diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp
index f68a8ed577..c9a3f03305 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 #include "ArchHooks_Win32.h"
 
 #include "archutils/win32/tls.h"
diff --git a/stepmania/src/arch/ErrorDialog/ErrorDialog_Win32.cpp b/stepmania/src/arch/ErrorDialog/ErrorDialog_Win32.cpp
index 24d1def7ff..1a3fe28c8c 100644
--- a/stepmania/src/arch/ErrorDialog/ErrorDialog_Win32.cpp
+++ b/stepmania/src/arch/ErrorDialog/ErrorDialog_Win32.cpp
@@ -1,4 +1,4 @@
-#include "../../stdafx.h"
+#include "../../global.h"
 #include "../../RageUtil.h"
 #include "../../resource.h"
 
diff --git a/stepmania/src/arch/ErrorDialog/ErrorDialog_stdout.cpp b/stepmania/src/arch/ErrorDialog/ErrorDialog_stdout.cpp
index 59393ce071..fcd4be9ff2 100644
--- a/stepmania/src/arch/ErrorDialog/ErrorDialog_stdout.cpp
+++ b/stepmania/src/arch/ErrorDialog/ErrorDialog_stdout.cpp
@@ -1,4 +1,4 @@
-#include "../../stdafx.h"
+#include "../../global.h"
 #include "ErrorDialog_stdout.h"
 
 void ErrorDialog_stdout::ShowError()
diff --git a/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp b/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp
index 07acc04706..03574e7a54 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp
+++ b/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 #include "InputHandler_Win32_Pump.h"
 
 #include "RageLog.h"
diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp b/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp
index 5198aaea92..b9daad93b4 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp
@@ -1,4 +1,4 @@
-#include "../../stdafx.h"
+#include "../../global.h"
 
 #include "SDL_image.h"
 #include "LoadingWindow_SDL.h"
diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.cpp b/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.cpp
index c5e275903b..93ca5465d9 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.cpp
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.cpp
@@ -1,4 +1,4 @@
-#include "../../stdafx.h"
+#include "../../global.h"
 #include "../../RageUtil.h"
 
 #include "LoadingWindow_Win32.h"
diff --git a/stepmania/src/arch/Sound/DSoundHelpers.cpp b/stepmania/src/arch/Sound/DSoundHelpers.cpp
index 63028612b6..c45482d857 100644
--- a/stepmania/src/arch/Sound/DSoundHelpers.cpp
+++ b/stepmania/src/arch/Sound/DSoundHelpers.cpp
@@ -1,4 +1,4 @@
-#include "../../stdafx.h"
+#include "../../global.h"
 #include "DSoundHelpers.h"
 #include "../../RageUtil.h"
 #include "../../RageLog.h"
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp b/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp
index 12e04967d7..847a15c038 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp
@@ -3,7 +3,7 @@
  * Each sound gets its own stream, which allows for very little startup
  * latency for each sound and lower CPU usage. */
 
-#include "stdafx.h"
+#include "global.h"
 #include "RageSoundDriver_DSound.h"
 #include "DSoundHelpers.h"
 
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
index c28c407cff..51c49a6265 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 #include "RageSoundDriver_DSound_Software.h"
 #include "DSoundHelpers.h"
 
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
index 7b783f8fdf..1896c2866b 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 #include "RageSoundDriver_WaveOut.h"
 
 #pragma comment(lib, "winmm.lib")
diff --git a/stepmania/src/arch/arch.cpp b/stepmania/src/arch/arch.cpp
index 8ac0392a7e..c581f95d83 100644
--- a/stepmania/src/arch/arch.cpp
+++ b/stepmania/src/arch/arch.cpp
@@ -2,11 +2,11 @@
  * This file provides functions to create driver objects.
  */
 
-#include "../stdafx.h"
-#include "../RageLog.h"
-#include "../RageUtil.h"
+#include "global.h"
+#include "RageLog.h"
+#include "RageUtil.h"
 
-#include "../PrefsManager.h"
+#include "PrefsManager.h"
 #include "arch.h"
 
 /* Load default drivers. */