Move prototypes back to C4Prototypes.h

src/C4Prototypes.h

@@ -22,79 +22,89 @@
 #ifndef INC_C4Prototypes
 #define INC_C4Prototypes
 
+class C4Action;
+class C4AList;
+class C4AulDefFunc;
 class C4AulFunc;
-class C4Game;
-class C4Record;
-class C4Playback;
-class C4Scenario;
-class C4PlayerInfoCore;
-class C4ObjectInfoCore;
+class C4AulScript;
+class C4AulScriptEngine;
+class C4AulScriptFunc;
+class C4ClientPlayerInfos;
+class C4Command;
+class C4Config;
+class C4Console;
 class C4Def;
 class C4DefList;
-class C4IDList;
-class C4NameList;
-class C4SVal;
-class C4Material;
-class C4MaterialMap;
-class C4TexMapEntry;
-class C4TextureMap;
-class C4TeamList;
-class C4RoundResult;
 class C4Facet;
-class C4ObjectInfo;
-class C4Object;
-class C4ObjectList;
-class C4ObjectLink;
-class C4MenuItem;
-class C4Menu;
-class C4Command;
-class C4Action;
-class C4MassMoverSet;
-class C4MassMover;
-class C4Console;
-class C4Viewport;
-class C4GraphicsSystem;
-class C4Player;
-class C4PlayerList;
-class C4GameResList;
+class C4FacetSurface;
+class C4Game;
 class C4GameMessage;
 class C4GameMessageList;
+class C4GameOptionsList;
 class C4GamePadControl;
 class C4GamePadOpener;
-class C4GameOptionsList;
-class C4SoundSystem;
-class C4PXS;
-class C4PXSSystem;
+class C4GamePadOpener;
+class C4GameResList;
 class C4Graph;
+class C4GraphicsSystem;
+class C4Group;
 class C4Group;
 class C4GroupSet;
-class C4Packet;
-class C4Stream;
+class C4IDList;
+class C4LChunk;
+class C4League;
+class C4LSector;
+class C4LSectors;
+class C4MassMover;
+class C4MassMoverSet;
+class C4Material;
+class C4MaterialList;
+class C4MaterialMap;
+class C4Menu;
+class C4MenuItem;
+class C4MouseControl;
+class C4NameList;
 class C4Network;
 class C4NetworkClient;
 class C4NetworkClientList;
-class C4MouseControl;
+class C4Object;
+class C4ObjectInfo;
+class C4ObjectInfoCore;
+class C4ObjectLink;
+class C4ObjectList;
+class C4Packet;
+class C4PathFinder;
+class C4Playback;
+class C4Player;
+class C4PlayerInfo;
+class C4PlayerInfoCore;
+class C4PlayerInfoList;
+class C4PlayerList;
+class C4PropList;
+class C4PXS;
+class C4PXSSystem;
+class C4RankSystem;
+class C4Record;
+class C4Rect;
 class C4Region;
 class C4RegionList;
-class C4PathFinder;
-class C4MaterialList;
-class C4AList;
-class C4AulFunc;
-class C4AulScriptFunc;
-class C4AulDefFunc;
-class C4AulScript;
-class C4AulScriptEngine;
-class C4LChunk;
-class C4LSector;
-class C4LSectors;
-class C4Rect;
-class C4Facet;
-class C4TargetFacet;
-class C4FacetSurface;
-class C4Surface;
-class C4League;
+class C4RoundResult;
 class C4RoundResults;
-class C4PropList;
+class C4Scenario;
+class C4SoundSystem;
+class C4Stream;
+class C4Surface;
+class C4SVal;
+class C4TargetFacet;
+class C4TeamList;
+class C4TexMapEntry;
+class C4TextureMap;
+class C4Viewport;
+class CStdFont;
+class CStdStream;
+class CStdVectorFont;
+class CSurface8;
+class StdCompiler;
 
 namespace C4GUI { class Screen; }
 typedef C4GUI::Screen C4GUIScreen;

src/control/C4PlayerInfo.h

@@ -41,13 +41,6 @@
 #include "C4InputValidation.h"
 #include "C4Id.h"
 
-class C4FacetSurface;
-
-// class predefs
-class C4PlayerInfo;
-class C4ClientPlayerInfos;
-class C4PlayerInfoList;
-
 // information about one player at a client
 class C4PlayerInfo
 	{

src/game/object/C4InfoCore.h

@@ -22,15 +22,11 @@
 #ifndef INC_C4InfoCore
 #define INC_C4InfoCore
 
-#include <vector>
 #include <C4Id.h>
 #include <C4ValueMap.h>
 #include <Fixed.h>
 #include "C4InputValidation.h"
 
-class C4Group;
-class C4RankSystem;
-
 const int32_t C4MaxPhysical = 100000,
 			C4MaxDeathMsg = 75;
 

src/gui/C4Gui.h

@@ -36,6 +36,7 @@
 #include "C4FacetEx.h"
 #include "C4LogBuf.h"
 #include "C4KeyboardInput.h"
+#include "C4Id.h"
 
 #include "C4Application.h"
 
@@ -44,10 +45,6 @@
 #include <StdResStr2.h>
 #include <StdWindow.h>
 
-class C4GroupSet;
-class C4GamePadOpener;
-class C4Viewport;
-class C4Def;
 
 // consts (load those from a def file some time)
 // font colors - alpha is font alpha, which is inversed opaque

src/lib/texture/C4SurfaceFile.h

@@ -23,10 +23,6 @@
 #ifndef INC_C4SurfaceFile
 #define INC_C4SurfaceFile
 
-class CStdStream;
-class C4Surface;
-class CSurface8;
-
 C4Surface *GroupReadSurface(CStdStream &hGroup, BYTE *bpPalette=NULL);
 CSurface8 *GroupReadSurface8(CStdStream &hGroup);
 C4Surface *GroupReadSurfaceOwnPal(CStdStream &hGroup);

src/network/C4Network2Res.h

@@ -23,7 +23,6 @@
 
 #include <StdAdaptors.h>
 #include <StdSync.h>
-#include <C4Group.h>
 
 #include <openssl/sha.h>
 

src/platform/C4Fonts.cpp

@@ -26,6 +26,7 @@
 #include <C4Components.h>
 #include <C4Log.h>
 #include <C4Surface.h>
+#include <StdFont.h>
 
 #include <StdFont.h>
 #include <stdexcept>

src/platform/C4Fonts.h

@@ -23,11 +23,6 @@
 
 #include <vector>
 
-class C4Group;
-class C4GroupSet;
-class C4Config;
-class CStdFont;
-class CStdVectorFont;
 
 // font definition to be read
 class C4FontDef