From 3cbf1dc042f1e22d5a2bee73460468fd0beb929e Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 9 Oct 2022 10:39:43 +0000
Subject: [PATCH] First pass with include-what-you-use

---
 apps/esmtool/esmtool.cpp                      |  1 -
 apps/opencs/editor.cpp                        |  5 +++--
 apps/opencs/editor.hpp                        | 11 +++++++---
 apps/opencs/model/doc/document.cpp            |  1 -
 apps/opencs/model/doc/document.hpp            | 18 +++++----------
 apps/opencs/model/doc/documentmanager.hpp     |  6 -----
 apps/opencs/model/doc/loader.cpp              |  2 +-
 apps/opencs/model/doc/loader.hpp              |  3 ++-
 apps/opencs/model/doc/operation.cpp           |  1 -
 apps/opencs/model/doc/operation.hpp           |  7 +-----
 apps/opencs/model/doc/operationholder.hpp     |  5 -----
 apps/opencs/model/doc/runner.cpp              |  3 +++
 apps/opencs/model/doc/runner.hpp              |  2 --
 apps/opencs/model/doc/stage.hpp               |  3 ---
 apps/opencs/model/filter/leafnode.hpp         |  2 +-
 apps/opencs/model/filter/parser.hpp           | 11 +++++++++-
 apps/opencs/model/prefs/modifiersetting.cpp   |  4 +++-
 apps/opencs/model/prefs/modifiersetting.hpp   |  6 +++--
 apps/opencs/model/prefs/state.cpp             |  2 +-
 apps/opencs/model/prefs/state.hpp             |  4 ++--
 apps/opencs/view/filter/editwidget.hpp        |  1 -
 apps/opencs/view/filter/filterbox.hpp         |  8 ++++---
 apps/opencs/view/filter/recordfilterbox.hpp   |  5 ++++-
 apps/opencs/view/prefs/dialogue.hpp           |  1 -
 apps/opencs/view/render/cell.cpp              | 21 ++++++++++++++++++
 apps/opencs/view/render/pathgrid.cpp          |  1 -
 apps/opencs/view/render/terrainstorage.cpp    | 15 +++++++++++++
 apps/opencs/view/render/terrainstorage.hpp    | 12 +++++++++-
 apps/opencs/view/tools/merge.cpp              |  1 -
 apps/opencs/view/tools/reportsubview.hpp      |  4 ++--
 apps/opencs/view/tools/searchsubview.hpp      |  3 ---
 apps/opencs/view/world/creator.cpp            |  2 ++
 apps/openmw/mwclass/creature.cpp              |  3 ++-
 apps/openmw/mwclass/creature.hpp              |  2 --
 apps/openmw/mwgui/postprocessorhud.cpp        | 11 ++++++++++
 apps/openmw/mwphysics/actor.cpp               |  1 -
 apps/openmw/mwphysics/actor.hpp               |  2 --
 apps/openmw/mwphysics/movementsolver.cpp      |  3 ---
 apps/openmw/mwphysics/movementsolver.hpp      |  2 --
 apps/openmw/mwphysics/mtphysics.cpp           |  1 -
 apps/openmw/mwphysics/mtphysics.hpp           |  1 -
 apps/openmw/mwphysics/object.hpp              |  4 ----
 apps/openmw/mwphysics/physicssystem.hpp       |  1 -
 apps/openmw/mwphysics/projectile.cpp          |  2 --
 apps/openmw/mwphysics/projectile.hpp          |  5 -----
 .../mwphysics/projectileconvexcallback.cpp    |  4 ----
 apps/wizard/componentselectionpage.cpp        |  3 ---
 apps/wizard/existinginstallationpage.hpp      |  2 --
 apps/wizard/installationpage.hpp              | 11 ++++++----
 apps/wizard/languageselectionpage.cpp         |  2 --
 apps/wizard/mainwizard.cpp                    |  1 -
 apps/wizard/unshield/unshieldworker.hpp       |  2 --
 apps/wizard/utils/componentlistwidget.cpp     |  2 --
 components/bsa/compressedbsafile.cpp          |  1 -
 components/esm/common.cpp                     |  3 ++-
 components/fx/lexer.cpp                       | 12 +++-------
 components/fx/lexer.hpp                       |  7 +-----
 components/fx/pass.hpp                        | 13 ++++++-----
 components/fx/technique.cpp                   |  2 --
 components/fx/technique.hpp                   |  7 ------
 components/fx/widgets.hpp                     | 15 ++++++++++---
 components/nif/niffile.cpp                    |  1 -
 components/nif/node.cpp                       |  2 +-
 components/nif/physics.hpp                    |  2 +-
 components/nifosg/nifloader.hpp               |  8 ++++---
 components/resource/scenemanager.hpp          | 22 ++++++++++++-------
 components/sceneutil/color.cpp                |  5 -----
 components/sceneutil/extradata.hpp            |  3 ---
 components/sceneutil/lightmanager.cpp         |  1 +
 components/sceneutil/lightmanager.hpp         |  7 ------
 components/sceneutil/rtt.cpp                  |  4 ----
 components/sceneutil/rtt.hpp                  |  3 ---
 components/sceneutil/unrefqueue.cpp           |  2 ++
 components/sceneutil/unrefqueue.hpp           |  2 --
 components/sceneutil/util.hpp                 |  3 +--
 components/sceneutil/workqueue.hpp            |  3 ++-
 components/settings/settings.hpp              |  2 --
 components/shader/shadervisitor.cpp           |  1 -
 components/shader/shadervisitor.hpp           |  3 ---
 components/to_utf8/to_utf8.cpp                |  3 ++-
 components/to_utf8/to_utf8.hpp                |  2 +-
 components/vfs/bsaarchive.cpp                 |  1 -
 components/vfs/manager.cpp                    |  2 --
 83 files changed, 180 insertions(+), 198 deletions(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index f20a9f287b..065ea5ecae 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -3,7 +3,6 @@
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <list>
 #include <map>
 #include <memory>
 #include <optional>
diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 729b9e58c6..8414e6bfdd 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -9,14 +9,15 @@
 
 #include <components/debug/debugging.hpp>
 #include <components/debug/debuglog.hpp>
+#include <components/fallback/fallback.hpp>
 #include <components/fallback/validate.hpp>
-#include <components/files/conversion.hpp>
 #include <components/files/qtconversion.hpp>
 #include <components/misc/rng.hpp>
-#include <components/misc/strings/conversion.hpp>
 #include <components/nifosg/nifloader.hpp>
 #include <components/settings/settings.hpp>
 
+#include "view/doc/viewmanager.hpp"
+
 #include "model/doc/document.hpp"
 
 #ifdef _WIN32
diff --git a/apps/opencs/editor.hpp b/apps/opencs/editor.hpp
index cc0ed688b8..1b9b096f4b 100644
--- a/apps/opencs/editor.hpp
+++ b/apps/opencs/editor.hpp
@@ -6,8 +6,6 @@
 #include <boost/interprocess/sync/file_lock.hpp>
 #include <boost/program_options/variables_map.hpp>
 
-#include <QLocalServer>
-#include <QLocalSocket>
 #include <QObject>
 #include <QString>
 
@@ -24,17 +22,24 @@
 #include "view/doc/filedialog.hpp"
 #include "view/doc/newgame.hpp"
 #include "view/doc/startup.hpp"
-#include "view/doc/viewmanager.hpp"
 
 #include "view/prefs/dialogue.hpp"
 
 #include "view/tools/merge.hpp"
 
+class QLocalServer;
+class QLocalSocket;
+
 namespace CSMDoc
 {
     class Document;
 }
 
+namespace CSVDoc
+{
+    class ViewManager;
+}
+
 namespace CS
 {
     class Editor : public QObject
diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 27cb56e94f..83cadc08c5 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -2,7 +2,6 @@
 
 #include "state.hpp"
 
-#include <cassert>
 #include <filesystem>
 #include <memory>
 #include <utility>
diff --git a/apps/opencs/model/doc/document.hpp b/apps/opencs/model/doc/document.hpp
index 942decb7b6..21dac9a2e8 100644
--- a/apps/opencs/model/doc/document.hpp
+++ b/apps/opencs/model/doc/document.hpp
@@ -19,16 +19,12 @@
 #include "runner.hpp"
 #include "saving.hpp"
 
-class QAbstractItemModel;
+class QTextDocument;
 
-namespace Fallback
+namespace CSMTools
 {
-    class Map;
-}
-
-namespace VFS
-{
-    class Manager;
+    class ReportModel;
+    class Search;
 }
 
 namespace ESM
@@ -43,13 +39,9 @@ namespace Files
     struct ConfigurationManager;
 }
 
-namespace CSMWorld
-{
-    class ResourcesManager;
-}
-
 namespace CSMDoc
 {
+    struct Message;
     class Document : public QObject
     {
         Q_OBJECT
diff --git a/apps/opencs/model/doc/documentmanager.hpp b/apps/opencs/model/doc/documentmanager.hpp
index 6f1d783a20..2db67cfc22 100644
--- a/apps/opencs/model/doc/documentmanager.hpp
+++ b/apps/opencs/model/doc/documentmanager.hpp
@@ -7,17 +7,11 @@
 #include <QObject>
 #include <QThread>
 
-#include <components/fallback/fallback.hpp>
 #include <components/files/multidircollection.hpp>
 #include <components/to_utf8/to_utf8.hpp>
 
 #include "loader.hpp"
 
-namespace VFS
-{
-    class Manager;
-}
-
 namespace Files
 {
     struct ConfigurationManager;
diff --git a/apps/opencs/model/doc/loader.cpp b/apps/opencs/model/doc/loader.cpp
index 8a84a827b0..c9fc9d08a1 100644
--- a/apps/opencs/model/doc/loader.cpp
+++ b/apps/opencs/model/doc/loader.cpp
@@ -2,7 +2,7 @@
 
 #include <components/files/conversion.hpp>
 
-#include <iostream>
+#include <QTimer>
 
 #include "../tools/reportmodel.hpp"
 
diff --git a/apps/opencs/model/doc/loader.hpp b/apps/opencs/model/doc/loader.hpp
index 24cb069f79..5e06b034d2 100644
--- a/apps/opencs/model/doc/loader.hpp
+++ b/apps/opencs/model/doc/loader.hpp
@@ -5,9 +5,10 @@
 
 #include <QMutex>
 #include <QObject>
-#include <QTimer>
 #include <QWaitCondition>
 
+class QTimer;
+
 namespace CSMDoc
 {
     class Document;
diff --git a/apps/opencs/model/doc/operation.cpp b/apps/opencs/model/doc/operation.cpp
index 396eb17962..523ce3b165 100644
--- a/apps/opencs/model/doc/operation.cpp
+++ b/apps/opencs/model/doc/operation.cpp
@@ -1,6 +1,5 @@
 #include "operation.hpp"
 
-#include <string>
 #include <vector>
 
 #include <QTimer>
diff --git a/apps/opencs/model/doc/operation.hpp b/apps/opencs/model/doc/operation.hpp
index 5ac89ff6b0..8b3b409b34 100644
--- a/apps/opencs/model/doc/operation.hpp
+++ b/apps/opencs/model/doc/operation.hpp
@@ -1,18 +1,13 @@
 #ifndef CSM_DOC_OPERATION_H
 #define CSM_DOC_OPERATION_H
 
-#include <map>
 #include <vector>
 
 #include <QObject>
-#include <QTimer>
 
 #include "messages.hpp"
 
-namespace CSMWorld
-{
-    class UniversalId;
-}
+class QTimer;
 
 namespace CSMDoc
 {
diff --git a/apps/opencs/model/doc/operationholder.hpp b/apps/opencs/model/doc/operationholder.hpp
index c5b4d23b9a..8434f69052 100644
--- a/apps/opencs/model/doc/operationholder.hpp
+++ b/apps/opencs/model/doc/operationholder.hpp
@@ -6,11 +6,6 @@
 
 #include "messages.hpp"
 
-namespace CSMWorld
-{
-    class UniversalId;
-}
-
 namespace CSMDoc
 {
     class Operation;
diff --git a/apps/opencs/model/doc/runner.cpp b/apps/opencs/model/doc/runner.cpp
index 8590939d97..c02a506836 100644
--- a/apps/opencs/model/doc/runner.cpp
+++ b/apps/opencs/model/doc/runner.cpp
@@ -2,8 +2,11 @@
 
 #include <utility>
 
+#if defined(Q_OS_MAC)
 #include <QCoreApplication>
 #include <QDir>
+#endif
+
 #include <QTemporaryFile>
 #include <QTextStream>
 
diff --git a/apps/opencs/model/doc/runner.hpp b/apps/opencs/model/doc/runner.hpp
index 170779772b..b94caca386 100644
--- a/apps/opencs/model/doc/runner.hpp
+++ b/apps/opencs/model/doc/runner.hpp
@@ -62,8 +62,6 @@ namespace CSMDoc
         void readyReadStandardOutput();
     };
 
-    class Operation;
-
     /// \brief Watch for end of save operation and restart or stop runner
     class SaveWatcher : public QObject
     {
diff --git a/apps/opencs/model/doc/stage.hpp b/apps/opencs/model/doc/stage.hpp
index d8f8a77c43..581b6c808f 100644
--- a/apps/opencs/model/doc/stage.hpp
+++ b/apps/opencs/model/doc/stage.hpp
@@ -1,9 +1,6 @@
 #ifndef CSM_DOC_STAGE_H
 #define CSM_DOC_STAGE_H
 
-#include <string>
-#include <vector>
-
 #include "messages.hpp"
 
 class QString;
diff --git a/apps/opencs/model/filter/leafnode.hpp b/apps/opencs/model/filter/leafnode.hpp
index afaad32a70..bf90da18b0 100644
--- a/apps/opencs/model/filter/leafnode.hpp
+++ b/apps/opencs/model/filter/leafnode.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_FILTER_LEAFNODE_H
 #define CSM_FILTER_LEAFNODE_H
 
-#include <memory>
+#include <vector>
 
 #include "node.hpp"
 
diff --git a/apps/opencs/model/filter/parser.hpp b/apps/opencs/model/filter/parser.hpp
index 660fd7d4fd..b7af8b6041 100644
--- a/apps/opencs/model/filter/parser.hpp
+++ b/apps/opencs/model/filter/parser.hpp
@@ -1,7 +1,16 @@
 #ifndef CSM_FILTER_PARSER_H
 #define CSM_FILTER_PARSER_H
 
-#include "node.hpp"
+#include <memory>
+#include <string>
+namespace CSMFilter
+{
+    class Node;
+}
+namespace CSMFilter
+{
+    struct Token;
+}
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/prefs/modifiersetting.cpp b/apps/opencs/model/prefs/modifiersetting.cpp
index d65367abaf..6b9da562f5 100644
--- a/apps/opencs/model/prefs/modifiersetting.cpp
+++ b/apps/opencs/model/prefs/modifiersetting.cpp
@@ -5,13 +5,15 @@
 #include <QLabel>
 #include <QMouseEvent>
 #include <QPushButton>
-#include <QWidget>
 
 #include <components/settings/settings.hpp>
 
 #include "shortcutmanager.hpp"
 #include "state.hpp"
 
+class QObject;
+class QWidget;
+
 namespace CSMPrefs
 {
     ModifierSetting::ModifierSetting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label)
diff --git a/apps/opencs/model/prefs/modifiersetting.hpp b/apps/opencs/model/prefs/modifiersetting.hpp
index 4aa8848759..7c43023f47 100644
--- a/apps/opencs/model/prefs/modifiersetting.hpp
+++ b/apps/opencs/model/prefs/modifiersetting.hpp
@@ -1,15 +1,17 @@
 #ifndef CSM_PREFS_MODIFIERSETTING_H
 #define CSM_PREFS_MODIFIERSETTING_H
 
-#include <QKeySequence>
-
 #include "setting.hpp"
 
+class QMutex;
+class QObject;
+class QWidget;
 class QEvent;
 class QPushButton;
 
 namespace CSMPrefs
 {
+    class Category;
     class ModifierSetting : public Setting
     {
         Q_OBJECT
diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index b3805670c3..16fa227629 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -1,7 +1,6 @@
 
 #include "state.hpp"
 
-#include <algorithm>
 #include <sstream>
 #include <stdexcept>
 
@@ -13,6 +12,7 @@
 #include "intsetting.hpp"
 #include "modifiersetting.hpp"
 #include "shortcutsetting.hpp"
+#include "stringsetting.hpp"
 
 CSMPrefs::State* CSMPrefs::State::sThis = nullptr;
 
diff --git a/apps/opencs/model/prefs/state.hpp b/apps/opencs/model/prefs/state.hpp
index 5f330b7651..354f4552e3 100644
--- a/apps/opencs/model/prefs/state.hpp
+++ b/apps/opencs/model/prefs/state.hpp
@@ -13,9 +13,7 @@
 
 #include "category.hpp"
 #include "enumsetting.hpp"
-#include "setting.hpp"
 #include "shortcutmanager.hpp"
-#include "stringsetting.hpp"
 
 class QColor;
 
@@ -27,6 +25,8 @@ namespace CSMPrefs
     class ColourSetting;
     class ShortcutSetting;
     class ModifierSetting;
+    class Setting;
+    class StringSetting;
 
     /// \brief User settings state
     ///
diff --git a/apps/opencs/view/filter/editwidget.hpp b/apps/opencs/view/filter/editwidget.hpp
index af6ea2c8d6..0f1838ea96 100644
--- a/apps/opencs/view/filter/editwidget.hpp
+++ b/apps/opencs/view/filter/editwidget.hpp
@@ -4,7 +4,6 @@
 #include <QLineEdit>
 #include <QPalette>
 
-#include "../../model/filter/node.hpp"
 #include "../../model/filter/parser.hpp"
 
 class QModelIndex;
diff --git a/apps/opencs/view/filter/filterbox.hpp b/apps/opencs/view/filter/filterbox.hpp
index 1bd89fe3f8..955a7bc47f 100644
--- a/apps/opencs/view/filter/filterbox.hpp
+++ b/apps/opencs/view/filter/filterbox.hpp
@@ -5,12 +5,14 @@
 
 #include <QWidget>
 
-#include "../../model/filter/node.hpp"
-#include "../../model/world/universalid.hpp"
-
+namespace CSMFilter
+{
+    class Node;
+}
 namespace CSMWorld
 {
     class Data;
+    class UniversalId;
 }
 
 namespace CSVFilter
diff --git a/apps/opencs/view/filter/recordfilterbox.hpp b/apps/opencs/view/filter/recordfilterbox.hpp
index 5583a8c873..4087acfb36 100644
--- a/apps/opencs/view/filter/recordfilterbox.hpp
+++ b/apps/opencs/view/filter/recordfilterbox.hpp
@@ -3,7 +3,10 @@
 
 #include <QWidget>
 
-#include "../../model/filter/node.hpp"
+namespace CSMFilter
+{
+    class Node;
+}
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/view/prefs/dialogue.hpp b/apps/opencs/view/prefs/dialogue.hpp
index 70ee40586c..dab25d303f 100644
--- a/apps/opencs/view/prefs/dialogue.hpp
+++ b/apps/opencs/view/prefs/dialogue.hpp
@@ -4,7 +4,6 @@
 #include <QMainWindow>
 
 class QSplitter;
-class QListWidget;
 class QStackedWidget;
 class QListWidgetItem;
 
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 6b6544b56e..e9bcef2e8a 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -1,8 +1,17 @@
 #include "cell.hpp"
 
+#include <set>
+#include <type_traits>
+#include <utility>
+
+#include <osg/Callback>
 #include <osg/Group>
+#include <osg/Node>
+#include <osg/NodeVisitor>
 #include <osg/PositionAttitudeTransform>
+#include <osg/Referenced>
 
+#include <components/esm/defs.hpp>
 #include <components/esm3/loadcell.hpp>
 #include <components/esm3/loadland.hpp>
 #include <components/misc/strings/lower.hpp>
@@ -20,6 +29,18 @@
 #include "pathgrid.hpp"
 #include "terrainstorage.hpp"
 
+#include <apps/opencs/model/world/cell.hpp>
+#include <apps/opencs/model/world/cellcoordinates.hpp>
+#include <apps/opencs/model/world/columns.hpp>
+#include <apps/opencs/model/world/data.hpp>
+#include <apps/opencs/model/world/idcollection.hpp>
+#include <apps/opencs/model/world/land.hpp>
+#include <apps/opencs/model/world/record.hpp>
+#include <apps/opencs/model/world/ref.hpp>
+#include <apps/opencs/model/world/refcollection.hpp>
+#include <apps/opencs/model/world/universalid.hpp>
+#include <apps/opencs/view/render/tagbase.hpp>
+
 namespace CSVRender
 {
     class CellNodeContainer : public osg::Referenced
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index 6de471ba67..8fcd3ac82b 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -6,7 +6,6 @@
 #include <osg/Geometry>
 #include <osg/Group>
 #include <osg/PositionAttitudeTransform>
-#include <osg/Vec3>
 
 #include <components/sceneutil/pathgridutil.hpp>
 
diff --git a/apps/opencs/view/render/terrainstorage.cpp b/apps/opencs/view/render/terrainstorage.cpp
index a4da6754d0..37ceff6719 100644
--- a/apps/opencs/view/render/terrainstorage.cpp
+++ b/apps/opencs/view/render/terrainstorage.cpp
@@ -2,6 +2,21 @@
 
 #include <components/esm3terrain/storage.hpp>
 
+#include <algorithm>
+#include <apps/opencs/model/world/data.hpp>
+#include <apps/opencs/model/world/idcollection.hpp>
+#include <apps/opencs/model/world/land.hpp>
+#include <apps/opencs/model/world/landtexture.hpp>
+#include <apps/opencs/model/world/record.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <iterator>
+#include <math.h>
+#include <memory>
+#include <osg/Vec4ub>
+#include <stdexcept>
+#include <stdlib.h>
+#include <string>
+
 namespace CSVRender
 {
     TerrainStorage::TerrainStorage(const CSMWorld::Data& data)
diff --git a/apps/opencs/view/render/terrainstorage.hpp b/apps/opencs/view/render/terrainstorage.hpp
index 64c026b76d..17eb1af9a8 100644
--- a/apps/opencs/view/render/terrainstorage.hpp
+++ b/apps/opencs/view/render/terrainstorage.hpp
@@ -3,9 +3,19 @@
 
 #include <array>
 
+#include <components/esm3/loadland.hpp>
+#include <components/esm3/loadltex.hpp>
 #include <components/esm3terrain/storage.hpp>
+#include <osg/ref_ptr>
 
-#include "../../model/world/data.hpp"
+namespace CSMWorld
+{
+    class Data;
+}
+namespace osg
+{
+    class Vec4ub;
+}
 
 namespace CSVRender
 {
diff --git a/apps/opencs/view/tools/merge.cpp b/apps/opencs/view/tools/merge.cpp
index 43c182368e..0e67a1b1d8 100644
--- a/apps/opencs/view/tools/merge.cpp
+++ b/apps/opencs/view/tools/merge.cpp
@@ -9,7 +9,6 @@
 #include <QSplitter>
 #include <QVBoxLayout>
 
-#include <components/files/conversion.hpp>
 #include <components/files/qtconversion.hpp>
 
 #include "../../model/doc/document.hpp"
diff --git a/apps/opencs/view/tools/reportsubview.hpp b/apps/opencs/view/tools/reportsubview.hpp
index ea07098fba..5b0cef5b18 100644
--- a/apps/opencs/view/tools/reportsubview.hpp
+++ b/apps/opencs/view/tools/reportsubview.hpp
@@ -2,9 +2,9 @@
 #define CSV_TOOLS_REPORTSUBVIEW_H
 
 #include "../doc/subview.hpp"
+#include <apps/opencs/model/world/universalid.hpp>
 
-class QTableView;
-class QModelIndex;
+class QObject;
 
 namespace CSMDoc
 {
diff --git a/apps/opencs/view/tools/searchsubview.hpp b/apps/opencs/view/tools/searchsubview.hpp
index 2c895351f4..f3fafbcd0a 100644
--- a/apps/opencs/view/tools/searchsubview.hpp
+++ b/apps/opencs/view/tools/searchsubview.hpp
@@ -7,9 +7,6 @@
 
 #include "searchbox.hpp"
 
-class QTableView;
-class QModelIndex;
-
 namespace CSMDoc
 {
     class Document;
diff --git a/apps/opencs/view/world/creator.cpp b/apps/opencs/view/world/creator.cpp
index 04db050a09..86f5034dd5 100644
--- a/apps/opencs/view/world/creator.cpp
+++ b/apps/opencs/view/world/creator.cpp
@@ -1,5 +1,7 @@
 #include "creator.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <stdexcept>
 
 CSVWorld::Creator::~Creator() {}
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index eacd4a15e9..c53276443a 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -1,6 +1,7 @@
 #include "creature.hpp"
 
-#include <components/debug/debuglog.hpp>
+#include <MyGUI_TextIterator.h>
+
 #include <components/esm3/creaturestate.hpp>
 #include <components/esm3/loadclas.hpp>
 #include <components/esm3/loadcrea.hpp>
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index 1951ce6093..9e559a604c 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -1,8 +1,6 @@
 #ifndef GAME_MWCLASS_CREATURE_H
 #define GAME_MWCLASS_CREATURE_H
 
-#include <MyGUI_TextIterator.h>
-
 #include "../mwworld/registeredclass.hpp"
 
 #include "actor.hpp"
diff --git a/apps/openmw/mwgui/postprocessorhud.cpp b/apps/openmw/mwgui/postprocessorhud.cpp
index bd54bbf2c2..77aa05404b 100644
--- a/apps/openmw/mwgui/postprocessorhud.cpp
+++ b/apps/openmw/mwgui/postprocessorhud.cpp
@@ -1,9 +1,20 @@
 #include "postprocessorhud.hpp"
 
+#include <MyGUI_Align.h>
 #include <MyGUI_Button.h>
+#include <MyGUI_Delegate.h>
+#include <MyGUI_EditBox.h>
+#include <MyGUI_EventPair.h>
 #include <MyGUI_FactoryManager.h>
+#include <MyGUI_Gui.h>
+#include <MyGUI_InputManager.h>
+#include <MyGUI_Macros.h>
 #include <MyGUI_ScrollView.h>
 #include <MyGUI_TabItem.h>
+#include <MyGUI_UString.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetDefines.h>
+#include <MyGUI_WidgetInput.h>
 #include <MyGUI_Window.h>
 
 #include <components/fx/technique.hpp>
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index d243415b48..5349392cb7 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -1,6 +1,5 @@
 #include "actor.hpp"
 
-#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 #include <BulletCollision/CollisionShapes/btCylinderShape.h>
 
 #include <components/debug/debuglog.hpp>
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 40d4f27c0f..543259c9e5 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -8,12 +8,10 @@
 
 #include <components/detournavigator/collisionshapetype.hpp>
 
-#include <LinearMath/btTransform.h>
 #include <osg/Quat>
 #include <osg/Vec3f>
 
 class btCollisionShape;
-class btCollisionObject;
 class btCollisionWorld;
 class btConvexShape;
 
diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 58d50cd2ed..a127124265 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -2,7 +2,6 @@
 
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
-#include <BulletCollision/CollisionShapes/btCollisionShape.h>
 #include <BulletCollision/CollisionShapes/btConvexShape.h>
 
 #include <components/esm3/loadgmst.hpp>
@@ -11,9 +10,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
-#include "../mwworld/refdata.hpp"
 
 #include "actor.hpp"
 #include "collisiontype.hpp"
diff --git a/apps/openmw/mwphysics/movementsolver.hpp b/apps/openmw/mwphysics/movementsolver.hpp
index 15051f6f8d..e3d6657d25 100644
--- a/apps/openmw/mwphysics/movementsolver.hpp
+++ b/apps/openmw/mwphysics/movementsolver.hpp
@@ -5,8 +5,6 @@
 
 #include <components/misc/constants.hpp>
 
-#include "../mwworld/ptr.hpp"
-
 class btCollisionWorld;
 
 namespace MWWorld
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index e340f25c66..da35752ae0 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -17,7 +17,6 @@
 
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
-#include "../mwmechanics/movement.hpp"
 
 #include "../mwrender/bulletdebugdraw.hpp"
 
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index 20bdffba13..ab0f768345 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -7,7 +7,6 @@
 #include <shared_mutex>
 #include <thread>
 #include <unordered_set>
-#include <variant>
 
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
diff --git a/apps/openmw/mwphysics/object.hpp b/apps/openmw/mwphysics/object.hpp
index a143c08548..875f12d879 100644
--- a/apps/openmw/mwphysics/object.hpp
+++ b/apps/openmw/mwphysics/object.hpp
@@ -7,7 +7,6 @@
 #include <osg/Node>
 
 #include <map>
-#include <memory>
 #include <mutex>
 
 namespace Resource
@@ -15,9 +14,6 @@ namespace Resource
     class BulletShapeInstance;
 }
 
-class btCollisionObject;
-class btVector3;
-
 namespace MWPhysics
 {
     class PhysicsTaskScheduler;
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 57dbde1471..4b67d9cb13 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -1,7 +1,6 @@
 #ifndef OPENMW_MWPHYSICS_PHYSICSSYSTEM_H
 #define OPENMW_MWPHYSICS_PHYSICSSYSTEM_H
 
-#include <algorithm>
 #include <array>
 #include <functional>
 #include <map>
diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index 242549147d..9c5c82e6c7 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -4,8 +4,6 @@
 
 #include <components/misc/convert.hpp>
 
-#include "../mwworld/class.hpp"
-
 #include "actor.hpp"
 #include "collisiontype.hpp"
 #include "mtphysics.hpp"
diff --git a/apps/openmw/mwphysics/projectile.hpp b/apps/openmw/mwphysics/projectile.hpp
index d8eebf3057..19337c7de1 100644
--- a/apps/openmw/mwphysics/projectile.hpp
+++ b/apps/openmw/mwphysics/projectile.hpp
@@ -18,11 +18,6 @@ namespace osg
     class Vec3f;
 }
 
-namespace Resource
-{
-    struct BulletShape;
-}
-
 namespace MWPhysics
 {
     class PhysicsTaskScheduler;
diff --git a/apps/openmw/mwphysics/projectileconvexcallback.cpp b/apps/openmw/mwphysics/projectileconvexcallback.cpp
index d3cbf1f21e..d7e80b4698 100644
--- a/apps/openmw/mwphysics/projectileconvexcallback.cpp
+++ b/apps/openmw/mwphysics/projectileconvexcallback.cpp
@@ -1,12 +1,8 @@
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 
-#include "../mwworld/class.hpp"
-
-#include "actor.hpp"
 #include "collisiontype.hpp"
 #include "projectile.hpp"
 #include "projectileconvexcallback.hpp"
-#include "ptrholder.hpp"
 
 namespace MWPhysics
 {
diff --git a/apps/wizard/componentselectionpage.cpp b/apps/wizard/componentselectionpage.cpp
index 8104fdc58e..e492f4b83a 100644
--- a/apps/wizard/componentselectionpage.cpp
+++ b/apps/wizard/componentselectionpage.cpp
@@ -1,6 +1,5 @@
 #include "componentselectionpage.hpp"
 
-#include <QDebug>
 #include <QMessageBox>
 #include <QPushButton>
 
@@ -128,8 +127,6 @@ bool Wizard::ComponentSelectionPage::validatePage()
     QStringList components(field(QLatin1String("installation.components")).toStringList());
     QString path(field(QLatin1String("installation.path")).toString());
 
-    //    qDebug() << components << path << mWizard->mInstallations[path];
-
     if (field(QLatin1String("installation.retailDisc")).toBool() == false)
     {
         if (components.contains(QLatin1String("Tribunal")) && !components.contains(QLatin1String("Bloodmoon")))
diff --git a/apps/wizard/existinginstallationpage.hpp b/apps/wizard/existinginstallationpage.hpp
index c7072217a2..a5ed77f9d4 100644
--- a/apps/wizard/existinginstallationpage.hpp
+++ b/apps/wizard/existinginstallationpage.hpp
@@ -3,8 +3,6 @@
 
 #include "ui_existinginstallationpage.h"
 
-#include <components/config/gamesettings.hpp>
-
 namespace Wizard
 {
     class MainWizard;
diff --git a/apps/wizard/installationpage.hpp b/apps/wizard/installationpage.hpp
index d7f04fe412..de0d68d478 100644
--- a/apps/wizard/installationpage.hpp
+++ b/apps/wizard/installationpage.hpp
@@ -5,18 +5,21 @@
 
 #include <QWizardPage>
 
-#include "inisettings.hpp"
 #include "ui_installationpage.h"
 #include "unshield/unshieldworker.hpp"
-#include <components/config/gamesettings.hpp>
+
+namespace Config
+{
+    class GameSettings;
+}
 
 class QThread;
+class QObject;
+class QWidget;
 
 namespace Wizard
 {
     class MainWizard;
-    class IniSettings;
-    class UnshieldWorker;
 
     class InstallationPage : public QWizardPage, private Ui::InstallationPage
     {
diff --git a/apps/wizard/languageselectionpage.cpp b/apps/wizard/languageselectionpage.cpp
index 60ab869c1d..9808d3c56c 100644
--- a/apps/wizard/languageselectionpage.cpp
+++ b/apps/wizard/languageselectionpage.cpp
@@ -2,8 +2,6 @@
 
 #include "mainwizard.hpp"
 
-#include <QDebug>
-
 Wizard::LanguageSelectionPage::LanguageSelectionPage(QWidget* parent)
     : QWizardPage(parent)
 {
diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp
index 7710f8bb5c..8de612f774 100644
--- a/apps/wizard/mainwizard.cpp
+++ b/apps/wizard/mainwizard.cpp
@@ -6,7 +6,6 @@
 #include <QMessageBox>
 #include <QTextCodec>
 
-#include <components/files/conversion.hpp>
 #include <components/files/qtconversion.hpp>
 
 #include "componentselectionpage.hpp"
diff --git a/apps/wizard/unshield/unshieldworker.hpp b/apps/wizard/unshield/unshieldworker.hpp
index f6bec7e744..0c97f47c03 100644
--- a/apps/wizard/unshield/unshieldworker.hpp
+++ b/apps/wizard/unshield/unshieldworker.hpp
@@ -10,8 +10,6 @@
 
 #include "../inisettings.hpp"
 
-#include <components/config/gamesettings.hpp>
-
 namespace Wizard
 {
     enum Component
diff --git a/apps/wizard/utils/componentlistwidget.cpp b/apps/wizard/utils/componentlistwidget.cpp
index 4124903b2d..83f21d1f6b 100644
--- a/apps/wizard/utils/componentlistwidget.cpp
+++ b/apps/wizard/utils/componentlistwidget.cpp
@@ -1,7 +1,5 @@
 #include "componentlistwidget.hpp"
 
-#include <QDebug>
-
 ComponentListWidget::ComponentListWidget(QWidget* parent)
     : QListWidget(parent)
 {
diff --git a/components/bsa/compressedbsafile.cpp b/components/bsa/compressedbsafile.cpp
index 8c1706ffe7..47026b55f0 100644
--- a/components/bsa/compressedbsafile.cpp
+++ b/components/bsa/compressedbsafile.cpp
@@ -27,7 +27,6 @@
 #include <cassert>
 #include <filesystem>
 #include <fstream>
-#include <stdexcept>
 
 #include <lz4frame.h>
 
diff --git a/components/esm/common.cpp b/components/esm/common.cpp
index 179e1f5c4e..cde084f039 100644
--- a/components/esm/common.cpp
+++ b/components/esm/common.cpp
@@ -1,4 +1,5 @@
-#include "sstream"
+#include <cstdint>
+#include <string>
 
 namespace ESM
 {
diff --git a/components/fx/lexer.cpp b/components/fx/lexer.cpp
index 5bb0de445f..d42ba46e9d 100644
--- a/components/fx/lexer.cpp
+++ b/components/fx/lexer.cpp
@@ -1,20 +1,14 @@
 #include "lexer.hpp"
 
-#include <array>
-#include <cmath>
-#include <cstdint>
-#include <exception>
+#include <cctype>
+#include <cstdlib>
 #include <optional>
 #include <string>
 #include <string_view>
-#include <variant>
 
+#include <components/fx/lexer_types.hpp>
 #include <components/misc/strings/format.hpp>
 
-#include <components/debug/debuglog.hpp>
-
-#include "types.hpp"
-
 namespace fx
 {
     namespace Lexer
diff --git a/components/fx/lexer.hpp b/components/fx/lexer.hpp
index 4b8c1ddbfd..01b3a3a56a 100644
--- a/components/fx/lexer.hpp
+++ b/components/fx/lexer.hpp
@@ -1,16 +1,11 @@
 #ifndef OPENMW_COMPONENTS_FX_LEXER_H
 #define OPENMW_COMPONENTS_FX_LEXER_H
 
-#include <cstdint>
+#include <cstddef>
 #include <optional>
 #include <stdexcept>
 #include <string>
 #include <string_view>
-#include <variant>
-
-#include <osg/Vec2f>
-#include <osg/Vec3f>
-#include <osg/Vec4f>
 
 #include "lexer_types.hpp"
 
diff --git a/components/fx/pass.hpp b/components/fx/pass.hpp
index 51e05ca6fe..509127a163 100644
--- a/components/fx/pass.hpp
+++ b/components/fx/pass.hpp
@@ -2,18 +2,21 @@
 #define OPENMW_COMPONENTS_FX_PASS_H
 
 #include <array>
-#include <cstdint>
 #include <optional>
 #include <string>
+#include <string_view>
 #include <unordered_set>
 
 #include <osg/BlendEquation>
 #include <osg/BlendFunc>
-#include <osg/Program>
 #include <osg/Shader>
-#include <osg/State>
-#include <osg/Texture2D>
-#include <osg/Timer>
+#include <osg/Vec4f>
+#include <osg/ref_ptr>
+
+namespace osg
+{
+    class StateSet;
+}
 
 namespace fx
 {
diff --git a/components/fx/technique.cpp b/components/fx/technique.cpp
index 2319eb4563..787f43a4f6 100644
--- a/components/fx/technique.cpp
+++ b/components/fx/technique.cpp
@@ -4,7 +4,6 @@
 #include <string>
 #include <utility>
 
-#include <osg/CullStack>
 #include <osg/Texture1D>
 #include <osg/Texture2D>
 #include <osg/Texture3D>
@@ -15,7 +14,6 @@
 #include <components/files/conversion.hpp>
 #include <components/misc/strings/algorithm.hpp>
 #include <components/resource/imagemanager.hpp>
-#include <components/sceneutil/util.hpp>
 #include <components/stereo/multiview.hpp>
 #include <components/vfs/manager.hpp>
 
diff --git a/components/fx/technique.hpp b/components/fx/technique.hpp
index a35f81ebd6..844e4b552a 100644
--- a/components/fx/technique.hpp
+++ b/components/fx/technique.hpp
@@ -5,20 +5,13 @@
 #include <memory>
 #include <string>
 #include <unordered_map>
-#include <variant>
 #include <vector>
 
 #include <osg/BlendEquation>
 #include <osg/BlendFunc>
 #include <osg/FrameBufferObject>
-#include <osg/Node>
-#include <osg/Program>
-#include <osg/Shader>
 #include <osg/StateSet>
 #include <osg/Texture2D>
-#include <osg/Vec2f>
-#include <osg/Vec3f>
-#include <osg/Vec4f>
 
 #include "lexer.hpp"
 #include "pass.hpp"
diff --git a/components/fx/widgets.hpp b/components/fx/widgets.hpp
index 751ad7f50f..f02b88f802 100644
--- a/components/fx/widgets.hpp
+++ b/components/fx/widgets.hpp
@@ -2,15 +2,24 @@
 #define OPENMW_COMPONENTS_FX_WIDGETS_H
 
 #include <MyGUI_Button.h>
-#include <MyGUI_Gui.h>
+#include <MyGUI_Delegate.h>
 #include <MyGUI_InputManager.h>
+#include <MyGUI_MouseButton.h>
+#include <MyGUI_RTTI.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_Widget.h>
+
+#include <algorithm>
+#include <components/fx/widgets.hpp>
+#include <components/misc/strings/format.hpp>
+#include <memory>
+#include <string>
+#include <vector>
 
 #include <osg/Vec2f>
 #include <osg/Vec3f>
 #include <osg/Vec4f>
 
-#include <components/misc/strings/format.hpp>
-
 #include "types.hpp"
 
 namespace Gui
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 15dc99701e..052608a6c6 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -1,7 +1,6 @@
 #include "niffile.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/files/conversion.hpp>
 #include <components/files/hash.hpp>
 
 #include <algorithm>
diff --git a/components/nif/node.cpp b/components/nif/node.cpp
index 66065aec32..6347de932e 100644
--- a/components/nif/node.cpp
+++ b/components/nif/node.cpp
@@ -1,6 +1,6 @@
 #include "node.hpp"
 
-#include <components/misc/algorithm.hpp>
+#include <components/misc/strings/algorithm.hpp>
 
 #include "data.hpp"
 #include "exception.hpp"
diff --git a/components/nif/physics.hpp b/components/nif/physics.hpp
index fac896b5ca..6ab1415fa5 100644
--- a/components/nif/physics.hpp
+++ b/components/nif/physics.hpp
@@ -17,7 +17,7 @@ namespace Nif
 {
 
     class NIFStream;
-    struct NIFFile;
+    class Reader;
 
     /// Non-record data types
 
diff --git a/components/nifosg/nifloader.hpp b/components/nifosg/nifloader.hpp
index 737c365c5e..21e0ae097c 100644
--- a/components/nifosg/nifloader.hpp
+++ b/components/nifosg/nifloader.hpp
@@ -2,12 +2,14 @@
 #define OPENMW_COMPONENTS_NIFOSG_LOADER
 
 #include <components/nif/niffile.hpp>
-#include <components/sceneutil/keyframe.hpp>
-#include <components/sceneutil/textkeymap.hpp>
 
-#include <osg/Referenced>
 #include <osg/ref_ptr>
 
+namespace SceneUtil
+{
+    class KeyframeHolder;
+}
+
 namespace osg
 {
     class Node;
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index db93147111..ac0040f9db 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -1,13 +1,10 @@
 #ifndef OPENMW_COMPONENTS_RESOURCE_SCENEMANAGER_H
 #define OPENMW_COMPONENTS_RESOURCE_SCENEMANAGER_H
 
-#include <map>
 #include <memory>
 #include <mutex>
 #include <string>
 
-#include <osg/Node>
-#include <osg/Texture2D>
 #include <osg/Texture>
 #include <osg/ref_ptr>
 
@@ -16,6 +13,20 @@
 #include <components/sceneutil/lightmanager.hpp>
 #include <filesystem>
 
+namespace VFS
+{
+    class Manager;
+}
+
+namespace osg
+{
+    class Group;
+    class Node;
+    class Program;
+    class State;
+    class Stats;
+}
+
 namespace Resource
 {
     class ImageManager;
@@ -28,11 +39,6 @@ namespace osgUtil
     class IncrementalCompileOperation;
 }
 
-namespace osgDB
-{
-    class SharedStateManager;
-}
-
 namespace Shader
 {
     class ShaderManager;
diff --git a/components/sceneutil/color.cpp b/components/sceneutil/color.cpp
index 825d7f65fd..5261409fbe 100644
--- a/components/sceneutil/color.cpp
+++ b/components/sceneutil/color.cpp
@@ -3,11 +3,6 @@
 #include <algorithm>
 #include <array>
 
-#include <SDL_opengl_glext.h>
-
-#include <components/debug/debuglog.hpp>
-#include <components/settings/settings.hpp>
-
 namespace SceneUtil
 {
 
diff --git a/components/sceneutil/extradata.hpp b/components/sceneutil/extradata.hpp
index cff94c3b06..4568a5289b 100644
--- a/components/sceneutil/extradata.hpp
+++ b/components/sceneutil/extradata.hpp
@@ -1,10 +1,7 @@
 #ifndef OPENMW_COMPONENTS_RESOURCE_EXTRADATA_H
 #define OPENMW_COMPONENTS_RESOURCE_EXTRADATA_H
 
-#include <array>
-
 #include <osg/NodeVisitor>
-#include <osg/StateAttribute>
 
 namespace Resource
 {
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 71eb06f0f8..ea7d3459ae 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -14,6 +14,7 @@
 
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/util.hpp>
+#include <components/shader/shadermanager.hpp>
 
 #include <components/misc/constants.hpp>
 #include <components/misc/hash.hpp>
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 133ce66750..93bddb800b 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -11,16 +11,9 @@
 #include <osg/NodeVisitor>
 #include <osg/observer_ptr>
 
-#include <components/shader/shadermanager.hpp>
-
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/settings/settings.hpp>
 
-namespace osgUtil
-{
-    class CullVisitor;
-}
-
 namespace SceneUtil
 {
     class LightBuffer;
diff --git a/components/sceneutil/rtt.cpp b/components/sceneutil/rtt.cpp
index be324543b1..c855784aa4 100644
--- a/components/sceneutil/rtt.cpp
+++ b/components/sceneutil/rtt.cpp
@@ -1,17 +1,13 @@
 #include "rtt.hpp"
 #include "util.hpp"
 
-#include <osg/Node>
-#include <osg/NodeVisitor>
 #include <osg/Texture2D>
 #include <osg/Texture2DArray>
 #include <osgUtil/CullVisitor>
 
-#include <components/debug/debuglog.hpp>
 #include <components/sceneutil/color.hpp>
 #include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/nodecallback.hpp>
-#include <components/settings/settings.hpp>
 #include <components/stereo/multiview.hpp>
 #include <components/stereo/stereomanager.hpp>
 
diff --git a/components/sceneutil/rtt.hpp b/components/sceneutil/rtt.hpp
index 8b4ca160f3..5c8183f6c0 100644
--- a/components/sceneutil/rtt.hpp
+++ b/components/sceneutil/rtt.hpp
@@ -10,7 +10,6 @@ namespace osg
 {
     class Texture2D;
     class Texture2DArray;
-    class Camera;
 }
 
 namespace osgUtil
@@ -20,8 +19,6 @@ namespace osgUtil
 
 namespace SceneUtil
 {
-    class CreateTextureViewsCallback;
-
     /// @brief Implements per-view RTT operations.
     /// @par With a naive RTT implementation, subsequent views of multiple views will overwrite the results of the
     /// previous views, leading to
diff --git a/components/sceneutil/unrefqueue.cpp b/components/sceneutil/unrefqueue.cpp
index 394f74c5b0..58bff4ac53 100644
--- a/components/sceneutil/unrefqueue.cpp
+++ b/components/sceneutil/unrefqueue.cpp
@@ -1,5 +1,7 @@
 #include "unrefqueue.hpp"
 
+#include <components/sceneutil/workqueue.hpp>
+
 namespace SceneUtil
 {
     namespace
diff --git a/components/sceneutil/unrefqueue.hpp b/components/sceneutil/unrefqueue.hpp
index 55b01f3a3d..dc89754ad3 100644
--- a/components/sceneutil/unrefqueue.hpp
+++ b/components/sceneutil/unrefqueue.hpp
@@ -1,8 +1,6 @@
 #ifndef OPENMW_COMPONENTS_UNREFQUEUE_H
 #define OPENMW_COMPONENTS_UNREFQUEUE_H
 
-#include "workqueue.hpp"
-
 #include <osg/Referenced>
 #include <osg/ref_ptr>
 
diff --git a/components/sceneutil/util.hpp b/components/sceneutil/util.hpp
index 76cb9a4e55..0a65a9980f 100644
--- a/components/sceneutil/util.hpp
+++ b/components/sceneutil/util.hpp
@@ -1,9 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SCENEUTIL_UTIL_H
 #define OPENMW_COMPONENTS_SCENEUTIL_UTIL_H
 
-#include <osg/BoundingSphere>
 #include <osg/Camera>
-#include <osg/Matrix>
+#include <osg/Matrixf>
 #include <osg/Texture2D>
 #include <osg/Vec4f>
 
diff --git a/components/sceneutil/workqueue.hpp b/components/sceneutil/workqueue.hpp
index 55689bb321..d167c4d7e4 100644
--- a/components/sceneutil/workqueue.hpp
+++ b/components/sceneutil/workqueue.hpp
@@ -6,9 +6,10 @@
 
 #include <atomic>
 #include <condition_variable>
+#include <deque>
 #include <mutex>
-#include <queue>
 #include <thread>
+#include <vector>
 
 namespace SceneUtil
 {
diff --git a/components/settings/settings.hpp b/components/settings/settings.hpp
index 3184c470c3..5ca5aee461 100644
--- a/components/settings/settings.hpp
+++ b/components/settings/settings.hpp
@@ -3,8 +3,6 @@
 
 #include "categories.hpp"
 
-#include <map>
-#include <set>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 7576a4df98..f79792bf2b 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -22,7 +22,6 @@
 #include <components/misc/osguservalues.hpp>
 #include <components/misc/strings/algorithm.hpp>
 #include <components/resource/imagemanager.hpp>
-#include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
 #include <components/sceneutil/riggeometry.hpp>
 #include <components/sceneutil/riggeometryosgaextension.hpp>
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index d23db34755..8b6fa4941c 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -1,11 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SHADERVISITOR_H
 #define OPENMW_COMPONENTS_SHADERVISITOR_H
 
-#include <array>
-
 #include <osg/NodeVisitor>
 #include <osg/Program>
-#include <osg/Texture2D>
 
 namespace Resource
 {
diff --git a/components/to_utf8/to_utf8.cpp b/components/to_utf8/to_utf8.cpp
index c4c35f9320..15fb8b26c0 100644
--- a/components/to_utf8/to_utf8.cpp
+++ b/components/to_utf8/to_utf8.cpp
@@ -2,8 +2,9 @@
 
 #include <algorithm>
 #include <cassert>
+#include <ios>
+#include <iterator>
 #include <stdexcept>
-#include <vector>
 
 #include <components/debug/debuglog.hpp>
 
diff --git a/components/to_utf8/to_utf8.hpp b/components/to_utf8/to_utf8.hpp
index 765663149b..df5462dbb9 100644
--- a/components/to_utf8/to_utf8.hpp
+++ b/components/to_utf8/to_utf8.hpp
@@ -4,7 +4,7 @@
 #include <cstring>
 #include <string>
 #include <string_view>
-#include <vector>
+#include <utility>
 
 namespace ToUTF8
 {
diff --git a/components/vfs/bsaarchive.cpp b/components/vfs/bsaarchive.cpp
index 81cab046f7..3de393c120 100644
--- a/components/vfs/bsaarchive.cpp
+++ b/components/vfs/bsaarchive.cpp
@@ -1,7 +1,6 @@
 #include "bsaarchive.hpp"
 
 #include <algorithm>
-#include <istream>
 #include <memory>
 
 namespace VFS
diff --git a/components/vfs/manager.cpp b/components/vfs/manager.cpp
index c74ec01ff8..c94a7593c0 100644
--- a/components/vfs/manager.cpp
+++ b/components/vfs/manager.cpp
@@ -1,10 +1,8 @@
 #include "manager.hpp"
 
 #include <algorithm>
-#include <istream>
 #include <stdexcept>
 
-#include <components/files/configurationmanager.hpp>
 #include <components/files/conversion.hpp>
 #include <components/misc/strings/lower.hpp>