From 472a36d92a2222e2d75b75cc4d8c85ba1197305d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 21 Apr 2023 02:13:40 +0200
Subject: [PATCH] Cleanup detournavigator includes

---
 components/detournavigator/asyncnavmeshupdater.cpp        | 2 --
 components/detournavigator/asyncnavmeshupdater.hpp        | 2 --
 components/detournavigator/commulativeaabb.hpp            | 1 -
 .../detournavigator/findrandompointaroundcircle.hpp       | 3 ++-
 components/detournavigator/findsmoothpath.cpp             | 2 ++
 components/detournavigator/findsmoothpath.hpp             | 1 -
 components/detournavigator/generatenavmeshtile.cpp        | 1 -
 components/detournavigator/generatenavmeshtile.hpp        | 3 ---
 components/detournavigator/makenavmesh.cpp                | 1 -
 components/detournavigator/navigatorimpl.cpp              | 1 -
 components/detournavigator/navigatorimpl.hpp              | 5 ++++-
 components/detournavigator/navmeshmanager.cpp             | 3 ---
 components/detournavigator/objectid.hpp                   | 2 +-
 components/detournavigator/recast.hpp                     | 1 -
 components/detournavigator/recastallocutils.hpp           | 4 +---
 components/detournavigator/recastglobalallocator.hpp      | 2 ++
 components/detournavigator/recastmesh.cpp                 | 2 --
 components/detournavigator/recastmeshobject.hpp           | 1 -
 components/detournavigator/recasttempallocator.hpp        | 2 ++
 .../detournavigator/tilecachedrecastmeshmanager.hpp       | 8 ++++++++
 20 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index fc05d45da9..85a953b261 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -11,8 +11,6 @@
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/thread.hpp>
 
-#include <BulletCollision/CollisionShapes/btBoxShape.h>
-
 #include <DetourNavMesh.h>
 
 #include <osg/io_utils>
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index 1991da15b7..b759a8e9a6 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -14,8 +14,6 @@
 #include "tileposition.hpp"
 #include "waitconditiontype.hpp"
 
-#include <osg/Vec3f>
-
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
diff --git a/components/detournavigator/commulativeaabb.hpp b/components/detournavigator/commulativeaabb.hpp
index 3559d3b000..5d24c329ca 100644
--- a/components/detournavigator/commulativeaabb.hpp
+++ b/components/detournavigator/commulativeaabb.hpp
@@ -2,7 +2,6 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_COMMULATIVEAABB_H
 
 #include <BulletCollision/Gimpact/btBoxCollision.h>
-#include <LinearMath/btTransform.h>
 
 #include <cstdint>
 
diff --git a/components/detournavigator/findrandompointaroundcircle.hpp b/components/detournavigator/findrandompointaroundcircle.hpp
index eca90617cf..d80a677e0e 100644
--- a/components/detournavigator/findrandompointaroundcircle.hpp
+++ b/components/detournavigator/findrandompointaroundcircle.hpp
@@ -3,9 +3,10 @@
 
 #include "flags.hpp"
 
-#include <optional>
 #include <osg/Vec3f>
 
+#include <optional>
+
 class dtNavMeshQuery;
 
 namespace DetourNavigator
diff --git a/components/detournavigator/findsmoothpath.cpp b/components/detournavigator/findsmoothpath.cpp
index 6650890517..04de62c89a 100644
--- a/components/detournavigator/findsmoothpath.cpp
+++ b/components/detournavigator/findsmoothpath.cpp
@@ -2,6 +2,8 @@
 
 #include <components/misc/convert.hpp>
 
+#include <DetourCommon.h>
+
 #include <algorithm>
 #include <array>
 
diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index 95f84381dd..2e9ffa83be 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -7,7 +7,6 @@
 #include "settingsutils.hpp"
 #include "status.hpp"
 
-#include <DetourCommon.h>
 #include <DetourNavMesh.h>
 #include <DetourNavMeshQuery.h>
 
diff --git a/components/detournavigator/generatenavmeshtile.cpp b/components/detournavigator/generatenavmeshtile.cpp
index 3e3c88e694..408c28cfba 100644
--- a/components/detournavigator/generatenavmeshtile.cpp
+++ b/components/detournavigator/generatenavmeshtile.cpp
@@ -8,7 +8,6 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <osg/Vec3f>
 #include <osg/io_utils>
 
 #include <functional>
diff --git a/components/detournavigator/generatenavmeshtile.hpp b/components/detournavigator/generatenavmeshtile.hpp
index ad06ea071c..c132ef6160 100644
--- a/components/detournavigator/generatenavmeshtile.hpp
+++ b/components/detournavigator/generatenavmeshtile.hpp
@@ -7,10 +7,7 @@
 
 #include <components/sceneutil/workqueue.hpp>
 
-#include <osg/Vec3f>
-
 #include <cstdint>
-#include <functional>
 #include <memory>
 #include <optional>
 #include <string_view>
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 0837680fc1..a389fe55b8 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -19,7 +19,6 @@
 #include <DetourNavMesh.h>
 #include <DetourNavMeshBuilder.h>
 #include <Recast.h>
-#include <RecastAlloc.h>
 
 #include <algorithm>
 #include <array>
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 0978f69c24..9d6084e596 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -4,7 +4,6 @@
 #include "stats.hpp"
 
 #include <components/esm3/loadpgrd.hpp>
-#include <components/misc/algorithm.hpp>
 #include <components/misc/convert.hpp>
 #include <components/misc/coordinateconverter.hpp>
 
diff --git a/components/detournavigator/navigatorimpl.hpp b/components/detournavigator/navigatorimpl.hpp
index 14760341f8..b8d2aa7978 100644
--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@@ -4,8 +4,11 @@
 #include "navigator.hpp"
 #include "navmeshmanager.hpp"
 
+#include <map>
 #include <memory>
-#include <set>
+#include <optional>
+#include <string_view>
+#include <unordered_map>
 
 namespace DetourNavigator
 {
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index e237f6c592..c7985c49b6 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -1,6 +1,5 @@
 #include "navmeshmanager.hpp"
 #include "debug.hpp"
-#include "exceptions.hpp"
 #include "gettilespositions.hpp"
 #include "makenavmesh.hpp"
 #include "navmeshcacheitem.hpp"
@@ -8,9 +7,7 @@
 #include "settingsutils.hpp"
 #include "waitconditiontype.hpp"
 
-#include <components/bullethelpers/heightfield.hpp>
 #include <components/debug/debuglog.hpp>
-#include <components/misc/convert.hpp>
 
 #include <osg/io_utils>
 
diff --git a/components/detournavigator/objectid.hpp b/components/detournavigator/objectid.hpp
index 75039bb09a..0c7236dbd5 100644
--- a/components/detournavigator/objectid.hpp
+++ b/components/detournavigator/objectid.hpp
@@ -2,7 +2,7 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_OBJECTID_H
 
 #include <cstddef>
-#include <unordered_map>
+#include <functional>
 
 namespace DetourNavigator
 {
diff --git a/components/detournavigator/recast.hpp b/components/detournavigator/recast.hpp
index 1811d35772..bf441051ff 100644
--- a/components/detournavigator/recast.hpp
+++ b/components/detournavigator/recast.hpp
@@ -2,7 +2,6 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_RECAST_H
 
 #include <Recast.h>
-#include <RecastAlloc.h>
 
 #include <cstddef>
 #include <type_traits>
diff --git a/components/detournavigator/recastallocutils.hpp b/components/detournavigator/recastallocutils.hpp
index 69a5cfa8b5..6caed5327c 100644
--- a/components/detournavigator/recastallocutils.hpp
+++ b/components/detournavigator/recastallocutils.hpp
@@ -1,9 +1,7 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTALLOCUTILS_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTALLOCUTILS_H
 
-#include <RecastAlloc.h>
-
-#include <cstdint>
+#include <cstddef>
 
 namespace DetourNavigator
 {
diff --git a/components/detournavigator/recastglobalallocator.hpp b/components/detournavigator/recastglobalallocator.hpp
index 1292926686..956f050a72 100644
--- a/components/detournavigator/recastglobalallocator.hpp
+++ b/components/detournavigator/recastglobalallocator.hpp
@@ -3,6 +3,8 @@
 
 #include "recasttempallocator.hpp"
 
+#include <RecastAlloc.h>
+
 #include <cstdlib>
 
 namespace DetourNavigator
diff --git a/components/detournavigator/recastmesh.cpp b/components/detournavigator/recastmesh.cpp
index 5c5764f336..66a0e777e1 100644
--- a/components/detournavigator/recastmesh.cpp
+++ b/components/detournavigator/recastmesh.cpp
@@ -1,8 +1,6 @@
 #include "recastmesh.hpp"
 #include "exceptions.hpp"
 
-#include <Recast.h>
-
 namespace DetourNavigator
 {
     Mesh::Mesh(std::vector<int>&& indices, std::vector<float>&& vertices, std::vector<AreaType>&& areaTypes)
diff --git a/components/detournavigator/recastmeshobject.hpp b/components/detournavigator/recastmeshobject.hpp
index e74b0d0d9d..e2d6f7a200 100644
--- a/components/detournavigator/recastmeshobject.hpp
+++ b/components/detournavigator/recastmeshobject.hpp
@@ -8,7 +8,6 @@
 
 #include <LinearMath/btTransform.h>
 
-#include <osg/Referenced>
 #include <osg/ref_ptr>
 
 #include <functional>
diff --git a/components/detournavigator/recasttempallocator.hpp b/components/detournavigator/recasttempallocator.hpp
index 290b088221..bb23dc8494 100644
--- a/components/detournavigator/recasttempallocator.hpp
+++ b/components/detournavigator/recasttempallocator.hpp
@@ -3,6 +3,8 @@
 
 #include "recastallocutils.hpp"
 
+#include <RecastAlloc.h>
+
 #include <cassert>
 #include <memory>
 #include <vector>
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 8fe4691ebc..db1f18f4d5 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -16,9 +16,17 @@
 #include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/index/rtree.hpp>
 
+#include <LinearMath/btTransform.h>
+
+#include <osg/Vec2i>
+
 #include <map>
+#include <memory>
 #include <mutex>
 #include <optional>
+#include <string>
+#include <string_view>
+#include <unordered_map>
 #include <vector>
 
 namespace DetourNavigator