diff --git a/stepmania/src/ScreenCourseManager.cpp b/stepmania/src/ScreenCourseManager.cpp
index 0fe4493753..1cd80c3bb9 100644
--- a/stepmania/src/ScreenCourseManager.cpp
+++ b/stepmania/src/ScreenCourseManager.cpp
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "ScreenCourseManager.h"
+#include "ScreenManager.h"
 #include "RageLog.h"
 #include "GameState.h"
 #include "SongManager.h"
diff --git a/stepmania/src/ScreenDebugOverlay.cpp b/stepmania/src/ScreenDebugOverlay.cpp
index 58e7db03f5..032b118a69 100644
--- a/stepmania/src/ScreenDebugOverlay.cpp
+++ b/stepmania/src/ScreenDebugOverlay.cpp
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "ScreenDebugOverlay.h"
 #include "ScreenDimensions.h"
+#include "ScreenManager.h"
 #include "PrefsManager.h"
 #include "RageLog.h"
 #include "GameState.h"
diff --git a/stepmania/src/ScreenEditCourse.cpp b/stepmania/src/ScreenEditCourse.cpp
index 2ee37480b0..06bb99f2f4 100644
--- a/stepmania/src/ScreenEditCourse.cpp
+++ b/stepmania/src/ScreenEditCourse.cpp
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "ScreenEditCourse.h"
+#include "ScreenManager.h"
 #include "RageLog.h"
 #include "GameState.h"
 #include "SongManager.h"
diff --git a/stepmania/src/ScreenEditCourseEntry.cpp b/stepmania/src/ScreenEditCourseEntry.cpp
index 8bc313fcad..393271a7c8 100644
--- a/stepmania/src/ScreenEditCourseEntry.cpp
+++ b/stepmania/src/ScreenEditCourseEntry.cpp
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "ScreenEditCourseEntry.h"
+#include "ScreenManager.h"
 #include "RageLog.h"
 #include "GameState.h"
 #include "SongManager.h"
diff --git a/stepmania/src/ScreenEnding.cpp b/stepmania/src/ScreenEnding.cpp
index 775d578bca..ca2d83d3f7 100644
--- a/stepmania/src/ScreenEnding.cpp
+++ b/stepmania/src/ScreenEnding.cpp
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "ScreenEnding.h"
+#include "ScreenManager.h"
 #include "SongManager.h"
 #include "GameSoundManager.h"
 #include "ThemeManager.h"
diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index 5a1aa4a1bb..e61dc0150b 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -2,6 +2,7 @@
 #include "ScreenMapControllers.h"
 #include "PrefsManager.h"
 #include "GameConstantsAndTypes.h"
+#include "ScreenManager.h"
 #include "PrefsManager.h"
 #include "RageLog.h"
 #include "InputMapper.h"
diff --git a/stepmania/src/ScreenOptionsEditProfile.cpp b/stepmania/src/ScreenOptionsEditProfile.cpp
index 874a4576df..96cc8ce91c 100644
--- a/stepmania/src/ScreenOptionsEditProfile.cpp
+++ b/stepmania/src/ScreenOptionsEditProfile.cpp
@@ -2,6 +2,7 @@
 
 #include "ScreenOptionsEditProfile.h"
 #include "ScreenMiniMenu.h"
+#include "ScreenManager.h"
 #include "ProfileManager.h"
 #include "ScreenTextEntry.h"
 #include "ScreenPrompt.h"
diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index adc0968758..ac852d1bb8 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "ScreenRanking.h"
+#include "ScreenManager.h"
 #include "ThemeManager.h"
 #include "SongManager.h"
 #include "GameState.h"
diff --git a/stepmania/src/ScreenReloadSongs.cpp b/stepmania/src/ScreenReloadSongs.cpp
index 573650145d..f55b0a8bc6 100644
--- a/stepmania/src/ScreenReloadSongs.cpp
+++ b/stepmania/src/ScreenReloadSongs.cpp
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "ScreenReloadSongs.h"
+#include "ScreenManager.h"
 #include "SongManager.h"
 #include "UnlockManager.h"
 #include "RageTimer.h"
diff --git a/stepmania/src/ScreenSelectProfile.cpp b/stepmania/src/ScreenSelectProfile.cpp
index 6e8b03d3e2..354b683d9c 100644
--- a/stepmania/src/ScreenSelectProfile.cpp
+++ b/stepmania/src/ScreenSelectProfile.cpp
@@ -5,6 +5,7 @@
 #include "ProfileManager.h"
 #include "ScreenTextEntry.h"
 #include "ScreenPrompt.h"
+#include "ScreenManager.h"
 #include "RageUtil.h"
 #include "GameState.h"
 #include "Profile.h"
diff --git a/stepmania/src/ScreenSplash.cpp b/stepmania/src/ScreenSplash.cpp
index 45fd472756..f23a2b9d0b 100644
--- a/stepmania/src/ScreenSplash.cpp
+++ b/stepmania/src/ScreenSplash.cpp
@@ -2,6 +2,7 @@
 #include "ScreenSplash.h"
 #include "ThemeManager.h"
 #include "RageUtil.h"
+#include "ScreenManager.h"
 
 AutoScreenMessage( SM_PrepScreen )
 
diff --git a/stepmania/src/ScreenSyncOverlay.cpp b/stepmania/src/ScreenSyncOverlay.cpp
index 8987b08eac..f615fd0de1 100644
--- a/stepmania/src/ScreenSyncOverlay.cpp
+++ b/stepmania/src/ScreenSyncOverlay.cpp
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "ScreenSyncOverlay.h"
 #include "ScreenDimensions.h"
+#include "ScreenManager.h"
 #include "GameState.h"
 #include "song.h"
 #include "PrefsManager.h"
diff --git a/stepmania/src/ScreenSystemLayer.cpp b/stepmania/src/ScreenSystemLayer.cpp
index 5a8b393bd6..c7b1132159 100644
--- a/stepmania/src/ScreenSystemLayer.cpp
+++ b/stepmania/src/ScreenSystemLayer.cpp
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "ScreenSystemLayer.h"
+#include "ScreenManager.h"
 #include "PrefsManager.h"
 #include "ThemeManager.h"
 #include "ActorUtil.h"