diff --git a/src/common/Collision/BoundingIntervalHierarchy.h b/src/common/Collision/BoundingIntervalHierarchy.h
index 816768900..bb5f281c8 100644
--- a/src/common/Collision/BoundingIntervalHierarchy.h
+++ b/src/common/Collision/BoundingIntervalHierarchy.h
@@ -7,9 +7,9 @@
 #ifndef _BIH_H
 #define _BIH_H
 
-#include "G3D/Vector3.h"
-#include "G3D/Ray.h"
 #include "G3D/AABox.h"
+#include "G3D/Ray.h"
+#include "G3D/Vector3.h"
 
 #include "Define.h"
 
diff --git a/src/common/Collision/BoundingIntervalHierarchyWrapper.h b/src/common/Collision/BoundingIntervalHierarchyWrapper.h
index 343165fc2..4018dcafd 100644
--- a/src/common/Collision/BoundingIntervalHierarchyWrapper.h
+++ b/src/common/Collision/BoundingIntervalHierarchyWrapper.h
@@ -7,10 +7,10 @@
 #ifndef _BIH_WRAP
 #define _BIH_WRAP
 
-#include "G3D/Table.h"
+#include "BoundingIntervalHierarchy.h"
 #include "G3D/Array.h"
 #include "G3D/Set.h"
-#include "BoundingIntervalHierarchy.h"
+#include "G3D/Table.h"
 
 template<class T, class BoundsFunc = BoundsTrait<T>>
 class BIHWrap
diff --git a/src/common/Collision/DynamicTree.cpp b/src/common/Collision/DynamicTree.cpp
index 2af4d3658..4d7704692 100644
--- a/src/common/Collision/DynamicTree.cpp
+++ b/src/common/Collision/DynamicTree.cpp
@@ -6,11 +6,11 @@
 
 #include "DynamicTree.h"
 #include "BoundingIntervalHierarchyWrapper.h"
+#include "GameObjectModel.h"
 #include "Log.h"
+#include "ModelInstance.h"
 #include "RegularGrid.h"
 #include "Timer.h"
-#include "GameObjectModel.h"
-#include "ModelInstance.h"
 #include <G3D/AABox.h>
 #include <G3D/Ray.h>
 #include <G3D/Vector3.h>
diff --git a/src/common/Collision/Management/IMMAPManager.h b/src/common/Collision/Management/IMMAPManager.h
index a558ab2c0..197851206 100644
--- a/src/common/Collision/Management/IMMAPManager.h
+++ b/src/common/Collision/Management/IMMAPManager.h
@@ -7,8 +7,8 @@
 #ifndef _IMMAPMANAGER_H
 #define _IMMAPMANAGER_H
 
-#include <string>
 #include "Define.h"
+#include <string>
 
 // Interface for IMMapManger
 namespace MMAP
diff --git a/src/common/Collision/Management/IVMapManager.h b/src/common/Collision/Management/IVMapManager.h
index 7d999c779..dc5429462 100644
--- a/src/common/Collision/Management/IVMapManager.h
+++ b/src/common/Collision/Management/IVMapManager.h
@@ -7,8 +7,8 @@
 #ifndef _IVMAPMANAGER_H
 #define _IVMAPMANAGER_H
 
-#include <string>
 #include "Define.h"
+#include <string>
 
 //===========================================================
 
diff --git a/src/common/Collision/Management/MMapFactory.cpp b/src/common/Collision/Management/MMapFactory.cpp
index 1cbceb374..0717f9824 100644
--- a/src/common/Collision/Management/MMapFactory.cpp
+++ b/src/common/Collision/Management/MMapFactory.cpp
@@ -5,8 +5,8 @@
  */
 
 #include "MMapFactory.h"
-#include <set>
 #include <cstring>
+#include <set>
 
 namespace MMAP
 {
diff --git a/src/common/Collision/Management/MMapFactory.h b/src/common/Collision/Management/MMapFactory.h
index b25ccce69..4f81d09d7 100644
--- a/src/common/Collision/Management/MMapFactory.h
+++ b/src/common/Collision/Management/MMapFactory.h
@@ -7,10 +7,10 @@
 #ifndef _MMAP_FACTORY_H
 #define _MMAP_FACTORY_H
 
-#include "MMapManager.h"
 #include "DetourAlloc.h"
-#include "DetourNavMesh.h"
 #include "DetourExtended.h"
+#include "DetourNavMesh.h"
+#include "MMapManager.h"
 #include <unordered_map>
 
 namespace MMAP
diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp
index 4c763a1ef..781782704 100644
--- a/src/common/Collision/Management/MMapManager.cpp
+++ b/src/common/Collision/Management/MMapManager.cpp
@@ -7,8 +7,8 @@
 #include "MMapManager.h"
 #include "Config.h"
 #include "Errors.h"
-#include "MapDefines.h"
 #include "Log.h"
+#include "MapDefines.h"
 #include "StringFormat.h"
 
 namespace MMAP
diff --git a/src/common/Collision/Management/MMapManager.h b/src/common/Collision/Management/MMapManager.h
index 42bcee08e..a3292c05d 100644
--- a/src/common/Collision/Management/MMapManager.h
+++ b/src/common/Collision/Management/MMapManager.h
@@ -9,10 +9,10 @@
 
 #include "Common.h"
 #include "DetourAlloc.h"
-#include "DetourNavMesh.h"
 #include "DetourExtended.h"
-#include <unordered_map>
+#include "DetourNavMesh.h"
 #include <shared_mutex>
+#include <unordered_map>
 #include <vector>
 
 //  memory management
diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp
index 0383b8c0d..e8a0a41aa 100644
--- a/src/common/Collision/Management/VMapManager2.cpp
+++ b/src/common/Collision/Management/VMapManager2.cpp
@@ -16,18 +16,18 @@
  */
 
 #include "VMapManager2.h"
+#include "Errors.h"
+#include "Log.h"
+#include "MapDefines.h"
 #include "MapTree.h"
 #include "ModelInstance.h"
-#include "WorldModel.h"
-#include "MapDefines.h"
-#include "Log.h"
 #include "VMapDefinitions.h"
-#include "Errors.h"
+#include "WorldModel.h"
 #include <G3D/Vector3.h>
-#include <iostream>
 #include <iomanip>
-#include <string>
+#include <iostream>
 #include <sstream>
+#include <string>
 
 using G3D::Vector3;
 
diff --git a/src/common/Collision/Management/VMapManager2.h b/src/common/Collision/Management/VMapManager2.h
index 514f03600..51df3c20f 100644
--- a/src/common/Collision/Management/VMapManager2.h
+++ b/src/common/Collision/Management/VMapManager2.h
@@ -18,8 +18,8 @@
 #ifndef _VMAPMANAGER2_H
 #define _VMAPMANAGER2_H
 
-#include "IVMapManager.h"
 #include "Common.h"
+#include "IVMapManager.h"
 #include <mutex>
 #include <unordered_map>
 #include <vector>
diff --git a/src/common/Collision/Maps/MapTree.cpp b/src/common/Collision/Maps/MapTree.cpp
index 46feecb65..3bbbcae6e 100644
--- a/src/common/Collision/Maps/MapTree.cpp
+++ b/src/common/Collision/Maps/MapTree.cpp
@@ -5,15 +5,15 @@
  */
 
 #include "MapTree.h"
-#include "ModelInstance.h"
-#include "VMapManager2.h"
-#include "VMapDefinitions.h"
-#include "Log.h"
 #include "Errors.h"
-#include <string>
-#include <sstream>
+#include "Log.h"
+#include "ModelInstance.h"
+#include "VMapDefinitions.h"
+#include "VMapManager2.h"
 #include <iomanip>
 #include <limits>
+#include <sstream>
+#include <string>
 
 using G3D::Vector3;
 
diff --git a/src/common/Collision/Maps/MapTree.h b/src/common/Collision/Maps/MapTree.h
index 11f0cdfb8..37f639d4f 100644
--- a/src/common/Collision/Maps/MapTree.h
+++ b/src/common/Collision/Maps/MapTree.h
@@ -7,8 +7,8 @@
 #ifndef _MAPTREE_H
 #define _MAPTREE_H
 
-#include "Define.h"
 #include "BoundingIntervalHierarchy.h"
+#include "Define.h"
 #include <unordered_map>
 
 namespace VMAP
diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp
index c4fbed201..cbda447a8 100644
--- a/src/common/Collision/Maps/TileAssembler.cpp
+++ b/src/common/Collision/Maps/TileAssembler.cpp
@@ -5,13 +5,13 @@
  */
 
 #include "TileAssembler.h"
-#include "MapTree.h"
 #include "BoundingIntervalHierarchy.h"
-#include "VMapDefinitions.h"
 #include "MapDefines.h"
+#include "MapTree.h"
+#include "VMapDefinitions.h"
+#include <iomanip>
 #include <set>
 #include <sstream>
-#include <iomanip>
 
 using G3D::Vector3;
 using G3D::AABox;
diff --git a/src/common/Collision/Maps/TileAssembler.h b/src/common/Collision/Maps/TileAssembler.h
index 462545ede..36466fb0c 100644
--- a/src/common/Collision/Maps/TileAssembler.h
+++ b/src/common/Collision/Maps/TileAssembler.h
@@ -7,8 +7,8 @@
 #ifndef _TILEASSEMBLER_H_
 #define _TILEASSEMBLER_H_
 
-#include <G3D/Vector3.h>
 #include <G3D/Matrix3.h>
+#include <G3D/Vector3.h>
 #include <map>
 #include <set>
 
diff --git a/src/common/Collision/Models/GameObjectModel.cpp b/src/common/Collision/Models/GameObjectModel.cpp
index dbac4440d..ec0aa4af1 100644
--- a/src/common/Collision/Models/GameObjectModel.cpp
+++ b/src/common/Collision/Models/GameObjectModel.cpp
@@ -5,12 +5,12 @@
  */
 
 #include "GameObjectModel.h"
-#include "VMapFactory.h"
-#include "VMapManager2.h"
-#include "VMapDefinitions.h"
-#include "WorldModel.h"
 #include "Log.h"
 #include "Timer.h"
+#include "VMapDefinitions.h"
+#include "VMapFactory.h"
+#include "VMapManager2.h"
+#include "WorldModel.h"
 
 using G3D::Vector3;
 using G3D::Ray;
diff --git a/src/common/Collision/Models/GameObjectModel.h b/src/common/Collision/Models/GameObjectModel.h
index 3051ba160..e17ac44e0 100644
--- a/src/common/Collision/Models/GameObjectModel.h
+++ b/src/common/Collision/Models/GameObjectModel.h
@@ -8,10 +8,10 @@
 #define _GAMEOBJECT_MODEL_H
 
 #include "Define.h"
-#include <G3D/Matrix3.h>
-#include <G3D/Vector3.h>
 #include <G3D/AABox.h>
+#include <G3D/Matrix3.h>
 #include <G3D/Ray.h>
+#include <G3D/Vector3.h>
 
 namespace VMAP
 {
diff --git a/src/common/Collision/Models/ModelInstance.cpp b/src/common/Collision/Models/ModelInstance.cpp
index 28a5099c5..734164053 100644
--- a/src/common/Collision/Models/ModelInstance.cpp
+++ b/src/common/Collision/Models/ModelInstance.cpp
@@ -5,9 +5,9 @@
  */
 
 #include "ModelInstance.h"
-#include "WorldModel.h"
 #include "MapTree.h"
 #include "VMapDefinitions.h"
+#include "WorldModel.h"
 
 using G3D::Vector3;
 using G3D::Ray;
diff --git a/src/common/Collision/Models/ModelInstance.h b/src/common/Collision/Models/ModelInstance.h
index 1d9a11f72..bfe7328a0 100644
--- a/src/common/Collision/Models/ModelInstance.h
+++ b/src/common/Collision/Models/ModelInstance.h
@@ -8,10 +8,10 @@
 #define _MODELINSTANCE_H_
 
 #include "Define.h"
-#include <G3D/Matrix3.h>
-#include <G3D/Vector3.h>
 #include <G3D/AABox.h>
+#include <G3D/Matrix3.h>
 #include <G3D/Ray.h>
+#include <G3D/Vector3.h>
 
 namespace VMAP
 {
diff --git a/src/common/Collision/Models/WorldModel.cpp b/src/common/Collision/Models/WorldModel.cpp
index a65f305b7..180ca6428 100644
--- a/src/common/Collision/Models/WorldModel.cpp
+++ b/src/common/Collision/Models/WorldModel.cpp
@@ -5,9 +5,9 @@
  */
 
 #include "WorldModel.h"
+#include "MapTree.h"
 #include "ModelInstance.h"
 #include "VMapDefinitions.h"
-#include "MapTree.h"
 
 using G3D::Vector3;
 using G3D::Ray;
diff --git a/src/common/Collision/Models/WorldModel.h b/src/common/Collision/Models/WorldModel.h
index 75a809c27..6f23647b5 100644
--- a/src/common/Collision/Models/WorldModel.h
+++ b/src/common/Collision/Models/WorldModel.h
@@ -7,12 +7,12 @@
 #ifndef _WORLDMODEL_H
 #define _WORLDMODEL_H
 
-#include "Define.h"
 #include "BoundingIntervalHierarchy.h"
-#include <G3D/HashTrait.h>
-#include <G3D/Vector3.h>
+#include "Define.h"
 #include <G3D/AABox.h>
+#include <G3D/HashTrait.h>
 #include <G3D/Ray.h>
+#include <G3D/Vector3.h>
 
 namespace VMAP
 {
diff --git a/src/common/Collision/RegularGrid.h b/src/common/Collision/RegularGrid.h
index a8571aa57..cef6984d9 100644
--- a/src/common/Collision/RegularGrid.h
+++ b/src/common/Collision/RegularGrid.h
@@ -1,10 +1,10 @@
 #ifndef _REGULAR_GRID_H
 #define _REGULAR_GRID_H
 
-#include <G3D/Ray.h>
-#include <G3D/Table.h>
 #include <G3D/BoundsTrait.h>
 #include <G3D/PositionTrait.h>
+#include <G3D/Ray.h>
+#include <G3D/Table.h>
 
 #include "Errors.h"
 
diff --git a/src/common/Collision/VMapTools.h b/src/common/Collision/VMapTools.h
index 582694126..08b356dac 100644
--- a/src/common/Collision/VMapTools.h
+++ b/src/common/Collision/VMapTools.h
@@ -8,8 +8,8 @@
 #define _VMAPTOOLS_H
 
 #include "Define.h"
-#include <G3D/CollisionDetection.h>
 #include <G3D/AABox.h>
+#include <G3D/CollisionDetection.h>
 
 /**
 The Class is mainly taken from G3D/AABSPTree.h but modified to be able to use our internal data structure.
diff --git a/src/common/Common.h b/src/common/Common.h
index 0c932ca4d..c050ee16b 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -22,13 +22,13 @@
 #    endif // !defined(BOOST_ASIO_HAS_MOVE)
 #  endif // if WARHEAD_COMPILER == WARHEAD_COMPILER_INTEL
 #else
-#include <sys/types.h>
+#include <cstdlib>
+#include <netdb.h>
+#include <netinet/in.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include <netdb.h>
-#include <cstdlib>
 #endif
 
 #if AC_COMPILER == AC_COMPILER_MICROSOFT
diff --git a/src/common/Configuration/Config.cpp b/src/common/Configuration/Config.cpp
index 5899f74ff..f82e5fc13 100644
--- a/src/common/Configuration/Config.cpp
+++ b/src/common/Configuration/Config.cpp
@@ -8,8 +8,8 @@
 #include "StringConvert.h"
 #include "StringFormat.h"
 #include "Util.h"
-#include <mutex>
 #include <fstream>
+#include <mutex>
 #include <unordered_map>
 
 namespace
diff --git a/src/common/Configuration/Config.h b/src/common/Configuration/Config.h
index be26a35f1..a679a8f7e 100644
--- a/src/common/Configuration/Config.h
+++ b/src/common/Configuration/Config.h
@@ -7,9 +7,9 @@
 #define CONFIG_H
 
 #include "Define.h"
+#include <stdexcept>
 #include <string>
 #include <vector>
-#include <stdexcept>
 
 class ConfigMgr
 {
diff --git a/src/common/Cryptography/Authentication/SRP6.h b/src/common/Cryptography/Authentication/SRP6.h
index c101c3625..86e293ebb 100644
--- a/src/common/Cryptography/Authentication/SRP6.h
+++ b/src/common/Cryptography/Authentication/SRP6.h
@@ -8,9 +8,9 @@
 
 #include "AuthDefines.h"
 #include "BigNumber.h"
-#include "Define.h"
 #include "Common.h"
 #include "CryptoHash.h"
+#include "Define.h"
 #include <array>
 #include <optional>
 
diff --git a/src/common/Cryptography/BigNumber.cpp b/src/common/Cryptography/BigNumber.cpp
index bc954192c..5cee8f81d 100644
--- a/src/common/Cryptography/BigNumber.cpp
+++ b/src/common/Cryptography/BigNumber.cpp
@@ -5,10 +5,10 @@
 
 #include "Cryptography/BigNumber.h"
 #include "Errors.h"
-#include <openssl/bn.h>
-#include <cstring>
 #include <algorithm>
+#include <cstring>
 #include <memory>
+#include <openssl/bn.h>
 
 BigNumber::BigNumber()
     : _bn(BN_new())
diff --git a/src/common/Cryptography/CryptoHash.h b/src/common/Cryptography/CryptoHash.h
index aa4c85b8f..3da687c7a 100644
--- a/src/common/Cryptography/CryptoHash.h
+++ b/src/common/Cryptography/CryptoHash.h
@@ -10,9 +10,9 @@
 #include "Define.h"
 #include "Errors.h"
 #include <array>
+#include <openssl/evp.h>
 #include <string>
 #include <string_view>
-#include <openssl/evp.h>
 
 class BigNumber;
 
diff --git a/src/common/Cryptography/HMAC.h b/src/common/Cryptography/HMAC.h
index 2ca35dfb9..e2cc795fb 100644
--- a/src/common/Cryptography/HMAC.h
+++ b/src/common/Cryptography/HMAC.h
@@ -10,9 +10,9 @@
 #include "Define.h"
 #include "Errors.h"
 #include <array>
+#include <openssl/hmac.h>
 #include <string>
 #include <string_view>
-#include <openssl/hmac.h>
 
 class BigNumber;
 
diff --git a/src/common/Cryptography/SessionKeyGenerator.h b/src/common/Cryptography/SessionKeyGenerator.h
index be7d03862..5bcff7de3 100644
--- a/src/common/Cryptography/SessionKeyGenerator.h
+++ b/src/common/Cryptography/SessionKeyGenerator.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2008-2021 TrinityCore <http://www.trinitycore.org/>
  */
 
-#include <cstring>
 #include "CryptoHash.h"
+#include <cstring>
 
 #ifndef AZEROTHCORE_SESSIONKEYGENERATOR_HPP
 #define AZEROTHCORE_SESSIONKEYGENERATOR_HPP
diff --git a/src/common/DataStores/DBCFileLoader.cpp b/src/common/DataStores/DBCFileLoader.cpp
index 304fe0845..6a1a6b830 100644
--- a/src/common/DataStores/DBCFileLoader.cpp
+++ b/src/common/DataStores/DBCFileLoader.cpp
@@ -4,11 +4,11 @@
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
+#include "DBCFileLoader.h"
+#include "Errors.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "DBCFileLoader.h"
-#include "Errors.h"
 
 DBCFileLoader::DBCFileLoader() : recordSize(0), recordCount(0), fieldCount(0), stringSize(0), fieldsOffset(nullptr), data(nullptr), stringTable(nullptr) { }
 
diff --git a/src/common/Debugging/Errors.cpp b/src/common/Debugging/Errors.cpp
index d2dbe569d..623fd2ae3 100644
--- a/src/common/Debugging/Errors.cpp
+++ b/src/common/Debugging/Errors.cpp
@@ -6,10 +6,10 @@
 
 #include "Errors.h"
 #include "StringFormat.h"
+#include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
 #include <thread>
-#include <cstdarg>
 
 /**
     @file Errors.cpp
diff --git a/src/common/Debugging/WheatyExceptionReport.h b/src/common/Debugging/WheatyExceptionReport.h
index 3f15b4cd1..3d6fb2757 100644
--- a/src/common/Debugging/WheatyExceptionReport.h
+++ b/src/common/Debugging/WheatyExceptionReport.h
@@ -3,13 +3,13 @@
 
 #if AC_PLATFORM == AC_PLATFORM_WINDOWS && !defined(__MINGW32__)
 
+#include <dbghelp.h>
+#include <mutex>
+#include <set>
+#include <stack>
+#include <stdlib.h>
 #include <winnt.h>
 #include <winternl.h>
-#include <dbghelp.h>
-#include <set>
-#include <stdlib.h>
-#include <stack>
-#include <mutex>
 #define countof  _countof
 
 #define WER_MAX_ARRAY_ELEMENTS_COUNT 10
diff --git a/src/common/Define.h b/src/common/Define.h
index 59f075e5f..73857029c 100644
--- a/src/common/Define.h
+++ b/src/common/Define.h
@@ -8,9 +8,9 @@
 #define ACORE_DEFINE_H
 
 #include "CompilerDefs.h"
-#include <cstddef>
 #include <cinttypes>
 #include <climits>
+#include <cstddef>
 
 #define ACORE_LITTLEENDIAN 0
 #define ACORE_BIGENDIAN    1
diff --git a/src/common/Dynamic/ObjectRegistry.h b/src/common/Dynamic/ObjectRegistry.h
index cab00ee08..91a43eb3a 100644
--- a/src/common/Dynamic/ObjectRegistry.h
+++ b/src/common/Dynamic/ObjectRegistry.h
@@ -8,10 +8,10 @@
 #define ACORE_OBJECTREGISTRY_H
 
 #include "Define.h"
-#include <string>
-#include <vector>
 #include <map>
+#include <string>
 #include <unordered_map>
+#include <vector>
 
 /** ObjectRegistry holds all registry item of the same type
  */
diff --git a/src/common/Dynamic/TypeContainer.h b/src/common/Dynamic/TypeContainer.h
index 8e8fc12eb..49963da53 100644
--- a/src/common/Dynamic/TypeContainer.h
+++ b/src/common/Dynamic/TypeContainer.h
@@ -12,12 +12,12 @@
  * types of object at the same time.
  */
 
-#include <map>
-#include <unordered_map>
-#include <vector>
 #include "Define.h"
 #include "Dynamic/TypeList.h"
 #include "GridRefManager.h"
+#include <map>
+#include <unordered_map>
+#include <vector>
 
 /*
  * @class ContainerMapList is a mulit-type container for map elements
diff --git a/src/common/Logging/AppenderConsole.cpp b/src/common/Logging/AppenderConsole.cpp
index 7a9bdfd7a..a7223bfe5 100644
--- a/src/common/Logging/AppenderConsole.cpp
+++ b/src/common/Logging/AppenderConsole.cpp
@@ -6,10 +6,10 @@
 #include "AppenderConsole.h"
 #include "LogMessage.h"
 #include "SmartEnum.h"
-#include "StringFormat.h"
 #include "StringConvert.h"
-#include "Util.h"
+#include "StringFormat.h"
 #include "Tokenize.h"
+#include "Util.h"
 #include <sstream>
 
 #if AC_PLATFORM == AC_PLATFORM_WINDOWS
diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp
index 5d80fdae3..32ffd924b 100644
--- a/src/common/Logging/Log.cpp
+++ b/src/common/Logging/Log.cpp
@@ -9,12 +9,12 @@
 #include "Common.h"
 #include "Config.h"
 #include "Errors.h"
-#include "Logger.h"
 #include "LogMessage.h"
 #include "LogOperation.h"
+#include "Logger.h"
 #include "StringConvert.h"
-#include "Util.h"
 #include "Tokenize.h"
+#include "Util.h"
 #include <chrono>
 #include <sstream>
 
diff --git a/src/common/Logging/LogMessage.h b/src/common/Logging/LogMessage.h
index f342b1b5b..886d98453 100644
--- a/src/common/Logging/LogMessage.h
+++ b/src/common/Logging/LogMessage.h
@@ -8,8 +8,8 @@
 
 #include "Define.h"
 #include "LogCommon.h"
-#include <string>
 #include <ctime>
+#include <string>
 
 struct LogMessage
 {
diff --git a/src/common/Logging/LogOperation.cpp b/src/common/Logging/LogOperation.cpp
index 22c16327a..15a70c86d 100644
--- a/src/common/Logging/LogOperation.cpp
+++ b/src/common/Logging/LogOperation.cpp
@@ -4,8 +4,8 @@
  */
 
 #include "LogOperation.h"
-#include "Logger.h"
 #include "LogMessage.h"
+#include "Logger.h"
 
 LogOperation::LogOperation(Logger const* _logger, std::unique_ptr<LogMessage>&& _msg) : logger(_logger), msg(std::forward<std::unique_ptr<LogMessage>>(_msg))
 {
diff --git a/src/common/Logging/Logger.h b/src/common/Logging/Logger.h
index f301036c9..60930ed4d 100644
--- a/src/common/Logging/Logger.h
+++ b/src/common/Logging/Logger.h
@@ -8,8 +8,8 @@
 
 #include "Define.h"
 #include "LogCommon.h"
-#include <unordered_map>
 #include <string>
+#include <unordered_map>
 
 class Appender;
 struct LogMessage;
diff --git a/src/common/Logging/enuminfo_LogCommon.cpp b/src/common/Logging/enuminfo_LogCommon.cpp
index 4f3e1e8b0..a3ce1e6c0 100644
--- a/src/common/Logging/enuminfo_LogCommon.cpp
+++ b/src/common/Logging/enuminfo_LogCommon.cpp
@@ -4,8 +4,8 @@
  * Copyright (C) 2008-2021 TrinityCore <http://www.trinitycore.org/>
  */
 
-#include "LogCommon.h"
 #include "Define.h"
+#include "LogCommon.h"
 #include "SmartEnum.h"
 #include <stdexcept>
 
diff --git a/src/common/PrecompiledHeaders/commonPCH.h b/src/common/PrecompiledHeaders/commonPCH.h
index 27707525f..f279b109a 100644
--- a/src/common/PrecompiledHeaders/commonPCH.h
+++ b/src/common/PrecompiledHeaders/commonPCH.h
@@ -1,6 +1,6 @@
 //add here most rarely modified headers to speed up debug build compilation
 
 #include "Common.h"
-#include "Log.h"
 #include "Errors.h"
+#include "Log.h"
 #include "TypeList.h"
diff --git a/src/common/Threading/PCQueue.h b/src/common/Threading/PCQueue.h
index af67fb5ca..d2a10ec91 100644
--- a/src/common/Threading/PCQueue.h
+++ b/src/common/Threading/PCQueue.h
@@ -7,10 +7,10 @@
 #ifndef _PCQ_H
 #define _PCQ_H
 
+#include <atomic>
 #include <condition_variable>
 #include <mutex>
 #include <queue>
-#include <atomic>
 #include <type_traits>
 
 template <typename T>
diff --git a/src/common/Threading/Threading.h b/src/common/Threading/Threading.h
index e2e0922aa..e2bdccb65 100644
--- a/src/common/Threading/Threading.h
+++ b/src/common/Threading/Threading.h
@@ -7,8 +7,8 @@
 #ifndef THREADING_H
 #define THREADING_H
 
-#include <thread>
 #include <atomic>
+#include <thread>
 
 namespace Acore
 {
diff --git a/src/common/Utilities/DataMap.h b/src/common/Utilities/DataMap.h
index 485b28ef3..090116920 100644
--- a/src/common/Utilities/DataMap.h
+++ b/src/common/Utilities/DataMap.h
@@ -5,10 +5,10 @@
 #ifndef _DATA_MAP_H_
 #define _DATA_MAP_H_
 
-#include <string>
-#include <unordered_map>
 #include <memory>
+#include <string>
 #include <type_traits>
+#include <unordered_map>
 
 class DataMap
 {
diff --git a/src/common/Utilities/Geometry.h b/src/common/Utilities/Geometry.h
index 2d1044918..b542e6ff3 100644
--- a/src/common/Utilities/Geometry.h
+++ b/src/common/Utilities/Geometry.h
@@ -12,8 +12,8 @@
 #define _ACORE_GEOMETRY_H
 
 #include "Define.h"
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 #include <math.h>
 
 [[nodiscard]] inline float getAngle(float startX, float startY, float destX, float destY)
diff --git a/src/common/Utilities/MathUtil.h b/src/common/Utilities/MathUtil.h
index 4164159aa..97f53e601 100644
--- a/src/common/Utilities/MathUtil.h
+++ b/src/common/Utilities/MathUtil.h
@@ -5,10 +5,10 @@
 #ifndef _MATH_UTIL_H
 #define _MATH_UTIL_H
 
-#include <vector>
-#include <iterator>
 #include <algorithm>
+#include <iterator>
 #include <numeric>
+#include <vector>
 
 // based on https://stackoverflow.com/questions/7616511/calculate-mean-and-standard-deviation-from-a-vector-of-samples-in-c-using-boos/12405793#comment32490316_12405793
 template <typename Container, typename T = typename std::decay<decltype(*std::begin(std::declval<Container>()))>::type>
diff --git a/src/common/Utilities/MessageBuffer.h b/src/common/Utilities/MessageBuffer.h
index 4f9c0a288..1a499c263 100644
--- a/src/common/Utilities/MessageBuffer.h
+++ b/src/common/Utilities/MessageBuffer.h
@@ -7,8 +7,8 @@
 #define __MESSAGEBUFFER_H_
 
 #include "Define.h"
-#include <vector>
 #include <cstring>
+#include <vector>
 
 class MessageBuffer
 {
diff --git a/src/common/Utilities/Physics.h b/src/common/Utilities/Physics.h
index abf30176b..32d7be6c0 100644
--- a/src/common/Utilities/Physics.h
+++ b/src/common/Utilities/Physics.h
@@ -13,8 +13,8 @@
 
 #include "Geometry.h"
 #include <cmath>
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 using namespace std;
 
diff --git a/src/common/Utilities/SFMTRand.cpp b/src/common/Utilities/SFMTRand.cpp
index 58a907c07..ea60e781a 100644
--- a/src/common/Utilities/SFMTRand.cpp
+++ b/src/common/Utilities/SFMTRand.cpp
@@ -6,9 +6,9 @@
 #include "SFMTRand.h"
 #include <algorithm>
 #include <array>
+#include <ctime>
 #include <functional>
 #include <random>
-#include <ctime>
 
 #if defined(__aarch64__)
 #if defined(__clang__)
diff --git a/src/common/Utilities/SignalHandler.h b/src/common/Utilities/SignalHandler.h
index 1fb4cd479..edf5d2e94 100644
--- a/src/common/Utilities/SignalHandler.h
+++ b/src/common/Utilities/SignalHandler.h
@@ -8,8 +8,8 @@
 #define _SIGNAL_HANDLER_H_
 
 #include <csignal>
-#include <unordered_set>
 #include <mutex>
+#include <unordered_set>
 
 namespace Acore
 {
diff --git a/src/common/Utilities/TaskScheduler.h b/src/common/Utilities/TaskScheduler.h
index 5824eace9..a5bf9d8a5 100644
--- a/src/common/Utilities/TaskScheduler.h
+++ b/src/common/Utilities/TaskScheduler.h
@@ -6,16 +6,16 @@
 #ifndef _TASK_SCHEDULER_H_
 #define _TASK_SCHEDULER_H_
 
-#include <optional>
+#include "Util.h"
 #include <algorithm>
 #include <chrono>
 #include <functional>
-#include <vector>
-#include <queue>
 #include <memory>
+#include <optional>
+#include <queue>
 #include <set>
 #include <utility>
-#include "Util.h"
+#include <vector>
 
 class TaskContext;
 
diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp
index 7a4d2d8f2..9ea724c50 100644
--- a/src/common/Utilities/Util.cpp
+++ b/src/common/Utilities/Util.cpp
@@ -7,18 +7,18 @@
 #include "Util.h"
 #include "Common.h"
 #include "Containers.h"
-// #include "IpAddress.h"
 #include "StringConvert.h"
 #include "StringFormat.h"
-#include <utf8.h>
+#include <ace/Default_Constants.h>
 #include <algorithm>
-#include <iomanip>
-#include <sstream>
-#include <string>
 #include <cctype>
 #include <cstdarg>
 #include <ctime>
-#include <ace/Default_Constants.h>
+#include <iomanip>
+#include <sstream>
+#include <string>
+#include <utf8.h>
+// #include "IpAddress.h"
 
 Tokenizer::Tokenizer(const std::string& src, const char sep, uint32 vectorReserve)
 {
diff --git a/src/common/Utilities/Util.h b/src/common/Utilities/Util.h
index e0e92f232..bc5114620 100644
--- a/src/common/Utilities/Util.h
+++ b/src/common/Utilities/Util.h
@@ -7,17 +7,17 @@
 #ifndef _UTIL_H
 #define _UTIL_H
 
+#include "Containers.h"
 #include "Define.h"
 #include "Errors.h"
-#include "Containers.h"
+#include <ace/INET_Addr.h>
 #include <algorithm>
+#include <array>
 #include <cctype>
-#include <string>
-#include <vector>
 #include <list>
 #include <map>
-#include <ace/INET_Addr.h>
-#include <array>
+#include <string>
+#include <vector>
 
 // Searcher for map of structs
 template<typename T, class S> struct Finder