diff --git a/stepmania/src/arch/ArchHooks/Selector_ArchHooks.h b/stepmania/src/arch/ArchHooks/Selector_ArchHooks.h
index ca97528469..fc39ec152a 100644
--- a/stepmania/src/arch/ArchHooks/Selector_ArchHooks.h
+++ b/stepmania/src/arch/ArchHooks/Selector_ArchHooks.h
@@ -13,7 +13,7 @@
 #elif defined(HAVE_WIN32) // XXX: Better name for this API?
 #include "ArchHooks_Win32.h"
 
-#elif defined(HAVE_XBOX) // XXX: Better name for this API?
+#elif defined(HAVE_XDK)
 #include "ArchHooks_Xbox.h"
 
 #else
diff --git a/stepmania/src/arch/InputHandler/Selector_InputHandler.h b/stepmania/src/arch/InputHandler/Selector_InputHandler.h
index 19064e7d85..921e9ad588 100644
--- a/stepmania/src/arch/InputHandler/Selector_InputHandler.h
+++ b/stepmania/src/arch/InputHandler/Selector_InputHandler.h
@@ -4,7 +4,7 @@
 #include "arch/arch_platform.h"
 
 /* InputHandler drivers selector. */
-#if defined(HAVE_DIRECTX) && !defined(XBOX)
+#if defined(HAVE_DIRECTX) && !defined(HAVE_XDK)
 #include "InputHandler_DirectInput.h"
 #endif
 
@@ -29,7 +29,7 @@
 #include "InputHandler_Win32_MIDI.h"
 #endif
 
-#ifdef HAVE_XBOX
+#ifdef HAVE_XDK
 #include "InputHandler_Xbox.h"
 #endif
 
diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
index ae501742cb..325dec5634 100644
--- a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+++ b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
@@ -24,7 +24,7 @@ namespace avcodec
 #endif
 };
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(XBOX)
 	#pragma comment(lib, "ffmpeg/lib/avcodec.lib")
 	#pragma comment(lib, "ffmpeg/lib/avformat.lib")
 #endif
diff --git a/stepmania/src/arch/MovieTexture/Selector_MovieTexture.h b/stepmania/src/arch/MovieTexture/Selector_MovieTexture.h
index da57b55288..cd3773d358 100644
--- a/stepmania/src/arch/MovieTexture/Selector_MovieTexture.h
+++ b/stepmania/src/arch/MovieTexture/Selector_MovieTexture.h
@@ -4,7 +4,7 @@
 #include "arch/arch_platform.h"
 
 /* MovieTexture driver selector. */
-#if defined(HAVE_DIRECTX) && !defined(HAVE_XBOX)
+#if defined(HAVE_DIRECTX) && !defined(HAVE_XDK)
 #include "MovieTexture_DShow.h"
 #endif
 
diff --git a/stepmania/src/arch/arch_default.h b/stepmania/src/arch/arch_default.h
index 8a887348b8..38abaa199c 100644
--- a/stepmania/src/arch/arch_default.h
+++ b/stepmania/src/arch/arch_default.h
@@ -9,9 +9,9 @@
  * InputHandler_SDL to be used.) */
 
 /* InputHandler drivers */
-#if defined (HAVE_XBOX)
+#if defined (HAVE_XDK)
  #define DEFAULT_INPUT_DRIVER_LIST "Xbox"
-#elif defined(HAVE_DIRECTX)
+#elif defined(HAVE_DIRECTX) && !defined(HAVE_XDK)
  #define DEFAULT_INPUT_DRIVER_LIST "DirectInput,Pump,Para"
 #elif defined(HAVE_X11) // Prefer X11 over SDL
  #define DEFAULT_INPUT_DRIVER_LIST "X11,Joystick"
diff --git a/stepmania/src/arch/arch_platform.h b/stepmania/src/arch/arch_platform.h
index 3611fb7b2b..66b7cdc74e 100644
--- a/stepmania/src/arch/arch_platform.h
+++ b/stepmania/src/arch/arch_platform.h
@@ -21,7 +21,7 @@
 #endif
 #if defined(_XBOX)
 #define HAVE_DIRECTX
-#define HAVE_XBOX // XXX: Better name for this API?
+#define HAVE_XDK
 #endif
 #if defined(LINUX)
 #define HAVE_UNIX	// Here just to be explicit.