diff --git a/src/common/Logging/Log.h b/src/common/Logging/Log.h
index e4b6d6142..90546bc22 100644
--- a/src/common/Logging/Log.h
+++ b/src/common/Logging/Log.h
@@ -18,6 +18,7 @@
 #ifndef _LOG_H__
 #define _LOG_H__
 
+#include "IoContext.h"
 #include "Define.h"
 #include "LogCommon.h"
 #include "StringFormat.h"
diff --git a/src/server/database/Database/DatabaseEnv.h b/src/server/database/Database/DatabaseEnv.h
index 7bf4a3207..b1439c64d 100644
--- a/src/server/database/Database/DatabaseEnv.h
+++ b/src/server/database/Database/DatabaseEnv.h
@@ -27,7 +27,6 @@
 
 #include "PreparedStatement.h"
 #include "QueryCallback.h"
-#include "QueryResult.h"
 #include "Transaction.h"
 
 /// Accessor to the world database
diff --git a/src/server/database/Updater/DBUpdater.h b/src/server/database/Updater/DBUpdater.h
index 62af83df1..6ad75baf7 100644
--- a/src/server/database/Updater/DBUpdater.h
+++ b/src/server/database/Updater/DBUpdater.h
@@ -20,6 +20,7 @@
 
 #include "DatabaseEnv.h"
 #include "Define.h"
+#include "QueryResult.h"
 #include <filesystem>
 #include <string>
 
diff --git a/src/server/game/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp
index f1fe5ada5..650a26fea 100644
--- a/src/server/game/Addons/AddonMgr.cpp
+++ b/src/server/game/Addons/AddonMgr.cpp
@@ -20,6 +20,7 @@
 #include "DatabaseEnv.h"
 #include "Log.h"
 #include "Timer.h"
+#include "QueryResult.h"
 #include <list>
 
 namespace AddonMgr
diff --git a/src/server/game/Movement/Waypoints/WaypointMgr.cpp b/src/server/game/Movement/Waypoints/WaypointMgr.cpp
index 6b8601fa1..de437b2cb 100644
--- a/src/server/game/Movement/Waypoints/WaypointMgr.cpp
+++ b/src/server/game/Movement/Waypoints/WaypointMgr.cpp
@@ -19,6 +19,7 @@
 #include "DatabaseEnv.h"
 #include "GridDefines.h"
 #include "Log.h"
+#include "QueryResult.h"
 
 WaypointMgr::WaypointMgr()
 {
diff --git a/src/server/shared/Network/AsyncAcceptor.h b/src/server/shared/Network/AsyncAcceptor.h
index 803906ee6..7caea4896 100644
--- a/src/server/shared/Network/AsyncAcceptor.h
+++ b/src/server/shared/Network/AsyncAcceptor.h
@@ -18,7 +18,6 @@
 #ifndef __ASYNCACCEPT_H_
 #define __ASYNCACCEPT_H_
 
-#include "IoContext.h"
 #include "IpAddress.h"
 #include "Log.h"
 #include <atomic>
diff --git a/src/server/shared/Network/NetworkThread.h b/src/server/shared/Network/NetworkThread.h
index 12c4ec4e8..aca77faab 100644
--- a/src/server/shared/Network/NetworkThread.h
+++ b/src/server/shared/Network/NetworkThread.h
@@ -24,10 +24,8 @@
 #include "IoContext.h"
 #include "Log.h"
 #include "Socket.h"
-#include "Timer.h"
 #include <atomic>
 #include <boost/asio/ip/tcp.hpp>
-#include <chrono>
 #include <memory>
 #include <mutex>
 #include <set>
diff --git a/src/server/shared/Realms/RealmList.cpp b/src/server/shared/Realms/RealmList.cpp
index 5ab14b016..dd28fa940 100644
--- a/src/server/shared/Realms/RealmList.cpp
+++ b/src/server/shared/Realms/RealmList.cpp
@@ -21,6 +21,7 @@
 #include "IoContext.h"
 #include "Log.h"
 #include "Resolver.h"
+#include "QueryResult.h"
 #include "Util.h"
 #include <boost/asio/ip/tcp.hpp>
 
diff --git a/src/server/shared/Realms/RealmList.h b/src/server/shared/Realms/RealmList.h
index f047af64c..e12970eae 100644
--- a/src/server/shared/Realms/RealmList.h
+++ b/src/server/shared/Realms/RealmList.h
@@ -22,6 +22,7 @@
 #include "Realm.h"
 #include <array>
 #include <map>
+#include <memory>
 #include <vector>
 
 struct RealmBuildInfo