cleanup

stepmania/src/BPMDisplay.cpp

@@ -8,6 +8,7 @@
 #include "Style.h"
 #include "ActorUtil.h"
 #include "CommonMetrics.h"
+#include "song.h"
 
 #include <limits.h>
 

stepmania/src/BPMDisplay.h

@@ -3,8 +3,6 @@
 #ifndef BPM_DISPLAY_H
 #define BPM_DISPLAY_H
 
-#include "Sprite.h"
-#include "song.h"
 #include "ActorFrame.h"
 #include "BitmapText.h"
 #include "Quad.h"
@@ -12,6 +10,7 @@
 #include "ThemeMetric.h"
 class Song;
 class Course;
+struct DisplayBpms;
 
 class BPMDisplay : public ActorFrame
 {

stepmania/src/CombinedLifeMeterTug.h

@@ -4,7 +4,6 @@
 #define CombinedLifeMeterTug_H
 
 #include "CombinedLifeMeter.h"
-#include "Sprite.h"
 #include "MeterDisplay.h"
 
 

stepmania/src/MenuTimer.h

@@ -3,8 +3,6 @@
 #ifndef MENU_TIMER_H
 #define MENU_TIMER_H
 
-#include "Sprite.h"
-#include "song.h"
 #include "ActorFrame.h"
 #include "BitmapText.h"
 #include "RageSound.h"

stepmania/src/MeterDisplay.h

@@ -2,7 +2,6 @@
 #define METER_DISPLAY_H
 
 #include "ActorFrame.h"
-#include "Sprite.h"
 #include "AutoActor.h"
 
 

stepmania/src/ScreenBookkeeping.cpp

@@ -1,16 +1,8 @@
 #include "global.h"
 #include "ScreenBookkeeping.h"
-#include "PrefsManager.h"
 #include "ScreenManager.h"
-#include "GameConstantsAndTypes.h"
-#include "PrefsManager.h"
 #include "RageLog.h"
-#include "InputMapper.h"
-#include "GameManager.h"
-#include "GameState.h"
-#include "GameSoundManager.h"
 #include "ThemeManager.h"
-#include "RageDisplay.h"
 #include "Bookkeeper.h"
 #include "ScreenDimensions.h"
 

stepmania/src/ScreenBookkeeping.h

@@ -4,10 +4,7 @@
 #define SCREEN_BOOKKEEPING_H
 
 #include "ScreenWithMenuElements.h"
-#include "Sprite.h"
 #include "BitmapText.h"
-#include "PrefsManager.h"
-#include "InputMapper.h"
 
 const int NUM_BOOKKEEPING_COLS = 4;
 

stepmania/src/ScreenJukebox.h

@@ -4,7 +4,6 @@
 #define ScreenJukebox_H
 
 #include "ScreenGameplayNormal.h"
-#include "Sprite.h"
 class CourseEntry;
 
 class ScreenJukebox : public ScreenGameplayNormal

stepmania/src/ScreenMapControllers.cpp

@@ -1,19 +1,14 @@
 #include "global.h"
 #include "ScreenMapControllers.h"
-#include "PrefsManager.h"
 #include "GameConstantsAndTypes.h"
 #include "ScreenManager.h"
-#include "PrefsManager.h"
 #include "RageLog.h"
 #include "InputMapper.h"
 #include "GameManager.h"
 #include "GameState.h"
-#include "GameSoundManager.h"
 #include "ThemeManager.h"
 #include "Game.h"
-#include "HelpDisplay.h"
 #include "ScreenDimensions.h"
-#include "ThemeMetric.h"
 #include "Command.h"
 
 static const ThemeMetric<apActorCommands> EVEN_LINE_IN	("ScreenMapControllers","EvenLineIn");
@@ -102,8 +97,6 @@ void ScreenMapControllers::Init()
 
 	m_iWaitingForPress = 0;
 
-	SOUND->PlayMusic( THEME->GetPathS("ScreenMapControllers","music") );
-
 	Refresh();
 }
 

stepmania/src/ScreenMapControllers.h

@@ -4,7 +4,6 @@
 #define SCREEN_MAP_CONTROLLERS_H
 
 #include "ScreenWithMenuElements.h"
-#include "Sprite.h"
 #include "BitmapText.h"
 #include "InputMapper.h"
 

stepmania/src/ScreenSelectMusic.h

@@ -23,6 +23,7 @@
 #include "ThemeMetric.h"
 #include "ActorCommands.h"
 #include "RageTexturePreloader.h"
+#include "TimingData.h"
 
 class ScreenSelectMusic : public ScreenWithMenuElements
 {