diff --git a/stepmania/src/RageInput.cpp b/stepmania/src/RageInput.cpp
index 2120d12a9f..e98e1c258d 100644
--- a/stepmania/src/RageInput.cpp
+++ b/stepmania/src/RageInput.cpp
@@ -13,6 +13,7 @@
 #include "RageInput.h"
 #include "RageLog.h"
 #include "RageException.h"
+#include "arch/arch.h"
 #include "arch/InputHandler/InputHandler.h"
 
 RageInput*		INPUTMAN	= NULL;		// globally accessable input device
diff --git a/stepmania/src/RageInput.h b/stepmania/src/RageInput.h
index bde00cd15d..b02fa92850 100644
--- a/stepmania/src/RageInput.h
+++ b/stepmania/src/RageInput.h
@@ -9,9 +9,8 @@
 */
 
 #include "RageInputDevice.h"
-#include "SDL_utils.h"
-#include "arch/arch.h"
 
+class InputHandler;
 class RageInput
 {
 	vector<InputHandler *> Devices;