diff --git a/stepmania/PBProject/SMMain.mm b/stepmania/PBProject/SMMain.mm
index 6d135b5352..5f3c9e6c05 100755
--- a/stepmania/PBProject/SMMain.mm
+++ b/stepmania/PBProject/SMMain.mm
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 #include "ProductInfo.h"
-#include "GameLoop.h"
+#include "arch/ArchHooks/ArchHooks.h"
 
 // XXX remove this
 extern "C"
@@ -29,7 +29,7 @@ extern "C"
 // Invoked from the Quit menu item.
 - (void)terminate:(id)sender
 {
-    ExitGame();
+    ArchHooks::SetUserQuit();
 }
 
 - (void)sendEvent:(NSEvent *)event
diff --git a/stepmania/src/ScreenExit.cpp b/stepmania/src/ScreenExit.cpp
index 0c2f97ea45..57fd9833bf 100644
--- a/stepmania/src/ScreenExit.cpp
+++ b/stepmania/src/ScreenExit.cpp
@@ -5,7 +5,7 @@
 #include "GameSoundManager.h"
 #include "RageSound.h"
 #include "RageLog.h"
-#include "GameLoop.h"
+#include "arch/ArchHooks/ArchHooks.h"
 
 /* This screen used to wait for sounds to stop.  However, implementing GetPlayingSounds()
  * is annoying, because sounds might be deleted at any time; they aren't ours to have
@@ -20,7 +20,7 @@ void ScreenExit::Init()
 {
 	m_Exited = false;
 
-	ExitGame();
+	ArchHooks::SetUserQuit();
 
 	/* It'd be better for any previous screen playing music to fade it out as it fades
 	 * out the screen.  XXX: Check to see if it's fading out; if it'll stop playing in
@@ -58,7 +58,7 @@ void ScreenExit::Update( float fDelta )
 	{
 		m_Exited = true;
 		LOG->Trace("ScreenExit: shutting down");
-		ExitGame();
+		ArchHooks::SetUserQuit();
 	}
 #endif
 }
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 5b241117ad..616da58ba9 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -1299,7 +1299,7 @@ bool HandleGlobalInputs( const InputEventPlus &input )
 			INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LALT)) )
 		{
 			// pressed Alt+F4
-			ExitGame();
+			ArchHooks::SetUserQuit();
 			return true;
 		}
 	}
diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp
index 5063763253..61e2cf5e48 100644
--- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp
+++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp
@@ -4,7 +4,7 @@
 #include "RageLog.h"
 #include "RageDisplay.h" // for REFRESH_DEFAULT
 #include "StepMania.h"
-#include "GameLoop.h"
+#include "arch/ArchHooks/ArchHooks.h"
 #include "DisplayResolutions.h"
 
 #if defined(MACOSX)
@@ -220,7 +220,7 @@ void LowLevelWindow_SDL::Update()
 			break;
 		case SDL_QUIT:
 			LOG->Trace("SDL_QUIT: shutting down");
-			ExitGame();
+			ArchHooks::SetUserQuit();
 			break;
 		}
 	}