From 7189a12df223bc8a94401ffea98f98b726fdd640 Mon Sep 17 00:00:00 2001
From: Ivan Savenko <saven.ivan@gmail.com>
Date: Wed, 2 Dec 2015 22:10:46 +0200
Subject: [PATCH] removed few more includes from headers

---
 AI/VCAI/AIUtility.cpp             | 1 +
 AI/VCAI/AIUtility.h               | 2 --
 AI/VCAI/VCAI.cpp                  | 1 +
 AI/VCAI/VCAI.h                    | 2 --
 lib/BattleState.h                 | 3 ---
 lib/Connection.h                  | 2 +-
 lib/registerTypes/RegisterTypes.h | 2 --
 server/CGameHandler.h             | 2 --
 8 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/AI/VCAI/AIUtility.cpp b/AI/VCAI/AIUtility.cpp
index 4ffbef8c6..f3892ef49 100644
--- a/AI/VCAI/AIUtility.cpp
+++ b/AI/VCAI/AIUtility.cpp
@@ -10,6 +10,7 @@
 #include "../../lib/mapObjects/CGTownInstance.h"
 #include "../../lib/mapObjects/CQuest.h"
 #include "../../lib/CPathfinder.h"
+#include "../../lib/mapping/CMapDefines.h"
 
 /*
  * AIUtility.cpp, part of VCMI engine
diff --git a/AI/VCAI/AIUtility.h b/AI/VCAI/AIUtility.h
index 2d3577202..bb551e51b 100644
--- a/AI/VCAI/AIUtility.h
+++ b/AI/VCAI/AIUtility.h
@@ -6,8 +6,6 @@
 #include "../../lib/CTownHandler.h"
 #include "../../lib/spells/CSpellHandler.h"
 #include "../../lib/Connection.h"
-//#include "../../lib/CGameState.h"
-#include "../../lib/NetPacks.h"
 #include "../../lib/CStopWatch.h"
 
 /*
diff --git a/AI/VCAI/VCAI.cpp b/AI/VCAI/VCAI.cpp
index 143e2b849..17cefc5e3 100644
--- a/AI/VCAI/VCAI.cpp
+++ b/AI/VCAI/VCAI.cpp
@@ -9,6 +9,7 @@
 #include "../../lib/CHeroHandler.h"
 #include "../../lib/CModHandler.h"
 #include "../../lib/CGameState.h"
+#include "../../lib/NetPacks.h"
 
 
 /*
diff --git a/AI/VCAI/VCAI.h b/AI/VCAI/VCAI.h
index 19c638cc2..c90c25dbf 100644
--- a/AI/VCAI/VCAI.h
+++ b/AI/VCAI/VCAI.h
@@ -15,8 +15,6 @@
 #include "../../lib/mapObjects/MiscObjects.h"
 #include "../../lib/spells/CSpellHandler.h"
 #include "../../lib/Connection.h"
-//#include "../../lib/CGameState.h"
-#include "../../lib/NetPacks.h"
 #include "../../lib/CondSh.h"
 
 struct QuestInfo;
diff --git a/lib/BattleState.h b/lib/BattleState.h
index 44260ad32..a06b517cd 100644
--- a/lib/BattleState.h
+++ b/lib/BattleState.h
@@ -11,12 +11,9 @@
 #pragma once
 
 #include "BattleHex.h"
-#include "HeroBonus.h"
-#include "CCreatureSet.h"
 #include "mapObjects/CArmedInstance.h" // for army serialization
 #include "mapObjects/CGHeroInstance.h" // for commander serialization
 #include "CCreatureHandler.h"
-#include "CObstacleInstance.h"
 #include "ConstTransitivePtr.h"
 #include "GameConstants.h"
 #include "CBattleCallback.h"
diff --git a/lib/Connection.h b/lib/Connection.h
index ee07bf9aa..49acb9c14 100644
--- a/lib/Connection.h
+++ b/lib/Connection.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include <typeinfo> //XXX this is in namespace std if you want w/o use typeinfo.h?
+#include <typeinfo>
 #include <type_traits>
 
 #include <boost/mpl/eval_if.hpp>
diff --git a/lib/registerTypes/RegisterTypes.h b/lib/registerTypes/RegisterTypes.h
index e3d3a9654..13ab1b028 100644
--- a/lib/registerTypes/RegisterTypes.h
+++ b/lib/registerTypes/RegisterTypes.h
@@ -24,8 +24,6 @@
  *
  */
 
-
-
 template<typename Serializer>
 void registerTypesMapObjects1(Serializer &s)
 {
diff --git a/server/CGameHandler.h b/server/CGameHandler.h
index fb1fff251..4370e6aec 100644
--- a/server/CGameHandler.h
+++ b/server/CGameHandler.h
@@ -2,11 +2,9 @@
 
 
 #include "../lib/FunctionList.h"
-//#include "../lib/CGameState.h"
 #include "../lib/Connection.h"
 #include "../lib/IGameCallback.h"
 #include "../lib/BattleAction.h"
-#include "../lib/NetPacks.h"
 #include "CQuery.h"