diff --git a/stepmania/src/Background.h b/stepmania/src/Background.h
index 69eeb786cd..7e226789ff 100644
--- a/stepmania/src/Background.h
+++ b/stepmania/src/Background.h
@@ -9,6 +9,8 @@
 #include "BGAnimation.h"
 #include "song.h"
 #include <deque>
+#include <map>
+
 class DancingCharacters;
 
 class BrightnessOverlay: public ActorFrame
diff --git a/stepmania/src/Font.h b/stepmania/src/Font.h
index 46e6b98628..874e61dbb7 100644
--- a/stepmania/src/Font.h
+++ b/stepmania/src/Font.h
@@ -6,6 +6,7 @@
 #include "RageTextureID.h"
 #include "RageUtil.h"
 #include "RageTypes.h"
+#include <map>
 
 class FontPage;
 class RageTexture;
diff --git a/stepmania/src/NotesLoaderBMS.cpp b/stepmania/src/NotesLoaderBMS.cpp
index 9f491916f4..c3b837eb8f 100644
--- a/stepmania/src/NotesLoaderBMS.cpp
+++ b/stepmania/src/NotesLoaderBMS.cpp
@@ -1,9 +1,7 @@
 #include "global.h"
 #include "NotesLoaderBMS.h"
-#include "NotesLoader.h"
 #include "NoteData.h"
 #include "GameConstantsAndTypes.h"
-#include "RageUtil.h"
 #include "RageLog.h"
 #include "GameManager.h"
 #include "RageException.h"
diff --git a/stepmania/src/NotesLoaderBMS.h b/stepmania/src/NotesLoaderBMS.h
index b59dfe949d..d2e2b57be5 100644
--- a/stepmania/src/NotesLoaderBMS.h
+++ b/stepmania/src/NotesLoaderBMS.h
@@ -2,8 +2,6 @@
 #define NOTES_LOADER_BMS_H
 
 #include "NotesLoader.h"
-#include "GameConstantsAndTypes.h"
-#include "NoteTypes.h"
 #include <map>
 
 class Song;
diff --git a/stepmania/src/RageSurface_Load_XPM.cpp b/stepmania/src/RageSurface_Load_XPM.cpp
index 7f3bde5af2..a562fad449 100644
--- a/stepmania/src/RageSurface_Load_XPM.cpp
+++ b/stepmania/src/RageSurface_Load_XPM.cpp
@@ -6,6 +6,7 @@
 #include "RageUtil.h"
 #include "RageLog.h"
 #include "RageSurface.h"
+#include <map>
 
 #define CheckLine() \
 	if( xpm[line] == NULL ) { \
diff --git a/stepmania/src/RageUtil.h b/stepmania/src/RageUtil.h
index 2869761a23..dd61058f81 100644
--- a/stepmania/src/RageUtil.h
+++ b/stepmania/src/RageUtil.h
@@ -3,8 +3,6 @@
 #ifndef RAGEUTIL_H
 #define RAGEUTIL_H
 
-#include <map>
-
 #define SAFE_DELETE(p)       { if(p) { delete (p);     (p)=NULL; } }
 #define SAFE_DELETE_ARRAY(p) { if(p) { delete[] (p);   (p)=NULL; } }
 #define SAFE_RELEASE(p)      { if(p) { (p)->Release(); (p)=NULL; } }