diff --git a/stepmania/src/ProfileManager.cpp b/stepmania/src/ProfileManager.cpp
index d2327b6626..32eeffd8ab 100644
--- a/stepmania/src/ProfileManager.cpp
+++ b/stepmania/src/ProfileManager.cpp
@@ -20,6 +20,10 @@
 #include "SongManager.h"
 #include "GameState.h"
 
+#ifdef _WINDOWS
+#include "windows.h"
+#endif
+
 ProfileManager*	PROFILEMAN = NULL;	// global and accessable from anywhere in our program
 
 
diff --git a/stepmania/src/RageLog.cpp b/stepmania/src/RageLog.cpp
index f3a1d34a11..a058477074 100644
--- a/stepmania/src/RageLog.cpp
+++ b/stepmania/src/RageLog.cpp
@@ -19,6 +19,9 @@
 #include "RageFile.h"
 #include <time.h>
 #include "ProductInfo.h"
+#if defined(WIN32) && !defined(_XBOX)
+#include "windows.h"
+#endif
 
 RageLog* LOG;		// global and accessable from anywhere in the program
 
diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp
index ad844340b0..6089169da2 100644
--- a/stepmania/src/RageUtil.cpp
+++ b/stepmania/src/RageUtil.cpp
@@ -147,6 +147,7 @@ CString vssprintf( const char *fmt, va_list argList)
 }
 
 #ifdef WIN32
+#include "windows.h"
 #ifdef _XBOX
 #include "D3DX8Core.h"
 #else
diff --git a/stepmania/src/RageUtil_CharConversions.cpp b/stepmania/src/RageUtil_CharConversions.cpp
index 613bf39f5c..4a1a992467 100644
--- a/stepmania/src/RageUtil_CharConversions.cpp
+++ b/stepmania/src/RageUtil_CharConversions.cpp
@@ -6,6 +6,8 @@
 
 #if defined(_WINDOWS)
 
+#include "windows.h"
+
 /* Convert from the given codepage to UTF-8.  Return true if successful. */
 static bool CodePageConvert(CString &txt, int cp)
 {
diff --git a/stepmania/src/RageUtil_FileDB.cpp b/stepmania/src/RageUtil_FileDB.cpp
index a96233faa2..2f98d3f968 100644
--- a/stepmania/src/RageUtil_FileDB.cpp
+++ b/stepmania/src/RageUtil_FileDB.cpp
@@ -15,6 +15,8 @@
 #if !defined(WIN32)
 #include <dirent.h>
 #include <fcntl.h>
+#else
+#include "windows.h"
 #endif
 
 
diff --git a/stepmania/src/StepMania.h b/stepmania/src/StepMania.h
index a9bf85a879..da61f7012e 100644
--- a/stepmania/src/StepMania.h
+++ b/stepmania/src/StepMania.h
@@ -22,6 +22,7 @@ void SaveGamePrefsToDisk();
 void ChangeCurrentGame( Game g );
 
 #if defined(WIN32)
+#include "windows.h"
 extern HWND g_hWndMain;
 #endif
 
diff --git a/stepmania/src/arch/Sound/DSoundHelpers.cpp b/stepmania/src/arch/Sound/DSoundHelpers.cpp
index 6999efb4dc..6a5d9a4ece 100644
--- a/stepmania/src/arch/Sound/DSoundHelpers.cpp
+++ b/stepmania/src/arch/Sound/DSoundHelpers.cpp
@@ -3,6 +3,7 @@
 #include "../../RageUtil.h"
 #include "../../RageLog.h"
 
+#include <mmsystem.h>
 #define DIRECTSOUND_VERSION 0x0700
 #include <dsound.h>
 
diff --git a/stepmania/src/arch/Sound/DSoundHelpers.h b/stepmania/src/arch/Sound/DSoundHelpers.h
index 85388326d0..e03271e454 100644
--- a/stepmania/src/arch/Sound/DSoundHelpers.h
+++ b/stepmania/src/arch/Sound/DSoundHelpers.h
@@ -2,6 +2,7 @@
 #define DSOUND_HELPERS 1
 
 #include "SDL.h"
+#include "windows.h"
 
 struct IDirectSound;
 struct IDirectSoundBuffer;
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h
index f71e62a21a..b866324d17 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h
@@ -3,6 +3,7 @@
 
 #include "RageSoundDriver.h"
 #include "RageThreads.h"
+#include "windows.h"
 #include "Mmsystem.h"
 
 class RageSound_WaveOut: public RageSoundDriver
diff --git a/stepmania/src/archutils/Win32/AppInstance.h b/stepmania/src/archutils/Win32/AppInstance.h
index 2fde54c53f..3a269c2baa 100644
--- a/stepmania/src/archutils/Win32/AppInstance.h
+++ b/stepmania/src/archutils/Win32/AppInstance.h
@@ -1,6 +1,8 @@
 #ifndef APP_INSTANCE_H
 #define APP_INSTANCE_H
 
+#include "windows.h"
+
 /* Win32 only: get an HINSTANCE; used for starting dialog boxes. */
 class AppInstance
 {
diff --git a/stepmania/src/archutils/Win32/DebugInfoHunt.cpp b/stepmania/src/archutils/Win32/DebugInfoHunt.cpp
index 75fa888609..1c59dbe413 100644
--- a/stepmania/src/archutils/Win32/DebugInfoHunt.cpp
+++ b/stepmania/src/archutils/Win32/DebugInfoHunt.cpp
@@ -3,6 +3,8 @@
 #include "RageLog.h"
 #include "RageUtil.h"
 #include "VideoDriverInfo.h"
+#include "windows.h"
+#include <mmsystem.h>
 
 
 void LogVideoDriverInfo( VideoDriverInfo info )
diff --git a/stepmania/src/archutils/Win32/GotoURL.cpp b/stepmania/src/archutils/Win32/GotoURL.cpp
index 3b6b02d75c..cf2b7efdfc 100644
--- a/stepmania/src/archutils/Win32/GotoURL.cpp
+++ b/stepmania/src/archutils/Win32/GotoURL.cpp
@@ -1,5 +1,7 @@
 #include "global.h"
 #include "GotoURL.h"
+#include "windows.h"
+#include "shellapi.h"
 
 LONG GetRegKey(HKEY key, CString subkey, LPTSTR retdata)
 {
@@ -37,11 +39,11 @@ bool GotoURL(CString url)
 	if (GetRegKey(HKEY_CLASSES_ROOT,key,key) != ERROR_SUCCESS)
 		return false;
 
-	char *pos = _tcsstr(key, "\"%1\"");
+	char *pos = strstr( key, "\"%1\"" );
 	if (pos == NULL)
 	{
 		// No quotes found.  Check for %1 without quotes
-		pos = strstr(key, _T("%1"));
+		pos = strstr( key, "%1" );
 		if (pos == NULL)                   
 			pos = key+lstrlen(key)-1; // No parameter.
 		else
diff --git a/stepmania/src/archutils/Win32/RestartProgram.cpp b/stepmania/src/archutils/Win32/RestartProgram.cpp
index acff6b9c92..cdfec8ff6d 100644
--- a/stepmania/src/archutils/Win32/RestartProgram.cpp
+++ b/stepmania/src/archutils/Win32/RestartProgram.cpp
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "RestartProgram.h"
+#include "windows.h"
 
 void Win32RestartProgram()
 {
diff --git a/stepmania/src/archutils/Win32/USB.cpp b/stepmania/src/archutils/Win32/USB.cpp
index c96a48d2b5..c9394bc973 100644
--- a/stepmania/src/archutils/Win32/USB.cpp
+++ b/stepmania/src/archutils/Win32/USB.cpp
@@ -9,10 +9,7 @@
 extern "C" {
 #include "ddk/setupapi.h"
 /* Quiet header warning: */
-#pragma warning( push )
-#pragma warning (disable : 4201)
 #include "ddk/hidsdi.h"
-#pragma warning( pop )
 }
 
 static CString GetUSBDevicePath (int num)
diff --git a/stepmania/src/archutils/Win32/USB.h b/stepmania/src/archutils/Win32/USB.h
index 10769dddca..5024d502cf 100644
--- a/stepmania/src/archutils/Win32/USB.h
+++ b/stepmania/src/archutils/Win32/USB.h
@@ -2,6 +2,7 @@
 #define WIN32_USB_H
 
 #include <vector>
+#include "windows.h"
 
 /* The API for Windows device I/O is obscenely horrible, so encapsulate it. */
 class WindowsFileIO
diff --git a/stepmania/src/archutils/Win32/VideoDriverInfo.cpp b/stepmania/src/archutils/Win32/VideoDriverInfo.cpp
index 14e7c60f71..989f10767d 100644
--- a/stepmania/src/archutils/Win32/VideoDriverInfo.cpp
+++ b/stepmania/src/archutils/Win32/VideoDriverInfo.cpp
@@ -2,6 +2,7 @@
 #include "VideoDriverInfo.h"
 #include "RageUtil.h"
 #include "RageLog.h"
+#include "windows.h"
 
 static void GetRegSubKeys( HKEY hKey, vector<CString> &lst )
 {