Core/Utils: Extract template base class out of flag128

6 files changed, 7 insertions, 8 deletions

diff --git a/src/server/game/Chat/LanguageMgr.cpp b/src/server/game/Chat/LanguageMgr.cpp
index c30cfa9b965..9bca8097837 100644
--- a/src/server/game/Chat/LanguageMgr.cpp
+++ b/src/server/game/Chat/LanguageMgr.cpp
@@ -22,6 +22,7 @@
 #include "SpellInfo.h"
 #include "SpellMgr.h"
 #include "Timer.h"
+#include "Util.h"
 #include <sstream>
 
 LanguageMgr::LanguageMgr() : _langsMap(), _wordsMap() { }
diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h
index cbaa4478fec..500cbd48dbd 100644
--- a/src/server/game/DataStores/DB2Structure.h
+++ b/src/server/game/DataStores/DB2Structure.h
@@ -20,8 +20,8 @@
 
 #include "Common.h"
 #include "DBCEnums.h"
+#include "FlagsArray.h"
 #include "RaceMask.h"
-#include "Util.h"
 
 #pragma pack(push, 1)
 
diff --git a/src/server/game/Entities/Item/ItemTemplate.h b/src/server/game/Entities/Item/ItemTemplate.h
index d7fbb685274..a2183ba78be 100644
--- a/src/server/game/Entities/Item/ItemTemplate.h
+++ b/src/server/game/Entities/Item/ItemTemplate.h
@@ -20,9 +20,9 @@
 
 #include "Common.h"
 #include "DB2Structure.h"
+#include "Errors.h"
 #include "SharedDefines.h"
 #include <bitset>
-#include <unordered_map>
 #include <vector>
 
 enum ItemModType
diff --git a/src/server/game/Server/Packets/GarrisonPackets.cpp b/src/server/game/Server/Packets/GarrisonPackets.cpp
index a488cd3b3c8..9a268388696 100644
--- a/src/server/game/Server/Packets/GarrisonPackets.cpp
+++ b/src/server/game/Server/Packets/GarrisonPackets.cpp
@@ -17,10 +17,9 @@
 
 #include "GarrisonPackets.h"
 #include "DB2Structure.h"
+#include "Errors.h"
 
-namespace WorldPackets
-{
-namespace Garrison
+namespace WorldPackets::Garrison
 {
 WorldPacket const* GarrisonCreateResult::Write()
 {
@@ -454,4 +453,3 @@ WorldPacket const* GarrisonBuildingActivated::Write()
     return &_worldPacket;
 }
 }
-}
diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h
index 2012b9b3a63..9a73a1aec45 100644
--- a/src/server/game/Spells/SpellInfo.h
+++ b/src/server/game/Spells/SpellInfo.h
@@ -20,7 +20,6 @@
 
 #include "SharedDefines.h"
 #include "DB2Structure.h"
-#include "Util.h"
 #include "Object.h"
 #include "SpellAuraDefines.h"
 #include "SpellDefines.h"
diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
index cf2cbb26c8e..e98d0070985 100644
--- a/src/server/game/Spells/SpellMgr.h
+++ b/src/server/game/Spells/SpellMgr.h
@@ -23,10 +23,11 @@
 #include "Define.h"
 #include "DBCEnums.h"
 #include "Duration.h"
+#include "Errors.h"
+#include "FlagsArray.h"
 #include "IteratorPair.h"
 #include "RaceMask.h"
 #include "SharedDefines.h"
-#include "Util.h"
 
 #include <functional>
 #include <map>