From 3032b177a16e513446b77ff14a37c320b4d8cef5 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 22 Feb 2019 23:16:47 +0400
Subject: [PATCH] Remove redundant includes

---
 apps/openmw/engine.cpp                          |  1 -
 apps/openmw/mwclass/activator.cpp               |  1 -
 apps/openmw/mwclass/actor.cpp                   |  1 -
 apps/openmw/mwclass/apparatus.cpp               |  2 --
 apps/openmw/mwclass/armor.cpp                   |  1 -
 apps/openmw/mwclass/clothing.cpp                |  1 -
 apps/openmw/mwclass/container.cpp               |  1 -
 apps/openmw/mwclass/door.cpp                    |  2 --
 apps/openmw/mwclass/ingredient.cpp              |  1 -
 apps/openmw/mwclass/light.cpp                   |  4 ----
 apps/openmw/mwclass/lockpick.cpp                |  2 --
 apps/openmw/mwclass/misc.cpp                    |  1 -
 apps/openmw/mwclass/potion.cpp                  |  2 --
 apps/openmw/mwclass/probe.cpp                   |  2 --
 apps/openmw/mwclass/repair.cpp                  |  3 ---
 apps/openmw/mwclass/weapon.cpp                  |  1 -
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp   |  3 ---
 apps/openmw/mwdialogue/scripttest.cpp           |  1 -
 apps/openmw/mwdialogue/selectwrapper.cpp        |  3 ---
 apps/openmw/mwgui/container.cpp                 |  2 --
 apps/openmw/mwgui/containeritemmodel.cpp        |  2 --
 apps/openmw/mwgui/formatting.cpp                |  2 --
 apps/openmw/mwgui/hud.cpp                       |  1 -
 apps/openmw/mwgui/itemmodel.cpp                 |  4 ----
 apps/openmw/mwgui/journalbooks.cpp              |  2 --
 apps/openmw/mwgui/journalwindow.cpp             |  1 -
 apps/openmw/mwgui/levelupdialog.cpp             |  1 -
 apps/openmw/mwgui/timeadvancer.cpp              |  3 ---
 apps/openmw/mwgui/windowbase.cpp                |  2 --
 apps/openmw/mwgui/windowmanagerimp.cpp          |  5 -----
 apps/openmw/mwmechanics/aiactivate.cpp          |  1 -
 apps/openmw/mwmechanics/aicast.cpp              |  1 -
 apps/openmw/mwmechanics/aicombat.cpp            |  3 ---
 apps/openmw/mwmechanics/aiescort.cpp            |  1 -
 apps/openmw/mwmechanics/aipackage.cpp           |  2 --
 apps/openmw/mwmechanics/aipursue.cpp            |  1 -
 apps/openmw/mwmechanics/aisequence.cpp          |  1 -
 apps/openmw/mwmechanics/aitravel.cpp            |  2 --
 apps/openmw/mwmechanics/alchemy.cpp             |  1 -
 apps/openmw/mwmechanics/magiceffects.cpp        |  2 --
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp |  1 -
 apps/openmw/mwmechanics/npcstats.cpp            |  1 -
 apps/openmw/mwmechanics/obstacle.cpp            |  2 --
 apps/openmw/mwmechanics/repair.cpp              |  1 -
 apps/openmw/mwmechanics/security.cpp            |  1 -
 apps/openmw/mwmechanics/spellcasting.cpp        |  1 -
 apps/openmw/mwmechanics/spellpriority.cpp       |  2 --
 apps/openmw/mwmechanics/spells.cpp              |  2 --
 apps/openmw/mwmechanics/weaponpriority.cpp      |  1 -
 apps/openmw/mwphysics/object.cpp                |  2 --
 apps/openmw/mwphysics/physicssystem.cpp         | 17 -----------------
 apps/openmw/mwphysics/trace.cpp                 |  2 --
 apps/openmw/mwrender/npcanimation.cpp           |  1 -
 apps/openmw/mwrender/objects.hpp                |  1 -
 apps/openmw/mwrender/pathgrid.cpp               |  2 --
 apps/openmw/mwrender/pathgrid.hpp               |  1 -
 apps/openmw/mwrender/renderingmanager.cpp       |  1 -
 apps/openmw/mwrender/renderingmanager.hpp       |  1 +
 apps/openmw/mwrender/sky.hpp                    |  1 -
 apps/openmw/mwscript/animationextensions.cpp    |  1 -
 apps/openmw/mwscript/cellextensions.cpp         |  1 -
 apps/openmw/mwscript/consoleextensions.cpp      |  5 -----
 apps/openmw/mwscript/containerextensions.cpp    |  4 +---
 apps/openmw/mwscript/globalscripts.cpp          |  2 --
 apps/openmw/mwscript/guiextensions.cpp          |  1 -
 apps/openmw/mwscript/interpretercontext.cpp     |  3 +--
 apps/openmw/mwscript/interpretercontext.hpp     |  1 -
 apps/openmw/mwscript/locals.cpp                 |  2 --
 apps/openmw/mwscript/miscextensions.cpp         |  1 -
 apps/openmw/mwscript/skyextensions.cpp          |  1 -
 apps/openmw/mwscript/soundextensions.cpp        |  3 +--
 apps/openmw/mwscript/statsextensions.cpp        |  2 --
 .../mwscript/transformationextensions.cpp       |  2 --
 apps/openmw/mwsound/movieaudiofactory.cpp       |  2 --
 apps/openmw/mwsound/openal_output.cpp           |  1 -
 apps/openmw/mwstate/character.cpp               |  1 +
 apps/openmw/mwstate/charactermanager.cpp        |  3 ++-
 apps/openmw/mwstate/statemanagerimp.cpp         |  1 -
 apps/openmw/mwworld/actionrepair.cpp            |  1 -
 apps/openmw/mwworld/cellpreloader.cpp           |  2 --
 apps/openmw/mwworld/cells.cpp                   |  1 -
 apps/openmw/mwworld/class.cpp                   |  1 -
 apps/openmw/mwworld/contentloader.hpp           |  1 -
 apps/openmw/mwworld/inventorystore.cpp          |  3 ---
 apps/openmw/mwworld/player.cpp                  |  1 -
 apps/openmw/mwworld/projectilemanager.cpp       |  1 -
 apps/openmw/mwworld/scene.cpp                   |  1 -
 apps/openmw/mwworld/weather.cpp                 |  1 -
 apps/openmw/mwworld/worldimp.cpp                |  2 --
 components/compiler/locals.cpp                  |  1 -
 components/compiler/parser.cpp                  |  4 ----
 components/compiler/scanner.cpp                 |  1 -
 components/contentselector/view/combobox.cpp    |  3 ---
 .../contentselector/view/contentselector.cpp    |  3 ---
 .../detournavigator/asyncnavmeshupdater.cpp     |  2 --
 components/detournavigator/makenavmesh.cpp      |  1 -
 components/detournavigator/navmeshmanager.cpp   |  5 -----
 .../detournavigator/navmeshtilescache.cpp       |  2 --
 .../detournavigator/recastmeshmanager.cpp       |  1 -
 components/detournavigator/recastmeshobject.cpp |  1 -
 components/detournavigator/settings.cpp         |  2 --
 components/esm/aisequence.cpp                   |  2 --
 components/esm/esmreader.hpp                    |  3 +--
 components/esm/loadskil.cpp                     |  2 --
 components/esmterrain/storage.cpp               |  1 -
 components/fontloader/fontloader.cpp            |  1 -
 components/interpreter/miscopcodes.hpp          |  1 -
 components/misc/stringops.hpp                   |  1 -
 components/myguiplatform/myguirendermanager.cpp |  2 --
 components/myguiplatform/myguitexture.cpp       |  1 -
 components/nifbullet/bulletnifloader.cpp        |  5 -----
 components/nifosg/nifloader.cpp                 |  1 -
 components/nifosg/particle.cpp                  |  1 -
 components/process/processinvoker.cpp           |  2 --
 components/resource/bulletshape.cpp             |  1 -
 components/sceneutil/agentpath.cpp              |  1 -
 components/sceneutil/attach.cpp                 |  1 -
 components/sceneutil/clone.cpp                  |  2 --
 components/sceneutil/optimizer.cpp              |  2 --
 components/sceneutil/pathgridutil.cpp           |  1 -
 .../sceneutil/positionattitudetransform.cpp     |  2 --
 components/sceneutil/riggeometry.cpp            |  3 ---
 components/sdlutil/sdlcursormanager.cpp         |  1 -
 components/shader/shadermanager.cpp             |  1 -
 components/shader/shadervisitor.cpp             |  2 --
 components/terrain/material.cpp                 |  3 ---
 components/to_utf8/to_utf8.cpp                  |  1 -
 components/vfs/manager.cpp                      |  1 -
 components/widgets/list.cpp                     |  1 -
 129 files changed, 8 insertions(+), 230 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index cb106c711c..16c945e2f9 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -37,7 +37,6 @@
 #include "mwgui/windowmanagerimp.hpp"
 
 #include "mwscript/scriptmanagerimp.hpp"
-#include "mwscript/extensions.hpp"
 #include "mwscript/interpretercontext.hpp"
 
 #include "mwsound/soundmanagerimp.hpp"
diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 42ea99b007..ab38515c27 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -5,7 +5,6 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/world.hpp"
 
 #include "../mwworld/cellstore.hpp"
diff --git a/apps/openmw/mwclass/actor.cpp b/apps/openmw/mwclass/actor.cpp
index 73a4d37d76..aa356f62d1 100644
--- a/apps/openmw/mwclass/actor.cpp
+++ b/apps/openmw/mwclass/actor.cpp
@@ -4,7 +4,6 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index e151e39c5a..5e7c1b9333 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -3,11 +3,9 @@
 #include <components/esm/loadappa.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionalchemy.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwphysics/physicssystem.hpp"
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 0a4958eb99..7ab1d49fed 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -9,7 +9,6 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 21c0d89c22..7e3e77d586 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -7,7 +7,6 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index e1784d5937..47dfa27b36 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -6,7 +6,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index a261180298..78aadb05ba 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -7,10 +7,8 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/nullaction.hpp"
 #include "../mwworld/failedaction.hpp"
 #include "../mwworld/actionteleport.hpp"
 #include "../mwworld/actiondoor.hpp"
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 70339564c6..84117f59d4 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -7,7 +7,6 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwphysics/physicssystem.hpp"
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index ea0abd6f64..38b7137f35 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -5,20 +5,16 @@
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/nullaction.hpp"
 #include "../mwworld/failedaction.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwphysics/physicssystem.hpp"
-#include "../mwworld/customdata.hpp"
 
 #include "../mwgui/tooltips.hpp"
 
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index 5673465a0b..013808bb28 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -4,11 +4,9 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 40ec2b34b7..51b641d4d5 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -7,7 +7,6 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwphysics/physicssystem.hpp"
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 39b1cc6c2e..4e95c62943 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -7,11 +7,9 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionapply.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
-#include "../mwworld/containerstore.hpp"
 #include "../mwphysics/physicssystem.hpp"
 #include "../mwworld/nullaction.hpp"
 
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 734b6b1fd0..b53e2418ae 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -4,11 +4,9 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 7cd7ef10d4..922858623c 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -3,14 +3,11 @@
 #include <components/esm/loadrepa.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwphysics/physicssystem.hpp"
-#include "../mwworld/nullaction.hpp"
 #include "../mwworld/actionrepair.hpp"
 
 #include "../mwgui/tooltips.hpp"
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 508cf47ae2..dd6d631663 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -10,7 +10,6 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 17f69d69b7..1ada7b9494 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -1,9 +1,6 @@
 #include "dialoguemanagerimp.hpp"
 
-#include <cctype>
-#include <cstdlib>
 #include <algorithm>
-#include <iterator>
 #include <list>
 
 #include <components/debug/debuglog.hpp>
diff --git a/apps/openmw/mwdialogue/scripttest.cpp b/apps/openmw/mwdialogue/scripttest.cpp
index 4f0b7422c7..791a4da7eb 100644
--- a/apps/openmw/mwdialogue/scripttest.cpp
+++ b/apps/openmw/mwdialogue/scripttest.cpp
@@ -15,7 +15,6 @@
 #include <components/compiler/streamerrorhandler.hpp>
 #include <components/compiler/scanner.hpp>
 #include <components/compiler/locals.hpp>
-#include <components/compiler/output.hpp>
 #include <components/compiler/scriptparser.hpp>
 
 #include "filter.hpp"
diff --git a/apps/openmw/mwdialogue/selectwrapper.cpp b/apps/openmw/mwdialogue/selectwrapper.cpp
index 793963e48f..28dbd214ba 100644
--- a/apps/openmw/mwdialogue/selectwrapper.cpp
+++ b/apps/openmw/mwdialogue/selectwrapper.cpp
@@ -1,9 +1,6 @@
 #include "selectwrapper.hpp"
 
-#include <cctype>
-
 #include <stdexcept>
-#include <algorithm>
 #include <sstream>
 #include <iterator>
 
diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index 51c0603ca3..f89cd4ff32 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -6,7 +6,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwworld/class.hpp"
@@ -18,7 +17,6 @@
 #include "inventorywindow.hpp"
 
 #include "itemview.hpp"
-#include "itemwidget.hpp"
 #include "inventoryitemmodel.hpp"
 #include "containeritemmodel.hpp"
 #include "sortfilteritemmodel.hpp"
diff --git a/apps/openmw/mwgui/containeritemmodel.cpp b/apps/openmw/mwgui/containeritemmodel.cpp
index 24e7f8d004..d34f15a0a4 100644
--- a/apps/openmw/mwgui/containeritemmodel.cpp
+++ b/apps/openmw/mwgui/containeritemmodel.cpp
@@ -13,8 +13,6 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwmechanics/actorutil.hpp"
-
 namespace
 {
 
diff --git a/apps/openmw/mwgui/formatting.cpp b/apps/openmw/mwgui/formatting.cpp
index 78359608ec..d4d6a0af56 100644
--- a/apps/openmw/mwgui/formatting.cpp
+++ b/apps/openmw/mwgui/formatting.cpp
@@ -4,14 +4,12 @@
 #include <MyGUI_Gui.h>
 #include <MyGUI_EditBox.h>
 #include <MyGUI_ImageBox.h>
-#include <MyGUI_FontManager.h>
 
 // correctBookartPath
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include <boost/algorithm/string/replace.hpp>
-#include <boost/algorithm/string/predicate.hpp>
 
 #include <components/debug/debuglog.hpp>
 #include <components/interpreter/defines.hpp>
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 54476c48e3..de66295157 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -25,7 +25,6 @@
 #include "itemmodel.hpp"
 #include "draganddrop.hpp"
 
-#include "itemmodel.hpp"
 #include "itemwidget.hpp"
 
 namespace MWGui
diff --git a/apps/openmw/mwgui/itemmodel.cpp b/apps/openmw/mwgui/itemmodel.cpp
index c7c10e8e4b..08c5bff359 100644
--- a/apps/openmw/mwgui/itemmodel.cpp
+++ b/apps/openmw/mwgui/itemmodel.cpp
@@ -1,13 +1,9 @@
 #include "itemmodel.hpp"
 
-#include <set>
-
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
-#include "../mwworld/store.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
diff --git a/apps/openmw/mwgui/journalbooks.cpp b/apps/openmw/mwgui/journalbooks.cpp
index 4302740f67..065a503e69 100644
--- a/apps/openmw/mwgui/journalbooks.cpp
+++ b/apps/openmw/mwgui/journalbooks.cpp
@@ -1,7 +1,5 @@
 #include "journalbooks.hpp"
 
-#include <MyGUI_LanguageManager.h>
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 
diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp
index f45d73ca92..095d74e8a6 100644
--- a/apps/openmw/mwgui/journalwindow.cpp
+++ b/apps/openmw/mwgui/journalwindow.cpp
@@ -1,6 +1,5 @@
 #include "journalwindow.hpp"
 
-#include <sstream>
 #include <set>
 #include <stack>
 #include <string>
diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index 286405f797..415c8e31c9 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -12,7 +12,6 @@
 #include "../mwbase/soundmanager.hpp"
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/esmstore.hpp"
 #include "../mwworld/cellstore.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
diff --git a/apps/openmw/mwgui/timeadvancer.cpp b/apps/openmw/mwgui/timeadvancer.cpp
index 43504ce870..a07da16825 100644
--- a/apps/openmw/mwgui/timeadvancer.cpp
+++ b/apps/openmw/mwgui/timeadvancer.cpp
@@ -1,8 +1,5 @@
 #include "timeadvancer.hpp"
 
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-
 namespace MWGui
 {
     TimeAdvancer::TimeAdvancer(float delay)
diff --git a/apps/openmw/mwgui/windowbase.cpp b/apps/openmw/mwgui/windowbase.cpp
index 86c780325a..727493892e 100644
--- a/apps/openmw/mwgui/windowbase.cpp
+++ b/apps/openmw/mwgui/windowbase.cpp
@@ -3,8 +3,6 @@
 #include <MyGUI_InputManager.h>
 #include <MyGUI_RenderManager.h>
 
-#include <components/settings/settings.hpp>
-
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 7e4ba09982..b3b8eec75f 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1,13 +1,11 @@
 #include "windowmanagerimp.hpp"
 
 #include <cassert>
-#include <iterator>
 
 #include <osgViewer/Viewer>
 
 #include <MyGUI_UString.h>
 #include <MyGUI_IPointer.h>
-#include <MyGUI_ResourceImageSetPointer.h>
 #include <MyGUI_TextureUtility.h>
 #include <MyGUI_FactoryManager.h>
 #include <MyGUI_LanguageManager.h>
@@ -38,7 +36,6 @@
 #include <components/translation/translation.hpp>
 
 #include <components/myguiplatform/myguiplatform.hpp>
-#include <components/myguiplatform/myguidatamanager.hpp>
 #include <components/myguiplatform/myguirendermanager.hpp>
 #include <components/myguiplatform/additivelayer.hpp>
 #include <components/myguiplatform/scalinglayer.hpp>
@@ -47,8 +44,6 @@
 
 #include <components/widgets/tags.hpp>
 
-#include <components/sdlutil/sdlcursormanager.hpp>
-
 #include <components/misc/resourcehelpers.hpp>
 
 #include "../mwbase/inputmanager.hpp"
diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index c4a8417dbb..e222c82bc0 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -8,7 +8,6 @@
 #include "../mwworld/class.hpp"
 
 #include "creaturestats.hpp"
-#include "steering.hpp"
 #include "movement.hpp"
 
 namespace MWMechanics
diff --git a/apps/openmw/mwmechanics/aicast.cpp b/apps/openmw/mwmechanics/aicast.cpp
index e448313bf8..b7c9bac3ba 100644
--- a/apps/openmw/mwmechanics/aicast.cpp
+++ b/apps/openmw/mwmechanics/aicast.cpp
@@ -8,7 +8,6 @@
 
 #include "aicombataction.hpp"
 #include "creaturestats.hpp"
-#include "spellcasting.hpp"
 #include "steering.hpp"
 
 MWMechanics::AiCast::AiCast(const std::string& targetId, const std::string& spellId, bool manualSpell)
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 245e95e488..32b3f9f2b5 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -15,15 +15,12 @@
 #include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
-#include "../mwrender/animation.hpp"
-
 #include "pathgrid.hpp"
 #include "creaturestats.hpp"
 #include "steering.hpp"
 #include "movement.hpp"
 #include "character.hpp"
 #include "aicombataction.hpp"
-#include "combat.hpp"
 #include "coordinateconverter.hpp"
 #include "actorutil.hpp"
 
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index 3d018d780c..03951d2798 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -11,7 +11,6 @@
 #include "../mwworld/cellstore.hpp"
 
 #include "creaturestats.hpp"
-#include "steering.hpp"
 #include "movement.hpp"
 
 /*
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 4646875fda..91449498da 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -1,7 +1,5 @@
 #include "aipackage.hpp"
 
-#include <cmath>
-
 #include <components/esm/loadcell.hpp>
 #include <components/esm/loadland.hpp>
 #include <components/esm/loadmgef.hpp>
diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index 4dd644e6b6..925f3adaa1 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -1,7 +1,6 @@
 #include "aipursue.hpp"
 
 #include <components/esm/aisequence.hpp>
-#include <components/esm/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index cf572abc0f..e337c63492 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -5,7 +5,6 @@
 #include <components/debug/debuglog.hpp>
 #include <components/esm/aisequence.hpp>
 
-#include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
 #include "aipackage.hpp"
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index d870298095..a2876da4fc 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -1,7 +1,6 @@
 #include "aitravel.hpp"
 
 #include <components/esm/aisequence.hpp>
-#include <components/esm/loadcell.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -10,7 +9,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
 
-#include "steering.hpp"
 #include "movement.hpp"
 #include "creaturestats.hpp"
 
diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
index facac4291f..87ee47b49a 100644
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -1,7 +1,6 @@
 #include "alchemy.hpp"
 
 #include <cassert>
-#include <cstdlib>
 #include <cmath>
 
 #include <algorithm>
diff --git a/apps/openmw/mwmechanics/magiceffects.cpp b/apps/openmw/mwmechanics/magiceffects.cpp
index 021691d6a9..1a1a44f638 100644
--- a/apps/openmw/mwmechanics/magiceffects.cpp
+++ b/apps/openmw/mwmechanics/magiceffects.cpp
@@ -1,7 +1,5 @@
 #include "magiceffects.hpp"
 
-#include <cstdlib>
-
 #include <stdexcept>
 
 #include <components/esm/effectlist.hpp>
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index b909d7df1e..eead405379 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -21,7 +21,6 @@
 
 #include "aicombat.hpp"
 #include "aipursue.hpp"
-#include "aitravel.hpp"
 #include "spellcasting.hpp"
 #include "autocalcspell.hpp"
 #include "npcstats.hpp"
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index bdd4e69688..70c2004f02 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -9,7 +9,6 @@
 #include <components/esm/loadfact.hpp>
 #include <components/esm/npcstats.hpp>
 
-#include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwmechanics/obstacle.cpp b/apps/openmw/mwmechanics/obstacle.cpp
index 9562c74df0..3d8fe7919c 100644
--- a/apps/openmw/mwmechanics/obstacle.cpp
+++ b/apps/openmw/mwmechanics/obstacle.cpp
@@ -1,9 +1,7 @@
 #include "obstacle.hpp"
 
-#include <components/esm/loadcell.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
 
diff --git a/apps/openmw/mwmechanics/repair.cpp b/apps/openmw/mwmechanics/repair.cpp
index 8c5e698960..8ab3c605d2 100644
--- a/apps/openmw/mwmechanics/repair.cpp
+++ b/apps/openmw/mwmechanics/repair.cpp
@@ -6,7 +6,6 @@
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/containerstore.hpp"
diff --git a/apps/openmw/mwmechanics/security.cpp b/apps/openmw/mwmechanics/security.cpp
index 18d4ec2e5a..f1aa6bf8e2 100644
--- a/apps/openmw/mwmechanics/security.cpp
+++ b/apps/openmw/mwmechanics/security.cpp
@@ -8,7 +8,6 @@
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
 #include "creaturestats.hpp"
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 1e7f3fc649..2a359cb52c 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -23,7 +23,6 @@
 #include "../mwworld/inventorystore.hpp"
 
 #include "../mwrender/animation.hpp"
-#include "../mwrender/vismask.hpp"
 
 #include "npcstats.hpp"
 #include "actorutil.hpp"
diff --git a/apps/openmw/mwmechanics/spellpriority.cpp b/apps/openmw/mwmechanics/spellpriority.cpp
index c55d5ab10c..79606fda6b 100644
--- a/apps/openmw/mwmechanics/spellpriority.cpp
+++ b/apps/openmw/mwmechanics/spellpriority.cpp
@@ -12,12 +12,10 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/actionequip.hpp"
 #include "../mwworld/cellstore.hpp"
 
 #include "creaturestats.hpp"
 #include "spellcasting.hpp"
-#include "combat.hpp"
 
 namespace
 {
diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index 0a11ed6414..3214b3fc9a 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -1,7 +1,5 @@
 #include "spells.hpp"
 
-#include <cstdlib>
-
 #include <components/esm/loadspel.hpp>
 #include <components/esm/spellstate.hpp>
 #include <components/misc/rng.hpp>
diff --git a/apps/openmw/mwmechanics/weaponpriority.cpp b/apps/openmw/mwmechanics/weaponpriority.cpp
index 55fb2eaf09..04a39fcbd3 100644
--- a/apps/openmw/mwmechanics/weaponpriority.cpp
+++ b/apps/openmw/mwmechanics/weaponpriority.cpp
@@ -1,7 +1,6 @@
 #include "weaponpriority.hpp"
 
 #include <components/esm/loadench.hpp>
-#include <components/esm/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index 2f28668215..549b450a97 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -6,8 +6,6 @@
 #include <components/resource/bulletshape.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 
-#include <osg/Object>
-
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 18fc064819..f6f7aac39c 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -1,15 +1,7 @@
 #include "physicssystem.hpp"
 
-#include <stdexcept>
-#include <unordered_map>
-#include <fstream>
-#include <array>
-
-#include <boost/optional.hpp>
-
 #include <osg/Group>
 
-#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 #include <BulletCollision/CollisionShapes/btConeShape.h>
 #include <BulletCollision/CollisionShapes/btSphereShape.h>
 #include <BulletCollision/CollisionShapes/btStaticPlaneShape.h>
@@ -21,12 +13,6 @@
 
 #include <LinearMath/btQuickprof.h>
 
-#include <DetourCommon.h>
-#include <DetourNavMesh.h>
-#include <DetourNavMeshBuilder.h>
-#include <DetourNavMeshQuery.h>
-#include <Recast.h>
-
 #include <components/nifbullet/bulletnifloader.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/bulletshapemanager.hpp>
@@ -50,9 +36,6 @@
 
 #include "../mwrender/bulletdebugdraw.hpp"
 
-#include "../mwbase/world.hpp"
-#include "../mwbase/environment.hpp"
-
 #include "../mwworld/class.hpp"
 
 #include "collisiontype.hpp"
diff --git a/apps/openmw/mwphysics/trace.cpp b/apps/openmw/mwphysics/trace.cpp
index 204ec14678..07465ada02 100644
--- a/apps/openmw/mwphysics/trace.cpp
+++ b/apps/openmw/mwphysics/trace.cpp
@@ -1,7 +1,5 @@
 #include "trace.h"
 
-#include <map>
-
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 #include <BulletCollision/CollisionShapes/btConvexShape.h>
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 4b36686f1c..a775f9391d 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -19,7 +19,6 @@
 #include <components/sceneutil/attach.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/skeleton.hpp>
-#include <components/sceneutil/lightmanager.hpp>
 
 #include <components/settings/settings.hpp>
 
diff --git a/apps/openmw/mwrender/objects.hpp b/apps/openmw/mwrender/objects.hpp
index 6598537632..98ebb95d98 100644
--- a/apps/openmw/mwrender/objects.hpp
+++ b/apps/openmw/mwrender/objects.hpp
@@ -2,7 +2,6 @@
 #define GAME_RENDER_OBJECTS_H
 
 #include <map>
-#include <memory>
 #include <string>
 
 #include <osg/ref_ptr>
diff --git a/apps/openmw/mwrender/pathgrid.cpp b/apps/openmw/mwrender/pathgrid.cpp
index ee4120d6f8..8a7bc8b5ee 100644
--- a/apps/openmw/mwrender/pathgrid.cpp
+++ b/apps/openmw/mwrender/pathgrid.cpp
@@ -6,14 +6,12 @@
 #include <osg/PositionAttitudeTransform>
 #include <osg/Group>
 
-#include <components/esm/loadstat.hpp>
 #include <components/esm/loadpgrd.hpp>
 #include <components/sceneutil/pathgridutil.hpp>
 
 #include "../mwbase/world.hpp" // these includes can be removed once the static-hack is gone
 #include "../mwbase/environment.hpp"
 
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwmechanics/pathfinding.hpp"
diff --git a/apps/openmw/mwrender/pathgrid.hpp b/apps/openmw/mwrender/pathgrid.hpp
index 22bfa8e73f..77f1a7f337 100644
--- a/apps/openmw/mwrender/pathgrid.hpp
+++ b/apps/openmw/mwrender/pathgrid.hpp
@@ -4,7 +4,6 @@
 #include <utility>
 
 #include <vector>
-#include <string>
 #include <map>
 
 #include <osg/ref_ptr>
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 51a92a280c..c1f2b390f5 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -1,6 +1,5 @@
 #include "renderingmanager.hpp"
 
-#include <stdexcept>
 #include <limits>
 #include <cstdlib>
 
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 3daf810716..8cede92d07 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -13,6 +13,7 @@
 #include "rendermode.hpp"
 
 #include <deque>
+#include <memory>
 
 namespace osg
 {
diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp
index e70f165213..f6472fbdec 100644
--- a/apps/openmw/mwrender/sky.hpp
+++ b/apps/openmw/mwrender/sky.hpp
@@ -4,7 +4,6 @@
 #include <string>
 #include <memory>
 #include <vector>
-#include <iostream>
 
 #include <osg/ref_ptr>
 #include <osg/Vec4f>
diff --git a/apps/openmw/mwscript/animationextensions.cpp b/apps/openmw/mwscript/animationextensions.cpp
index e737d8ea19..6e959c0c0f 100644
--- a/apps/openmw/mwscript/animationextensions.cpp
+++ b/apps/openmw/mwscript/animationextensions.cpp
@@ -3,7 +3,6 @@
 #include <stdexcept>
 #include <limits>
 
-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
diff --git a/apps/openmw/mwscript/cellextensions.cpp b/apps/openmw/mwscript/cellextensions.cpp
index f01fed2ce1..80d4f7eb86 100644
--- a/apps/openmw/mwscript/cellextensions.cpp
+++ b/apps/openmw/mwscript/cellextensions.cpp
@@ -4,7 +4,6 @@
 
 #include "../mwworld/esmstore.hpp"
 
-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
diff --git a/apps/openmw/mwscript/consoleextensions.cpp b/apps/openmw/mwscript/consoleextensions.cpp
index d2e07d3e14..749ec80969 100644
--- a/apps/openmw/mwscript/consoleextensions.cpp
+++ b/apps/openmw/mwscript/consoleextensions.cpp
@@ -1,11 +1,6 @@
 #include "consoleextensions.hpp"
 
-#include <components/compiler/extensions.hpp>
-#include <components/compiler/opcodes.hpp>
-
 #include <components/interpreter/interpreter.hpp>
-#include <components/interpreter/runtime.hpp>
-#include <components/interpreter/opcodes.hpp>
 
 namespace MWScript
 {
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 8a25f0c015..7d555e632a 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -8,7 +8,6 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
@@ -22,14 +21,13 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwworld/actionequip.hpp"
+#include "../mwworld/action.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/inventorystore.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
-#include "interpretercontext.hpp"
 #include "ref.hpp"
 
 namespace MWScript
diff --git a/apps/openmw/mwscript/globalscripts.cpp b/apps/openmw/mwscript/globalscripts.cpp
index a52a4938ad..63b0236c88 100644
--- a/apps/openmw/mwscript/globalscripts.cpp
+++ b/apps/openmw/mwscript/globalscripts.cpp
@@ -1,7 +1,5 @@
 #include "globalscripts.hpp"
 
-#include <cassert>
-
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/esm/esmwriter.hpp>
diff --git a/apps/openmw/mwscript/guiextensions.cpp b/apps/openmw/mwscript/guiextensions.cpp
index cea176ff6c..64f45b4c09 100644
--- a/apps/openmw/mwscript/guiextensions.cpp
+++ b/apps/openmw/mwscript/guiextensions.cpp
@@ -1,6 +1,5 @@
 #include "guiextensions.hpp"
 
-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index 07b7a3bffd..30c56406ef 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -4,8 +4,6 @@
 #include <stdexcept>
 #include <sstream>
 
-#include <components/interpreter/types.hpp>
-
 #include <components/compiler/locals.hpp>
 
 #include <components/esm/cellid.hpp>
@@ -18,6 +16,7 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/inputmanager.hpp"
 
+#include "../mwworld/action.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/containerstore.hpp"
diff --git a/apps/openmw/mwscript/interpretercontext.hpp b/apps/openmw/mwscript/interpretercontext.hpp
index 5f1f4f7ab8..0e001d6923 100644
--- a/apps/openmw/mwscript/interpretercontext.hpp
+++ b/apps/openmw/mwscript/interpretercontext.hpp
@@ -4,7 +4,6 @@
 #include <components/interpreter/context.hpp>
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/action.hpp"
 
 namespace MWSound
 {
diff --git a/apps/openmw/mwscript/locals.cpp b/apps/openmw/mwscript/locals.cpp
index 4c55731688..6992005907 100644
--- a/apps/openmw/mwscript/locals.cpp
+++ b/apps/openmw/mwscript/locals.cpp
@@ -13,8 +13,6 @@
 
 #include "../mwworld/esmstore.hpp"
 
-#include <iostream>
-
 namespace MWScript
 {
     void Locals::ensure (const std::string& scriptName)
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index d3b49239ce..c480cfec89 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -2,7 +2,6 @@
 
 #include <cstdlib>
 
-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 #include <components/compiler/locals.hpp>
 
diff --git a/apps/openmw/mwscript/skyextensions.cpp b/apps/openmw/mwscript/skyextensions.cpp
index 479c9d70ce..efcef68275 100644
--- a/apps/openmw/mwscript/skyextensions.cpp
+++ b/apps/openmw/mwscript/skyextensions.cpp
@@ -2,7 +2,6 @@
 
 #include <algorithm>
 
-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
diff --git a/apps/openmw/mwscript/soundextensions.cpp b/apps/openmw/mwscript/soundextensions.cpp
index 4d199c299f..fe6f7bac36 100644
--- a/apps/openmw/mwscript/soundextensions.cpp
+++ b/apps/openmw/mwscript/soundextensions.cpp
@@ -1,6 +1,5 @@
-#include "extensions.hpp"
+#include "soundextensions.hpp"
 
-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index 10d1252b91..092faa9267 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -14,7 +14,6 @@
 #include <components/interpreter/opcodes.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -27,7 +26,6 @@
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
-#include "interpretercontext.hpp"
 #include "ref.hpp"
 
 namespace
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 9f0784d6c0..0d0d6f29e3 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -4,7 +4,6 @@
 
 #include <components/esm/loadcell.hpp>
 
-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
@@ -18,7 +17,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/manualref.hpp"
 #include "../mwworld/player.hpp"
-#include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
diff --git a/apps/openmw/mwsound/movieaudiofactory.cpp b/apps/openmw/mwsound/movieaudiofactory.cpp
index 146023bc16..b0bfd52e17 100644
--- a/apps/openmw/mwsound/movieaudiofactory.cpp
+++ b/apps/openmw/mwsound/movieaudiofactory.cpp
@@ -1,7 +1,5 @@
 #include "movieaudiofactory.hpp"
 
-#include <iostream>
-
 #include <extern/osg-ffmpeg-videoplayer/audiodecoder.hpp>
 #include <extern/osg-ffmpeg-videoplayer/videostate.hpp>
 
diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index ccb3f22b52..ba75534b65 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -1,5 +1,4 @@
 #include <algorithm>
-#include <stdexcept>
 #include <cstring>
 #include <vector>
 #include <memory>
diff --git a/apps/openmw/mwstate/character.cpp b/apps/openmw/mwstate/character.cpp
index a8fffaec60..3c5c4f8b2a 100644
--- a/apps/openmw/mwstate/character.cpp
+++ b/apps/openmw/mwstate/character.cpp
@@ -1,5 +1,6 @@
 #include "character.hpp"
 
+#include <cctype>
 #include <sstream>
 
 #include <boost/filesystem.hpp>
diff --git a/apps/openmw/mwstate/charactermanager.cpp b/apps/openmw/mwstate/charactermanager.cpp
index d440ba8696..856264d03b 100644
--- a/apps/openmw/mwstate/charactermanager.cpp
+++ b/apps/openmw/mwstate/charactermanager.cpp
@@ -1,5 +1,6 @@
 #include "charactermanager.hpp"
 
+#include <cctype>
 #include <sstream>
 
 #include <boost/filesystem.hpp>
@@ -58,7 +59,7 @@ MWState::Character* MWState::CharacterManager::createCharacter(const std::string
     // The character name is user-supplied, so we need to escape the path
     for (std::string::const_iterator it = name.begin(); it != name.end(); ++it)
     {
-        if (isalnum(*it)) // Ignores multibyte characters and non alphanumeric characters
+        if (std::isalnum(*it)) // Ignores multibyte characters and non alphanumeric characters
             stream << *it;
         else
             stream << "_";
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 946c5eef7f..01da76e900 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -32,7 +32,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
-#include "../mwworld/inventorystore.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
diff --git a/apps/openmw/mwworld/actionrepair.cpp b/apps/openmw/mwworld/actionrepair.cpp
index 4fb7f7adab..4fe48b4b4c 100644
--- a/apps/openmw/mwworld/actionrepair.cpp
+++ b/apps/openmw/mwworld/actionrepair.cpp
@@ -3,7 +3,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwworld/player.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
 namespace MWWorld
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 89e5357f06..96461c1178 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -10,9 +10,7 @@
 #include <components/resource/keyframemanager.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/stringops.hpp>
-#include <components/nifosg/nifloader.hpp>
 #include <components/terrain/world.hpp>
-#include <components/esmterrain/storage.hpp>
 #include <components/sceneutil/unrefqueue.hpp>
 #include <components/esm/loadcell.hpp>
 
diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index 2b032e1d70..4d2583d53f 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -11,7 +11,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
-#include "class.hpp"
 #include "esmstore.hpp"
 #include "containerstore.hpp"
 #include "cellstore.hpp"
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 70fde33cfb..9786ed32b4 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -20,7 +20,6 @@
 
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/magiceffects.hpp"
 
 namespace MWWorld
 {
diff --git a/apps/openmw/mwworld/contentloader.hpp b/apps/openmw/mwworld/contentloader.hpp
index 2069a78fc8..b529ae9db8 100644
--- a/apps/openmw/mwworld/contentloader.hpp
+++ b/apps/openmw/mwworld/contentloader.hpp
@@ -1,7 +1,6 @@
 #ifndef CONTENTLOADER_HPP
 #define CONTENTLOADER_HPP
 
-#include <iosfwd>
 #include <boost/filesystem/path.hpp>
 #include <MyGUI_TextIterator.h>
 
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 8b35d8dcc0..a0895a1538 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -12,9 +12,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/windowmanager.hpp"
-
-#include "../mwgui/inventorywindow.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/spellcasting.hpp"
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 52a5ab4192..a615c9978a 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -15,7 +15,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwmechanics/movement.hpp"
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index ff449acf57..6e163b0d57 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -34,7 +34,6 @@
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/aipackage.hpp"
 
-#include "../mwrender/effectmanager.hpp"
 #include "../mwrender/animation.hpp"
 #include "../mwrender/vismask.hpp"
 #include "../mwrender/renderingmanager.hpp"
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 1d5293b7ce..a8f573ac37 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -4,7 +4,6 @@
 
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
-#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 
 #include <components/debug/debuglog.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 719aef837e..6ef9535e9f 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -4,7 +4,6 @@
 
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
-#include <components/esm/savedgame.hpp>
 #include <components/esm/weatherstate.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index d7963fae13..e3658285d1 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -35,7 +35,6 @@
 #include "../mwbase/scriptmanager.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
-#include "../mwmechanics/movement.hpp"
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/spellcasting.hpp"
 #include "../mwmechanics/levelledlist.hpp"
@@ -48,7 +47,6 @@
 #include "../mwrender/camera.hpp"
 #include "../mwrender/vismask.hpp"
 
-#include "../mwscript/interpretercontext.hpp"
 #include "../mwscript/globalscripts.hpp"
 
 #include "../mwclass/door.hpp"
diff --git a/components/compiler/locals.cpp b/components/compiler/locals.cpp
index 768fc077ca..2b485abecf 100644
--- a/components/compiler/locals.cpp
+++ b/components/compiler/locals.cpp
@@ -1,6 +1,5 @@
 #include "locals.hpp"
 
-#include <cassert>
 #include <stdexcept>
 #include <algorithm>
 #include <ostream>
diff --git a/components/compiler/parser.cpp b/components/compiler/parser.cpp
index fe019718a6..62265d8a1b 100644
--- a/components/compiler/parser.cpp
+++ b/components/compiler/parser.cpp
@@ -1,9 +1,5 @@
 #include "parser.hpp"
 
-#include <cctype>
-#include <algorithm>
-#include <iterator>
-
 #include "errorhandler.hpp"
 #include "exception.hpp"
 #include "scanner.hpp"
diff --git a/components/compiler/scanner.cpp b/components/compiler/scanner.cpp
index b56dbb95bc..c5ef483f3c 100644
--- a/components/compiler/scanner.cpp
+++ b/components/compiler/scanner.cpp
@@ -3,7 +3,6 @@
 #include <cassert>
 #include <cctype>
 #include <sstream>
-#include <algorithm>
 #include <iterator>
 
 #include "exception.hpp"
diff --git a/components/contentselector/view/combobox.cpp b/components/contentselector/view/combobox.cpp
index 18cafc2dc1..959eca2890 100644
--- a/components/contentselector/view/combobox.cpp
+++ b/components/contentselector/view/combobox.cpp
@@ -1,7 +1,4 @@
-#include <QRegExpValidator>
-#include <QLineEdit>
 #include <QString>
-#include <QApplication>
 #include <QKeyEvent>
 
 #include "combobox.hpp"
diff --git a/components/contentselector/view/contentselector.cpp b/components/contentselector/view/contentselector.cpp
index 4f95b7fe46..89c389556f 100644
--- a/components/contentselector/view/contentselector.cpp
+++ b/components/contentselector/view/contentselector.cpp
@@ -8,10 +8,7 @@
 #include <QContextMenuEvent>
 
 #include <QClipboard>
-#include <QGridLayout>
-#include <QMessageBox>
 #include <QModelIndex>
-#include <QDir>
 
 ContentSelectorView::ContentSelector::ContentSelector(QWidget *parent) :
     QObject(parent)
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index f4efc744b7..1e158667b0 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -5,8 +5,6 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <iostream>
-
 namespace
 {
     using DetourNavigator::ChangeType;
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 26f86da321..7bd2fee77c 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -7,7 +7,6 @@
 #include "settings.hpp"
 #include "settingsutils.hpp"
 #include "sharednavmesh.hpp"
-#include "settingsutils.hpp"
 #include "flags.hpp"
 #include "navmeshtilescache.hpp"
 
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index aa2d621843..2a29d1dd4a 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -5,14 +5,9 @@
 #include "makenavmesh.hpp"
 #include "navmeshcacheitem.hpp"
 #include "settings.hpp"
-#include "sharednavmesh.hpp"
 
 #include <DetourNavMesh.h>
 
-#include <BulletCollision/CollisionShapes/btConcaveShape.h>
-
-#include <iostream>
-
 namespace
 {
     using DetourNavigator::ChangeType;
diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index 6bfbfb3954..64edab0ad0 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -1,8 +1,6 @@
 #include "navmeshtilescache.hpp"
 #include "exceptions.hpp"
 
-#include <iostream>
-
 namespace DetourNavigator
 {
     namespace
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index 1c3a72b59c..39afdf56ed 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -1,6 +1,5 @@
 #include "recastmeshmanager.hpp"
 
-#include <BulletCollision/CollisionShapes/btCompoundShape.h>
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 
 namespace DetourNavigator
diff --git a/components/detournavigator/recastmeshobject.cpp b/components/detournavigator/recastmeshobject.cpp
index acaf398c16..24d3e6b5a8 100644
--- a/components/detournavigator/recastmeshobject.cpp
+++ b/components/detournavigator/recastmeshobject.cpp
@@ -5,7 +5,6 @@
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
 
 #include <cassert>
-#include <numeric>
 
 namespace DetourNavigator
 {
diff --git a/components/detournavigator/settings.cpp b/components/detournavigator/settings.cpp
index f584e48f94..ddffd0d1f5 100644
--- a/components/detournavigator/settings.cpp
+++ b/components/detournavigator/settings.cpp
@@ -2,8 +2,6 @@
 
 #include <components/settings/settings.hpp>
 
-#include <string>
-
 namespace DetourNavigator
 {
     boost::optional<Settings> makeSettingsFromSettingsManager()
diff --git a/components/esm/aisequence.cpp b/components/esm/aisequence.cpp
index 6e41ba3023..7891299e32 100644
--- a/components/esm/aisequence.cpp
+++ b/components/esm/aisequence.cpp
@@ -3,8 +3,6 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-#include "defs.hpp"
-
 #include <memory>
 
 namespace ESM
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index 6e84fa7d4f..9cf56e8a91 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -1,8 +1,7 @@
 #ifndef OPENMW_ESM_READER_H
 #define OPENMW_ESM_READER_H
 
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
 #include <cassert>
 #include <vector>
 #include <sstream>
diff --git a/components/esm/loadskil.cpp b/components/esm/loadskil.cpp
index 36204c9401..09b0258174 100644
--- a/components/esm/loadskil.cpp
+++ b/components/esm/loadskil.cpp
@@ -2,8 +2,6 @@
 
 #include <sstream>
 
-#include <components/misc/stringops.hpp>
-
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 #include "defs.hpp"
diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp
index dfdc9718df..567d93bbd2 100644
--- a/components/esmterrain/storage.cpp
+++ b/components/esmterrain/storage.cpp
@@ -1,7 +1,6 @@
 #include "storage.hpp"
 
 #include <set>
-#include <iostream>
 
 #include <OpenThreads/ScopedLock>
 
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 0378e294eb..dae83a1f9b 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -3,7 +3,6 @@
 #include <stdexcept>
 
 #include <osg/Image>
-#include <osg/Texture2D>
 
 #include <osgDB/WriteFile>
 
diff --git a/components/interpreter/miscopcodes.hpp b/components/interpreter/miscopcodes.hpp
index 77e5a00790..29d1c063b1 100644
--- a/components/interpreter/miscopcodes.hpp
+++ b/components/interpreter/miscopcodes.hpp
@@ -1,7 +1,6 @@
 #ifndef INTERPRETER_MISCOPCODES_H_INCLUDED
 #define INTERPRETER_MISCOPCODES_H_INCLUDED
 
-#include <cstdlib>
 #include <stdexcept>
 #include <vector>
 #include <string>
diff --git a/components/misc/stringops.hpp b/components/misc/stringops.hpp
index 79fa36d1ee..76a585d61d 100644
--- a/components/misc/stringops.hpp
+++ b/components/misc/stringops.hpp
@@ -1,7 +1,6 @@
 #ifndef MISC_STRINGOPS_H
 #define MISC_STRINGOPS_H
 
-#include <cctype>
 #include <cstring>
 #include <string>
 #include <algorithm>
diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index a3f7f76a22..33cc31e2e8 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -1,7 +1,5 @@
 #include "myguirendermanager.hpp"
 
-#include <stdexcept>
-
 #include <MyGUI_Gui.h>
 #include <MyGUI_Timer.h>
 
diff --git a/components/myguiplatform/myguitexture.cpp b/components/myguiplatform/myguitexture.cpp
index 756893974b..598f5a14e9 100644
--- a/components/myguiplatform/myguitexture.cpp
+++ b/components/myguiplatform/myguitexture.cpp
@@ -1,7 +1,6 @@
 #include "myguitexture.hpp"
 
 #include <stdexcept>
-#include <iostream>
 
 #include <osg/Texture2D>
 
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 1a526c63b6..72933fc32a 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -1,9 +1,6 @@
 #include "bulletnifloader.hpp"
 
-#include <cstdio>
 #include <vector>
-#include <list>
-#include <stdexcept>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
@@ -15,8 +12,6 @@
 
 #include <components/nif/node.hpp>
 #include <components/nif/data.hpp>
-#include <components/nif/property.hpp>
-#include <components/nif/controller.hpp>
 #include <components/nif/extra.hpp>
 
 namespace
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index a2dad247d9..ba3543ce75 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -21,7 +21,6 @@
 #include <osgParticle/ParticleSystem>
 #include <osgParticle/ParticleSystemUpdater>
 #include <osgParticle/ConstantRateCounter>
-#include <osgParticle/Shooter>
 #include <osgParticle/BoxPlacer>
 #include <osgParticle/ModularProgram>
 
diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index c1f6a2819b..eeb6777ce5 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -8,7 +8,6 @@
 #include <components/debug/debuglog.hpp>
 #include <components/misc/rng.hpp>
 #include <components/nif/controlled.hpp>
-#include <components/nif/nifkey.hpp>
 #include <components/nif/data.hpp>
 
 #include "userdata.hpp"
diff --git a/components/process/processinvoker.cpp b/components/process/processinvoker.cpp
index cc842fd615..78cf70038b 100644
--- a/components/process/processinvoker.cpp
+++ b/components/process/processinvoker.cpp
@@ -3,8 +3,6 @@
 #include <QMessageBox>
 #include <QStringList>
 #include <QString>
-#include <QFileInfo>
-#include <QFile>
 #include <QDir>
 #include <QDebug>
 #include <QCoreApplication>
diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index e3f6b22b4a..7dd0964e8b 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -4,7 +4,6 @@
 #include <string>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
-#include <BulletCollision/CollisionShapes/btTriangleMesh.h>
 #include <BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
 
diff --git a/components/sceneutil/agentpath.cpp b/components/sceneutil/agentpath.cpp
index aaee4dd1ef..abe332f758 100644
--- a/components/sceneutil/agentpath.cpp
+++ b/components/sceneutil/agentpath.cpp
@@ -2,7 +2,6 @@
 #include "detourdebugdraw.hpp"
 
 #include <components/detournavigator/settings.hpp>
-#include <components/esm/loadpgrd.hpp>
 
 #include <algorithm>
 
diff --git a/components/sceneutil/attach.cpp b/components/sceneutil/attach.cpp
index f143d19a8d..5126a37764 100644
--- a/components/sceneutil/attach.cpp
+++ b/components/sceneutil/attach.cpp
@@ -1,7 +1,6 @@
 #include "attach.hpp"
 
 #include <stdexcept>
-#include <iostream>
 
 #include <osg/NodeVisitor>
 #include <osg/Group>
diff --git a/components/sceneutil/clone.cpp b/components/sceneutil/clone.cpp
index 99dd7bad3c..d1cca5b315 100644
--- a/components/sceneutil/clone.cpp
+++ b/components/sceneutil/clone.cpp
@@ -1,12 +1,10 @@
 #include "clone.hpp"
 
 #include <osg/StateSet>
-#include <osg/Version>
 
 #include <osgParticle/ParticleProcessor>
 #include <osgParticle/ParticleSystemUpdater>
 #include <osgParticle/Emitter>
-#include <osgParticle/Program>
 
 #include <components/sceneutil/morphgeometry.hpp>
 
diff --git a/components/sceneutil/optimizer.cpp b/components/sceneutil/optimizer.cpp
index 25ad03fbad..aaff38797b 100644
--- a/components/sceneutil/optimizer.cpp
+++ b/components/sceneutil/optimizer.cpp
@@ -25,7 +25,6 @@
 #include <osg/Billboard>
 #include <osg/Geometry>
 #include <osg/Notify>
-#include <osg/Texture>
 #include <osg/Timer>
 #include <osg/io_utils>
 
@@ -36,7 +35,6 @@
 #include <typeinfo>
 #include <algorithm>
 #include <numeric>
-#include <sstream>
 
 #include <iterator>
 
diff --git a/components/sceneutil/pathgridutil.cpp b/components/sceneutil/pathgridutil.cpp
index 1497beb2b8..58c5d8ad28 100644
--- a/components/sceneutil/pathgridutil.cpp
+++ b/components/sceneutil/pathgridutil.cpp
@@ -2,7 +2,6 @@
 
 #include <osg/Geometry>
 
-#include <components/esm/loadland.hpp>
 #include <components/esm/loadpgrd.hpp>
 
 namespace SceneUtil
diff --git a/components/sceneutil/positionattitudetransform.cpp b/components/sceneutil/positionattitudetransform.cpp
index 5f6b57e979..6129c33b4d 100644
--- a/components/sceneutil/positionattitudetransform.cpp
+++ b/components/sceneutil/positionattitudetransform.cpp
@@ -1,7 +1,5 @@
 #include "positionattitudetransform.hpp"
 
-#include <iostream>
-
 namespace SceneUtil
 {
 
diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index f1acf33e99..0c81980553 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -1,8 +1,5 @@
 #include "riggeometry.hpp"
 
-#include <stdexcept>
-#include <cstdlib>
-
 #include <osg/Version>
 
 #include <components/debug/debuglog.hpp>
diff --git a/components/sdlutil/sdlcursormanager.cpp b/components/sdlutil/sdlcursormanager.cpp
index 6d21175753..82854cb2f8 100644
--- a/components/sdlutil/sdlcursormanager.cpp
+++ b/components/sdlutil/sdlcursormanager.cpp
@@ -2,7 +2,6 @@
 
 #include <cassert>
 #include <stdexcept>
-#include <iostream>
 #include <cstdlib>
 
 #include <SDL_mouse.h>
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 0f4dc2e738..97fc79562d 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -1,7 +1,6 @@
 #include "shadermanager.hpp"
 
 #include <fstream>
-#include <iostream>
 #include <algorithm>
 #include <sstream>
 
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 3080e1318a..911a8cbbf1 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -1,7 +1,5 @@
 #include "shadervisitor.hpp"
 
-#include <iostream>
-
 #include <osg/Texture>
 #include <osg/Material>
 #include <osg/Geometry>
diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index 83684b5c91..c61bdb455b 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -1,13 +1,10 @@
 #include "material.hpp"
 
-#include <stdexcept>
-
 #include <osg/Fog>
 #include <osg/Depth>
 #include <osg/TexEnvCombine>
 #include <osg/Texture2D>
 #include <osg/TexMat>
-#include <osg/Material>
 #include <osg/BlendFunc>
 
 #include <components/shader/shadermanager.hpp>
diff --git a/components/to_utf8/to_utf8.cpp b/components/to_utf8/to_utf8.cpp
index d4ab00381b..bcb174b7be 100644
--- a/components/to_utf8/to_utf8.cpp
+++ b/components/to_utf8/to_utf8.cpp
@@ -2,7 +2,6 @@
 
 #include <vector>
 #include <cassert>
-#include <iomanip>
 #include <stdexcept>
 
 #include <components/debug/debuglog.hpp>
diff --git a/components/vfs/manager.cpp b/components/vfs/manager.cpp
index 4f3994bace..c198823811 100644
--- a/components/vfs/manager.cpp
+++ b/components/vfs/manager.cpp
@@ -1,6 +1,5 @@
 #include "manager.hpp"
 
-#include <cctype>
 #include <stdexcept>
 
 #include <components/misc/stringops.hpp>
diff --git a/components/widgets/list.cpp b/components/widgets/list.cpp
index 9318e32ed4..73e01675a7 100644
--- a/components/widgets/list.cpp
+++ b/components/widgets/list.cpp
@@ -3,7 +3,6 @@
 #include <MyGUI_Gui.h>
 #include <MyGUI_Button.h>
 #include <MyGUI_ImageBox.h>
-#include <MyGUI_ScrollBar.h>
 
 namespace Gui
 {