Core/Common: Include cleanup

16 files changed, 51 insertions, 20 deletions

diff --git a/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h b/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h
index 98778d9fa83..d6ef0a43d79 100644
--- a/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h
+++ b/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h
@@ -18,9 +18,10 @@
 #ifndef TRINITYCORE_AREATRIGGER_TEMPLATE_H
 #define TRINITYCORE_AREATRIGGER_TEMPLATE_H
 
-#include <G3D/Vector3.h>
-
 #include "Define.h"
+#include <G3D/Vector3.h>
+#include <vector>
+#include <cstring>
 
 #define MAX_AREATRIGGER_ENTITY_DATA 6
 #define MAX_AREATRIGGER_SCALE 7
diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp
index ac34ebc0e9c..27a8623bad0 100644
--- a/src/server/game/Entities/Corpse/Corpse.cpp
+++ b/src/server/game/Entities/Corpse/Corpse.cpp
@@ -19,6 +19,7 @@
 #include "Common.h"
 #include "Corpse.h"
 #include "Player.h"
+#include "UpdateData.h"
 #include "ObjectAccessor.h"
 #include "DatabaseEnv.h"
 
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index 32775918cb2..94ef4c532d6 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -20,6 +20,7 @@
 #define TRINITYCORE_CREATURE_H
 
 #include "Common.h"
+#include "Duration.h"
 #include "Unit.h"
 #include "ItemTemplate.h"
 #include "LootMgr.h"
@@ -482,21 +483,21 @@ typedef std::unordered_map<uint16, CreatureBaseStats> CreatureBaseStatsContainer
 
 struct CreatureLocale
 {
-    StringVector Name;
-    StringVector NameAlt;
-    StringVector Title;
-    StringVector TitleAlt;
+    std::vector<std::string> Name;
+    std::vector<std::string> NameAlt;
+    std::vector<std::string> Title;
+    std::vector<std::string> TitleAlt;
 };
 
 struct GossipMenuItemsLocale
 {
-    StringVector OptionText;
-    StringVector BoxText;
+    std::vector<std::string> OptionText;
+    std::vector<std::string> BoxText;
 };
 
 struct PointOfInterestLocale
 {
-    StringVector Name;
+    std::vector<std::string> Name;
 };
 
 struct EquipmentItem
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index 6f444d857c9..fe4fcd08cad 100644
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -865,9 +865,9 @@ union GameObjectValue
 
 struct GameObjectLocale
 {
-    StringVector Name;
-    StringVector CastBarCaption;
-    StringVector Unk1;
+    std::vector<std::string> Name;
+    std::vector<std::string> CastBarCaption;
+    std::vector<std::string> Unk1;
 };
 
 // `gameobject_addon` table
diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp
index 5d039a615b9..6c97161ba3a 100644
--- a/src/server/game/Entities/Item/Item.cpp
+++ b/src/server/game/Entities/Item/Item.cpp
@@ -34,6 +34,7 @@
 #include "GameTables.h"
 #include "CollectionMgr.h"
 #include "ArtifactPackets.h"
+#include "UpdateData.h"
 
 void AddItemsSetItem(Player* player, Item* item)
 {
diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
index ce88ba61f3e..a9bef8e415f 100644
--- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
+++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
@@ -22,6 +22,7 @@
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "Util.h"
+#include "Random.h"
 
 #include <list>
 #include <vector>
diff --git a/src/server/game/Entities/Object/ObjectGuid.cpp b/src/server/game/Entities/Object/ObjectGuid.cpp
index 92484f9e184..292dcdd60a4 100644
--- a/src/server/game/Entities/Object/ObjectGuid.cpp
+++ b/src/server/game/Entities/Object/ObjectGuid.cpp
@@ -17,8 +17,9 @@
  */
 
 #include "ObjectGuid.h"
+#include "Hash.h"
+#include "Log.h"
 #include "World.h"
-
 #include <sstream>
 #include <iomanip>
 
@@ -109,6 +110,14 @@ std::string ObjectGuid::ToString() const
     return str.str();
 }
 
+std::size_t ObjectGuid::GetHash() const
+{
+    std::size_t hashVal = 0;
+    Trinity::hash_combine(hashVal, _low);
+    Trinity::hash_combine(hashVal, _high);
+    return hashVal;
+}
+
 ObjectGuid ObjectGuid::Global(HighGuid type, LowType counter)
 {
     return ObjectGuid(uint64(uint64(type) << 58), counter);
diff --git a/src/server/game/Entities/Object/ObjectGuid.h b/src/server/game/Entities/Object/ObjectGuid.h
index 88172c970cb..883476b5f21 100644
--- a/src/server/game/Entities/Object/ObjectGuid.h
+++ b/src/server/game/Entities/Object/ObjectGuid.h
@@ -19,10 +19,14 @@
 #ifndef ObjectGuid_h__
 #define ObjectGuid_h__
 
-#include "Common.h"
 #include "ByteBuffer.h"
-#include <type_traits>
+#include <deque>
 #include <functional>
+#include <list>
+#include <set>
+#include <type_traits>
+#include <unordered_set>
+#include <vector>
 
 enum TypeID
 {
@@ -316,6 +320,7 @@ class TC_GAME_API ObjectGuid
         static char const* GetTypeName(HighGuid high);
         char const* GetTypeName() const { return !IsEmpty() ? GetTypeName(GetHigh()) : "None"; }
         std::string ToString() const;
+        std::size_t GetHash() const;
 
     private:
         static bool HasEntry(HighGuid high)
@@ -415,7 +420,7 @@ namespace std
     public:
         size_t operator()(ObjectGuid const& key) const
         {
-            return boost::hash_range(reinterpret_cast<uint64 const*>(&key), reinterpret_cast<uint64 const*>(&key) + 2);
+            return key.GetHash();
         }
     };
 }
diff --git a/src/server/game/Entities/Object/ObjectPosSelector.h b/src/server/game/Entities/Object/ObjectPosSelector.h
index d5414e0e245..3d75a8daafb 100644
--- a/src/server/game/Entities/Object/ObjectPosSelector.h
+++ b/src/server/game/Entities/Object/ObjectPosSelector.h
@@ -19,9 +19,9 @@
 #ifndef _OBJECT_POS_SELECTOR_H
 #define _OBJECT_POS_SELECTOR_H
 
-#include<Common.h>
-
-#include<map>
+#include "Common.h"
+#include <map>
+#include <cmath>
 
 enum UsedPosType { USED_POS_PLUS, USED_POS_MINUS };
 
diff --git a/src/server/game/Entities/Object/Position.cpp b/src/server/game/Entities/Object/Position.cpp
index 5cf7fdd51f1..bbb6ee271cb 100644
--- a/src/server/game/Entities/Object/Position.cpp
+++ b/src/server/game/Entities/Object/Position.cpp
@@ -18,6 +18,7 @@
 #include "Position.h"
 #include "ByteBuffer.h"
 #include "GridDefines.h"
+#include "Random.h"
 
 #include <G3D/g3dmath.h>
 
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 936e793bfdb..eb99ccb70c3 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -19621,6 +19621,8 @@ void Player::SaveToDB(bool create /*=false*/)
     stmt->setUInt64(0, GetGUID().GetCounter());
     trans->Append(stmt);
 
+    auto finiteAlways = [](float f) { return std::isfinite(f) ? f : 0.0f; };
+
     if (create)
     {
         //! Insert query
diff --git a/src/server/game/Entities/Player/SceneMgr.h b/src/server/game/Entities/Player/SceneMgr.h
index 0a7c13322cd..9064d9c892b 100644
--- a/src/server/game/Entities/Player/SceneMgr.h
+++ b/src/server/game/Entities/Player/SceneMgr.h
@@ -19,6 +19,7 @@
 #define SceneMgr_h__
 
 #include "Common.h"
+#include <map>
 
 enum SceneFlags
 {
diff --git a/src/server/game/Entities/Player/TradeData.cpp b/src/server/game/Entities/Player/TradeData.cpp
index 3c193df220b..fe5b8231109 100644
--- a/src/server/game/Entities/Player/TradeData.cpp
+++ b/src/server/game/Entities/Player/TradeData.cpp
@@ -17,6 +17,7 @@
 
 #include "TradeData.h"
 #include "Player.h"
+#include "Random.h"
 #include "TradePackets.h"
 
 TradeData* TradeData::GetTraderData() const
@@ -143,3 +144,8 @@ void TradeData::SetAccepted(bool state, bool forTrader /*= false*/)
             _player->GetSession()->SendTradeStatus(info);
     }
 }
+
+void TradeData::UpdateServerStateIndex()
+{
+    _serverStateIndex = rand32();
+}
diff --git a/src/server/game/Entities/Player/TradeData.h b/src/server/game/Entities/Player/TradeData.h
index 3fa800eb557..2a5b9f79777 100644
--- a/src/server/game/Entities/Player/TradeData.h
+++ b/src/server/game/Entities/Player/TradeData.h
@@ -65,7 +65,7 @@ public:
     void UpdateClientStateIndex() { ++_clientStateIndex; }
 
     uint32 GetServerStateIndex() const { return _serverStateIndex; }
-    void UpdateServerStateIndex() { _serverStateIndex = rand32(); }
+    void UpdateServerStateIndex();
 
 private:
     void Update(bool for_trader = true) const;
diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp
index b8329d24a8b..2c09cf6f9e2 100644
--- a/src/server/game/Entities/Transport/Transport.cpp
+++ b/src/server/game/Entities/Transport/Transport.cpp
@@ -27,6 +27,7 @@
 #include "Cell.h"
 #include "CellImpl.h"
 #include "Totem.h"
+#include "UpdateData.h"
 
 Transport::Transport() : GameObject(),
     _transportInfo(NULL), _isMoving(true), _pendingStop(false),
diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp
index fab73a76b40..72f58e0f17a 100644
--- a/src/server/game/Entities/Unit/StatSystem.cpp
+++ b/src/server/game/Entities/Unit/StatSystem.cpp
@@ -25,6 +25,7 @@
 #include "SpellAuras.h"
 #include "SpellAuraEffects.h"
 #include "World.h"
+#include <numeric>
 
 inline bool _ModifyUInt32(bool apply, uint32& baseValue, int32& amount)
 {