Restrict property/type tag changes to eclbasevanguar.hh

ebos/eclbasevanguard.hh

@@ -51,7 +51,6 @@
 #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQState.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp>
 
-#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp>
 
 #include <opm/simulators/utils/readDeck.hpp>
 
@@ -176,6 +175,9 @@ struct AllowDistributedWells<TypeTag, TTag::EclBaseVanguard> {
     static constexpr bool value = false;
 };
 
+template<class T1, class T2>
+struct UseMultisegmentWell;
+
 // Same as in BlackoilModelParametersEbos.hpp but for here.
 template<class TypeTag>
 struct UseMultisegmentWell<TypeTag, TTag::EclBaseVanguard> {

opm/simulators/flow/BlackoilModelParametersEbos.hpp

@@ -32,10 +32,6 @@ namespace TTag {
 struct FlowModelParameters {};
 }
 
-// forward declaration to make this header usable from eclbasevanguard.hh
-template<class TypeTag, class MyTypeTag>
-struct EclDeckFileName;
-
 template<class TypeTag, class MyTypeTag>
 struct DbhpMaxRel {
     using type = UndefinedProperty;