diff --git a/stepmania/src/LuaManager.cpp b/stepmania/src/LuaManager.cpp
index 1b5a3c6dc3..ccd2d31620 100644
--- a/stepmania/src/LuaManager.cpp
+++ b/stepmania/src/LuaManager.cpp
@@ -21,7 +21,7 @@ void foo()
 LuaManager *LUA = NULL;
 static LuaFunctionList *g_LuaFunctions = NULL;
 
-#if defined(_WINDOWS)
+#if defined(_MSC_VER)
 	#pragma comment(lib, "lua-5.0/lib/LibLua.lib")
 	#pragma comment(lib, "lua-5.0/lib/LibLuaLib.lib")
 #endif
@@ -29,7 +29,7 @@ static LuaFunctionList *g_LuaFunctions = NULL;
 	#pragma comment(lib, "lua-5.0/lib/LibLuaXbox.lib")
 	#pragma comment(lib, "lua-5.0/lib/LibLuaLibXbox.lib")
 #endif
-#if defined(_WINDOWS) || defined (_XBOX)
+#if defined(_MSC_VER) || defined (_XBOX)
 	/* "interaction between '_setjmp' and C++ object destruction is non-portable"
 	 * We don't care; we'll throw a fatal exception immediately anyway. */
 	#pragma warning (disable : 4611)
diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp
index 2342444902..b89e73d070 100644
--- a/stepmania/src/Profile.cpp
+++ b/stepmania/src/Profile.cpp
@@ -41,7 +41,7 @@ const CString COMMON_XSL	= "Common.xsl";
 
 #define MAX_DISPLAY_NAME_LENGTH 12
 
-#if defined(WIN32)
+#if defined(_MSC_VER)
 #pragma warning (disable : 4706) // assignment within conditional expression
 #endif
 
diff --git a/stepmania/src/RageDisplay_D3D.cpp b/stepmania/src/RageDisplay_D3D.cpp
index 0dc39f6040..fc5b789493 100644
--- a/stepmania/src/RageDisplay_D3D.cpp
+++ b/stepmania/src/RageDisplay_D3D.cpp
@@ -31,7 +31,7 @@
 
 // Static libraries
 // load Windows D3D8 dynamically
-#if defined(_WINDOWS)
+#if defined(_MSC_VER)
 	#pragma comment(lib, "D3dx8.lib")
 	#pragma comment(lib, "Dxerr8.lib")
 #endif
diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp
index bcc40a61f8..780534d949 100644
--- a/stepmania/src/RageDisplay_OGL.cpp
+++ b/stepmania/src/RageDisplay_OGL.cpp
@@ -58,7 +58,7 @@
 
 #include "arch/arch.h"
 
-#ifdef WIN32
+#if defined(_MSC_VER)
 #pragma comment(lib, "opengl32.lib")
 #pragma comment(lib, "glu32.lib")
 #endif
diff --git a/stepmania/src/RageFileDriverDeflate.cpp b/stepmania/src/RageFileDriverDeflate.cpp
index b1ef8d6161..44287cf3d4 100644
--- a/stepmania/src/RageFileDriverDeflate.cpp
+++ b/stepmania/src/RageFileDriverDeflate.cpp
@@ -5,7 +5,7 @@
 #include "RageLog.h"
 #include "RageUtil.h"
 
-#if defined(_WINDOWS) || defined(_XBOX)
+#if defined(_MSC_VER) || defined(_XBOX)
         #include "zlib/zlib.h"
         #pragma comment(lib, "zlib/zdll.lib")
 #elif defined(DARWIN)
diff --git a/stepmania/src/RageSoundReader_MP3.cpp b/stepmania/src/RageSoundReader_MP3.cpp
index d113980397..0a92f91416 100644
--- a/stepmania/src/RageSoundReader_MP3.cpp
+++ b/stepmania/src/RageSoundReader_MP3.cpp
@@ -8,7 +8,7 @@
 #include <cstdio>
 #include <cerrno>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #include "mad-0.15.1b/mad.h"
 #ifdef _XBOX
 #ifdef _DEBUG
diff --git a/stepmania/src/RageSoundReader_Resample_Good.cpp b/stepmania/src/RageSoundReader_Resample_Good.cpp
index 914a14b3e6..090965e7a6 100644
--- a/stepmania/src/RageSoundReader_Resample_Good.cpp
+++ b/stepmania/src/RageSoundReader_Resample_Good.cpp
@@ -4,7 +4,7 @@
 #include "RageSoundReader_Resample_Good.h"
 
 #include "libresample/include/libresample.h"
-#ifdef _WINDOWS
+#if defined(_MSC_VER)
 #pragma comment(lib, "libresample/resample.lib")
 #endif
 
diff --git a/stepmania/src/RageSoundReader_Vorbisfile.cpp b/stepmania/src/RageSoundReader_Vorbisfile.cpp
index 71e66c82eb..e9df2a2bdb 100644
--- a/stepmania/src/RageSoundReader_Vorbisfile.cpp
+++ b/stepmania/src/RageSoundReader_Vorbisfile.cpp
@@ -20,7 +20,7 @@
 #pragma comment(lib, "vorbis/xbox/vorbis_static.lib")
 #pragma comment(lib, "vorbis/xbox/vorbisfile_static.lib")
 #endif
-#elif defined(_WINDOWS)
+#elif defined(_MSC_VER)
 #pragma comment(lib, "vorbis/win32/ogg_static.lib")
 #pragma comment(lib, "vorbis/win32/vorbis_static.lib")
 #pragma comment(lib, "vorbis/win32/vorbisfile_static.lib")
diff --git a/stepmania/src/RageSurface_Load_JPEG.cpp b/stepmania/src/RageSurface_Load_JPEG.cpp
index 738671519b..df9016383e 100644
--- a/stepmania/src/RageSurface_Load_JPEG.cpp
+++ b/stepmania/src/RageSurface_Load_JPEG.cpp
@@ -19,11 +19,13 @@
 #include "libjpeg/jpeglib.h"
 #include "libjpeg/jerror.h"
 
+#if defined(_MSC_VER)
 #if !defined(XBOX)
 #pragma comment(lib, "libjpeg/jpeg.lib")
 #else
 #pragma comment(lib, "libjpeg/xboxjpeg.lib")
 #endif
+#endif
 
 #pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */
 #else
diff --git a/stepmania/src/RageSurface_Load_PNG.cpp b/stepmania/src/RageSurface_Load_PNG.cpp
index 8655858056..ddbef32b0b 100644
--- a/stepmania/src/RageSurface_Load_PNG.cpp
+++ b/stepmania/src/RageSurface_Load_PNG.cpp
@@ -5,12 +5,13 @@
 #include "RageFile.h"
 #include "RageSurface.h"
 
-#if defined(WIN32)
+
+#if defined(_MSC_VER)
 #  include "libpng/include/png.h"
-#  if defined(_WINDOWS)
+#  if defined(XBOX) 
+#    pragma comment(lib, "libpng/lib/xboxlibpng.lib")
+#  else
 #    pragma comment(lib, "libpng/lib/libpng.lib")
-#  elif defined(XBOX)
-#	 pragma comment(lib, "libpng/lib/xboxlibpng.lib")
 #  endif
 #  pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */
 #else
diff --git a/stepmania/src/RageSurface_Save_JPEG.cpp b/stepmania/src/RageSurface_Save_JPEG.cpp
index 212da10875..097ce7ee20 100644
--- a/stepmania/src/RageSurface_Save_JPEG.cpp
+++ b/stepmania/src/RageSurface_Save_JPEG.cpp
@@ -18,7 +18,7 @@ namespace jpeg
 /* Pull in JPEG library here. */
 #ifdef _XBOX
 #pragma comment(lib, "libjpeg/xboxjpeg.lib")
-#elif defined _WINDOWS
+#elif defined _MSC_VER
 #pragma comment(lib, "libjpeg/jpeg.lib")
 #endif
 
diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp
index 46923e419a..12c9f83dde 100644
--- a/stepmania/src/RageUtil.cpp
+++ b/stepmania/src/RageUtil.cpp
@@ -222,12 +222,15 @@ CString vssprintf( const char *fmt, va_list argList)
 }
 
 #ifdef WIN32
+
 #ifdef _XBOX
-#include <D3DX8Core.h>
+#  include <D3DX8Core.h>
 #else
-#include <windows.h>
-#include <dxerr8.h>
-#pragma comment(lib, "dxerr8.lib")
+#  include <windows.h>
+#  include <dxerr8.h>
+#  if defined(_MSC_VER)
+#    pragma comment(lib, "dxerr8.lib")
+#  endif
 #endif
 
 CString hr_ssprintf( int hr, const char *fmt, ...)
diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp
index 95afa9f863..61a94d04ac 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp
@@ -15,7 +15,9 @@
 #include "archutils/win32/WindowsResources.h"
 
 #include <mmsystem.h>
+#if defined(_MSC_VER)
 #pragma comment(lib, "winmm.lib") // for timeGetTime
+#endif
 
 ArchHooks_Win32::ArchHooks_Win32()
 {
diff --git a/stepmania/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp b/stepmania/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp
index 9a4fee6644..7fe4918bfe 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp
+++ b/stepmania/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp
@@ -5,10 +5,12 @@
 #include "StepMania.h"
 #include "archutils/Win32/GraphicsWindow.h"
 
+#if defined(_MSC_VER)
 #pragma comment(lib, "dinput.lib")
 #if defined(_WINDOWS)
 #pragma comment(lib, "dxguid.lib")
 #endif
+#endif
 LPDIRECTINPUT dinput = NULL;
 
 static int ConvertScancodeToKey( int scancode );
diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp
index 7e6f4570be..40317edbdb 100644
--- a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp
+++ b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp
@@ -1,5 +1,6 @@
 #include "global.h"
 
+#if defined(_MSC_VER)
 /* XXX register thread */
 #pragma comment(lib, "winmm.lib") 
  
@@ -9,6 +10,7 @@
 #else
 	#pragma comment(lib, "baseclasses/release/strmbase.lib") 
 #endif
+#endif
 
 #include "MovieTexture_DShowHelper.h"
 #include "MovieTexture_DShow.h"
@@ -22,7 +24,9 @@
 #include "arch/Dialog/Dialog.h"
 
 #include <vfw.h> /* for GetVideoCodecDebugInfo */
+#if defined(_MSC_VER)
 #pragma comment(lib, "vfw32.lib")
+#endif
 
 static CString FourCCToString(int fcc)
 {
diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
index 0a8cf5be42..4f90b7c543 100644
--- a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+++ b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
@@ -24,7 +24,7 @@ namespace avcodec
 #endif
 };
 
-#if defined(_WIN32)
+#if defined(_MSC_VER)
 	#pragma comment(lib, "ffmpeg/lib/avcodec.lib")
 	#pragma comment(lib, "ffmpeg/lib/avformat.lib")
 #endif
diff --git a/stepmania/src/arch/Sound/DSoundHelpers.cpp b/stepmania/src/arch/Sound/DSoundHelpers.cpp
index 728aad4782..a44b288638 100644
--- a/stepmania/src/arch/Sound/DSoundHelpers.cpp
+++ b/stepmania/src/arch/Sound/DSoundHelpers.cpp
@@ -10,7 +10,9 @@
 #define DIRECTSOUND_VERSION 0x0700
 #include <dsound.h>
 
+#if defined(_MSC_VER)
 #pragma comment(lib, "dsound.lib")
+#endif
 
 BOOL CALLBACK DSound::EnumCallback( LPGUID lpGuid, LPCSTR lpcstrDescription, LPCSTR lpcstrModule, LPVOID lpContext )
 {
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
index f012e3a203..07cb0c1e67 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
@@ -1,7 +1,9 @@
 #include "global.h"
 #include "RageSoundDriver_WaveOut.h"
 
+#if defined(_MSC_VER)
 #pragma comment(lib, "winmm.lib")
+#endif
 
 #include "RageTimer.h"
 #include "RageLog.h"
diff --git a/stepmania/src/archutils/Win32/Crash.cpp b/stepmania/src/archutils/Win32/Crash.cpp
index e370c04984..f84f68577c 100644
--- a/stepmania/src/archutils/Win32/Crash.cpp
+++ b/stepmania/src/archutils/Win32/Crash.cpp
@@ -575,7 +575,9 @@ long VDDebugInfoLookupRVA(VDDebugInfoContext *pctx, unsigned rva, char *buf, int
 
 ///////////////////////////////////////////////////////////////////////////
 #include "archutils/Win32/ddk/dbghelp.h"
+#if defined(_MSC_VER)
 #pragma comment(lib, "archutils/Win32/ddk/dbghelp.lib")
+#endif
 
 static bool InitDbghelp()
 {
diff --git a/stepmania/src/archutils/Win32/GetFileInformation.cpp b/stepmania/src/archutils/Win32/GetFileInformation.cpp
index 8bfa2a5dea..9a35e82500 100644
--- a/stepmania/src/archutils/Win32/GetFileInformation.cpp
+++ b/stepmania/src/archutils/Win32/GetFileInformation.cpp
@@ -6,7 +6,9 @@
 #include <windows.h>
 #include <tlhelp32.h>
 
+#if defined(_MSC_VER)
 #pragma comment(lib, "version.lib")
+#endif
 
 bool GetFileVersion( CString fn, CString &out )
 {
diff --git a/stepmania/src/archutils/Win32/USB.cpp b/stepmania/src/archutils/Win32/USB.cpp
index 5da80fb321..b4519f7e86 100644
--- a/stepmania/src/archutils/Win32/USB.cpp
+++ b/stepmania/src/archutils/Win32/USB.cpp
@@ -3,8 +3,10 @@
 #include "RageLog.h"
 #include "RageUtil.h"
 
+#if defined(_MSC_VER)
 #pragma comment(lib, "archutils/Win32/ddk/setupapi.lib") 
 #pragma comment(lib, "archutils/Win32/ddk/hid.lib") 
+#endif
 
 extern "C" {
 #include "archutils/Win32/ddk/setupapi.h"
diff --git a/stepmania/src/archutils/Win32/arch_setup.h b/stepmania/src/archutils/Win32/arch_setup.h
index 70b4e10d52..ac62ce87f0 100644
--- a/stepmania/src/archutils/Win32/arch_setup.h
+++ b/stepmania/src/archutils/Win32/arch_setup.h
@@ -57,6 +57,7 @@ typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
 static inline int64_t llabs( int64_t i ) { return i >= 0? i: -i; }
 
+#if defined(_MSC_VER)
 #pragma warning (disable : 4201) // nonstandard extension used : nameless struct/union (Windows headers do this)
 #pragma warning (disable : 4786) // turn off broken debugger warning
 #pragma warning (disable : 4512) // assignment operator could not be generated (so?)
@@ -71,6 +72,7 @@ static inline int64_t llabs( int64_t i ) { return i >= 0? i: -i; }
 #pragma warning (disable : 4063)
 #pragma warning (disable : 4127)
 #pragma warning (disable : 4786) /* VC6: identifier was truncated to '255' characters in the debug information */
+#endif
 
 #undef min
 #undef max
diff --git a/stepmania/src/crypto/CryptBn.cpp b/stepmania/src/crypto/CryptBn.cpp
index 9b4e77e8fd..61c6ab111c 100644
--- a/stepmania/src/crypto/CryptBn.cpp
+++ b/stepmania/src/crypto/CryptBn.cpp
@@ -5,7 +5,7 @@
 #include "global.h"
 #include "CryptBn.h"
 
-#if defined(WIN32)
+#if defined(_MSC_VER)
 #pragma warning (disable : 4244) // conversion from 'int' to 'BignumInt', possible loss of data
 #endif
 
diff --git a/stepmania/src/crypto51/config.h b/stepmania/src/crypto51/config.h
index 59c2ef305b..4e84cecb7c 100644
--- a/stepmania/src/crypto51/config.h
+++ b/stepmania/src/crypto51/config.h
@@ -4,7 +4,7 @@
 // ***************** Important Settings ********************
 
 #include "global.h"
-#if defined(WIN32)
+#if defined(_MSC_VER)
 #pragma warning (disable : 4244) // conversion ... possible loss of data
 #pragma warning (disable : 4516) // access-declarations are deprecated
 #pragma warning (disable : 4511) // copy constructor could not be generated
diff --git a/stepmania/src/ezsockets.cpp b/stepmania/src/ezsockets.cpp
index eec4fe5d69..075e2f8efa 100644
--- a/stepmania/src/ezsockets.cpp
+++ b/stepmania/src/ezsockets.cpp
@@ -9,7 +9,7 @@
 #include "ezsockets.h"
 
 #if defined(_XBOX)
-#elif defined(_WINDOWS) // We need the WinSock32 Library on Windows
+#elif defined(_MSC_VER) // We need the WinSock32 Library on Windows
 #pragma comment(lib,"wsock32.lib")
 #else
 #include <sys/types.h>
diff --git a/stepmania/src/pcre/internal.h b/stepmania/src/pcre/internal.h
index e22b096a68..8006230921 100644
--- a/stepmania/src/pcre/internal.h
+++ b/stepmania/src/pcre/internal.h
@@ -47,7 +47,7 @@ modules, but which are not relevant to the outside. */
 #define POSIX_MALLOC_THRESHOLD 10
 #define EXPORT
 
-#if defined(_WINDOWS)
+#if defined(_MSC_VER)
 #pragma warning( disable : 4244 )
 #endif