include cleanups.

stepmania/src/ScreenEz2SelectMusic.h

@@ -10,6 +10,7 @@
 #include "DifficultyRating.h"
 #include "ModeSwitcher.h"
 #include "RageTexturePreloader.h"
+#include "RageSound.h"
 
 class ScreenEz2SelectMusic : public ScreenWithMenuElements
 {

stepmania/src/ScreenJoinMultiplayer.h

@@ -2,6 +2,7 @@
 #define ScreenJoinMultiplayer_H
 
 #include "ScreenWithMenuElements.h"
+#include "RageSound.h"
 
 enum MultiPlayerStatus
 {

stepmania/src/ScreenMiniMenu.h

@@ -4,6 +4,7 @@
 #define SCREEN_MINI_MENU_H
 
 #include "ScreenOptions.h"
+#include "GameConstantsAndTypes.h"
 
 typedef bool (*MenuRowUpdateEnabled)();
 

stepmania/src/ScreenNameEntryTraditional.h

@@ -13,6 +13,7 @@
 #include "ActorScroller.h"
 #include "ThemeMetric.h"
 #include "DifficultyMeter.h"
+#include "RageSound.h"
 
 
 class HighScoreWheelItem : public ActorFrame

stepmania/src/ScreenOptions.h

@@ -11,6 +11,7 @@
 #include "OptionsCursor.h"
 #include "LuaExpressionTransform.h"
 #include "InputEventPlus.h"
+#include "RageSound.h"
 
 class OptionRowHandler;
 

stepmania/src/ScreenOptionsManageCourses.h

@@ -2,6 +2,7 @@
 #define ScreenOptionsManageCourses_H
 
 #include "ScreenOptions.h"
+#include "GameConstantsAndTypes.h"
 
 class Course;
 

stepmania/src/ScreenPlayerOptions.h

@@ -2,6 +2,8 @@
 #define SCREENPLAYEROPTIONS_H
 
 #include "ScreenOptionsMaster.h"
+#include "RageSound.h"
+
 struct lua_State;
 
 class ScreenPlayerOptions : public ScreenOptionsMaster

stepmania/src/ScreenPrompt.h

@@ -5,6 +5,7 @@
 
 #include "ScreenWithMenuElements.h"
 #include "BitmapText.h"
+#include "RageSound.h"
 
 enum PromptType
 {

stepmania/src/ScreenSelectMode.h

@@ -13,6 +13,7 @@
 #include "GameCommand.h"
 #include "BitmapText.h"
 #include "Character.h"
+#include "RageSound.h"
 
 /* Class Definition */
 

stepmania/src/ScreenTextEntry.h

@@ -5,6 +5,7 @@
 
 #include "ScreenWithMenuElements.h"
 #include "BitmapText.h"
+#include "RageSound.h"
 
 enum KeyboardRow
 {

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")

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;