diff --git a/stepmania/src/ScreenAttract.cpp b/stepmania/src/ScreenAttract.cpp
index 193091b672..40162e716f 100644
--- a/stepmania/src/ScreenAttract.cpp
+++ b/stepmania/src/ScreenAttract.cpp
@@ -6,7 +6,6 @@
 #include "PrefsManager.h"
 #include "RageLog.h"
 #include "GameState.h"
-#include "GameManager.h"
 #include "InputMapper.h"
 #include "ThemeManager.h"
 #include "GameSoundManager.h"
diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index 2e782adf3d..bd2b353d0e 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -7,7 +7,6 @@
 #include "GameManager.h"
 #include "GameState.h"
 #include "ThemeManager.h"
-#include "Game.h"
 #include "ScreenDimensions.h"
 #include "InputEventPlus.h"
 #include "LocalizedString.h"
diff --git a/stepmania/src/ScreenPrompt.cpp b/stepmania/src/ScreenPrompt.cpp
index 7237708011..ef25b0f210 100644
--- a/stepmania/src/ScreenPrompt.cpp
+++ b/stepmania/src/ScreenPrompt.cpp
@@ -2,7 +2,6 @@
 #include "ScreenPrompt.h"
 #include "ScreenManager.h"
 #include "GameSoundManager.h"
-#include "GameConstantsAndTypes.h"
 #include "ThemeManager.h"
 #include "ScreenDimensions.h"
 #include "ActorUtil.h"
diff --git a/stepmania/src/ScreenSandbox.cpp b/stepmania/src/ScreenSandbox.cpp
index 66d4ad91b4..6e3f8e972b 100644
--- a/stepmania/src/ScreenSandbox.cpp
+++ b/stepmania/src/ScreenSandbox.cpp
@@ -7,7 +7,6 @@
 
 #include "global.h"
 #include "ScreenSandbox.h"
-#include "GameConstantsAndTypes.h"
 #include "ThemeManager.h"
 #include "RageDisplay.h"
 #include "RageLog.h"
diff --git a/stepmania/src/ScreenTestFonts.cpp b/stepmania/src/ScreenTestFonts.cpp
index cc3cc77d25..12fe9ffae8 100644
--- a/stepmania/src/ScreenTestFonts.cpp
+++ b/stepmania/src/ScreenTestFonts.cpp
@@ -3,7 +3,6 @@
 #include "FontManager.h"
 #include "RageTextureManager.h"
 #include "ScreenTextEntry.h"
-#include "GameConstantsAndTypes.h"
 #include "ScreenDimensions.h"
 #include "InputEventPlus.h"
 #include "RageUtil.h"
diff --git a/stepmania/src/ScreenTestInput.cpp b/stepmania/src/ScreenTestInput.cpp
index 89e7bfb0d3..ed3ec810f0 100644
--- a/stepmania/src/ScreenTestInput.cpp
+++ b/stepmania/src/ScreenTestInput.cpp
@@ -5,7 +5,6 @@
 #include "InputMapper.h"
 #include "GameState.h"
 #include "ThemeManager.h"
-#include "Game.h"
 #include "ScreenDimensions.h"
 #include "GameManager.h"
 #include "PrefsManager.h"
diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp
index da7959343a..4caed504ce 100644
--- a/stepmania/src/ScreenTextEntry.cpp
+++ b/stepmania/src/ScreenTextEntry.cpp
@@ -3,7 +3,6 @@
 #include "RageUtil.h"
 #include "Preference.h"
 #include "ScreenManager.h"
-#include "GameConstantsAndTypes.h"
 #include "ThemeManager.h"
 #include "FontCharAliases.h"
 #include "ScreenDimensions.h"