Core: Header cleanup in game/*/*.cpp

4 files changed, 3 insertions, 12 deletions

diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index fcbab4e8ab4..95a2485bc7a 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -30,12 +30,8 @@
 #include "UpdateData.h"
 #include "UpdateMask.h"
 #include "Util.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
-#include "Log.h"
 #include "Transport.h"
-#include "TargetedMovementGenerator.h"
-#include "WaypointMovementGenerator.h"
 #include "VMapFactory.h"
 #include "CellImpl.h"
 #include "GridNotifiers.h"
@@ -46,12 +42,8 @@
 #include "Totem.h"
 #include "MovementPackets.h"
 #include "OutdoorPvPMgr.h"
-#include "DynamicTree.h"
 #include "Unit.h"
-#include "Group.h"
 #include "BattlefieldMgr.h"
-#include "Battleground.h"
-#include "Chat.h"
 #include "GameObjectPackets.h"
 #include "MiscPackets.h"
 
diff --git a/src/server/game/Entities/Object/ObjectGuid.cpp b/src/server/game/Entities/Object/ObjectGuid.cpp
index af0513e2d26..05ef5d7dc32 100644
--- a/src/server/game/Entities/Object/ObjectGuid.cpp
+++ b/src/server/game/Entities/Object/ObjectGuid.cpp
@@ -18,7 +18,7 @@
 
 #include "ObjectGuid.h"
 #include "World.h"
-#include "ObjectMgr.h"
+
 #include <sstream>
 #include <iomanip>
 
diff --git a/src/server/game/Entities/Object/Position.cpp b/src/server/game/Entities/Object/Position.cpp
index 530e51cd8f5..8f8e5743f8c 100644
--- a/src/server/game/Entities/Object/Position.cpp
+++ b/src/server/game/Entities/Object/Position.cpp
@@ -17,9 +17,10 @@
 
 #include "Position.h"
 #include "ByteBuffer.h"
-#include "G3D/g3dmath.h"
 #include "GridDefines.h"
 
+#include <G3D/g3dmath.h>
+
 bool Position::operator==(Position const &a)
 {
     return (G3D::fuzzyEq(a.m_positionX, m_positionX) &&
diff --git a/src/server/game/Entities/Object/Updates/UpdateData.cpp b/src/server/game/Entities/Object/Updates/UpdateData.cpp
index 4ceb20d02aa..54c915a640b 100644
--- a/src/server/game/Entities/Object/Updates/UpdateData.cpp
+++ b/src/server/game/Entities/Object/Updates/UpdateData.cpp
@@ -20,9 +20,7 @@
 #include "ByteBuffer.h"
 #include "WorldPacket.h"
 #include "UpdateData.h"
-#include "Log.h"
 #include "Opcodes.h"
-#include "World.h"
 
 UpdateData::UpdateData(uint32 map) : m_map(map), m_blockCount(0) { }