Cleaning up includes

client/widgets/CArtifactHolder.h

@@ -1,8 +1,6 @@
 #pragma once
 
 #include "CComponent.h"
-#include "../gui/CIntObject.h"
-#include "../../lib/NetPacksBase.h"
 
 /*
  * CArtifactHolder.h, part of VCMI engine
@@ -18,6 +16,8 @@ class CArtifactsOfHero;
 class CAnimImage;
 class CAdventureMapButton;
 
+struct ArtifactLocation;
+
 class CArtifactHolder
 {
 public:

client/widgets/CComponent.cpp

@@ -14,6 +14,7 @@
 #include "../../lib/CCreatureHandler.h"
 #include "../../lib/CSpellHandler.h"
 #include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/NetPacksBase.h"
 
 /*
  * CComponent.cpp, part of VCMI engine

client/widgets/CComponent.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "../../lib/NetPacksBase.h"
 #include "CIntObjectClasses.h"
 
 /*
@@ -13,6 +12,8 @@
  *
  */
 
+struct Component;
+
 /// common popup window component
 class CComponent : public virtual CIntObject
 {

client/widgets/CIntObjectClasses.h

@@ -2,6 +2,7 @@
 
 #include "../gui/CIntObject.h"
 #include "../gui/SDL_Extensions.h"
+
 #include "../../lib/FunctionList.h"
 
 struct SDL_Surface;
@@ -99,7 +100,7 @@ public:
 	bool swappedImages,//fix for some buttons: normal and pressed image are swapped
 		keepFrame; // don't change visual representation
 
-    void addTextOverlay(const std::string &Text, EFonts font, SDL_Color color = Colors::WHITE);
+	void addTextOverlay(const std::string &Text, EFonts font, SDL_Color color = Colors::WHITE);
 	void update();//to refresh button after image or text change
 
 	void setOffset(int newOffset);

client/widgets/MiscWidgets.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "CIntObjectClasses.h"
 #include "CComponent.h"
 
 /*

client/windows/CAdvmapInterface.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "../gui/CIntObject.h"
 #include "../widgets/AdventureMapClasses.h"
 
 class CDefHandler;

client/windows/CHeroWindow.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "../../lib/HeroBonus.h"
-#include "../widgets/CIntObjectClasses.h"
 #include "../widgets/CArtifactHolder.h"
 #include "../widgets/CGarrisonInt.h"
 

client/windows/CSpellWindow.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "../gui/CIntObject.h"
 #include "../widgets/CIntObjectClasses.h"
 
 /*

client/windows/CTradeWindow.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "../widgets/CIntObjectClasses.h"
 #include "../widgets/CArtifactHolder.h"
 
 /*

client/windows/GUIClasses.h

@@ -17,59 +17,8 @@
  *
  */
 
-struct ArtifactLocation;
-class CStackBasicDescriptor;
-class CBonusSystemNode;
-class CArtifact;
-class CDefEssential;
-class CAdventureMapButton;
-class CHighlightableButtonsGroup;
-class CDefHandler;
-struct HeroMoveDetails;
-class CDefEssential;
-class CGHeroInstance;
-class CAdvMapInt;
-class CCastleInterface;
-class CBattleInterface;
-class CStack;
-class CComponent;
-class CCreature;
-struct SDL_Surface;
-struct CPath;
-class CCreatureAnim;
-class CSelectableComponent;
-class CCreatureSet;
-class CGObjectInstance;
 class CGDwelling;
-class CSlider;
-struct UpgradeInfo;
-template <typename T> struct CondSh;
-class CInGameConsole;
-class CGarrisonInt;
-class CInGameConsole;
-struct Component;
-class CArmedInstance;
-class CGTownInstance;
-class StackState;
-class CPlayerInterface;
-class CHeroWindow;
-class CArtifact;
-class CArtifactsOfHero;
-class CCreatureArtifactSet;
-class CResDataBar;
-struct SPuzzleInfo;
-class CGGarrison;
-class CStackInstance;
 class IMarket;
-class CTextBox;
-class CArtifactInstance;
-class IBonusBearer;
-class CArtPlace;
-class CAnimImage;
-struct InfoAboutArmy;
-struct InfoAboutHero;
-struct InfoAboutTown;
-
 class CCreaturePic;
 class MoraleLuckBox;
 class CHeroArea;