diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
index 5232e9912b2..2cf698f9e28 100644
--- a/src/server/game/Entities/Object/Object.h
+++ b/src/server/game/Entities/Object/Object.h
@@ -75,12 +75,15 @@ enum NotifyFlags
     NOTIFY_ALL                      = 0xFF
 };
 
+class AreaTrigger;
+class Conversation;
 class Corpse;
 class Creature;
 class CreatureAI;
 class DynamicObject;
 class GameObject;
 class InstanceScript;
+class Map;
 class Player;
 class Scenario;
 class TempSummon;
@@ -91,6 +94,11 @@ class WorldObject;
 class WorldPacket;
 class ZoneScript;
 
+namespace G3D
+{
+    class Quat;
+}
+
 typedef std::unordered_map<Player*, UpdateData> UpdateDataMapType;
 
 namespace UpdateMask
diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h
index 6322c439a43..df0ba99de1e 100644
--- a/src/server/game/Globals/ObjectAccessor.h
+++ b/src/server/game/Globals/ObjectAccessor.h
@@ -22,18 +22,19 @@
 #include "ObjectGuid.h"
 #include <unordered_map>
 
-class Object;
-class WorldObject;
-class Unit;
-class Creature;
-class Player;
-class Corpse;
-class GameObject;
-class DynamicObject;
 class AreaTrigger;
-class Pet;
-class Transport;
+class Conversation;
+class Corpse;
+class Creature;
+class DynamicObject;
+class GameObject;
 class Map;
+class Object;
+class Pet;
+class Player;
+class Transport;
+class Unit;
+class WorldObject;
 
 namespace boost
 {