diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index e1c0ea666a..4dbfb3072f 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -32,6 +32,7 @@
 #include <components/esm/loadcell.hpp>
 
 #include "../mwworld/fallback.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "sky.hpp"
 #include "effectmanager.hpp"
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index e72fc050cd..cb03c489d0 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -33,6 +33,8 @@
 
 #include <components/esm/loadcell.hpp>
 
+#include "../mwworld/cellstore.hpp"
+
 #include "vismask.hpp"
 #include "ripplesimulation.hpp"
 #include "renderbin.hpp"
diff --git a/apps/openmw/mwrender/water.hpp b/apps/openmw/mwrender/water.hpp
index f77afbfee8..b5eca3f256 100644
--- a/apps/openmw/mwrender/water.hpp
+++ b/apps/openmw/mwrender/water.hpp
@@ -1,12 +1,13 @@
 #ifndef OPENMW_MWRENDER_WATER_H
 #define OPENMW_MWRENDER_WATER_H
 
+#include <memory>
+
 #include <osg/ref_ptr>
+#include <osg/Vec3f>
 
 #include <components/settings/settings.hpp>
 
-#include "../mwworld/cellstore.hpp"
-
 namespace osg
 {
     class Group;
@@ -28,6 +29,8 @@ namespace Resource
 namespace MWWorld
 {
     class Fallback;
+    class CellStore;
+    class Ptr;
 }
 
 namespace MWRender