diff --git a/src/tools/map_extractor/dbcfile.cpp b/src/tools/map_extractor/dbcfile.cpp
index b349dfc75..589511666 100644
--- a/src/tools/map_extractor/dbcfile.cpp
+++ b/src/tools/map_extractor/dbcfile.cpp
@@ -20,7 +20,6 @@
 #include "dbcfile.h"
 
 #include "mpq_libmpq04.h"
-#include <utility>
 
 DBCFile::DBCFile(std::string  filename):
     filename(std::move(filename)), recordSize(0), recordCount(0), fieldCount(0), stringSize(0), data(nullptr), stringTable(nullptr)
diff --git a/src/tools/map_extractor/dbcfile.h b/src/tools/map_extractor/dbcfile.h
index b8158811b..5fd536593 100644
--- a/src/tools/map_extractor/dbcfile.h
+++ b/src/tools/map_extractor/dbcfile.h
@@ -19,7 +19,6 @@
 #define DBCFILE_H
 #include <cassert>
 #include <string>
-#include <utility>
 
 // cppcheck-suppress ctuOneDefinitionRuleViolation
 class DBCFile
diff --git a/src/tools/map_extractor/mpq_libmpq04.h b/src/tools/map_extractor/mpq_libmpq04.h
index c7483e25b..dece851e9 100644
--- a/src/tools/map_extractor/mpq_libmpq04.h
+++ b/src/tools/map_extractor/mpq_libmpq04.h
@@ -20,7 +20,6 @@
 
 #include "libmpq/mpq.h"
 #include "loadlib/loadlib.h"
-#include <cctype>
 #include <cstring>
 #include <deque>
 #include <iostream>
diff --git a/src/tools/mmaps_generator/IntermediateValues.h b/src/tools/mmaps_generator/IntermediateValues.h
index 85d127a9e..971cf9000 100644
--- a/src/tools/mmaps_generator/IntermediateValues.h
+++ b/src/tools/mmaps_generator/IntermediateValues.h
@@ -18,8 +18,6 @@
 #ifndef _INTERMEDIATE_VALUES_H
 #define _INTERMEDIATE_VALUES_H
 
-#include "DetourNavMesh.h"
-#include "PathCommon.h"
 #include "Recast.h"
 #include "TerrainBuilder.h"
 
diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp
index aa35cee05..407cdb103 100644
--- a/src/tools/mmaps_generator/MapBuilder.cpp
+++ b/src/tools/mmaps_generator/MapBuilder.cpp
@@ -22,7 +22,6 @@
 #include "ModelInstance.h"
 #include "PathCommon.h"
 #include "StringFormat.h"
-#include "VMapFactory.h"
 #include "VMapMgr2.h"
 #include <DetourCommon.h>
 #include <DetourNavMesh.h>
diff --git a/src/tools/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h
index 59b865e04..19ef1ef59 100644
--- a/src/tools/mmaps_generator/MapBuilder.h
+++ b/src/tools/mmaps_generator/MapBuilder.h
@@ -20,12 +20,10 @@
 
 #include <atomic>
 #include <list>
-#include <map>
 #include <set>
 #include <thread>
 #include <vector>
 
-#include "IntermediateValues.h"
 #include "Optional.h"
 #include "TerrainBuilder.h"
 
diff --git a/src/tools/mmaps_generator/PathCommon.h b/src/tools/mmaps_generator/PathCommon.h
index 8e15a8cf3..866dffb68 100644
--- a/src/tools/mmaps_generator/PathCommon.h
+++ b/src/tools/mmaps_generator/PathCommon.h
@@ -18,7 +18,6 @@
 #ifndef _MMAP_COMMON_H
 #define _MMAP_COMMON_H
 
-#include "Common.h"
 #include <string>
 #include <vector>
 
diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp
index 0e394488c..2faee49d9 100644
--- a/src/tools/mmaps_generator/TerrainBuilder.cpp
+++ b/src/tools/mmaps_generator/TerrainBuilder.cpp
@@ -23,6 +23,7 @@
 #include "PathCommon.h"
 #include "VMapMgr2.h"
 #include <vector>
+#include <map>
 
 // ******************************************
 // Map file format defines
diff --git a/src/tools/mmaps_generator/TerrainBuilder.h b/src/tools/mmaps_generator/TerrainBuilder.h
index 2c0a00af4..23cdbc471 100644
--- a/src/tools/mmaps_generator/TerrainBuilder.h
+++ b/src/tools/mmaps_generator/TerrainBuilder.h
@@ -18,7 +18,6 @@
 #ifndef _MMAP_TERRAIN_BUILDER_H
 #define _MMAP_TERRAIN_BUILDER_H
 
-#include "PathCommon.h"
 #include "WorldModel.h"
 
 #include "G3D/Array.h"
diff --git a/src/tools/vmap4_extractor/adtfile.cpp b/src/tools/vmap4_extractor/adtfile.cpp
index 5af0937ed..6db292bc8 100644
--- a/src/tools/vmap4_extractor/adtfile.cpp
+++ b/src/tools/vmap4_extractor/adtfile.cpp
@@ -17,7 +17,6 @@
 
 #include "adtfile.h"
 #include "vmapexport.h"
-#include <algorithm>
 #include <cstdio>
 
 #ifdef WIN32
diff --git a/src/tools/vmap4_extractor/dbcfile.cpp b/src/tools/vmap4_extractor/dbcfile.cpp
index 61e0993ac..3e6351b14 100644
--- a/src/tools/vmap4_extractor/dbcfile.cpp
+++ b/src/tools/vmap4_extractor/dbcfile.cpp
@@ -21,7 +21,6 @@
 #undef max
 
 #include <cstdio>
-#include <utility>
 
 DBCFile::DBCFile(std::string  filename):
     filename(std::move(filename)), recordSize(0), recordCount(0), fieldCount(0), stringSize(0), data(nullptr), stringTable(nullptr)
diff --git a/src/tools/vmap4_extractor/dbcfile.h b/src/tools/vmap4_extractor/dbcfile.h
index adde0b2ae..ad7a4bb70 100644
--- a/src/tools/vmap4_extractor/dbcfile.h
+++ b/src/tools/vmap4_extractor/dbcfile.h
@@ -20,7 +20,6 @@
 
 #include <cassert>
 #include <string>
-#include <utility>
 
 class DBCFile
 {
diff --git a/src/tools/vmap4_extractor/gameobject_extract.cpp b/src/tools/vmap4_extractor/gameobject_extract.cpp
index 0bcc9c2da..fd7160e78 100644
--- a/src/tools/vmap4_extractor/gameobject_extract.cpp
+++ b/src/tools/vmap4_extractor/gameobject_extract.cpp
@@ -19,7 +19,6 @@
 #include "dbcfile.h"
 #include "model.h"
 #include "vmapexport.h"
-#include <algorithm>
 #include <cstdio>
 
 bool ExtractSingleModel(std::string& fname)
diff --git a/src/tools/vmap4_extractor/model.h b/src/tools/vmap4_extractor/model.h
index 6b4e3e0c8..021d1dedb 100644
--- a/src/tools/vmap4_extractor/model.h
+++ b/src/tools/vmap4_extractor/model.h
@@ -21,7 +21,6 @@
 #include "loadlib/loadlib.h"
 #include "modelheaders.h"
 #include "vec3d.h"
-#include <vector>
 
 class MPQFile;
 struct WMODoodadData;
diff --git a/src/tools/vmap4_extractor/mpq_libmpq04.h b/src/tools/vmap4_extractor/mpq_libmpq04.h
index 1cceb1faf..5b6c81ce3 100644
--- a/src/tools/vmap4_extractor/mpq_libmpq04.h
+++ b/src/tools/vmap4_extractor/mpq_libmpq04.h
@@ -20,7 +20,6 @@
 
 #include "libmpq/mpq.h"
 #include "loadlib/loadlib.h"
-#include <cctype>
 #include <cstring>
 #include <deque>
 #include <iostream>
diff --git a/src/tools/vmap4_extractor/wdtfile.h b/src/tools/vmap4_extractor/wdtfile.h
index 1ff934ca4..e2a6a61df 100644
--- a/src/tools/vmap4_extractor/wdtfile.h
+++ b/src/tools/vmap4_extractor/wdtfile.h
@@ -20,7 +20,6 @@
 
 #include "mpq_libmpq04.h"
 #include "wmo.h"
-#include <cstdlib>
 #include <string>
 
 class ADTFile;
diff --git a/src/tools/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp
index af34818c7..c0d6c0bbe 100644
--- a/src/tools/vmap4_extractor/wmo.cpp
+++ b/src/tools/vmap4_extractor/wmo.cpp
@@ -23,7 +23,6 @@
 #include <cstdio>
 #include <cstdlib>
 #include <map>
-#include <utility>
 #undef min
 #undef max
 #include "mpq_libmpq04.h"