diff --git a/stepmania/src/arch/arch.cpp b/stepmania/src/arch/arch.cpp
index df86df4e1c..beaea7ca0c 100644
--- a/stepmania/src/arch/arch.cpp
+++ b/stepmania/src/arch/arch.cpp
@@ -68,7 +68,7 @@ void MakeInputHandlers(vector<InputHandler *> &Add)
 	Add.push_back(new InputHandler_Win32_Pump);
 //	Add.push_back(new InputHandler_Win32_Para);
 #elif defined(_XBOX)
-	// Add.push_back(new InputHandler_DInput);
+	Add.push_back(new InputHandler_Xbox);
 #endif
 
 #if defined(SUPPORT_SDL_INPUT)
diff --git a/stepmania/src/arch/arch_xbox.h b/stepmania/src/arch/arch_xbox.h
index 2fa6fe2efc..91ffcfd9a2 100644
--- a/stepmania/src/arch/arch_xbox.h
+++ b/stepmania/src/arch/arch_xbox.h
@@ -7,12 +7,15 @@
 
 #include "ArchHooks/ArchHooks_Xbox.h"
 
+#include "InputHandler/InputHandler_Xbox.h"
+
 /* Err, is SDL input working on Xbox?  arch_default comments indicated no.
  * (Best to use a custom driver for threaded input, anyway.) */
 /* I believe it is working, and it's the only thing we depend on SDL for.
  * I'll write an InputHandler so we can ditch the SDLXbox mess. -Chris */
 #include "InputHandler/InputHandler_SDL.h"
 
+
 #include "Sound/RageSoundDriver_DSound.h"
 
 /* Undef this if you need no SDL input. */