7 files changed, 8 insertions, 4 deletions
diff --git a/src/server/game/AI/CreatureAIFactory.h b/src/server/game/AI/CreatureAIFactory.h
index 3d269416902..2408ff0ce4b 100644
--- a/src/server/game/AI/CreatureAIFactory.h
+++ b/src/server/game/AI/CreatureAIFactory.h
@@ -19,7 +19,6 @@
 #define TRINITY_CREATUREAIFACTORY_H
 
 #include "ObjectMgr.h"
-#include "ObjectRegistry.h"
 #include "SelectableAI.h"
 
 class Creature;
diff --git a/src/server/game/AI/GameObjectAIFactory.h b/src/server/game/AI/GameObjectAIFactory.h
index f3a57c4705d..522aea6cb74 100644
--- a/src/server/game/AI/GameObjectAIFactory.h
+++ b/src/server/game/AI/GameObjectAIFactory.h
@@ -18,6 +18,7 @@
 #ifndef TRINITY_GAMEOBJECTAIFACTORY_H
 #define TRINITY_GAMEOBJECTAIFACTORY_H
 
+#include "ObjectMgr.h"
 #include "SelectableAI.h"
 
 class GameObject;
diff --git a/src/server/game/Globals/PlayerChoice.h b/src/server/game/Globals/PlayerChoice.h
index 3a8e7948d8e..17504586b35 100644
--- a/src/server/game/Globals/PlayerChoice.h
+++ b/src/server/game/Globals/PlayerChoice.h
@@ -19,6 +19,7 @@
 #define TRINITYCORE_PLAYER_CHOICE_H
 
 #include "Define.h"
+#include "Duration.h"
 #include "EnumFlag.h"
 #include "Optional.h"
 #include <algorithm>
diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
index cc44e5bad4b..4205b6912f0 100644
--- a/src/server/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
@@ -19,7 +19,6 @@
 #include "Config.h"
 #include "NetworkThread.h"
 #include "ScriptMgr.h"
-#include "WorldSocket.h"
 #include <boost/system/error_code.hpp>
 
 class WorldSocketThread : public Trinity::Net::NetworkThread<WorldSocket>
diff --git a/src/server/game/Server/WorldSocketMgr.h b/src/server/game/Server/WorldSocketMgr.h
index 8859da81074..9f905f23cd2 100644
--- a/src/server/game/Server/WorldSocketMgr.h
+++ b/src/server/game/Server/WorldSocketMgr.h
@@ -19,8 +19,7 @@
 #define TRINITYCORE_WORLD_SOCKET_MGR_H
 
 #include "SocketMgr.h"
-
-class WorldSocket;
+#include "WorldSocket.h"
 
 /// Manages all sockets connected to peers and network threads
 class TC_GAME_API WorldSocketMgr : public Trinity::Net::SocketMgr<WorldSocket>
diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.h b/src/server/game/Tools/CharacterDatabaseCleaner.h
index 83a639f99ab..249eb959f66 100644
--- a/src/server/game/Tools/CharacterDatabaseCleaner.h
+++ b/src/server/game/Tools/CharacterDatabaseCleaner.h
@@ -18,6 +18,8 @@
 #ifndef CHARACTERDATABASECLEANER_H
 #define CHARACTERDATABASECLEANER_H
 
+#include "Define.h"
+
 namespace CharacterDatabaseCleaner
 {
     enum CleaningFlags
diff --git a/src/server/game/Warden/Modules/WardenModuleMac.h b/src/server/game/Warden/Modules/WardenModuleMac.h
index a699261a284..3ab4a5b64b0 100644
--- a/src/server/game/Warden/Modules/WardenModuleMac.h
+++ b/src/server/game/Warden/Modules/WardenModuleMac.h
@@ -18,6 +18,9 @@
 #ifndef _WARDEN_MODULE_MAC_H
 #define _WARDEN_MODULE_MAC_H
 
+#include "Define.h"
+#include <array>
+
 std::array<uint8, 9318> Module_0DBBF209A27B1E279A9FEC5C168A15F7_Data =
 {
     0x07, 0x0C, 0x44, 0xCD, 0xC9, 0xFB, 0x99, 0xBC, 0x7C, 0x77, 0xDC, 0xE8, 0x8D, 0x07, 0xBE, 0x55,