diff --git a/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp b/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp
index 72cd4b0530..569b8776c6 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp
+++ b/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp
@@ -10,13 +10,10 @@
 #include "archutils/Win32/AppInstance.h"
 #include "InputFilter.h"
 #include "PrefsManager.h"
+#include "archutils/win32/tls.h"
 
 #include "InputHandler_DirectInputHelper.h"
 
-/*extern "C" {
-extern HINSTANCE __declspec(dllimport) SDL_Instance;
-};*/
-
 static vector<DIDevice> Devices;
 
 /* Number of joysticks found: */
@@ -432,6 +429,8 @@ void InputHandler_DInput::Update(float fDeltaTime)
 
 void InputHandler_DInput::InputThread()
 {
+	InitThreadData("DirectInput thread");
+	VDCHECKPOINT;
 	if(!SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST))
 		LOG->Warn(werr_ssprintf(GetLastError(), "Failed to set DirectInput thread priority"));
 
diff --git a/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp b/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp
index 3d34f87e10..d8361eeff2 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp
+++ b/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp
@@ -5,6 +5,7 @@
 #include "RageLog.h"
 #include "RageInputDevice.h"
 #include "archutils/Win32/USB.h"
+#include "archutils/win32/tls.h"
 
 InputHandler_Win32_Pump::InputHandler_Win32_Pump()
 {
@@ -85,6 +86,9 @@ int InputHandler_Win32_Pump::InputThread_Start( void *p )
 
 void InputHandler_Win32_Pump::InputThread()
 {
+	InitThreadData("Pump thread");
+	VDCHECKPOINT;
+
 	vector<WindowsFileIO *> sources;
 	int i;
 	for(i = 0; i < NUM_PUMPS; ++i)
@@ -95,15 +99,18 @@ void InputHandler_Win32_Pump::InputThread()
 
 	while(!shutdown)
 	{
+		VDCHECKPOINT;
 		int actual = 0, val = 0;
 		int ret = WindowsFileIO::read_several(sources, &val, actual, 0.100f);
 
+		VDCHECKPOINT;
 		if(ret <= 0) 
 			continue; /* no event */
 
 		HandleInput( actual, val );
 		InputHandler::UpdateTimer();
 	}
+	VDCHECKPOINT;
 }
 
 void InputHandler_Win32_Pump::Update(float fDeltaTime)