diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.h b/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.h
index f33e5a11a6..d0da21bbec 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.h
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.h
@@ -9,7 +9,7 @@
  *
  */
 
-#include "LoadingWindow_Null.h"
+#include "LoadingWindow.h"
 
 extern void MakeNewCocoaWindow();
 extern void DisposeOfCocoaWindow();
@@ -25,7 +25,6 @@ public:
 	void SetText(CString str) { SetCocoaWindowText(str.c_str()); }
 };
 
-#undef ARCH_LOADING_WINDOW
-#define ARCH_LOADING_WINDOW LoadingWindow_Cocoa
+#define HAVE_LOADING_WINDOW_COCOA
 
 #endif /* LOADING_WINDOW_COCOA */
diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Null.h b/stepmania/src/arch/LoadingWindow/LoadingWindow_Null.h
index 9db3f08f57..ff56b36407 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Null.h
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Null.h
@@ -13,8 +13,7 @@ public:
 	void Paint() { }
 };
 
-#undef ARCH_LOADING_WINDOW
-#define ARCH_LOADING_WINDOW LoadingWindow_Null
+#define HAVE_LOADING_WINDOW_NULL
 
 #endif
 
diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.h b/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.h
index d49d47615a..f0dbfa7c1e 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.h
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.h
@@ -14,8 +14,7 @@ public:
 	void Paint();
 };
 
-#undef ARCH_LOADING_WINDOW
-#define ARCH_LOADING_WINDOW LoadingWindow_SDL
+#define HAVE_LOADING_WINDOW_NULL
 
 #endif
 
diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.h b/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.h
index 4d8ca33668..0a00ba2f16 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.h
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.h
@@ -22,8 +22,7 @@ public:
 	void Paint();
 };
 
-#undef ARCH_LOADING_WINDOW
-#define ARCH_LOADING_WINDOW LoadingWindow_Win32
+#define HAVE_LOADING_WINDOW_WIN32
 
 #endif