diff --git a/stepmania/src/AnnouncerManager.h b/stepmania/src/AnnouncerManager.h
index 741e4b393b..f55707a228 100644
--- a/stepmania/src/AnnouncerManager.h
+++ b/stepmania/src/AnnouncerManager.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ANNOUNCER_MANAGER_H
+#define ANNOUNCER_MANAGER_H
 /*
 -----------------------------------------------------------------------------
  Class: AnnouncerManager
@@ -36,4 +37,5 @@ protected:
 
 
 extern AnnouncerManager*	ANNOUNCER;	// global and accessable from anywhere in our program
-	
\ No newline at end of file
+	
+#endif
diff --git a/stepmania/src/ArrowEffects.h b/stepmania/src/ArrowEffects.h
index e1b5fb5607..3a938b8f36 100644
--- a/stepmania/src/ArrowEffects.h
+++ b/stepmania/src/ArrowEffects.h
@@ -1,4 +1,6 @@
-#pragma once
+#ifndef ARROWEFFECTS_H
+#define ARROWEFFECTS_H
+
 /*
 -----------------------------------------------------------------------------
  File: ArrowEffects.h
@@ -51,3 +53,4 @@ float ArrowGetAlpha( PlayerNumber pn, float fYPos, float fPercentFadeToFail );
 //	ArrowAppearance.
 float ArrowGetGlow( PlayerNumber pn, float fYPos, float fPercentFadeToFail );
 
+#endif
diff --git a/stepmania/src/StdString.h b/stepmania/src/StdString.h
index a39bb47f3e..6763e22d46 100644
--- a/stepmania/src/StdString.h
+++ b/stepmania/src/StdString.h
@@ -244,13 +244,11 @@
 //				http://home.earthlink.net/~jmoleary
 // =============================================================================
 
-// Avoid multiple inclusion the VC++ way,
 // Turn off browser references
 // Turn off unavoidable compiler warnings
 
 
 #if defined(_MSC_VER) && (_MSC_VER > 1100)
-	#pragma once
 	#pragma component(browser, off, references, "CStdString")
 	#pragma warning (push)
 	#pragma warning (disable : 4290) // C++ Exception Specification ignored