diff --git a/src/C4Include.cpp b/src/C4Include.cpp
index 4656d61bb..2fb2c39de 100644
--- a/src/C4Include.cpp
+++ b/src/C4Include.cpp
@@ -15,178 +15,8 @@
  * See clonk_trademark_license.txt for full license.
  */
 
-// Include all headers for precompilation.
-// Keep C4Include.h the last include.
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "C4Application.h"
-#include "C4FullScreen.h"
-#include "C4Game.h"
-#include "C4GraphicsSystem.h"
-#include "C4Prototypes.h"
-#include "C4Version.h"
-#include "config/C4Config.h"
-#include "config/C4ConfigShareware.h"
-#include "config/C4Constants.h"
-#include "config/C4SecurityCertificates.h"
-#include "control/C4Control.h"
-#include "control/C4GameControl.h"
-#include "control/C4GameParameters.h"
-#include "control/C4GameSave.h"
-#include "control/C4PlayerInfo.h"
-#include "control/C4Record.h"
-#include "control/C4RoundResults.h"
-#include "control/C4Teams.h"
-#include "editor/C4Console.h"
-#include "editor/C4DevmodeDlg.h"
-#include "editor/C4EditCursor.h"
-#include "editor/C4ObjectListDlg.h"
-#include "editor/C4PropertyDlg.h"
-#include "editor/C4ToolsDlg.h"
-#include "game/C4GameVersion.h"
-#include "game/C4Physics.h"
-#include "game/landscape/C4Landscape.h"
-#include "game/landscape/C4MapCreatorS2.h"
-#include "game/landscape/C4Map.h"
-#include "game/landscape/C4MassMover.h"
-#include "game/landscape/C4Material.h"
-#include "game/landscape/C4MaterialList.h"
-#include "game/landscape/C4Particles.h"
-#include "game/landscape/C4PathFinder.h"
-#include "game/landscape/C4PXS.h"
-#include "game/landscape/C4Region.h"
-#include "game/landscape/C4Scenario.h"
-#include "game/landscape/C4Sky.h"
-#include "game/landscape/C4SolidMask.h"
-#include "game/landscape/C4Texture.h"
-#include "game/landscape/C4Weather.h"
-#include "game/object/C4Command.h"
-#include "game/object/C4DefGraphics.h"
-#include "game/object/C4Def.h"
-#include "game/object/C4GameObjects.h"
-#include "game/object/C4Id.h"
-#include "game/object/C4IDList.h"
-#include "game/object/C4InfoCore.h"
-#include "game/object/C4ObjectCom.h"
-#include "game/object/C4Object.h"
-#include "game/object/C4ObjectInfo.h"
-#include "game/object/C4ObjectInfoList.h"
-#include "game/object/C4ObjectList.h"
-#include "game/object/C4ObjectMenu.h"
-#include "game/object/C4Sector.h"
-#include "game/object/C4Shape.h"
-#include "game/player/C4Player.h"
-#include "game/player/C4PlayerList.h"
-#include "game/player/C4RankSystem.h"
-#include "game/script/C4Effects.h"
-#include "game/script/C4FindObject.h"
-#include "game/script/C4Script.h"
-#include "game/script/C4TransferZone.h"
-#include "gui/C4ChatDlg.h"
-#include "gui/C4DownloadDlg.h"
-#include "gui/C4FileSelDlg.h"
-#include "gui/C4Folder.h"
-#include "gui/C4GameDialogs.h"
-#include "gui/C4GameLobby.h"
-#include "gui/C4GameMessage.h"
-#include "gui/C4GameOptions.h"
-#include "gui/C4GameOverDlg.h"
-#include "gui/C4Gui.h"
-#include "gui/C4KeyboardInput.h"
-#include "gui/C4LoaderScreen.h"
-#include "gui/C4MainMenu.h"
-#include "gui/C4Menu.h"
-#include "gui/C4MessageBoard.h"
-#include "gui/C4MessageInput.h"
-#include "gui/C4MouseControl.h"
-#include "gui/C4PlayerInfoListBox.h"
-#include "gui/C4Scoreboard.h"
-#include "gui/C4StartupAboutDlg.h"
-#include "gui/C4Startup.h"
-#include "gui/C4StartupMainDlg.h"
-#include "gui/C4StartupNetDlg.h"
-#include "gui/C4StartupOptionsDlg.h"
-#include "gui/C4StartupPlrSelDlg.h"
-#include "gui/C4StartupScenSelDlg.h"
-#include "gui/C4UpdateDlg.h"
-#include "gui/C4UpperBoard.h"
-#include "gui/C4UserMessages.h"
-#include "gui/C4Viewport.h"
-#include "lib/C4InputValidation.h"
-#include "lib/C4LogBuf.h"
-#include "lib/C4Log.h"
-#include "lib/C4NameList.h"
-#include "lib/C4Random.h"
-#include "lib/C4Rect.h"
-#include "lib/C4RTF.h"
-#include "lib/C4Stat.h"
-#include "lib/Fixed.h"
-#include "lib/PathFinder.h"
-#include "lib/Standard.h"
-#include "lib/StdAdaptors.h"
-#include "lib/StdBase64.h"
-#include "lib/StdBuf.h"
-#include "lib/StdColors.h"
-#include "lib/StdCompiler.h"
-#include "lib/StdMarkup.h"
-#include "lib/StdResStr2.h"
-#include "lib/StdResStr.h"
-#include "lib/texture/C4FacetEx.h"
-#include "lib/texture/C4Facet.h"
-#include "lib/texture/C4GraphicsResource.h"
-#include "lib/texture/C4SurfaceFile.h"
-#include "lib/texture/C4Surface.h"
-#include "lib/texture/StdPNG.h"
-#include "network/C4Client.h"
-#include "network/C4GameControlNetwork.h"
-#include "network/C4InteractiveThread.h"
-#include "network/C4League.h"
-#include "network/C4NetIO.h"
-#include "network/C4Network2Client.h"
-#include "network/C4Network2Dialogs.h"
-#include "network/C4Network2Discover.h"
-#include "network/C4Network2.h"
-#include "network/C4Network2IO.h"
-#include "network/C4Network2IRC.h"
-#include "network/C4Network2Players.h"
-#include "network/C4Network2Reference.h"
-#include "network/C4Network2Res.h"
-#include "network/C4Network2Stats.h"
-#include "network/C4PacketBase.h"
-#include "platform/Bitmap256.h"
-#include "platform/C4FileClasses.h"
-#include "platform/C4FileMonitor.h"
-#include "platform/C4Fonts.h"
-#include "platform/C4GamePadCon.h"
-#include "platform/C4MusicFile.h"
-#include "platform/C4MusicSystem.h"
-#include "platform/C4SoundSystem.h"
-#include "platform/C4Video.h"
-#include "platform/C4VideoPlayback.h"
-#include "platform/StdConfig.h"
-#include "platform/StdD3D.h"
-#include "platform/StdD3DShader.h"
-#include "platform/StdDDraw2.h"
-#include "platform/StdFacet.h"
-#include "platform/StdFile.h"
-#include "platform/StdFont.h"
-#include "platform/StdGL.h"
-#include "platform/StdNoGfx.h"
-#include "platform/StdRegistry.h"
-#include "platform/StdScheduler.h"
-#include "platform/StdSurface2.h"
-#include "platform/StdSurface8.h"
-#include "platform/StdSync.h"
-#include "platform/StdVideo.h"
-#include "platform/StdWindow.h"
-#include "script/C4AList.h"
-#include "script/C4Aul.h"
-#include "script/C4PropList.h"
-#include "script/C4ScriptHost.h"
-#include "script/C4StringTable.h"
-#include "script/C4Value.h"
-#include "script/C4ValueList.h"
-#include "script/C4ValueMap.h"
-#include "zlib/zutil.h"
+// Never put anything else in this file: MSVC will pretend
+// that it was included from C4Include.h, but other compilers
+// won't. So to make MSVC's see the truth, C4Include.h must
+// be the only header included here.
 #include "C4Include.h"
diff --git a/src/C4Include.h b/src/C4Include.h
index 870a7674e..d94898dad 100644
--- a/src/C4Include.h
+++ b/src/C4Include.h
@@ -24,31 +24,14 @@
 #ifndef INC_C4Include
 #define INC_C4Include
 
-#include <Standard.h>
-#include <StdBuf.h>
-#include <StdFile.h>
-#include <StdResStr2.h>
-#include <C4Prototypes.h>
+#include "Standard.h"
+#include "Fixed.h"
+#include "StdBuf.h"
+#include "StdFile.h"
+#include "StdResStr2.h"
+#include "C4Prototypes.h"
 
-#ifdef _MSC_VER
-#pragma warning(disable: 4786)
-#pragma warning(disable: 4706)
-#pragma warning(disable: 4239)
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif //HAVE_CONFIG_H
-
-#ifdef _WIN32
-	#define C4_OS "win32"
-#elif defined(__linux__)
-	#define C4_OS "linux"
-#elif defined(__APPLE__)
-	#define C4_OS "mac"
-#else
-	#define C4_OS "unknown";
-#endif
+#include "C4PlayerControl.h"
 
 #ifdef DEBUGREC
 #define DEBUGREC_SCRIPT
@@ -64,16 +47,28 @@
 // solidmask debugging
 //#define SOLIDMASK_DEBUG
 
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
-#include <windows.h>
-#include <mmsystem.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <assert.h>
-#include "C4PlayerControl.h"
+#include <algorithm>
+#include <cassert>
+#include <cctype>
+#include <cerrno>
+#include <climits>
+#include <cmath>
+#include <cstdarg>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
+#include <iostream>
+#include <list>
+#include <map>
+#include <memory>
+#include <new>
+#include <set>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <utility>
+#include <vector>
 
 #endif // INC_C4Include
diff --git a/src/lib/Standard.h b/src/lib/Standard.h
index 73bd5fc24..fca3ae34e 100644
--- a/src/lib/Standard.h
+++ b/src/lib/Standard.h
@@ -31,6 +31,8 @@
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4786) // long symbol names
+#pragma warning(disable: 4706)
+#pragma warning(disable: 4239)
 #endif
 
 // debug memory management
@@ -79,10 +81,9 @@ typedef __int32 intptr_t;
 #else
 #error Could not find integer datatypes!
 #endif
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#else
-typedef ptrdiff_t ssize_t;
 #endif
 
 #if defined(__GNUC__)
@@ -167,6 +168,18 @@ inline int stricmp(const char *s1, const char *s2) {
 #define ZeroMemory(d,l) memset((d), 0, (l))
 #endif //_WIN32
 
+
+#ifdef _WIN32
+	#define C4_OS "win32"
+#elif defined(__linux__)
+	#define C4_OS "linux"
+#elif defined(__APPLE__)
+	#define C4_OS "mac"
+#else
+	#define C4_OS "unknown";
+#endif
+
+
 // These functions have to be provided by the application.
 bool Log(const char *szMessage);
 bool LogSilent(const char *szMessage);
@@ -336,11 +349,6 @@ template <typename T>
 // open a weblink in an external browser
 bool OpenURL(const char *szURL);
 
-class StdCompiler;
-
-#include <cstdlib>
-#include <cassert>
-#include <cmath>
 
 #endif // INC_STANDARD
 
diff --git a/src/platform/StdJoystick.h b/src/platform/StdJoystick.h
index caba5a610..2f929ad9f 100644
--- a/src/platform/StdJoystick.h
+++ b/src/platform/StdJoystick.h
@@ -22,7 +22,6 @@
 #ifndef INC_StdJoystick
 #define INC_StdJoystick
 
-#include "C4Include.h"
 #include <Standard.h>
 #include <windows.h>
 #include <mmsystem.h>