diff --git a/stepmania/src/arch/ArchHooks/Selector_ArchHooks.h b/stepmania/src/arch/ArchHooks/Selector_ArchHooks.h
index f56c35c068..de91661360 100644
--- a/stepmania/src/arch/ArchHooks/Selector_ArchHooks.h
+++ b/stepmania/src/arch/ArchHooks/Selector_ArchHooks.h
@@ -4,7 +4,7 @@
 #include "arch/arch_platform.h"
 
 /* ArchHooks driver selector. */
-#if defined(HAVE_MACOSX)
+#if defined(__MACOSX__)
 #include "ArchHooks_darwin.h"
 
 #elif defined(UNIX)
diff --git a/stepmania/src/arch/Dialog/Selector_Dialog.h b/stepmania/src/arch/Dialog/Selector_Dialog.h
index 6a013bd059..aa08f72e8b 100644
--- a/stepmania/src/arch/Dialog/Selector_Dialog.h
+++ b/stepmania/src/arch/Dialog/Selector_Dialog.h
@@ -7,7 +7,7 @@
 #if defined(WIN32)
 #include "DialogDriver_Win32.h"
 
-#elif defined(HAVE_COCOA)
+#elif defined(__MACOSX__)
 #include "DialogDriver_Cocoa.h"
 #endif
 
diff --git a/stepmania/src/arch/InputHandler/Selector_InputHandler.h b/stepmania/src/arch/InputHandler/Selector_InputHandler.h
index d649d0c2b2..e6aeb1f3d1 100644
--- a/stepmania/src/arch/InputHandler/Selector_InputHandler.h
+++ b/stepmania/src/arch/InputHandler/Selector_InputHandler.h
@@ -17,7 +17,7 @@
 // NOTE: If X11 is available, we don't use LLW_SDL, which IH_SDL depends on.
 #if defined(HAVE_X11)
 #include "InputHandler_X11.h"
-#elif defined(HAVE_CARBON)
+#elif defined(__MACOSX__)
 #include "InputHandler_Carbon.h"
 #elif defined(HAVE_SDL)
 #include "InputHandler_SDL.h"
diff --git a/stepmania/src/arch/LoadingWindow/Selector_LoadingWindow.h b/stepmania/src/arch/LoadingWindow/Selector_LoadingWindow.h
index c39891a44f..0e9ff74a31 100644
--- a/stepmania/src/arch/LoadingWindow/Selector_LoadingWindow.h
+++ b/stepmania/src/arch/LoadingWindow/Selector_LoadingWindow.h
@@ -6,7 +6,7 @@
 /* LoadingWindow driver selector. */
 #include "LoadingWindow_Null.h"
 
-#if defined(HAVE_COCOA)
+#if defined(__MACOSX__)
 #include "LoadingWindow_Cocoa.h"
 
 #elif defined(HAVE_GTK)
diff --git a/stepmania/src/arch/Sound/Selector_RageSoundDriver.h b/stepmania/src/arch/Sound/Selector_RageSoundDriver.h
index c5f4437b6d..5c61c0a439 100644
--- a/stepmania/src/arch/Sound/Selector_RageSoundDriver.h
+++ b/stepmania/src/arch/Sound/Selector_RageSoundDriver.h
@@ -9,7 +9,7 @@
 #include "RageSoundDriver_ALSA9_Software.h"
 #endif
 
-#ifdef HAVE_COREAUDIO
+#if defined(__MACOSX__)
 #include "RageSoundDriver_CA.h"
 #endif
 
diff --git a/stepmania/src/arch/arch_default.h b/stepmania/src/arch/arch_default.h
index 21979eb9c3..c5d824a7bc 100644
--- a/stepmania/src/arch/arch_default.h
+++ b/stepmania/src/arch/arch_default.h
@@ -15,8 +15,8 @@
  #define DEFAULT_INPUT_DRIVER_LIST "DirectInput,Pump,Para"
 #elif defined(HAVE_X11) // Prefer X11 over SDL
  #define DEFAULT_INPUT_DRIVER_LIST "X11,Joystick"
-#elif defined(HAVE_CARBON)
-# define DEFAULT_INPUT_DRIVER_LIST "Carbon"
+#elif defined(__MACOSX__)
+# define DEFAULT_INPUT_DRIVER_LIST "Carbon,SDL"
 #elif defined(HAVE_SDL)
  #define DEFAULT_INPUT_DRIVER_LIST "SDL"
 #elif defined(LINUX)
diff --git a/stepmania/src/arch/arch_platform.h b/stepmania/src/arch/arch_platform.h
index cf3e128aac..1eb1a2d215 100644
--- a/stepmania/src/arch/arch_platform.h
+++ b/stepmania/src/arch/arch_platform.h
@@ -3,14 +3,6 @@
 
 // In here, you define which APIs are guaranteed to be available on which OSes.
 // Don't ever actually #include anything here -- that's for */Selector_*.h.
-#if defined(__MACOSX__)
-#define HAVE_MACOSX
-#define HAVE_COCOA
-#define HAVE_COREAUDIO
-#define HAVE_CARBON
-#define HAVE_SDL
-#define HAVE_CRYPTOPP
-#endif
 #if defined(_WINDOWS)
 #define HAVE_DIRECTX
 #define HAVE_FFMPEG
diff --git a/stepmania/src/archutils/Darwin/arch_setup.h b/stepmania/src/archutils/Darwin/arch_setup.h
index 8d14a3bef3..14fdb3b2da 100644
--- a/stepmania/src/archutils/Darwin/arch_setup.h
+++ b/stepmania/src/archutils/Darwin/arch_setup.h
@@ -1,21 +1,27 @@
 #ifndef ARCH_SETUP_DARWIN_H
 #define ARCH_SETUP_DARWIN_H
 
-typedef unsigned char 	   UInt8;
-typedef unsigned short 	   UInt16;
-typedef unsigned long 	   UInt32;
+typedef unsigned char      UInt8;
+typedef signed char        SInt8;
+typedef unsigned short     UInt16;
+typedef signed short       SInt16;
+typedef unsigned long      UInt32;
+typedef signed long        SInt32;
+typedef signed long long   SInt64;
 typedef unsigned long long UInt64;
-#define __TYPES__
+
+#define __MACTYPES__
 #include <libkern/OSByteOrder.h>
-#undef __TYPES__
+#undef __MACTYPES__
 #define BACKTRACE_LOOKUP_METHOD_DARWIN_DYLD
 #define BACKTRACE_METHOD_POWERPC_DARWIN
 #define HAVE_VERSION_INFO
 #define HAVE_CXA_DEMANGLE
+#define HAVE_CRYPTOPP
+#define HAVE_THEORA
 #define HAVE_FFMPEG
 #define HAVE_SDL
 #define CRASH_HANDLER
-#define HAVE_THEORA
 // Looking ahead to "Universal binaries."
 #ifdef __BIG_ENDIAN__
 # define ENDIAN_BIG