diff --git a/server/battles/BattleActionProcessor.cpp b/server/battles/BattleActionProcessor.cpp
index bddabd8b7..e32d082f3 100644
--- a/server/battles/BattleActionProcessor.cpp
+++ b/server/battles/BattleActionProcessor.cpp
@@ -13,31 +13,17 @@
 #include "BattleProcessor.h"
 
 #include "../CGameHandler.h"
-#include "../CVCMIServer.h"
-#include "../processors/HeroPoolProcessor.h"
-#include "../queries/QueriesProcessor.h"
-#include "../queries/BattleQueries.h"
 
-#include "../../lib/ArtifactUtils.h"
 #include "../../lib/CGeneralTextHandler.h"
 #include "../../lib/CStack.h"
-#include "../../lib/CondSh.h"
 #include "../../lib/GameSettings.h"
-#include "../../lib/ScopeGuard.h"
-#include "../../lib/TerrainHandler.h"
-#include "../../lib/UnlockGuard.h"
 #include "../../lib/battle/BattleInfo.h"
-#include "../../lib/battle/CUnitState.h"
+#include "../../lib/battle/BattleAction.h"
 #include "../../lib/gameState/CGameState.h"
-#include "../../lib/mapObjects/CGTownInstance.h"
-#include "../../lib/mapping/CMap.h"
-#include "../../lib/modding/IdentifierStorage.h"
-#include "../../lib/serializer/Cast.h"
+#include "../../lib/NetPacks.h"
 #include "../../lib/spells/AbilityCaster.h"
-#include "../../lib/spells/BonusCaster.h"
 #include "../../lib/spells/CSpellHandler.h"
 #include "../../lib/spells/ISpellMechanics.h"
-#include "../../lib/spells/ObstacleCasterProxy.h"
 #include "../../lib/spells/Problem.h"
 
 BattleActionProcessor::BattleActionProcessor(BattleProcessor * owner)
diff --git a/server/battles/BattleFlowProcessor.cpp b/server/battles/BattleFlowProcessor.cpp
index 3cbe14402..b671a1f13 100644
--- a/server/battles/BattleFlowProcessor.cpp
+++ b/server/battles/BattleFlowProcessor.cpp
@@ -13,32 +13,16 @@
 #include "BattleProcessor.h"
 
 #include "../CGameHandler.h"
-#include "../CVCMIServer.h"
-#include "../processors/HeroPoolProcessor.h"
-#include "../queries/QueriesProcessor.h"
-#include "../queries/BattleQueries.h"
 
-#include "../../lib/ArtifactUtils.h"
-#include "../../lib/CGeneralTextHandler.h"
 #include "../../lib/CStack.h"
-#include "../../lib/CondSh.h"
 #include "../../lib/GameSettings.h"
-#include "../../lib/ScopeGuard.h"
-#include "../../lib/TerrainHandler.h"
-#include "../../lib/UnlockGuard.h"
 #include "../../lib/battle/BattleInfo.h"
-#include "../../lib/battle/CUnitState.h"
 #include "../../lib/gameState/CGameState.h"
 #include "../../lib/mapObjects/CGTownInstance.h"
-#include "../../lib/mapping/CMap.h"
-#include "../../lib/modding/IdentifierStorage.h"
-#include "../../lib/serializer/Cast.h"
-#include "../../lib/spells/AbilityCaster.h"
+#include "../../lib/NetPacks.h"
 #include "../../lib/spells/BonusCaster.h"
-#include "../../lib/spells/CSpellHandler.h"
 #include "../../lib/spells/ISpellMechanics.h"
 #include "../../lib/spells/ObstacleCasterProxy.h"
-#include "../../lib/spells/Problem.h"
 
 BattleFlowProcessor::BattleFlowProcessor(BattleProcessor * owner)
 	: owner(owner)
diff --git a/server/battles/BattleProcessor.cpp b/server/battles/BattleProcessor.cpp
index 0c04bff7c..62a0be3a1 100644
--- a/server/battles/BattleProcessor.cpp
+++ b/server/battles/BattleProcessor.cpp
@@ -15,32 +15,14 @@
 #include "BattleResultProcessor.h"
 
 #include "../CGameHandler.h"
-#include "../CVCMIServer.h"
-#include "../processors/HeroPoolProcessor.h"
 #include "../queries/QueriesProcessor.h"
 #include "../queries/BattleQueries.h"
 
-#include "../../lib/ArtifactUtils.h"
-#include "../../lib/CGeneralTextHandler.h"
-#include "../../lib/CStack.h"
-#include "../../lib/CondSh.h"
-#include "../../lib/GameSettings.h"
-#include "../../lib/ScopeGuard.h"
 #include "../../lib/TerrainHandler.h"
-#include "../../lib/UnlockGuard.h"
 #include "../../lib/battle/BattleInfo.h"
-#include "../../lib/battle/CUnitState.h"
 #include "../../lib/gameState/CGameState.h"
-#include "../../lib/mapObjects/CGTownInstance.h"
 #include "../../lib/mapping/CMap.h"
 #include "../../lib/modding/IdentifierStorage.h"
-#include "../../lib/serializer/Cast.h"
-#include "../../lib/spells/AbilityCaster.h"
-#include "../../lib/spells/BonusCaster.h"
-#include "../../lib/spells/CSpellHandler.h"
-#include "../../lib/spells/ISpellMechanics.h"
-#include "../../lib/spells/ObstacleCasterProxy.h"
-#include "../../lib/spells/Problem.h"
 
 BattleProcessor::BattleProcessor(CGameHandler * gameHandler)
 	: gameHandler(gameHandler)
diff --git a/server/battles/BattleResultProcessor.cpp b/server/battles/BattleResultProcessor.cpp
index 6f1fe3451..912de4e65 100644
--- a/server/battles/BattleResultProcessor.cpp
+++ b/server/battles/BattleResultProcessor.cpp
@@ -11,32 +11,18 @@
 #include "BattleResultProcessor.h"
 
 #include "../CGameHandler.h"
-#include "../CVCMIServer.h"
 #include "../processors/HeroPoolProcessor.h"
 #include "../queries/QueriesProcessor.h"
 #include "../queries/BattleQueries.h"
 
 #include "../../lib/ArtifactUtils.h"
-#include "../../lib/CGeneralTextHandler.h"
 #include "../../lib/CStack.h"
-#include "../../lib/CondSh.h"
 #include "../../lib/GameSettings.h"
-#include "../../lib/ScopeGuard.h"
-#include "../../lib/TerrainHandler.h"
-#include "../../lib/UnlockGuard.h"
 #include "../../lib/battle/BattleInfo.h"
-#include "../../lib/battle/CUnitState.h"
 #include "../../lib/gameState/CGameState.h"
 #include "../../lib/mapObjects/CGTownInstance.h"
-#include "../../lib/mapping/CMap.h"
-#include "../../lib/modding/IdentifierStorage.h"
 #include "../../lib/serializer/Cast.h"
-#include "../../lib/spells/AbilityCaster.h"
-#include "../../lib/spells/BonusCaster.h"
 #include "../../lib/spells/CSpellHandler.h"
-#include "../../lib/spells/ISpellMechanics.h"
-#include "../../lib/spells/ObstacleCasterProxy.h"
-#include "../../lib/spells/Problem.h"
 
 BattleResultProcessor::BattleResultProcessor(BattleProcessor * owner)
 //	: owner(owner)