diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp
index adbf9653fb..036a422e22 100644
--- a/stepmania/src/ScreenJukebox.cpp
+++ b/stepmania/src/ScreenJukebox.cpp
@@ -5,7 +5,6 @@
 #include "ThemeManager.h"
 #include "GameState.h"
 #include "SongManager.h"
-#include "StepMania.h"
 #include "ScreenManager.h"
 #include "GameSoundManager.h"
 #include "Steps.h"
@@ -16,7 +15,6 @@
 #include "ThemeManager.h"
 #include "Style.h"
 #include "PlayerState.h"
-#include "ProfileManager.h"
 #include "StatsManager.h"
 #include "CommonMetrics.h"
 
diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 82ceb6fce4..f0287396b5 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -9,7 +9,6 @@
 #include "ThemeManager.h"
 #include "InputMapper.h"
 #include "ActorUtil.h"
-#include "ProfileManager.h"
 #include "ScreenDimensions.h"
 #include "Command.h"
 
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index da088c3765..c35ae73329 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -21,7 +21,7 @@
 #include "RageFileManager.h"
 #include "RageSurface.h"
 #include "NoteDataUtil.h"
-#include "ProfileManager.h"
+#include "StepsUtil.h"
 #include "Foreach.h"
 #include "UnlockManager.h"
 #include "BackgroundUtil.h"
diff --git a/stepmania/src/Steps.cpp b/stepmania/src/Steps.cpp
index 35cc20faa9..6e395ad024 100644
--- a/stepmania/src/Steps.cpp
+++ b/stepmania/src/Steps.cpp
@@ -16,19 +16,12 @@
 #include "global.h"
 #include "Steps.h"
 #include "StepsUtil.h"
-#include "song.h"
-#include "Steps.h"
-#include "IniFile.h"
 #include "RageUtil.h"
 #include "RageLog.h"
 #include "NoteData.h"
-#include "GameInput.h"
 #include "RageException.h"
-#include "MsdFile.h"
 #include "GameManager.h"
 #include "NoteDataUtil.h"
-#include "ProfileManager.h"
-#include "PrefsManager.h"
 #include "NotesLoaderSM.h"
 
 Steps::Steps()
diff --git a/stepmania/src/WheelItemBase.cpp b/stepmania/src/WheelItemBase.cpp
index 424eabaa0c..a2d9929bbd 100644
--- a/stepmania/src/WheelItemBase.cpp
+++ b/stepmania/src/WheelItemBase.cpp
@@ -1,20 +1,5 @@
 #include "global.h"
 #include "WheelItemBase.h"
-#include "RageUtil.h"
-#include "SongManager.h"
-#include "GameManager.h"
-#include "PrefsManager.h"
-#include "ScreenManager.h"	// for sending SM_PlayMusicSample
-#include "RageLog.h"
-#include "GameConstantsAndTypes.h"
-#include "GameState.h"
-#include "ThemeManager.h"
-#include "Steps.h"
-#include "song.h"
-#include "Course.h"
-#include "ProfileManager.h"
-#include "ActorUtil.h"
-#include "ThemeMetric.h"
 
 WheelItemBaseData::WheelItemBaseData( WheelItemType wit, CString sText, RageColor color )
 {
diff --git a/stepmania/src/WheelItemBase.h b/stepmania/src/WheelItemBase.h
index 367b798c11..3a0d883ae4 100644
--- a/stepmania/src/WheelItemBase.h
+++ b/stepmania/src/WheelItemBase.h
@@ -4,12 +4,10 @@
 #define WHEELITEMBASE_H
 
 #include "ActorFrame.h"
-#include "GradeDisplay.h"
 #include "BitmapText.h"
 #include "WheelNotifyIcon.h"
-#include "TextBanner.h"
+#include "ThemeMetric.h"
 #include "GameConstantsAndTypes.h"
-#include "GameCommand.h"
 
 struct WheelItemBaseData;