diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp
index 91ccb5d586..120968c979 100644
--- a/stepmania/src/ScreenDemonstration.cpp
+++ b/stepmania/src/ScreenDemonstration.cpp
@@ -10,6 +10,7 @@
 #include "GameSoundManager.h"
 #include "GameManager.h"
 #include "Style.h"
+#include "PrefsManager.h"
 
 
 #define SECONDS_TO_SHOW			THEME->GetMetricF(m_sName,"SecondsToShow")
diff --git a/stepmania/src/ScreenGameplayMultiplayer.cpp b/stepmania/src/ScreenGameplayMultiplayer.cpp
index 433957ca29..0982f79043 100644
--- a/stepmania/src/ScreenGameplayMultiplayer.cpp
+++ b/stepmania/src/ScreenGameplayMultiplayer.cpp
@@ -13,6 +13,7 @@
 #include "ScoreDisplayPercentage.h"
 #include "ScoreDisplayNormal.h"
 #include "ScoreDisplayOni.h"
+#include "song.h"
 #include "Steps.h"
 #include "NoteDataUtil.h"
 #include "RageLog.h"
@@ -20,6 +21,7 @@
 #include "PlayerState.h"
 #include "InputMapper.h"
 #include "ActorUtil.h"
+#include "PrefsManager.h"
 
 //
 // Defines
diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp
index a6d11d7e52..2c3ec619d0 100644
--- a/stepmania/src/ScreenHowToPlay.cpp
+++ b/stepmania/src/ScreenHowToPlay.cpp
@@ -17,6 +17,7 @@
 #include "PlayerState.h"
 #include "Style.h"
 #include "ActorUtil.h"
+#include "PrefsManager.h"
 
 static const ThemeMetric<CString>		STEPFILE			("ScreenHowToPlay","Stepfile");
 static const ThemeMetric<int>			NUM_PERFECTS		("ScreenHowToPlay","NumPerfects");
diff --git a/stepmania/src/ScreenHowToPlay.h b/stepmania/src/ScreenHowToPlay.h
index acaf3b3ead..ba455dfb42 100644
--- a/stepmania/src/ScreenHowToPlay.h
+++ b/stepmania/src/ScreenHowToPlay.h
@@ -6,6 +6,7 @@
 #include "LifeMeterBar.h"
 #include "Character.h"
 #include "Model.h"
+#include "song.h"
 
 
 class ScreenHowToPlay : public ScreenAttract
diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp
index 036a422e22..fb6bca658e 100644
--- a/stepmania/src/ScreenJukebox.cpp
+++ b/stepmania/src/ScreenJukebox.cpp
@@ -17,6 +17,7 @@
 #include "PlayerState.h"
 #include "StatsManager.h"
 #include "CommonMetrics.h"
+#include "PrefsManager.h"
 
 #define SHOW_COURSE_MODIFIERS_PROBABILITY	THEME->GetMetricF(m_sName,"ShowCourseModifiersProbability")