Unify the #include blocks a little bit

One line for C4Include.h, one for the .h corresponding to the .cpp, one
empty line, the other C4* includes, another empty line, external headers.

src/c4group/C4ComponentHost.cpp

@@ -25,6 +25,7 @@
 
 #include <C4Include.h>
 #include <C4ComponentHost.h>
+
 #include <C4Application.h>
 #include <StdRegistry.h>
 

src/c4group/c4group_ng.cpp

@@ -42,6 +42,7 @@
 //         4.95.4 September 2005 Unix-flavour
 
 #include <C4Include.h>
+
 #include <C4Group.h>
 #include <C4Version.h>
 #include <C4Update.h>

src/config/C4Config.cpp

@@ -27,8 +27,8 @@
 
 #include <C4Include.h>
 #include <C4Config.h>
-#include <C4Version.h>
 
+#include <C4Version.h>
 #include <C4Log.h>
 #include <C4Components.h>
 #include <C4Network2.h>

src/game/landscape/C4Landscape.cpp

@@ -39,9 +39,7 @@
 #include <C4Random.h>
 #include <C4Surface.h>
 #include <C4ToolsDlg.h>
-#ifdef DEBUGREC
 #include <C4Record.h>
-#endif
 #include <C4Material.h>
 #include <C4GameMessage.h>
 #include <C4Application.h>

src/gui/C4GameOptions.cpp

@@ -22,6 +22,7 @@
 
 #include "C4Include.h"
 #include "C4GameOptions.h"
+
 #include <C4Game.h>
 #include <C4GameControl.h>
 #include "C4GraphicsResource.h"

src/gui/C4GuiButton.cpp

@@ -21,6 +21,7 @@
 
 #include <C4Include.h>
 #include <C4Gui.h>
+
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>

src/gui/C4GuiCheckBox.cpp

@@ -21,6 +21,7 @@
 
 #include <C4Include.h>
 #include <C4Gui.h>
+
 #include <C4FacetEx.h>
 #include <C4MouseControl.h>
 #include <C4GraphicsResource.h>

src/gui/C4GuiComboBox.cpp

@@ -23,6 +23,7 @@
 
 #include <C4Include.h>
 #include <C4Gui.h>
+
 #include <C4FacetEx.h>
 #include <C4MouseControl.h>
 #include <C4GraphicsResource.h>

src/gui/C4GuiEdit.cpp

@@ -24,6 +24,7 @@
 
 #include <C4Include.h>
 #include <C4Gui.h>
+
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>

src/gui/C4GuiListBox.cpp

@@ -21,6 +21,7 @@
 
 #include <C4Include.h>
 #include <C4Gui.h>
+
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>

src/gui/C4GuiMenu.cpp

@@ -23,6 +23,7 @@
 
 #include <C4Include.h>
 #include <C4Gui.h>
+
 #include <C4FacetEx.h>
 #include <C4MouseControl.h>
 #include <C4GraphicsResource.h>

src/gui/C4GuiTabular.cpp

@@ -24,6 +24,7 @@
 
 #include <C4Include.h>
 #include <C4Gui.h>
+
 #include <C4FacetEx.h>
 #include <C4Game.h>
 #include <C4FullScreen.h>

src/gui/C4StartupMainDlg.cpp

@@ -22,9 +22,9 @@
 
 #include <C4Include.h>
 #include <C4StartupMainDlg.h>
+
 #include <C4UpdateDlg.h>
 #include <C4Version.h>
-
 #include <C4StartupNetDlg.h>
 #include <C4StartupScenSelDlg.h>
 #include <C4StartupOptionsDlg.h>

src/gui/C4StartupNetDlg.cpp

@@ -29,8 +29,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <C4Include.h>
 #include <C4StartupNetDlg.h>
-#include <C4UpdateDlg.h>
 
+#include <C4UpdateDlg.h>
 #include <C4StartupScenSelDlg.h>
 #include <C4StartupMainDlg.h>
 #include <C4Game.h>

src/gui/C4UpdateDlg.cpp

@@ -25,10 +25,9 @@
 
 // Don't compile this class if automatic update is disabled
 #ifdef WITH_AUTOMATIC_UPDATE
-
 #include "C4UpdateDlg.h"
-#include "C4DownloadDlg.h"
 
+#include "C4DownloadDlg.h"
 #include <C4Log.h>
 
 #ifdef _WIN32

src/gui/C4Viewport.cpp

@@ -28,8 +28,8 @@
 
 #include <C4Include.h>
 #include <C4Viewport.h>
-#include <C4ViewportWindow.h>
 
+#include <C4ViewportWindow.h>
 #include <C4Console.h>
 #include <C4Object.h>
 #include <C4FullScreen.h>

src/lib/C4Log.cpp

@@ -25,8 +25,8 @@
 
 #include <C4Include.h>
 #include <C4Log.h>
-#include <C4AulDebug.h>
 
+#include <C4AulDebug.h>
 #include <C4Console.h>
 #include <C4GameLobby.h>
 #include <C4Game.h>

src/network/C4GameControlNetwork.cpp

@@ -20,9 +20,9 @@
 /* control managament: network part */
 
 #include "C4Include.h"
+#include <C4GameControlNetwork.h>
 
 #include <C4Application.h>
-#include <C4GameControlNetwork.h>
 #include <C4GameControl.h>
 #include <C4Game.h>
 #include <C4Log.h>

src/network/C4Network2.cpp

@@ -23,11 +23,9 @@
  */
 
 #include <C4Include.h>
-#include <utility>
-
 #include <C4Network2.h>
-#include <C4Version.h>
 
+#include <C4Version.h>
 #include <C4Log.h>
 #include <C4Application.h>
 #include <C4Console.h>

src/network/C4Network2Dialogs.cpp

@@ -27,7 +27,6 @@
 
 #include "C4Network2.h"
 #include "C4Network2Stats.h"
-
 #include "C4Viewport.h"
 #include "C4GameOptions.h"
 #include <C4Game.h>

src/network/C4Network2IRC.cpp

@@ -22,10 +22,10 @@
 
 #include "C4Include.h"
 #include "C4Network2IRC.h"
+
 #include "C4Config.h"
 #include "C4Version.h"
 #include "C4InteractiveThread.h"
-
 #include "C4Gui.h" // for clearly visi
 
 #include <cctype> // for isdigit

src/network/C4Network2ResDlg.cpp

@@ -20,13 +20,13 @@
 // resource display list box
 
 #include "C4Include.h"
+#include "C4Network2Dialogs.h"
+
 #include "C4GameLobby.h"
 #include "C4FullScreen.h"
-
 #include "C4Network2.h"
 #include "C4PlayerInfo.h"
 #include "C4Network2Players.h"
-#include "C4Network2Dialogs.h"
 #include <C4GraphicsResource.h>
 
 // ----------- C4Network2ResDlg::ListItem ----------------------------------------------------------------

src/platform/C4ViewportWindow.cpp

@@ -27,8 +27,8 @@
 
 #include <C4Include.h>
 #include <C4ViewportWindow.h>
-#include <C4Viewport.h>
 
+#include <C4Viewport.h>
 #include <C4Console.h>
 #include <C4UserMessages.h>
 #include <C4MouseControl.h>

src/platform/C4WindowGTK.cpp

@@ -26,7 +26,6 @@
 #include <C4App.h>
 #include "C4Version.h"
 #include "C4Config.h"
-
 #include <X11/Xlib.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>

src/platform/C4WindowSDL.cpp

@@ -24,6 +24,7 @@
 
 #include <C4Include.h>
 #include <C4Window.h>
+
 #include <StdGL.h>
 #include <StdDDraw2.h>
 #include <StdFile.h>

src/platform/StdD3D.cpp

@@ -25,6 +25,7 @@
 
 #include "C4Include.h"
 #include <StdD3D.h>
+
 #include <StdD3DShader.h>
 
 #include <C4App.h>

src/platform/StdGL.cpp

@@ -27,6 +27,7 @@
 
 #include "C4Include.h"
 #include <StdGL.h>
+
 #include <C4Surface.h>
 #include <C4Window.h>
 #include "C4Rect.h"

src/script/C4AulDebug.cpp

@@ -19,14 +19,14 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
 #include <C4Include.h>
+#include "C4AulDebug.h"
+
 #include <C4Version.h>
 #include <C4GameControl.h>
 #include <C4Game.h>
 #include <C4MessageInput.h>
 #include <C4Log.h>
 #include <C4Object.h>
-
-#include "C4AulDebug.h"
 #include "C4AulExec.h"
 
 #ifndef NOAULDEBUG