diff --git a/ewoms/io/eclipsewriter.hh b/ewoms/io/eclipsewriter.hh
index b5b6b4c6a0..bc33fa0be3 100644
--- a/ewoms/io/eclipsewriter.hh
+++ b/ewoms/io/eclipsewriter.hh
@@ -41,6 +41,11 @@
 #include <fstream>
 #include <type_traits>
 
+namespace Opm {
+namespace Properties {
+NEW_PROP_TAG(EnableEclipseOutput);
+}}
+
 namespace Ewoms {
 template <class TypeTag>
 class EclipseWriter;
diff --git a/ewoms/wells/eclpeacemanwell.hh b/ewoms/wells/eclpeacemanwell.hh
index 6646222c6c..f3e871acab 100644
--- a/ewoms/wells/eclpeacemanwell.hh
+++ b/ewoms/wells/eclpeacemanwell.hh
@@ -24,11 +24,21 @@
 #ifndef EWOMS_ECL_PEACEMAN_WELL_HH
 #define EWOMS_ECL_PEACEMAN_WELL_HH
 
+#include <opm/material/fluidstates/CompositionalFluidState.hpp>
+
 #include <opm/core/utility/PropertySystem.hpp>
 #include <opm/core/utility/Average.hpp>
 
 #include <dune/common/version.hh>
 
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+#include <dune/geometry/referenceelements.hh>
+#else
+#include <dune/geometry/genericreferenceelements.hh>
+#endif
+
+#include <unordered_map>
+
 namespace Opm {
 namespace Properties {
 NEW_PROP_TAG(Scalar);
@@ -38,9 +48,14 @@ NEW_PROP_TAG(Simulator);
 NEW_PROP_TAG(ElementContext);
 NEW_PROP_TAG(RateVector);
 NEW_PROP_TAG(GridView);
+NEW_PROP_TAG(NumPhases);
+NEW_PROP_TAG(NumComponents);
 }}
 
 namespace Ewoms {
+template <class TypeTag>
+class EcfvDiscretization;
+
 /*!
  * \brief The well model of Peaceman.
  *
diff --git a/ewoms/wells/eclwellmanager.hh b/ewoms/wells/eclwellmanager.hh
index 1016474e50..100616f067 100644
--- a/ewoms/wells/eclwellmanager.hh
+++ b/ewoms/wells/eclwellmanager.hh
@@ -31,10 +31,19 @@
 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/CompletionSet.hpp>
 
+#include <opm/core/utility/PropertySystem.hpp>
+
+#include <dune/grid/common/gridenums.hh>
+
 #include <map>
 #include <string>
 #include <vector>
 
+namespace Opm {
+namespace Properties {
+NEW_PROP_TAG(Grid);
+}}
+
 namespace Ewoms {
 /*!
  * \brief A class which handles well controls as specified by an