Remove some redundant #includes

src/C4Prototypes.h

@@ -31,6 +31,8 @@ class C4AulScript;
 class C4AulScriptEngine;
 class C4AulScriptFunc;
 class C4BltTransform;
+class C4Client;
+class C4ClientCore;
 class C4ClientList;
 class C4ClientPlayerInfos;
 class C4Command;
@@ -67,6 +69,7 @@ class C4League;
 class C4LoaderScreen;
 class C4LSector;
 class C4LSectors;
+class C4MainMenu;
 class C4MapCreatorS2;
 class C4Markup;
 class C4MassMover;
@@ -78,10 +81,10 @@ class C4Menu;
 class C4MenuItem;
 class C4MouseControl;
 class C4NameList;
-class C4Network;
-class C4NetworkClient;
-class C4NetworkClientList;
+class C4Network2Client;
+class C4Network2IOConnection;
 class C4Network2IRCClient;
+class C4Network2RefClient;
 class C4Network2Reference;
 class C4Network2ResDlg;
 class C4Network2Stats;
@@ -90,7 +93,7 @@ class C4ObjectInfo;
 class C4ObjectInfoCore;
 class C4ObjectLink;
 class C4ObjectList;
-class C4Packet;
+class C4PacketJoinData;
 class C4PathFinder;
 class C4Pattern;
 class C4Playback;
@@ -124,6 +127,8 @@ class C4TexMapEntry;
 class C4TexMgr;
 class C4TexRef;
 class C4TextureMap;
+class C4TransferZone;
+class C4TransferZones;
 class C4Value;
 class C4ValueArray;
 class C4ValueNumbers;
@@ -146,10 +151,16 @@ class StdMeshMatManager;
 class StdMeshMatrix;
 class StdMeshSkeletonLoader;
 
+namespace C4GameLobby
+{
+	class Countdown;
+	class MainDlg;
+}
 namespace C4GUI
 {
 	class ComboBox_FillCB;
 	class Dialog;
+	class FrameDecoration;
 	class Screen;
 }
 typedef C4GUI::Screen C4GUIScreen;

src/c4group/C4ComponentHost.cpp

@@ -19,9 +19,6 @@
 
 #include <C4Include.h>
 #include <C4ComponentHost.h>
-#include <C4Language.h>
-
-#include <StdRegistry.h>
 
 bool C4ComponentHost::Load(C4Group &hGroup,
                            const char *fname,

src/c4group/C4ComponentHost.h

@@ -20,8 +20,6 @@
 #ifndef INC_C4ComponentHost
 #define INC_C4ComponentHost
 
-#include "C4GroupSet.h"
-
 class C4ComponentHost
 {
 public:

src/c4group/C4Group.cpp

@@ -24,21 +24,7 @@
 
 #include <C4Components.h>
 #include <C4InputValidation.h>
-#include <C4Config.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef _WIN32
-#include <sys/utime.h>
-#else
-#include <utime.h>
-#include <fcntl.h>
-#include <unistd.h>
-#endif
-
-#include <StdPNG.h>
 #include <zlib.h>
-#include <fcntl.h>
 
 
 //------------------------------ File Sort Lists -------------------------------------------

src/c4group/C4Group.h

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

src/c4group/C4GroupSet.cpp

@@ -19,7 +19,6 @@
 #include <C4Include.h>
 #include <C4GroupSet.h>
 
-#include <C4Game.h>
 #include <C4Components.h>
 #include <C4Group.h>
 #include <C4Log.h>

src/c4group/C4Update.cpp

@@ -16,7 +16,6 @@
 #include <C4Include.h>
 #include "C4Update.h"
 #include "C4Version.h"
-#include "C4Config.h"
 #include "C4Components.h"
 #include "C4Group.h"
 #include "C4Log.h"

src/c4group/C4Update.h

@@ -19,7 +19,6 @@
 
 #define INC_C4GroupEx
 
-#include "C4Group.h"
 #include "C4InputValidation.h"
 
 const int C4UP_MaxUpGrpCnt = 50;

src/c4group/CStdFile.cpp

@@ -28,7 +28,6 @@
 #include <zlib.h>
 #include <zlib/gzio.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 #include <sys/stat.h>
 #include <fcntl.h>

src/c4group/CStdFile.h

@@ -21,9 +21,7 @@
 #define INC_CSTDFILE
 
 #include <stdio.h>
-#include <StdFile.h>
 #include <StdSync.h> // for StdThreadCheck
-#include <StdBuf.h>
 #include <zlib.h> // for gzFile
 
 const int CStdFileBufSize = 4096;

src/control/C4GameControl.h

@@ -19,7 +19,6 @@
 #define INC_C4GameControl
 
 #include "C4Control.h"
-#include "C4Network2Client.h"
 #include "C4Record.h"
 
 enum C4ControlMode

src/control/C4GameParameters.cpp

@@ -21,7 +21,6 @@
 #include "C4Def.h"
 #include <C4DefList.h>
 #include <C4Game.h>
-#include <C4GameObjects.h>
 #include <C4Network2.h>
 
 // *** C4GameRes

src/control/C4GameParameters.h

@@ -20,7 +20,6 @@
 
 #include "C4IDList.h"
 #include "C4PlayerInfo.h"
-#include "C4LangStringTable.h"
 #include "C4Teams.h"
 #include "C4InfoCore.h"
 

src/control/C4GameSave.cpp

@@ -20,19 +20,17 @@
 
 #include <C4Components.h>
 #include <C4Game.h>
-#include <C4League.h>
-#include <C4Console.h>
 #include <C4Log.h>
-#include <C4Player.h>
 #include <C4Landscape.h>
 #include <C4PXS.h>
 #include <C4MassMover.h>
-#include <C4ScriptHost.h>
 #include <C4PlayerList.h>
-#include <C4GameObjects.h>
 #include <C4RoundResults.h>
 #include <C4Record.h>
 #include <C4Version.h>
+#include <C4GameParameters.h>
+#include <C4Value.h>
+#include <C4Network2.h>
 
 // *** C4GameSave main class
 

src/control/C4GameSave.h

@@ -27,7 +27,6 @@
 #define INC_C4GameSave
 
 #include <C4Scenario.h>
-#include <C4Group.h>
 #include <C4Components.h>
 
 class C4GameSave

src/control/C4PlayerInfo.cpp

@@ -27,6 +27,7 @@
 #include <C4FullScreen.h>
 #include <C4PlayerList.h>
 #include <C4GameControl.h>
+#include <C4Components.h>
 
 // *** C4PlayerInfo
 

src/control/C4PlayerInfoConflicts.cpp

@@ -19,10 +19,9 @@
 
 #include <C4Include.h>
 #include <C4PlayerInfo.h>
-#include <C4GraphicsSystem.h>
 #include <C4Game.h>
 #include <C4Teams.h>
-
+#include <StdColors.h>
 #include <C4Random.h>
 
 // number of times trying new player colors

src/control/C4RoundResults.cpp

@@ -19,7 +19,6 @@
 #include <C4RoundResults.h>
 
 #include <C4Player.h>
-#include <C4GraphicsSystem.h>
 #include <C4Game.h>
 #include <C4Object.h>
 #include <C4PlayerList.h>

src/control/C4RoundResults.h

@@ -23,7 +23,6 @@
 #ifndef INC_C4RoundResults
 #define INC_C4RoundResults
 
-#include "C4Constants.h"
 #include "C4Components.h"
 #include "C4IDList.h"
 #include "C4PacketBase.h"

src/editor/C4ObjectListDlg.cpp

@@ -20,8 +20,6 @@
 #include <C4ObjectListDlg.h>
 #include <C4Console.h>
 #include <C4Object.h>
-#include <C4Language.h>
-#include <C4Game.h>
 #include <C4GameObjects.h>
 
 

src/editor/C4ToolsDlg.cpp

@@ -20,15 +20,9 @@
 #include <C4Include.h>
 #include <C4ToolsDlg.h>
 #include <C4Console.h>
-#include <C4Application.h>
 #include <C4Texture.h>
 #include <C4Landscape.h>
-#include <C4Game.h>
 #include <C4GameControl.h>
-#include <StdRegistry.h>
-#ifndef USE_CONSOLE
-#include <C4DrawGL.h>
-#endif
 
 bool C4ToolsDlg::Open()
 {

src/editor/C4ToolsDlg.h

@@ -25,7 +25,6 @@
 #endif
 
 #include "C4Constants.h"
-#include "C4ConsoleGUI.h"
 
 const int32_t
 	C4TLS_Brush  = 0,

src/editor/C4ViewportWindow.cpp

@@ -22,17 +22,12 @@
 
 #include <C4Viewport.h>
 #include <C4Console.h>
-#include <C4MouseControl.h>
-#include <C4GraphicsSystem.h>
 #include <C4Landscape.h>
 #include <C4PlayerList.h>
-#include <StdRegistry.h>
 
-#ifdef USE_X11
 #ifdef WITH_DEVELOPER_MODE
 #include <gtk/gtk.h>
 #endif
-#endif
 
 #ifdef USE_WIN32_WINDOWS
 

src/editor/C4ViewportWindow.h

@@ -21,7 +21,6 @@
 #define INC_C4ViewportWindow
 
 #include <C4Window.h>
-#include <C4Viewport.h>
 
 #ifdef WITH_DEVELOPER_MODE
 #include <gtk/gtk.h>

src/game/C4FullScreen.cpp

@@ -23,17 +23,15 @@
 #include <C4Game.h>
 #include <C4Application.h>
 #include <C4Viewport.h>
-#include <C4League.h>
 #include <C4Language.h>
 #include <C4Gui.h>
-#include <C4Network2.h>
 #include <C4GameDialogs.h>
-#include <C4GamePadCon.h>
 #include <C4Player.h>
 #include <C4GameOverDlg.h>
 #include <C4GraphicsSystem.h>
 #include <C4MouseControl.h>
 #include <C4PlayerList.h>
+#include <C4Version.h>
 
 void C4FullScreen::CharIn(const char * c) { ::pGUI->CharIn(c); }
 

src/game/C4FullScreen.h

@@ -20,7 +20,6 @@
 #ifndef INC_C4FullScreen
 #define INC_C4FullScreen
 
-#include "C4MainMenu.h"
 #include <C4Window.h>
 
 bool IsKeyDown(int iKey);

src/game/C4Game.h

@@ -25,6 +25,7 @@
 #include <C4Extra.h>
 #include "C4Scoreboard.h"
 #include <C4PlayerControl.h>
+#include <C4TransferZone.h>
 
 class C4Game
 {

src/game/C4GraphicsSystem.cpp

@@ -21,21 +21,15 @@
 #include <C4GraphicsSystem.h>
 
 #include <C4Viewport.h>
-#include <C4ViewportWindow.h>
 #include <C4Application.h>
 #include <C4Console.h>
-#include <C4Random.h>
 #include <C4FullScreen.h>
 #include <C4Gui.h>
 #include <C4LoaderScreen.h>
-#include <C4Player.h>
-#include <C4SoundSystem.h>
-#include <C4MouseControl.h>
 #include <C4GraphicsResource.h>
 #include <C4Landscape.h>
 #include <C4Network2.h>
 #include <C4Game.h>
-#include <C4PlayerList.h>
 #include <C4GameObjects.h>
 
 #include <StdPNG.h>

src/game/C4GraphicsSystem.h

@@ -20,11 +20,9 @@
 #ifndef INC_C4GraphicsSystem
 #define INC_C4GraphicsSystem
 
-#include <C4FacetEx.h>
 #include <C4MessageBoard.h>
 #include <C4UpperBoard.h>
 #include <C4Video.h>
-#include <C4Shape.h>
 
 class C4GraphicsSystem
 {

src/game/C4Viewport.h

@@ -20,7 +20,7 @@
 #ifndef INC_C4Viewport
 #define INC_C4Viewport
 
-#include <C4Shape.h>
+#include <C4FacetEx.h>
 
 class C4Viewport
 {

src/gamescript/C4Effect.cpp

@@ -24,11 +24,9 @@
 #include <C4DefList.h>
 #include <C4Object.h>
 #include <C4Random.h>
-#include <C4Log.h>
 #include <C4Game.h>
 #include <C4Landscape.h>
 #include <C4PXS.h>
-#include <C4PlayerList.h>
 #include <C4GameObjects.h>
 #include <C4SoundSystem.h>
 

src/gamescript/C4Effect.h

@@ -24,7 +24,6 @@
 #ifndef INC_C4Effects
 #define INC_C4Effects
 
-#include <C4Constants.h>
 #include <C4ObjectPtr.h>
 #include <C4PropList.h>
 

src/gamescript/C4FindObject.h

@@ -16,10 +16,8 @@
 #ifndef C4FINDOBJECT_H
 #define C4FINDOBJECT_H
 
-#include "C4Id.h"
-#include "C4Shape.h"
-#include "C4Value.h"
-#include "C4Aul.h"
+#include <C4Value.h>
+#include <C4Rect.h>
 
 // Condition map
 enum C4FindObjectCondID

src/gamescript/C4GameScript.cpp

@@ -33,7 +33,6 @@
 #include <C4Log.h>
 #include <C4MessageInput.h>
 #include <C4MouseControl.h>
-#include <C4ObjectInfoList.h>
 #include <C4Player.h>
 #include <C4PlayerList.h>
 #include <C4PXS.h>

src/gamescript/C4TransferZone.cpp

@@ -20,7 +20,6 @@
 #include <C4Include.h>
 #include <C4TransferZone.h>
 
-#include <C4Game.h>
 #include <C4FacetEx.h>
 #include <C4Landscape.h>
 #include <C4GameObjects.h>

src/gamescript/C4TransferZone.h

@@ -20,8 +20,6 @@
 #ifndef INC_C4TransferZone
 #define INC_C4TransferZone
 
-class C4TransferZones;
-
 class C4TransferZone
 {
 	friend class C4TransferZones;

src/graphics/C4Draw.cpp

@@ -28,9 +28,9 @@
 #include "C4Rect.h"
 #include <C4Config.h>
 #include "StdMesh.h"
+#include <CSurface8.h>
 
 #include <stdio.h>
-#include <limits.h>
 
 // Instruct Optimus laptops to use nVidia GPU instead of integrated GPU
 #if defined(_WIN32) && !defined(USE_CONSOLE)

src/graphics/C4Draw.h

@@ -20,12 +20,7 @@
 #define INC_STDDDRAW2
 
 #include <C4Surface.h>
-#include <CSurface8.h>
-#include <StdBuf.h>
 #include <StdMeshMaterial.h>
-#ifdef _WIN32
-#include <C4windowswrapper.h>
-#endif
 
 // Global Draw access pointer
 extern C4Draw *pDraw;

src/graphics/C4DrawGL.cpp

@@ -24,7 +24,7 @@
 #include <C4FoWRegion.h>
 #include "C4Rect.h"
 #include "C4Config.h"
-#include "C4Application.h"
+#include <C4App.h>
 
 #ifndef USE_CONSOLE
 
@@ -35,7 +35,6 @@
 
 #include <stdio.h>
 #include <math.h>
-#include <limits.h>
 
 CStdGL::CStdGL():
 		pMainCtx(0)

src/graphics/C4DrawGL.h

@@ -25,14 +25,9 @@
 #endif
 #include <GL/glew.h>
 
-#if defined(__APPLE__)
 #ifdef USE_COCOA
 #import "ObjectiveCAssociated.h"
 #endif
-#include <OpenGL/glu.h>
-#else
-#include <GL/glu.h>
-#endif
 #include <C4Draw.h>
 #include <C4Shader.h>
 

src/graphics/C4DrawGLCtx.cpp

@@ -19,10 +19,8 @@
 #include "C4Include.h"
 #include <C4DrawGL.h>
 
-#include <C4App.h>
-#include <C4Surface.h>
 #include <C4Window.h>
-#include <C4Config.h>
+#include <C4App.h>
 
 #ifndef USE_CONSOLE
 

src/graphics/C4FacetEx.cpp

@@ -20,7 +20,6 @@
 #include <C4Include.h>
 #include <C4FacetEx.h>
 
-#include <C4Random.h>
 #include <C4Rect.h>
 #include <C4Group.h>
 

src/graphics/C4GraphicsResource.cpp

@@ -24,10 +24,7 @@
 #include <C4FontLoader.h>
 #include <C4Log.h>
 #include <C4Game.h>
-#include <C4GraphicsSystem.h>
-#include <C4Def.h>
-
-#include <C4DrawGL.h>
+#include <C4Components.h>
 
 /* C4GraphicsResource */
 

src/graphics/C4GraphicsResource.h

@@ -20,7 +20,6 @@
 #ifndef INC_C4GraphicsResource
 #define INC_C4GraphicsResource
 
-#include <C4Group.h>
 #include <C4GroupSet.h>
 #include <C4Surface.h>
 #include <C4FacetEx.h>

src/graphics/C4SurfaceLoaders.cpp

@@ -19,14 +19,11 @@
 
 #include <C4Include.h>
 #include <C4Surface.h>
-#include <C4GroupSet.h>
 
+#include <C4GroupSet.h>
 #include <C4Group.h>
 #include <C4Log.h>
-
-#include <Bitmap256.h>
 #include <StdPNG.h>
-#include <C4Draw.h>
 
 bool C4Surface::LoadAny(C4Group &hGroup, const char *szName, bool fOwnPal, bool fNoErrIfNotFound)
 {

src/graphics/CSurface8.cpp

@@ -18,13 +18,10 @@
 
 #include "C4Include.h"
 #include <CSurface8.h>
-#include <Bitmap256.h>
-#include <StdPNG.h>
-#include <C4Draw.h>
-#include <CStdFile.h>
-#include <Bitmap256.h>
 
-#include "limits.h"
+#include <Bitmap256.h>
+#include <CStdFile.h>
+#include <StdColors.h>
 
 CSurface8::CSurface8()
 {

src/graphics/CSurface8.h

@@ -18,8 +18,6 @@
 #ifndef INC_StdSurface8
 #define INC_StdSurface8
 
-#include <StdColors.h>
-
 class CSurface8
 {
 public:

src/gui/C4ChatDlg.cpp

@@ -18,6 +18,7 @@
 #include "C4Include.h"
 #include "C4ChatDlg.h"
 
+#include <C4Application.h>
 #include "C4InputValidation.h"
 #include "C4Network2IRC.h"
 #include "C4MessageInput.h"

src/gui/C4ChatDlg.h

@@ -20,7 +20,6 @@
 
 #include "C4Gui.h"
 #include "C4InteractiveThread.h"
-#include "C4Network2IRC.h"
 
 // a GUI control to chat in
 class C4ChatControl : public C4GUI::Window, private C4InteractiveThread::Callback

src/gui/C4FileSelDlg.h

@@ -19,6 +19,7 @@
 #define INC_C4FileSelDlg
 
 #include <C4Gui.h>
+#include <C4Components.h>
 
 // callback handler for file selection dialog
 class C4FileSel_BaseCB

src/gui/C4Folder.cpp

@@ -19,10 +19,8 @@
 #include <C4Include.h>
 #include <C4Folder.h>
 
-#include <C4Random.h>
 #include <C4Group.h>
 #include <C4Components.h>
-#include <C4Game.h>
 
 
 //================= C4FolderHead ====================

src/gui/C4GameDialogs.cpp

@@ -18,10 +18,7 @@
 #include <C4Include.h>
 #include <C4GameDialogs.h>
 
-#include <C4Viewport.h>
-#include <C4Network2Dialogs.h>
 #include <C4Game.h>
-#include <C4Player.h>
 #include <C4Network2.h>
 
 bool C4AbortGameDialog::is_shown = false;

src/gui/C4GameLobby.cpp

@@ -18,10 +18,10 @@
 #include <C4Include.h>
 #include <C4GameLobby.h>
 
-#include "C4FullScreen.h"
+#include <C4Application.h>
+#include <C4Components.h>
 #include "C4Network2Dialogs.h"
 #include "C4GameOptions.h"
-#include "C4GameDialogs.h"
 #include "C4RTF.h"
 #include "C4ChatDlg.h"
 #include "C4PlayerInfoListBox.h"

src/gui/C4GameLobby.h

@@ -22,13 +22,10 @@
 #define INC_C4GameLobby
 
 #include "C4Gui.h"
-#include "C4Client.h"
-#include "C4PlayerInfo.h"
+#include <C4PacketBase.h>
 
 namespace C4GameLobby
 {
-	class MainDlg;
-
 	// countdown time from which the elevator sound starts and team selection becomes unavailable
 	const int32_t AlmostStartCountdownTime = 10; // seconds
 

src/gui/C4GameMessage.cpp

@@ -21,9 +21,7 @@
 #include <C4GameMessage.h>
 
 #include <C4Object.h>
-#include <C4Application.h>
 #include <C4GraphicsResource.h>
-#include <C4Game.h>
 #include <C4Player.h>
 #include <C4PlayerList.h>
 

src/gui/C4GameMessage.h

@@ -20,8 +20,7 @@
 #ifndef INC_C4GameMessage
 #define INC_C4GameMessage
 
-#include <C4Surface.h>
-#include <C4Gui.h>
+#include <StdColors.h>
 #include <C4Value.h>
 
 const int32_t C4GM_MaxText = 256,

src/gui/C4GameOptions.cpp

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

src/gui/C4GameOverDlg.cpp

@@ -18,12 +18,12 @@
 #include <C4Include.h>
 #include <C4GameOverDlg.h>
 
+#include <C4Application.h>
 #include <C4Def.h>
 #include <C4DefList.h>
 #include <C4Game.h>
 #include <C4FullScreen.h>
 #include <C4Player.h>
-#include <C4PlayerInfo.h>
 #include <C4PlayerInfoListBox.h>
 #include <C4PlayerList.h>
 #include <C4GameObjects.h>

src/gui/C4Gui.h

@@ -25,17 +25,11 @@
 
 #include <C4FontLoader.h>
 #include "C4Rect.h"
-#include "C4Shape.h"
 #include "C4FacetEx.h"
 #include "C4LogBuf.h"
 #include "C4KeyboardInput.h"
-#include "C4Id.h"
-
-#include "C4Application.h"
-
 #include <StdScheduler.h>
 #include <C4Id.h>
-
 #include <C4Window.h>
 
 // consts (load those from a def file some time)

src/gui/C4GuiButton.cpp

@@ -19,9 +19,6 @@
 #include <C4Include.h>
 #include <C4Gui.h>
 
-#include <C4FullScreen.h>
-#include <C4LoaderScreen.h>
-#include <C4Application.h>
 #include <C4MouseControl.h>
 #include <C4GraphicsResource.h>
 #include <C4Draw.h>

src/gui/C4GuiContainers.cpp

@@ -18,9 +18,7 @@
 
 #include <C4Include.h>
 #include <C4Gui.h>
-#include <C4FullScreen.h>
-#include <C4LoaderScreen.h>
-#include <C4Application.h>
+
 #include <C4MouseControl.h>
 #include <C4GraphicsResource.h>
 

src/gui/C4GuiDialogs.cpp

@@ -21,15 +21,10 @@
 #include <C4Gui.h>
 
 #include <C4DefList.h>
-#include <C4FullScreen.h>
-#include <C4LoaderScreen.h>
 #include <C4Application.h>
 #include <C4Viewport.h>
-#include <C4Console.h>
 #include <C4Def.h>
-#include <C4MouseControl.h>
 #include <C4GraphicsResource.h>
-#include <C4Game.h>
 #include <C4Application.h>
 
 #include <C4DrawGL.h>

src/gui/C4GuiEdit.cpp

@@ -19,8 +19,6 @@
 #include <C4Include.h>
 #include <C4Gui.h>
 
-#include <C4FullScreen.h>
-#include <C4LoaderScreen.h>
 #include <C4Application.h>
 #include <C4MouseControl.h>
 #include <C4GraphicsResource.h>

src/gui/C4GuiLabels.cpp

@@ -18,9 +18,7 @@
 
 #include <C4Include.h>
 #include <C4Gui.h>
-#include <C4FullScreen.h>
-#include <C4LoaderScreen.h>
-#include <C4Application.h>
+
 #include <C4MouseControl.h>
 #include <C4GraphicsResource.h>
 

src/gui/C4GuiListBox.cpp

@@ -19,9 +19,6 @@
 #include <C4Include.h>
 #include <C4Gui.h>
 
-#include <C4FullScreen.h>
-#include <C4LoaderScreen.h>
-#include <C4Application.h>
 #include <C4MouseControl.h>
 #include <algorithm>
 

src/gui/C4GuiTabular.cpp

@@ -20,10 +20,6 @@
 #include <C4Gui.h>
 
 #include <C4FacetEx.h>
-#include <C4Game.h>
-#include <C4FullScreen.h>
-#include <C4LoaderScreen.h>
-#include <C4Application.h>
 #include <C4MouseControl.h>
 #include <C4GraphicsResource.h>
 

src/gui/C4LoaderScreen.cpp

@@ -18,13 +18,13 @@
 #include <C4Include.h>
 #include <C4LoaderScreen.h>
 
+#include <C4Components.h>
 #include <C4LogBuf.h>
 #include <C4Log.h>
 #include <C4GraphicsResource.h>
 #include <C4Random.h>
 #include <C4GroupSet.h>
 #include <C4Game.h>
-#include <C4FullScreen.h>
 
 C4LoaderScreen::C4LoaderScreen()
 {

src/gui/C4MainMenu.cpp

@@ -19,19 +19,19 @@
 #include <C4Include.h>
 #include <C4MainMenu.h>
 
+#include <C4Application.h>
 #include <C4DefList.h>
 #include <C4FullScreen.h>
 #include <C4Viewport.h>
 #include <C4Player.h>
 #include <C4GameOverDlg.h>
-#include <C4Object.h>
 #include <C4GraphicsResource.h>
-#include <C4GraphicsSystem.h>
 #include <C4Game.h>
 #include <C4PlayerList.h>
 #include <C4GameObjects.h>
 #include <C4Network2.h>
 #include <C4GameControl.h>
+#include <C4Def.h>
 
 // -----------------------------------------------------------
 // C4MainMenu

src/gui/C4Menu.cpp

@@ -22,16 +22,12 @@
 
 #include <C4DefList.h>
 #include <C4Object.h>
-#include <C4FullScreen.h>
-#include <C4ObjectCom.h>
 #include <C4Viewport.h>
 #include <C4Player.h>
 #include <C4MouseControl.h>
 #include <C4GraphicsResource.h>
-#include <C4GraphicsSystem.h>
 #include <C4Game.h>
 #include <C4PlayerList.h>
-#include <C4GameObjects.h>
 #include <C4GameControl.h>
 
 const int32_t     C4MN_DefInfoWdt     = 270, // default width of info windows

src/gui/C4Menu.h

@@ -22,7 +22,6 @@
 
 #include "C4Id.h"
 #include "C4FacetEx.h"
-#include "C4Shape.h"
 #include "C4Gui.h"
 #include "C4IDList.h"
 

src/gui/C4MessageBoard.cpp

@@ -20,12 +20,9 @@
 #include <C4Include.h>
 #include <C4MessageBoard.h>
 
-#include <C4Object.h>
 #include <C4Application.h>
 #include <C4LoaderScreen.h>
 #include <C4Gui.h>
-#include <C4Console.h>
-#include <C4Network2Dialogs.h>
 #include <C4Player.h>
 #include <C4GraphicsSystem.h>
 #include <C4GraphicsResource.h>

src/gui/C4MessageInput.cpp

@@ -20,11 +20,9 @@
 
 #include <C4Game.h>
 #include <C4Object.h>
-#include <C4Script.h>
 #include <C4Gui.h>
 #include <C4Console.h>
 #include <C4Application.h>
-#include <C4Network2Dialogs.h>
 #include <C4Log.h>
 #include <C4Player.h>
 #include <C4GameLobby.h>
@@ -33,8 +31,6 @@
 #include <C4GameControl.h>
 #include <C4GraphicsResource.h>
 
-#include <cctype>
-
 // --------------------------------------------------
 // C4ChatInputDialog
 

src/gui/C4MessageInput.h

@@ -19,7 +19,6 @@
 #define INC_C4MessageInput
 
 #include "C4Gui.h"
-#include "C4KeyboardInput.h"
 #include "C4ObjectPtr.h"
 
 const int32_t C4MSGB_BackBufferMax  = 20;

src/gui/C4MouseControl.cpp

@@ -20,10 +20,8 @@
 #include <C4Include.h>
 #include <C4MouseControl.h>
 
-#include <C4DefList.h>
 #include <C4Viewport.h>
 #include <C4Object.h>
-#include <C4Command.h>
 #include <C4Application.h>
 #include <C4FullScreen.h>
 #include <C4Gui.h>
@@ -32,9 +30,7 @@
 #include <C4Player.h>
 #include "C4ChatDlg.h"
 #include <C4GraphicsResource.h>
-#include <C4GraphicsSystem.h>
 #include <C4PlayerList.h>
-#include <C4GameObjects.h>
 #include <C4GameControl.h>
 
 const int32_t C4MC_Drag_None            = 0,

src/gui/C4PlayerInfoListBox.cpp

@@ -20,7 +20,6 @@
 
 #include <C4PlayerInfo.h>
 #include <C4Network2Dialogs.h>
-#include <C4GameDialogs.h>
 #include <C4Teams.h>
 #include <C4Game.h>
 #include <C4FileSelDlg.h>
@@ -29,6 +28,7 @@
 #include <C4Network2.h>
 #include <C4GameControl.h>
 #include <C4RoundResults.h>
+#include <C4GameLobby.h>
 
 DWORD GenerateRandomPlayerColor(int32_t iTry); // in C4PlayerInfoConflicts.cpp
 

src/gui/C4PlayerInfoListBox.h

@@ -20,10 +20,6 @@
 
 #include "C4Gui.h"
 
-#include "C4Scenario.h"
-#include "C4Network2Res.h"
-#include "C4GameLobby.h"
-
 class C4PlayerInfoListBox : public C4GUI::ListBox
 {
 public:

src/gui/C4Scoreboard.cpp

@@ -16,11 +16,9 @@
 // script-controlled InGame dialog to show player infos
 
 #include "C4Include.h"
-#include <utility>
-
 #include "C4Scoreboard.h"
-#include "C4Gui.h"
 
+#include "C4Gui.h"
 #include "C4GameOverDlg.h"
 #include <C4GraphicsResource.h>
 

src/gui/C4Scoreboard.h

@@ -18,8 +18,6 @@
 #ifndef INC_C4Scoreboard
 #define INC_C4Scoreboard
 
-#include <utility>
-
 class C4Scoreboard
 {
 public:

src/gui/C4StartupAboutDlg.cpp

@@ -17,12 +17,11 @@
 
 #include <C4Include.h>
 #include <C4StartupAboutDlg.h>
+
 #include <C4UpdateDlg.h>
 #include <C4GraphicsResource.h>
 #include <C4Version.h>
 
-#include <C4StartupMainDlg.h>
-
 // ------------------------------------------------
 // --- C4StartupAboutDlg
 

src/gui/C4StartupMainDlg.cpp

@@ -18,6 +18,8 @@
 #include <C4Include.h>
 #include <C4StartupMainDlg.h>
 
+#include <C4Application.h>
+#include <C4Components.h>
 #include <C4UpdateDlg.h>
 #include <C4Version.h>
 #include <C4StartupNetDlg.h>

src/gui/C4StartupNetDlg.cpp

@@ -18,17 +18,13 @@
 #include <C4Include.h>
 #include <C4StartupNetDlg.h>
 
+#include <C4Application.h>
 #include <C4UpdateDlg.h>
 #include <C4StartupScenSelDlg.h>
-#include <C4StartupMainDlg.h>
 #include <C4Game.h>
-#include <C4Log.h>
 #include "C4ChatDlg.h"
 #include <C4GraphicsResource.h>
-
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
+#include <C4Network2Reference.h>
 
 // ----------- C4StartupNetListEntry -----------------------------------------------------------------------
 

src/gui/C4StartupOptionsDlg.cpp

@@ -18,6 +18,7 @@
 #include <C4Include.h>
 #include <C4StartupOptionsDlg.h>
 
+#include <C4Application.h>
 #include <C4StartupMainDlg.h>
 #include <C4Language.h>
 #include <C4GamePadCon.h>

src/gui/C4StartupScenSelDlg.cpp

@@ -18,6 +18,8 @@
 #include <C4Include.h>
 #include <C4StartupScenSelDlg.h>
 
+#include <C4Application.h>
+#include <C4GameOptions.h>
 #include <C4Network2Dialogs.h>
 #include <C4StartupMainDlg.h>
 #include <C4StartupNetDlg.h>
@@ -31,8 +33,6 @@
 #include <C4FileSelDlg.h>
 #include <C4MouseControl.h>
 #include <C4GraphicsResource.h>
-#include <C4GameOptions.h>
-
 #include <set>
 
 // singleton

src/gui/C4UpdateDlg.cpp

@@ -17,9 +17,10 @@
 // is only compiled WITH_AUTOMATIC_UPDATE
 
 #include "C4Include.h"
-
 #include "C4UpdateDlg.h"
 
+#include <C4Application.h>
+#include <C4Components.h>
 #include "C4DownloadDlg.h"
 #include <C4Log.h>
 

src/gui/C4UpperBoard.cpp

@@ -18,7 +18,6 @@
 
 #include <C4Game.h>
 #include <C4Config.h>
-#include <C4Application.h>
 #include <C4GraphicsResource.h>
 
 C4UpperBoard::C4UpperBoard()

src/landscape/C4Map.cpp

@@ -22,10 +22,7 @@
 
 #include <C4Random.h>
 #include <C4Texture.h>
-#include <C4Group.h>
-
 #include <CSurface8.h>
-#include <Bitmap256.h>
 
 C4MapCreator::C4MapCreator()
 {

src/landscape/C4Map.h

@@ -20,8 +20,6 @@
 #ifndef INC_C4Map
 #define INC_C4Map
 
-#include <C4Scenario.h>
-
 class C4MapCreator
 {
 public:

src/landscape/C4MapCreatorS2.cpp

@@ -18,12 +18,11 @@
 #include <C4Include.h>
 #include <C4MapCreatorS2.h>
 #include <C4Random.h>
-#include <C4Game.h>
-#include <C4Aul.h>
 #include <C4Material.h>
 #include <C4ScriptHost.h>
 #include <C4Texture.h>
 #include <C4Record.h>
+#include <CSurface8.h>
 
 namespace {
 	// node attribute entry for SetField search

src/landscape/C4MapCreatorS2.h

@@ -18,10 +18,6 @@
 #ifndef INC_C4MapCreatorS2
 #define INC_C4MapCreatorS2
 
-#include <C4Group.h>
-#include <C4Scenario.h>
-#include <C4Surface.h>
-
 #define C4MC_SizeRes        100         // positions in percent
 #define C4MC_ZoomRes        100         // zoom resolution (-100 to +99)
 

src/landscape/C4MassMover.cpp

@@ -23,7 +23,6 @@
 #include <C4Components.h>
 #include <C4Random.h>
 #include <C4Material.h>
-#include <C4Game.h>
 #include <C4Landscape.h>
 #include <C4Record.h>
 

src/landscape/C4PXS.cpp

@@ -25,7 +25,6 @@
 #include <C4Physics.h>
 #include <C4Random.h>
 #include <C4Weather.h>
-#include <C4Game.h>
 #include <C4Record.h>
 
 static const C4Real WindDrift_Factor = itofix(1, 800);

src/landscape/C4PathFinder.cpp

@@ -47,7 +47,6 @@
 #include <C4PathFinder.h>
 
 #include <C4FacetEx.h>
-#include <C4Game.h>
 #include <C4GraphicsSystem.h>
 
 const int32_t C4PF_MaxDepth        = 35,

src/landscape/C4PathFinder.h

@@ -20,8 +20,6 @@
 #ifndef INC_C4PathFinder
 #define INC_C4PathFinder
 
-#include <C4TransferZone.h>
-
 class C4PathFinder;
 
 class C4PathFinderRay

src/landscape/C4Scenario.cpp

@@ -20,12 +20,10 @@
 #include <C4Include.h>
 #include <C4Scenario.h>
 
-#include <C4Config.h>
 #include <C4InputValidation.h>
 #include <C4Random.h>
 #include <C4Group.h>
 #include <C4Components.h>
-#include <C4Game.h>
 #include <StdColors.h>
 
 //==================================== C4SVal ==============================================

src/landscape/C4Texture.cpp

@@ -24,7 +24,6 @@
 #include <C4Game.h>
 #include <C4Config.h>
 #include <C4Components.h>
-#include <C4Application.h>
 #include <C4Material.h>
 #include <C4Landscape.h>
 #include <C4Log.h>

src/lib/C4Random.h

@@ -20,8 +20,6 @@
 #ifndef INC_C4Random
 #define INC_C4Random
 
-#include <ctime>
-
 extern int RandomCount;
 
 void FixedRandom(DWORD dwSeed);

src/lib/C4Real.h

@@ -32,8 +32,6 @@
 #ifndef INC_C4Real
 #define INC_C4Real
 
-#include <math.h>
-
 // activate to switch to classic fixed-point math
 #define C4REAL_USE_FIXNUM 1
 #define inline ALWAYS_INLINE

src/lib/Standard.cpp

@@ -18,7 +18,6 @@
 /* All kinds of valuable helpers */
 
 #include "C4Include.h"
-#include <StdSync.h>
 
 //------------------------------------- Basics ----------------------------------------
 

src/lib/StdBuf.h

@@ -26,7 +26,6 @@
 #include <cstring>
 #include <cassert>
 #include <cstdarg>
-#include <utility>
 #include <algorithm>
 
 // debug memory management

src/network/C4Client.cpp

@@ -16,6 +16,7 @@
 #include <C4Include.h>
 #include <C4Client.h>
 
+#include <C4Application.h>
 #include <C4Config.h>
 #include <C4Network2Client.h>
 #include <C4Game.h>