From 6e4df10454c48d37d3edc8ec4e732b79ad4b29e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Brammer?= <gbrammer@gmx.de>
Date: Fri, 5 Jun 2009 20:00:23 +0200
Subject: [PATCH] Header reorganisation

Lots of #includes are moved from C4Game.h to the files that actually need
them
---
 engine/inc/C4Console.h              |  1 -
 engine/inc/C4FullScreen.h           |  4 ---
 engine/inc/C4Game.h                 | 38 ++++++++---------------------
 engine/inc/C4Wrappers.h             |  3 +++
 engine/src/C4Application.cpp        |  4 +++
 engine/src/C4ChatDlg.cpp            |  3 ++-
 engine/src/C4Console.cpp            |  4 +++
 engine/src/C4Control.cpp            |  3 +++
 engine/src/C4Def.cpp                |  2 +-
 engine/src/C4EditCursor.cpp         |  1 +
 engine/src/C4Effect.cpp             |  1 +
 engine/src/C4Facet.cpp              |  1 +
 engine/src/C4FileSelDlg.cpp         |  3 ++-
 engine/src/C4FullScreen.cpp         |  3 +++
 engine/src/C4Game.cpp               |  5 ++++
 engine/src/C4GameControlNetwork.cpp |  1 +
 engine/src/C4GameLobby.cpp          |  1 +
 engine/src/C4GameMessage.cpp        |  1 +
 engine/src/C4GameOptions.cpp        |  2 +-
 engine/src/C4GameParameters.cpp     |  2 +-
 engine/src/C4GameSave.cpp           |  3 +++
 engine/src/C4GraphicsResource.cpp   |  1 +
 engine/src/C4GraphicsSystem.cpp     |  1 +
 engine/src/C4Gui.cpp                |  1 +
 engine/src/C4GuiButton.cpp          |  1 +
 engine/src/C4GuiContainers.cpp      |  1 +
 engine/src/C4GuiDialogs.cpp         |  1 +
 engine/src/C4GuiEdit.cpp            |  1 +
 engine/src/C4GuiLabels.cpp          |  1 +
 engine/src/C4GuiListBox.cpp         |  1 +
 engine/src/C4GuiTabular.cpp         |  1 +
 engine/src/C4IDList.cpp             |  2 +-
 engine/src/C4Landscape.cpp          |  2 ++
 engine/src/C4LoaderScreen.cpp       |  3 ++-
 engine/src/C4Log.cpp                |  3 +++
 engine/src/C4Material.cpp           |  2 +-
 engine/src/C4Menu.cpp               |  1 +
 engine/src/C4MessageBoard.cpp       |  4 +++
 engine/src/C4MessageInput.cpp       |  1 +
 engine/src/C4Network2.cpp           |  3 +++
 engine/src/C4Network2Client.cpp     |  1 +
 engine/src/C4Network2Dialogs.cpp    |  3 ++-
 engine/src/C4Network2Players.cpp    |  3 ++-
 engine/src/C4Network2Reference.cpp  |  4 +--
 engine/src/C4Network2ResDlg.cpp     |  2 +-
 engine/src/C4Object.cpp             |  2 ++
 engine/src/C4ObjectList.cpp         |  1 +
 engine/src/C4ObjectListDlg.cpp      |  1 +
 engine/src/C4ObjectMenu.cpp         |  1 +
 engine/src/C4Packet2.cpp            |  5 +++-
 engine/src/C4PathFinder.cpp         |  1 +
 engine/src/C4Player.cpp             |  1 +
 engine/src/C4PlayerInfoListBox.cpp  |  2 ++
 engine/src/C4PlayerList.cpp         |  2 ++
 engine/src/C4RankSystem.cpp         |  1 +
 engine/src/C4Scoreboard.cpp         |  3 ++-
 engine/src/C4Script.cpp             |  3 +++
 engine/src/C4SoundSystem.cpp        |  1 +
 engine/src/C4Startup.cpp            |  2 ++
 engine/src/C4StartupMainDlg.cpp     |  1 +
 engine/src/C4StartupPlrSelDlg.cpp   |  2 ++
 engine/src/C4StartupScenSelDlg.cpp  |  1 +
 engine/src/C4UpperBoard.cpp         |  1 +
 engine/src/C4Video.cpp              |  2 ++
 engine/src/C4Viewport.cpp           |  2 ++
 engine/src/C4WinMain.cpp            |  2 ++
 66 files changed, 118 insertions(+), 49 deletions(-)

diff --git a/engine/inc/C4Console.h b/engine/inc/C4Console.h
index d36d8f8dd..4aec89d05 100644
--- a/engine/inc/C4Console.h
+++ b/engine/inc/C4Console.h
@@ -28,7 +28,6 @@
 #include "C4ToolsDlg.h"
 #include "C4ObjectListDlg.h"
 #include "C4EditCursor.h"
-#include "C4Game.h"
 
 #include <StdWindow.h>
 
diff --git a/engine/inc/C4FullScreen.h b/engine/inc/C4FullScreen.h
index 379f07b61..544feb26a 100644
--- a/engine/inc/C4FullScreen.h
+++ b/engine/inc/C4FullScreen.h
@@ -26,10 +26,6 @@
 #include "C4MainMenu.h"
 #include <StdWindow.h>
 
-#ifndef BIG_C4INCLUDE
-#include "C4Game.h"
-#endif
-
 bool IsKeyDown(int iKey);
 
 class C4FullScreen: public CStdWindow
diff --git a/engine/inc/C4Game.h b/engine/inc/C4Game.h
index 748851dac..e3d500855 100644
--- a/engine/inc/C4Game.h
+++ b/engine/inc/C4Game.h
@@ -26,42 +26,24 @@
 
 #ifdef C4ENGINE
 
-#include <C4Def.h>
-#include <C4Texture.h>
-#include <C4RankSystem.h>
-#include <C4GraphicsSystem.h>
-#include <C4GraphicsResource.h>
-#include <C4GameMessage.h>
-#include <C4MouseControl.h>
-#include <C4MessageInput.h>
-#include <C4Weather.h>
-#include <C4Material.h>
-#include <C4GameObjects.h>
-#include <C4Landscape.h>
-#include <C4Scenario.h>
-#include <C4MassMover.h>
-#include <C4PXS.h>
-#include <C4PlayerList.h>
-#include <C4Teams.h>
+#include <C4Client.h>
+#include <C4GameParameters.h>
 #include <C4PlayerInfo.h>
+#include <C4RoundResults.h>
+#include <C4GameMessage.h>
+#include <C4Weather.h>
+#include <C4GameObjects.h>
+#include <C4Scenario.h>
+#include <C4PlayerList.h>
+#include <C4Material.h>
+#include <C4GameControl.h>
 #include <C4Control.h>
 #include <C4PathFinder.h>
-#include <C4ComponentHost.h>
-#include <C4ScriptHost.h>
-#include <C4Particles.h>
-#include <C4GroupSet.h>
 #include <C4Extra.h>
-#include <C4GameControl.h>
 #include <C4Effects.h>
 #include <C4Fonts.h>
-#include "C4LangStringTable.h"
 #include "C4Scoreboard.h"
-#include <C4Network2.h>
-#include <C4Scenario.h>
-#include <C4Client.h>
-#include <C4Network2Reference.h>
 #include <C4VideoPlayback.h>
-#include <C4RoundResults.h>
 
 class C4Game
   {
diff --git a/engine/inc/C4Wrappers.h b/engine/inc/C4Wrappers.h
index 633347ec9..4d77ef5a9 100644
--- a/engine/inc/C4Wrappers.h
+++ b/engine/inc/C4Wrappers.h
@@ -31,6 +31,9 @@
 #include <C4Game.h>
 #include <C4Landscape.h>
 #include <C4Log.h>
+#include "C4Texture.h"
+#include "C4GraphicsSystem.h"
+#include "C4GraphicsResource.h"
 #endif
 
 //=================================== ID2Def ==============================================
diff --git a/engine/src/C4Application.cpp b/engine/src/C4Application.cpp
index c1f7c3234..eacdefd3f 100644
--- a/engine/src/C4Application.cpp
+++ b/engine/src/C4Application.cpp
@@ -31,6 +31,10 @@
 #endif
 
 #ifndef BIG_C4INCLUDE
+#include "C4Game.h"
+#include "C4GraphicsSystem.h"
+#include "C4GraphicsResource.h"
+#include "C4MessageInput.h"
 #include <C4FileClasses.h>
 #include <C4FullScreen.h>
 #include <C4Language.h>
diff --git a/engine/src/C4ChatDlg.cpp b/engine/src/C4ChatDlg.cpp
index be5665952..527e21b9a 100644
--- a/engine/src/C4ChatDlg.cpp
+++ b/engine/src/C4ChatDlg.cpp
@@ -22,9 +22,10 @@
 
 #include "C4Include.h"
 #include "C4ChatDlg.h"
-#include "C4Game.h"
+
 #include "C4InputValidation.h"
 #include "C4Network2IRC.h"
+#include "C4MessageInput.h"
 
 void convUTF8toWindows(StdStrBuf &sText)
 {
diff --git a/engine/src/C4Console.cpp b/engine/src/C4Console.cpp
index 0c31829db..24dd7ed50 100644
--- a/engine/src/C4Console.cpp
+++ b/engine/src/C4Console.cpp
@@ -28,10 +28,14 @@
 #include <C4Application.h>
 
 #include <C4GameSave.h>
+#include <C4Game.h>
+#include <C4MessageInput.h>
 #include <C4UserMessages.h>
 #include <C4Version.h>
 #include <C4Language.h>
 #include <C4Player.h>
+#include <C4Landscape.h>
+#include <C4GraphicsSystem.h>
 
 #include <StdFile.h>
 #include <StdRegistry.h>
diff --git a/engine/src/C4Control.cpp b/engine/src/C4Control.cpp
index ba26fe8a8..a9b89ba27 100644
--- a/engine/src/C4Control.cpp
+++ b/engine/src/C4Control.cpp
@@ -36,6 +36,9 @@
 #include <C4Log.h>
 #include <C4Wrappers.h>
 #include <C4Player.h>
+#include <C4RankSystem.h>
+#include <C4PXS.h>
+#include <C4MassMover.h>
 #endif
 
 // *** C4ControlPacket
diff --git a/engine/src/C4Def.cpp b/engine/src/C4Def.cpp
index e10702048..f1b816f46 100644
--- a/engine/src/C4Def.cpp
+++ b/engine/src/C4Def.cpp
@@ -35,7 +35,7 @@
 #include <C4Components.h>
 #include <C4Config.h>
 #include <C4ValueList.h>
-
+#include <C4RankSystem.h>
 #ifdef C4ENGINE
 #include <C4Wrappers.h>
 #include <C4Object.h>
diff --git a/engine/src/C4EditCursor.cpp b/engine/src/C4EditCursor.cpp
index d22774465..4b675823d 100644
--- a/engine/src/C4EditCursor.cpp
+++ b/engine/src/C4EditCursor.cpp
@@ -32,6 +32,7 @@
 #include <C4Application.h>
 #include <C4Random.h>
 #include <C4Wrappers.h>
+#include <C4MouseControl.h>
 #endif
 
 #ifdef WITH_DEVELOPER_MODE
diff --git a/engine/src/C4Effect.cpp b/engine/src/C4Effect.cpp
index 95522c3a1..4cf6f9722 100644
--- a/engine/src/C4Effect.cpp
+++ b/engine/src/C4Effect.cpp
@@ -30,6 +30,7 @@
 #include <C4Log.h>
 #include <C4Game.h>
 #include <C4Wrappers.h>
+#include <C4PXS.h>
 #endif
 
 void C4Effect::AssignCallbackFunctions()
diff --git a/engine/src/C4Facet.cpp b/engine/src/C4Facet.cpp
index d85b22293..933c39de8 100644
--- a/engine/src/C4Facet.cpp
+++ b/engine/src/C4Facet.cpp
@@ -24,6 +24,7 @@
 #include <C4Include.h>
 #include <C4Facet.h>
 #include <C4Game.h>
+#include <C4GraphicsResource.h>
 
 #include <StdD3D.h>
 
diff --git a/engine/src/C4FileSelDlg.cpp b/engine/src/C4FileSelDlg.cpp
index 0e417a38a..64884920e 100644
--- a/engine/src/C4FileSelDlg.cpp
+++ b/engine/src/C4FileSelDlg.cpp
@@ -23,7 +23,8 @@
 #include <C4FileSelDlg.h>
 
 #ifndef BIG_C4INCLUDE
-#include <C4Game.h> // only for single use of ::GraphicsResource.fctOKCancel below...
+#include <C4GraphicsResource.h> // only for single use of ::GraphicsResource.fctOKCancel below...
+#include <C4Version.h>
 #endif
 
 #ifdef _WIN32
diff --git a/engine/src/C4FullScreen.cpp b/engine/src/C4FullScreen.cpp
index 84289aa86..18cd5802e 100644
--- a/engine/src/C4FullScreen.cpp
+++ b/engine/src/C4FullScreen.cpp
@@ -25,6 +25,7 @@
 #include <C4FullScreen.h>
 
 #ifndef BIG_C4INCLUDE
+#include <C4Game.h>
 #include <C4Application.h>
 #include <C4UserMessages.h>
 #include <C4Viewport.h>
@@ -36,6 +37,8 @@
 #include <C4GamePadCon.h>
 #include <C4Player.h>
 #include <C4GameOverDlg.h>
+#include <C4GraphicsSystem.h>
+#include <C4MouseControl.h>
 #endif
 
 #ifdef _WIN32
diff --git a/engine/src/C4Game.cpp b/engine/src/C4Game.cpp
index 14f2f1955..993966fa5 100644
--- a/engine/src/C4Game.cpp
+++ b/engine/src/C4Game.cpp
@@ -58,6 +58,11 @@
 #include <C4ObjectMenu.h>
 #include <C4GameLobby.h>
 #include <C4ChatDlg.h>
+#include <C4MouseControl.h>
+#include <C4PXS.h>
+#include <C4MessageInput.h>
+#include <C4MassMover.h>
+#include <C4RankSystem.h>
 #endif
 
 #include <StdFile.h>
diff --git a/engine/src/C4GameControlNetwork.cpp b/engine/src/C4GameControlNetwork.cpp
index 0a317b7e1..0efa41989 100644
--- a/engine/src/C4GameControlNetwork.cpp
+++ b/engine/src/C4GameControlNetwork.cpp
@@ -27,6 +27,7 @@
 #include <C4GameControl.h>
 #include <C4Game.h>
 #include <C4Log.h>
+#include <C4GraphicsSystem.h>
 #endif
 
 // *** C4GameControlNetwork
diff --git a/engine/src/C4GameLobby.cpp b/engine/src/C4GameLobby.cpp
index 3fcd93e3a..af9db63f5 100644
--- a/engine/src/C4GameLobby.cpp
+++ b/engine/src/C4GameLobby.cpp
@@ -33,6 +33,7 @@
 #include "C4RTF.H"
 #include "C4ChatDlg.h"
 #include "C4PlayerInfoListBox.h"
+#include <C4MessageInput.h>
 #endif
 
 namespace C4GameLobby {
diff --git a/engine/src/C4GameMessage.cpp b/engine/src/C4GameMessage.cpp
index de798e7e8..c6dbc7eed 100644
--- a/engine/src/C4GameMessage.cpp
+++ b/engine/src/C4GameMessage.cpp
@@ -26,6 +26,7 @@
 #ifndef BIG_C4INCLUDE
 #include <C4Object.h>
 #include <C4Application.h>
+#include <C4GraphicsResource.h>
 #include <C4Game.h>
 #include <C4Player.h>
 #endif
diff --git a/engine/src/C4GameOptions.cpp b/engine/src/C4GameOptions.cpp
index 1d8b663a0..a85b20e41 100644
--- a/engine/src/C4GameOptions.cpp
+++ b/engine/src/C4GameOptions.cpp
@@ -21,7 +21,7 @@
 
 #include "C4Include.h"
 #include "C4GameOptions.h"
-#include "C4Game.h"
+#include <C4Game.h>
 
 // ----------- C4GameOptionsList::Option ----------------------------------------------------------------
 
diff --git a/engine/src/C4GameParameters.cpp b/engine/src/C4GameParameters.cpp
index dc8085c8b..93c2a7cf4 100644
--- a/engine/src/C4GameParameters.cpp
+++ b/engine/src/C4GameParameters.cpp
@@ -24,7 +24,7 @@
 #ifndef BIG_C4INCLUDE
 #include "C4Log.h"
 #include "C4Components.h"
-#include "C4Game.h"
+
 #include "C4Wrappers.h"
 #endif
 
diff --git a/engine/src/C4GameSave.cpp b/engine/src/C4GameSave.cpp
index b230d570d..3784b3391 100644
--- a/engine/src/C4GameSave.cpp
+++ b/engine/src/C4GameSave.cpp
@@ -32,6 +32,9 @@
 #include <C4Console.h>
 #include <C4Log.h>
 #include <C4Player.h>
+#include <C4Landscape.h>
+#include <C4PXS.h>
+#include <C4MassMover.h>
 #endif
 
 // *** C4GameSave main class
diff --git a/engine/src/C4GraphicsResource.cpp b/engine/src/C4GraphicsResource.cpp
index c2fadd76d..90c58be36 100644
--- a/engine/src/C4GraphicsResource.cpp
+++ b/engine/src/C4GraphicsResource.cpp
@@ -29,6 +29,7 @@
 #include <C4Gui.h>
 #include <C4Log.h>
 #include <C4Game.h>
+#include <C4GraphicsSystem.h>
 #endif
 
 #include <StdGL.h>
diff --git a/engine/src/C4GraphicsSystem.cpp b/engine/src/C4GraphicsSystem.cpp
index a84efa077..8fc955bde 100644
--- a/engine/src/C4GraphicsSystem.cpp
+++ b/engine/src/C4GraphicsSystem.cpp
@@ -36,6 +36,7 @@
 #include <C4Wrappers.h>
 #include <C4Player.h>
 #include <C4SoundSystem.h>
+#include <C4MouseControl.h>
 #endif
 
 #include <StdPNG.h>
diff --git a/engine/src/C4Gui.cpp b/engine/src/C4Gui.cpp
index 675a1cbbf..ad873cf9a 100644
--- a/engine/src/C4Gui.cpp
+++ b/engine/src/C4Gui.cpp
@@ -31,6 +31,7 @@
 #include <C4Wrappers.h>
 #include <C4Log.h>
 #include <C4GamePadCon.h>
+#include <C4MouseControl.h>
 #endif
 
 namespace C4GUI {
diff --git a/engine/src/C4GuiButton.cpp b/engine/src/C4GuiButton.cpp
index 43a0d5bcf..82da4988a 100644
--- a/engine/src/C4GuiButton.cpp
+++ b/engine/src/C4GuiButton.cpp
@@ -24,6 +24,7 @@
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>
+#include <C4MouseControl.h>
 
 namespace C4GUI {
 
diff --git a/engine/src/C4GuiContainers.cpp b/engine/src/C4GuiContainers.cpp
index 94ea2a25f..54680db3c 100644
--- a/engine/src/C4GuiContainers.cpp
+++ b/engine/src/C4GuiContainers.cpp
@@ -25,6 +25,7 @@
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>
+#include <C4MouseControl.h>
 
 namespace C4GUI {
 
diff --git a/engine/src/C4GuiDialogs.cpp b/engine/src/C4GuiDialogs.cpp
index 2417b1e93..c845296cd 100644
--- a/engine/src/C4GuiDialogs.cpp
+++ b/engine/src/C4GuiDialogs.cpp
@@ -33,6 +33,7 @@
 #include <C4Console.h>
 #include <C4Def.h>
 #include <C4Wrappers.h>
+#include <C4MouseControl.h>
 #endif
 
 #include <StdGL.h>
diff --git a/engine/src/C4GuiEdit.cpp b/engine/src/C4GuiEdit.cpp
index f4440b1eb..5ce353982 100644
--- a/engine/src/C4GuiEdit.cpp
+++ b/engine/src/C4GuiEdit.cpp
@@ -25,6 +25,7 @@
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>
+#include <C4MouseControl.h>
 
 namespace C4GUI {
 
diff --git a/engine/src/C4GuiLabels.cpp b/engine/src/C4GuiLabels.cpp
index b1004c434..8c3ca3414 100644
--- a/engine/src/C4GuiLabels.cpp
+++ b/engine/src/C4GuiLabels.cpp
@@ -24,6 +24,7 @@
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>
+#include <C4MouseControl.h>
 
 namespace C4GUI {
 
diff --git a/engine/src/C4GuiListBox.cpp b/engine/src/C4GuiListBox.cpp
index 2dc48e024..06c0d410d 100644
--- a/engine/src/C4GuiListBox.cpp
+++ b/engine/src/C4GuiListBox.cpp
@@ -23,6 +23,7 @@
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>
+#include <C4MouseControl.h>
 
 namespace C4GUI {
 
diff --git a/engine/src/C4GuiTabular.cpp b/engine/src/C4GuiTabular.cpp
index 4e79a7689..f41e5f0e8 100644
--- a/engine/src/C4GuiTabular.cpp
+++ b/engine/src/C4GuiTabular.cpp
@@ -27,6 +27,7 @@
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>
+#include <C4MouseControl.h>
 
 namespace C4GUI {
 
diff --git a/engine/src/C4IDList.cpp b/engine/src/C4IDList.cpp
index 927693090..8a308e5e5 100644
--- a/engine/src/C4IDList.cpp
+++ b/engine/src/C4IDList.cpp
@@ -27,7 +27,7 @@
 #ifndef BIG_C4INCLUDE
 #include <C4Def.h>
 #include <C4Application.h>
-#include <C4Game.h>
+#include <C4GraphicsResource.h>
 #endif
 
 C4IDListChunk::C4IDListChunk()
diff --git a/engine/src/C4Landscape.cpp b/engine/src/C4Landscape.cpp
index 5f17e4a6f..407695f5c 100644
--- a/engine/src/C4Landscape.cpp
+++ b/engine/src/C4Landscape.cpp
@@ -42,6 +42,8 @@
 #include <C4Application.h>
 #include <C4Wrappers.h>
 #include <C4Stat.h>
+#include <C4MassMover.h>
+#include <C4PXS.h>
 #endif
 
 #include <StdPNG.h>
diff --git a/engine/src/C4LoaderScreen.cpp b/engine/src/C4LoaderScreen.cpp
index 3293f66b7..dc0ada33f 100644
--- a/engine/src/C4LoaderScreen.cpp
+++ b/engine/src/C4LoaderScreen.cpp
@@ -25,9 +25,10 @@
 #ifndef BIG_C4INCLUDE
 #include <C4LogBuf.h>
 #include <C4Log.h>
-#include <C4Game.h>
+#include <C4GraphicsResource.h>
 #include <C4Random.h>
 #include <C4GroupSet.h>
+#include <C4Game.h>
 #endif
 
 C4LoaderScreen::C4LoaderScreen() : TitleFont(::GraphicsResource.FontTitle), LogFont(::GraphicsResource.FontTiny)
diff --git a/engine/src/C4Log.cpp b/engine/src/C4Log.cpp
index ce6593109..7b43619fc 100644
--- a/engine/src/C4Log.cpp
+++ b/engine/src/C4Log.cpp
@@ -28,8 +28,11 @@
 #ifndef BIG_C4INCLUDE
 #include <C4Console.h>
 #include <C4GameLobby.h>
+#include <C4Game.h>
 #include <C4LogBuf.h>
 #include <C4Language.h>
+#include <C4Network2.h>
+#include <C4GraphicsSystem.h>
 #endif
 
 #if defined(HAVE_SHARE_H) || defined(_WIN32)
diff --git a/engine/src/C4Material.cpp b/engine/src/C4Material.cpp
index 3f1987ed4..b4e03c536 100644
--- a/engine/src/C4Material.cpp
+++ b/engine/src/C4Material.cpp
@@ -28,7 +28,7 @@
 #ifndef BIG_C4INCLUDE
 
 #include <C4Group.h>
-#include <C4Game.h>
+#include <C4PXS.h>
 #include <C4Random.h>
 #include <C4ToolsDlg.h> // For C4TLS_MatSky...
 #ifdef C4ENGINE
diff --git a/engine/src/C4Menu.cpp b/engine/src/C4Menu.cpp
index ba400e1df..e8bf31ab5 100644
--- a/engine/src/C4Menu.cpp
+++ b/engine/src/C4Menu.cpp
@@ -30,6 +30,7 @@
 #include <C4Viewport.h>
 #include <C4Wrappers.h>
 #include <C4Player.h>
+#include <C4MouseControl.h>
 #endif
 
 const int32_t 		C4MN_DefInfoWdt     = 270, // default width of info windows
diff --git a/engine/src/C4MessageBoard.cpp b/engine/src/C4MessageBoard.cpp
index ec3581054..6355bf768 100644
--- a/engine/src/C4MessageBoard.cpp
+++ b/engine/src/C4MessageBoard.cpp
@@ -32,6 +32,10 @@
 #include <C4Console.h>
 #include <C4Network2Dialogs.h>
 #include <C4Player.h>
+#include <C4GraphicsSystem.h>
+#include <C4GraphicsResource.h>
+#include <C4MessageInput.h>
+#include <C4Game.h>
 #endif
 
 const int C4LogSize=30000, C4LogMaxLines=1000;
diff --git a/engine/src/C4MessageInput.cpp b/engine/src/C4MessageInput.cpp
index 3e3420585..1f0b09107 100644
--- a/engine/src/C4MessageInput.cpp
+++ b/engine/src/C4MessageInput.cpp
@@ -35,6 +35,7 @@
 #include <C4Log.h>
 #include <C4Player.h>
 #include <C4GameLobby.h>
+#include <C4GraphicsSystem.h>
 #endif
 #include <cctype>
 
diff --git a/engine/src/C4Network2.cpp b/engine/src/C4Network2.cpp
index b7eefafa5..100d78794 100644
--- a/engine/src/C4Network2.cpp
+++ b/engine/src/C4Network2.cpp
@@ -30,6 +30,9 @@
 #include <C4Console.h>
 #include <C4GameSave.h>
 #include <C4RoundResults.h>
+#include <C4Game.h>
+#include <C4GraphicsSystem.h>
+#include <C4GraphicsResource.h>
 
 // lobby
 #include <C4Gui.h>
diff --git a/engine/src/C4Network2Client.cpp b/engine/src/C4Network2Client.cpp
index f17d7576e..1c77be2b3 100644
--- a/engine/src/C4Network2Client.cpp
+++ b/engine/src/C4Network2Client.cpp
@@ -27,6 +27,7 @@
 #include <C4Network2IO.h>
 #include <C4Network2Stats.h>
 #include <C4GameLobby.h> // fullscreen network lobby
+#include <C4Game.h>
 #endif
 
 #ifndef _WIN32
diff --git a/engine/src/C4Network2Dialogs.cpp b/engine/src/C4Network2Dialogs.cpp
index 645901c9c..c64d34d3c 100644
--- a/engine/src/C4Network2Dialogs.cpp
+++ b/engine/src/C4Network2Dialogs.cpp
@@ -27,9 +27,10 @@
 #ifndef BIG_C4INCLUDE
 #include "C4Network2.h"
 #include "C4Network2Stats.h"
-#include "C4Game.h"
+
 #include "C4Viewport.h"
 #include "C4GameOptions.h"
+#include <C4Game.h>
 #endif
 
 #ifndef HAVE_WINSOCK
diff --git a/engine/src/C4Network2Players.cpp b/engine/src/C4Network2Players.cpp
index ba5384a7f..72a7157e8 100644
--- a/engine/src/C4Network2Players.cpp
+++ b/engine/src/C4Network2Players.cpp
@@ -25,7 +25,8 @@
 #include "C4Network2Players.h"
 #include "C4PlayerInfo.h"
 #include "C4GameLobby.h"
-#include "C4Game.h"
+#include <C4Game.h>
+
 #include "C4Control.h"
 
 // *** C4Network2Players
diff --git a/engine/src/C4Network2Reference.cpp b/engine/src/C4Network2Reference.cpp
index b73d5734b..a49d6ad22 100644
--- a/engine/src/C4Network2Reference.cpp
+++ b/engine/src/C4Network2Reference.cpp
@@ -18,9 +18,7 @@
  * See clonk_trademark_license.txt for full license.
  */
 #include "C4Include.h"
-#ifdef C4ENGINE
-#include "C4Game.h"
-#endif
+#include <C4Game.h>
 #include "C4Version.h"
 #include "C4Network2Reference.h"
 
diff --git a/engine/src/C4Network2ResDlg.cpp b/engine/src/C4Network2ResDlg.cpp
index 1d1ea872f..3a45e5933 100644
--- a/engine/src/C4Network2ResDlg.cpp
+++ b/engine/src/C4Network2ResDlg.cpp
@@ -22,7 +22,7 @@
 #include "C4Include.h"
 #include "C4GameLobby.h"
 #include "C4FullScreen.h"
-#include "C4Game.h"
+
 #include "C4Network2.h"
 #include "C4PlayerInfo.h"
 #include "C4Network2Players.h"
diff --git a/engine/src/C4Object.cpp b/engine/src/C4Object.cpp
index 7e72e352e..c7b119cbd 100644
--- a/engine/src/C4Object.cpp
+++ b/engine/src/C4Object.cpp
@@ -45,6 +45,8 @@
 #include <C4Wrappers.h>
 #include <C4Player.h>
 #include <C4ObjectMenu.h>
+#include <C4RankSystem.h>
+#include <C4GameVersion.h>
 #endif
 
 void DrawVertex(C4Facet &cgo, int32_t tx, int32_t ty, int32_t col, int32_t contact)
diff --git a/engine/src/C4ObjectList.cpp b/engine/src/C4ObjectList.cpp
index e9fe1f9b4..a422db16a 100644
--- a/engine/src/C4ObjectList.cpp
+++ b/engine/src/C4ObjectList.cpp
@@ -29,6 +29,7 @@
 #include <C4Object.h>
 #include <C4Wrappers.h>
 #include <C4Application.h>
+#include <C4Region.h>
 #endif
 
 C4ObjectList::C4ObjectList(): FirstIter(0)
diff --git a/engine/src/C4ObjectListDlg.cpp b/engine/src/C4ObjectListDlg.cpp
index 20f8e430f..20a864b1a 100644
--- a/engine/src/C4ObjectListDlg.cpp
+++ b/engine/src/C4ObjectListDlg.cpp
@@ -24,6 +24,7 @@
 #include <C4Console.h>
 #include <C4Object.h>
 #include <C4Language.h>
+#include <C4Game.h>
 
 
 #ifdef WITH_DEVELOPER_MODE
diff --git a/engine/src/C4ObjectMenu.cpp b/engine/src/C4ObjectMenu.cpp
index 1c2856230..a11c90c7e 100644
--- a/engine/src/C4ObjectMenu.cpp
+++ b/engine/src/C4ObjectMenu.cpp
@@ -27,6 +27,7 @@
 #include <C4Wrappers.h>
 #include <C4Player.h>
 #include <C4Viewport.h>
+#include <C4MouseControl.h>
 #endif
 
 
diff --git a/engine/src/C4Packet2.cpp b/engine/src/C4Packet2.cpp
index b6e3656f1..e9843c853 100644
--- a/engine/src/C4Packet2.cpp
+++ b/engine/src/C4Packet2.cpp
@@ -19,10 +19,13 @@
  */
 #include "C4Include.h"
 
-#include "C4Game.h"
+
 #include "C4Network2Res.h"
 #include "C4Version.h"
 #include "C4GameLobby.h"
+#include <C4Network2.h>
+#include <C4RoundResults.h>
+#include <C4GameControlNetwork.h>
 
 // *** constants
 
diff --git a/engine/src/C4PathFinder.cpp b/engine/src/C4PathFinder.cpp
index 74d766209..a50397d70 100644
--- a/engine/src/C4PathFinder.cpp
+++ b/engine/src/C4PathFinder.cpp
@@ -52,6 +52,7 @@
 #ifndef BIG_C4INCLUDE
 #include <C4FacetEx.h>
 #include <C4Game.h>
+#include <C4GraphicsSystem.h>
 #endif
 
 const int32_t C4PF_MaxDepth				 = 35,
diff --git a/engine/src/C4Player.cpp b/engine/src/C4Player.cpp
index 1c39df40c..8b0c25910 100644
--- a/engine/src/C4Player.cpp
+++ b/engine/src/C4Player.cpp
@@ -41,6 +41,7 @@
 #include <C4FullScreen.h>
 #include <C4GameOverDlg.h>
 #include <C4ObjectMenu.h>
+#include <C4MouseControl.h>
 #endif
 
 #define C4FOW_Def_View_RangeX 500
diff --git a/engine/src/C4PlayerInfoListBox.cpp b/engine/src/C4PlayerInfoListBox.cpp
index 1964c2c65..c96bed2a4 100644
--- a/engine/src/C4PlayerInfoListBox.cpp
+++ b/engine/src/C4PlayerInfoListBox.cpp
@@ -29,6 +29,8 @@
 #include <C4Teams.h>
 #include <C4Game.h>
 #include <C4FileSelDlg.h>
+#include <C4GraphicsResource.h>
+#include <C4MouseControl.h>
 #endif
 
 DWORD GenerateRandomPlayerColor(int32_t iTry); // in C4PlayerInfoConflicts.cpp
diff --git a/engine/src/C4PlayerList.cpp b/engine/src/C4PlayerList.cpp
index 163429290..72fd9ec16 100644
--- a/engine/src/C4PlayerList.cpp
+++ b/engine/src/C4PlayerList.cpp
@@ -32,6 +32,8 @@
 #include <C4Log.h>
 #include <C4Player.h>
 #include <C4Object.h>
+#include <C4Game.h>
+#include <C4GraphicsSystem.h>
 #endif
 
 C4PlayerList::C4PlayerList()
diff --git a/engine/src/C4RankSystem.cpp b/engine/src/C4RankSystem.cpp
index 02704d1f3..1a48bc93f 100644
--- a/engine/src/C4RankSystem.cpp
+++ b/engine/src/C4RankSystem.cpp
@@ -29,6 +29,7 @@
 #include <C4ComponentHost.h>
 #include <C4FacetEx.h>
 #include <C4Game.h>
+#include <C4GraphicsResource.h>
 #endif
 
 #include <StdRegistry.h>
diff --git a/engine/src/C4Scoreboard.cpp b/engine/src/C4Scoreboard.cpp
index e46790208..100a12846 100644
--- a/engine/src/C4Scoreboard.cpp
+++ b/engine/src/C4Scoreboard.cpp
@@ -22,8 +22,9 @@
 #include "C4Include.h"
 #include "C4Scoreboard.h"
 #include "C4Gui.h"
-#include "C4Game.h"
+
 #include "C4GameOverDlg.h"
+#include <C4GraphicsResource.h>
 
 // ************************************************
 // *** C4Scoreboard
diff --git a/engine/src/C4Script.cpp b/engine/src/C4Script.cpp
index a18717309..0ea10efb6 100644
--- a/engine/src/C4Script.cpp
+++ b/engine/src/C4Script.cpp
@@ -41,6 +41,9 @@
 #include <C4ObjectInfoList.h>
 #include <C4Player.h>
 #include <C4ObjectMenu.h>
+#include <C4RankSystem.h>
+#include <C4PXS.h>
+#include <C4MessageInput.h>
 #endif
 
 //========================== Some Support Functions =======================================
diff --git a/engine/src/C4SoundSystem.cpp b/engine/src/C4SoundSystem.cpp
index 5b59236c2..8ee24165b 100644
--- a/engine/src/C4SoundSystem.cpp
+++ b/engine/src/C4SoundSystem.cpp
@@ -30,6 +30,7 @@
 #include <C4Game.h>
 #include <C4Config.h>
 #include <C4Application.h>
+#include <C4GraphicsSystem.h>
 #endif
 
 C4SoundEffect::C4SoundEffect():
diff --git a/engine/src/C4Startup.cpp b/engine/src/C4Startup.cpp
index 43b8163b5..ed5235efb 100644
--- a/engine/src/C4Startup.cpp
+++ b/engine/src/C4Startup.cpp
@@ -32,6 +32,8 @@
 #include <C4Game.h>
 #include <C4Application.h>
 #include <C4Log.h>
+#include <C4GraphicsResource.h>
+#include <C4GraphicsSystem.h>
 #endif
 
 bool C4StartupGraphics::LoadFile(C4FacetID &rToFct, const char *szFilename)
diff --git a/engine/src/C4StartupMainDlg.cpp b/engine/src/C4StartupMainDlg.cpp
index e91a2bc8d..5a74bfd44 100644
--- a/engine/src/C4StartupMainDlg.cpp
+++ b/engine/src/C4StartupMainDlg.cpp
@@ -35,6 +35,7 @@
 #include <C4Game.h>
 #include <C4Log.h>
 #include <C4Language.h>
+#include <C4GraphicsResource.h>
 #endif
 
 
diff --git a/engine/src/C4StartupPlrSelDlg.cpp b/engine/src/C4StartupPlrSelDlg.cpp
index b451bc4ae..52a08d3b4 100644
--- a/engine/src/C4StartupPlrSelDlg.cpp
+++ b/engine/src/C4StartupPlrSelDlg.cpp
@@ -32,6 +32,8 @@
 #include <C4Language.h>
 #include <C4FileSelDlg.h>
 #include <C4Log.h>
+#include <C4GraphicsResource.h>
+#include <C4RankSystem.h>
 #endif
 #include <cctype>
 
diff --git a/engine/src/C4StartupScenSelDlg.cpp b/engine/src/C4StartupScenSelDlg.cpp
index 381f59b99..b5d631cbc 100644
--- a/engine/src/C4StartupScenSelDlg.cpp
+++ b/engine/src/C4StartupScenSelDlg.cpp
@@ -38,6 +38,7 @@
 #include <C4GameDialogs.h>
 #include <C4Language.h>
 #include <C4FileSelDlg.h>
+#include <C4MouseControl.h>
 #endif
 
 #include <set>
diff --git a/engine/src/C4UpperBoard.cpp b/engine/src/C4UpperBoard.cpp
index 9c03b6f78..cfd4e71ba 100644
--- a/engine/src/C4UpperBoard.cpp
+++ b/engine/src/C4UpperBoard.cpp
@@ -24,6 +24,7 @@
 #include <C4Game.h>
 #include <C4Config.h>
 #include <C4Application.h>
+#include <C4GraphicsResource.h>
 #endif
 
 C4UpperBoard::C4UpperBoard()
diff --git a/engine/src/C4Video.cpp b/engine/src/C4Video.cpp
index 7dd92e570..914a0486a 100644
--- a/engine/src/C4Video.cpp
+++ b/engine/src/C4Video.cpp
@@ -30,6 +30,8 @@
 #include <C4Application.h>
 #include <C4Game.h>
 #include <C4Player.h>
+#include <C4GraphicsResource.h>
+#include <C4GraphicsSystem.h>
 #endif
 
 #ifdef _WIN32
diff --git a/engine/src/C4Viewport.cpp b/engine/src/C4Viewport.cpp
index 05c492354..568d0a059 100644
--- a/engine/src/C4Viewport.cpp
+++ b/engine/src/C4Viewport.cpp
@@ -41,6 +41,8 @@
 #include <C4Player.h>
 #include <C4ChatDlg.h>
 #include <C4ObjectMenu.h>
+#include <C4MouseControl.h>
+#include <C4PXS.h>
 #endif
 
 #include <StdGL.h>
diff --git a/engine/src/C4WinMain.cpp b/engine/src/C4WinMain.cpp
index d77a2bb7f..6b9ee1d4a 100644
--- a/engine/src/C4WinMain.cpp
+++ b/engine/src/C4WinMain.cpp
@@ -29,6 +29,8 @@
 #include <C4Console.h>
 #include <C4FullScreen.h>
 #include <C4Log.h>
+#include <C4Game.h>
+#include <C4Version.h>
 
 C4Application Application;
 C4Console			Console;