From bf1f4f2117d1aebd9a02ba6a2502443f590d7ccb Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 19 Aug 2022 19:17:21 +0200
Subject: [PATCH 1/2] Mark private template functions defined in cpp as inline

---
 .../opencs/model/tools/referenceablecheck.hpp | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/apps/opencs/model/tools/referenceablecheck.hpp b/apps/opencs/model/tools/referenceablecheck.hpp
index 83c8f12325..8c0ce27075 100644
--- a/apps/opencs/model/tools/referenceablecheck.hpp
+++ b/apps/opencs/model/tools/referenceablecheck.hpp
@@ -54,31 +54,29 @@ namespace CSMTools
             //Convenience functions
             void inventoryListCheck(const std::vector<ESM::ContItem>& itemList, CSMDoc::Messages& messages, const std::string& id);
 
-            template<typename ITEM> void inventoryItemCheck(const ITEM& someItem,
-                                                            CSMDoc::Messages& messages,
-                                                            const std::string& someID,
-                                                            bool enchantable); //for all enchantable items.
+            /// for all enchantable items.
+            template <typename Item>
+            inline void inventoryItemCheck(const Item& someItem, CSMDoc::Messages& messages, const std::string& someID,
+                bool enchantable);
 
-            template<typename ITEM> void inventoryItemCheck(const ITEM& someItem,
-                                                            CSMDoc::Messages& messages,
-                                                            const std::string& someID); //for non-enchantable items.
+            /// for non-enchantable items.
+            template <typename Item>
+            inline void inventoryItemCheck(const Item& someItem, CSMDoc::Messages& messages, const std::string& someID);
 
-            template<typename TOOL> void toolCheck(const TOOL& someTool,
-                                                   CSMDoc::Messages& messages,
-                                                   const std::string& someID,
-                                                   bool canbebroken); //for tools with uses.
+            /// for tools with uses.
+            template <typename Tool>
+            inline void toolCheck(const Tool& someTool, CSMDoc::Messages& messages, const std::string& someID,
+                bool canbebroken);
 
-            template<typename TOOL> void toolCheck(const TOOL& someTool,
-                                                   CSMDoc::Messages& messages,
-                                                   const std::string& someID); //for tools without uses.
+            /// for tools without uses.
+            template <typename Tool>
+            inline void toolCheck(const Tool& someTool, CSMDoc::Messages& messages, const std::string& someID);
 
-            template<typename LIST> void listCheck(const LIST& someList,
-                                                   CSMDoc::Messages& messages,
-                                                   const std::string& someID);
+            template <typename List>
+            inline void listCheck(const List& someList, CSMDoc::Messages& messages, const std::string& someID);
 
-            template<typename TOOL> void scriptCheck(const TOOL& someTool,
-                                                   CSMDoc::Messages& messages,
-                                                   const std::string& someID);
+            template <typename Tool>
+            inline void scriptCheck(const Tool& someTool, CSMDoc::Messages& messages, const std::string& someID);
 
             const CSMWorld::RefIdData& mReferencables;
             const CSMWorld::IdCollection<ESM::Race>& mRaces;

From b3882777abff176aabcf5a42c296cbb8a34cc5ca Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 19 Aug 2022 19:19:42 +0200
Subject: [PATCH 2/2] Cleanup opencs includes

---
 apps/opencs/editor.cpp                            |  1 -
 apps/opencs/model/doc/document.cpp                |  2 ++
 apps/opencs/model/doc/document.hpp                |  1 -
 apps/opencs/model/doc/stage.hpp                   |  2 --
 apps/opencs/model/tools/referenceablecheck.hpp    | 10 ++++++++--
 apps/opencs/model/tools/referencecheck.cpp        |  4 ++++
 apps/opencs/model/tools/referencecheck.hpp        | 13 +++++++++++--
 apps/opencs/model/tools/soundgencheck.cpp         |  3 +++
 apps/opencs/model/tools/soundgencheck.hpp         |  9 ++++++++-
 apps/opencs/model/world/cell.hpp                  |  1 -
 apps/opencs/model/world/columns.hpp               |  2 --
 apps/opencs/model/world/data.cpp                  |  2 ++
 apps/opencs/model/world/data.hpp                  |  2 --
 apps/opencs/model/world/idtableproxymodel.cpp     |  1 +
 apps/opencs/model/world/idtree.hpp                |  1 -
 apps/opencs/model/world/nestedcollection.cpp      |  2 ++
 apps/opencs/model/world/nestedidcollection.hpp    | 13 +++++++++++--
 apps/opencs/model/world/nestedtableproxymodel.hpp |  2 --
 apps/opencs/model/world/pathgrid.hpp              |  3 +++
 apps/opencs/model/world/refcollection.cpp         |  2 ++
 apps/opencs/model/world/refcollection.hpp         |  7 +++++--
 apps/opencs/model/world/subcellcollection.hpp     |  9 +++------
 apps/opencs/view/doc/operation.cpp                |  2 +-
 apps/opencs/view/doc/runlogsubview.cpp            |  2 ++
 apps/opencs/view/doc/runlogsubview.hpp            |  5 +++++
 apps/opencs/view/doc/subview.hpp                  |  4 ----
 apps/opencs/view/doc/view.cpp                     |  2 ++
 apps/opencs/view/doc/viewmanager.cpp              |  2 ++
 apps/opencs/view/render/instancemode.cpp          |  1 +
 apps/opencs/view/render/pathgrid.hpp              |  1 -
 apps/opencs/view/render/selectionmode.hpp         |  2 --
 apps/opencs/view/render/terrainselection.hpp      |  1 -
 apps/opencs/view/render/terrainshapemode.cpp      |  2 +-
 apps/opencs/view/render/terrainshapemode.hpp      | 10 ++++++----
 apps/opencs/view/render/terraintexturemode.hpp    |  6 +-----
 apps/opencs/view/render/worldspacewidget.cpp      |  1 +
 apps/opencs/view/render/worldspacewidget.hpp      |  2 --
 apps/opencs/view/tools/merge.cpp                  |  1 +
 apps/opencs/view/tools/reportsubview.cpp          |  3 +++
 apps/opencs/view/world/idtypedelegate.hpp         |  2 --
 apps/opencs/view/world/previewsubview.cpp         |  2 ++
 apps/opencs/view/world/recordstatusdelegate.hpp   |  1 -
 42 files changed, 93 insertions(+), 51 deletions(-)

diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index b70c9f9ca8..55627178e0 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -15,7 +15,6 @@
 #include <components/settings/settings.hpp>
 
 #include "model/doc/document.hpp"
-#include "model/world/data.hpp"
 
 #ifdef _WIN32
 #include <components/windows.hpp>
diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 48a668c8cf..034586a60c 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -1,5 +1,7 @@
 #include "document.hpp"
 
+#include "state.hpp"
+
 #include <cassert>
 #include <memory>
 
diff --git a/apps/opencs/model/doc/document.hpp b/apps/opencs/model/doc/document.hpp
index 4aae282fb6..7c9f0e85a5 100644
--- a/apps/opencs/model/doc/document.hpp
+++ b/apps/opencs/model/doc/document.hpp
@@ -16,7 +16,6 @@
 
 #include "../tools/tools.hpp"
 
-#include "state.hpp"
 #include "saving.hpp"
 #include "blacklist.hpp"
 #include "runner.hpp"
diff --git a/apps/opencs/model/doc/stage.hpp b/apps/opencs/model/doc/stage.hpp
index 1eae27a982..950019ce9a 100644
--- a/apps/opencs/model/doc/stage.hpp
+++ b/apps/opencs/model/doc/stage.hpp
@@ -4,8 +4,6 @@
 #include <vector>
 #include <string>
 
-#include "../world/universalid.hpp"
-
 #include "messages.hpp"
 
 class QString;
diff --git a/apps/opencs/model/tools/referenceablecheck.hpp b/apps/opencs/model/tools/referenceablecheck.hpp
index 8c0ce27075..c927087721 100644
--- a/apps/opencs/model/tools/referenceablecheck.hpp
+++ b/apps/opencs/model/tools/referenceablecheck.hpp
@@ -1,11 +1,17 @@
 #ifndef REFERENCEABLECHECKSTAGE_H
 #define REFERENCEABLECHECKSTAGE_H
 
-#include "../world/universalid.hpp"
 #include "../doc/stage.hpp"
-#include "../world/data.hpp"
+
 #include "../world/refiddata.hpp"
 #include "../world/resources.hpp"
+#include "../world/idcollection.hpp"
+
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadscpt.hpp>
 
 namespace CSMTools
 {
diff --git a/apps/opencs/model/tools/referencecheck.cpp b/apps/opencs/model/tools/referencecheck.cpp
index d8ff9f20ef..8baf47c6c5 100644
--- a/apps/opencs/model/tools/referencecheck.cpp
+++ b/apps/opencs/model/tools/referencecheck.cpp
@@ -2,6 +2,10 @@
 
 #include "../prefs/state.hpp"
 
+#include "../../model/world/cell.hpp"
+
+#include <components/esm3/loadfact.hpp>
+
 CSMTools::ReferenceCheckStage::ReferenceCheckStage(
     const CSMWorld::RefCollection& references,
     const CSMWorld::RefIdCollection& referencables,
diff --git a/apps/opencs/model/tools/referencecheck.hpp b/apps/opencs/model/tools/referencecheck.hpp
index 2da139869c..a1e024dda3 100644
--- a/apps/opencs/model/tools/referencecheck.hpp
+++ b/apps/opencs/model/tools/referencecheck.hpp
@@ -1,8 +1,17 @@
 #ifndef CSM_TOOLS_REFERENCECHECK_H
 #define CSM_TOOLS_REFERENCECHECK_H
 
-#include "../doc/state.hpp"
-#include "../doc/document.hpp"
+#include "../world/idcollection.hpp"
+#include "../world/refiddata.hpp"
+#include "../world/refidcollection.hpp"
+#include "../world/refcollection.hpp"
+
+#include "../doc/stage.hpp"
+
+namespace ESM
+{
+    struct Faction;
+}
 
 namespace CSMTools
 {
diff --git a/apps/opencs/model/tools/soundgencheck.cpp b/apps/opencs/model/tools/soundgencheck.cpp
index ec29e23fef..ef6c211fb3 100644
--- a/apps/opencs/model/tools/soundgencheck.cpp
+++ b/apps/opencs/model/tools/soundgencheck.cpp
@@ -5,6 +5,9 @@
 #include "../world/refiddata.hpp"
 #include "../world/universalid.hpp"
 
+#include <components/esm3/loadsoun.hpp>
+#include <components/esm3/loadsndg.hpp>
+
 CSMTools::SoundGenCheckStage::SoundGenCheckStage(const CSMWorld::IdCollection<ESM::SoundGenerator> &soundGens,
                                                  const CSMWorld::IdCollection<ESM::Sound> &sounds,
                                                  const CSMWorld::RefIdCollection &objects)
diff --git a/apps/opencs/model/tools/soundgencheck.hpp b/apps/opencs/model/tools/soundgencheck.hpp
index 306d35ded9..1a34db5694 100644
--- a/apps/opencs/model/tools/soundgencheck.hpp
+++ b/apps/opencs/model/tools/soundgencheck.hpp
@@ -1,10 +1,17 @@
 #ifndef CSM_TOOLS_SOUNDGENCHECK_HPP
 #define CSM_TOOLS_SOUNDGENCHECK_HPP
 
-#include "../world/data.hpp"
+#include "../world/idcollection.hpp"
+#include "../world/refidcollection.hpp"
 
 #include "../doc/stage.hpp"
 
+namespace ESM
+{
+    struct SoundGenerator;
+    struct Sound;
+}
+
 namespace CSMTools
 {
     /// \brief VerifyStage: make sure that sound gen records are internally consistent
diff --git a/apps/opencs/model/world/cell.hpp b/apps/opencs/model/world/cell.hpp
index 256a07d301..9f87451a46 100644
--- a/apps/opencs/model/world/cell.hpp
+++ b/apps/opencs/model/world/cell.hpp
@@ -1,7 +1,6 @@
 #ifndef CSM_WOLRD_CELL_H
 #define CSM_WOLRD_CELL_H
 
-#include <vector>
 #include <string>
 
 #include <components/esm3/loadcell.hpp>
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index 604a2f8ca1..5e43a4d561 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -4,8 +4,6 @@
 #include <string>
 #include <vector>
 
-#include "columnbase.hpp"
-
 namespace CSMWorld
 {
     namespace Columns
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 247900f407..183b7c92e7 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -15,6 +15,8 @@
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
 
+#include "../doc/messages.hpp"
+
 #include "idtable.hpp"
 #include "idtree.hpp"
 #include "columnimp.hpp"
diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index a337b74879..e56515d068 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -34,8 +34,6 @@
 #include <components/files/multidircollection.hpp>
 #include <components/to_utf8/to_utf8.hpp>
 
-#include "../doc/stage.hpp"
-
 #include "actoradapter.hpp"
 #include "idcollection.hpp"
 #include "nestedidcollection.hpp"
diff --git a/apps/opencs/model/world/idtableproxymodel.cpp b/apps/opencs/model/world/idtableproxymodel.cpp
index 9d9dd7db3d..7cc00ae29e 100644
--- a/apps/opencs/model/world/idtableproxymodel.cpp
+++ b/apps/opencs/model/world/idtableproxymodel.cpp
@@ -3,6 +3,7 @@
 #include <vector>
 
 #include "idtablebase.hpp"
+#include "columnbase.hpp"
 
 namespace
 {
diff --git a/apps/opencs/model/world/idtree.hpp b/apps/opencs/model/world/idtree.hpp
index 294645a151..2793aac62d 100644
--- a/apps/opencs/model/world/idtree.hpp
+++ b/apps/opencs/model/world/idtree.hpp
@@ -2,7 +2,6 @@
 #define CSM_WOLRD_IDTREE_H
 
 #include "idtable.hpp"
-#include "universalid.hpp"
 #include "columns.hpp"
 
 /*! \brief
diff --git a/apps/opencs/model/world/nestedcollection.cpp b/apps/opencs/model/world/nestedcollection.cpp
index 850d8c3859..6d4a2579c7 100644
--- a/apps/opencs/model/world/nestedcollection.cpp
+++ b/apps/opencs/model/world/nestedcollection.cpp
@@ -1,5 +1,7 @@
 #include "nestedcollection.hpp"
 
+#include "columnbase.hpp"
+
 CSMWorld::NestedCollection::NestedCollection()
 {}
 
diff --git a/apps/opencs/model/world/nestedidcollection.hpp b/apps/opencs/model/world/nestedidcollection.hpp
index 1928786c78..76402821f5 100644
--- a/apps/opencs/model/world/nestedidcollection.hpp
+++ b/apps/opencs/model/world/nestedidcollection.hpp
@@ -3,9 +3,11 @@
 
 #include <map>
 #include <stdexcept>
+#include <memory>
 
 #include "nestedcollection.hpp"
-#include "nestedcoladapterimp.hpp"
+#include "collection.hpp"
+#include "nestedcolumnadapter.hpp"
 
 namespace ESM
 {
@@ -16,10 +18,17 @@ namespace CSMWorld
 {
     struct NestedTableWrapperBase;
     struct Cell;
+    struct ColumnBase;
 
-    template<typename T, typename AT>
+    template <typename ESXRecordT>
+    struct IdAccessor;
+
+    template <typename ESXRecordT, typename IdAccessorT>
     class IdCollection;
 
+    template <typename ESXRecordT>
+    class NestedColumnAdapter;
+
     template<typename ESXRecordT, typename IdAccessorT = IdAccessor<ESXRecordT> >
     class NestedIdCollection : public IdCollection<ESXRecordT, IdAccessorT>, public NestedCollection
     {
diff --git a/apps/opencs/model/world/nestedtableproxymodel.hpp b/apps/opencs/model/world/nestedtableproxymodel.hpp
index b10f8a3a36..4f44cd7df6 100644
--- a/apps/opencs/model/world/nestedtableproxymodel.hpp
+++ b/apps/opencs/model/world/nestedtableproxymodel.hpp
@@ -5,8 +5,6 @@
 
 #include <QAbstractProxyModel>
 
-#include "universalid.hpp"
-#include "columns.hpp"
 #include "columnbase.hpp"
 
 /*! \brief
diff --git a/apps/opencs/model/world/pathgrid.hpp b/apps/opencs/model/world/pathgrid.hpp
index 712b3969d6..ad89918fbf 100644
--- a/apps/opencs/model/world/pathgrid.hpp
+++ b/apps/opencs/model/world/pathgrid.hpp
@@ -12,6 +12,9 @@ namespace CSMWorld
     template<typename T, typename AT>
     class IdCollection;
 
+    template<typename ESXRecordT>
+    struct IdAccessor;
+
     /// \brief Wrapper for Pathgrid record
     ///
     /// \attention The mData.mX and mData.mY fields of the ESM::Pathgrid struct are not used.
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 804a13cf7b..49abbbbf16 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -7,6 +7,8 @@
 #include "universalid.hpp"
 #include "record.hpp"
 
+#include "../doc/messages.hpp"
+
 #include <string_view>
 
 namespace CSMWorld
diff --git a/apps/opencs/model/world/refcollection.hpp b/apps/opencs/model/world/refcollection.hpp
index affd66af32..87688c162a 100644
--- a/apps/opencs/model/world/refcollection.hpp
+++ b/apps/opencs/model/world/refcollection.hpp
@@ -4,12 +4,15 @@
 #include <map>
 #include <string_view>
 
-#include "../doc/stage.hpp"
-
 #include "collection.hpp"
 #include "ref.hpp"
 #include "record.hpp"
 
+namespace CSMDoc
+{
+    class Messages;
+}
+
 namespace CSMWorld
 {
     struct Cell;
diff --git a/apps/opencs/model/world/subcellcollection.hpp b/apps/opencs/model/world/subcellcollection.hpp
index a60929680b..a792e11457 100644
--- a/apps/opencs/model/world/subcellcollection.hpp
+++ b/apps/opencs/model/world/subcellcollection.hpp
@@ -11,20 +11,17 @@ namespace ESM
 namespace CSMWorld
 {
     struct Cell;
-    template<typename T, typename AT>
-    class IdCollection;
 
     /// \brief Single type collection of top level records that are associated with cells
     template<typename ESXRecordT, typename IdAccessorT = IdAccessor<ESXRecordT> >
     class SubCellCollection : public NestedIdCollection<ESXRecordT, IdAccessorT>
     {
-            const IdCollection<Cell>& mCells;
+            const IdCollection<Cell, IdAccessor<Cell>>& mCells;
 
             void loadRecord (ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted) override;
 
         public:
-
-            SubCellCollection (const IdCollection<Cell>& cells);
+            SubCellCollection(const IdCollection<Cell, IdAccessor<Cell>>& cells);
     };
 
     template<typename ESXRecordT, typename IdAccessorT>
@@ -37,7 +34,7 @@ namespace CSMWorld
 
     template<typename ESXRecordT, typename IdAccessorT>
     SubCellCollection<ESXRecordT, IdAccessorT>::SubCellCollection (
-        const IdCollection<Cell>& cells)
+        const IdCollection<Cell, IdAccessor<Cell>>& cells)
     : mCells (cells)
     {}
 }
diff --git a/apps/opencs/view/doc/operation.cpp b/apps/opencs/view/doc/operation.cpp
index c3714a001e..fe9ccf457f 100644
--- a/apps/opencs/view/doc/operation.cpp
+++ b/apps/opencs/view/doc/operation.cpp
@@ -6,7 +6,7 @@
 #include <QPushButton>
 #include <QHBoxLayout>
 
-#include "../../model/doc/document.hpp"
+#include "../../model/doc/state.hpp"
 
 void CSVDoc::Operation::updateLabel (int threads)
 {
diff --git a/apps/opencs/view/doc/runlogsubview.cpp b/apps/opencs/view/doc/runlogsubview.cpp
index 2b7182228b..3a871ff103 100644
--- a/apps/opencs/view/doc/runlogsubview.cpp
+++ b/apps/opencs/view/doc/runlogsubview.cpp
@@ -1,5 +1,7 @@
 #include "runlogsubview.hpp"
 
+#include "../../model/doc/document.hpp"
+
 #include <QTextEdit>
 
 CSVDoc::RunLogSubView::RunLogSubView (const CSMWorld::UniversalId& id,
diff --git a/apps/opencs/view/doc/runlogsubview.hpp b/apps/opencs/view/doc/runlogsubview.hpp
index e7b490fff0..31a390276c 100644
--- a/apps/opencs/view/doc/runlogsubview.hpp
+++ b/apps/opencs/view/doc/runlogsubview.hpp
@@ -3,6 +3,11 @@
 
 #include "subview.hpp"
 
+namespace CSMDoc
+{
+    class Document;
+}
+
 namespace CSVDoc
 {
     class RunLogSubView : public SubView
diff --git a/apps/opencs/view/doc/subview.hpp b/apps/opencs/view/doc/subview.hpp
index ca9ca82252..d61609da98 100644
--- a/apps/opencs/view/doc/subview.hpp
+++ b/apps/opencs/view/doc/subview.hpp
@@ -1,12 +1,8 @@
 #ifndef CSV_DOC_SUBVIEW_H
 #define CSV_DOC_SUBVIEW_H
 
-#include "../../model/doc/document.hpp"
-
 #include "../../model/world/universalid.hpp"
 
-#include "subviewfactory.hpp"
-
 #include <QDockWidget>
 
 class QUndoStack;
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 68658248eb..3f29e69a23 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -13,6 +13,8 @@
 #include <QScreen>
 
 #include "../../model/doc/document.hpp"
+#include "../../model/doc/state.hpp"
+
 #include "../../model/prefs/state.hpp"
 #include "../../model/prefs/shortcut.hpp"
 
diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp
index b417a5b499..f8fc67de9a 100644
--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@@ -9,6 +9,8 @@
 
 #include "../../model/doc/documentmanager.hpp"
 #include "../../model/doc/document.hpp"
+#include "../../model/doc/state.hpp"
+
 #include "../../model/world/columns.hpp"
 #include "../../model/world/idcompletionmanager.hpp"
 
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index a84b26ca51..39eb27f23b 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -16,6 +16,7 @@
 #include "../../model/world/idtree.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/world/commandmacro.hpp"
+#include "../../model/world/tablemimedata.hpp"
 #include "../../model/prefs/shortcut.hpp"
 
 #include "../widget/scenetoolbar.hpp"
diff --git a/apps/opencs/view/render/pathgrid.hpp b/apps/opencs/view/render/pathgrid.hpp
index 284b98d0b6..ea17942e81 100644
--- a/apps/opencs/view/render/pathgrid.hpp
+++ b/apps/opencs/view/render/pathgrid.hpp
@@ -8,7 +8,6 @@
 #include <osg/Vec3d>
 
 #include "../../model/world/cellcoordinates.hpp"
-#include "../../model/world/idcollection.hpp"
 #include "../../model/world/subcellcollection.hpp"
 
 #include "tagbase.hpp"
diff --git a/apps/opencs/view/render/selectionmode.hpp b/apps/opencs/view/render/selectionmode.hpp
index 95f6de41b4..28e44b85b1 100644
--- a/apps/opencs/view/render/selectionmode.hpp
+++ b/apps/opencs/view/render/selectionmode.hpp
@@ -3,8 +3,6 @@
 
 #include "../widget/scenetoolmode.hpp"
 
-#include "mask.hpp"
-
 class QAction;
 
 namespace CSVRender
diff --git a/apps/opencs/view/render/terrainselection.hpp b/apps/opencs/view/render/terrainselection.hpp
index 4b4758e75e..864414ad34 100644
--- a/apps/opencs/view/render/terrainselection.hpp
+++ b/apps/opencs/view/render/terrainselection.hpp
@@ -9,7 +9,6 @@
 #include <osg/PositionAttitudeTransform>
 
 #include <components/esm3/loadland.hpp>
-#include "../../model/world/cellcoordinates.hpp"
 
 namespace osg
 {
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index bd023b9b76..3666dd835d 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -20,7 +20,7 @@
 
 #include "../../model/prefs/state.hpp"
 #include "../../model/world/idtree.hpp"
-#include "../../model/world/tablemimedata.hpp"
+#include "../../model/world/commands.hpp"
 
 #include "brushdraw.hpp"
 #include "commands.hpp"
diff --git a/apps/opencs/view/render/terrainshapemode.hpp b/apps/opencs/view/render/terrainshapemode.hpp
index 8b40483be4..0497f24da9 100644
--- a/apps/opencs/view/render/terrainshapemode.hpp
+++ b/apps/opencs/view/render/terrainshapemode.hpp
@@ -10,12 +10,9 @@
 #include <QEvent>
 
 #ifndef Q_MOC_RUN
-#include "../../model/world/data.hpp"
-#include "../../model/world/land.hpp"
 #include "../../model/doc/document.hpp"
-#include "../../model/world/commands.hpp"
 #include "../../model/world/idtable.hpp"
-#include "../../model/world/landtexture.hpp"
+#include "../../model/world/columnimp.hpp"
 #include "../widget/brushshapes.hpp"
 #endif
 
@@ -27,6 +24,11 @@ namespace CSVWidget
     class SceneToolShapeBrush;
 }
 
+namespace CSMWorld
+{
+    class CellCoordinates;
+}
+
 namespace CSVRender
 {
     class PagedWorldspaceWidget;
diff --git a/apps/opencs/view/render/terraintexturemode.hpp b/apps/opencs/view/render/terraintexturemode.hpp
index 06c95e3d79..e91a69342c 100644
--- a/apps/opencs/view/render/terraintexturemode.hpp
+++ b/apps/opencs/view/render/terraintexturemode.hpp
@@ -10,13 +10,9 @@
 #include <QEvent>
 
 #ifndef Q_MOC_RUN
-#include "../../model/world/data.hpp"
-#include "../../model/world/land.hpp"
-
 #include "../../model/doc/document.hpp"
-#include "../../model/world/commands.hpp"
 #include "../../model/world/idtable.hpp"
-#include "../../model/world/landtexture.hpp"
+#include "../../model/world/columnimp.hpp"
 #include "../widget/brushshapes.hpp"
 #include "brushdraw.hpp"
 #endif
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index a145d13d30..50e2968251 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -12,6 +12,7 @@
 
 #include "../../model/world/universalid.hpp"
 #include "../../model/world/idtable.hpp"
+#include "../../model/world/tablemimedata.hpp"
 
 #include "../../model/prefs/shortcut.hpp"
 #include "../../model/prefs/state.hpp"
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index cf244ce712..6e12153394 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -5,11 +5,9 @@
 #include <osg/Vec3>
 
 #include "../../model/doc/document.hpp"
-#include "../../model/world/tablemimedata.hpp"
 
 #include "instancedragmodes.hpp"
 #include "scenewidget.hpp"
-#include "mask.hpp"
 
 namespace CSMPrefs
 {
diff --git a/apps/opencs/view/tools/merge.cpp b/apps/opencs/view/tools/merge.cpp
index f50a85f2fc..2f94ef0ed5 100644
--- a/apps/opencs/view/tools/merge.cpp
+++ b/apps/opencs/view/tools/merge.cpp
@@ -11,6 +11,7 @@
 
 #include "../../model/doc/document.hpp"
 #include "../../model/doc/documentmanager.hpp"
+#include "../../model/doc/state.hpp"
 
 #include "../doc/filewidget.hpp"
 #include "../doc/adjusterwidget.hpp"
diff --git a/apps/opencs/view/tools/reportsubview.cpp b/apps/opencs/view/tools/reportsubview.cpp
index c7712f29cf..e3d08bd87b 100644
--- a/apps/opencs/view/tools/reportsubview.cpp
+++ b/apps/opencs/view/tools/reportsubview.cpp
@@ -2,6 +2,9 @@
 
 #include "reporttable.hpp"
 
+#include "../../model/doc/state.hpp"
+#include "../../model/doc/document.hpp"
+
 CSVTools::ReportSubView::ReportSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
 : CSVDoc::SubView (id), mDocument (document), mRefreshState (0)
 {
diff --git a/apps/opencs/view/world/idtypedelegate.hpp b/apps/opencs/view/world/idtypedelegate.hpp
index f1c3b539c9..3371ce42c0 100755
--- a/apps/opencs/view/world/idtypedelegate.hpp
+++ b/apps/opencs/view/world/idtypedelegate.hpp
@@ -1,9 +1,7 @@
 #ifndef IDTYPEDELEGATE_HPP
 #define IDTYPEDELEGATE_HPP
 
-#include "enumdelegate.hpp"
 #include "util.hpp"
-#include "../../model/world/universalid.hpp"
 #include "datadisplaydelegate.hpp"
 
 namespace CSVWorld
diff --git a/apps/opencs/view/world/previewsubview.cpp b/apps/opencs/view/world/previewsubview.cpp
index cb231b4782..9cc1b8aeed 100644
--- a/apps/opencs/view/world/previewsubview.cpp
+++ b/apps/opencs/view/world/previewsubview.cpp
@@ -7,6 +7,8 @@
 #include "../widget/scenetoolbar.hpp"
 #include "../widget/scenetoolmode.hpp"
 
+#include "../../model/doc/document.hpp"
+
 CSVWorld::PreviewSubView::PreviewSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
 : SubView (id), mTitle (id.toString().c_str())
 {
diff --git a/apps/opencs/view/world/recordstatusdelegate.hpp b/apps/opencs/view/world/recordstatusdelegate.hpp
index ece19e26d5..e70e1af26b 100644
--- a/apps/opencs/view/world/recordstatusdelegate.hpp
+++ b/apps/opencs/view/world/recordstatusdelegate.hpp
@@ -4,7 +4,6 @@
 #include "util.hpp"
 
 #include "datadisplaydelegate.hpp"
-#include "../../model/world/record.hpp"
 
 class QIcon;
 class QFont;