diff --git a/stepmania/src/RageInput.cpp b/stepmania/src/RageInput.cpp
index 73fe42b08d..ec9a57680b 100644
--- a/stepmania/src/RageInput.cpp
+++ b/stepmania/src/RageInput.cpp
@@ -34,6 +34,19 @@ static const char *PumpButtonNames[] = {
 	"P2 UL", "P2 UR", "P2 MID", "P2 DL", "P2 DR"
 };
 
+struct RageInput::pump_t
+{
+	HANDLE h;
+	OVERLAPPED ov;
+	long buf;
+	bool pending;
+
+	pump_t();
+	~pump_t();
+	bool init(int devno);
+	int GetPadEvent();
+};
+
 int DeviceInput::NumButtons(InputDevice device)
 {
 	switch( device )
@@ -383,7 +396,6 @@ void RageInput::Update( float fDeltaTime )
 
 }
 
-
 bool RageInput::BeingPressed( DeviceInput di, bool bPrevState )
 {
 	switch( di.device )
diff --git a/stepmania/src/RageInput.h b/stepmania/src/RageInput.h
index 4684de4938..294d2e6c39 100644
--- a/stepmania/src/RageInput.h
+++ b/stepmania/src/RageInput.h
@@ -98,17 +98,8 @@ class RageInput
 	} m_pumpState[NUM_PUMPS], m_oldPumpState[NUM_PUMPS];
 
 	/* Structure for reading Pump pads: */
-	struct pump_t {
-		HANDLE h;
-		OVERLAPPED ov;
-		long buf;
-		bool pending;
-
-		pump_t();
-		~pump_t();
-		bool init(int devno);
-		int GetPadEvent();
-	} *m_Pumps;
+	struct pump_t;
+	pump_t *m_Pumps;
 
 public:
 	RageInput();