From 35c48c3671f99b89e9df687cf7b0879469d7c788 Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Thu, 17 Aug 2006 18:52:46 +0000
Subject: [PATCH] Header cleanup.

---
 stepmania/src/LyricDisplay.cpp            |  1 +
 stepmania/src/LyricDisplay.h              |  1 -
 stepmania/src/MusicList.cpp               |  1 +
 stepmania/src/MusicList.h                 | 10 ++++++----
 stepmania/src/ScreenDebugOverlay.cpp      |  1 +
 stepmania/src/ScreenGameplay.cpp          |  1 +
 stepmania/src/ScreenGameplayLesson.cpp    |  1 +
 stepmania/src/ScreenGameplayShared.cpp    |  1 +
 stepmania/src/ScreenGameplaySyncMachine.h |  1 +
 stepmania/src/ScreenJukebox.cpp           |  1 +
 stepmania/src/ScreenSelectGroup.cpp       |  1 +
 11 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/stepmania/src/LyricDisplay.cpp b/stepmania/src/LyricDisplay.cpp
index 48bd9acb1b..689a7720fa 100644
--- a/stepmania/src/LyricDisplay.cpp
+++ b/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");
diff --git a/stepmania/src/LyricDisplay.h b/stepmania/src/LyricDisplay.h
index 6b45d64378..161a4bd027 100644
--- a/stepmania/src/LyricDisplay.h
+++ b/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
diff --git a/stepmania/src/MusicList.cpp b/stepmania/src/MusicList.cpp
index 5ffad10769..65443524cb 100644
--- a/stepmania/src/MusicList.cpp
+++ b/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
diff --git a/stepmania/src/MusicList.h b/stepmania/src/MusicList.h
index 47dea6f702..3d8e02a05d 100644
--- a/stepmania/src/MusicList.h
+++ b/stepmania/src/MusicList.h
@@ -1,17 +1,19 @@
-#ifndef MUSICLIST_H
-#define MUSICLIST_H
+#ifndef MUSIC_LIST_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;
 	};
diff --git a/stepmania/src/ScreenDebugOverlay.cpp b/stepmania/src/ScreenDebugOverlay.cpp
index d7a8e63a9d..9a183b898d 100644
--- a/stepmania/src/ScreenDebugOverlay.cpp
+++ b/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;
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 61428a819a..24e5da5145 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -53,6 +53,7 @@
 #include "ScreenSaveSync.h"
 #include "AdjustSync.h"
 #include "SongUtil.h"
+#include "song.h"
 
 //
 // Defines
diff --git a/stepmania/src/ScreenGameplayLesson.cpp b/stepmania/src/ScreenGameplayLesson.cpp
index 00ff6c7d9e..199467f3b2 100644
--- a/stepmania/src/ScreenGameplayLesson.cpp
+++ b/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()
diff --git a/stepmania/src/ScreenGameplayShared.cpp b/stepmania/src/ScreenGameplayShared.cpp
index 482c85e60b..9c75b0af14 100644
--- a/stepmania/src/ScreenGameplayShared.cpp
+++ b/stepmania/src/ScreenGameplayShared.cpp
@@ -7,6 +7,7 @@
 #include "ActiveAttackList.h"
 #include "ScoreDisplayNormal.h"
 #include "ScoreKeeperShared.h"
+#include "song.h"
 
 REGISTER_SCREEN_CLASS( ScreenGameplayShared );
 
diff --git a/stepmania/src/ScreenGameplaySyncMachine.h b/stepmania/src/ScreenGameplaySyncMachine.h
index 711c6dbceb..0db5ff00e8 100644
--- a/stepmania/src/ScreenGameplaySyncMachine.h
+++ b/stepmania/src/ScreenGameplaySyncMachine.h
@@ -4,6 +4,7 @@
 #define ScreenGameplaySyncMachine_H
 
 #include "ScreenGameplayNormal.h"
+#include "song.h"
 
 class ScreenGameplaySyncMachine : public ScreenGameplayNormal
 {
diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp
index 14cc88f52c..44972b7193 100644
--- a/stepmania/src/ScreenJukebox.cpp
+++ b/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")
 
diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp
index 1497186de5..acc582a73f 100644
--- a/stepmania/src/ScreenSelectGroup.cpp
+++ b/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")