Remove unnecessary includes

AI/Nullkiller/Pathfinding/AINodeStorage.cpp

@@ -11,12 +11,9 @@
 #include "AINodeStorage.h"
 #include "Actions/TownPortalAction.h"
 #include "Actions/WhirlpoolAction.h"
-#include "../Goals/Goals.h"
-#include "../AIGateway.h"
 #include "../Engine/Nullkiller.h"
 #include "../../../lib/callback/IGameInfoCallback.h"
 #include "../../../lib/mapping/CMap.h"
-#include "../../../lib/mapObjects/MapObjects.h"
 #include "../../../lib/pathfinder/CPathfinder.h"
 #include "../../../lib/pathfinder/PathfinderUtil.h"
 #include "../../../lib/pathfinder/PathfinderOptions.h"

AI/Nullkiller/Pathfinding/AINodeStorage.h

@@ -16,10 +16,6 @@ constexpr int NKAI_GRAPH_TRACE_LEVEL = 0; // To actually enable graph visualizat
 
 #include "../../../lib/pathfinder/CGPathNode.h"
 #include "../../../lib/pathfinder/INodeStorage.h"
-#include "../../../lib/mapObjects/CGHeroInstance.h"
-#include "../AIUtility.h"
-#include "../Engine/FuzzyHelper.h"
-#include "../Goals/AbstractGoal.h"
 #include "Actions/SpecialAction.h"
 #include "Actors.h"
 

AI/VCAI/Pathfinding/AINodeStorage.cpp

@@ -10,10 +10,8 @@
 #include "StdInc.h"
 #include "AINodeStorage.h"
 #include "Actions/TownPortalAction.h"
-#include "../Goals/Goals.h"
 #include "../../../lib/callback/IGameInfoCallback.h"
 #include "../../../lib/mapping/CMap.h"
-#include "../../../lib/mapObjects/MapObjects.h"
 #include "../../../lib/pathfinder/CPathfinder.h"
 #include "../../../lib/pathfinder/PathfinderOptions.h"
 #include "../../../lib/pathfinder/PathfinderUtil.h"

AI/VCAI/Pathfinding/AINodeStorage.h

@@ -10,12 +10,9 @@
 
 #pragma once
 
-#include "../../../lib/mapObjects/CGHeroInstance.h"
 #include "../../../lib/pathfinder/CGPathNode.h"
 #include "../../../lib/pathfinder/INodeStorage.h"
-#include "../AIUtility.h"
 #include "../FuzzyHelper.h"
-#include "../Goals/AbstractGoal.h"
 #include "Actions/ISpecialAction.h"
 
 struct AIPathNode : public CGPathNode

AI/VCAI/Pathfinding/AIPathfinderConfig.h

@@ -11,7 +11,6 @@
 #pragma once
 
 #include "AINodeStorage.h"
-#include "../VCAI.h"
 #include "../../../lib/pathfinder/PathfinderOptions.h"
 
 namespace AIPathfinding

lib/mapObjects/MiscObjects.cpp

@@ -19,7 +19,6 @@
 #include "../entities/artifact/CArtifact.h"
 #include "../CConfigHandler.h"
 #include "../texts/CGeneralTextHandler.h"
-#include "../CSoundBase.h"
 #include "../CSkillHandler.h"
 #include "../spells/CSpellHandler.h"
 #include "../gameState/CGameState.h"
@@ -30,7 +29,6 @@
 #include "../mapObjectConstructors/AObjectTypeHandler.h"
 #include "../mapObjectConstructors/CObjectClassesHandler.h"
 #include "../mapObjects/CGHeroInstance.h"
-#include "../modding/ModScope.h"
 #include "../networkPacks/PacksForClient.h"
 #include "../networkPacks/PacksForClientBattle.h"
 #include "../networkPacks/StackLocation.h"

lib/pathfinder/CGPathNode.cpp

@@ -12,7 +12,7 @@
 
 #include "CPathfinder.h"
 
-#include "../gameState/CGameState.h"
+#include "../callback/IGameInfoCallback.h"
 #include "../mapObjects/CGHeroInstance.h"
 #include "../mapping/CMapDefines.h"
 

lib/pathfinder/CGPathNode.h

@@ -9,7 +9,8 @@
  */
 #pragma once
 
-#include "../GameConstants.h"
+#include "../constants/Enumerations.h"
+#include "../constants/EntityIdentifiers.h"
 #include "../int3.h"
 
 #include <boost/heap/fibonacci_heap.hpp>

lib/pathfinder/CPathfinder.cpp

@@ -24,7 +24,7 @@
 #include "../mapObjects/CGTownInstance.h"
 #include "../mapObjects/MiscObjects.h"
 #include "../mapping/CMap.h"
-#include "spells/CSpellHandler.h"
+#include "../spells/CSpellHandler.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 

lib/pathfinder/CPathfinder.h

@@ -10,12 +10,14 @@
 #pragma once
 
 #include "CGPathNode.h"
-#include "../callback/CGameInfoCallback.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 
+class IGameInfoCallback;
+class PathfinderConfig;
 class CGWhirlpool;
 class TurnInfo;
+class CGTeleport;
 struct PathfinderOptions;
 
 // Optimized storage - tile can have 0-8 neighbour tiles
@@ -63,7 +65,7 @@ private:
 	CGPathNode * topAndPop();
 };
 
-class DLL_LINKAGE CPathfinderHelper
+class DLL_LINKAGE CPathfinderHelper : boost::noncopyable
 {
 	/// returns base movement cost for movement between specific tiles. Does not accounts for diagonal movement or last tile exception
 	ui32 getTileMovementCost(const TerrainTile & dest, const TerrainTile & from, const TurnInfo * ti) const;

lib/pathfinder/INodeStorage.h

@@ -9,7 +9,7 @@
  */
 #pragma once
 
-#include "../GameConstants.h"
+#include "../constants/EntityIdentifiers.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 

lib/pathfinder/PathfinderOptions.cpp

@@ -10,13 +10,14 @@
 #include "StdInc.h"
 #include "PathfinderOptions.h"
 
-#include "../gameState/CGameState.h"
-#include "../IGameSettings.h"
-#include "../GameLibrary.h"
 #include "NodeStorage.h"
 #include "PathfindingRules.h"
 #include "CPathfinder.h"
 
+#include "../IGameSettings.h"
+#include "../GameLibrary.h"
+#include "../callback/IGameInfoCallback.h"
+
 VCMI_LIB_NAMESPACE_BEGIN
 
 PathfinderOptions::PathfinderOptions(const IGameInfoCallback & cb)

lib/pathfinder/PathfinderUtil.h

@@ -9,10 +9,9 @@
  */
 #pragma once
 
-#include "../TerrainHandler.h"
 #include "../mapObjects/CGObjectInstance.h"
 #include "../mapping/CMapDefines.h"
-#include "../gameState/CGameState.h"
+#include "../callback/IGameInfoCallback.h"
 #include "CGPathNode.h"
 
 VCMI_LIB_NAMESPACE_BEGIN