diff --git a/stepmania/src/RageSoundManager.cpp b/stepmania/src/RageSoundManager.cpp
index b1558dbe48..26578407af 100644
--- a/stepmania/src/RageSoundManager.cpp
+++ b/stepmania/src/RageSoundManager.cpp
@@ -12,7 +12,7 @@
 #include "arch/arch.h"
 #include "arch/Sound/RageSoundDriver.h"
 
-#if defined(WIN32)
+#if defined(_MSC_VER) && _MSC_VER >= 1300 
 set<void *> g_ProtectedPages;
 void EnableWrites()
 {
@@ -335,7 +335,8 @@ void RageSoundManager::GetCopies( RageSound &snd, vector<RageSound *> &snds, boo
 
 	g_SoundManMutex.Lock(); /* lock for access to all_sounds */
 	set<RageSound *> sounds;
-	sounds.insert( all_sounds.begin(), all_sounds.end() );
+	for( all_sounds_type::iterator iter = all_sounds.begin(); iter != all_sounds.end(); ++iter )
+		sounds.insert( *iter );
 	g_SoundManMutex.Unlock(); /* finished with all_sounds */
 	
 	RageSound *parent = snd.GetOriginal();
diff --git a/stepmania/src/RageSoundManager.h b/stepmania/src/RageSoundManager.h
index 1e20816ecd..53890ed560 100644
--- a/stepmania/src/RageSoundManager.h
+++ b/stepmania/src/RageSoundManager.h
@@ -11,7 +11,7 @@ class RageSoundDriver;
 struct RageSoundParams;
 
 /* This is a temporary hack, to try to track down an obscure crash. */
-#if defined(WIN32)
+#if defined(_MSC_VER) && _MSC_VER >= 1300 
 #include <windows.h>
 
 extern set<void *> g_ProtectedPages;