HAVE_WIN32 -> WINDOWS. HAVE_LINUXKERNEL -> LINUX. If some features originating in Linux work on other systems, then define them specifically (eg. HAVE_LINUX_JOYSTICKS).

stepmania/src/arch/ArchHooks/Selector_ArchHooks.h

@@ -10,7 +10,7 @@
 #elif defined(HAVE_UNIX)
 #include "ArchHooks_Unix.h"
 
-#elif defined(HAVE_WIN32) // XXX: Better name for this API?
+#elif defined(WINDOWS)
 #include "ArchHooks_Win32.h"
 
 #elif defined(HAVE_XDK)

stepmania/src/arch/Dialog/Selector_Dialog.h

@@ -4,7 +4,7 @@
 #include "arch/arch_platform.h"
 
 /* Dialog drivers selector. */
-#if defined(HAVE_WIN32)
+#if defined(WIN32)
 #include "DialogDriver_Win32.h"
 
 #elif defined(HAVE_COCOA)

stepmania/src/arch/InputHandler/Selector_InputHandler.h

@@ -8,7 +8,7 @@
 #include "InputHandler_DirectInput.h"
 #endif
 
-#ifdef HAVE_LINUXKERNEL
+#if defined(LINUX)
 #include "InputHandler_Linux_Joystick.h"
 #endif
 
@@ -23,7 +23,7 @@
 #include "InputHandler_SDL.h"
 #endif
 
-#ifdef HAVE_WIN32
+#if defined(WINDOWS)
 #include "InputHandler_Win32_Pump.h"
 #include "InputHandler_Win32_Para.h"
 #include "InputHandler_Win32_MIDI.h"

stepmania/src/arch/Lights/Selector_LightsDriver.h

@@ -4,10 +4,10 @@
 #include "arch/arch_platform.h"
 
 /* LightsDriver selector. */
-#ifdef HAVE_WIN32
+#if defined(WINDOWS)
 #include "LightsDriver_Win32Parallel.h"
 #endif
-#ifdef HAVE_LINUXKERNEL
+#if defined(LINUX)
 #include "LightsDriver_LinuxParallel.h"
 #include "LightsDriver_LinuxWeedTech.h"
 #endif

stepmania/src/arch/LoadingWindow/Selector_LoadingWindow.h

@@ -15,7 +15,7 @@
 #elif defined(HAVE_SDL)
 #include "LoadingWindow_SDL.h"
 
-#elif defined(HAVE_WIN32)
+#elif defined(WINDOWS)
 #include "LoadingWindow_Win32.h"
 
 #elif defined(HAVE_XDK)

stepmania/src/arch/LowLevelWindow/Selector_LowLevelWindow.h

@@ -2,9 +2,9 @@
 #define SELECTOR_LOW_LEVEL_WINDOW_H
 
 /* LowLevelWindow selector. */
-#if defined(HAVE_WIN32)
+#if defined(WINDOWS)
 #include "LowLevelWindow_Win32.h"
-#elif defined(HAVE_X11) // Prefer LLW_X11 over LLW_SDL
+#elif defined(HAVE_X11)
 #include "LowLevelWindow_X11.h"
 #elif defined(HAVE_SDL)
 #include "LowLevelWindow_SDL.h"

stepmania/src/arch/MemoryCard/Selector_MemoryCardDriver.h

@@ -4,9 +4,9 @@
 #include "arch/arch_platform.h"
 
 /* MemoryCardDriver selector. */
-#if defined(HAVE_LINUXKERNEL)
+#if defined(LINUX)
 #include "MemoryCardDriverThreaded_Linux.h"
-#elif defined(HAVE_WIN32)
+#elif defined(WINDOWS)
 #include "MemoryCardDriverThreaded_Windows.h"
 #endif
 

stepmania/src/arch/Sound/Selector_RageSoundDriver.h

@@ -24,7 +24,7 @@
 #include "RageSoundDriver_OSS.h"
 #endif
 
-#ifdef HAVE_WIN32
+#if defined(WIN32)
 #include "RageSoundDriver_WaveOut.h"
 #endif