diff --git a/apps/esmtool/labels.cpp b/apps/esmtool/labels.cpp
index 883a9e728..ea7b50129 100644
--- a/apps/esmtool/labels.cpp
+++ b/apps/esmtool/labels.cpp
@@ -11,7 +11,6 @@
 #include <components/esm/loadrace.hpp>
 #include <components/esm/loadspel.hpp>
 #include <components/esm/loadweap.hpp>
-#include <components/esm/aipackage.hpp>
 
 #include <boost/format.hpp>
 
diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp
index 2c05f9ecb..d38069d89 100644
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@@ -1,8 +1,8 @@
 #include "importer.hpp"
 
 #include <iomanip>
-#include <utility>
 
+#include <boost/filesystem/fstream.hpp>
 
 #include <osgDB/ReadFile>
 #include <osg/ImageUtils>
diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp
index fb3144814..24646b844 100644
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@@ -1,17 +1,12 @@
 #include "importer.hpp"
 
-#include <ctime>
 #include <iostream>
-#include <string>
-#include <map>
-#include <vector>
-#include <algorithm>
 #include <sstream>
 #include <components/misc/stringops.hpp>
 
-#include <boost/version.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
+#include <boost/version.hpp>
 
 namespace bfs = boost::filesystem;
 
diff --git a/apps/mwiniimporter/main.cpp b/apps/mwiniimporter/main.cpp
index a3f115fcf..8a2aeb603 100644
--- a/apps/mwiniimporter/main.cpp
+++ b/apps/mwiniimporter/main.cpp
@@ -1,11 +1,9 @@
 #include "importer.hpp"
 
-#include <string>
 #include <iostream>
 
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
-#include <boost/filesystem/path.hpp>
 #include <boost/filesystem/fstream.hpp>
 
 namespace bpo = boost::program_options;
diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index ea32a8457..ef984c0ca 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -5,6 +5,7 @@
 #include <iostream>
 
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 
 #include "../world/defaultgmsts.hpp"
 
diff --git a/apps/opencs/model/doc/documentmanager.cpp b/apps/opencs/model/doc/documentmanager.cpp
index 87fb960c1..098d7bad5 100644
--- a/apps/opencs/model/doc/documentmanager.cpp
+++ b/apps/opencs/model/doc/documentmanager.cpp
@@ -1,8 +1,5 @@
 #include "documentmanager.hpp"
 
-#include <algorithm>
-#include <stdexcept>
-
 #include <boost/filesystem.hpp>
 
 #ifndef Q_MOC_RUN
diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index 82a965ae4..f9c028e29 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -1,20 +1,15 @@
 #include "savingstages.hpp"
 
-#include <fstream>
-
 #include <boost/filesystem.hpp>
 
 #include <QUndoStack>
 
 #include <components/esm/loaddial.hpp>
 
-#include <components/misc/stringops.hpp>
-
 #include "../world/infocollection.hpp"
 #include "../world/cellcoordinates.hpp"
 
 #include "document.hpp"
-#include "savingstate.hpp"
 
 CSMDoc::OpenSaveStage::OpenSaveStage (Document& document, SavingState& state, bool projectFile)
 : mDocument (document), mState (state), mProjectFile (projectFile)
diff --git a/apps/opencs/model/doc/savingstate.cpp b/apps/opencs/model/doc/savingstate.cpp
index 10539c1b5..7214735f0 100644
--- a/apps/opencs/model/doc/savingstate.cpp
+++ b/apps/opencs/model/doc/savingstate.cpp
@@ -1,5 +1,7 @@
 #include "savingstate.hpp"
 
+#include <boost/filesystem/fstream.hpp>
+
 #include "operation.hpp"
 #include "document.hpp"
 
diff --git a/apps/opencs/view/doc/adjusterwidget.cpp b/apps/opencs/view/doc/adjusterwidget.cpp
index 620d853ac..06da68ed8 100644
--- a/apps/opencs/view/doc/adjusterwidget.cpp
+++ b/apps/opencs/view/doc/adjusterwidget.cpp
@@ -1,8 +1,5 @@
 #include "adjusterwidget.hpp"
 
-#include <stdexcept>
-#include <string>
-
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 81fb2e6a7..b1c1311bc 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -1,6 +1,5 @@
 #include "engine.hpp"
 
-#include <stdexcept>
 #include <iomanip>
 
 #include <boost/filesystem/fstream.hpp>
@@ -28,7 +27,6 @@
 #include <components/sceneutil/workqueue.hpp>
 
 #include <components/files/configurationmanager.hpp>
-#include <components/translation/translation.hpp>
 
 #include <components/version/version.hpp>
 
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index be860118e..a7e522acd 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -8,6 +8,8 @@
 #include <SDL_messagebox.h>
 #include "engine.hpp"
 
+#include <boost/filesystem/fstream.hpp>
+
 #if defined(_WIN32)
 // For OutputDebugString
 #ifndef WIN32_LEAN_AND_MEAN
@@ -31,7 +33,6 @@ extern int cc_install_handlers(int argc, char **argv, int num_signals, int *sigs
 extern int is_debugger_attached(void);
 #endif
 
-#include <boost/version.hpp>
 /**
  * Workaround for problems with whitespaces in paths in older versions of Boost library
  */
diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index c4a27f7ed..047f65263 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -2,13 +2,10 @@
 
 #include <MyGUI_ListBox.h>
 #include <MyGUI_ImageBox.h>
-#include <MyGUI_RenderManager.h>
 #include <MyGUI_Gui.h>
 
 #include <osg/Texture2D>
 
-#include <boost/format.hpp>
-
 #include <components/myguiplatform/myguitexture.hpp>
 
 #include "../mwworld/esmstore.hpp"
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index 41f2a9b51..5f8967cf4 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -1,15 +1,9 @@
 #include "npcstats.hpp"
 
-#include <cmath>
-#include <stdexcept>
-#include <vector>
-#include <algorithm>
-
 #include <iomanip>
 
 #include <boost/format.hpp>
 
-#include <components/esm/loadskil.hpp>
 #include <components/esm/loadclas.hpp>
 #include <components/esm/loadgmst.hpp>
 #include <components/esm/loadfact.hpp>
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 02882adbe..0ed389bdf 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -10,8 +10,6 @@
 #include <osg/PositionAttitudeTransform>
 #include <osg/ClipNode>
 #include <osg/FrontFace>
-#include <osg/Shader>
-#include <osg/GLExtensions>
 
 #include <osgDB/ReadFile>
 
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index a65c275d6..dfc066bcd 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -10,7 +10,6 @@
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
-#include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
 
 #include <components/misc/stringops.hpp>
diff --git a/apps/openmw/mwstate/character.cpp b/apps/openmw/mwstate/character.cpp
index 733ac1171..4f7d365b4 100644
--- a/apps/openmw/mwstate/character.cpp
+++ b/apps/openmw/mwstate/character.cpp
@@ -1,18 +1,12 @@
 #include "character.hpp"
 
-#include <ctime>
-
 #include <sstream>
-#include <algorithm>
-#include <stdexcept>
 
 #include <boost/filesystem.hpp>
 
 #include <components/esm/esmreader.hpp>
 #include <components/esm/defs.hpp>
 
-#include <components/misc/stringops.hpp>
-
 bool MWState::operator< (const Slot& left, const Slot& right)
 {
     return left.mTimeStamp<right.mTimeStamp;
diff --git a/apps/openmw/mwstate/charactermanager.cpp b/apps/openmw/mwstate/charactermanager.cpp
index 90b25ab5a..62ddd649a 100644
--- a/apps/openmw/mwstate/charactermanager.cpp
+++ b/apps/openmw/mwstate/charactermanager.cpp
@@ -1,8 +1,6 @@
 #include "charactermanager.hpp"
 
 #include <sstream>
-#include <stdexcept>
-#include <cctype> // std::isalnum
 
 #include <boost/filesystem.hpp>
 
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 64c543fb1..68b0e4ecb 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -7,8 +7,6 @@
 
 #include <components/loadinglistener/loadinglistener.hpp>
 
-#include <components/misc/stringops.hpp>
-
 #include <components/settings/settings.hpp>
 
 #include <osg/Image>
@@ -35,7 +33,6 @@
 #include "../mwworld/inventorystore.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
 #include "../mwscript/globalscripts.hpp"
diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index 50b3374e5..c4be428b3 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -23,7 +23,6 @@
 
 #include "bsa_file.hpp"
 
-#include <stdexcept>
 #include <cassert>
 
 #include <boost/filesystem/path.hpp>
diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 46dbca8dc..5316255ad 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -1,17 +1,12 @@
 #include "configurationmanager.hpp"
 
-#include <string>
 #include <iostream>
-#include <algorithm>
-#include <ctype.h>
 
 #include <components/files/escape.hpp>
 
 #include <boost/algorithm/string/erase.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/filesystem/fstream.hpp>
-#include <boost/iostreams/filtering_stream.hpp>
-
 /**
  * \namespace Files
  */
diff --git a/components/files/escape.cpp b/components/files/escape.cpp
index c5d2c041e..f28870c70 100644
--- a/components/files/escape.cpp
+++ b/components/files/escape.cpp
@@ -1,7 +1,6 @@
 #include "escape.hpp"
 
 #include <boost/algorithm/string/replace.hpp>
-#include <boost/program_options.hpp>
 
 namespace Files
 {
diff --git a/components/files/linuxpath.cpp b/components/files/linuxpath.cpp
index 89b4bf45a..fce7cd02c 100644
--- a/components/files/linuxpath.cpp
+++ b/components/files/linuxpath.cpp
@@ -2,10 +2,7 @@
 
 #if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
 
-#include <cstdlib>
-#include <cstring>
 #include <pwd.h>
-#include <unistd.h>
 #include <boost/filesystem/fstream.hpp>
 
 #include <components/misc/stringops.hpp>
diff --git a/components/files/multidircollection.cpp b/components/files/multidircollection.cpp
index b37a95b2f..93db6834d 100644
--- a/components/files/multidircollection.cpp
+++ b/components/files/multidircollection.cpp
@@ -1,15 +1,9 @@
 #include "multidircollection.hpp"
 
-#include <cctype>
-
-#include <algorithm>
-#include <stdexcept>
 #include <iostream>
 
 #include <boost/filesystem.hpp>
 
-#include <components/misc/stringops.hpp>
-
 namespace Files
 {
     struct NameEqual
diff --git a/components/myguiplatform/myguiloglistener.cpp b/components/myguiplatform/myguiloglistener.cpp
index b36e0d852..a22ac8fc5 100644
--- a/components/myguiplatform/myguiloglistener.cpp
+++ b/components/myguiplatform/myguiloglistener.cpp
@@ -1,9 +1,6 @@
 #include "myguiloglistener.hpp"
 
 #include <iomanip>
-#include <time.h>
-
-#include <boost/filesystem/path.hpp>
 
 namespace osgMyGUI
 {
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index 0c0600cc0..e93642ee2 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -1,13 +1,11 @@
 #include "settings.hpp"
 
-#include <stdexcept>
 #include <sstream>
 #include <iostream>
 
 #include <components/misc/stringops.hpp>
 
 #include <boost/filesystem/fstream.hpp>
-#include <boost/filesystem/path.hpp>
 #include <boost/algorithm/string.hpp>
 
 namespace
diff --git a/components/translation/translation.cpp b/components/translation/translation.cpp
index 51947f6f9..14a32f178 100644
--- a/components/translation/translation.cpp
+++ b/components/translation/translation.cpp
@@ -2,8 +2,6 @@
 
 #include <boost/filesystem/fstream.hpp>
 
-#include <components/misc/stringops.hpp>
-
 namespace Translation
 {
     Storage::Storage()