Core/Misc: Minor game include cleanup

11 files changed, 5 insertions, 23 deletions

diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h
index cf1337350aa..a979a9fe007 100644
--- a/src/server/game/Grids/Cells/Cell.h
+++ b/src/server/game/Grids/Cells/Cell.h
@@ -18,8 +18,6 @@
 #ifndef TRINITY_CELL_H
 #define TRINITY_CELL_H
 
-#include <cmath>
-
 #include "TypeContainer.h"
 #include "TypeContainerVisitor.h"
 
diff --git a/src/server/game/Grids/Cells/CellImpl.h b/src/server/game/Grids/Cells/CellImpl.h
index 3b343851bb2..a02938f3c4a 100644
--- a/src/server/game/Grids/Cells/CellImpl.h
+++ b/src/server/game/Grids/Cells/CellImpl.h
@@ -18,8 +18,6 @@
 #ifndef TRINITY_CELLIMPL_H
 #define TRINITY_CELLIMPL_H
 
-#include <cmath>
-
 #include "Cell.h"
 #include "Map.h"
 #include "Object.h"
diff --git a/src/server/game/Grids/Dynamic/TypeContainer.h b/src/server/game/Grids/Dynamic/TypeContainer.h
index f790f0e3904..0776bde32e0 100644
--- a/src/server/game/Grids/Dynamic/TypeContainer.h
+++ b/src/server/game/Grids/Dynamic/TypeContainer.h
@@ -23,9 +23,7 @@
  * types of object at the same time.
  */
 
-#include <map>
 #include <unordered_map>
-#include <vector>
 #include "Define.h"
 #include "Dynamic/TypeList.h"
 #include "GridRefManager.h"
diff --git a/src/server/game/Grids/Dynamic/TypeContainerFunctions.h b/src/server/game/Grids/Dynamic/TypeContainerFunctions.h
index 94d9a7e1594..e7dec91baf6 100644
--- a/src/server/game/Grids/Dynamic/TypeContainerFunctions.h
+++ b/src/server/game/Grids/Dynamic/TypeContainerFunctions.h
@@ -26,8 +26,6 @@
 
 #include "Define.h"
 #include "Dynamic/TypeList.h"
-#include <map>
-#include <unordered_map>
 
 namespace Trinity
 {
diff --git a/src/server/game/Grids/Dynamic/TypeContainerVisitor.h b/src/server/game/Grids/Dynamic/TypeContainerVisitor.h
index cfe3c68edf3..d22f159af28 100644
--- a/src/server/game/Grids/Dynamic/TypeContainerVisitor.h
+++ b/src/server/game/Grids/Dynamic/TypeContainerVisitor.h
@@ -24,7 +24,6 @@
  * to overload its types as a visit method is called.
  */
 
-#include "Define.h"
 #include "Dynamic/TypeContainer.h"
 
 // forward declaration
diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h
index fa0862dc896..cadf19c6044 100644
--- a/src/server/game/Grids/NGrid.h
+++ b/src/server/game/Grids/NGrid.h
@@ -24,7 +24,6 @@
 #include "Grid.h"
 #include "GridReference.h"
 #include "Timer.h"
-#include "Util.h"
 
 #define DEFAULT_VISIBILITY_NOTIFY_PERIOD      1000
 
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp
index fcfea53e891..84e035fb9ff 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiers.cpp
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.cpp
@@ -16,13 +16,13 @@
  */
 
 #include "GridNotifiers.h"
+#include "CellImpl.h"
+#include "CreatureAI.h"
 #include "GridNotifiersImpl.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
-#include "UpdateData.h"
-#include "Transport.h"
 #include "ObjectAccessor.h"
-#include "CellImpl.h"
+#include "Transport.h"
+#include "UpdateData.h"
+#include "WorldPacket.h"
 
 using namespace Trinity;
 
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h
index bd8bcbe6c07..6ae52d3cb63 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiers.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.h
@@ -29,7 +29,6 @@
 #include "SceneObject.h"
 #include "Spell.h"
 #include "SpellInfo.h"
-#include "TemporarySummon.h"
 #include "UnitAI.h"
 #include "UpdateData.h"
 
diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
index f09de34e4c9..816ad4c20a9 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
@@ -20,11 +20,8 @@
 
 #include "GridNotifiers.h"
 #include "Corpse.h"
-#include "CreatureAI.h"
 #include "Player.h"
-#include "SpellAuras.h"
 #include "UpdateData.h"
-#include "WorldPacket.h"
 #include "WorldSession.h"
 
 template<class T>
diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp
index f110d9b84ea..a6e3d5e52ce 100644
--- a/src/server/game/Grids/ObjectGridLoader.cpp
+++ b/src/server/game/Grids/ObjectGridLoader.cpp
@@ -31,8 +31,6 @@
 #include "ObjectMgr.h"
 #include "PhasingHandler.h"
 #include "SceneObject.h"
-#include "World.h"
-#include "ScriptMgr.h"
 
 void ObjectGridEvacuator::Visit(CreatureMapType &m)
 {
diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h
index c9f2de1ccb3..472efbaac5f 100644
--- a/src/server/game/Grids/ObjectGridLoader.h
+++ b/src/server/game/Grids/ObjectGridLoader.h
@@ -18,9 +18,7 @@
 #ifndef TRINITY_OBJECTGRIDLOADER_H
 #define TRINITY_OBJECTGRIDLOADER_H
 
-#include "TypeList.h"
 #include "Define.h"
-#include "GridLoader.h"
 #include "GridDefines.h"
 #include "Cell.h"