diff --git a/apps/bulletobjecttool/main.cpp b/apps/bulletobjecttool/main.cpp
index 1167120695..28c5df452e 100644
--- a/apps/bulletobjecttool/main.cpp
+++ b/apps/bulletobjecttool/main.cpp
@@ -33,7 +33,6 @@
 #include <limits>
 #include <map>
 #include <memory>
-#include <osg/ref_ptr>
 #include <ostream>
 #include <string>
 #include <string_view>
diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index c4269670b2..b3891a647b 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -25,7 +25,6 @@
 #include <apps/opencs/model/world/refcollection.hpp>
 #include <apps/opencs/model/world/refidcollection.hpp>
 #include <apps/opencs/model/world/refiddata.hpp>
-#include <apps/opencs/model/world/subcellcollection.hpp>
 #include <apps/opencs/model/world/universalid.hpp>
 
 #include <components/esm/esmcommon.hpp>
@@ -39,7 +38,6 @@
 #include <components/misc/strings/lower.hpp>
 
 #include "../world/cellcoordinates.hpp"
-#include "../world/infocollection.hpp"
 
 #include "document.hpp"
 
diff --git a/apps/opencs/model/filter/valuenode.cpp b/apps/opencs/model/filter/valuenode.cpp
index fdedf7a17f..264967f240 100644
--- a/apps/opencs/model/filter/valuenode.cpp
+++ b/apps/opencs/model/filter/valuenode.cpp
@@ -4,7 +4,6 @@
 #include <stdexcept>
 #include <utility>
 
-#include "../world/columns.hpp"
 #include "../world/idtablebase.hpp"
 
 CSMFilter::ValueNode::ValueNode(int columnId, Type lowerType, Type upperType, double lower, double upper)
diff --git a/apps/opencs/model/tools/tools.cpp b/apps/opencs/model/tools/tools.cpp
index 46462b9c99..e1e7a0dcd8 100644
--- a/apps/opencs/model/tools/tools.cpp
+++ b/apps/opencs/model/tools/tools.cpp
@@ -7,11 +7,6 @@
 #include <vector>
 
 #include "../doc/document.hpp"
-#include "../doc/operation.hpp"
-#include "../doc/state.hpp"
-
-#include "../world/data.hpp"
-#include "../world/universalid.hpp"
 
 #include "birthsigncheck.hpp"
 #include "bodypartcheck.hpp"
diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp
index 4812ff7e9c..dff4426ba5 100644
--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@@ -23,10 +23,6 @@
 
 #include "../../model/doc/document.hpp"
 #include "../../model/doc/documentmanager.hpp"
-#include "../../model/doc/state.hpp"
-
-#include "../../model/world/columns.hpp"
-#include "../../model/world/idcompletionmanager.hpp"
 
 #include "../../model/prefs/state.hpp"
 
@@ -35,7 +31,6 @@
 #include "../world/idcompletiondelegate.hpp"
 #include "../world/idtypedelegate.hpp"
 #include "../world/recordstatusdelegate.hpp"
-#include "../world/util.hpp"
 #include "../world/vartypedelegate.hpp"
 
 #include "view.hpp"
diff --git a/apps/opencs/view/render/previewwidget.cpp b/apps/opencs/view/render/previewwidget.cpp
index 12a4cbb1a7..0f9064aaac 100644
--- a/apps/opencs/view/render/previewwidget.cpp
+++ b/apps/opencs/view/render/previewwidget.cpp
@@ -6,8 +6,6 @@
 #include <apps/opencs/view/render/object.hpp>
 #include <apps/opencs/view/render/scenewidget.hpp>
 
-#include <osg/ref_ptr>
-
 #include "../../model/world/data.hpp"
 #include "../../model/world/idtable.hpp"
 
diff --git a/apps/opencs/view/render/scenewidget.hpp b/apps/opencs/view/render/scenewidget.hpp
index a2200c780e..a6b0521783 100644
--- a/apps/opencs/view/render/scenewidget.hpp
+++ b/apps/opencs/view/render/scenewidget.hpp
@@ -9,7 +9,6 @@
 #include <QTimer>
 #include <QWidget>
 
-#include <osg/Timer>
 #include <osg/Vec4f>
 #include <osg/ref_ptr>
 
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index 3c4a1e5570..6e1a216816 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -13,7 +13,6 @@
 
 #include <osg/Camera>
 #include <osg/Vec3f>
-#include <osg/ref_ptr>
 
 #include <apps/opencs/model/doc/document.hpp>
 #include <apps/opencs/model/prefs/category.hpp>
diff --git a/apps/opencs/view/render/terraintexturemode.cpp b/apps/opencs/view/render/terraintexturemode.cpp
index 7e1e65674d..407f058a15 100644
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@@ -14,7 +14,6 @@
 
 #include <osg/Vec2f>
 #include <osg/Vec3d>
-#include <osg/ref_ptr>
 
 #include <apps/opencs/model/prefs/category.hpp>
 #include <apps/opencs/model/prefs/setting.hpp>
@@ -41,7 +40,6 @@
 #include "../../model/world/landtexture.hpp"
 #include "../../model/world/tablemimedata.hpp"
 #include "../../model/world/universalid.hpp"
-#include "../widget/brushshapes.hpp"
 
 #include "brushdraw.hpp"
 #include "editmode.hpp"
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index c9ac27b177..fee608b200 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -28,7 +28,6 @@
 #include "../widget/scenetooltoggle2.hpp"
 
 #include "cameracontroller.hpp"
-#include "mask.hpp"
 
 namespace CSVRender
 {
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 3999925bd1..691939efb7 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -50,7 +50,6 @@
 
 #include "cameracontroller.hpp"
 #include "instancemode.hpp"
-#include "mask.hpp"
 #include "object.hpp"
 #include "pathgridmode.hpp"
 
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index d6933a5443..71bb85c798 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -12,8 +12,6 @@
 
 #include <components/misc/rng.hpp>
 
-#include <osg/Timer>
-
 #include "../mwworld/doorstate.hpp"
 #include "../mwworld/globalvariablename.hpp"
 #include "../mwworld/ptr.hpp"
diff --git a/apps/openmw/mwmechanics/stat.cpp b/apps/openmw/mwmechanics/stat.cpp
index d96d2cac39..b603fc220f 100644
--- a/apps/openmw/mwmechanics/stat.cpp
+++ b/apps/openmw/mwmechanics/stat.cpp
@@ -1,5 +1,7 @@
 #include "stat.hpp"
 
+#include <algorithm>
+
 #include <components/esm3/statstate.hpp>
 
 namespace MWMechanics
diff --git a/apps/openmw/mwmechanics/stat.hpp b/apps/openmw/mwmechanics/stat.hpp
index f4f28685b0..21cdad21a9 100644
--- a/apps/openmw/mwmechanics/stat.hpp
+++ b/apps/openmw/mwmechanics/stat.hpp
@@ -1,9 +1,6 @@
 #ifndef GAME_MWMECHANICS_STAT_H
 #define GAME_MWMECHANICS_STAT_H
 
-#include <algorithm>
-#include <limits>
-
 namespace ESM
 {
     template <typename T>
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index a236a7ed45..c8e9ba5bd8 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -1,6 +1,7 @@
 #ifndef GAME_MWWORLD_WORLDIMP_H
 #define GAME_MWWORLD_WORLDIMP_H
 
+#include <osg/Timer>
 #include <osg/ref_ptr>
 
 #include <components/detournavigator/collisionshapetype.hpp>
diff --git a/components/esm4/lighting.hpp b/components/esm4/lighting.hpp
index 8883c71643..d4f0d0ffea 100644
--- a/components/esm4/lighting.hpp
+++ b/components/esm4/lighting.hpp
@@ -28,7 +28,6 @@
 #define ESM4_LIGHTING_H
 
 #include <cstdint>
-#include <limits>
 
 namespace ESM4
 {
diff --git a/components/esm4/loadgrup.hpp b/components/esm4/loadgrup.hpp
index 3ad4f12aa9..7cc5abfff4 100644
--- a/components/esm4/loadgrup.hpp
+++ b/components/esm4/loadgrup.hpp
@@ -30,8 +30,6 @@
 #include <cstdint>
 #include <vector>
 
-#include "common.hpp" // GroupLabel
-
 namespace ESM4
 {
     // http://www.uesp.net/wiki/Tes4Mod:Mod_File_Format#Hierarchical_Top_Groups
diff --git a/components/misc/thread.hpp b/components/misc/thread.hpp
index 191c43bba1..a95a3a8b4c 100644
--- a/components/misc/thread.hpp
+++ b/components/misc/thread.hpp
@@ -1,8 +1,6 @@
 #ifndef OPENMW_COMPONENTS_MISC_THREAD_H
 #define OPENMW_COMPONENTS_MISC_THREAD_H
 
-#include <thread>
-
 namespace Misc
 {
     void setCurrentThreadIdlePriority();
diff --git a/components/platform/platform.cpp b/components/platform/platform.cpp
index 08a7d5d2f2..787cfa522e 100644
--- a/components/platform/platform.cpp
+++ b/components/platform/platform.cpp
@@ -1,13 +1,12 @@
 #include "platform.hpp"
 
-#include <stdio.h>
-
 namespace Platform
 {
 
     static void increaseFileHandleLimit()
     {
 #ifdef WIN32
+#include <stdio.h>
         // Increase limit for open files at the stream I/O level, see
         // https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/setmaxstdio?view=msvc-170#remarks
         _setmaxstdio(8192);
diff --git a/components/resource/niffilemanager.hpp b/components/resource/niffilemanager.hpp
index 1dca680ed4..5aef3f3016 100644
--- a/components/resource/niffilemanager.hpp
+++ b/components/resource/niffilemanager.hpp
@@ -1,8 +1,6 @@
 #ifndef OPENMW_COMPONENTS_RESOURCE_NIFFILEMANAGER_H
 #define OPENMW_COMPONENTS_RESOURCE_NIFFILEMANAGER_H
 
-#include <osg/ref_ptr>
-
 #include <components/nif/niffile.hpp>
 
 #include "resourcemanager.hpp"
diff --git a/components/sceneutil/lightcommon.hpp b/components/sceneutil/lightcommon.hpp
index ed86427372..5d9d5967cd 100644
--- a/components/sceneutil/lightcommon.hpp
+++ b/components/sceneutil/lightcommon.hpp
@@ -1,8 +1,5 @@
-
 #ifndef COMPONENTS_SCENEUTIL_LIGHTCOMMON
 #define COMPONENTS_SCENEUTIL_LIGHTCOMMON
-#include <string_view>
-#include <variant>
 
 #include <osg/Vec4>
 
diff --git a/components/sdlutil/sdlinputwrapper.hpp b/components/sdlutil/sdlinputwrapper.hpp
index abdc5b05fc..85272e626c 100644
--- a/components/sdlutil/sdlinputwrapper.hpp
+++ b/components/sdlutil/sdlinputwrapper.hpp
@@ -1,8 +1,6 @@
 #ifndef OPENMW_COMPONENTS_SDLUTIL_SDLINPUTWRAPPER_H
 #define OPENMW_COMPONENTS_SDLUTIL_SDLINPUTWRAPPER_H
 
-#include <map>
-
 #include <osg/ref_ptr>
 
 #include <SDL_events.h>
diff --git a/components/sqlite3/types.hpp b/components/sqlite3/types.hpp
index 325e9e6608..e55d85f41c 100644
--- a/components/sqlite3/types.hpp
+++ b/components/sqlite3/types.hpp
@@ -1,8 +1,6 @@
 #ifndef OPENMW_COMPONENTS_SQLITE3_TYPES_H
 #define OPENMW_COMPONENTS_SQLITE3_TYPES_H
 
-#include <cstddef>
-
 namespace Sqlite3
 {
     struct ConstBlob
diff --git a/components/terrain/heightcull.hpp b/components/terrain/heightcull.hpp
index 24222078a6..e192340db5 100644
--- a/components/terrain/heightcull.hpp
+++ b/components/terrain/heightcull.hpp
@@ -2,7 +2,6 @@
 #define COMPONENTS_TERRAIN_HEIGHTCULL_H
 
 #include <osg/Referenced>
-#include <osg/ref_ptr>
 
 #include <limits>