Reorder some includes.

stepmania/src/Course.cpp

@@ -1,21 +1,21 @@
+#include <limits.h>
 #include "global.h"
 #include "Course.h"
-#include "PrefsManager.h"
+#include "CourseLoaderCRS.h"
-#include "song.h"
+#include "Foreach.h"
-#include "SongCacheIndex.h"
 #include "GameManager.h"
 #include "GameState.h"
+#include "LocalizedString.h"
+#include "LuaManager.h"
+#include "Preference.h"
+#include "PrefsManager.h"
+#include "ProfileManager.h"
 #include "RageLog.h"
+#include "song.h"
+#include "SongCacheIndex.h"
 #include "Steps.h"
 #include "ThemeManager.h"
-#include "ProfileManager.h"
-#include "Foreach.h"
 #include "UnlockManager.h"
-#include "CourseLoaderCRS.h"
-#include "LuaManager.h"
-#include "LocalizedString.h"
-#include "Preference.h"
-#include <limits.h>
 
 static Preference<int> MAX_SONGS_IN_EDIT_COURSE( "MaxSongsInEditCourse", -1 );
 

stepmania/src/GameState.h

@@ -3,34 +3,33 @@
 #ifndef GAMESTATE_H
 #define GAMESTATE_H
 
-#include "GameConstantsAndTypes.h"
-#include "SongOptions.h"
-#include "Grade.h"
 #include "Attack.h"
-#include "RageTimer.h"
 #include "Difficulty.h"
+#include "GameConstantsAndTypes.h"
+#include "Grade.h"
 #include "MessageManager.h"
-#include "SongOptions.h"
 #include "ModsGroup.h"
+#include "RageTimer.h"
+#include "SongOptions.h"
 
 #include <map>
 #include <deque>
 #include <set>
 
-class Song;
-class Steps;
-class Course;
-class Trail;
-class Game;
-class Style;
 class Character;
-class TimingData;
+class Course;
-class StageStats;
+class Game;
-class PlayerState;
 struct lua_State;
 class LuaTable;
-class Profile;
+class PlayerState;
 class PlayerOptions;
+class Profile;
+class Song;
+class Steps;
+class StageStats;
+class Style;
+class TimingData;
+class Trail;
 
 class GameState
 {

stepmania/src/ModsGroup.h

@@ -1,8 +1,8 @@
 #ifndef MODS_GROUP_H
 #define MODS_GROUP_H
 
-#include "RageTimer.h"
 #include "EnumHelper.h"
+#include "RageTimer.h"
 
 enum ModsLevel
 {

stepmania/src/PlayerOptions.h

@@ -3,9 +3,9 @@
 #ifndef PLAYER_OPTIONS_H
 #define PLAYER_OPTIONS_H
 
+class Course;
 class Song;
 class Steps;
-class Course;
 class Trail;
 
 #include "GameConstantsAndTypes.h"

stepmania/src/PlayerState.h

@@ -3,12 +3,12 @@
 #ifndef PlayerState_H
 #define PlayerState_H
 
+#include "Attack.h"
+#include "ModsGroup.h"
 #include "PlayerNumber.h"
 #include "PlayerOptions.h"
-#include "Attack.h"
 #include "RageTimer.h"
 struct lua_State;
-#include "ModsGroup.h"
 
 class PlayerState
 {

stepmania/src/Preference.h

@@ -4,8 +4,8 @@
 #define PREFERENCE_H
 
 #include "EnumHelper.h"
-#include "RageUtil.h"
 #include "LuaManager.h"
+#include "RageUtil.h"
 class XNode;
 
 struct lua_State;

stepmania/src/SongManager.cpp

@@ -1,40 +1,39 @@
 #include "global.h"
 #include "SongManager.h"
-#include "RageLog.h"
-#include "MsdFile.h"
-#include "NotesLoaderDWI.h"
-#include "BannerCache.h"
-
-#include "GameState.h"
-#include "PrefsManager.h"
 #include "arch/LoadingWindow/LoadingWindow.h"
-#include "Course.h"
-
 #include "AnnouncerManager.h"
-#include "ThemeManager.h"
+#include "BackgroundUtil.h"
+#include "BannerCache.h"
+#include "CatalogXml.h"
+#include "Course.h"
+#include "CourseLoaderCRS.h"
+#include "CourseUtil.h"
+#include "Foreach.h"
 #include "GameManager.h"
-#include "RageFile.h"
+#include "GameState.h"
-#include "Sprite.h"
+#include "LocalizedString.h"
-#include "ProfileManager.h"
+#include "MsdFile.h"
+#include "NoteSkinManager.h"
+#include "NotesLoaderDWI.h"
 #include "NotesLoaderSM.h"
+#include "PrefsManager.h"
+#include "Profile.h"
+#include "ProfileManager.h"
+#include "RageFile.h"
+#include "RageFileManager.h"
+#include "RageLog.h"
 #include "song.h"
 #include "SongUtil.h"
+#include "Sprite.h"
+#include "StatsManager.h"
 #include "Steps.h"
 #include "StepsUtil.h"
-#include "CourseUtil.h"
-#include "TrailUtil.h"
-#include "RageFileManager.h"
-#include "UnlockManager.h"
-#include "Foreach.h"
-#include "StatsManager.h"
 #include "Style.h"
-#include "BackgroundUtil.h"
+#include "ThemeManager.h"
-#include "Profile.h"
-#include "CourseLoaderCRS.h"
 #include "TitleSubstitution.h"
-#include "LocalizedString.h"
+#include "TrailUtil.h"
-#include "CatalogXml.h"
+#include "UnlockManager.h"
-#include "NoteSkinManager.h"
+
 
 SongManager*	SONGMAN = NULL;	// global and accessable from anywhere in our program