Use forward declarations

apps/opencs/model/world/actoradapter.hpp

@@ -14,7 +14,6 @@
 #include <components/esm3/loadbody.hpp>
 #include <components/misc/weakcache.hpp>
 
-#include "refidcollection.hpp"
 #include "idcollection.hpp"
 
 namespace ESM
@@ -25,6 +24,7 @@ namespace ESM
 namespace CSMWorld
 {
     class Data;
+    class RefIdCollection;
 
     /// Adapts multiple collections to provide the data needed to render
     /// an npc or creature.

apps/opencs/model/world/cellcoordinates.cpp

@@ -5,6 +5,8 @@
 #include <ostream>
 #include <sstream>
 
+#include <osg/Vec3d>
+
 #include <components/esm3/loadland.hpp>
 #include <components/misc/constants.hpp>
 

apps/opencs/model/world/cellcoordinates.hpp

@@ -7,7 +7,10 @@
 
 #include <QMetaType>
 
-#include <osg/Vec3d>
+namespace osg
+{
+    class Vec3d;
+}
 
 namespace CSMWorld
 {

apps/opencs/model/world/cellselection.cpp

@@ -1,5 +1,7 @@
 #include "cellselection.hpp"
 
+#include "cellcoordinates.hpp"
+
 #include <cmath>
 #include <stdexcept>
 #include <limits>

apps/opencs/model/world/cellselection.hpp

@@ -5,10 +5,10 @@
 
 #include <QMetaType>
 
-#include "cellcoordinates.hpp"
-
 namespace CSMWorld
 {
+    class CellCoordinates;
+
     /// \brief Selection of cells in a paged worldspace
     ///
     /// \note The CellSelection does not specify the worldspace it applies to.

apps/opencs/model/world/resourcesmanager.cpp

@@ -1,5 +1,7 @@
 #include "resourcesmanager.hpp"
 
+#include "resources.hpp"
+
 #include <stdexcept>
 
 CSMWorld::ResourcesManager::ResourcesManager()
@@ -7,6 +9,8 @@ CSMWorld::ResourcesManager::ResourcesManager()
 {
 }
 
+CSMWorld::ResourcesManager::~ResourcesManager() = default;
+
 void CSMWorld::ResourcesManager::addResources (const Resources& resources)
 {
     mResources.insert (std::make_pair (resources.getType(), resources));

apps/opencs/model/world/resourcesmanager.hpp

@@ -4,7 +4,6 @@
 #include <map>
 
 #include "universalid.hpp"
-#include "resources.hpp"
 
 namespace VFS
 {
@@ -13,6 +12,8 @@ namespace VFS
 
 namespace CSMWorld
 {
+    class Resources;
+
     class ResourcesManager
     {
             std::map<UniversalId::Type, Resources> mResources;
@@ -27,6 +28,7 @@ namespace CSMWorld
         public:
 
             ResourcesManager();
+            ~ResourcesManager();
 
             const VFS::Manager* getVFS() const;
 

apps/openmw/mwmechanics/spelleffects.hpp

@@ -3,11 +3,14 @@
 
 #include "activespells.hpp"
 
-#include "../mwworld/ptr.hpp"
-
 // These functions should probably be split up into separate Lua functions for each magic effect when magic is dehardcoded.
 // That way ESM::MGEF could point to two Lua scripts for each effect. Needs discussion.
 
+namespace MWWorld
+{
+    class Ptr;
+}
+
 namespace MWMechanics
 {
     enum class MagicApplicationResult

apps/openmw/mwmechanics/summoning.hpp

@@ -1,13 +1,15 @@
 #ifndef OPENMW_MECHANICS_SUMMONING_H
 #define OPENMW_MECHANICS_SUMMONING_H
 
-#include <set>
+#include <string>
-
+#include <utility>
-#include "../mwworld/ptr.hpp"
 
 #include <components/esm3/magiceffects.hpp>
 
-#include "magiceffects.hpp"
+namespace MWWorld
+{
+    class Ptr;
+}
 
 namespace MWMechanics
 {

apps/openmw/mwmechanics/weaponpriority.hpp

@@ -1,7 +1,10 @@
 #ifndef OPENMW_WEAPON_PRIORITY_H
 #define OPENMW_WEAPON_PRIORITY_H
 
-#include "../mwworld/ptr.hpp"
+namespace MWWorld
+{
+    class Ptr;
+}
 
 namespace MWMechanics
 {

apps/openmw/mwmechanics/weapontype.hpp

@@ -1,7 +1,20 @@
 #ifndef GAME_MWMECHANICS_WEAPONTYPE_H
 #define GAME_MWMECHANICS_WEAPONTYPE_H
 
-#include "../mwworld/inventorystore.hpp"
+namespace ESM
+{
+    struct WeaponType;
+}
+
+namespace MWWorld
+{
+    class Ptr;
+
+    template <class PtrType>
+    class ContainerStoreIteratorBase;
+
+    using ContainerStoreIterator = ContainerStoreIteratorBase<Ptr>;
+}
 
 namespace MWMechanics
 {