diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index 71457605ab..c872be595c 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -10,7 +10,6 @@
 #include "GameState.h"
 #include "GameSoundManager.h"
 #include "ThemeManager.h"
-#include "RageDisplay.h"
 #include "Game.h"
 #include "HelpDisplay.h"
 #include "ScreenDimensions.h"
diff --git a/stepmania/src/ScreenMapControllers.h b/stepmania/src/ScreenMapControllers.h
index b5e6e055b9..406fffcf54 100644
--- a/stepmania/src/ScreenMapControllers.h
+++ b/stepmania/src/ScreenMapControllers.h
@@ -6,9 +6,7 @@
 #include "ScreenWithMenuElements.h"
 #include "Sprite.h"
 #include "BitmapText.h"
-#include "PrefsManager.h"
 #include "InputMapper.h"
-#include "RageInputDevice.h"
 
 
 class ScreenMapControllers : public ScreenWithMenuElements
diff --git a/stepmania/src/ScreenSetTime.cpp b/stepmania/src/ScreenSetTime.cpp
index 67d324462e..1aa63a36d5 100644
--- a/stepmania/src/ScreenSetTime.cpp
+++ b/stepmania/src/ScreenSetTime.cpp
@@ -1,17 +1,12 @@
 #include "global.h"
 #include "ScreenSetTime.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 "DateTime.h"
 #include "EnumHelper.h"
 #include "arch/ArchHooks/ArchHooks.h"
 
diff --git a/stepmania/src/ScreenSetTime.h b/stepmania/src/ScreenSetTime.h
index 98ed98ed2c..5099fcb1ed 100644
--- a/stepmania/src/ScreenSetTime.h
+++ b/stepmania/src/ScreenSetTime.h
@@ -2,11 +2,7 @@
 #define SCREEN_SET_TIME_H
 
 #include "ScreenWithMenuElements.h"
-#include "Sprite.h"
 #include "BitmapText.h"
-#include "PrefsManager.h"
-#include "InputMapper.h"
-#include "RageInputDevice.h"
 
 enum SetTimeSelection
 { 
diff --git a/stepmania/src/ScreenTestInput.cpp b/stepmania/src/ScreenTestInput.cpp
index ce77408f5d..f5b3608589 100644
--- a/stepmania/src/ScreenTestInput.cpp
+++ b/stepmania/src/ScreenTestInput.cpp
@@ -1,16 +1,11 @@
 #include "global.h"
 #include "ScreenTestInput.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 "Game.h"
 #include "ScreenDimensions.h"
 
diff --git a/stepmania/src/ScreenTestInput.h b/stepmania/src/ScreenTestInput.h
index 5f531b68af..eb1c6def03 100644
--- a/stepmania/src/ScreenTestInput.h
+++ b/stepmania/src/ScreenTestInput.h
@@ -1,12 +1,10 @@
+/* ScreenTestInput - Display pressed keys. */
+
 #ifndef SCREEN_TEST_INPUT_H
 #define SCREEN_TEST_INPUT_H
 
 #include "ScreenWithMenuElements.h"
-#include "Sprite.h"
 #include "BitmapText.h"
-#include "PrefsManager.h"
-#include "InputMapper.h"
-#include "RageInputDevice.h"
 
 
 class ScreenTestInput : public ScreenWithMenuElements
diff --git a/stepmania/src/ScreenTestLights.cpp b/stepmania/src/ScreenTestLights.cpp
index c65cd44847..b37644a0a5 100644
--- a/stepmania/src/ScreenTestLights.cpp
+++ b/stepmania/src/ScreenTestLights.cpp
@@ -1,16 +1,11 @@
 #include "global.h"
 #include "ScreenTestLights.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 "LightsManager.h"
 #include "Game.h"
 #include "ScreenDimensions.h"
diff --git a/stepmania/src/ScreenTestLights.h b/stepmania/src/ScreenTestLights.h
index e167c2557f..85d4f98f4e 100644
--- a/stepmania/src/ScreenTestLights.h
+++ b/stepmania/src/ScreenTestLights.h
@@ -2,11 +2,7 @@
 #define SCREEN_TEST_LIGHTS_H
 
 #include "ScreenWithMenuElements.h"
-#include "Sprite.h"
 #include "BitmapText.h"
-#include "PrefsManager.h"
-#include "InputMapper.h"
-#include "RageInputDevice.h"
 
 
 class ScreenTestLights : public ScreenWithMenuElements