Use forward declarations instead of including aistate.hpp

apps/openmw/mwmechanics/aipackage.hpp

@@ -4,12 +4,13 @@
 #include <memory>
 
 #include <components/detournavigator/areatype.hpp>
- 
+
 #include "pathfinding.hpp"
 #include "obstacle.hpp"
-#include "aistate.hpp"
 #include "aipackagetypeid.hpp"
 #include "aitimer.hpp"
+#include "aistatefwd.hpp"
+
 #include "../mwworld/ptr.hpp"
 
 namespace ESM

apps/openmw/mwmechanics/aisequence.hpp

@@ -27,10 +27,6 @@ namespace MWMechanics
 {
     class AiPackage;
     class CharacterController;
-    
-    template< class Base > class DerivedClassStorage;
-    struct AiTemporaryBase;
-    typedef DerivedClassStorage<AiTemporaryBase> AiState;
 
     using AiPackages = std::vector<std::shared_ptr<AiPackage>>;
 

apps/openmw/mwmechanics/aistate.hpp

@@ -1,6 +1,7 @@
 #ifndef AISTATE_H
 #define AISTATE_H
 
+#include "aistatefwd.hpp"
 #include "aitemporarybase.hpp"
 
 namespace MWMechanics
@@ -71,9 +72,6 @@ namespace MWMechanics
                 delete mStorage;
         }
     };
-
-    /// \brief Container for AI package status.
-    typedef DerivedClassStorage<AiTemporaryBase> AiState;
 }
 
 #endif // AISTATE_H

apps/openmw/mwmechanics/aistatefwd.hpp

@@ -0,0 +1,15 @@
+#ifndef OPENMW_MWMECHANICS_AISTATEFWD_H
+#define OPENMW_MWMECHANICS_AISTATEFWD_H
+
+namespace MWMechanics
+{
+    template <class Base>
+    class DerivedClassStorage;
+
+    struct AiTemporaryBase;
+
+    /// \brief Container for AI package status.
+    using AiState = DerivedClassStorage<AiTemporaryBase>;
+}
+
+#endif