diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp
index 2f17726cbe..c589cfc0ff 100644
--- a/stepmania/src/Course.cpp
+++ b/stepmania/src/Course.cpp
@@ -4,6 +4,7 @@
 #include "song.h"
 #include "GameManager.h"
 #include "SongManager.h"
+#include "SongUtil.h"
 #include "GameState.h"
 #include "RageException.h"
 #include "RageLog.h"
diff --git a/stepmania/src/CourseUtil.cpp b/stepmania/src/CourseUtil.cpp
index e16c074bbc..4514b14742 100644
--- a/stepmania/src/CourseUtil.cpp
+++ b/stepmania/src/CourseUtil.cpp
@@ -3,6 +3,7 @@
 #include "Course.h"
 #include "RageTimer.h"
 #include "ProfileManager.h"
+#include "Profile.h"
 #include "SongManager.h"
 #include "XmlFile.h"
 #include "GameState.h"
diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp
index f516d8659b..6bd25e4edb 100644
--- a/stepmania/src/GameCommand.cpp
+++ b/stepmania/src/GameCommand.cpp
@@ -7,6 +7,7 @@
 #include "RageDisplay.h"
 #include "AnnouncerManager.h"
 #include "ProfileManager.h"
+#include "Profile.h"
 #include "StepMania.h"
 #include "ScreenManager.h"
 #include "SongManager.h"
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 409582e5f2..7ebada930c 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -9,7 +9,9 @@
 #include "RageLog.h"
 #include "RageUtil.h"
 #include "SongManager.h"
+#include "SongUtil.h"
 #include "Steps.h"
+#include "HighScore.h"
 #include "NoteSkinManager.h"
 #include "GameCommand.h"
 #include "NoteFieldPositioning.h"
@@ -17,6 +19,7 @@
 #include "UnlockManager.h"
 #include "AnnouncerManager.h"
 #include "ProfileManager.h"
+#include "Profile.h"
 #include "ThemeManager.h"
 #include "LightsManager.h"
 #include "RageFile.h"
diff --git a/stepmania/src/PaneDisplay.cpp b/stepmania/src/PaneDisplay.cpp
index 81c78ac9e6..141a2688e8 100644
--- a/stepmania/src/PaneDisplay.cpp
+++ b/stepmania/src/PaneDisplay.cpp
@@ -6,6 +6,7 @@
 #include "Steps.h"
 #include "RageLog.h"
 #include "ProfileManager.h"
+#include "Profile.h"
 #include "SongManager.h"
 #include "Course.h"
 #include "Style.h"
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 9287d9a2ba..6059f8d5ae 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -36,6 +36,7 @@
 #include "Style.h"
 #include "MessageManager.h"
 #include "ProfileManager.h"
+#include "Profile.h"
 #include "StatsManager.h"
 
 CString JUDGMENT_X_NAME( size_t p, size_t both_sides )		{ return "JudgmentXOffset" + (both_sides ? CString("BothSides") : ssprintf("OneSideP%d",int(p+1)) ); }
diff --git a/stepmania/src/ScreenEnding.cpp b/stepmania/src/ScreenEnding.cpp
index 7ffefba2a5..775d578bca 100644
--- a/stepmania/src/ScreenEnding.cpp
+++ b/stepmania/src/ScreenEnding.cpp
@@ -6,6 +6,7 @@
 #include "AnnouncerManager.h"
 #include "song.h"
 #include "ProfileManager.h"
+#include "Profile.h"
 #include "ActorUtil.h"
 #include "GameState.h"
 #include "MemoryCardManager.h"
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index fa7c8af41d..5bd52df55d 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -19,6 +19,7 @@
 #include "Course.h"
 #include "LightsManager.h"
 #include "ProfileManager.h"
+#include "Profile.h"
 #include "song.h"
 #include "StatsManager.h"
 #include "Grade.h"
diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp
index 169c9fe69b..348a08f475 100644
--- a/stepmania/src/ScreenNameEntry.cpp
+++ b/stepmania/src/ScreenNameEntry.cpp
@@ -14,6 +14,7 @@
 #include "Course.h"
 #include "AnnouncerManager.h"
 #include "ProfileManager.h"
+#include "Profile.h"
 #include "NoteFieldPositioning.h"
 #include "StageStats.h"
 #include "Game.h"
diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index 21fca7970d..55153b5f29 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -18,6 +18,7 @@
 #include "song.h"
 #include "Steps.h"
 #include "ProfileManager.h"
+#include "Profile.h"
 #include "StatsManager.h"
 #include "RageDisplay.h"
 #include "Foreach.h"
diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index 056a1d8c5e..adc0968758 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -10,6 +10,7 @@
 #include "PrefsManager.h"
 #include "ActorUtil.h"
 #include "ProfileManager.h"
+#include "Profile.h"
 #include "RageLog.h"
 #include "UnlockManager.h"
 #include "ScreenDimensions.h"
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 8b132889ac..2412af433a 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -18,6 +18,7 @@
 #include "RageTextureManager.h"
 #include "Course.h"
 #include "ProfileManager.h"
+#include "Profile.h"
 #include "MenuTimer.h"
 #include "LightsManager.h"
 #include "StatsManager.h"
diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index aafbde924b..aa975209a9 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -23,6 +23,7 @@
 #include "SongUtil.h"
 #include "StepsUtil.h"
 #include "CourseUtil.h"
+#include "TrailUtil.h"
 #include "RageFileManager.h"
 #include "UnlockManager.h"
 #include "Foreach.h"
diff --git a/stepmania/src/SongUtil.cpp b/stepmania/src/SongUtil.cpp
index ccc0b6f867..ed7e235ff2 100644
--- a/stepmania/src/SongUtil.cpp
+++ b/stepmania/src/SongUtil.cpp
@@ -5,10 +5,10 @@
 #include "GameState.h"
 #include "Style.h"
 #include "ProfileManager.h"
+#include "Profile.h"
 #include "PrefsManager.h"
 #include "SongManager.h"
 #include "XmlFile.h"
-#include "PrefsManager.h"
 #include "Foreach.h"
 #include "UnlockManager.h"
 
diff --git a/stepmania/src/StatsManager.cpp b/stepmania/src/StatsManager.cpp
index eb9c40a813..61207eaf1c 100644
--- a/stepmania/src/StatsManager.cpp
+++ b/stepmania/src/StatsManager.cpp
@@ -3,8 +3,10 @@
 #include "GameState.h"
 #include "Foreach.h"
 #include "ProfileManager.h"
+#include "Profile.h"
 #include "PrefsManager.h"
 #include "Steps.h"
+#include "StyleUtil.h"
 
 StatsManager*	STATSMAN = NULL;	// global object accessable from anywhere in the program
 
diff --git a/stepmania/src/StepsUtil.cpp b/stepmania/src/StepsUtil.cpp
index 08805e5373..db24128b1b 100644
--- a/stepmania/src/StepsUtil.cpp
+++ b/stepmania/src/StepsUtil.cpp
@@ -2,6 +2,7 @@
 #include "StepsUtil.h"
 #include "Steps.h"
 #include "ProfileManager.h"
+#include "Profile.h"
 #include "song.h"
 #include "SongManager.h"
 #include "GameManager.h"
diff --git a/stepmania/src/UnlockManager.cpp b/stepmania/src/UnlockManager.cpp
index ec21803679..f5e43fe974 100644
--- a/stepmania/src/UnlockManager.cpp
+++ b/stepmania/src/UnlockManager.cpp
@@ -8,6 +8,7 @@
 #include "SongManager.h"
 #include "GameState.h"
 #include "ProfileManager.h"
+#include "Profile.h"
 #include "ThemeManager.h"
 #include "Foreach.h"
 #include "Steps.h"