From e0c4f08aa52813f3740fb28dc4872ed3602a71b0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 8 Nov 2021 01:45:41 +0100
Subject: [PATCH 1/2] Remove redundant includes

---
 apps/openmw/mwgui/mapwindow.hpp                  | 2 ++
 components/debug/debuglog.hpp                    | 2 --
 components/detournavigator/debug.hpp             | 8 --------
 components/detournavigator/recastmeshbuilder.hpp | 1 -
 components/detournavigator/recastmeshmanager.hpp | 2 --
 5 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index d3cd626475..61f48d5279 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -4,6 +4,8 @@
 #include <stdint.h>
 #include <memory>
 
+#include <osg/Vec2f>
+
 #include "windowpinnablebase.hpp"
 
 #include <components/esm/cellid.hpp>
diff --git a/components/debug/debuglog.hpp b/components/debug/debuglog.hpp
index 0da5b9cbdd..f794768546 100644
--- a/components/debug/debuglog.hpp
+++ b/components/debug/debuglog.hpp
@@ -4,8 +4,6 @@
 #include <mutex>
 #include <iostream>
 
-#include <osg/io_utils>
-
 namespace Debug
 {
     enum Level
diff --git a/components/detournavigator/debug.hpp b/components/detournavigator/debug.hpp
index d86d923a41..a868ac2a2e 100644
--- a/components/detournavigator/debug.hpp
+++ b/components/detournavigator/debug.hpp
@@ -7,16 +7,8 @@
 #include <osg/io_utils>
 
 #include <components/bullethelpers/operators.hpp>
-#include <components/misc/guarded.hpp>
 
-#include <chrono>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <memory>
-#include <sstream>
 #include <string>
-#include <thread>
 
 class dtNavMesh;
 
diff --git a/components/detournavigator/recastmeshbuilder.hpp b/components/detournavigator/recastmeshbuilder.hpp
index 120e4b045a..84e9716569 100644
--- a/components/detournavigator/recastmeshbuilder.hpp
+++ b/components/detournavigator/recastmeshbuilder.hpp
@@ -9,7 +9,6 @@
 #include <LinearMath/btTransform.h>
 
 #include <array>
-#include <functional>
 #include <memory>
 #include <tuple>
 #include <vector>
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index 33aba97bbf..d93745c71e 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -14,8 +14,6 @@
 #include <map>
 #include <optional>
 #include <memory>
-#include <variant>
-#include <tuple>
 #include <mutex>
 
 class btCollisionShape;

From a824e112d42a1706bc4eee0c1cc6bfd2fd332fdc Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 6 Nov 2021 16:36:59 +0100
Subject: [PATCH 2/2] Fix recastmesh.cpp includes

recastmesh.cpp is supposed to include recastmesh.hpp not navmesh.hpp.
---
 components/sceneutil/recastmesh.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/sceneutil/recastmesh.cpp b/components/sceneutil/recastmesh.cpp
index 18cec022ff..5732f86959 100644
--- a/components/sceneutil/recastmesh.cpp
+++ b/components/sceneutil/recastmesh.cpp
@@ -1,4 +1,4 @@
-#include "navmesh.hpp"
+#include "recastmesh.hpp"
 #include "detourdebugdraw.hpp"
 
 #include <components/detournavigator/settings.hpp>