vcmi: a bunch of forward definitions

lib/BasicTypes.cpp

@@ -13,6 +13,7 @@
 #include "VCMI_Lib.h"
 #include "GameConstants.h"
 #include "GameSettings.h"
+#include "JsonNode.h"
 #include "bonuses/BonusList.h"
 #include "bonuses/Bonus.h"
 #include "bonuses/IBonusBearer.h"

lib/BattleFieldHandler.cpp

@@ -11,6 +11,7 @@
 
 #include <vcmi/Entity.h>
 #include "BattleFieldHandler.h"
+#include "JsonNode.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 

lib/CModHandler.cpp

@@ -7,7 +7,6 @@
  * Full text of license available in license.txt file, in main folder
  *
  */
-#include "GameConstants.h"
 #include "StdInc.h"
 #include "CModHandler.h"
 #include "mapObjects/CObjectClassesHandler.h"

lib/bonuses/Bonus.h

@@ -20,6 +20,7 @@ class ILimiter;
 class IPropagator;
 class IUpdater;
 class BonusList;
+class CSelector;
 
 using TBonusSubtype = int32_t;
 using TBonusListPtr = std::shared_ptr<BonusList>;

lib/bonuses/BonusEnum.cpp

@@ -13,6 +13,8 @@
 
 #include "BonusEnum.h"
 
+#include "../JsonNode.h"
+
 VCMI_LIB_NAMESPACE_BEGIN
 
 #define BONUS_NAME(x) { #x, BonusType::x },

lib/bonuses/BonusEnum.h

@@ -10,10 +10,10 @@
 
 #pragma once
 
-#include "../JsonNode.h"
-
 VCMI_LIB_NAMESPACE_BEGIN
 
+class JsonNode;
+
 #define BONUS_LIST										\
 	BONUS_NAME(NONE) 									\
 	BONUS_NAME(LEVEL_COUNTER) /* for commander artifacts*/ \

lib/bonuses/BonusList.cpp

@@ -11,6 +11,8 @@
 #include "StdInc.h"
 #include "CBonusSystemNode.h"
 
+#include "../JsonNode.h"
+
 VCMI_LIB_NAMESPACE_BEGIN
 
 BonusList::BonusList(bool BelongsToTree) : belongsToTree(BelongsToTree)

lib/bonuses/CBonusSystemNode.h

@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include "GameConstants.h"
+
 #include "BonusList.h"
 #include "IBonusBearer.h"
 

lib/bonuses/Limiters.h

@@ -9,10 +9,14 @@
  */
 
 #include "Bonus.h"
-#include "battle/BattleHex.h"
+
+#include "../GameConstants.h"
+#include "../battle/BattleHex.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 
+class CCreature;
+
 extern DLL_LINKAGE const std::map<std::string, TLimiterPtr> bonusLimiterMap;
 
 struct BonusLimitationContext

scripting/lua/api/BonusSystem.cpp

@@ -11,6 +11,8 @@
 
 #include "BonusSystem.h"
 
+#include "../../../lib/JsonNode.h"
+
 #include "../../../lib/bonuses/BonusList.h"
 #include "../../../lib/bonuses/Bonus.h"
 #include "../../../lib/bonuses/IBonusBearer.h"

test/mock/mock_spells_Spell.h

@@ -11,6 +11,7 @@
 #pragma once
 
 #include <vcmi/spells/Spell.h>
+#include "GameConstants.h"
 
 namespace spells
 {