diff --git a/src/server/game/Maps/GridMap.h b/src/server/game/Maps/GridMap.h
index 83bddab5d9..072bc9c211 100644
--- a/src/server/game/Maps/GridMap.h
+++ b/src/server/game/Maps/GridMap.h
@@ -18,10 +18,11 @@
 #ifndef TRINITY_GRID_MAP_H
 #define TRINITY_GRID_MAP_H
 
+#include <cstdio>
+
 #include "Define.h"
 #include "MapDefines.h"
 #include "Optional.h"
-#include <cstdio>
 
 struct LiquidData;
 enum ZLiquidStatus : uint32;
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index 0edaf0cd33..301056c4af 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -18,26 +18,26 @@
 #ifndef TRINITY_MAP_H
 #define TRINITY_MAP_H
 
-#include "Define.h"
+#include <bitset>
+#include <list>
+#include <memory>
 
 #include "Cell.h"
+#include "Define.h"
 #include "DynamicTree.h"
 #include "GridDefines.h"
 #include "GridRefManager.h"
-#include "MapDefines.h"
-#include "MapReference.h"
-#include "MapRefManager.h"
 #include "MPSCQueue.h"
+#include "MapDefines.h"
+#include "MapRefManager.h"
+#include "MapReference.h"
 #include "ObjectGuid.h"
 #include "SharedDefines.h"
 #include "SpawnData.h"
 #include "Timer.h"
-#include "WorldStateDefines.h"
 #include "Transaction.h"
 #include "Weather.h"
-#include <bitset>
-#include <list>
-#include <memory>
+#include "WorldStateDefines.h"
 
 class Battleground;
 class BattlegroundMap;
diff --git a/src/server/game/Maps/TerrainMgr.h b/src/server/game/Maps/TerrainMgr.h
index 2114e02db1..8684dc3b96 100644
--- a/src/server/game/Maps/TerrainMgr.h
+++ b/src/server/game/Maps/TerrainMgr.h
@@ -18,12 +18,6 @@
 #ifndef TERRAIN_MGR_H
 #define TERRAIN_MGR_H
 
-#include "Define.h"
-#include "Duration.h"
-#include "GridDefines.h"
-#include "MapDefines.h"
-#include "Position.h"
-#include "Timer.h"
 #include <atomic>
 #include <bitset>
 #include <memory>
@@ -31,6 +25,13 @@
 #include <unordered_map>
 #include <vector>
 
+#include "Define.h"
+#include "Duration.h"
+#include "GridDefines.h"
+#include "MapDefines.h"
+#include "Position.h"
+#include "Timer.h"
+
 class DynamicMapTree;
 class GridMap;
 class PhaseShift;
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
index a0a22e2e46..4b5bbdfcee 100644
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -15,21 +15,21 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "StringFormat.h"
-#include "Util.h"
-#include "MapDefines.h"
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/operations.hpp>
 #include <bitset>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
 #include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <deque>
 #include <fstream>
 #include <set>
 #include <unordered_map>
-#include <cstdlib>
-#include <cstring>
 
 #include "Common.h"
+#include "MapDefines.h"
+#include "StringFormat.h"
+#include "Util.h"
 #ifdef PLATFORM_WINDOWS
 #undef PLATFORM_WINDOWS
 #endif
diff --git a/src/tools/map_extractor/loadlib/loadlib.h b/src/tools/map_extractor/loadlib/loadlib.h
index 95e71aa565..f055a0b3f7 100644
--- a/src/tools/map_extractor/loadlib/loadlib.h
+++ b/src/tools/map_extractor/loadlib/loadlib.h
@@ -21,6 +21,7 @@
 #include "StormLib.h"
 #include "Define.h"
 #include <map>
+#include <memory>
 #include <string>
 
 #define FILE_FORMAT_VERSION    18
diff --git a/src/tools/mmaps_generator/IntermediateValues.h b/src/tools/mmaps_generator/IntermediateValues.h
index aa9a9702cb..9b5bcd4319 100644
--- a/src/tools/mmaps_generator/IntermediateValues.h
+++ b/src/tools/mmaps_generator/IntermediateValues.h
@@ -18,9 +18,8 @@
 #ifndef _INTERMEDIATE_VALUES_H
 #define _INTERMEDIATE_VALUES_H
 
-#include "PathCommon.h"
-#include "TerrainBuilder.h"
 #include "Recast.h"
+#include "TerrainBuilder.h"
 
 namespace MMAP
 {
diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp
index 8f6f46568e..07d9003527 100644
--- a/src/tools/mmaps_generator/MapBuilder.cpp
+++ b/src/tools/mmaps_generator/MapBuilder.cpp
@@ -16,13 +16,12 @@
  */
 
 #include "MapBuilder.h"
-#include "MapTree.h"
+#include "IntermediateValues.h"
 #include "MMapDefines.h"
+#include "MapTree.h"
 #include "ModelInstance.h"
 #include "PathCommon.h"
-#include "IntermediateValues.h"
 #include "StringFormat.h"
-#include <DetourCommon.h>
 #include <DetourNavMesh.h>
 #include <DetourNavMeshBuilder.h>
 #include <climits>
diff --git a/src/tools/mmaps_generator/TerrainBuilder.h b/src/tools/mmaps_generator/TerrainBuilder.h
index 9c3ea652b7..8d3c78da88 100644
--- a/src/tools/mmaps_generator/TerrainBuilder.h
+++ b/src/tools/mmaps_generator/TerrainBuilder.h
@@ -23,7 +23,6 @@
 
 #include "G3D/Array.h"
 #include "G3D/Vector3.h"
-#include "G3D/Matrix3.h"
 
 enum class map_liquidHeaderTypeFlags : uint8;
 
diff --git a/src/tools/vmap4_extractor/adtfile.cpp b/src/tools/vmap4_extractor/adtfile.cpp
index d2dacc1952..d93bd0746e 100644
--- a/src/tools/vmap4_extractor/adtfile.cpp
+++ b/src/tools/vmap4_extractor/adtfile.cpp
@@ -17,7 +17,6 @@
 
 #include "vmapexport.h"
 #include "adtfile.h"
-#include <algorithm>
 #include <cstdio>
 #include "Errors.h"
 
diff --git a/src/tools/vmap4_extractor/mpqfile.h b/src/tools/vmap4_extractor/mpqfile.h
index 5cc1d501c3..f6809cb7a6 100644
--- a/src/tools/vmap4_extractor/mpqfile.h
+++ b/src/tools/vmap4_extractor/mpqfile.h
@@ -8,6 +8,7 @@
 
 #include "StormLib.h"
 #include "Define.h"
+#include <memory>
 
 #ifdef _WIN32
 #include <Windows.h>    // mainly only HANDLE definition is required
diff --git a/src/tools/vmap4_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h
index fd0b497c8f..bc95ef80da 100644
--- a/src/tools/vmap4_extractor/wmo.h
+++ b/src/tools/vmap4_extractor/wmo.h
@@ -18,12 +18,12 @@
 #ifndef WMO_H
 #define WMO_H
 
+#include "vec3d.h"
 #include "mpqfile.h"
+#include <memory>
 #include <string>
 #include <unordered_set>
-#include <memory>
 #include <vector>
-#include "vec3d.h"
 
 // MOPY flags
 enum MopyFlags