diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index c1f2ce4a01..f4f36b7465 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -15,6 +15,7 @@
 #include "GameManager.h"
 #include "GameState.h"
 #include "RageLog.h"
+#include "InputFilter.h"
 
 
 InputMapper*	INPUTMAPPER = NULL;	// global and accessable from anywhere in our program
@@ -266,7 +267,7 @@ bool InputMapper::IsButtonDown( GameInput GameI )
 
 		if( GameToDevice( GameI, i, DeviceI ) )
 		{
-			if( INPUTMAN->IsBeingPressed( DeviceI ) )
+			if( INPUTFILTER->IsBeingPressed( DeviceI ) )
 				return true;
 		}
 	}
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index f283b42103..4af41f31c1 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -20,6 +20,7 @@
 #include "GameConstantsAndTypes.h"
 #include "RageLog.h"
 #include "GameState.h"
+#include "InputFilter.h"
 
 
 //
@@ -476,7 +477,7 @@ void ScreenEdit::DrawPrimitives()
 	m_textHelp.Draw();
 	m_textInfo.Draw();
 	m_Fade.Draw();
-	if( INPUTMAN->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD,DIK_F1) ) )
+	if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD,DIK_F1) ) )
 	{
 		m_rectShortcutsBack.Draw();
 		m_textShortcuts.Draw();
@@ -708,7 +709,7 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
 			{
 				const DeviceInput di(DEVICE_KEYBOARD, DIK_1+col);
 
-				if( !INPUTMAN->IsBeingPressed(di) )
+				if( !INPUTFILTER->IsBeingPressed(di) )
 					continue;
 
 				// create a new hold note
@@ -719,8 +720,8 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
 				m_NoteFieldEdit.AddHoldNote( newHN );
 			}
 
-			if( INPUTMAN->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, DIK_LSHIFT)) ||
-				INPUTMAN->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, DIK_RSHIFT)))
+			if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, DIK_LSHIFT)) ||
+				INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, DIK_RSHIFT)))
 			{
 				/* Shift is being held. 
 				 *
@@ -1099,8 +1100,8 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
 			case IET_FAST_REPEAT:	fDelta *= 40;	break;
 			}
 
-			if( INPUTMAN->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, DIK_LSHIFT)) ||
-				INPUTMAN->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, DIK_RSHIFT)))
+			if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, DIK_LSHIFT)) ||
+				INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, DIK_RSHIFT)))
 			{
 				m_pSong->m_fMusicSampleLengthSeconds += fDelta;
 				m_pSong->m_fMusicSampleLengthSeconds = max(m_pSong->m_fMusicSampleLengthSeconds,0);
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 65072a23b4..a7bb7184f4 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -824,9 +824,9 @@ void Update()
 	//if( fDeltaTime > 0.050f )	// we dropped a bunch of frames
 	// 	fDeltaTime = 0.050f;
 	
-	if( INPUTMAN->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, DIK_TAB) ) )
+	if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, DIK_TAB) ) )
 		fDeltaTime *= 4;
-	if( INPUTMAN->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, DIK_GRAVE) ) )
+	if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, DIK_GRAVE) ) )
 		fDeltaTime /= 4;