Header cleanup.

stepmania/src/LyricDisplay.cpp

@@ -3,6 +3,7 @@
 #include "ScreenDimensions.h"
 #include "GameState.h"
 #include "ThemeMetric.h"
+#include "song.h"
 
 static ThemeMetric<apActorCommands>	IN_COMMAND	("LyricDisplay","InCommand");
 static ThemeMetric<apActorCommands>	OUT_COMMAND	("LyricDisplay","OutCommand");

stepmania/src/LyricDisplay.h

@@ -2,7 +2,6 @@
 #define LYRIC_DISPLAY_H
 
 #include "ActorFrame.h"
-#include "song.h"
 #include "BitmapText.h"
 
 class LyricDisplay: public ActorFrame

stepmania/src/MusicList.cpp

@@ -3,6 +3,7 @@
 #include "ThemeManager.h"
 #include "ThemeMetric.h"
 #include "RageUtil.h"
+#include "song.h"
 
 /* If this actor is used anywhere other than SelectGroup, we
  * can add a setting that changes which metric group we pull

stepmania/src/MusicList.h

@@ -1,17 +1,19 @@
-#ifndef MUSICLIST_H
+#ifndef MUSIC_LIST_H
-#define MUSICLIST_H
+#define MUSIC_LIST_H
 
 #include "ActorFrame.h"
 #include "BitmapText.h"
-#include "song.h"
 
 const int MAX_MLIST_COLUMNS = 5;
 
+class Song;
+
 class MusicList : public ActorFrame
 {
 	BitmapText		m_textTitles[MAX_MLIST_COLUMNS];
 	
-	struct group {
+	struct group
+	{
 		RString ContentsText[MAX_MLIST_COLUMNS];
 		int m_iNumSongsInGroup;
 	};

stepmania/src/ScreenDebugOverlay.cpp

@@ -25,6 +25,7 @@
 #include "SongManager.h"
 #include "GameLoop.h"
 #include "ScreenServiceAction.h"
+#include "song.h"
 
 static bool g_bIsDisplayed = false;
 static bool g_bIsSlow = false;

stepmania/src/ScreenGameplay.cpp

@@ -53,6 +53,7 @@
 #include "ScreenSaveSync.h"
 #include "AdjustSync.h"
 #include "SongUtil.h"
+#include "song.h"
 
 //
 // Defines

stepmania/src/ScreenGameplayLesson.cpp

@@ -4,6 +4,7 @@
 #include "GameState.h"
 #include "PrefsManager.h"
 #include "StatsManager.h"
+#include "song.h"
 
 REGISTER_SCREEN_CLASS( ScreenGameplayLesson );
 ScreenGameplayLesson::ScreenGameplayLesson()

stepmania/src/ScreenGameplayShared.cpp

@@ -7,6 +7,7 @@
 #include "ActiveAttackList.h"
 #include "ScoreDisplayNormal.h"
 #include "ScoreKeeperShared.h"
+#include "song.h"
 
 REGISTER_SCREEN_CLASS( ScreenGameplayShared );
 

stepmania/src/ScreenGameplaySyncMachine.h

@@ -4,6 +4,7 @@
 #define ScreenGameplaySyncMachine_H
 
 #include "ScreenGameplayNormal.h"
+#include "song.h"
 
 class ScreenGameplaySyncMachine : public ScreenGameplayNormal
 {

stepmania/src/ScreenJukebox.cpp

@@ -21,6 +21,7 @@
 #include "InputEventPlus.h"
 #include "AdjustSync.h"
 #include "SongUtil.h"
+#include "song.h"
 
 #define SHOW_COURSE_MODIFIERS_PROBABILITY	THEME->GetMetricF(m_sName,"ShowCourseModifiersProbability")
 

stepmania/src/ScreenSelectGroup.cpp

@@ -17,6 +17,7 @@
 #include "MenuTimer.h"
 #include "SongUtil.h"
 #include "LocalizedString.h"
+#include "song.h"
 
 #define BANNER_WIDTH					THEME->GetMetricF("ScreenSelectGroup","BannerWidth")
 #define BANNER_HEIGHT					THEME->GetMetricF("ScreenSelectGroup","BannerHeight")