diff --git a/stepmania/src/DualScrollBar.cpp b/stepmania/src/DualScrollBar.cpp
index adeceec517..b636aa2537 100644
--- a/stepmania/src/DualScrollBar.cpp
+++ b/stepmania/src/DualScrollBar.cpp
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "DualScrollBar.h"
 #include "ThemeManager.h"
+#include "RageUtil.h"
 
 DualScrollBar::DualScrollBar()
 {
diff --git a/stepmania/src/GhostArrow.cpp b/stepmania/src/GhostArrow.cpp
index 021c92dd19..5a44beac27 100644
--- a/stepmania/src/GhostArrow.cpp
+++ b/stepmania/src/GhostArrow.cpp
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "GhostArrow.h"
 #include "NoteSkinManager.h"
+#include "RageUtil.h"
 
 GhostArrow::GhostArrow()
 {
diff --git a/stepmania/src/MemoryCardDisplay.cpp b/stepmania/src/MemoryCardDisplay.cpp
index b8bfc676f7..9b4fe43c28 100644
--- a/stepmania/src/MemoryCardDisplay.cpp
+++ b/stepmania/src/MemoryCardDisplay.cpp
@@ -2,6 +2,7 @@
 #include "MemoryCardDisplay.h"
 #include "ThemeManager.h"
 #include "MemoryCardManager.h"
+#include "RageUtil.h"
 
 
 MemoryCardDisplay::MemoryCardDisplay()
diff --git a/stepmania/src/MusicSortDisplay.cpp b/stepmania/src/MusicSortDisplay.cpp
index d4e43c0f9b..e4f47da589 100644
--- a/stepmania/src/MusicSortDisplay.cpp
+++ b/stepmania/src/MusicSortDisplay.cpp
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "MusicSortDisplay.h"
 #include "ThemeManager.h"
+#include "RageUtil.h"
 
 
 MusicSortDisplay::MusicSortDisplay()
diff --git a/stepmania/src/OptionIcon.cpp b/stepmania/src/OptionIcon.cpp
index 5daab9d282..bc654847dd 100644
--- a/stepmania/src/OptionIcon.cpp
+++ b/stepmania/src/OptionIcon.cpp
@@ -2,6 +2,7 @@
 #include "OptionIcon.h"
 #include "ThemeManager.h"
 #include "PlayerOptions.h"
+#include "RageUtil.h"
 
 #define TEXT_OFFSET_X	THEME->GetMetricF("OptionIcon","TextOffsetX")
 #define TEXT_OFFSET_Y	THEME->GetMetricF("OptionIcon","TextOffsetY")
diff --git a/stepmania/src/ProTimingDisplay.cpp b/stepmania/src/ProTimingDisplay.cpp
index 95d9b22bc2..bb3fc51663 100644
--- a/stepmania/src/ProTimingDisplay.cpp
+++ b/stepmania/src/ProTimingDisplay.cpp
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "ProTimingDisplay.h"
 #include "ThemeManager.h"
+#include "RageUtil.h"
 
 static CachedThemeMetric	MARVELOUS_COMMAND	("ProTimingDisplay","MarvelousCommand");
 static CachedThemeMetric	PERFECT_COMMAND		("ProTimingDisplay","PerfectCommand");
diff --git a/stepmania/src/ScreenBranch.cpp b/stepmania/src/ScreenBranch.cpp
index 98fac2f332..56a3d9a11c 100644
--- a/stepmania/src/ScreenBranch.cpp
+++ b/stepmania/src/ScreenBranch.cpp
@@ -16,6 +16,7 @@
 #include "ThemeManager.h"
 #include "LuaHelpers.h"
 #include "ModeChoice.h"
+#include "RageUtil.h"
 
 #define CHOICES						THEME->GetMetric (m_sName,"Choices")
 #define CONDITION(choice)			THEME->GetMetric (m_sName,"Condition"+choice)
diff --git a/stepmania/src/ScreenTestSound.cpp b/stepmania/src/ScreenTestSound.cpp
index a38e526b0e..1d5f53969c 100644
--- a/stepmania/src/ScreenTestSound.cpp
+++ b/stepmania/src/ScreenTestSound.cpp
@@ -19,6 +19,7 @@
 #include "ScreenManager.h"
 #include "RageSoundManager.h"
 #include "ThemeManager.h"
+#include "RageUtil.h"
 
 ScreenTestSound::ScreenTestSound( CString sClassName ) : Screen( sClassName )
 {	
diff --git a/stepmania/src/ScrollBar.cpp b/stepmania/src/ScrollBar.cpp
index 5e127ddf11..7021a411ea 100644
--- a/stepmania/src/ScrollBar.cpp
+++ b/stepmania/src/ScrollBar.cpp
@@ -2,6 +2,7 @@
 #include "ScrollBar.h"
 #include "GameConstantsAndTypes.h"
 #include "ThemeManager.h"
+#include "RageUtil.h"
 
 
 ScrollBar::ScrollBar()