diff --git a/stepmania/src/EnumHelper.h b/stepmania/src/EnumHelper.h
index 286ce6e024..710da063eb 100644
--- a/stepmania/src/EnumHelper.h
+++ b/stepmania/src/EnumHelper.h
@@ -3,6 +3,7 @@
 
 #include "LuaReference.h"
 #include "RageUtil.h"
+#include <memory>
 
 extern "C"
 {
diff --git a/stepmania/src/RageFileDriverDeflate.cpp b/stepmania/src/RageFileDriverDeflate.cpp
index 4dfeeacdf9..7fc5e9af44 100644
--- a/stepmania/src/RageFileDriverDeflate.cpp
+++ b/stepmania/src/RageFileDriverDeflate.cpp
@@ -4,6 +4,7 @@
 #include "RageFile.h"
 #include "RageLog.h"
 #include "RageUtil.h"
+#include <memory>
 
 #if defined(_WINDOWS) || defined(_XBOX)
         #include "zlib/zlib.h"
diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp
index 89528c4f97..624cb86045 100644
--- a/stepmania/src/ScreenOptionsMasterPrefs.cpp
+++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp
@@ -127,7 +127,7 @@ static void MovePref( int &iSel, bool bToSel, const ConfOption *pConfOption )
 }
 
 template <>
-static void MovePref<bool>( int &iSel, bool bToSel, const ConfOption *pConfOption )
+void MovePref<bool>( int &iSel, bool bToSel, const ConfOption *pConfOption )
 {
 	IPreference *pPref = IPreference::GetPreferenceByName( pConfOption->m_sPrefName );
 	ASSERT_M( pPref != NULL, pConfOption->m_sPrefName );
diff --git a/stepmania/src/StdString.h b/stepmania/src/StdString.h
index 426e9ff689..adcd1614bc 100644
--- a/stepmania/src/StdString.h
+++ b/stepmania/src/StdString.h
@@ -100,12 +100,11 @@ typedef char*			PSTR;
 #include <malloc.h>			// _alloca
 #endif
 
-#include <cstdarg>
-
 #include <cstdio>
 #include <cctype>
 #include <cstdlib>
 #include <cstdarg>
+#include <cstring>
 
 // a very shorthand way of applying the fix for KB problem Q172398
 // (basic_string assignment bug)