diff --git a/stepmania/src/arch/InputHandler/InputHandler_DirectInput.h b/stepmania/src/arch/InputHandler/InputHandler_DirectInput.h
index 75f049e1e2..1a9a381e14 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_DirectInput.h
+++ b/stepmania/src/arch/InputHandler/InputHandler_DirectInput.h
@@ -7,6 +7,14 @@
 struct DIDevice;
 class InputHandler_DInput: public InputHandler
 {
+public:
+	InputHandler_DInput();
+	~InputHandler_DInput();
+	void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
+	void Update(float fDeltaTime);
+	void WindowReset();
+
+private:
 	RageThread InputThread;
 	bool shutdown;
 
@@ -19,13 +27,6 @@ class InputHandler_DInput: public InputHandler
 
 	void StartThread();
 	void ShutdownThread();
-
-public:
-	InputHandler_DInput();
-	~InputHandler_DInput();
-	void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
-	void Update(float fDeltaTime);
-	void WindowReset();
 };
 #define USE_INPUT_HANDLER_DIRECTINPUT
 
diff --git a/stepmania/src/arch/InputHandler/InputHandler_MonkeyKeyboard.h b/stepmania/src/arch/InputHandler/InputHandler_MonkeyKeyboard.h
index 08102845c2..5a0fd9dd16 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_MonkeyKeyboard.h
+++ b/stepmania/src/arch/InputHandler/InputHandler_MonkeyKeyboard.h
@@ -1,5 +1,5 @@
 #ifndef INPUT_HANDLER_MONKEY_SCRIPT
-#define INPUT_HANDLER_MONKEY_SCRIPT 1
+#define INPUT_HANDLER_MONKEY_SCRIPT
 
 #include "InputHandler.h"
 #include "RageTimer.h"
@@ -7,14 +7,15 @@
 
 class InputHandler_MonkeyKeyboard: public InputHandler
 {
-	RageTimer m_timerPressButton;
-	DeviceInput m_diLast;	// Last input that we sent
-
 public:
 	void Update(float fDeltaTime);
 	InputHandler_MonkeyKeyboard();
 	~InputHandler_MonkeyKeyboard();
 	void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
+
+private:
+	RageTimer m_timerPressButton;
+	DeviceInput m_diLast;	// Last input that we sent
 };
 #define USE_INPUT_HANDLER_MONKEY_KEYBOARD
 
diff --git a/stepmania/src/arch/InputHandler/InputHandler_Win32_MIDI.h b/stepmania/src/arch/InputHandler/InputHandler_Win32_MIDI.h
index d3b803908d..fd0d34823d 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_Win32_MIDI.h
+++ b/stepmania/src/arch/InputHandler/InputHandler_Win32_MIDI.h
@@ -10,10 +10,11 @@ public:
 	InputHandler_Win32_MIDI();
 	~InputHandler_Win32_MIDI();
 
-	void Update(float fDeltaTime);
-	void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
+	void Update( float fDeltaTime );
+	void GetDevicesAndDescriptions( vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut );
 
 	void SetDev( DeviceInput key, bool pressed ) { ButtonPressed( key, pressed ); }
+
 private:
 	bool m_bFoundDevice;
 };
diff --git a/stepmania/src/arch/InputHandler/InputHandler_Win32_Para.h b/stepmania/src/arch/InputHandler/InputHandler_Win32_Para.h
index 16051b5479..3c096f17dd 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_Win32_Para.h
+++ b/stepmania/src/arch/InputHandler/InputHandler_Win32_Para.h
@@ -1,5 +1,5 @@
 #ifndef INPUT_HANDLER_WIN32_PARA_H
-#define INPUT_HANDLER_WIN32_PARA_H 1
+#define INPUT_HANDLER_WIN32_PARA_H
 
 #include "InputHandler.h"
 #include "RageThreads.h"
@@ -7,6 +7,13 @@
 class USBDevice;
 class InputHandler_Win32_Para: public InputHandler
 {
+public:
+	void Update(float fDeltaTime);
+	InputHandler_Win32_Para();
+	~InputHandler_Win32_Para();
+	void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
+
+private:
 	USBDevice *dev;
 	RageThread InputThread;
 	bool shutdown;
@@ -14,13 +21,6 @@ class InputHandler_Win32_Para: public InputHandler
 	static int InputThread_Start( void *p );
 	void InputThreadMain();
 	void HandleInput( int devno, int event );
-
-
-public:
-	void Update(float fDeltaTime);
-	InputHandler_Win32_Para();
-	~InputHandler_Win32_Para();
-	void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
 };
 #define USE_INPUT_HANDLER_WIN32_PARA
 
diff --git a/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.h b/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.h
index 4cf9508abc..d5603dc64c 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.h
+++ b/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.h
@@ -1,5 +1,5 @@
 #ifndef INPUT_HANDLER_WIN32_PUMP_H
-#define INPUT_HANDLER_WIN32_PUMP_H 1
+#define INPUT_HANDLER_WIN32_PUMP_H
 
 #include "InputHandler.h"
 #include "RageThreads.h"
@@ -7,6 +7,13 @@
 class USBDevice;
 class InputHandler_Win32_Pump: public InputHandler
 {
+public:
+	void Update(float fDeltaTime);
+	InputHandler_Win32_Pump();
+	~InputHandler_Win32_Pump();
+	void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
+
+private:
 	USBDevice *dev;
 	RageThread InputThread;
 	bool shutdown;
@@ -14,13 +21,6 @@ class InputHandler_Win32_Pump: public InputHandler
 	static int InputThread_Start( void *p );
 	void InputThreadMain();
 	void HandleInput( int devno, int event );
-
-
-public:
-	void Update(float fDeltaTime);
-	InputHandler_Win32_Pump();
-	~InputHandler_Win32_Pump();
-	void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
 };
 #define USE_INPUT_HANDLER_WIN32_PUMP