From 2d23b01da88cb75debfb2a918443cbbf2c642abe Mon Sep 17 00:00:00 2001
From: Markus Blatt <markus@dr-blatt.de>
Date: Wed, 27 Jan 2021 14:41:10 +0100
Subject: [PATCH] Restrict property/type tag changes to eclbasevanguar.hh

---
 ebos/eclbasevanguard.hh                             | 4 +++-
 opm/simulators/flow/BlackoilModelParametersEbos.hpp | 4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ebos/eclbasevanguard.hh b/ebos/eclbasevanguard.hh
index f73e5207d..fdb7a6084 100644
--- a/ebos/eclbasevanguard.hh
+++ b/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> {
diff --git a/opm/simulators/flow/BlackoilModelParametersEbos.hpp b/opm/simulators/flow/BlackoilModelParametersEbos.hpp
index 53bd0fc20..a443524ed 100644
--- a/opm/simulators/flow/BlackoilModelParametersEbos.hpp
+++ b/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;