Separate includes into sections and alphabetize them

Okay, so basically here's the include layout that this game now
consistently uses:

[The "main" header file, if any (e.g. Graphics.h for Graphics.cpp)]
[blank line]
[All system includes, such as tinyxml2/physfs/utfcpp/SDL]
[blank line]
[All project includes, such as Game.h/Entity.h/etc.]

And if applicable, another blank line, and then some special-case
include screwy stuff (take a look at editor.cpp or FileSystemUtils.cpp,
for example, they have ifdefs and defines with their includes).

desktop_version/src/BinaryBlob.cpp

@@ -1,11 +1,9 @@
 #include "BinaryBlob.h"
 
+#include <physfs.h> /* FIXME: Abstract to FileSystemUtils! */
+#include <SDL.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <SDL.h>
-
-/* FIXME: Abstract to FileSystemUtils! */
-#include <physfs.h>
 
 binaryBlob::binaryBlob()
 {

desktop_version/src/Entity.h

@@ -1,14 +1,14 @@
 #ifndef ENTITY_H
 #define ENTITY_H
 
+#include <string>
+#include <vector>
+
 #include "Maths.h"
 #include "Ent.h"
 #include "BlockV.h"
 #include "Game.h"
 
-#include <vector>
-#include <string>
-
 #define removeentity_iter(index) { if (obj.removeentity(index)) index--; }
 #define removeblock_iter(index) { obj.removeblock(index); index--; }
 

desktop_version/src/FileSystemUtils.cpp

@@ -1,22 +1,17 @@
-#include <vector>
+#include <algorithm>
-#include <string>
+#include <iostream>
-
+#include <iterator>
+#include <physfs.h>
+#include <SDL.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <string>
+#include <tinyxml2.h>
+#include <vector>
 
 #include "Graphics.h"
 #include "UtilityClass.h"
 
-#include <iterator>
-#include <algorithm>
-#include <iostream>
-
-#include <SDL.h>
-#include <physfs.h>
-
-#include <tinyxml2.h>
-
 /* These are needed for PLATFORM_* crap */
 #if defined(_WIN32)
 #include <windows.h>

desktop_version/src/Finalclass.cpp

@@ -1,9 +1,8 @@
 #include "Finalclass.h"
 
-#include "MakeAndPlay.h"
-
 #include "Game.h"
 #include "Entity.h"
+#include "MakeAndPlay.h"
 #include "UtilityClass.h"
 
 const short* finalclass::loadlevel(int rx, int ry)

desktop_version/src/Game.cpp

@@ -1,27 +1,22 @@
-#include "Enums.h"
-
-#include "editor.h"
 #include "Game.h"
-#include "Graphics.h"
-#include "Entity.h"
-#include "Map.h"
-#include "Music.h"
-#include "Script.h"
-#include "UtilityClass.h"
 
+#include <sstream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#include <sstream>
-
-#include "FileSystemUtils.h"
-
 #include <tinyxml2.h>
 
-#include "Network.h"
+#include "editor.h"
-
+#include "Entity.h"
+#include "Enums.h"
+#include "FileSystemUtils.h"
+#include "Graphics.h"
 #include "MakeAndPlay.h"
+#include "Map.h"
+#include "Music.h"
+#include "Network.h"
+#include "Script.h"
+#include "UtilityClass.h"
 
 // lol, Win32 -flibit
 #ifdef _WIN32

desktop_version/src/Game.h

@@ -1,9 +1,9 @@
 #ifndef GAME_H
 #define GAME_H
 
-#include <vector>
-#include <string>
 #include <SDL.h>
+#include <string>
+#include <vector>
 
 struct MenuOption
 {

desktop_version/src/Graphics.cpp

@@ -1,14 +1,16 @@
 #include "Graphics.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <utf8/unchecked.h>
+
 #include "editor.h"
 #include "Entity.h"
+#include "FileSystemUtils.h"
 #include "Map.h"
 #include "Music.h"
 #include "Screen.h"
-#include "FileSystemUtils.h"
 #include "UtilityClass.h"
-#include <utf8/unchecked.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 void Graphics::init()
 {

desktop_version/src/Graphics.h

@@ -1,21 +1,16 @@
 #ifndef GRAPHICS_H
 #define GRAPHICS_H
 
-#include "GraphicsResources.h"
-#include <vector>
-#include <map>
-
-
-
-#include "Maths.h"
-#include "Textbox.h"
-
-
-#include <string>
 #include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
 
+#include "GraphicsResources.h"
 #include "GraphicsUtil.h"
+#include "Maths.h"
 #include "Screen.h"
+#include "Textbox.h"
 
 class Graphics
 {

desktop_version/src/GraphicsResources.cpp

@@ -1,8 +1,10 @@
 #include "GraphicsResources.h"
-#include "FileSystemUtils.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "FileSystemUtils.h"
+
 // Used to load PNG data
 extern "C"
 {

desktop_version/src/Input.cpp

@@ -1,21 +1,18 @@
-#include "Logic.h"
-#include "Script.h"
-#include "Credits.h"
-
-#include "MakeAndPlay.h"
-
 #include <tinyxml2.h>
 
-#include "FileSystemUtils.h"
+#include "Credits.h"
-
 #include "editor.h"
 #include "Entity.h"
 #include "Enums.h"
+#include "FileSystemUtils.h"
 #include "Game.h"
 #include "Graphics.h"
 #include "KeyPoll.h"
+#include "Logic.h"
+#include "MakeAndPlay.h"
 #include "Map.h"
 #include "Music.h"
+#include "Script.h"
 
 void updatebuttonmappings(int bind)
 {

desktop_version/src/KeyPoll.cpp

@@ -1,11 +1,13 @@
 #include "KeyPoll.h"
-#include "Game.h"
+
-#include "Graphics.h"
-#include "Music.h"
 #include <stdio.h>
 #include <string.h>
 #include <utf8/unchecked.h>
 
+#include "Game.h"
+#include "Graphics.h"
+#include "Music.h"
+
 void KeyPoll::setSensitivity(int _value)
 {
 	switch (_value)

desktop_version/src/KeyPoll.h

@@ -1,11 +1,10 @@
 #ifndef KEYPOLL_H
 #define KEYPOLL_H
 
+#include <map> // FIXME: I should feel very bad for using C++ -flibit
+#include <SDL.h>
 #include <string>
 #include <vector>
-#include <map> // FIXME: I should feel very bad for using C++ -flibit
-
-#include <SDL.h>
 
 enum Kybrd
 {

desktop_version/src/Labclass.cpp

@@ -1,9 +1,8 @@
 #include "Labclass.h"
 
-#include "MakeAndPlay.h"
-
 #include "Game.h"
 #include "Entity.h"
+#include "MakeAndPlay.h"
 #include "UtilityClass.h"
 
 const short* labclass::loadlevel(int rx, int ry)

desktop_version/src/Logic.cpp

@@ -1,15 +1,14 @@
-#include "Script.h"
-#include "Network.h"
-#include "FileSystemUtils.h"
 #include "Credits.h"
-
 #include "editor.h"
 #include "Entity.h"
 #include "Enums.h"
+#include "FileSystemUtils.h"
 #include "Game.h"
 #include "Graphics.h"
 #include "Map.h"
 #include "Music.h"
+#include "Network.h"
+#include "Script.h"
 #include "UtilityClass.h"
 
 void titleupdatetextcol()

desktop_version/src/Map.cpp

@@ -1,13 +1,12 @@
 #include "Map.h"
-#include "Script.h"
-
-#include "MakeAndPlay.h"
 
 #include "editor.h"
 #include "Entity.h"
 #include "Game.h"
 #include "Graphics.h"
+#include "MakeAndPlay.h"
 #include "Music.h"
+#include "Script.h"
 #include "UtilityClass.h"
 
 mapclass::mapclass()

desktop_version/src/Map.h

@@ -1,15 +1,15 @@
 #ifndef MAPGAME_H
 #define MAPGAME_H
 
-#include "Tower.h"
-#include "WarpClass.h"
-#include "Finalclass.h"
-#include "Labclass.h"
-#include "Spacestation2.h"
-#include "Otherlevel.h"
 #include <vector>
 
+#include "Finalclass.h"
+#include "Labclass.h"
 #include "Maths.h"
+#include "Otherlevel.h"
+#include "Spacestation2.h"
+#include "Tower.h"
+#include "WarpClass.h"
 
 struct Roomtext
 {

desktop_version/src/Music.cpp

@@ -1,6 +1,8 @@
+#include "Music.h"
+
 #include <SDL.h>
 #include <stdio.h>
-#include "Music.h"
+
 #include "BinaryBlob.h"
 #include "Map.h"
 #include "UtilityClass.h"

desktop_version/src/Music.h

@@ -1,11 +1,11 @@
 #ifndef MUSIC_H
 #define MUSIC_H
 
-#include "SoundSystem.h"
-#include "BinaryBlob.h"
-
 #include <vector>
 
+#include "BinaryBlob.h"
+#include "SoundSystem.h"
+
 #define musicroom(rx, ry) ((rx) + ((ry) * 20))
 
 class musicclass

desktop_version/src/Otherlevel.cpp

@@ -1,9 +1,8 @@
 #include "Otherlevel.h"
 
-#include "MakeAndPlay.h"
-
 #include "Game.h"
 #include "Entity.h"
+#include "MakeAndPlay.h"
 
 const short* otherlevelclass::loadlevel(int rx, int ry)
 {

desktop_version/src/Render.cpp

@@ -1,15 +1,14 @@
+#include "Credits.h"
 #include "editor.h"
-#include "Graphics.h"
-#include "UtilityClass.h"
-#include "Maths.h"
 #include "Entity.h"
+#include "FileSystemUtils.h"
+#include "Graphics.h"
+#include "MakeAndPlay.h"
 #include "Map.h"
+#include "Maths.h"
 #include "Music.h"
 #include "Script.h"
-#include "FileSystemUtils.h"
+#include "UtilityClass.h"
-#include "Credits.h"
-
-#include "MakeAndPlay.h"
 
 int tr;
 int tg;

desktop_version/src/Screen.cpp

@@ -1,10 +1,10 @@
 #include "Screen.h"
 
+#include <stdlib.h>
+
 #include "FileSystemUtils.h"
 #include "GraphicsUtil.h"
 
-#include <stdlib.h>
-
 // Used to create the window icon
 extern "C"
 {

desktop_version/src/Script.cpp

@@ -1,12 +1,12 @@
 #include "Script.h"
-#include "Graphics.h"
 
 #include "editor.h"
 #include "Entity.h"
 #include "Enums.h"
-#include "Music.h"
+#include "Graphics.h"
 #include "KeyPoll.h"
 #include "Map.h"
+#include "Music.h"
 #include "UtilityClass.h"
 
 scriptclass::scriptclass()

desktop_version/src/Scripts.cpp

@@ -1,4 +1,5 @@
 #include "Script.h"
+
 #include <SDL.h>
 
 void scriptclass::load(const std::string& name)

desktop_version/src/SoundSystem.cpp

@@ -1,5 +1,7 @@
-#include <SDL.h>
 #include "SoundSystem.h"
+
+#include <SDL.h>
+
 #include "FileSystemUtils.h"
 
 MusicTrack::MusicTrack(const char* fileName)

desktop_version/src/Spacestation2.cpp

@@ -1,9 +1,8 @@
 #include "Spacestation2.h"
 
-#include "MakeAndPlay.h"
-
 #include "Game.h"
 #include "Entity.h"
+#include "MakeAndPlay.h"
 #include "UtilityClass.h"
 
 const short* spacestation2class::loadlevel(int rx, int ry)

desktop_version/src/TerminalScripts.cpp

@@ -1,4 +1,5 @@
 #include "Script.h"
+
 #include <SDL.h>
 
 void scriptclass::loadother(const char* t)

desktop_version/src/Textbox.cpp

@@ -1,4 +1,5 @@
 #include "Textbox.h"
+
 #include <utf8/unchecked.h>
 
 textboxclass::textboxclass()

desktop_version/src/Tower.cpp

@@ -1,7 +1,6 @@
 #include "Tower.h"
 
 #include "MakeAndPlay.h"
-
 #include "UtilityClass.h"
 
 towerclass::towerclass()

desktop_version/src/UtilityClass.cpp

@@ -1,8 +1,7 @@
 #include "UtilityClass.h"
 
-#include <SDL.h>
-
 #include <cctype>
+#include <SDL.h>
 #include <sstream>
 
 /* Used by UtilityClass::GCString to generate a button list */

desktop_version/src/UtilityClass.h

@@ -2,8 +2,8 @@
 #define UTILITYCLASS_H
 
 #include <SDL.h>
-#include <vector>
 #include <string>
+#include <vector>
 
 int ss_toi(std::string _s);
 

desktop_version/src/WarpClass.cpp

@@ -1,9 +1,8 @@
 #include "WarpClass.h"
 
-#include "MakeAndPlay.h"
-
 #include "Game.h"
 #include "Entity.h"
+#include "MakeAndPlay.h"
 #include "UtilityClass.h"
 
 const short* warpclass::loadlevel(int rx, int ry)

desktop_version/src/editor.cpp

@@ -2,24 +2,22 @@
 
 #include "editor.h"
 
-#include "Graphics.h"
+#include <physfs.h>
+#include <stdio.h>
+#include <string>
+#include <tinyxml2.h>
+#include <utf8/unchecked.h>
+
 #include "Entity.h"
-#include "Music.h"
+#include "Enums.h"
+#include "FileSystemUtils.h"
+#include "Graphics.h"
 #include "KeyPoll.h"
 #include "Map.h"
+#include "Music.h"
 #include "Script.h"
 #include "UtilityClass.h"
 
-#include <tinyxml2.h>
-
-#include "Enums.h"
-
-#include "FileSystemUtils.h"
-
-#include <string>
-#include <utf8/unchecked.h>
-#include <physfs.h>
-
 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS
 #endif
@@ -27,7 +25,6 @@
 #define _POSIX_SOURCE
 #endif
 #include <inttypes.h>
-#include <cstdio>
 
 edlevelclass::edlevelclass()
 {

desktop_version/src/editor.h

@@ -3,10 +3,9 @@
 #ifndef EDITOR_H
 #define EDITOR_H
 
-#include <vector>
-#include <string>
-
 #include <SDL.h>
+#include <string>
+#include <vector>
 
 // Text entry field type
 enum textmode {

desktop_version/src/main.cpp

@@ -1,37 +1,26 @@
 #include <SDL.h>
-#include "SoundSystem.h"
-
-#include "UtilityClass.h"
-#include "Enums.h"
-#include "Entity.h"
-#include "Game.h"
-#include "Graphics.h"
-#include "KeyPoll.h"
-#include "Render.h"
-
-#include "Tower.h"
-#include "WarpClass.h"
-#include "Labclass.h"
-#include "Finalclass.h"
-#include "Map.h"
-#include "Music.h"
-
-#include "Screen.h"
-
-#include "Script.h"
-
-#include "Logic.h"
-
-#include "Input.h"
-#include "editor.h"
-#include "preloader.h"
-
-#include "FileSystemUtils.h"
-#include "Network.h"
-
 #include <stdio.h>
 #include <string.h>
 
+#include "editor.h"
+#include "Enums.h"
+#include "Entity.h"
+#include "FileSystemUtils.h"
+#include "Game.h"
+#include "Graphics.h"
+#include "Input.h"
+#include "KeyPoll.h"
+#include "Logic.h"
+#include "Map.h"
+#include "Music.h"
+#include "Network.h"
+#include "preloader.h"
+#include "Render.h"
+#include "Screen.h"
+#include "Script.h"
+#include "SoundSystem.h"
+#include "UtilityClass.h"
+
 scriptclass script;
 
 #if !defined(NO_CUSTOM_LEVELS)

desktop_version/src/preloader.cpp

@@ -1,5 +1,3 @@
-#include "preloader.h"
-
 #include "Enums.h"
 #include "Game.h"
 #include "Graphics.h"