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)

6 files changed, 62 insertions, 34 deletions

diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index 792a757493b..fdfb062104b 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -16,22 +16,24 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "Guild.h"
 #include "AccountMgr.h"
+#include "Bag.h"
 #include "CalendarMgr.h"
+#include "CalendarPackets.h"
 #include "Chat.h"
+#include "ChatPackets.h"
 #include "Config.h"
 #include "DatabaseEnv.h"
-#include "Guild.h"
 #include "GuildFinderMgr.h"
 #include "GuildMgr.h"
 #include "GuildPackets.h"
 #include "Language.h"
 #include "Log.h"
+#include "ObjectMgr.h"
+#include "Opcodes.h"
 #include "ScriptMgr.h"
 #include "SocialMgr.h"
-#include "Opcodes.h"
-#include "ChatPackets.h"
-#include "CalendarPackets.h"
 
 #define MAX_GUILD_BANK_TAB_TEXT_LEN 500
 #define EMBLEM_PRICE 10 * GOLD
@@ -656,6 +658,16 @@ void Guild::Member::ResetValues(bool weekly /* = false*/)
     }
 }
 
+Player* Guild::Member::FindPlayer() const
+{
+    return ObjectAccessor::FindPlayer(m_guid);
+}
+
+Player* Guild::Member::FindConnectedPlayer() const
+{
+    return ObjectAccessor::FindConnectedPlayer(m_guid);
+}
+
 // Get amount of money/slots left for today.
 // If (tabId == GUILD_BANK_MAX_TABS) return money amount.
 // Otherwise return remaining items amount for specified tab.
@@ -2761,6 +2773,13 @@ void Guild::SetBankTabText(uint8 tabId, std::string const& text)
     }
 }
 
+void Guild::_DeleteMemberFromDB(ObjectGuid::LowType lowguid)
+{
+    PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_MEMBER);
+    stmt->setUInt64(0, lowguid);
+    CharacterDatabase.Execute(stmt);
+}
+
 // Private methods
 void Guild::_CreateLogHolders()
 {
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();
diff --git a/src/server/game/Guilds/GuildFinderMgr.cpp b/src/server/game/Guilds/GuildFinderMgr.cpp
index 8182bc848dd..c057324e2c5 100644
--- a/src/server/game/Guilds/GuildFinderMgr.cpp
+++ b/src/server/game/Guilds/GuildFinderMgr.cpp
@@ -15,12 +15,24 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ObjectMgr.h"
 #include "GuildFinderMgr.h"
+#include "DatabaseEnv.h"
+#include "Guild.h"
 #include "GuildMgr.h"
 #include "GuildFinderPackets.h"
+#include "Log.h"
+#include "ObjectMgr.h"
 #include "World.h"
 
+MembershipRequest::MembershipRequest() : _availability(0), _classRoles(0), _interests(0), _time(time(NULL))
+{
+}
+
+MembershipRequest::MembershipRequest(ObjectGuid const& playerGUID, ObjectGuid const& guildId, uint32 availability, uint32 classRoles, uint32 interests, std::string comment, time_t submitTime) :
+    _comment(std::move(comment)), _guildId(guildId), _playerGUID(playerGUID), _availability(availability), _classRoles(classRoles), _interests(interests), _time(submitTime)
+{
+}
+
 GuildFinderMgr::GuildFinderMgr()
 {
 }
@@ -102,7 +114,7 @@ void GuildFinderMgr::LoadMembershipRequests()
         std::string comment = fields[5].GetString();
         uint32 submitTime   = fields[6].GetUInt32();
 
-        MembershipRequest request(playerId, guildId, availability, classRoles, interests, comment, time_t(submitTime));
+        MembershipRequest request(playerId, guildId, availability, classRoles, interests, std::move(comment), time_t(submitTime));
 
         _membershipRequestsByGuild[guildId][playerId] = request;
         _membershipRequestsByPlayer[playerId][guildId] = request;
diff --git a/src/server/game/Guilds/GuildFinderMgr.h b/src/server/game/Guilds/GuildFinderMgr.h
index 5a08a1bead2..9e9f9ffb905 100644
--- a/src/server/game/Guilds/GuildFinderMgr.h
+++ b/src/server/game/Guilds/GuildFinderMgr.h
@@ -20,7 +20,11 @@
 
 #include "Common.h"
 #include "ObjectGuid.h"
-#include "GuildMgr.h"
+#include "SharedDefines.h"
+#include <unordered_map>
+
+class Guild;
+class Player;
 
 enum GuildFinderOptionsInterest
 {
@@ -58,22 +62,9 @@ enum GuildFinderOptionsLevel
 struct MembershipRequest
 {
     public:
-        MembershipRequest(MembershipRequest const& settings) : _comment(settings.GetComment())
-        {
-            _availability = settings.GetAvailability();
-            _classRoles = settings.GetClassRoles();
-            _interests = settings.GetInterests();
-            _guildId = settings.GetGuildGuid();
-            _playerGUID = settings.GetPlayerGUID();
-            _time = settings.GetSubmitTime();
-        }
-
-        MembershipRequest(ObjectGuid const& playerGUID, ObjectGuid const& guildId, uint32 availability, uint32 classRoles, uint32 interests, std::string& comment, time_t submitTime) :
-            _comment(comment), _guildId(guildId), _playerGUID(playerGUID), _availability(availability),
-            _classRoles(classRoles), _interests(interests), _time(submitTime)  {}
+        MembershipRequest();
 
-        MembershipRequest() : _availability(0), _classRoles(0),
-            _interests(0), _time(time(NULL)) {}
+        MembershipRequest(ObjectGuid const& playerGUID, ObjectGuid const& guildId, uint32 availability, uint32 classRoles, uint32 interests, std::string comment, time_t submitTime);
 
         ObjectGuid const& GetGuildGuid() const      { return _guildId; }
         ObjectGuid const& GetPlayerGUID() const   { return _playerGUID; }
diff --git a/src/server/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp
index 3ddd511fe61..c7811b0b9ab 100644
--- a/src/server/game/Guilds/GuildMgr.cpp
+++ b/src/server/game/Guilds/GuildMgr.cpp
@@ -15,11 +15,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Common.h"
 #include "GuildMgr.h"
+#include "DatabaseEnv.h"
+#include "Guild.h"
+#include "Log.h"
+#include "ObjectMgr.h"
 
 GuildMgr::GuildMgr() : NextGuildId(UI64LIT(1))
-{ }
+{
+}
 
 GuildMgr::~GuildMgr()
 {
diff --git a/src/server/game/Guilds/GuildMgr.h b/src/server/game/Guilds/GuildMgr.h
index fda7a0c6271..4833c840e10 100644
--- a/src/server/game/Guilds/GuildMgr.h
+++ b/src/server/game/Guilds/GuildMgr.h
@@ -18,13 +18,21 @@
 #ifndef _GUILDMGR_H
 #define _GUILDMGR_H
 
-#include "Guild.h"
+#include "Define.h"
+#include "ObjectGuid.h"
+#include <unordered_map>
+#include <vector>
+
+class Guild;
+struct GuildReward;
 
 class TC_GAME_API GuildMgr
 {
 private:
     GuildMgr();
     ~GuildMgr();
+    GuildMgr(GuildMgr const&) = delete;
+    GuildMgr& operator=(GuildMgr const&) = delete;
 
 public:
     static GuildMgr* instance();