diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp
index 1921315bab..862ee857f2 100644
--- a/stepmania/src/EditMenu.cpp
+++ b/stepmania/src/EditMenu.cpp
@@ -54,7 +54,7 @@ static ThemeMetric<apActorCommands> ROW_VALUE_ON_COMMAND("EditMenu","RowValueOnC
 static ThemeMetric1D<float> ROW_Y						("EditMenu",ROW_Y_NAME,NUM_EDIT_MENU_ROWS);
 
 
-static void GetSongsToShowForGroup( const CString &sGroup, vector<Song*> &vpSongsOut )
+void EditMenu::GetSongsToShowForGroup( const CString &sGroup, vector<Song*> &vpSongsOut )
 {
 	vpSongsOut.clear();
 	SONGMAN->GetSongs( vpSongsOut, sGroup );
@@ -76,7 +76,8 @@ static void GetSongsToShowForGroup( const CString &sGroup, vector<Song*> &vpSong
 	}
 	SongUtil::SortSongPointerArrayByTitle( vpSongsOut );
 }
-static void GetGroupsToShow( vector<CString> &vsGroupsOut )
+
+void EditMenu::GetGroupsToShow( vector<CString> &vsGroupsOut )
 {
 	vsGroupsOut.clear();
 	SONGMAN->GetSongGroupNames( vsGroupsOut );
diff --git a/stepmania/src/EditMenu.h b/stepmania/src/EditMenu.h
index 4b3d83cc5e..c4c9045e1a 100644
--- a/stepmania/src/EditMenu.h
+++ b/stepmania/src/EditMenu.h
@@ -71,6 +71,9 @@ public:
 	EditMenuRow GetSelectedRow() const { return m_SelectedRow; }
 
 private:
+	void GetSongsToShowForGroup( const CString &sGroup, vector<Song*> &vpSongsOut );
+	void GetGroupsToShow( vector<CString> &vsGroupsOut );
+
 	void UpdateArrows();
 	Sprite	m_sprArrows[NUM_ARROWS];
 
diff --git a/stepmania/src/ScreenEditMenu.h b/stepmania/src/ScreenEditMenu.h
index 7dea7318f5..a4ffb0559d 100644
--- a/stepmania/src/ScreenEditMenu.h
+++ b/stepmania/src/ScreenEditMenu.h
@@ -24,8 +24,9 @@ private:
 
 	void RefreshExplanationText();
 	void RefreshNumStepsLoadedFromProfile();
-public:
+
 	EditMenu		m_Selector;
+
 private:
 	BitmapText		m_textExplanation;
 	BitmapText		m_textNumStepsLoadedFromProfile;