From 7a2e51e7eac5cae44e0f47df683afbcc263e7008 Mon Sep 17 00:00:00 2001
From: Thad Ward <coderjoe@users.sourceforge.net>
Date: Sun, 30 Oct 2005 21:39:49 +0000
Subject: [PATCH] include cleanups.

---
 stepmania/src/ScreenEz2SelectMusic.h       | 1 +
 stepmania/src/ScreenJoinMultiplayer.h      | 1 +
 stepmania/src/ScreenMiniMenu.h             | 1 +
 stepmania/src/ScreenNameEntryTraditional.h | 1 +
 stepmania/src/ScreenOptions.h              | 1 +
 stepmania/src/ScreenOptionsManageCourses.h | 1 +
 stepmania/src/ScreenPlayerOptions.h        | 2 ++
 stepmania/src/ScreenPrompt.h               | 1 +
 stepmania/src/ScreenSelectMode.h           | 1 +
 stepmania/src/ScreenTextEntry.h            | 1 +
 stepmania/src/ScreenWithMenuElements.cpp   | 1 +
 stepmania/src/ScreenWithMenuElements.h     | 3 +--
 12 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/ScreenEz2SelectMusic.h b/stepmania/src/ScreenEz2SelectMusic.h
index 3b9ef46150..85495ad531 100644
--- a/stepmania/src/ScreenEz2SelectMusic.h
+++ b/stepmania/src/ScreenEz2SelectMusic.h
@@ -10,6 +10,7 @@
 #include "DifficultyRating.h"
 #include "ModeSwitcher.h"
 #include "RageTexturePreloader.h"
+#include "RageSound.h"
 
 class ScreenEz2SelectMusic : public ScreenWithMenuElements
 {
diff --git a/stepmania/src/ScreenJoinMultiplayer.h b/stepmania/src/ScreenJoinMultiplayer.h
index e6ffcc1181..e1b4f39c6c 100644
--- a/stepmania/src/ScreenJoinMultiplayer.h
+++ b/stepmania/src/ScreenJoinMultiplayer.h
@@ -2,6 +2,7 @@
 #define ScreenJoinMultiplayer_H
 
 #include "ScreenWithMenuElements.h"
+#include "RageSound.h"
 
 enum MultiPlayerStatus
 {
diff --git a/stepmania/src/ScreenMiniMenu.h b/stepmania/src/ScreenMiniMenu.h
index 4ab1136411..0a308e0ac0 100644
--- a/stepmania/src/ScreenMiniMenu.h
+++ b/stepmania/src/ScreenMiniMenu.h
@@ -4,6 +4,7 @@
 #define SCREEN_MINI_MENU_H
 
 #include "ScreenOptions.h"
+#include "GameConstantsAndTypes.h"
 
 typedef bool (*MenuRowUpdateEnabled)();
 
diff --git a/stepmania/src/ScreenNameEntryTraditional.h b/stepmania/src/ScreenNameEntryTraditional.h
index 9faf64dbd9..ec46722646 100644
--- a/stepmania/src/ScreenNameEntryTraditional.h
+++ b/stepmania/src/ScreenNameEntryTraditional.h
@@ -13,6 +13,7 @@
 #include "ActorScroller.h"
 #include "ThemeMetric.h"
 #include "DifficultyMeter.h"
+#include "RageSound.h"
 
 
 class HighScoreWheelItem : public ActorFrame
diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h
index 93224670fc..6d8754e31c 100644
--- a/stepmania/src/ScreenOptions.h
+++ b/stepmania/src/ScreenOptions.h
@@ -11,6 +11,7 @@
 #include "OptionsCursor.h"
 #include "LuaExpressionTransform.h"
 #include "InputEventPlus.h"
+#include "RageSound.h"
 
 class OptionRowHandler;
 
diff --git a/stepmania/src/ScreenOptionsManageCourses.h b/stepmania/src/ScreenOptionsManageCourses.h
index ad1480febd..fd08a4d362 100644
--- a/stepmania/src/ScreenOptionsManageCourses.h
+++ b/stepmania/src/ScreenOptionsManageCourses.h
@@ -2,6 +2,7 @@
 #define ScreenOptionsManageCourses_H
 
 #include "ScreenOptions.h"
+#include "GameConstantsAndTypes.h"
 
 class Course;
 
diff --git a/stepmania/src/ScreenPlayerOptions.h b/stepmania/src/ScreenPlayerOptions.h
index 464906ec99..c635797663 100644
--- a/stepmania/src/ScreenPlayerOptions.h
+++ b/stepmania/src/ScreenPlayerOptions.h
@@ -2,6 +2,8 @@
 #define SCREENPLAYEROPTIONS_H
 
 #include "ScreenOptionsMaster.h"
+#include "RageSound.h"
+
 struct lua_State;
 
 class ScreenPlayerOptions : public ScreenOptionsMaster
diff --git a/stepmania/src/ScreenPrompt.h b/stepmania/src/ScreenPrompt.h
index bae504fb0c..43637ae3f8 100644
--- a/stepmania/src/ScreenPrompt.h
+++ b/stepmania/src/ScreenPrompt.h
@@ -5,6 +5,7 @@
 
 #include "ScreenWithMenuElements.h"
 #include "BitmapText.h"
+#include "RageSound.h"
 
 enum PromptType
 {
diff --git a/stepmania/src/ScreenSelectMode.h b/stepmania/src/ScreenSelectMode.h
index 3acb272a55..a304a6754b 100644
--- a/stepmania/src/ScreenSelectMode.h
+++ b/stepmania/src/ScreenSelectMode.h
@@ -13,6 +13,7 @@
 #include "GameCommand.h"
 #include "BitmapText.h"
 #include "Character.h"
+#include "RageSound.h"
 
 /* Class Definition */
 
diff --git a/stepmania/src/ScreenTextEntry.h b/stepmania/src/ScreenTextEntry.h
index 18be1af366..3370fb3c93 100644
--- a/stepmania/src/ScreenTextEntry.h
+++ b/stepmania/src/ScreenTextEntry.h
@@ -5,6 +5,7 @@
 
 #include "ScreenWithMenuElements.h"
 #include "BitmapText.h"
+#include "RageSound.h"
 
 enum KeyboardRow
 {
diff --git a/stepmania/src/ScreenWithMenuElements.cpp b/stepmania/src/ScreenWithMenuElements.cpp
index 925169d29e..d2635a619c 100644
--- a/stepmania/src/ScreenWithMenuElements.cpp
+++ b/stepmania/src/ScreenWithMenuElements.cpp
@@ -10,6 +10,7 @@
 #include "ScreenManager.h"
 #include "GameSoundManager.h"
 #include "AnnouncerManager.h"
+#include "MemoryCardDisplay.h"
 
 #define TIMER_STEALTH			THEME->GetMetricB(m_sName,"TimerStealth")
 #define STYLE_ICON				THEME->GetMetricB(m_sName,"StyleIcon")
diff --git a/stepmania/src/ScreenWithMenuElements.h b/stepmania/src/ScreenWithMenuElements.h
index 474f4a4061..31b160abba 100644
--- a/stepmania/src/ScreenWithMenuElements.h
+++ b/stepmania/src/ScreenWithMenuElements.h
@@ -5,8 +5,7 @@
 #include "Sprite.h"
 #include "Transition.h"
 #include "ActorUtil.h"
-#include "RageSound.h"
-#include "MemoryCardDisplay.h"
+//#include "RageSound.h"
 #include "ThemeMetric.h"
 
 class MenuTimer;