diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index ed909a4f14..ad716f7f74 100644
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "DBCStores.h"
+#include "DB2Stores.h"
 #include "Containers.h"
 #include "Log.h"
 #include "SharedDefines.h"
diff --git a/src/server/game/Maps/TransportMgr.h b/src/server/game/Maps/TransportMgr.h
index 34733613c2..ede7071965 100644
--- a/src/server/game/Maps/TransportMgr.h
+++ b/src/server/game/Maps/TransportMgr.h
@@ -22,6 +22,7 @@
 #include "Spline.h"
 #include "DBCStores.h"
 #include "ObjectGuid.h"
+#include "DB2Structure.h"
 
 struct KeyFrame;
 struct GameObjectTemplate;
diff --git a/src/server/game/Server/Packets/ChatPackets.h b/src/server/game/Server/Packets/ChatPackets.h
index 15764afe15..3d65bb04c5 100644
--- a/src/server/game/Server/Packets/ChatPackets.h
+++ b/src/server/game/Server/Packets/ChatPackets.h
@@ -19,6 +19,8 @@
 #define ChatPackets_h__
 
 #include "Packet.h"
+#include "SharedDefines.h"
+#include "ObjectGuid.h"
 
 namespace WorldPackets
 {
diff --git a/src/server/game/Server/Packets/MiscPackets.h b/src/server/game/Server/Packets/MiscPackets.h
index c25370505d..dfff0e331f 100644
--- a/src/server/game/Server/Packets/MiscPackets.h
+++ b/src/server/game/Server/Packets/MiscPackets.h
@@ -21,6 +21,8 @@
 #include "Packet.h"
 #include "ObjectGuid.h"
 #include "WorldSession.h"
+#include "G3D/Vector3.h"
+#include "Object.h"
 
 namespace WorldPackets
 {
diff --git a/src/server/game/Server/Packets/MovementPackets.cpp b/src/server/game/Server/Packets/MovementPackets.cpp
index bab7ad89ce..972a52dc41 100644
--- a/src/server/game/Server/Packets/MovementPackets.cpp
+++ b/src/server/game/Server/Packets/MovementPackets.cpp
@@ -17,6 +17,7 @@
 
 #include "MovementPackets.h"
 #include "MovementTypedefs.h"
+#include "Unit.h"
 
 ByteBuffer& operator<<(ByteBuffer& data, G3D::Vector3 const& v)
 {
diff --git a/src/server/game/Server/Packets/QuestPackets.h b/src/server/game/Server/Packets/QuestPackets.h
index 8fc5fe000f..12410380c3 100644
--- a/src/server/game/Server/Packets/QuestPackets.h
+++ b/src/server/game/Server/Packets/QuestPackets.h
@@ -20,6 +20,7 @@
 
 #include "Packet.h"
 #include "QuestDef.h"
+#include "ObjectGuid.h"
 
 namespace WorldPackets
 {