diff --git a/stepmania/src/arch/ArchHooks/ArchHooks.cpp b/stepmania/src/arch/ArchHooks/ArchHooks.cpp
index 9392dfd11b..8f8b6c073a 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks.cpp
+++ b/stepmania/src/arch/ArchHooks/ArchHooks.cpp
@@ -3,9 +3,9 @@
 #include "RageLog.h"
 #include "RageThreads.h"
 
-bool ArchHooks::s_bQuitting = false;
-bool ArchHooks::s_bToggleWindowed = false;
-static bool g_bHasFocus = true;
+bool ArchHooks::g_bQuitting = false;
+bool ArchHooks::g_bToggleWindowed = false;
+bool ArchHooks::g_bHasFocus = true;
 // Keep from pulling RageThreads.h into ArchHooks.h
 static RageMutex g_Mutex( "ArchHooks" );
 ArchHooks *HOOKS = NULL;
@@ -13,16 +13,16 @@ ArchHooks *HOOKS = NULL;
 bool ArchHooks::GetAndClearToggleWindowed()
 {
 	LockMut( g_Mutex );
-	bool bToggle = s_bToggleWindowed;
+	bool bToggle = g_bToggleWindowed;
 	
-	s_bToggleWindowed = false;
+	g_bToggleWindowed = false;
 	return bToggle;
 }
 
 void ArchHooks::SetToggleWindowed()
 {
 	LockMut( g_Mutex );
-	s_bToggleWindowed = true;
+	g_bToggleWindowed = true;
 }
 
 #include "Selector_ArchHooks.h"
diff --git a/stepmania/src/arch/ArchHooks/ArchHooks.h b/stepmania/src/arch/ArchHooks/ArchHooks.h
index b7d9eb08d5..a677bbab29 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks.h
+++ b/stepmania/src/arch/ArchHooks/ArchHooks.h
@@ -57,8 +57,8 @@ public:
 	/*
 	 * Returns true if the user wants to quit (eg. ^C, or clicked a "close window" button).
 	 */
-	static bool UserQuit() { return s_bQuitting; }
-	static void SetUserQuit() { s_bQuitting = true; }
+	static bool UserQuit() { return g_bQuitting; }
+	static void SetUserQuit() { g_bQuitting = true; }
 	
 	/*
 	 * Returns true if the user wants to toggle windowed mode and atomically clears
@@ -119,8 +119,9 @@ private:
 	static int64_t FixupTimeIfLooped( int64_t usecs );
 	static int64_t FixupTimeIfBackwards( int64_t usecs );
 
-	static bool s_bQuitting;
-	static bool s_bToggleWindowed;
+	static bool g_bQuitting;
+	static bool g_bToggleWindowed;
+	static bool g_bHasFocus;
 };
 
 #endif