diff --git a/stepmania/src/arch/arch.cpp b/stepmania/src/arch/arch.cpp
index 34fca9643e..aa52671ac0 100644
--- a/stepmania/src/arch/arch.cpp
+++ b/stepmania/src/arch/arch.cpp
@@ -28,7 +28,11 @@ LowLevelWindow *MakeLowLevelWindow() { return new ARCH_LOW_LEVEL_WINDOW; }
 
 void MakeInputHandlers(vector<InputHandler *> &Add)
 {
+#if defined(WIN32) && !defined(_XBOX)
+	Add.push_back(new InputHandler_DInput);
+#else
 	Add.push_back(new InputHandler_SDL);
+#endif
 
 #if defined(WIN32)
 	Add.push_back(new InputHandler_Win32_Pump);
diff --git a/stepmania/src/arch/arch_Win32.h b/stepmania/src/arch/arch_Win32.h
index ac3568abd3..b62aa69d42 100644
--- a/stepmania/src/arch/arch_Win32.h
+++ b/stepmania/src/arch/arch_Win32.h
@@ -6,6 +6,7 @@
 #include "ErrorDialog/ErrorDialog_Win32.h"
 #include "ArchHooks/ArchHooks_Win32.h"
 
+#include "InputHandler/InputHandler_DirectInput.h"
 #include "InputHandler/InputHandler_Win32_Pump.h"
 // #include "InputHandler/InputHandler_Win32_Para.h"