diff --git a/stepmania/src/ExportStrings.cpp b/stepmania/src/ExportStrings.cpp
index 5677d84ba9..4a9a08d364 100644
--- a/stepmania/src/ExportStrings.cpp
+++ b/stepmania/src/ExportStrings.cpp
@@ -8,6 +8,7 @@
 #include "LuaManager.h"
 #include "ProductInfo.h"
 #include "DateTime.h"
+#include "Foreach.h"
 
 const RString INSTALLER_LANGUAGES_DIR = "Themes/_Installer/Languages/";
 
diff --git a/stepmania/src/LuaBinding.cpp b/stepmania/src/LuaBinding.cpp
index 5ad5bfcade..e7bda5b1f3 100644
--- a/stepmania/src/LuaBinding.cpp
+++ b/stepmania/src/LuaBinding.cpp
@@ -2,6 +2,7 @@
 #include "LuaBinding.h"
 #include "LuaReference.h"
 #include "RageUtil.h"
+#include "Foreach.h"
 
 #include "SubscriptionManager.h"
 static SubscriptionManager<LuaBinding> m_Subscribers;
diff --git a/stepmania/src/PlayerState.cpp b/stepmania/src/PlayerState.cpp
index 1d0f620867..4bc807eecc 100644
--- a/stepmania/src/PlayerState.cpp
+++ b/stepmania/src/PlayerState.cpp
@@ -2,6 +2,7 @@
 #include "PlayerState.h"
 #include "GameState.h"
 #include "RageLog.h"
+#include "Foreach.h"
 
 PlayerState::PlayerState()
 {
diff --git a/stepmania/src/Preference.cpp b/stepmania/src/Preference.cpp
index 36261616fb..383c6ae52b 100644
--- a/stepmania/src/Preference.cpp
+++ b/stepmania/src/Preference.cpp
@@ -5,6 +5,7 @@
 #include "LuaManager.h"
 #include "MessageManager.h"
 #include "SubscriptionManager.h"
+#include "Foreach.h"
 
 static SubscriptionManager<IPreference> m_Subscribers;
 
diff --git a/stepmania/src/RageInputDevice.cpp b/stepmania/src/RageInputDevice.cpp
index aa453b466d..3bee33a07e 100644
--- a/stepmania/src/RageInputDevice.cpp
+++ b/stepmania/src/RageInputDevice.cpp
@@ -6,7 +6,7 @@
 #include "global.h"
 #include "RageInputDevice.h"
 #include "RageUtil.h"
-#include "EnumHelper.h"
+#include "Foreach.h"
 
 static map<DeviceButton,RString> g_mapNamesToString;
 static map<RString,DeviceButton> g_mapStringToNames;
diff --git a/stepmania/src/RageLog.cpp b/stepmania/src/RageLog.cpp
index a8ff4ffa1c..6ea8a0d143 100644
--- a/stepmania/src/RageLog.cpp
+++ b/stepmania/src/RageLog.cpp
@@ -4,6 +4,7 @@
 #include "RageTimer.h"
 #include "RageFile.h"
 #include "RageThreads.h"
+#include "Foreach.h"
 
 #include <ctime>
 #if defined(_WINDOWS)
diff --git a/stepmania/src/RageUtil.h b/stepmania/src/RageUtil.h
index b59d0ae794..a45574f188 100644
--- a/stepmania/src/RageUtil.h
+++ b/stepmania/src/RageUtil.h
@@ -5,7 +5,6 @@
 
 #include <map>
 #include <vector>
-#include "Foreach.h"
 class RageFileDriver;
 
 #define SAFE_DELETE(p)       do { delete (p);     (p)=NULL; } while( false )
diff --git a/stepmania/src/Workout.cpp b/stepmania/src/Workout.cpp
index dc78a1d2f1..4a98ea37a6 100644
--- a/stepmania/src/Workout.cpp
+++ b/stepmania/src/Workout.cpp
@@ -7,6 +7,7 @@
 #include "XmlFile.h"
 #include "XmlFileUtil.h"
 #include "Course.h"
+#include "Foreach.h"
 
 static const char *WorkoutProgramNames[] = {
 	"FatBurn",
diff --git a/stepmania/src/WorkoutGraph.cpp b/stepmania/src/WorkoutGraph.cpp
index 259c477a71..bb7cf700c3 100644
--- a/stepmania/src/WorkoutGraph.cpp
+++ b/stepmania/src/WorkoutGraph.cpp
@@ -10,6 +10,7 @@
 #include "Workout.h"
 #include "WorkoutManager.h"
 #include "StatsManager.h"
+#include "Foreach.h"
 
 const int MAX_METERS_TO_SHOW = Workout::GetEstimatedNumSongsFromSeconds( 90 * 60 );
 
diff --git a/stepmania/src/XmlFileUtil.cpp b/stepmania/src/XmlFileUtil.cpp
index ecdd8c6042..34ddb775a2 100644
--- a/stepmania/src/XmlFileUtil.cpp
+++ b/stepmania/src/XmlFileUtil.cpp
@@ -6,6 +6,7 @@
 #include "RageUtil.h"
 #include "RageLog.h"
 #include "arch/Dialog/Dialog.h"
+#include "Foreach.h"
 
 bool XmlFileUtil::LoadFromFileShowErrors( XNode &xml, RageFileBasic &f )
 {
diff --git a/stepmania/src/archutils/Darwin/JoystickDevice.cpp b/stepmania/src/archutils/Darwin/JoystickDevice.cpp
index 24169bcdd1..3fc559d166 100644
--- a/stepmania/src/archutils/Darwin/JoystickDevice.cpp
+++ b/stepmania/src/archutils/Darwin/JoystickDevice.cpp
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "JoystickDevice.h"
 #include "RageUtil.h"
+#include "Foreach.h"
 
 using namespace std;
 using __gnu_cxx::hash_map;