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)

1 files changed, 3 insertions, 9 deletions

diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h
index 238052fa943..99bad731a09 100644
--- a/src/server/game/Guilds/Guild.h
+++ b/src/server/game/Guilds/Guild.h
@@ -23,7 +23,6 @@
 #include "World.h"
 #include "Item.h"
 #include "WorldPacket.h"
-#include "ObjectMgr.h"
 #include "Player.h"
 
 class Item;
@@ -396,8 +395,8 @@ private:
         int32 GetBankWithdrawValue(uint8 tabId) const;
         void ResetValues(bool weekly = false);
 
-        inline Player* FindPlayer() const { return ObjectAccessor::FindPlayer(m_guid); }
-        inline Player* FindConnectedPlayer() const { return ObjectAccessor::FindConnectedPlayer(m_guid); }
+        Player* FindPlayer() const;
+        Player* FindConnectedPlayer() const;
 
     private:
         ObjectGuid::LowType m_guildId;
@@ -937,12 +936,7 @@ private:
         return nullptr;
     }
 
-    static inline void _DeleteMemberFromDB(ObjectGuid::LowType lowguid)
-    {
-        PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_MEMBER);
-        stmt->setUInt64(0, lowguid);
-        CharacterDatabase.Execute(stmt);
-    }
+    static void _DeleteMemberFromDB(ObjectGuid::LowType lowguid);
 
     // Creates log holders (either when loading or when creating guild)
     void _CreateLogHolders();