diff --git a/apps/openmw/mwmechanics/aiavoiddoor.hpp b/apps/openmw/mwmechanics/aiavoiddoor.hpp
index 1781c5e4a..183f429f3 100644
--- a/apps/openmw/mwmechanics/aiavoiddoor.hpp
+++ b/apps/openmw/mwmechanics/aiavoiddoor.hpp
@@ -3,10 +3,6 @@
 
 #include "typedaipackage.hpp"
 
-#include <string>
-
-#include <components/esm/defs.hpp>
-
 #include "../mwworld/class.hpp"
 
 #include "pathfinding.hpp"
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index 81b09c8b9..5ad73c2da 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -3,7 +3,6 @@
 
 #include <memory>
 
-#include <components/esm/defs.hpp>
 #include <components/detournavigator/areatype.hpp>
 
 #include "pathfinding.hpp"
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 575a03434..fada7761d 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -5,8 +5,6 @@
 #include <components/debug/debuglog.hpp>
 #include <components/esm/aisequence.hpp>
 
-#include "../mwbase/world.hpp"
-
 #include "aipackage.hpp"
 #include "aistate.hpp"
 #include "aiwander.hpp"
diff --git a/apps/openmw/mwmechanics/spelllist.hpp b/apps/openmw/mwmechanics/spelllist.hpp
index c95ee812b..5920949d6 100644
--- a/apps/openmw/mwmechanics/spelllist.hpp
+++ b/apps/openmw/mwmechanics/spelllist.hpp
@@ -9,8 +9,6 @@
 
 #include <components/esm/loadspel.hpp>
 
-#include "magiceffects.hpp"
-
 namespace ESM
 {
     struct SpellState;
diff --git a/apps/openmw/mwmechanics/spells.hpp b/apps/openmw/mwmechanics/spells.hpp
index 055339795..9737b72cd 100644
--- a/apps/openmw/mwmechanics/spells.hpp
+++ b/apps/openmw/mwmechanics/spells.hpp
@@ -4,7 +4,6 @@
 #include <memory>
 #include <map>
 #include <string>
-#include <set>
 #include <vector>
 
 #include "../mwworld/timestamp.hpp"
diff --git a/apps/openmw/mwmechanics/weaponpriority.hpp b/apps/openmw/mwmechanics/weaponpriority.hpp
index 67de7b50f..9dcef3e2e 100644
--- a/apps/openmw/mwmechanics/weaponpriority.hpp
+++ b/apps/openmw/mwmechanics/weaponpriority.hpp
@@ -1,8 +1,6 @@
 #ifndef OPENMW_WEAPON_PRIORITY_H
 #define OPENMW_WEAPON_PRIORITY_H
 
-#include <components/esm/loadweap.hpp>
-
 #include "../mwworld/ptr.hpp"
 
 namespace MWMechanics