diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 0fc992d400..8846aa38b8 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -1,43 +1,41 @@
 #include "global.h"
 #include "GameState.h"
-#include "GameManager.h"
-#include "PrefsManager.h"
-#include "GamePreferences.h"
-#include "song.h"
+#include "Actor.h"
+#include "AdjustSync.h"
+#include "AnnouncerManager.h"
+#include "Bookkeeper.h"
+#include "Character.h"
+#include "CharacterManager.h"
+#include "CommonMetrics.h"
 #include "Course.h"
+#include "Foreach.h"
+#include "Game.h"
+#include "GameCommand.h"
+#include "GameConstantsAndTypes.h"
+#include "GameManager.h"
+#include "GamePreferences.h"
+#include "HighScore.h"
+#include "LightsManager.h"
+#include "LuaReference.h"
+#include "MessageManager.h"
+#include "MemoryCardManager.h"
+#include "NoteSkinManager.h"
+#include "PlayerState.h"
+#include "PrefsManager.h"
+#include "Profile.h"
+#include "ProfileManager.h"
+#include "RageFile.h"
 #include "RageLog.h"
 #include "RageUtil.h"
+#include "ScreenEdit.h"
+#include "song.h"
 #include "SongManager.h"
 #include "SongUtil.h"
-#include "Steps.h"
-#include "HighScore.h"
-#include "NoteSkinManager.h"
-#include "GameCommand.h"
-#include "Character.h"
-#include "UnlockManager.h"
-#include "AnnouncerManager.h"
-#include "ProfileManager.h"
-#include "Profile.h"
-#include "ThemeManager.h"
-#include "LightsManager.h"
-#include "RageFile.h"
-#include "Bookkeeper.h"
-#include "MemoryCardManager.h"
 #include "StatsManager.h"
-#include "GameConstantsAndTypes.h"
-#include "CommonMetrics.h"
-#include "Actor.h"
-#include "PlayerState.h"
+#include "Steps.h"
 #include "Style.h"
-#include "MessageManager.h"
-#include "CommonMetrics.h"
-#include "Foreach.h"
-#include "LuaReference.h"
-#include "CommonMetrics.h"
-#include "CharacterManager.h"
-#include "Game.h"
-#include "AdjustSync.h"
-#include "ScreenEdit.h"
+#include "ThemeManager.h"
+#include "UnlockManager.h"
 
 #include <ctime>
 #include <set>
diff --git a/stepmania/src/PlayerState.cpp b/stepmania/src/PlayerState.cpp
index 4bc807eecc..a3866458b9 100644
--- a/stepmania/src/PlayerState.cpp
+++ b/stepmania/src/PlayerState.cpp
@@ -1,8 +1,8 @@
 #include "global.h"
 #include "PlayerState.h"
+#include "Foreach.h"
 #include "GameState.h"
 #include "RageLog.h"
-#include "Foreach.h"
 
 PlayerState::PlayerState()
 {
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 5580728289..4f4b0a972c 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -1,38 +1,37 @@
-#include "global.h"
-#include "ScreenEdit.h"
-#include "PrefsManager.h"
-#include "GamePreferences.h"
-#include "SongManager.h"
-#include "ScreenManager.h"
-#include "ScreenSaveSync.h"
-#include "GameManager.h"
-#include "RageInput.h"
-#include "RageLog.h"
-#include "GameSoundManager.h"
-#include "GameState.h"
-#include "InputMapper.h"
-#include "RageLog.h"
-#include "ThemeManager.h"
-#include "NoteDataUtil.h"
-#include "NoteSkinManager.h"
-#include "SongUtil.h"
-#include "StepsUtil.h"
-#include "Foreach.h"
-#include "ScreenDimensions.h"
-#include "ThemeMetric.h"
-#include "ScreenTextEntry.h"
-#include "ScreenMiniMenu.h"
-#include "ScreenPrompt.h"
-#include "Style.h"
-#include "ActorUtil.h"
-#include "CommonMetrics.h"
-#include "BackgroundUtil.h"
 #include <utility>
 #include <float.h>
-#include "InputEventPlus.h"
-#include "NotesWriterSM.h"
-#include "LocalizedString.h"
+#include "global.h"
+#include "ScreenEdit.h"
+#include "ActorUtil.h"
 #include "AdjustSync.h"
+#include "BackgroundUtil.h"
+#include "CommonMetrics.h"
+#include "Foreach.h"
+#include "GameManager.h"
+#include "GamePreferences.h"
+#include "GameSoundManager.h"
+#include "GameState.h"
+#include "InputEventPlus.h"
+#include "InputMapper.h"
+#include "LocalizedString.h"
+#include "NoteDataUtil.h"
+#include "NoteSkinManager.h"
+#include "NotesWriterSM.h"
+#include "PrefsManager.h"
+#include "RageInput.h"
+#include "RageLog.h"
+#include "ScreenDimensions.h"
+#include "ScreenManager.h"
+#include "ScreenMiniMenu.h"
+#include "ScreenPrompt.h"
+#include "ScreenSaveSync.h"
+#include "ScreenTextEntry.h"
+#include "SongManager.h"
+#include "SongUtil.h"
+#include "StepsUtil.h"
+#include "Style.h"
+#include "ThemeManager.h"
+#include "ThemeMetric.h"
 
 static Preference<float> g_iDefaultRecordLength( "DefaultRecordLength", 4 );
 static Preference<bool> g_bEditorShowBGChangesPlay( "EditorShowBGChangesPlay", false );
diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp
index 412043e360..7edb608f49 100644
--- a/stepmania/src/ScreenEditMenu.cpp
+++ b/stepmania/src/ScreenEditMenu.cpp
@@ -1,23 +1,23 @@
 #include "global.h"
 #include "ScreenEditMenu.h"
-#include "SongManager.h"
-#include "ScreenManager.h"
-#include "GameConstantsAndTypes.h"
-#include "RageUtil.h"
-#include "GameManager.h"
-#include "RageLog.h"
-#include "GameState.h"
-#include "GameSoundManager.h"
-#include "ThemeManager.h"
-#include "Steps.h"
-#include "song.h"
 #include "CommonMetrics.h"
-#include "ScreenTextEntry.h"
-#include "ScreenPrompt.h"
+#include "GameConstantsAndTypes.h"
+#include "GameManager.h"
+#include "GameSoundManager.h"
+#include "GameState.h"
 #include "LocalizedString.h"
-#include "SongUtil.h"
 #include "RageFile.h"
 #include "RageFileManager.h"
+#include "RageLog.h"
+#include "RageUtil.h"
+#include "ScreenManager.h"
+#include "ScreenPrompt.h"
+#include "ScreenTextEntry.h"
+#include "song.h"
+#include "SongManager.h"
+#include "SongUtil.h"
+#include "Steps.h"
+#include "ThemeManager.h"
 
 static const RString TEMP_FILE_NAME = "--temp--";