diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 1d5fe8347e..4bc0b9a581 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -11,7 +11,6 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 
 namespace MWMechanics
 {
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 781b897a73..3f113802f8 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -3,7 +3,6 @@
 #include <iterator>
 #include <limits>
 
-#include <components/detournavigator/exceptions.hpp>
 #include <components/detournavigator/debug.hpp>
 #include <components/detournavigator/navigator.hpp>
 #include <components/debug/debuglog.hpp>
diff --git a/apps/openmw/mwmechanics/spellcasting.hpp b/apps/openmw/mwmechanics/spellcasting.hpp
index 45431bbc6a..cc525d2db6 100644
--- a/apps/openmw/mwmechanics/spellcasting.hpp
+++ b/apps/openmw/mwmechanics/spellcasting.hpp
@@ -2,7 +2,6 @@
 #define MWMECHANICS_SPELLCASTING_H
 
 #include <components/esm/effectlist.hpp>
-#include <components/esm/loadmgef.hpp>
 
 #include "../mwworld/ptr.hpp"
 
diff --git a/apps/openmw/mwmechanics/spelllist.cpp b/apps/openmw/mwmechanics/spelllist.cpp
index d8fbcf25a4..24a04788e1 100644
--- a/apps/openmw/mwmechanics/spelllist.cpp
+++ b/apps/openmw/mwmechanics/spelllist.cpp
@@ -3,7 +3,6 @@
 #include <algorithm>
 
 #include <components/esm/loadspel.hpp>
-#include <components/misc/rng.hpp>
 
 #include "spells.hpp"
 
diff --git a/apps/openmw/mwmechanics/spellpriority.cpp b/apps/openmw/mwmechanics/spellpriority.cpp
index 81658193d6..bd9c5f7cb3 100644
--- a/apps/openmw/mwmechanics/spellpriority.cpp
+++ b/apps/openmw/mwmechanics/spellpriority.cpp
@@ -17,7 +17,6 @@
 #include "creaturestats.hpp"
 #include "spellresistance.hpp"
 #include "weapontype.hpp"
-#include "combat.hpp"
 #include "summoning.hpp"
 #include "spellutil.hpp"
 
diff --git a/apps/openmw/mwmechanics/weaponpriority.cpp b/apps/openmw/mwmechanics/weaponpriority.cpp
index 13ce309277..8480dc208e 100644
--- a/apps/openmw/mwmechanics/weaponpriority.cpp
+++ b/apps/openmw/mwmechanics/weaponpriority.cpp
@@ -9,7 +9,6 @@
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
 
-#include "npcstats.hpp"
 #include "combat.hpp"
 #include "aicombataction.hpp"
 #include "spellpriority.hpp"
diff --git a/apps/openmw/mwmechanics/weapontype.hpp b/apps/openmw/mwmechanics/weapontype.hpp
index 056a1dbfd7..09fa73c065 100644
--- a/apps/openmw/mwmechanics/weapontype.hpp
+++ b/apps/openmw/mwmechanics/weapontype.hpp
@@ -3,8 +3,6 @@
 
 #include "../mwworld/inventorystore.hpp"
 
-#include "creaturestats.hpp"
-
 namespace MWMechanics
 {
     static std::map<int, ESM::WeaponType> sWeaponTypeList =
diff --git a/apps/openmw/mwphysics/actorconvexcallback.cpp b/apps/openmw/mwphysics/actorconvexcallback.cpp
index f99b706d74..cdd4322894 100644
--- a/apps/openmw/mwphysics/actorconvexcallback.cpp
+++ b/apps/openmw/mwphysics/actorconvexcallback.cpp
@@ -7,7 +7,6 @@
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <components/misc/convert.hpp>
 
-#include "collisiontype.hpp"
 #include "projectile.hpp"
 
 namespace MWPhysics
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index c5ba902fcd..7c9961f2a3 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -23,7 +23,6 @@
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/esm/loadgmst.hpp>
-#include <components/misc/constants.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/unrefqueue.hpp>
 #include <components/misc/convert.hpp>
@@ -56,7 +55,6 @@
 #include "closestnotmerayresultcallback.hpp"
 #include "contacttestresultcallback.hpp"
 #include "projectileconvexcallback.hpp"
-#include "constants.hpp"
 #include "movementsolver.hpp"
 #include "mtphysics.hpp"
 
diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index a931219975..252da0a687 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -5,10 +5,7 @@
 
 #include <LinearMath/btVector3.h>
 
-#include <components/debug/debuglog.hpp>
 #include <components/misc/convert.hpp>
-#include <components/resource/bulletshape.hpp>
-#include <components/sceneutil/positionattitudetransform.hpp>
 
 #include "../mwworld/class.hpp"
 
diff --git a/apps/openmw/mwphysics/projectile.hpp b/apps/openmw/mwphysics/projectile.hpp
index fb50eebde8..81c33d2a5e 100644
--- a/apps/openmw/mwphysics/projectile.hpp
+++ b/apps/openmw/mwphysics/projectile.hpp
@@ -6,8 +6,6 @@
 #include <mutex>
 #include <optional>
 
-#include "components/misc/convert.hpp"
-
 #include "ptrholder.hpp"
 
 class btCollisionObject;