Revisit #includes

Consolidate the include statements scattered across the code in accordance
with the comment in C4Include.h. The advantages are listed in the same
comment.
Furthermore, it follows llvm-include-order which is the logical
extrapolation of the project's style guideline wherever possible
(C4Include.h being the most-frequent exception).

src/C4Include.h

@@ -64,16 +64,16 @@ constexpr bool SOLIDMASK_DEBUG = false;
 #include <unordered_set>
 #include <math.h>
 
-#include "lib/Standard.h"
 #include "C4Prototypes.h"
+#include "lib/C4Log.h"
 #include "lib/C4Real.h"
+#include "lib/Standard.h"
 #include "lib/StdBuf.h"
 #include "platform/StdFile.h"
-#include "c4group/C4Language.h"
-#include "lib/C4Log.h"
-#include "config/C4Reloc.h"
-#include "config/C4Config.h"
 
+#include "c4group/C4Language.h"
+#include "config/C4Config.h"
+#include "config/C4Reloc.h"
 #include "game/C4Game.h"
 
 #endif // INC_C4Include

src/C4Prototypes.h

@@ -158,6 +158,7 @@ class StdMeshMatManager;
 class StdMeshMatrix;
 class StdMeshSkeletonLoader;
 class StdMeshUpdate;
+class StdStrBuf;
 
 namespace C4GameLobby
 {

src/c4group/C4Extra.cpp

@@ -18,10 +18,7 @@
 #include "C4Include.h"
 #include "c4group/C4Extra.h"
 
-#include "config/C4Config.h"
 #include "c4group/C4Components.h"
-#include "game/C4Game.h"
-#include "lib/C4Log.h"
 
 C4Extra::C4Extra() = default;
 

src/c4group/C4Group.h

@@ -24,7 +24,6 @@
 #include <io.h>
 #endif
 #include "c4group/CStdFile.h"
-#include "lib/StdBuf.h"
 
 // C4Group-Rewind-warning:
 // The current C4Group-implementation cannot handle random file access very well,

src/c4group/C4GroupSet.cpp

@@ -21,8 +21,6 @@
 
 #include "c4group/C4Components.h"
 #include "c4group/C4Group.h"
-#include "lib/C4Log.h"
-#include "c4group/C4Language.h"
 
 C4GroupSetNode::C4GroupSetNode(C4GroupSet &rParent, C4GroupSetNode *pPrev, C4Group &rGroup, bool fGrpOwned, int32_t id)
 {

src/c4group/C4LangStringTable.cpp

@@ -16,11 +16,8 @@
 // Loads StringTbl* and replaces $..$-strings by localized versions
 
 #include "C4Include.h"
-
-#include <utility>
-#include <vector>
-
 #include "c4group/C4LangStringTable.h"
+
 #include "lib/C4InputValidation.h"
 
 C4LangStringTable::C4LangStringTable() : ref_count(1) {}

src/c4group/C4LangStringTable.h

@@ -20,10 +20,6 @@
 
 #include "c4group/C4ComponentHost.h"
 
-#include <map>
-#include <string>
-#include <stdexcept>
-
 class C4LangStringTable : public C4ComponentHost
 {
 	// Contains the localization string->string mapping. Populated lazily from PopulateStringTable, thus mutable.

src/c4group/C4Language.cpp

@@ -27,9 +27,6 @@
 
 #include "game/C4Application.h"
 #include "c4group/C4Components.h"
-#include "lib/C4Log.h"
-#include "config/C4Config.h"
-#include "game/C4Game.h"
 
 template<size_t iBufferSize>
 static bool GetRelativePath(const char *strPath, const char *strRelativeTo, char(&strBuffer)[iBufferSize])

src/c4group/C4Update.cpp

@@ -15,10 +15,10 @@
  */
 #include "C4Include.h"
 #include "c4group/C4Update.h"
+
 #include "C4Version.h"
 #include "c4group/C4Components.h"
 #include "c4group/C4Group.h"
-#include "lib/C4Log.h"
 
 C4Config *GetCfg();
 

src/c4group/C4Update.h

@@ -16,7 +16,6 @@
 /* Update package support */
 
 #ifndef INC_C4GroupEx
-
 #define INC_C4GroupEx
 
 #include "lib/C4InputValidation.h"

src/c4group/CStdFile.cpp

@@ -18,20 +18,16 @@
 /* A handy wrapper class to gzio files */
 
 #include "C4Include.h"
-#ifdef _WIN32
-#	include "platform/C4windowswrapper.h"
-#endif
-#include "platform/StdFile.h"
 #include "c4group/CStdFile.h"
+#ifdef _WIN32
+#include "platform/C4windowswrapper.h"
+#endif
 #include "lib/SHA1.h"
 
 #include <zlib.h>
 #include "zlib/gzio.h"
-#include <cstdio>
 
 #include <sys/stat.h>
-#include <fcntl.h>
-#include <cassert>
 
 CStdFile::CStdFile()
 {

src/c4group/CStdFile.h

@@ -20,7 +20,6 @@
 #ifndef INC_CSTDFILE
 #define INC_CSTDFILE
 
-#include <stdio.h>
 #include "platform/StdSync.h" // for StdThreadCheck
 #include <zlib.h> // for gzFile
 

src/c4group/gunzip4c4group.cpp

@@ -14,7 +14,6 @@
 
 #include "C4Include.h"
 #include "c4group/CStdFile.h"
-#include <stdio.h>
 
 bool EraseItemSafe(const char *szFilename)
 {

src/config/C4Config.cpp

@@ -21,13 +21,9 @@
 #include "config/C4Config.h"
 
 #include "C4Version.h"
-#include "lib/C4Log.h"
 #include "c4group/C4Components.h"
 #include "network/C4Network2.h"
-#include "c4group/C4Language.h"
 
-#include <utility>
-#include "platform/StdFile.h"
 #include "platform/C4Window.h"
 #include "platform/StdRegistry.h"
 

src/config/C4Config.h

@@ -23,7 +23,6 @@
 #include "config/C4Constants.h"
 #include "lib/C4InputValidation.h"
 #include "control/C4PlayerControl.h"
-#include <list>
 
 #define C4DEFAULT_FONT_NAME "Endeavour"
 enum { CFG_MaxString  = 1024, CFG_MaxEditorMRU = 8 };

src/config/C4Reloc.cpp

@@ -16,7 +16,6 @@
 #include "C4Include.h"
 #include "config/C4Reloc.h"
 
-#include "config/C4Config.h"
 #include "game/C4Application.h"
 
 C4Reloc Reloc; // singleton

src/config/C4Reloc.h

@@ -16,8 +16,6 @@
 #ifndef C4RELOC_H
 #define C4RELOC_H
 
-#include <vector>
-
 class C4Reloc
 {
 public:

src/control/C4Control.cpp

@@ -20,38 +20,34 @@
 #include "C4Include.h"
 #include "control/C4Control.h"
 
-#include "script/C4AulExec.h"
-#include "object/C4Object.h"
-#include "control/C4GameSave.h"
-#include "gui/C4GameLobby.h"
-#include "network/C4Network2Dialogs.h"
-#include "lib/C4Random.h"
-#include "editor/C4Console.h"
-#include "lib/C4Log.h"
-#include "game/C4GraphicsSystem.h"
-#include "player/C4Player.h"
-#include "player/C4RankSystem.h"
-#include "control/C4RoundResults.h"
-#include "landscape/C4PXS.h"
-#include "landscape/C4MassMover.h"
-#include "gui/C4GameMessage.h"
-#include "landscape/C4Landscape.h"
-#include "game/C4Game.h"
-#include "game/C4GameScript.h"
-#include "player/C4PlayerList.h"
-#include "object/C4GameObjects.h"
 #include "control/C4GameControl.h"
-#include "gui/C4ScriptGuiWindow.h"
+#include "control/C4GameSave.h"
+#include "control/C4RoundResults.h"
+#include "editor/C4Console.h"
+#include "game/C4GameScript.h"
+#include "game/C4GraphicsSystem.h"
+#include "gui/C4GameLobby.h"
+#include "gui/C4GameMessage.h"
 #include "gui/C4MessageInput.h"
+#include "gui/C4ScriptGuiWindow.h"
+#include "landscape/C4Landscape.h"
+#include "landscape/C4MassMover.h"
+#include "landscape/C4PXS.h"
+#include "lib/C4Random.h"
+#include "network/C4Network2Dialogs.h"
 #include "object/C4Def.h"
 #include "object/C4DefList.h"
+#include "object/C4GameObjects.h"
+#include "object/C4Object.h"
+#include "player/C4Player.h"
+#include "player/C4PlayerList.h"
+#include "player/C4RankSystem.h"
+#include "script/C4AulExec.h"
 
 #ifndef NOAULDEBUG
 #include "script/C4AulDebug.h"
 #endif
 
-#include "script/C4AulExec.h"
-
 // *** C4ControlPacket
 C4ControlPacket::C4ControlPacket()
 		: iByClient(::Control.ClientID())

src/control/C4Control.h

@@ -20,11 +20,11 @@
 #ifndef INC_C4Control
 #define INC_C4Control
 
-#include "object/C4Id.h"
-#include "network/C4PacketBase.h"
 #include "control/C4PlayerInfo.h"
-#include "network/C4Client.h"
 #include "gui/C4KeyboardInput.h"
+#include "network/C4PacketBase.h"
+#include "network/C4Client.h"
+#include "object/C4Id.h"
 #include "object/C4ObjectList.h"
 
 // *** control base classes

src/control/C4GameControl.cpp

@@ -16,15 +16,13 @@
 /* control management */
 
 #include "C4Include.h"
-
-#include "game/C4Application.h"
-#include "game/C4Game.h"
 #include "control/C4GameControl.h"
-#include "gui/C4GameOverDlg.h"
+
 #include "control/C4Record.h"
-#include "lib/C4Log.h"
-#include "network/C4Network2Stats.h"
+#include "game/C4Application.h"
+#include "gui/C4GameOverDlg.h"
 #include "gui/C4MouseControl.h"
+#include "network/C4Network2Stats.h"
 #include "platform/C4GamePadCon.h"
 #include "player/C4PlayerList.h"
 #include "player/C4Player.h"

src/control/C4GameParameters.cpp

@@ -16,11 +16,9 @@
 #include "C4Include.h"
 #include "control/C4GameParameters.h"
 
-#include "lib/C4Log.h"
 #include "c4group/C4Components.h"
 #include "object/C4Def.h"
 #include "object/C4DefList.h"
-#include "game/C4Game.h"
 #include "game/C4Application.h"
 #include "network/C4Network2.h"
 

src/control/C4GameParameters.h

@@ -18,9 +18,9 @@
 #ifndef C4GAMEPARAMETERS_H
 #define C4GAMEPARAMETERS_H
 
-#include "object/C4IDList.h"
 #include "control/C4PlayerInfo.h"
 #include "control/C4Teams.h"
+#include "object/C4IDList.h"
 #include "object/C4InfoCore.h"
 
 class C4GameRes

src/control/C4GameSave.cpp

@@ -18,19 +18,17 @@
 #include "C4Include.h"
 #include "control/C4GameSave.h"
 
-#include "c4group/C4Components.h"
-#include "game/C4Game.h"
-#include "lib/C4Log.h"
-#include "landscape/C4Landscape.h"
-#include "landscape/C4PXS.h"
-#include "landscape/C4MassMover.h"
-#include "player/C4PlayerList.h"
-#include "control/C4RoundResults.h"
-#include "control/C4Record.h"
 #include "C4Version.h"
+#include "c4group/C4Components.h"
 #include "control/C4GameParameters.h"
-#include "script/C4Value.h"
+#include "control/C4Record.h"
+#include "control/C4RoundResults.h"
+#include "landscape/C4Landscape.h"
+#include "landscape/C4MassMover.h"
+#include "landscape/C4PXS.h"
+#include "player/C4PlayerList.h"
 #include "network/C4Network2.h"
+#include "script/C4Value.h"
 
 // *** C4GameSave main class
 

src/control/C4PlayerControl.cpp

@@ -19,26 +19,21 @@
 #include "C4ForbidLibraryCompilation.h"
 #include "control/C4PlayerControl.h"
 
-#include "object/C4DefList.h"
 #include "c4group/C4LangStringTable.h"
-#include "player/C4Player.h"
-#include "player/C4PlayerList.h"
 #include "control/C4Control.h"
-#include "game/C4Game.h"
-#include "platform/C4GamePadCon.h"
-#include "lib/C4Log.h"
-#include "graphics/C4GraphicsResource.h"
-#include "gui/C4MouseControl.h"
+#include "control/C4Record.h"
 #include "game/C4GraphicsSystem.h"
 #include "game/C4Viewport.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4MouseControl.h"
+#include "object/C4DefList.h"
 #include "object/C4Object.h"
 #include "object/C4ObjectMenu.h"
+#include "platform/C4GamePadCon.h"
+#include "player/C4Player.h"
+#include "player/C4PlayerList.h"
 #include "script/C4Aul.h"
 
-#include <algorithm>
-
-#include "control/C4Record.h"
-
 /* C4PlayerControlDef */
 
 void C4PlayerControlDef::CompileFunc(StdCompiler *pComp)

src/control/C4PlayerControl.h

@@ -23,8 +23,6 @@
 #include "object/C4Id.h"
 #include "platform/C4TimeMilliseconds.h"
 
-#include <list>
-
 const float C4GFX_ZoomStep = 1.1040895f;
 
 // one control definition, e.g. "Left", "Throw", etc.

src/control/C4PlayerInfo.cpp

@@ -20,14 +20,11 @@
 #include "C4Include.h"
 #include "control/C4PlayerInfo.h"
 
-#include "game/C4Game.h"
-#include "config/C4Config.h"
-#include "lib/C4Log.h"
-#include "player/C4Player.h"
-#include "game/C4FullScreen.h"
-#include "player/C4PlayerList.h"
-#include "control/C4GameControl.h"
 #include "c4group/C4Components.h"
+#include "control/C4GameControl.h"
+#include "game/C4FullScreen.h"
+#include "player/C4Player.h"
+#include "player/C4PlayerList.h"
 
 // *** C4PlayerInfo
 

src/control/C4PlayerInfo.h

@@ -32,10 +32,10 @@
 #ifndef INC_C4PlayerInfo
 #define INC_C4PlayerInfo
 
-#include "network/C4PacketBase.h"
-#include "network/C4Network2Res.h"
 #include "config/C4Constants.h"
 #include "lib/C4InputValidation.h"
+#include "network/C4PacketBase.h"
+#include "network/C4Network2Res.h"
 #include "object/C4Id.h"
 
 // information about one player at a client

src/control/C4PlayerInfoConflicts.cpp

@@ -19,7 +19,6 @@
 
 #include "C4Include.h"
 #include "control/C4PlayerInfo.h"
-#include "game/C4Game.h"
 #include "control/C4Teams.h"
 #include "lib/StdColors.h"
 #include "lib/C4Random.h"

src/control/C4Record.cpp

@@ -18,15 +18,11 @@
 #include "C4Include.h"
 #include "control/C4Record.h"
 
-#include "editor/C4Console.h"
-#include "control/C4PlayerInfo.h"
-#include "control/C4GameSave.h"
-#include "lib/C4Log.h"
-#include "player/C4Player.h"
-#include "game/C4Game.h"
 #include "control/C4GameControl.h"
-
-#include "platform/StdFile.h"
+#include "control/C4GameSave.h"
+#include "control/C4PlayerInfo.h"
+#include "editor/C4Console.h"
+#include "player/C4Player.h"
 
 #define IMMEDIATEREC
 

src/control/C4RoundResults.cpp

@@ -18,13 +18,12 @@
 #include "C4Include.h"
 #include "control/C4RoundResults.h"
 
-#include "player/C4Player.h"
-#include "game/C4Game.h"
 #include "object/C4Def.h"
-#include "object/C4Object.h"
-#include "player/C4PlayerList.h"
-#include "object/C4GameObjects.h"
 #include "object/C4DefList.h"
+#include "object/C4GameObjects.h"
+#include "object/C4Object.h"
+#include "player/C4Player.h"
+#include "player/C4PlayerList.h"
 
 // *** C4RoundResultsPlayer
 

src/control/C4RoundResults.h

@@ -24,9 +24,9 @@
 #define INC_C4RoundResults
 
 #include "c4group/C4Components.h"
-#include "object/C4IDList.h"
-#include "network/C4PacketBase.h"
 #include "graphics/C4FacetEx.h"
+#include "network/C4PacketBase.h"
+#include "object/C4IDList.h"
 
 // Contains additional data not present in C4PlayerInfo
 class C4RoundResultsPlayer

src/control/C4Teams.cpp

@@ -18,12 +18,11 @@
 #include "C4Include.h"
 #include "control/C4Teams.h"
 
-#include "game/C4Game.h"
-#include "lib/C4Random.h"
 #include "c4group/C4Components.h"
+#include "control/C4GameControl.h"
+#include "lib/C4Random.h"
 #include "player/C4Player.h"
 #include "player/C4PlayerList.h"
-#include "control/C4GameControl.h"
 
 // ---------------------------------------------------------------
 // C4Team

src/editor/C4Console.cpp

@@ -20,22 +20,19 @@
 #include "C4Include.h"
 #include "editor/C4Console.h"
 
-#include "game/C4Application.h"
-#include "object/C4Def.h"
-#include "control/C4GameSave.h"
-#include "game/C4Game.h"
-#include "gui/C4MessageInput.h"
 #include "C4Version.h"
-#include "c4group/C4Language.h"
-#include "player/C4Player.h"
-#include "landscape/C4Landscape.h"
+#include "control/C4GameControl.h"
+#include "control/C4GameSave.h"
+#include "game/C4Application.h"
 #include "game/C4GraphicsSystem.h"
 #include "game/C4Viewport.h"
-#include "script/C4ScriptHost.h"
+#include "gui/C4MessageInput.h"
+#include "landscape/C4Landscape.h"
+#include "object/C4Def.h"
+#include "player/C4Player.h"
 #include "player/C4PlayerList.h"
-#include "control/C4GameControl.h"
+#include "script/C4ScriptHost.h"
 
-#include "platform/StdFile.h"
 #include "platform/StdRegistry.h"
 
 #define FILE_SELECT_FILTER_FOR_C4S "OpenClonk Scenario\0"         \

src/editor/C4Console.h

@@ -21,9 +21,9 @@
 #define INC_C4Console
 
 #include "editor/C4ConsoleGUI.h"
-#include "editor/C4ToolsDlg.h"
-#include "editor/C4ObjectListDlg.h"
 #include "editor/C4EditCursor.h"
+#include "editor/C4ObjectListDlg.h"
+#include "editor/C4ToolsDlg.h"
 
 #include "platform/C4Window.h"
 

src/editor/C4ConsoleCocoa.mm

@@ -17,13 +17,11 @@
 
 #include "C4Include.h"
 #include "editor/C4Console.h"
-#include "game/C4Application.h"
 
+#include "game/C4Application.h"
 #include "control/C4GameSave.h"
-#include "game/C4Game.h"
 #include "gui/C4MessageInput.h"
 #include "C4Version.h"
-#include "c4group/C4Language.h"
 #include "player/C4Player.h"
 #include "landscape/C4Landscape.h"
 #include "landscape/C4Sky.h"
@@ -32,7 +30,6 @@
 #include "control/C4GameControl.h"
 #include "landscape/C4Texture.h"
 
-#include "platform/StdFile.h"
 #include "platform/StdRegistry.h"
 
 #import <Cocoa/Cocoa.h>

src/editor/C4ConsoleGUI.h

@@ -17,10 +17,9 @@
 #ifndef C4CONSOLEGUI_INC
 #define C4CONSOLEGUI_INC
 
+#include "control/C4GameControl.h"
 #include "game/C4Application.h"
 #include "player/C4Player.h"
-#include "control/C4GameControl.h"
-#include "lib/StdBuf.h"
 
 namespace OpenFileFlags
 {

src/editor/C4ConsoleQt.h

@@ -34,7 +34,6 @@
 #include <QtWidgets>
 #include <qabstractitemmodel.h>
 #include <QAbstractTableModel>
-#include <memory>
 
 // TODO: If we remove the other editors, state and consolegui can be merged and the relevant header go into this file
 // For now, just use this to include Qt

src/editor/C4EditCursor.cpp

@@ -29,7 +29,6 @@
 #include "landscape/C4Landscape.h"
 #include "landscape/C4Texture.h"
 #include "graphics/C4GraphicsResource.h"
-#include "game/C4Game.h"
 #include "object/C4GameObjects.h"
 #include "control/C4GameControl.h"
 #include "script/C4AulExec.h"

src/editor/C4EditCursor.h

@@ -20,12 +20,11 @@
 #ifndef INC_C4EditCursor
 #define INC_C4EditCursor
 
-#include "object/C4ObjectList.h"
 #include "control/C4Control.h"
 #include "lib/C4Rect.h"
-#include "script/C4Value.h"
-#include <vector>
 #include "object/C4DefGraphics.h"
+#include "object/C4ObjectList.h"
+#include "script/C4Value.h"
 
 
 // Currently selected elements in editcursor. May be objects and other prop lists.

src/editor/C4EditorWindowController.mm

@@ -19,7 +19,6 @@
 #include "editor/C4Console.h"
 #include "player/C4Player.h"
 #include "player/C4PlayerList.h"
-#include "game/C4Game.h"
 
 #import <Cocoa/Cocoa.h>
 #import "editor/C4EditorWindowController.h"

src/editor/C4ToolsDlg.cpp

@@ -19,10 +19,11 @@
 
 #include "C4Include.h"
 #include "editor/C4ToolsDlg.h"
+
+#include "control/C4GameControl.h"
 #include "editor/C4Console.h"
 #include "landscape/C4Texture.h"
 #include "landscape/C4Landscape.h"
-#include "control/C4GameControl.h"
 
 bool C4ToolsDlg::Open()
 {

src/game/C4Application.cpp

@@ -22,26 +22,23 @@
 #include "game/C4Application.h"
 
 #include "C4Version.h"
+#include "editor/C4Console.h"
+#include "game/C4FullScreen.h"
+#include "game/C4GraphicsSystem.h"
+#include "graphics/C4Draw.h"
+#include "graphics/C4GraphicsResource.h"
+#include "graphics/StdPNG.h"
+#include "gui/C4GameLobby.h"
+#include "gui/C4GfxErrorDlg.h"
+#include "gui/C4MessageInput.h"
 #ifdef _WIN32
 #include "gui/C4UpdateDlg.h"
 #endif
-#include "game/C4Game.h"
-#include "gui/C4GfxErrorDlg.h"
-#include "game/C4GraphicsSystem.h"
-#include "graphics/C4GraphicsResource.h"
-#include "gui/C4MessageInput.h"
-#include "game/C4FullScreen.h"
-#include "c4group/C4Language.h"
-#include "editor/C4Console.h"
 #include "gui/C4Startup.h"
-#include "lib/C4Log.h"
-#include "platform/C4GamePadCon.h"
-#include "gui/C4GameLobby.h"
+#include "landscape/C4Particles.h"
 #include "network/C4Network2.h"
 #include "network/C4Network2IRC.h"
-#include "landscape/C4Particles.h"
-#include "graphics/StdPNG.h"
-#include "graphics/C4Draw.h"
+#include "platform/C4GamePadCon.h"
 
 #include <getopt.h>
 

src/game/C4Application.h

@@ -18,12 +18,12 @@
 #ifndef INC_C4Application
 #define INC_C4Application
 
-#include "c4group/C4Group.h"
-#include "platform/C4MusicSystem.h"
-#include "platform/C4SoundSystem.h"
 #include "c4group/C4Components.h"
+#include "c4group/C4Group.h"
 #include "network/C4InteractiveThread.h"
 #include "platform/C4App.h"
+#include "platform/C4MusicSystem.h"
+#include "platform/C4SoundSystem.h"
 
 class C4ApplicationGameTimer;
 

src/game/C4FullScreen.cpp

@@ -20,18 +20,16 @@
 #include "C4Include.h"
 #include "game/C4FullScreen.h"
 
-#include "game/C4Game.h"
-#include "game/C4Application.h"
-#include "game/C4Viewport.h"
-#include "c4group/C4Language.h"
-#include "gui/C4Gui.h"
-#include "gui/C4GameDialogs.h"
-#include "player/C4Player.h"
-#include "gui/C4GameOverDlg.h"
-#include "game/C4GraphicsSystem.h"
-#include "gui/C4MouseControl.h"
-#include "player/C4PlayerList.h"
 #include "C4Version.h"
+#include "game/C4Application.h"
+#include "game/C4GraphicsSystem.h"
+#include "game/C4Viewport.h"
+#include "gui/C4GameDialogs.h"
+#include "gui/C4GameOverDlg.h"
+#include "gui/C4Gui.h"
+#include "gui/C4MouseControl.h"
+#include "player/C4Player.h"
+#include "player/C4PlayerList.h"
 
 void C4FullScreen::CharIn(const char * c) { ::pGUI->CharIn(c); }
 

src/game/C4Game.cpp

@@ -21,64 +21,62 @@
 #include "C4ForbidLibraryCompilation.h"
 #include "game/C4Game.h"
 
-#include "script/C4AulDebug.h"
+#include "C4Version.h"
+#include "control/C4GameControl.h"
+#include "control/C4GameParameters.h"
+#include "control/C4GameSave.h"
+#include "control/C4PlayerControl.h"
+#include "control/C4PlayerInfo.h"
+#include "control/C4Record.h"
+#include "control/C4RoundResults.h"
+#include "editor/C4Console.h"
+#include "game/C4Application.h"
+#include "game/C4FullScreen.h"
+#include "game/C4GraphicsSystem.h"
+#include "game/C4Viewport.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4ChatDlg.h"
+#include "gui/C4GameLobby.h"
+#include "gui/C4GameMessage.h"
+#include "gui/C4GameOverDlg.h"
+#include "gui/C4LoaderScreen.h"
+#include "gui/C4MessageInput.h"
+#include "gui/C4MouseControl.h"
+#include "gui/C4ScriptGuiWindow.h"
+#include "gui/C4Startup.h"
+#include "landscape/C4Landscape.h"
+#include "landscape/C4MapScript.h"
+#include "landscape/C4MassMover.h"
+#include "landscape/C4Material.h"
+#include "landscape/C4PXS.h"
+#include "landscape/C4Particles.h"
+#include "landscape/C4Sky.h"
+#include "landscape/C4SolidMask.h"
+#include "landscape/C4Texture.h"
+#include "landscape/C4Weather.h"
+#include "landscape/fow/C4FoW.h"
+#include "lib/C4Random.h"
+#include "lib/C4Stat.h"
+#include "lib/StdMesh.h"
+#include "network/C4League.h"
+#include "network/C4Network2Dialogs.h"
+#include "network/C4Network2Reference.h"
+#include "network/C4Network2Stats.h"
+#include "object/C4Command.h"
 #include "object/C4Def.h"
 #include "object/C4DefList.h"
-#include "script/C4Effect.h"
-#include "platform/C4FileMonitor.h"
-#include "control/C4GameSave.h"
-#include "control/C4Record.h"
-#include "game/C4Application.h"
-#include "object/C4Object.h"
-#include "object/C4ObjectInfo.h"
-#include "lib/C4Random.h"
-#include "object/C4ObjectCom.h"
-#include "game/C4FullScreen.h"
-#include "gui/C4Startup.h"
-#include "game/C4Viewport.h"
-#include "object/C4Command.h"
-#include "lib/C4Stat.h"
-#include "network/C4League.h"
-#include "control/C4PlayerInfo.h"
-#include "gui/C4LoaderScreen.h"
-#include "network/C4Network2Dialogs.h"
-#include "editor/C4Console.h"
-#include "network/C4Network2Stats.h"
-#include "lib/C4Log.h"
-#include "player/C4Player.h"
-#include "gui/C4GameOverDlg.h"
-#include "control/C4GameParameters.h"
-#include "object/C4ObjectMenu.h"
-#include "gui/C4GameLobby.h"
-#include "gui/C4ChatDlg.h"
-#include "control/C4PlayerControl.h"
-#include "gui/C4MouseControl.h"
-#include "landscape/C4PXS.h"
-#include "gui/C4MessageInput.h"
-#include "landscape/C4MassMover.h"
-#include "player/C4RankSystem.h"
-#include "control/C4RoundResults.h"
-#include "gui/C4GameMessage.h"
-#include "gui/C4ScriptGuiWindow.h"
-#include "landscape/C4Material.h"
-#include "network/C4Network2Reference.h"
-#include "landscape/C4Weather.h"
-#include "graphics/C4GraphicsResource.h"
-#include "game/C4GraphicsSystem.h"
-#include "landscape/C4Texture.h"
-#include "landscape/C4Landscape.h"
-#include "landscape/C4Sky.h"
-#include "player/C4PlayerList.h"
 #include "object/C4GameObjects.h"
-#include "control/C4GameControl.h"
-#include "C4Version.h"
+#include "object/C4Object.h"
+#include "object/C4ObjectCom.h"
+#include "object/C4ObjectInfo.h"
+#include "object/C4ObjectMenu.h"
+#include "platform/C4FileMonitor.h"
+#include "player/C4Player.h"
+#include "player/C4PlayerList.h"
+#include "player/C4RankSystem.h"
+#include "script/C4AulDebug.h"
 #include "script/C4AulExec.h"
-#include "platform/StdFile.h"
-#include "landscape/C4MapScript.h"
-#include "landscape/C4SolidMask.h"
-#include "landscape/fow/C4FoW.h"
-#include "landscape/C4Particles.h"
-#include "lib/StdMesh.h"
+#include "script/C4Effect.h"
 
 #include <unordered_map>
 

src/game/C4Game.h

@@ -20,15 +20,13 @@
 #ifndef INC_C4Game
 #define INC_C4Game
 
-#include "landscape/C4Scenario.h"
-#include "landscape/C4PathFinder.h"
 #include "c4group/C4Extra.h"
-#include "gui/C4Scoreboard.h"
 #include "control/C4PlayerControl.h"
+#include "gui/C4Scoreboard.h"
+#include "landscape/C4PathFinder.h"
+#include "landscape/C4Scenario.h"
 #include "landscape/C4TransferZone.h"
 
-#include <memory>
-
 class C4ScriptGuiWindow;
 
 class C4Game

src/game/C4GameScript.cpp

@@ -21,34 +21,32 @@
 #include "C4ForbidLibraryCompilation.h"
 #include "game/C4GameScript.h"
 
-#include "game/C4Application.h"
-#include "script/C4AulDefFunc.h"
-#include "object/C4Command.h"
-#include "object/C4DefList.h"
-#include "editor/C4Console.h"
-#include "game/C4Game.h"
-#include "object/C4GameObjects.h"
 #include "control/C4GameControl.h"
-#include "gui/C4GameMessage.h"
-#include "platform/C4GamePadCon.h"
-#include "game/C4GraphicsSystem.h"
-#include "lib/C4Log.h"
-#include "gui/C4MessageInput.h"
-#include "gui/C4ScriptGuiWindow.h"
-#include "gui/C4MouseControl.h"
-#include "player/C4Player.h"
-#include "player/C4PlayerList.h"
-#include "landscape/C4PXS.h"
 #include "control/C4RoundResults.h"
-#include "landscape/C4Texture.h"
-#include "landscape/C4Weather.h"
+#include "editor/C4Console.h"
+#include "game/C4Application.h"
+#include "game/C4GraphicsSystem.h"
 #include "game/C4Viewport.h"
-#include "landscape/fow/C4FoW.h"
-#include "landscape/C4Landscape.h"
-#include "landscape/C4Sky.h"
-#include "landscape/C4Particles.h"
 #include "graphics/C4GraphicsResource.h"
 #include "graphics/C4Shader.h"
+#include "gui/C4GameMessage.h"
+#include "gui/C4MessageInput.h"
+#include "gui/C4MouseControl.h"
+#include "gui/C4ScriptGuiWindow.h"
+#include "landscape/C4Landscape.h"
+#include "landscape/C4PXS.h"
+#include "landscape/C4Particles.h"
+#include "landscape/C4Sky.h"
+#include "landscape/C4Texture.h"
+#include "landscape/C4Weather.h"
+#include "landscape/fow/C4FoW.h"
+#include "object/C4Command.h"
+#include "object/C4DefList.h"
+#include "object/C4GameObjects.h"
+#include "platform/C4GamePadCon.h"
+#include "player/C4Player.h"
+#include "player/C4PlayerList.h"
+#include "script/C4AulDefFunc.h"
 
 C4Effect ** FnGetEffectsFor(C4PropList * pTarget)
 {

src/game/C4GraphicsSystem.cpp

@@ -21,20 +21,19 @@
 #include "C4ForbidLibraryCompilation.h"
 #include "game/C4GraphicsSystem.h"
 
-#include "game/C4Viewport.h"
-#include "game/C4Application.h"
 #include "editor/C4Console.h"
+#include "game/C4Application.h"
 #include "game/C4FullScreen.h"
+#include "game/C4Viewport.h"
+#include "graphics/C4Draw.h"
+#include "graphics/C4GraphicsResource.h"
+#include "graphics/StdPNG.h"
 #include "gui/C4Gui.h"
 #include "gui/C4LoaderScreen.h"
-#include "graphics/C4GraphicsResource.h"
 #include "landscape/C4Landscape.h"
 #include "landscape/C4Sky.h"
 #include "network/C4Network2.h"
-#include "game/C4Game.h"
 #include "object/C4GameObjects.h"
-#include "graphics/StdPNG.h"
-#include "graphics/C4Draw.h"
 
 static const int MAX_BACKGROUND_FPS = 5;
 

src/game/C4GraphicsSystem.h

@@ -23,8 +23,6 @@
 #include "gui/C4MessageBoard.h"
 #include "gui/C4UpperBoard.h"
 
-#include <memory>
-
 class C4GraphicsSystem
 {
 public:

src/game/C4Physics.h

@@ -20,8 +20,6 @@
 #ifndef INC_C4Physics
 #define INC_C4Physics
 
-#include "lib/C4Real.h"
-
 const int StableRange=10;
 const int AttachRange=5;
 const int CornerRange=AttachRange+2;

src/game/C4Viewport.cpp

@@ -21,28 +21,28 @@
 #include "C4ForbidLibraryCompilation.h"
 #include "game/C4Viewport.h"
 
-#include "editor/C4ViewportWindow.h"
 #include "editor/C4Console.h"
-#include "object/C4Def.h"
-#include "object/C4Object.h"
+#include "editor/C4ViewportWindow.h"
 #include "game/C4FullScreen.h"
-#include "lib/C4Stat.h"
-#include "player/C4Player.h"
-#include "object/C4ObjectMenu.h"
-#include "gui/C4MouseControl.h"
-#include "landscape/C4PXS.h"
-#include "gui/C4GameMessage.h"
-#include "gui/C4ScriptGuiWindow.h"
-#include "graphics/C4GraphicsResource.h"
 #include "game/C4GraphicsSystem.h"
-#include "landscape/C4Landscape.h"
-#include "landscape/C4Sky.h"
-#include "player/C4PlayerList.h"
-#include "object/C4GameObjects.h"
-#include "network/C4Network2.h"
-#include "landscape/fow/C4FoWRegion.h"
-#include "landscape/C4Particles.h"
 #include "graphics/C4Draw.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4GameMessage.h"
+#include "gui/C4MouseControl.h"
+#include "gui/C4ScriptGuiWindow.h"
+#include "landscape/C4Landscape.h"
+#include "landscape/C4PXS.h"
+#include "landscape/C4Particles.h"
+#include "landscape/C4Sky.h"
+#include "landscape/fow/C4FoWRegion.h"
+#include "lib/C4Stat.h"
+#include "network/C4Network2.h"
+#include "object/C4Def.h"
+#include "object/C4GameObjects.h"
+#include "object/C4Object.h"
+#include "object/C4ObjectMenu.h"
+#include "player/C4Player.h"
+#include "player/C4PlayerList.h"
 
 void C4Viewport::DropFile(const char* fileName, float x, float y)
 {

src/game/ClonkMain.cpp

@@ -20,8 +20,6 @@
 #include "C4Include.h"
 #include "game/C4Application.h"
 
-#include "lib/C4Log.h"
-#include "game/C4Game.h"
 #include "C4Version.h"
 #include "network/C4Network2.h"
 

src/graphics/C4Draw.cpp

@@ -20,19 +20,16 @@
 #include "C4ForbidLibraryCompilation.h"
 #include "graphics/C4Draw.h"
 
-#include "platform/C4App.h"
-#include "graphics/C4FontLoader.h"
-#include "platform/C4Window.h"
 #include "graphics/C4DrawGL.h"
 #include "graphics/C4DrawT.h"
+#include "graphics/C4FontLoader.h"
+#include "graphics/CSurface8.h"
 #include "lib/C4Markup.h"
 #include "lib/C4Rect.h"
-#include "config/C4Config.h"
-#include "lib/StdMesh.h"
-#include "graphics/CSurface8.h"
 #include "lib/StdColors.h"
-
-#include <cstdio>
+#include "lib/StdMesh.h"
+#include "platform/C4App.h"
+#include "platform/C4Window.h"
 
 // Instruct Optimus laptops to use nVidia GPU instead of integrated GPU
 #if defined(_WIN32) && !defined(USE_CONSOLE)

src/graphics/C4Draw.h

@@ -19,9 +19,9 @@
 #ifndef INC_STDDDRAW2
 #define INC_STDDDRAW2
 
+#include "lib/StdMeshMaterial.h"
 #include "graphics/C4Surface.h"
 #include "graphics/C4BltTransform.h"
-#include "lib/StdMeshMaterial.h"
 
 // Global Draw access pointer
 extern C4Draw *pDraw;

src/graphics/C4DrawGL.cpp

@@ -20,24 +20,15 @@
 #include "C4ForbidLibraryCompilation.h"
 #include "graphics/C4DrawGL.h"
 
+#include "game/C4Application.h"
 #include "graphics/C4Surface.h"
-#include "platform/C4Window.h"
 #include "landscape/fow/C4FoWRegion.h"
 #include "lib/C4Rect.h"
-#include "config/C4Config.h"
-#include "game/C4Application.h"
 #include "lib/StdColors.h"
+#include "platform/C4Window.h"
 
 #ifndef USE_CONSOLE
 
-// MSVC doesn't define M_PI in math.h unless requested
-#ifdef  _MSC_VER
-#define _USE_MATH_DEFINES
-#endif  /* _MSC_VER */
-
-#include <cstdio>
-#include <cmath>
-
 namespace
 {
 	const char *MsgSourceToStr(GLenum source)

src/graphics/C4DrawGLCtx.cpp

@@ -20,8 +20,8 @@
 #include "C4ForbidLibraryCompilation.h"
 #include "graphics/C4DrawGL.h"
 
-#include "platform/C4Window.h"
 #include "platform/C4App.h"
+#include "platform/C4Window.h"
 
 #ifndef USE_CONSOLE
 

src/graphics/C4DrawMeshGL.cpp

@@ -18,16 +18,16 @@
 
 #include "C4Include.h"
 #include "C4ForbidLibraryCompilation.h"
-#include "object/C4Object.h"
+
 #include "graphics/C4DrawGL.h"
+#include "graphics/C4GraphicsResource.h"
 #include "landscape/fow/C4FoWRegion.h"
 #include "lib/SHA1.h"
+#include "lib/StdMesh.h"
+#include "object/C4Object.h"
 #include "object/C4MeshDenumerator.h"
 
-#include "lib/StdMesh.h"
-#include "graphics/C4GraphicsResource.h"
 #include <clocale>
-#include <stdexcept>
 
 #ifndef USE_CONSOLE
 

src/graphics/C4FontLoader.cpp

@@ -22,16 +22,10 @@
 
 #ifndef USE_CONSOLE
 #include "c4group/C4Components.h"
-#include "config/C4Config.h"
-#include "graphics/C4Draw.h"
-#include "c4group/C4Language.h"
-#include "lib/C4Log.h"
 #include "lib/C4Markup.h"
-#include "graphics/C4Surface.h"
 #include "lib/StdColors.h"
-
-#include <stdexcept>
-#include <string>
+#include "graphics/C4Draw.h"
+#include "graphics/C4Surface.h"
 
 #ifdef _WIN32
 #include "platform/C4windowswrapper.h"

src/graphics/C4FontLoader.h

@@ -23,9 +23,6 @@
 #include "graphics/C4Facet.h"
 #include "graphics/C4Surface.h"
 #include "graphics/C4FontLoaderCustomImages.h"
-#include "lib/StdBuf.h"
-#include <stdio.h>
-#include <map>
 
 // Font rendering flags
 #define STDFONT_CENTERED    0x0001

src/graphics/C4GraphicsResource.cpp

@@ -21,12 +21,10 @@
 #include "C4ForbidLibraryCompilation.h"
 #include "graphics/C4GraphicsResource.h"
 
-#include "object/C4DefList.h"
-#include "graphics/C4FontLoader.h"
-#include "lib/C4Log.h"
-#include "game/C4Game.h"
 #include "c4group/C4Components.h"
+#include "graphics/C4FontLoader.h"
 #include "graphics/C4DrawGL.h"
+#include "object/C4DefList.h"
 
 /* C4GraphicsResource */
 

src/graphics/C4Shader.h

@@ -19,7 +19,6 @@
 #define INC_C4Shader
 
 #include "C4ForbidLibraryCompilation.h"
-#include "lib/StdBuf.h"
 #include "lib/StdMeshMath.h"
 #include "graphics/C4Surface.h"
 

src/graphics/C4Surface.cpp

@@ -20,30 +20,20 @@
 #include "C4ForbidLibraryCompilation.h"
 #include "graphics/C4Surface.h"
 
-#include "platform/StdFile.h"
 #include "c4group/CStdFile.h"
-#include "platform/C4App.h"
+#include "graphics/Bitmap256.h"
+#include "graphics/C4Draw.h"
 #include "graphics/C4DrawGL.h"
+#include "graphics/StdPNG.h"
+#include "lib/StdColors.h"
+#include "platform/C4App.h"
 #include "platform/C4Window.h"
 #include "platform/StdRegistry.h"
-#include "graphics/C4Draw.h"
-#include "graphics/Bitmap256.h"
-#include "graphics/StdPNG.h"
-#include "config/C4Config.h"
-#include "lib/StdColors.h"
-
 
 #ifdef HAVE_IO_H
 #include <io.h>
 #endif
 
-#include <cmath>
-#include <cstdio>
-#include <cstdlib>
-#include <ctime>
-#include <climits>
-#include <list>
-
 C4Surface::C4Surface() : fIsBackground(false)
 {
 	Default();

src/graphics/C4Surface.h

@@ -21,8 +21,6 @@
 #include "C4ForbidLibraryCompilation.h"
 #include "lib/C4Rect.h"
 
-#include <list>
-
 // blitting modes
 #define C4GFXBLIT_NORMAL          0 // regular blit
 #define C4GFXBLIT_ADDITIVE        1 // all blits additive

src/graphics/C4SurfaceLoaders.cpp

@@ -22,7 +22,6 @@
 
 #include "c4group/C4GroupSet.h"
 #include "c4group/C4Group.h"
-#include "lib/C4Log.h"
 #include "graphics/StdPNG.h"
 #include "lib/StdColors.h"
 

src/gui/C4ChatDlg.cpp

@@ -19,10 +19,10 @@
 #include "gui/C4ChatDlg.h"
 
 #include "game/C4Application.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4MessageInput.h"
 #include "lib/C4InputValidation.h"
 #include "network/C4Network2IRC.h"
-#include "gui/C4MessageInput.h"
-#include "graphics/C4GraphicsResource.h"
 
 /* C4ChatControl::ChatSheet::NickItem */
 

src/gui/C4DownloadDlg.cpp

@@ -18,7 +18,6 @@
 #include "C4Include.h"
 #include "gui/C4DownloadDlg.h"
 
-#include "lib/C4Log.h"
 #include "graphics/C4GraphicsResource.h"
 
 C4Network2HTTPClient HTTPClient;

src/gui/C4FileSelDlg.cpp

@@ -18,9 +18,9 @@
 #include "C4Include.h"
 #include "gui/C4FileSelDlg.h"
 
-#include "graphics/C4GraphicsResource.h" // only for single use of ::GraphicsResource.fctOKCancel below...
 #include "C4Version.h"
 #include "graphics/C4Draw.h"
+#include "graphics/C4GraphicsResource.h" // only for single use of ::GraphicsResource.fctOKCancel below...
 
 #ifdef _WIN32
 #ifndef _WIN32_IE

src/gui/C4GameDialogs.cpp

@@ -18,7 +18,6 @@
 #include "C4Include.h"
 #include "gui/C4GameDialogs.h"
 
-#include "game/C4Game.h"
 #include "network/C4Network2.h"
 
 bool C4AbortGameDialog::is_shown = false;

src/gui/C4GameLobby.cpp

@@ -19,17 +19,16 @@
 #include "C4ForbidLibraryCompilation.h"
 #include "gui/C4GameLobby.h"
 
-#include "game/C4Application.h"
 #include "c4group/C4Components.h"
-#include "network/C4Network2Dialogs.h"
-#include "gui/C4GameOptions.h"
-#include "gui/C4ChatDlg.h"
-#include "gui/C4PlayerInfoListBox.h"
-#include "gui/C4MessageInput.h"
-#include "game/C4Game.h"
-#include "network/C4Network2.h"
-#include "graphics/C4GraphicsResource.h"
 #include "control/C4GameControl.h"
+#include "game/C4Application.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4ChatDlg.h"
+#include "gui/C4GameOptions.h"
+#include "gui/C4MessageInput.h"
+#include "gui/C4PlayerInfoListBox.h"
+#include "network/C4Network2.h"
+#include "network/C4Network2Dialogs.h"
 
 namespace C4GameLobby
 {

src/gui/C4GameMessage.cpp

@@ -20,12 +20,12 @@
 #include "C4Include.h"
 #include "gui/C4GameMessage.h"
 
+#include "graphics/C4Draw.h"
+#include "graphics/C4GraphicsResource.h"
 #include "object/C4Def.h"
 #include "object/C4Object.h"
-#include "graphics/C4GraphicsResource.h"
 #include "player/C4Player.h"
 #include "player/C4PlayerList.h"
-#include "graphics/C4Draw.h"
 
 const int32_t ObjectMsgDelayFactor = 2, GlobalMsgDelayFactor = 3; // frames per char message display time
 

src/gui/C4GameOptions.cpp

@@ -18,9 +18,8 @@
 #include "C4Include.h"
 #include "gui/C4GameOptions.h"
 
-#include "game/C4Application.h"
-#include "game/C4Game.h"
 #include "control/C4GameControl.h"
+#include "game/C4Application.h"
 #include "graphics/C4GraphicsResource.h"
 #include "gui/C4GameLobby.h"
 #include "gui/C4Startup.h"

src/gui/C4GameOverDlg.cpp

@@ -18,18 +18,16 @@
 #include "C4Include.h"
 #include "gui/C4GameOverDlg.h"
 
+#include "control/C4GameControl.h"
 #include "game/C4Application.h"
+#include "game/C4FullScreen.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4PlayerInfoListBox.h"
 #include "object/C4Def.h"
 #include "object/C4DefList.h"
-#include "game/C4Game.h"
-#include "game/C4FullScreen.h"
-#include "player/C4Player.h"
-#include "gui/C4PlayerInfoListBox.h"
-#include "player/C4PlayerList.h"
 #include "object/C4GameObjects.h"
-#include "control/C4GameControl.h"
-#include "graphics/C4GraphicsResource.h"
-
+#include "player/C4Player.h"
+#include "player/C4PlayerList.h"
 
 // ---------------------------------------------------
 // C4GoalDisplay

src/gui/C4Gui.cpp

@@ -19,16 +19,15 @@
 #include "C4Include.h"
 #include "gui/C4Gui.h"
 
-#include "game/C4FullScreen.h"
-#include "gui/C4LoaderScreen.h"
 #include "game/C4Application.h"
-#include "game/C4Viewport.h"
-#include "lib/C4Log.h"
-#include "platform/C4GamePadCon.h"
-#include "gui/C4MouseControl.h"
-#include "graphics/C4GraphicsResource.h"
-#include "graphics/C4Draw.h"
+#include "game/C4FullScreen.h"
 #include "game/C4GraphicsSystem.h"
+#include "game/C4Viewport.h"
+#include "graphics/C4Draw.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4LoaderScreen.h"
+#include "gui/C4MouseControl.h"
+#include "platform/C4GamePadCon.h"
 
 namespace C4GUI
 {

src/gui/C4Gui.h

@@ -23,14 +23,14 @@
 #ifndef INC_C4Gui
 #define INC_C4Gui
 
-#include "graphics/C4FontLoader.h"
-#include "lib/C4Rect.h"
 #include "graphics/C4FacetEx.h"
-#include "lib/C4LogBuf.h"
+#include "graphics/C4FontLoader.h"
 #include "gui/C4KeyboardInput.h"
-#include "platform/StdScheduler.h"
+#include "lib/C4Rect.h"
+#include "lib/C4LogBuf.h"
 #include "object/C4Id.h"
 #include "platform/C4Window.h"
+#include "platform/StdScheduler.h"
 
 // consts (load those from a def file some time)
 // font colors - alpha is font alpha, which is inversed opaque

src/gui/C4GuiButton.cpp

@@ -19,9 +19,9 @@
 #include "C4Include.h"
 #include "gui/C4Gui.h"
 
-#include "gui/C4MouseControl.h"
-#include "graphics/C4GraphicsResource.h"
 #include "graphics/C4Draw.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4MouseControl.h"
 
 namespace C4GUI
 {

src/gui/C4GuiCheckBox.cpp

@@ -19,12 +19,10 @@
 #include "C4Include.h"
 #include "gui/C4Gui.h"
 
-#include "graphics/C4FacetEx.h"
-#include "gui/C4MouseControl.h"
-#include "graphics/C4GraphicsResource.h"
 #include "graphics/C4Draw.h"
-
-#include "platform/C4Window.h"
+#include "graphics/C4FacetEx.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4MouseControl.h"
 
 namespace C4GUI
 {

src/gui/C4GuiComboBox.cpp

@@ -20,12 +20,10 @@
 #include "C4Include.h"
 #include "gui/C4Gui.h"
 
-#include "graphics/C4FacetEx.h"
-#include "gui/C4MouseControl.h"
-#include "graphics/C4GraphicsResource.h"
 #include "graphics/C4Draw.h"
-
-#include "platform/C4Window.h"
+#include "graphics/C4FacetEx.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4MouseControl.h"
 
 namespace C4GUI
 {

src/gui/C4GuiContainers.cpp

@@ -19,9 +19,9 @@
 #include "C4Include.h"
 #include "gui/C4Gui.h"
 
-#include "gui/C4MouseControl.h"
-#include "graphics/C4GraphicsResource.h"
 #include "graphics/C4Draw.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4MouseControl.h"
 
 namespace C4GUI
 {

src/gui/C4GuiDialogs.cpp

@@ -21,14 +21,13 @@
 #include "C4ForbidLibraryCompilation.h"
 #include "gui/C4Gui.h"
 
-#include "object/C4DefList.h"
-#include "game/C4Application.h"
-#include "game/C4Viewport.h"
-#include "object/C4Def.h"
-#include "graphics/C4GraphicsResource.h"
-#include "graphics/C4Draw.h"
 #include "game/C4Application.h"
 #include "game/C4GameScript.h"
+#include "game/C4Viewport.h"
+#include "graphics/C4Draw.h"
+#include "graphics/C4GraphicsResource.h"
+#include "object/C4DefList.h"
+#include "object/C4Def.h"
 
 #include "graphics/C4DrawGL.h"
 #include "platform/StdRegistry.h"

src/gui/C4GuiEdit.cpp

@@ -20,9 +20,9 @@
 #include "gui/C4Gui.h"
 
 #include "game/C4Application.h"
-#include "gui/C4MouseControl.h"
-#include "graphics/C4GraphicsResource.h"
 #include "graphics/C4Draw.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4MouseControl.h"
 
 namespace C4GUI
 {

src/gui/C4GuiLabels.cpp

@@ -19,9 +19,9 @@
 #include "C4Include.h"
 #include "gui/C4Gui.h"
 
-#include "gui/C4MouseControl.h"
-#include "graphics/C4GraphicsResource.h"
 #include "graphics/C4Draw.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4MouseControl.h"
 
 namespace C4GUI
 {

src/gui/C4GuiListBox.cpp

@@ -19,9 +19,8 @@
 #include "C4Include.h"
 #include "gui/C4Gui.h"
 
-#include "gui/C4MouseControl.h"
 #include "graphics/C4Draw.h"
-#include <algorithm>
+#include "gui/C4MouseControl.h"
 
 namespace C4GUI
 {

src/gui/C4GuiMenu.cpp

@@ -19,12 +19,10 @@
 #include "C4Include.h"
 #include "gui/C4Gui.h"
 
-#include "graphics/C4FacetEx.h"
-#include "gui/C4MouseControl.h"
-#include "graphics/C4GraphicsResource.h"
 #include "graphics/C4Draw.h"
-
-#include "platform/C4Window.h"
+#include "graphics/C4FacetEx.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4MouseControl.h"
 
 namespace C4GUI
 {

src/gui/C4GuiTabular.cpp

@@ -19,10 +19,10 @@
 #include "C4Include.h"
 #include "gui/C4Gui.h"
 
-#include "graphics/C4FacetEx.h"
-#include "gui/C4MouseControl.h"
-#include "graphics/C4GraphicsResource.h"
 #include "graphics/C4Draw.h"
+#include "graphics/C4FacetEx.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4MouseControl.h"
 
 namespace C4GUI
 {

src/gui/C4KeyboardInput.cpp

@@ -19,13 +19,8 @@
 #include "gui/C4KeyboardInput.h"
 
 #include "c4group/C4Components.h"
-#include "game/C4Game.h"
 #include "platform/C4Window.h"
 
-
-#include <algorithm>
-#include <regex>
-#include <string>
 #include <unordered_map>
 
 #ifdef HAVE_SDL

src/gui/C4KeyboardInput.h

@@ -18,13 +18,6 @@
 #ifndef INC_C4KeyboardInput
 #define INC_C4KeyboardInput
 
-#include <vector>
-#include <map>
-#include <cctype>
-#include <vector>
-#include <map>
-#include <algorithm>
-
 // key context classifications
 enum C4KeyScope
 {

src/gui/C4LoaderScreen.cpp

@@ -19,13 +19,11 @@
 #include "gui/C4LoaderScreen.h"
 
 #include "c4group/C4Components.h"
-#include "lib/C4LogBuf.h"
-#include "lib/C4Log.h"
-#include "graphics/C4GraphicsResource.h"
-#include "graphics/C4Draw.h"
-#include "lib/C4Random.h"
 #include "c4group/C4GroupSet.h"
-#include "game/C4Game.h"
+#include "graphics/C4Draw.h"
+#include "graphics/C4GraphicsResource.h"
+#include "lib/C4LogBuf.h"
+#include "lib/C4Random.h"
 
 C4LoaderScreen::C4LoaderScreen()
 {

src/gui/C4MainMenu.cpp

@@ -19,19 +19,18 @@
 #include "C4Include.h"
 #include "gui/C4MainMenu.h"
 
+#include "control/C4GameControl.h"
 #include "game/C4Application.h"
-#include "object/C4DefList.h"
 #include "game/C4FullScreen.h"
 #include "game/C4Viewport.h"
-#include "player/C4Player.h"
-#include "gui/C4GameOverDlg.h"
 #include "graphics/C4GraphicsResource.h"
-#include "game/C4Game.h"
-#include "player/C4PlayerList.h"
-#include "object/C4GameObjects.h"
+#include "gui/C4GameOverDlg.h"
 #include "network/C4Network2.h"
-#include "control/C4GameControl.h"
 #include "object/C4Def.h"
+#include "object/C4DefList.h"
+#include "object/C4GameObjects.h"
+#include "player/C4Player.h"
+#include "player/C4PlayerList.h"
 
 // -----------------------------------------------------------
 // C4MainMenu

src/gui/C4Menu.cpp

@@ -20,18 +20,17 @@
 #include "C4Include.h"
 #include "gui/C4Menu.h"
 
+#include "control/C4GameControl.h"
+#include "game/C4Viewport.h"
+#include "graphics/C4Draw.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4MouseControl.h"
+#include "lib/StdColors.h"
 #include "object/C4Def.h"
 #include "object/C4DefList.h"
 #include "object/C4Object.h"
-#include "game/C4Viewport.h"
 #include "player/C4Player.h"
-#include "gui/C4MouseControl.h"
-#include "graphics/C4GraphicsResource.h"
-#include "graphics/C4Draw.h"
-#include "game/C4Game.h"
 #include "player/C4PlayerList.h"
-#include "control/C4GameControl.h"
-#include "lib/StdColors.h"
 
 const int32_t     C4MN_DefInfoWdt     = 270, // default width of info windows
                   C4MN_DlgWdt         = 270, // default width of dialog windows

src/gui/C4Menu.h

@@ -20,9 +20,9 @@
 #ifndef INC_C4Menu
 #define INC_C4Menu
 
-#include "object/C4Id.h"
 #include "graphics/C4FacetEx.h"
 #include "gui/C4Gui.h"
+#include "object/C4Id.h"
 #include "object/C4IDList.h"
 
 enum

src/gui/C4MessageBoard.cpp

@@ -21,17 +21,16 @@
 #include "gui/C4MessageBoard.h"
 
 #include "game/C4Application.h"
-#include "gui/C4LoaderScreen.h"
-#include "gui/C4Gui.h"
-#include "player/C4Player.h"
-#include "game/C4GraphicsSystem.h"
-#include "graphics/C4GraphicsResource.h"
-#include "graphics/C4Draw.h"
-#include "gui/C4MessageInput.h"
-#include "game/C4Game.h"
-#include "player/C4PlayerList.h"
 #include "game/C4FullScreen.h"
+#include "game/C4GraphicsSystem.h"
+#include "graphics/C4Draw.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4Gui.h"
+#include "gui/C4LoaderScreen.h"
+#include "gui/C4MessageInput.h"
 #include "lib/StdColors.h"
+#include "player/C4Player.h"
+#include "player/C4PlayerList.h"
 
 const int C4LogSize=30000, C4LogMaxLines=1000;
 

src/gui/C4MessageInput.cpp

@@ -18,18 +18,16 @@
 #include "C4Include.h"
 #include "gui/C4MessageInput.h"
 
-#include "game/C4Game.h"
-#include "object/C4Object.h"
-#include "gui/C4Gui.h"
+#include "control/C4GameControl.h"
 #include "editor/C4Console.h"
 #include "game/C4Application.h"
-#include "lib/C4Log.h"
-#include "player/C4Player.h"
-#include "gui/C4GameLobby.h"
 #include "game/C4GraphicsSystem.h"
-#include "player/C4PlayerList.h"
-#include "control/C4GameControl.h"
 #include "graphics/C4GraphicsResource.h"
+#include "gui/C4Gui.h"
+#include "gui/C4GameLobby.h"
+#include "object/C4Object.h"
+#include "player/C4Player.h"
+#include "player/C4PlayerList.h"
 
 // --------------------------------------------------
 // C4ChatInputDialog

src/gui/C4MouseControl.cpp

@@ -20,22 +20,21 @@
 #include "C4Include.h"
 #include "gui/C4MouseControl.h"
 
-#include "game/C4Viewport.h"
-#include "object/C4Def.h"
-#include "object/C4Object.h"
+#include "control/C4GameControl.h"
 #include "game/C4Application.h"
 #include "game/C4FullScreen.h"
-#include "gui/C4Gui.h"
-#include "landscape/C4Landscape.h"
-#include "game/C4Game.h"
-#include "player/C4Player.h"
-#include "gui/C4ChatDlg.h"
-#include "graphics/C4GraphicsResource.h"
+#include "game/C4Viewport.h"
 #include "graphics/C4Draw.h"
-#include "player/C4PlayerList.h"
-#include "control/C4GameControl.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4ChatDlg.h"
+#include "gui/C4Gui.h"
 #include "gui/C4ScriptGuiWindow.h"
+#include "landscape/C4Landscape.h"
 #include "lib/StdMesh.h"
+#include "object/C4Def.h"
+#include "object/C4Object.h"
+#include "player/C4Player.h"
+#include "player/C4PlayerList.h"
 
 const int32_t C4MC_Drag_None            = 0,
               C4MC_Drag_Script          = 6,

src/gui/C4MouseControl.h

@@ -21,8 +21,8 @@
 #define INC_C4MouseControl
 
 #include "graphics/C4Facet.h"
-#include "object/C4ObjectList.h"
 #include "lib/C4Rect.h"
+#include "object/C4ObjectList.h"
 struct ZoomData; // #include "graphics/C4Draw.h"
 
 const int32_t C4MC_Button_None        = 0,

src/gui/C4PlayerInfoListBox.cpp

@@ -18,18 +18,17 @@
 #include "C4Include.h"
 #include "gui/C4PlayerInfoListBox.h"
 
+#include "control/C4GameControl.h"
 #include "control/C4PlayerInfo.h"
-#include "network/C4Network2Dialogs.h"
+#include "control/C4RoundResults.h"
 #include "control/C4Teams.h"
-#include "game/C4Game.h"
-#include "gui/C4FileSelDlg.h"
-#include "graphics/C4GraphicsResource.h"
 #include "graphics/C4Draw.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4FileSelDlg.h"
+#include "gui/C4GameLobby.h"
 #include "gui/C4MouseControl.h"
 #include "network/C4Network2.h"
-#include "control/C4GameControl.h"
-#include "control/C4RoundResults.h"
-#include "gui/C4GameLobby.h"
+#include "network/C4Network2Dialogs.h"
 
 DWORD GenerateRandomPlayerColor(int32_t iTry); // in C4PlayerInfoConflicts.cpp
 

src/gui/C4Scoreboard.cpp

@@ -18,10 +18,10 @@
 #include "C4Include.h"
 #include "gui/C4Scoreboard.h"
 
-#include "gui/C4Gui.h"
 #include "gui/C4GameOverDlg.h"
-#include "graphics/C4GraphicsResource.h"
+#include "gui/C4Gui.h"
 #include "graphics/C4Draw.h"
+#include "graphics/C4GraphicsResource.h"
 
 
 class C4ScoreboardDlg : public C4GUI::Dialog

src/gui/C4ScriptGuiWindow.cpp

@@ -29,22 +29,19 @@
 #include "C4Include.h"
 #include "gui/C4ScriptGuiWindow.h"
 
+#include "control/C4Control.h"
 #include "game/C4Application.h"
+#include "game/C4GraphicsSystem.h"
+#include "game/C4Viewport.h"
+#include "graphics/C4Draw.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4MouseControl.h"
+#include "lib/StdColors.h"
 #include "object/C4Def.h"
 #include "object/C4DefList.h"
-#include "game/C4GraphicsSystem.h"
-#include "graphics/C4GraphicsResource.h"
-#include "graphics/C4Draw.h"
-#include "game/C4Game.h"
-#include "control/C4Control.h"
-#include "gui/C4MouseControl.h"
 #include "object/C4Object.h"
 #include "player/C4Player.h"
 #include "player/C4PlayerList.h"
-#include "game/C4Viewport.h"
-#include "lib/StdColors.h"
-
-#include <cmath>
 
 // Adds some helpful logs for hunting control & menu based desyncs.
 //#define MenuDebugLogF(...) DebugLogF(__VA_ARGS__)

src/gui/C4ScriptGuiWindow.h

@@ -20,11 +20,8 @@
 
 #include "graphics/C4Surface.h"
 #include "gui/C4Gui.h"
-
 #include "script/C4Value.h"
 
-#include <map>
-
 enum C4ScriptGuiWindowPropertyName
 {
 	left = 0,

src/gui/C4Startup.cpp

@@ -19,18 +19,16 @@
 #include "C4ForbidLibraryCompilation.h"
 #include "gui/C4Startup.h"
 
+#include "game/C4Application.h"
+#include "game/C4GraphicsSystem.h"
 #include "graphics/C4FontLoader.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4StartupAboutDlg.h"
 #include "gui/C4StartupMainDlg.h"
-#include "gui/C4StartupScenSelDlg.h"
 #include "gui/C4StartupNetDlg.h"
 #include "gui/C4StartupOptionsDlg.h"
-#include "gui/C4StartupAboutDlg.h"
 #include "gui/C4StartupPlrSelDlg.h"
-#include "game/C4Game.h"
-#include "game/C4Application.h"
-#include "lib/C4Log.h"
-#include "graphics/C4GraphicsResource.h"
-#include "game/C4GraphicsSystem.h"
+#include "gui/C4StartupScenSelDlg.h"
 
 bool C4StartupGraphics::LoadFile(C4FacetID &rToFct, const char *szFilename)
 {

src/gui/C4StartupAboutDlg.cpp

@@ -18,9 +18,9 @@
 #include "C4Include.h"
 #include "gui/C4StartupAboutDlg.h"
 
-#include "gui/C4UpdateDlg.h"
-#include "graphics/C4GraphicsResource.h"
 #include "C4Version.h"
+#include "graphics/C4GraphicsResource.h"
+#include "gui/C4UpdateDlg.h"
 
 // ------------------------------------------------
 // --- C4StartupAboutDlg