diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp
index 5fc09c6b4b..09a4843022 100644
--- a/stepmania/src/ScreenEditMenu.cpp
+++ b/stepmania/src/ScreenEditMenu.cpp
@@ -22,6 +22,7 @@
 #include "RageSounds.h"
 #include "ThemeManager.h"
 #include "Steps.h"
+#include "song.h"
 
 
 //
diff --git a/stepmania/src/ScreenMusicScroll.cpp b/stepmania/src/ScreenMusicScroll.cpp
index da6c91dede..5620aa3abd 100644
--- a/stepmania/src/ScreenMusicScroll.cpp
+++ b/stepmania/src/ScreenMusicScroll.cpp
@@ -22,6 +22,7 @@
 #include "GameState.h"
 #include "ThemeManager.h"
 #include "AnnouncerManager.h"
+#include "song.h"
 
 
 #define SCROLL_DELAY		THEME->GetMetricF("ScreenMusicScroll","ScrollDelay")
diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index 20956a9456..a535daa41b 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -27,6 +27,7 @@
 #include "ActorUtil.h"
 #include "FontCharAliases.h"
 #include "AnnouncerManager.h"
+#include "song.h"
 #include <math.h>
 
 
diff --git a/stepmania/src/ScreenSelectCharacter.h b/stepmania/src/ScreenSelectCharacter.h
index eca0a7164b..a38c95b422 100644
--- a/stepmania/src/ScreenSelectCharacter.h
+++ b/stepmania/src/ScreenSelectCharacter.h
@@ -12,6 +12,7 @@
 #include "Screen.h"
 #include "Sprite.h"
 #include "RandomSample.h"
+#include "GameConstantsAndTypes.h"
 #include "MenuElements.h"
 #include "OptionIcon.h"
 #include "Banner.h"