diff --git a/stepmania/src/LifeMeter.h b/stepmania/src/LifeMeter.h
index 9071f6609c..82a1d33cf5 100644
--- a/stepmania/src/LifeMeter.h
+++ b/stepmania/src/LifeMeter.h
@@ -13,7 +13,6 @@
 
 #include "GameConstantsAndTypes.h"
 #include "ActorFrame.h"
-#include "PlayerOptions.h"
 
 
 class Song;
diff --git a/stepmania/src/ScoreDisplay.h b/stepmania/src/ScoreDisplay.h
index 59153a75fb..72eb755b52 100644
--- a/stepmania/src/ScoreDisplay.h
+++ b/stepmania/src/ScoreDisplay.h
@@ -12,12 +12,9 @@
 */
 
 #include "Sprite.h"
-#include "Song.h"
+#include "GameConstantsAndTypes.h"
 #include "ActorFrame.h"
 #include "BitmapText.h"
-#include "PlayerOptions.h"
-
-
 
 class ScoreDisplay : public BitmapText
 {
diff --git a/stepmania/src/SmallGradeDisplay.h b/stepmania/src/SmallGradeDisplay.h
index 7c83a08fdc..aeb2be64cc 100644
--- a/stepmania/src/SmallGradeDisplay.h
+++ b/stepmania/src/SmallGradeDisplay.h
@@ -13,7 +13,6 @@
 
 
 #include "Sprite.h"
-#include "PrefsManager.h"
 #include "Grade.h"
 #include "GameConstantsAndTypes.h"
 
diff --git a/stepmania/src/TransitionFadeWipe.h b/stepmania/src/TransitionFadeWipe.h
index 277197a8d3..bca6edc99b 100644
--- a/stepmania/src/TransitionFadeWipe.h
+++ b/stepmania/src/TransitionFadeWipe.h
@@ -13,7 +13,6 @@
 
 
 #include "Transition.h"
-#include "Sprite.h"
 #include "Quad.h"
 
 
diff --git a/stepmania/src/TransitionInvisible.cpp b/stepmania/src/TransitionInvisible.cpp
index 2b56159db2..e4a3237726 100644
--- a/stepmania/src/TransitionInvisible.cpp
+++ b/stepmania/src/TransitionInvisible.cpp
@@ -11,12 +11,7 @@
 */
 
 
-#include "RageUtil.h"
-
 #include "TransitionInvisible.h"
-#include "GameConstantsAndTypes.h"
-
-
 
 TransitionInvisible::TransitionInvisible()
 {
diff --git a/stepmania/src/TransitionInvisible.h b/stepmania/src/TransitionInvisible.h
index d64ac76944..d5e79c202d 100644
--- a/stepmania/src/TransitionInvisible.h
+++ b/stepmania/src/TransitionInvisible.h
@@ -13,8 +13,6 @@
 
 
 #include "Transition.h"
-#include "Quad.h"
-
 
 class TransitionInvisible : public Transition
 {
diff --git a/stepmania/src/TransitionKeepAlive.h b/stepmania/src/TransitionKeepAlive.h
index 8785468d56..8df6d4bb97 100644
--- a/stepmania/src/TransitionKeepAlive.h
+++ b/stepmania/src/TransitionKeepAlive.h
@@ -13,7 +13,7 @@
 
 
 #include "Sprite.h"
-#include "TransitionFadeWipe.h"
+#include "Transition.h"
 
 
 class TransitionKeepAlive : public Transition
diff --git a/stepmania/src/TransitionOniFade.h b/stepmania/src/TransitionOniFade.h
index 00a30c3e70..0af4c851a9 100644
--- a/stepmania/src/TransitionOniFade.h
+++ b/stepmania/src/TransitionOniFade.h
@@ -13,9 +13,7 @@
 
 
 #include "Transition.h"
-#include "Sprite.h"
 #include "Quad.h"
-#include "TransitionFade.h"
 #include "Banner.h"