diff --git a/apps/bulletobjecttool/main.cpp b/apps/bulletobjecttool/main.cpp
index c22dc15305..30ddff1c6c 100644
--- a/apps/bulletobjecttool/main.cpp
+++ b/apps/bulletobjecttool/main.cpp
@@ -1,18 +1,24 @@
 #include <components/debug/debugging.hpp>
+#include <components/debug/debuglog.hpp>
+#include <components/esm/defs.hpp>
 #include <components/esm3/loadcell.hpp>
 #include <components/esm3/readerscache.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/load.hpp>
 #include <components/fallback/fallback.hpp>
 #include <components/fallback/validate.hpp>
+#include <components/files/collections.hpp>
 #include <components/files/configurationmanager.hpp>
+#include <components/files/multidircollection.hpp>
 #include <components/platform/platform.hpp>
+#include <components/resource/bulletshape.hpp>
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/resource/foreachbulletobject.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/niffilemanager.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/settings/settings.hpp>
+#include <components/to_utf8/to_utf8.hpp>
 #include <components/version/version.hpp>
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
@@ -21,9 +27,19 @@
 
 #include <charconv>
 #include <cstddef>
+#include <cstdint>
+#include <filesystem>
 #include <iomanip>
-#include <stdexcept>
+#include <limits>
+#include <map>
+#include <memory>
+#include <osg/ref_ptr>
+#include <ostream>
 #include <string>
+#include <string_view>
+#include <system_error>
+#include <type_traits>
+#include <utility>
 #include <vector>
 
 namespace
diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index 75c383d5de..6b60e5f2f9 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -2,19 +2,22 @@
 #include "worldspacedata.hpp"
 
 #include <components/debug/debugging.hpp>
+#include <components/debug/debuglog.hpp>
 #include <components/detournavigator/agentbounds.hpp>
+#include <components/detournavigator/collisionshapetype.hpp>
 #include <components/detournavigator/navmeshdb.hpp>
 #include <components/detournavigator/recastglobalallocator.hpp>
 #include <components/detournavigator/settings.hpp>
-#include <components/esm3/esmreader.hpp>
 #include <components/esm3/readerscache.hpp>
 #include <components/esm3/variant.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/load.hpp>
 #include <components/fallback/fallback.hpp>
 #include <components/fallback/validate.hpp>
+#include <components/files/collections.hpp>
 #include <components/files/configurationmanager.hpp>
 #include <components/files/conversion.hpp>
+#include <components/files/multidircollection.hpp>
 #include <components/platform/platform.hpp>
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/resource/imagemanager.hpp>
@@ -31,8 +34,14 @@
 #include <boost/program_options.hpp>
 
 #include <cstddef>
-#include <stdexcept>
+#include <cstdint>
+#include <filesystem>
+#include <iostream>
+#include <map>
+#include <string>
 #include <thread>
+#include <type_traits>
+#include <utility>
 #include <vector>
 
 #ifdef WIN32
diff --git a/apps/navmeshtool/navmesh.hpp b/apps/navmeshtool/navmesh.hpp
index 817531a207..4e607f4f2b 100644
--- a/apps/navmeshtool/navmesh.hpp
+++ b/apps/navmeshtool/navmesh.hpp
@@ -1,8 +1,6 @@
 #ifndef OPENMW_NAVMESHTOOL_NAVMESH_H
 #define OPENMW_NAVMESHTOOL_NAVMESH_H
 
-#include <osg/Vec3f>
-
 #include <cstddef>
 
 namespace DetourNavigator
diff --git a/apps/niftest/niftest.cpp b/apps/niftest/niftest.cpp
index 06b6562dee..6ea00651ca 100644
--- a/apps/niftest/niftest.cpp
+++ b/apps/niftest/niftest.cpp
@@ -1,13 +1,19 @@
 /// Program to test .nif files both on the FileSystem and in BSA archives.
 
+#include <exception>
 #include <filesystem>
 #include <iostream>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <components/files/configurationmanager.hpp>
 #include <components/files/constrainedfilestream.hpp>
 #include <components/files/conversion.hpp>
 #include <components/misc/strings/algorithm.hpp>
 #include <components/nif/niffile.hpp>
+#include <components/vfs/archive.hpp>
 #include <components/vfs/bsaarchive.hpp>
 #include <components/vfs/filesystemarchive.hpp>
 #include <components/vfs/manager.hpp>
diff --git a/apps/opencs/model/filter/andnode.hpp b/apps/opencs/model/filter/andnode.hpp
index 763e03db11..d673b8f5c0 100644
--- a/apps/opencs/model/filter/andnode.hpp
+++ b/apps/opencs/model/filter/andnode.hpp
@@ -3,8 +3,18 @@
 
 #include "narynode.hpp"
 
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace CSMWorld
+{
+    class IdTableBase;
+}
+
 namespace CSMFilter
 {
+    class Node;
     class AndNode : public NAryNode
     {
     public:
diff --git a/apps/opencs/model/filter/notnode.cpp b/apps/opencs/model/filter/notnode.cpp
index c9074843b8..80162dc9e5 100644
--- a/apps/opencs/model/filter/notnode.cpp
+++ b/apps/opencs/model/filter/notnode.cpp
@@ -1,5 +1,13 @@
 #include "notnode.hpp"
 
+#include <apps/opencs/model/filter/node.hpp>
+#include <apps/opencs/model/filter/unarynode.hpp>
+
+namespace CSMWorld
+{
+    class IdTableBase;
+}
+
 CSMFilter::NotNode::NotNode(std::shared_ptr<Node> child)
     : UnaryNode(child, "not")
 {
diff --git a/apps/opencs/model/filter/notnode.hpp b/apps/opencs/model/filter/notnode.hpp
index 34a277d5a0..955a19f7bc 100644
--- a/apps/opencs/model/filter/notnode.hpp
+++ b/apps/opencs/model/filter/notnode.hpp
@@ -1,10 +1,19 @@
 #ifndef CSM_FILTER_NOTNODE_H
 #define CSM_FILTER_NOTNODE_H
 
+#include <map>
+#include <memory>
+
 #include "unarynode.hpp"
 
+namespace CSMWorld
+{
+    class IdTableBase;
+}
+
 namespace CSMFilter
 {
+    class Node;
     class NotNode : public UnaryNode
     {
     public:
diff --git a/apps/opencs/model/filter/ornode.cpp b/apps/opencs/model/filter/ornode.cpp
index 19e06f1aed..ed17b88a56 100644
--- a/apps/opencs/model/filter/ornode.cpp
+++ b/apps/opencs/model/filter/ornode.cpp
@@ -1,5 +1,13 @@
 #include "ornode.hpp"
 
+#include <apps/opencs/model/filter/narynode.hpp>
+#include <apps/opencs/model/filter/node.hpp>
+
+namespace CSMWorld
+{
+    class IdTableBase;
+}
+
 CSMFilter::OrNode::OrNode(const std::vector<std::shared_ptr<Node>>& nodes)
     : NAryNode(nodes, "or")
 {
diff --git a/apps/opencs/model/filter/ornode.hpp b/apps/opencs/model/filter/ornode.hpp
index 80830cff4e..2dd8422708 100644
--- a/apps/opencs/model/filter/ornode.hpp
+++ b/apps/opencs/model/filter/ornode.hpp
@@ -3,8 +3,18 @@
 
 #include "narynode.hpp"
 
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace CSMWorld
+{
+    class IdTableBase;
+}
+
 namespace CSMFilter
 {
+    class Node;
     class OrNode : public NAryNode
     {
     public:
diff --git a/apps/opencs/model/filter/parser.cpp b/apps/opencs/model/filter/parser.cpp
index 32b683f910..705137e0d7 100644
--- a/apps/opencs/model/filter/parser.cpp
+++ b/apps/opencs/model/filter/parser.cpp
@@ -1,9 +1,15 @@
 #include "parser.hpp"
 
+#include <algorithm>
 #include <cctype>
 #include <sstream>
 #include <stdexcept>
+#include <vector>
 
+#include <apps/opencs/model/world/idcollection.hpp>
+#include <apps/opencs/model/world/record.hpp>
+
+#include <components/esm3/filter.hpp>
 #include <components/misc/strings/lower.hpp>
 
 #include "../world/columns.hpp"
diff --git a/apps/opencs/model/filter/parser.hpp b/apps/opencs/model/filter/parser.hpp
index b7af8b6041..d5e3f3aed3 100644
--- a/apps/opencs/model/filter/parser.hpp
+++ b/apps/opencs/model/filter/parser.hpp
@@ -3,14 +3,11 @@
 
 #include <memory>
 #include <string>
+
 namespace CSMFilter
 {
     class Node;
 }
-namespace CSMFilter
-{
-    struct Token;
-}
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/prefs/category.hpp b/apps/opencs/model/prefs/category.hpp
index 3f98e9fbb3..5c75f99067 100644
--- a/apps/opencs/model/prefs/category.hpp
+++ b/apps/opencs/model/prefs/category.hpp
@@ -1,6 +1,7 @@
 #ifndef CSM_PREFS_CATEGORY_H
 #define CSM_PREFS_CATEGORY_H
 
+#include <algorithm>
 #include <string>
 #include <vector>
 
diff --git a/apps/opencs/view/filter/editwidget.cpp b/apps/opencs/view/filter/editwidget.cpp
index b94d59083b..fce466c2eb 100644
--- a/apps/opencs/view/filter/editwidget.cpp
+++ b/apps/opencs/view/filter/editwidget.cpp
@@ -8,6 +8,9 @@
 #include <QMenu>
 #include <QString>
 
+#include <apps/opencs/model/filter/parser.hpp>
+#include <apps/opencs/model/world/universalid.hpp>
+
 #include <components/misc/helpviewer.hpp>
 
 #include "../../model/prefs/shortcut.hpp"
diff --git a/apps/opencs/view/render/actor.cpp b/apps/opencs/view/render/actor.cpp
index 2ac5bdea80..b5a7fd3e5f 100644
--- a/apps/opencs/view/render/actor.cpp
+++ b/apps/opencs/view/render/actor.cpp
@@ -1,11 +1,21 @@
 #include "actor.hpp"
 
+#include <memory>
+#include <unordered_map>
+#include <utility>
+
 #include <osg/Group>
+#include <osg/MatrixTransform>
 #include <osg/Node>
 
+#include <apps/opencs/model/world/actoradapter.hpp>
+#include <apps/opencs/model/world/idcollection.hpp>
+#include <apps/opencs/model/world/record.hpp>
+
+#include <components/esm3/loadbody.hpp>
 #include <components/esm3/mappings.hpp>
 #include <components/misc/resourcehelpers.hpp>
-#include <components/resource/resourcemanager.hpp>
+#include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/attach.hpp>
 #include <components/sceneutil/skeleton.hpp>
diff --git a/apps/opencs/view/render/actor.hpp b/apps/opencs/view/render/actor.hpp
index 414cd438d7..00f3b2c775 100644
--- a/apps/opencs/view/render/actor.hpp
+++ b/apps/opencs/view/render/actor.hpp
@@ -13,11 +13,6 @@
 
 #include "../../model/world/actoradapter.hpp"
 
-namespace osg
-{
-    class Group;
-}
-
 namespace CSMWorld
 {
     class Data;
diff --git a/apps/opencs/view/render/brushdraw.cpp b/apps/opencs/view/render/brushdraw.cpp
index c89cfe41a5..0d45009399 100644
--- a/apps/opencs/view/render/brushdraw.cpp
+++ b/apps/opencs/view/render/brushdraw.cpp
@@ -1,13 +1,24 @@
 #include "brushdraw.hpp"
 
 #include <limits>
+#include <set>
+#include <utility>
 
 #include <osg/Array>
+#include <osg/GL>
 #include <osg/Geometry>
 #include <osg/Group>
+#include <osg/Math>
+#include <osg/PrimitiveSet>
+#include <osg/StateAttribute>
+#include <osg/StateSet>
+#include <osg/Vec4f>
 
+#include <osgUtil/IntersectionVisitor>
 #include <osgUtil/LineSegmentIntersector>
 
+#include <components/esm3/loadland.hpp>
+
 #include "../../model/world/cellcoordinates.hpp"
 #include "../widget/brushshapes.hpp"
 #include "mask.hpp"
diff --git a/apps/opencs/view/render/brushdraw.hpp b/apps/opencs/view/render/brushdraw.hpp
index 64ded1c10b..27a276c7cc 100644
--- a/apps/opencs/view/render/brushdraw.hpp
+++ b/apps/opencs/view/render/brushdraw.hpp
@@ -1,11 +1,16 @@
 #ifndef CSV_RENDER_BRUSHDRAW_H
 #define CSV_RENDER_BRUSHDRAW_H
 
-#include <osg/Geometry>
-#include <osg/Group>
+#include <osg/Vec3d>
+#include <osg/ref_ptr>
 
 #include "../widget/brushshapes.hpp"
-#include <components/esm3/loadland.hpp>
+
+namespace osg
+{
+    class Geometry;
+    class Group;
+}
 
 namespace CSVRender
 {
diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index 14c8218ef6..9aa418baa0 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -1,17 +1,19 @@
 #include "cameracontroller.hpp"
 
 #include <cmath>
+#include <set>
+#include <string>
 
 #include <QWidget>
 
 #include <osg/BoundingBox>
 #include <osg/Camera>
 #include <osg/ComputeBoundsVisitor>
-#include <osg/Drawable>
 #include <osg/Group>
 #include <osg/Matrixd>
 #include <osg/Quat>
 
+#include <osgUtil/IntersectionVisitor>
 #include <osgUtil/LineSegmentIntersector>
 
 #include "../../model/prefs/shortcut.hpp"
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
index 4ebca23930..c5108f900f 100644
--- a/apps/opencs/view/render/cameracontroller.hpp
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -1,13 +1,11 @@
 #ifndef OPENCS_VIEW_CAMERACONTROLLER_H
 #define OPENCS_VIEW_CAMERACONTROLLER_H
 
-#include <string>
 #include <vector>
 
 #include <QObject>
 
 #include <osg/Vec3d>
-#include <osg/ref_ptr>
 
 namespace osg
 {
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index e9bcef2e8a..a301744bea 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -1,14 +1,13 @@
 #include "cell.hpp"
 
+#include <algorithm>
 #include <set>
-#include <type_traits>
 #include <utility>
 
 #include <osg/Callback>
 #include <osg/Group>
 #include <osg/Node>
 #include <osg/NodeVisitor>
-#include <osg/PositionAttitudeTransform>
 #include <osg/Referenced>
 
 #include <components/esm/defs.hpp>
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 42f61c0956..d5c68ac548 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -6,18 +6,17 @@
 #include <string>
 #include <vector>
 
+#include <osg/Vec3d>
 #include <osg/ref_ptr>
 
 #include "../../model/world/cellcoordinates.hpp"
 #include "instancedragmodes.hpp"
-#include "terrainstorage.hpp"
 
 class QModelIndex;
 
 namespace osg
 {
     class Group;
-    class Geometry;
 }
 
 namespace CSMWorld
@@ -35,12 +34,12 @@ namespace CSVRender
     class CellWater;
     class Pathgrid;
     class TagBase;
+    class TerrainStorage;
     class Object;
 
     class CellArrow;
     class CellBorder;
     class CellMarker;
-    class CellWater;
 
     class Cell
     {
diff --git a/apps/opencs/view/render/cellarrow.hpp b/apps/opencs/view/render/cellarrow.hpp
index 9bf66bdcd8..8f175ca999 100644
--- a/apps/opencs/view/render/cellarrow.hpp
+++ b/apps/opencs/view/render/cellarrow.hpp
@@ -3,6 +3,8 @@
 
 #include "tagbase.hpp"
 
+#include <QString>
+
 #include <osg/ref_ptr>
 
 #include "../../model/world/cellcoordinates.hpp"
diff --git a/apps/opencs/view/render/cellborder.cpp b/apps/opencs/view/render/cellborder.cpp
index 67154adee3..f63814dcb7 100644
--- a/apps/opencs/view/render/cellborder.cpp
+++ b/apps/opencs/view/render/cellborder.cpp
@@ -1,9 +1,15 @@
 #include "cellborder.hpp"
 
+#include <osg/Array>
+#include <osg/GL>
 #include <osg/Geometry>
 #include <osg/Group>
 #include <osg/PositionAttitudeTransform>
 #include <osg/PrimitiveSet>
+#include <osg/StateAttribute>
+#include <osg/StateSet>
+#include <osg/Vec3f>
+#include <osg/Vec4f>
 
 #include <components/esm3/loadland.hpp>
 
diff --git a/apps/opencs/view/render/cellmarker.cpp b/apps/opencs/view/render/cellmarker.cpp
index 692728a995..5b116ec04d 100644
--- a/apps/opencs/view/render/cellmarker.cpp
+++ b/apps/opencs/view/render/cellmarker.cpp
@@ -1,11 +1,24 @@
 #include "cellmarker.hpp"
 
+#include <string>
+
 #include <osg/AutoTransform>
+#include <osg/GL>
+#include <osg/Group>
 #include <osg/Material>
+#include <osg/StateAttribute>
+#include <osg/StateSet>
+#include <osg/Vec3f>
+#include <osg/Vec4f>
 #include <osgText/Text>
+#include <osgText/TextBase>
 
 #include <components/misc/constants.hpp>
 
+#include <apps/opencs/model/world/cellcoordinates.hpp>
+#include <apps/opencs/view/render/mask.hpp>
+#include <apps/opencs/view/render/tagbase.hpp>
+
 CSVRender::CellMarkerTag::CellMarkerTag(CellMarker* marker)
     : TagBase(Mask_CellMarker)
     , mMarker(marker)
diff --git a/apps/opencs/view/render/cellwater.hpp b/apps/opencs/view/render/cellwater.hpp
index 8a965d743e..72e6a712b0 100644
--- a/apps/opencs/view/render/cellwater.hpp
+++ b/apps/opencs/view/render/cellwater.hpp
@@ -5,10 +5,9 @@
 
 #include <osg/ref_ptr>
 
-#include <QModelIndex>
 #include <QObject>
 
-#include "../../model/world/record.hpp"
+class QModelIndex;
 
 namespace osg
 {
@@ -22,6 +21,9 @@ namespace CSMWorld
     struct Cell;
     class CellCoordinates;
     class Data;
+
+    template <typename ESXRecordT>
+    struct Record;
 }
 
 namespace CSVRender
diff --git a/apps/opencs/view/render/commands.cpp b/apps/opencs/view/render/commands.cpp
index cbc97e3d4b..68e72778ae 100644
--- a/apps/opencs/view/render/commands.cpp
+++ b/apps/opencs/view/render/commands.cpp
@@ -1,5 +1,10 @@
 #include "commands.hpp"
 
+#include <memory>
+
+#include <apps/opencs/view/render/editmode.hpp>
+#include <apps/opencs/view/render/terrainselection.hpp>
+
 #include <components/debug/debuglog.hpp>
 
 #include "terrainshapemode.hpp"
diff --git a/apps/opencs/view/render/commands.hpp b/apps/opencs/view/render/commands.hpp
index 62b7fbfdcd..69ba9b0f7f 100644
--- a/apps/opencs/view/render/commands.hpp
+++ b/apps/opencs/view/render/commands.hpp
@@ -2,14 +2,11 @@
 #define CSV_RENDER_COMMANDS_HPP
 
 #include <QPointer>
-
 #include <QUndoCommand>
 
-#include "worldspacewidget.hpp"
-
 namespace CSVRender
 {
-    class TerrainSelection;
+    class WorldspaceWidget;
 
     /*
         Current solution to force a redrawing of the terrain-selection grid
diff --git a/apps/opencs/view/render/instanceselectionmode.cpp b/apps/opencs/view/render/instanceselectionmode.cpp
index 8506646510..fa8998747d 100644
--- a/apps/opencs/view/render/instanceselectionmode.cpp
+++ b/apps/opencs/view/render/instanceselectionmode.cpp
@@ -1,14 +1,33 @@
 #include "instanceselectionmode.hpp"
 
+#include <cmath>
+#include <string>
+#include <vector>
+
+#include <apps/opencs/model/doc/document.hpp>
+#include <apps/opencs/model/world/data.hpp>
+#include <apps/opencs/model/world/universalid.hpp>
+#include <apps/opencs/view/render/mask.hpp>
+#include <apps/opencs/view/render/selectionmode.hpp>
+
+#include <osg/Array>
+#include <osg/GL>
+#include <osg/Geometry>
+#include <osg/Group>
+#include <osg/Math>
+#include <osg/PositionAttitudeTransform>
+#include <osg/PrimitiveSet>
+#include <osg/StateAttribute>
+#include <osg/StateSet>
+#include <osg/Vec3d>
+#include <osg/Vec3f>
+#include <osg/Vec4f>
+#include <osg/ref_ptr>
+
 #include <QAction>
 #include <QMenu>
 #include <QPoint>
 
-#include <osg/Group>
-#include <osg/PositionAttitudeTransform>
-#include <osg/Vec3d>
-#include <osg/ref_ptr>
-
 #include "../../model/world/commands.hpp"
 #include "../../model/world/idtable.hpp"
 
@@ -16,8 +35,15 @@
 #include "object.hpp"
 #include "worldspacewidget.hpp"
 
+namespace CSVWidget
+{
+    class SceneToolbar;
+}
+
 namespace CSVRender
 {
+    class TagBase;
+
     InstanceSelectionMode::InstanceSelectionMode(
         CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget, osg::Group* cellNode)
         : SelectionMode(parent, worldspaceWidget, Mask_Reference)
diff --git a/apps/opencs/view/render/instanceselectionmode.hpp b/apps/opencs/view/render/instanceselectionmode.hpp
index cd5afd5d1a..9551f964d6 100644
--- a/apps/opencs/view/render/instanceselectionmode.hpp
+++ b/apps/opencs/view/render/instanceselectionmode.hpp
@@ -1,16 +1,32 @@
 #ifndef CSV_RENDER_INSTANCE_SELECTION_MODE_H
 #define CSV_RENDER_INSTANCE_SELECTION_MODE_H
 
-#include <QPoint>
-
-#include <osg/PositionAttitudeTransform>
 #include <osg/Vec3d>
+#include <osg/ref_ptr>
+
+class QAction;
+class QMenu;
+class QObject;
+class QPoint;
+
+namespace CSVWidget
+{
+    class SceneToolbar;
+}
+
+namespace osg
+{
+    class PositionAttitudeTransform;
+    class Group;
+    class Vec3f;
+}
 
 #include "instancedragmodes.hpp"
 #include "selectionmode.hpp"
 
 namespace CSVRender
 {
+    class WorldspaceWidget;
     class InstanceSelectionMode : public SelectionMode
     {
         Q_OBJECT
diff --git a/apps/opencs/view/render/lighting.cpp b/apps/opencs/view/render/lighting.cpp
index 93b343c2b7..1d150c42a8 100644
--- a/apps/opencs/view/render/lighting.cpp
+++ b/apps/opencs/view/render/lighting.cpp
@@ -1,10 +1,17 @@
 #include "lighting.hpp"
 
+#include <string>
+
+#include <osg/Group>
 #include <osg/LightSource>
 #include <osg/NodeVisitor>
+#include <osg/Object>
 #include <osg/Switch>
 #include <osg/ValueObject>
 
+#include <apps/opencs/model/prefs/category.hpp>
+#include <apps/opencs/model/prefs/setting.hpp>
+
 #include <components/misc/constants.hpp>
 
 #include "../../model/prefs/state.hpp"
diff --git a/apps/opencs/view/render/lightingbright.cpp b/apps/opencs/view/render/lightingbright.cpp
index f7649d42f5..7acd24fc62 100644
--- a/apps/opencs/view/render/lightingbright.cpp
+++ b/apps/opencs/view/render/lightingbright.cpp
@@ -1,6 +1,9 @@
 #include "lightingbright.hpp"
 
+#include <osg/Group>
+#include <osg/Light>
 #include <osg/LightSource>
+#include <osg/ref_ptr>
 
 CSVRender::LightingBright::LightingBright() {}
 
diff --git a/apps/opencs/view/render/lightingbright.hpp b/apps/opencs/view/render/lightingbright.hpp
index 0f7de195c1..8ee570e2a2 100644
--- a/apps/opencs/view/render/lightingbright.hpp
+++ b/apps/opencs/view/render/lightingbright.hpp
@@ -3,9 +3,10 @@
 
 #include "lighting.hpp"
 
+#include <osg/Vec4f>
+
 namespace osg
 {
-    class Light;
     class Group;
 }
 
diff --git a/apps/opencs/view/render/lightingday.cpp b/apps/opencs/view/render/lightingday.cpp
index 91b098c707..c960d18e81 100644
--- a/apps/opencs/view/render/lightingday.cpp
+++ b/apps/opencs/view/render/lightingday.cpp
@@ -1,6 +1,9 @@
 #include "lightingday.hpp"
 
+#include <osg/Group>
+#include <osg/Light>
 #include <osg/LightSource>
+#include <osg/ref_ptr>
 
 CSVRender::LightingDay::LightingDay() {}
 
diff --git a/apps/opencs/view/render/lightingday.hpp b/apps/opencs/view/render/lightingday.hpp
index fb7ff440b7..aeff1c5078 100644
--- a/apps/opencs/view/render/lightingday.hpp
+++ b/apps/opencs/view/render/lightingday.hpp
@@ -3,6 +3,8 @@
 
 #include "lighting.hpp"
 
+#include <osg/Vec4f>
+
 namespace CSVRender
 {
     class LightingDay : public Lighting
diff --git a/apps/opencs/view/render/lightingnight.cpp b/apps/opencs/view/render/lightingnight.cpp
index 80aac5b7f4..898df865ce 100644
--- a/apps/opencs/view/render/lightingnight.cpp
+++ b/apps/opencs/view/render/lightingnight.cpp
@@ -1,6 +1,9 @@
 #include "lightingnight.hpp"
 
+#include <osg/Group>
+#include <osg/Light>
 #include <osg/LightSource>
+#include <osg/ref_ptr>
 
 CSVRender::LightingNight::LightingNight() {}
 
diff --git a/apps/opencs/view/render/lightingnight.hpp b/apps/opencs/view/render/lightingnight.hpp
index 2a4e0f87ff..6232f8d496 100644
--- a/apps/opencs/view/render/lightingnight.hpp
+++ b/apps/opencs/view/render/lightingnight.hpp
@@ -3,6 +3,8 @@
 
 #include "lighting.hpp"
 
+#include <osg/Vec4f>
+
 namespace CSVRender
 {
     class LightingNight : public Lighting
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 3b2f26504b..87e91844bf 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -1,9 +1,12 @@
 #include "object.hpp"
 
+#include <algorithm>
+#include <cmath>
+#include <exception>
 #include <stdexcept>
 #include <string>
+#include <utility>
 
-#include <osg/Depth>
 #include <osg/Group>
 #include <osg/PositionAttitudeTransform>
 
diff --git a/apps/opencs/view/render/object.hpp b/apps/opencs/view/render/object.hpp
index 47bd09f657..1c1f069845 100644
--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@@ -4,8 +4,7 @@
 #include <memory>
 #include <string>
 
-#include <osg/Geometry>
-#include <osg/Referenced>
+#include <osg/Vec3f>
 #include <osg/ref_ptr>
 
 #include <components/esm/defs.hpp>
@@ -13,11 +12,11 @@
 #include "tagbase.hpp"
 
 class QModelIndex;
-class QUndoStack;
 
 namespace osg
 {
     class PositionAttitudeTransform;
+    class Geometry;
     class Group;
     class Node;
 }
diff --git a/apps/opencs/view/render/orbitcameramode.hpp b/apps/opencs/view/render/orbitcameramode.hpp
index 89fa93d3b8..41480de215 100644
--- a/apps/opencs/view/render/orbitcameramode.hpp
+++ b/apps/opencs/view/render/orbitcameramode.hpp
@@ -1,8 +1,6 @@
 #ifndef CSV_RENDER_ORBITCAMERAPICKMODE_H
 #define CSV_RENDER_ORBITCAMERAPICKMODE_H
 
-#include <memory>
-
 #include "../widget/modebutton.hpp"
 
 namespace CSMPrefs
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index 6a4ba40bdb..5c45e2b31f 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -1,6 +1,6 @@
 #include "pathgridmode.hpp"
 
-#include <QPoint>
+#include <QIcon>
 
 #include <components/sceneutil/pathgridutil.hpp>
 
@@ -16,6 +16,23 @@
 #include "pathgridselectionmode.hpp"
 #include "worldspacewidget.hpp"
 
+#include <apps/opencs/model/doc/document.hpp>
+#include <apps/opencs/model/prefs/category.hpp>
+#include <apps/opencs/model/prefs/setting.hpp>
+#include <apps/opencs/view/render/editmode.hpp>
+#include <apps/opencs/view/render/tagbase.hpp>
+
+#include <osg/Camera>
+#include <osg/Matrixd>
+#include <osg/Vec3d>
+#include <osg/ref_ptr>
+
+#include <vector>
+
+class QPoint;
+class QUndoStack;
+class QWidget;
+
 namespace CSVRender
 {
     PathgridMode::PathgridMode(WorldspaceWidget* worldspaceWidget, QWidget* parent)
diff --git a/apps/opencs/view/render/previewwidget.hpp b/apps/opencs/view/render/previewwidget.hpp
index 6851922e8d..4d9c9a0bf8 100644
--- a/apps/opencs/view/render/previewwidget.hpp
+++ b/apps/opencs/view/render/previewwidget.hpp
@@ -7,11 +7,6 @@
 
 class QModelIndex;
 
-namespace VFS
-{
-    class Manager;
-}
-
 namespace CSMWorld
 {
     class Data;
diff --git a/apps/opencs/view/render/scenewidget.hpp b/apps/opencs/view/render/scenewidget.hpp
index 6d2230aa7e..d6aad24290 100644
--- a/apps/opencs/view/render/scenewidget.hpp
+++ b/apps/opencs/view/render/scenewidget.hpp
@@ -1,14 +1,18 @@
 #ifndef OPENCS_VIEW_SCENEWIDGET_H
 #define OPENCS_VIEW_SCENEWIDGET_H
 
-#include <map>
 #include <memory>
+#include <string>
 
+#include <QColor>
+#include <QObject>
 #include <QTimer>
 #include <QWidget>
 
+#include <osg/Vec4f>
+#include <osg/ref_ptr>
+
 #include <osgViewer/CompositeViewer>
-#include <osgViewer/View>
 
 #include "lightingbright.hpp"
 #include "lightingday.hpp"
diff --git a/apps/opencs/view/render/tagbase.cpp b/apps/opencs/view/render/tagbase.cpp
index bbbbc78390..b52a553c97 100644
--- a/apps/opencs/view/render/tagbase.cpp
+++ b/apps/opencs/view/render/tagbase.cpp
@@ -1,6 +1,7 @@
-
 #include "tagbase.hpp"
 
+#include <apps/opencs/view/render/mask.hpp>
+
 CSVRender::TagBase::TagBase(Mask mask)
     : mMask(mask)
 {
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index be3ed672d8..72bca9648f 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -9,7 +9,6 @@
 #include <QIcon>
 #include <QWidget>
 
-#include <osg/Group>
 #include <osg/Vec3f>
 
 #include <components/debug/debuglog.hpp>
diff --git a/apps/opencs/view/render/terrainstorage.cpp b/apps/opencs/view/render/terrainstorage.cpp
index 37ceff6719..0fccd08193 100644
--- a/apps/opencs/view/render/terrainstorage.cpp
+++ b/apps/opencs/view/render/terrainstorage.cpp
@@ -1,16 +1,18 @@
 #include "terrainstorage.hpp"
 
+#include <components/esm3/loadltex.hpp>
 #include <components/esm3terrain/storage.hpp>
+#include <components/resource/resourcesystem.hpp>
 
-#include <algorithm>
 #include <apps/opencs/model/world/data.hpp>
 #include <apps/opencs/model/world/idcollection.hpp>
 #include <apps/opencs/model/world/land.hpp>
 #include <apps/opencs/model/world/landtexture.hpp>
 #include <apps/opencs/model/world/record.hpp>
-#include <components/resource/resourcesystem.hpp>
+
+#include <algorithm>
+#include <cmath>
 #include <iterator>
-#include <math.h>
 #include <memory>
 #include <osg/Vec4ub>
 #include <stdexcept>
diff --git a/apps/opencs/view/render/terrainstorage.hpp b/apps/opencs/view/render/terrainstorage.hpp
index 17eb1af9a8..18f38effbf 100644
--- a/apps/opencs/view/render/terrainstorage.hpp
+++ b/apps/opencs/view/render/terrainstorage.hpp
@@ -4,7 +4,6 @@
 #include <array>
 
 #include <components/esm3/loadland.hpp>
-#include <components/esm3/loadltex.hpp>
 #include <components/esm3terrain/storage.hpp>
 #include <osg/ref_ptr>
 
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index ccc884bdeb..41247b1100 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -1,6 +1,7 @@
 #include "worldspacewidget.hpp"
 
 #include <algorithm>
+#include <set>
 
 #include <QDragEnterEvent>
 #include <QDragMoveEvent>
@@ -8,6 +9,27 @@
 #include <QMouseEvent>
 #include <QToolTip>
 
+#include <apps/opencs/model/doc/document.hpp>
+#include <apps/opencs/model/prefs/category.hpp>
+#include <apps/opencs/model/prefs/setting.hpp>
+#include <apps/opencs/model/world/columns.hpp>
+#include <apps/opencs/model/world/data.hpp>
+#include <apps/opencs/model/world/record.hpp>
+#include <apps/opencs/view/render/editmode.hpp>
+#include <apps/opencs/view/render/scenewidget.hpp>
+#include <apps/opencs/view/widget/modebutton.hpp>
+
+#include <components/esm/defs.hpp>
+
+#include <osg/Camera>
+#include <osg/Group>
+#include <osg/Matrixd>
+#include <osg/Node>
+#include <osg/Referenced>
+#include <osg/Viewport>
+#include <osgUtil/IntersectionVisitor>
+#include <osgViewer/View>
+
 #include <osgUtil/LineSegmentIntersector>
 
 #include "../../model/world/idtable.hpp"
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 9933c9d7ab..752c42615c 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -6,6 +6,8 @@
 
 #include "../../model/doc/document.hpp"
 
+#include <apps/opencs/view/render/tagbase.hpp>
+
 #include "instancedragmodes.hpp"
 #include "scenewidget.hpp"
 
@@ -30,9 +32,7 @@ namespace CSVWidget
 
 namespace CSVRender
 {
-    class TagBase;
     class Cell;
-    class CellArrow;
     class EditMode;
 
     struct WorldspaceHitResult
diff --git a/apps/opencs/view/widget/droplineedit.cpp b/apps/opencs/view/widget/droplineedit.cpp
index 3e429402c0..4b1bf2aef6 100644
--- a/apps/opencs/view/widget/droplineedit.cpp
+++ b/apps/opencs/view/widget/droplineedit.cpp
@@ -1,10 +1,14 @@
 #include "droplineedit.hpp"
 
+#include <string>
+
 #include <QDropEvent>
 
 #include "../../model/world/tablemimedata.hpp"
 #include "../../model/world/universalid.hpp"
 
+#include <apps/opencs/model/world/columnbase.hpp>
+
 #include "../world/dragdroputils.hpp"
 
 CSVWidget::DropLineEdit::DropLineEdit(CSMWorld::ColumnBase::Display type, QWidget* parent)
diff --git a/apps/opencs/view/widget/droplineedit.hpp b/apps/opencs/view/widget/droplineedit.hpp
index 5d6fd26227..3a707d80c1 100644
--- a/apps/opencs/view/widget/droplineedit.hpp
+++ b/apps/opencs/view/widget/droplineedit.hpp
@@ -12,7 +12,6 @@ namespace CSMDoc
 
 namespace CSMWorld
 {
-    class TableMimeData;
     class UniversalId;
 }
 
diff --git a/apps/opencs/view/widget/scenetoolshapebrush.cpp b/apps/opencs/view/widget/scenetoolshapebrush.cpp
index 474fef28c9..7ed1bfc9a7 100644
--- a/apps/opencs/view/widget/scenetoolshapebrush.cpp
+++ b/apps/opencs/view/widget/scenetoolshapebrush.cpp
@@ -19,9 +19,13 @@
 #include "brushshapes.hpp"
 #include "scenetool.hpp"
 
-#include "../../model/doc/document.hpp"
 #include "../../model/prefs/state.hpp"
 
+namespace CSMDoc
+{
+    class Document;
+}
+
 CSVWidget::ShapeBrushSizeControls::ShapeBrushSizeControls(const QString& title, QWidget* parent)
     : QGroupBox(title, parent)
 {
diff --git a/apps/opencs/view/widget/scenetooltoggle2.cpp b/apps/opencs/view/widget/scenetooltoggle2.cpp
index 558c7f9850..da15a9a0a7 100644
--- a/apps/opencs/view/widget/scenetooltoggle2.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle2.cpp
@@ -1,7 +1,6 @@
 #include "scenetooltoggle2.hpp"
 
 #include <sstream>
-#include <stdexcept>
 
 #include <QFrame>
 #include <QHBoxLayout>
diff --git a/apps/wizard/installationtargetpage.cpp b/apps/wizard/installationtargetpage.cpp
index 7e23a19d37..c32573184d 100644
--- a/apps/wizard/installationtargetpage.cpp
+++ b/apps/wizard/installationtargetpage.cpp
@@ -1,9 +1,12 @@
 #include "installationtargetpage.hpp"
 
+#include <string>
+
 #include <QDebug>
 #include <QFileDialog>
 #include <QMessageBox>
 
+#include <components/files/configurationmanager.hpp>
 #include <components/files/conversion.hpp>
 
 #include "mainwizard.hpp"
diff --git a/apps/wizard/installationtargetpage.hpp b/apps/wizard/installationtargetpage.hpp
index 6d5d066636..b7af537726 100644
--- a/apps/wizard/installationtargetpage.hpp
+++ b/apps/wizard/installationtargetpage.hpp
@@ -1,6 +1,8 @@
 #ifndef INSTALLATIONTARGETPAGE_HPP
 #define INSTALLATIONTARGETPAGE_HPP
 
+#include <QWizard>
+
 #include "ui_installationtargetpage.h"
 
 namespace Files
diff --git a/apps/wizard/intropage.cpp b/apps/wizard/intropage.cpp
index 50692e20a2..c7c05369e2 100644
--- a/apps/wizard/intropage.cpp
+++ b/apps/wizard/intropage.cpp
@@ -2,6 +2,10 @@
 
 #include "mainwizard.hpp"
 
+#include <QObject>
+#include <QPixmap>
+#include <QWidget>
+
 Wizard::IntroPage::IntroPage(QWidget* parent)
     : QWizardPage(parent)
 {
diff --git a/apps/wizard/intropage.hpp b/apps/wizard/intropage.hpp
index e9031b0a3c..e8da3f9a49 100644
--- a/apps/wizard/intropage.hpp
+++ b/apps/wizard/intropage.hpp
@@ -3,6 +3,8 @@
 
 #include "ui_intropage.h"
 
+#include <QWizard>
+
 namespace Wizard
 {
     class MainWizard;
diff --git a/apps/wizard/languageselectionpage.hpp b/apps/wizard/languageselectionpage.hpp
index 5159409292..93ec630a47 100644
--- a/apps/wizard/languageselectionpage.hpp
+++ b/apps/wizard/languageselectionpage.hpp
@@ -1,8 +1,14 @@
 #ifndef LANGUAGESELECTIONPAGE_HPP
 #define LANGUAGESELECTIONPAGE_HPP
 
+#include <QString>
+#include <QWizard>
+
 #include "ui_languageselectionpage.h"
 
+class QObject;
+class QWidget;
+
 namespace Wizard
 {
     class MainWizard;
diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp
index 8de612f774..68ca8f6bf0 100644
--- a/apps/wizard/mainwizard.cpp
+++ b/apps/wizard/mainwizard.cpp
@@ -4,9 +4,11 @@
 #include <QDebug>
 #include <QDir>
 #include <QMessageBox>
+#include <QProcess>
 #include <QTextCodec>
 
 #include <components/files/qtconversion.hpp>
+#include <components/process/processinvoker.hpp>
 
 #include "componentselectionpage.hpp"
 #include "conclusionpage.hpp"
diff --git a/apps/wizard/mainwizard.hpp b/apps/wizard/mainwizard.hpp
index 9b58fbea2c..60f46fa1a5 100644
--- a/apps/wizard/mainwizard.hpp
+++ b/apps/wizard/mainwizard.hpp
@@ -1,10 +1,9 @@
 #ifndef MAINWIZARD_HPP
 #define MAINWIZARD_HPP
 
+#include <QProcess>
 #include <QWizard>
 
-#include <components/process/processinvoker.hpp>
-
 #ifndef Q_MOC_RUN
 #include <components/files/configurationmanager.hpp>
 
@@ -12,6 +11,11 @@
 #include <components/config/launchersettings.hpp>
 #endif
 
+namespace Process
+{
+    class ProcessInvoker;
+}
+
 namespace Wizard
 {
     class MainWizard : public QWizard
diff --git a/apps/wizard/unshield/unshieldworker.cpp b/apps/wizard/unshield/unshieldworker.cpp
index a7e633357c..58046dcb2c 100644
--- a/apps/wizard/unshield/unshieldworker.cpp
+++ b/apps/wizard/unshield/unshieldworker.cpp
@@ -9,6 +9,8 @@
 #include <QTextCodec>
 #include <QTextStream>
 
+#include <apps/wizard/inisettings.hpp>
+
 Wizard::UnshieldWorker::UnshieldWorker(qint64 expectedMorrowindBsaSize, QObject* parent)
     : QObject(parent)
     , mExpectedMorrowindBsaSize(expectedMorrowindBsaSize)