Core/Misc: Cleanup unused includes

11 files changed, 7 insertions, 12 deletions

diff --git a/src/tools/extractor_common/CascHandles.h b/src/tools/extractor_common/CascHandles.h
index cf40020feb6..51f781a49f9 100644
--- a/src/tools/extractor_common/CascHandles.h
+++ b/src/tools/extractor_common/CascHandles.h
@@ -20,7 +20,6 @@
 
 #include "Define.h"
 #include <CascPort.h>
-#include <memory>
 
 namespace boost
 {
diff --git a/src/tools/map_extractor/loadlib/loadlib.h b/src/tools/map_extractor/loadlib/loadlib.h
index 5e6c5285b38..aadf8cc8724 100644
--- a/src/tools/map_extractor/loadlib/loadlib.h
+++ b/src/tools/map_extractor/loadlib/loadlib.h
@@ -21,6 +21,7 @@
 #include "Define.h"
 #include "CascHandles.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 0772dfef402..c9bbd1d7d73 100644
--- a/src/tools/mmaps_generator/IntermediateValues.h
+++ b/src/tools/mmaps_generator/IntermediateValues.h
@@ -18,10 +18,8 @@
 #ifndef _INTERMEDIATE_VALUES_H
 #define _INTERMEDIATE_VALUES_H
 
-#include "PathCommon.h"
-#include "TerrainBuilder.h"
 #include "Recast.h"
-#include "DetourNavMesh.h"
+#include "TerrainBuilder.h"
 
 namespace MMAP
 {
diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp
index aa2c7ad4b8f..6e3142f2868 100644
--- a/src/tools/mmaps_generator/MapBuilder.cpp
+++ b/src/tools/mmaps_generator/MapBuilder.cpp
@@ -17,12 +17,12 @@
 
 #include "MapBuilder.h"
 #include "Containers.h"
+#include "IntermediateValues.h"
 #include "MapTree.h"
 #include "MMapDefines.h"
 #include "ModelInstance.h"
 #include "PathCommon.h"
 #include "StringFormat.h"
-#include <DetourCommon.h>
 #include <DetourNavMesh.h>
 #include <DetourNavMeshBuilder.h>
 #include <climits>
diff --git a/src/tools/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h
index 8bd299efd67..9e0927a32ae 100644
--- a/src/tools/mmaps_generator/MapBuilder.h
+++ b/src/tools/mmaps_generator/MapBuilder.h
@@ -20,13 +20,11 @@
 
 #include <vector>
 #include <set>
-#include <map>
 #include <list>
 #include <atomic>
 #include <thread>
 
 #include "TerrainBuilder.h"
-#include "IntermediateValues.h"
 
 #include "Recast.h"
 #include "DetourNavMesh.h"
diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp
index 1c40ad5bee4..ffae6eb2b29 100644
--- a/src/tools/mmaps_generator/TerrainBuilder.cpp
+++ b/src/tools/mmaps_generator/TerrainBuilder.cpp
@@ -23,6 +23,7 @@
 #include "ModelInstance.h"
 #include "Util.h"
 #include "VMapManager2.h"
+#include <map>
 
 namespace MMAP
 {
diff --git a/src/tools/mmaps_generator/TerrainBuilder.h b/src/tools/mmaps_generator/TerrainBuilder.h
index a41cc705df5..83e32dfef41 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 b643fdf40ae..bab83bd7cfa 100644
--- a/src/tools/vmap4_extractor/adtfile.cpp
+++ b/src/tools/vmap4_extractor/adtfile.cpp
@@ -18,7 +18,6 @@
 #include "vmapexport.h"
 #include "adtfile.h"
 #include "StringFormat.h"
-#include <algorithm>
 #include <cstdio>
 #include "Errors.h"
 
diff --git a/src/tools/vmap4_extractor/cascfile.h b/src/tools/vmap4_extractor/cascfile.h
index e0f67499bcc..53193c931a5 100644
--- a/src/tools/vmap4_extractor/cascfile.h
+++ b/src/tools/vmap4_extractor/cascfile.h
@@ -25,6 +25,7 @@
 
 #include "Define.h"
 #include "CascHandles.h"
+#include <memory>
 #include <string>
 #include <utility>
 
diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp
index 737f774bead..ebbe37efdd7 100644
--- a/src/tools/vmap4_extractor/vmapexport.cpp
+++ b/src/tools/vmap4_extractor/vmapexport.cpp
@@ -30,7 +30,6 @@
 #include <CascLib.h>
 #include <boost/filesystem/operations.hpp>
 #include <fstream>
-#include <iostream>
 #include <list>
 #include <map>
 #include <unordered_map>
diff --git a/src/tools/vmap4_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h
index f5f364d2302..5ba69c8b49b 100644
--- a/src/tools/vmap4_extractor/wmo.h
+++ b/src/tools/vmap4_extractor/wmo.h
@@ -18,11 +18,11 @@
 #ifndef WMO_H
 #define WMO_H
 
+#include "vec3d.h"
+#include <memory>
 #include <string>
 #include <unordered_set>
 #include <vector>
-#include "vec3d.h"
-#include "cascfile.h"
 
 // MOPY flags
 enum MopyFlags