diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp
index 64a0de2178..ddb829bb93 100644
--- a/stepmania/src/Course.cpp
+++ b/stepmania/src/Course.cpp
@@ -2,29 +2,20 @@
 #include "Course.h"
 #include "PrefsManager.h"
 #include "song.h"
-#include "GameManager.h"
-#include "SongManager.h"
-#include "SongUtil.h"
-#include "GameState.h"
-#include "RageException.h"
-#include "RageLog.h"
-#include "PlayerOptions.h"
-#include "SongOptions.h"
 #include "SongCacheIndex.h"
-#include "RageUtil.h"
-#include "TitleSubstitution.h"
+#include "GameManager.h"
+#include "GameState.h"
+#include "RageLog.h"
 #include "Steps.h"
-#include "BannerCache.h"
 #include "ThemeManager.h"
 #include "ProfileManager.h"
 #include "Foreach.h"
 #include "UnlockManager.h"
-#include <limits.h>
 #include "CourseLoaderCRS.h"
 #include "LuaFunctions.h"
 #include "LocalizedString.h"
-#include "StepsUtil.h"
 #include "Preference.h"
+#include <limits.h>
 
 static Preference<int> MAX_SONGS_IN_EDIT_COURSE( "MaxSongsInEditCourse", -1 );
 
diff --git a/stepmania/src/Course.h b/stepmania/src/Course.h
index 71c195ff57..b139de91a5 100644
--- a/stepmania/src/Course.h
+++ b/stepmania/src/Course.h
@@ -3,22 +3,16 @@
 #ifndef COURSE_H
 #define COURSE_H
 
-#include "PlayerNumber.h"
 #include "GameConstantsAndTypes.h"
 #include "Attack.h"
-#include <map>
-#include "Trail.h"
-#include <set>
 #include "EnumHelper.h"
+#include "Trail.h"
 #include "RageTypes.h"
 #include "SongUtil.h"
 #include "StepsUtil.h"
+#include <map>
+#include <set>
 
-class PlayerOptions;
-class SongOptions;
-class Song;
-class Steps;
-class Profile;
 struct lua_State;
 
 const int MAX_EDIT_COURSE_TITLE_LENGTH = 12;