Core/Game: Include cleanup

* Mostly aimed at removing Log/DatabaseEnv includes from other headers
* Fix most packet headers including other packet headers - moved common structures such as ItemInstance to their own files
* Moved SAI function definitions to source files (massive or requiring many different dependencies)

4 files changed, 36 insertions, 8 deletions

diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp
index 533674ff156..7eca59ffd73 100644
--- a/src/server/game/Battlefield/Battlefield.cpp
+++ b/src/server/game/Battlefield/Battlefield.cpp
@@ -24,12 +24,15 @@
 #include "GridNotifiersImpl.h"
 #include "Group.h"
 #include "GroupMgr.h"
+#include "Log.h"
 #include "Map.h"
 #include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "WorldPacket.h"
+#include "BattlegroundPackets.h"
 #include "MiscPackets.h"
+#include "WorldStatePackets.h"
 
 Battlefield::Battlefield()
 {
@@ -252,6 +255,11 @@ void Battlefield::InvitePlayersInZoneToWar()
     }
 }
 
+uint64 Battlefield::GetQueueId() const
+{
+    return MAKE_PAIR64(m_BattleId | 0x20000, 0x1F100000);
+}
+
 void Battlefield::InvitePlayerToWar(Player* player)
 {
     if (!player)
diff --git a/src/server/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h
index acd07fb34c8..71b48f81de1 100644
--- a/src/server/game/Battlefield/Battlefield.h
+++ b/src/server/game/Battlefield/Battlefield.h
@@ -18,10 +18,10 @@
 #ifndef BATTLEFIELD_H_
 #define BATTLEFIELD_H_
 
-#include "ObjectDefines.h"
+#include "Position.h"
 #include "SharedDefines.h"
 #include "ZoneScript.h"
-#include "Packets/WorldStatePackets.h"
+#include <map>
 
 enum BattlefieldTypes
 {
@@ -67,14 +67,31 @@ enum BattlefieldTimers
 };
 
 // some class predefs
-class Player;
-class GameObject;
-class WorldPacket;
+class Battlefield;
+class BfGraveyard;
 class Creature;
+class GameObject;
+class Group;
+class Map;
+class Player;
 class Unit;
+class WorldPacket;
 
-class Battlefield;
-class BfGraveyard;
+struct Position;
+struct WorldSafeLocsEntry;
+
+namespace WorldPackets
+{
+    namespace WorldState
+    {
+        class InitWorldStates;
+    }
+}
+
+namespace G3D
+{
+    class Quat;
+}
 
 typedef std::vector<BfGraveyard*> GraveyardVect;
 typedef std::map<ObjectGuid, time_t> PlayerTimerMap;
@@ -234,7 +251,7 @@ class TC_GAME_API Battlefield : public ZoneScript
 
         uint32 GetTypeId() const { return m_TypeId; }
         uint32 GetZoneId() const { return m_ZoneId; }
-        uint64 GetQueueId() const { return MAKE_PAIR64(m_BattleId | 0x20000, 0x1F100000); }
+        uint64 GetQueueId() const;
 
         void TeamApplyBuff(TeamId team, uint32 spellId, uint32 spellId2 = 0);
 
diff --git a/src/server/game/Battlefield/Zones/BattlefieldTB.cpp b/src/server/game/Battlefield/Zones/BattlefieldTB.cpp
index 88a13344ace..0163b6c0195 100644
--- a/src/server/game/Battlefield/Zones/BattlefieldTB.cpp
+++ b/src/server/game/Battlefield/Zones/BattlefieldTB.cpp
@@ -34,6 +34,7 @@
 #include "SpellAuras.h"
 #include "TemporarySummon.h"
 #include "WorldSession.h"
+#include "WorldStatePackets.h"
 
 BattlefieldTB::~BattlefieldTB() { }
 
diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
index ff6476bc06d..815b37064bb 100644
--- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
+++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
@@ -24,12 +24,14 @@
 #include "CreatureTextMgr.h"
 #include "Battleground.h"
 #include "MapManager.h"
+#include "Log.h"
 #include "ObjectMgr.h"
 #include "Opcodes.h"
 #include "Player.h"
 #include "SpellAuras.h"
 #include "TemporarySummon.h"
 #include "WorldSession.h"
+#include "WorldStatePackets.h"
 
 struct BfWGCoordGY
 {