diff --git a/apps/opencs/model/world/pathgrid.cpp b/apps/opencs/model/world/pathgrid.cpp
index 1c82585df..5c66e7d8e 100644
--- a/apps/opencs/model/world/pathgrid.cpp
+++ b/apps/opencs/model/world/pathgrid.cpp
@@ -1,4 +1,5 @@
-
+#include "cell.hpp"
+#include "idcollection.hpp"
 #include "pathgrid.hpp"
 
 #include <sstream>
diff --git a/apps/opencs/model/world/pathgrid.hpp b/apps/opencs/model/world/pathgrid.hpp
index 3c9fcff50..7ce5aff8c 100644
--- a/apps/opencs/model/world/pathgrid.hpp
+++ b/apps/opencs/model/world/pathgrid.hpp
@@ -6,11 +6,14 @@
 
 #include <components/esm/loadpgrd.hpp>
 
-#include "idcollection.hpp"
-#include "cell.hpp"
-
 namespace CSMWorld
 {
+    struct Cell;
+    template<typename T>
+    struct IdAccessor;
+    template<typename T, typename AT = IdAccessor<T>>
+    class IdCollection;
+
     /// \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/subcellcollection.hpp b/apps/opencs/model/world/subcellcollection.hpp
index 28f0de695..2100df4f4 100644
--- a/apps/opencs/model/world/subcellcollection.hpp
+++ b/apps/opencs/model/world/subcellcollection.hpp
@@ -1,10 +1,19 @@
 #ifndef CSM_WOLRD_SUBCOLLECTION_H
 #define CSM_WOLRD_SUBCOLLECTION_H
 
-#include "idcollection.hpp"
+namespace ESM
+{
+    class ESMReader;
+}
 
 namespace CSMWorld
 {
+    struct Cell;
+    template<typename T>
+    struct IdAccessor;
+    template<typename T, typename AT = IdAccessor<T>>
+    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 IdCollection<ESXRecordT, IdAccessorT>