diff --git a/stepmania/src/arch/arch.cpp b/stepmania/src/arch/arch.cpp
index 78c851c792..66c9d8c1c8 100644
--- a/stepmania/src/arch/arch.cpp
+++ b/stepmania/src/arch/arch.cpp
@@ -276,9 +276,6 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers)
 #ifdef USE_RAGE_SOUND_OSS
 		if(!DriversToTry[i].CompareNoCase("OSS"))		ret = new RageSound_OSS;
 #endif
-#ifdef USE_RAGE_SOUND_QT1
-		if(!DriversToTry[i].CompareNoCase("QT1"))		ret = new RageSound_QT1;
-#endif
 #ifdef USE_RAGE_SOUND_WAVE_OUT
 		if(!DriversToTry[i].CompareNoCase("WaveOut"))		ret = new RageSound_WaveOut;
 #endif
diff --git a/stepmania/src/arch/arch_default.h b/stepmania/src/arch/arch_default.h
index 8dfbc32071..48499fffce 100644
--- a/stepmania/src/arch/arch_default.h
+++ b/stepmania/src/arch/arch_default.h
@@ -11,12 +11,12 @@
 /* InputHandler drivers */
 #if defined (HAVE_XDK)
  #define DEFAULT_INPUT_DRIVER_LIST "Xbox"
-#elif defined(HAVE_DIRECTX) && !defined(HAVE_XDK)
+#elif defined(HAVE_DIRECTX)
  #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(MACOSX)
-# define DEFAULT_INPUT_DRIVER_LIST "Carbon,SDL"
+# define DEFAULT_INPUT_DRIVER_LIST "Carbon"
 #elif defined(HAVE_SDL)
  #define DEFAULT_INPUT_DRIVER_LIST "SDL"
 #elif defined(LINUX)
@@ -29,7 +29,7 @@
 #define DEFAULT_MOVIE_DRIVER_LIST "Theora,FFMpeg,DShow,Null"
 
 /* RageSoundDrivers */
-#define DEFAULT_SOUND_DRIVER_LIST "ALSA,DirectSound,ALSA-sw,DirectSound-sw,CoreAudio,OSS,QT1,WaveOut,Null"
+#define DEFAULT_SOUND_DRIVER_LIST "ALSA,DirectSound,ALSA-sw,DirectSound-sw,CoreAudio,OSS,WaveOut,Null"
 
 #endif