diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h
index fe06dfe9d..86ce107b1 100644
--- a/src/server/game/Grids/Cells/Cell.h
+++ b/src/server/game/Grids/Cells/Cell.h
@@ -19,7 +19,6 @@
 #define ACORE_CELL_H
 
 #include "GridDefines.h"
-#include "TypeContainer.h"
 #include "TypeContainerVisitor.h"
 
 class Map;
diff --git a/src/server/game/Grids/Cells/CellImpl.h b/src/server/game/Grids/Cells/CellImpl.h
index 97eaa4f3f..f8cf0ed08 100644
--- a/src/server/game/Grids/Cells/CellImpl.h
+++ b/src/server/game/Grids/Cells/CellImpl.h
@@ -21,7 +21,6 @@
 #include "Cell.h"
 #include "Map.h"
 #include "Object.h"
-#include <cmath>
 
 inline Cell::Cell(CellCoord const& p)
 {
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp
index bfbf028d7..23b130b2a 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiers.cpp
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.cpp
@@ -18,7 +18,6 @@
 #include "GridNotifiers.h"
 #include "Map.h"
 #include "ObjectAccessor.h"
-#include "SpellMgr.h"
 #include "Transport.h"
 #include "UpdateData.h"
 #include "WorldPacket.h"
diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
index bc5e8e2fa..3be0d19d9 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
@@ -22,10 +22,7 @@
 #include "CreatureAI.h"
 #include "GridNotifiers.h"
 #include "Object.h"
-#include "Opcodes.h"
 #include "Player.h"
-#include "SpellAuras.h"
-#include "UpdateData.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 
diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp
index 2c92ef675..2b7d6f8ef 100644
--- a/src/server/game/Grids/ObjectGridLoader.cpp
+++ b/src/server/game/Grids/ObjectGridLoader.cpp
@@ -24,7 +24,6 @@
 #include "GridNotifiers.h"
 #include "ObjectMgr.h"
 #include "Transport.h"
-#include "Vehicle.h"
 
 // for loading world object at grid loading (Corpses)
 //TODO: to implement npc on transport, also need to load npcs at grid loading
diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h
index 863e5f15f..d6029ac7b 100644
--- a/src/server/game/Grids/ObjectGridLoader.h
+++ b/src/server/game/Grids/ObjectGridLoader.h
@@ -21,8 +21,6 @@
 #include "Cell.h"
 #include "Define.h"
 #include "GridDefines.h"
-#include "GridLoader.h"
-#include "TypeList.h"
 
 class ObjectWorldLoader;