diff --git a/stepmania/src/ScreenCaution.cpp b/stepmania/src/ScreenCaution.cpp
index 23e20bcc8a..0a7fe5e46b 100644
--- a/stepmania/src/ScreenCaution.cpp
+++ b/stepmania/src/ScreenCaution.cpp
@@ -13,6 +13,7 @@
 #include "ScreenCaution.h"
 #include "GameConstantsAndTypes.h"
 #include "PrefsManager.h"
+#include "ScreenManager.h"
 #include "AnnouncerManager.h"
 #include "GameState.h"
 #include "RageSoundManager.h"
diff --git a/stepmania/src/ScreenCaution.h b/stepmania/src/ScreenCaution.h
index 63c922e28b..be291e5456 100644
--- a/stepmania/src/ScreenCaution.h
+++ b/stepmania/src/ScreenCaution.h
@@ -14,8 +14,6 @@
 
 
 #include "Screen.h"
-#include "TransitionFade.h"
-#include "TransitionFadeWipe.h"
 #include "RandomSample.h"
 #include "BGAnimation.h"
 #include "TransitionBGAnimation.h"
diff --git a/stepmania/src/ScreenEditMenu.h b/stepmania/src/ScreenEditMenu.h
index dccabcdc60..8bec31ca70 100644
--- a/stepmania/src/ScreenEditMenu.h
+++ b/stepmania/src/ScreenEditMenu.h
@@ -12,8 +12,6 @@
 #include "Screen.h"
 #include "EditMenu.h"
 #include "BitmapText.h"
-#include "TransitionFade.h"
-#include "RandomSample.h"
 #include "MenuElements.h"
 
 
diff --git a/stepmania/src/ScreenJukeboxMenu.h b/stepmania/src/ScreenJukeboxMenu.h
index ee534d5a32..1839856c48 100644
--- a/stepmania/src/ScreenJukeboxMenu.h
+++ b/stepmania/src/ScreenJukeboxMenu.h
@@ -12,8 +12,6 @@
 #include "Screen.h"
 #include "JukeboxMenu.h"
 #include "BitmapText.h"
-#include "TransitionFade.h"
-#include "RandomSample.h"
 #include "MenuElements.h"
 
 
diff --git a/stepmania/src/ScreenOptionsMenu.h b/stepmania/src/ScreenOptionsMenu.h
index de4dca78aa..87dd02f7c4 100644
--- a/stepmania/src/ScreenOptionsMenu.h
+++ b/stepmania/src/ScreenOptionsMenu.h
@@ -11,11 +11,6 @@
 
 #include "Screen.h"
 #include "ScreenOptions.h"
-#include "Sprite.h"
-#include "BitmapText.h"
-#include "RandomSample.h"
-#include "TransitionFade.h"
-#include "Quad.h"
 
 
 class ScreenOptionsMenu : public ScreenOptions
diff --git a/stepmania/src/ScreenSelectMode.h b/stepmania/src/ScreenSelectMode.h
index 064e42524e..d0fa7f2651 100644
--- a/stepmania/src/ScreenSelectMode.h
+++ b/stepmania/src/ScreenSelectMode.h
@@ -10,10 +10,6 @@ Andrew Livy
 #include "Background.h"
 #include "Screen.h"
 #include "Sprite.h"
-#include "BitmapText.h"
-#include "TransitionFade.h"
-#include "Quad.h"
-#include "RandomSample.h"
 #include "Quad.h"
 #include "MenuElements.h"
 #include "ScrollingList.h"
diff --git a/stepmania/src/ScreenSelectStyle5th.h b/stepmania/src/ScreenSelectStyle5th.h
index f56b8afe39..5576da2d46 100644
--- a/stepmania/src/ScreenSelectStyle5th.h
+++ b/stepmania/src/ScreenSelectStyle5th.h
@@ -12,11 +12,8 @@
 #include "Screen.h"
 #include "Sprite.h"
 #include "BitmapText.h"
-#include "TransitionFade.h"
-#include "Quad.h"
 #include "RandomSample.h"
 #include "Quad.h"
-#include "TransitionKeepAlive.h"
 #include "MenuElements.h"
 
 // 
diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp
index 8a2749d32b..7b6742123c 100644
--- a/stepmania/src/ScreenStage.cpp
+++ b/stepmania/src/ScreenStage.cpp
@@ -16,8 +16,6 @@
 #include "RageLog.h"
 #include "GameConstantsAndTypes.h"
 #include "BitmapText.h"
-#include "TransitionFadeWipe.h"
-#include "TransitionFade.h"
 #include "SongManager.h"
 #include "Sprite.h"
 #include "AnnouncerManager.h"