diff --git a/examples/co2injection_flash_ecfv.cpp b/examples/co2injection_flash_ecfv.cpp
index 405d3891b..ef41d8c8c 100644
--- a/examples/co2injection_flash_ecfv.cpp
+++ b/examples/co2injection_flash_ecfv.cpp
@@ -32,6 +32,7 @@
 #include <opm/material/common/quad.hpp>
 #endif
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/flash/flashmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
diff --git a/examples/co2injection_flash_ni_ecfv.cpp b/examples/co2injection_flash_ni_ecfv.cpp
index 56718dbe4..73966e1e2 100644
--- a/examples/co2injection_flash_ni_ecfv.cpp
+++ b/examples/co2injection_flash_ni_ecfv.cpp
@@ -28,7 +28,10 @@
  */
 #include "config.h"
 
+// this must be included before the vanguard
 #include <opm/material/common/quad.hpp>
+
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/flash/flashmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
diff --git a/examples/co2injection_flash_ni_vcfv.cpp b/examples/co2injection_flash_ni_vcfv.cpp
index b639bfc1e..bfb8bd18f 100644
--- a/examples/co2injection_flash_ni_vcfv.cpp
+++ b/examples/co2injection_flash_ni_vcfv.cpp
@@ -28,7 +28,10 @@
  */
 #include "config.h"
 
+// this must be included before the vanguard
 #include <opm/material/common/quad.hpp>
+
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/flash/flashmodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
diff --git a/examples/co2injection_flash_vcfv.cpp b/examples/co2injection_flash_vcfv.cpp
index 277cd296d..e29bda604 100644
--- a/examples/co2injection_flash_vcfv.cpp
+++ b/examples/co2injection_flash_vcfv.cpp
@@ -32,6 +32,7 @@
 #include <opm/material/common/quad.hpp>
 #endif
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/flash/flashmodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
diff --git a/examples/co2injection_immiscible_ecfv.cpp b/examples/co2injection_immiscible_ecfv.cpp
index c1ec40a1f..7e72e6867 100644
--- a/examples/co2injection_immiscible_ecfv.cpp
+++ b/examples/co2injection_immiscible_ecfv.cpp
@@ -28,6 +28,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
diff --git a/examples/co2injection_immiscible_ni_ecfv.cpp b/examples/co2injection_immiscible_ni_ecfv.cpp
index 571d56431..2c0257549 100644
--- a/examples/co2injection_immiscible_ni_ecfv.cpp
+++ b/examples/co2injection_immiscible_ni_ecfv.cpp
@@ -28,6 +28,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
diff --git a/examples/co2injection_immiscible_ni_vcfv.cpp b/examples/co2injection_immiscible_ni_vcfv.cpp
index 000c3140c..a1bf11a65 100644
--- a/examples/co2injection_immiscible_ni_vcfv.cpp
+++ b/examples/co2injection_immiscible_ni_vcfv.cpp
@@ -28,6 +28,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
diff --git a/examples/co2injection_immiscible_vcfv.cpp b/examples/co2injection_immiscible_vcfv.cpp
index f31038542..31b722210 100644
--- a/examples/co2injection_immiscible_vcfv.cpp
+++ b/examples/co2injection_immiscible_vcfv.cpp
@@ -28,6 +28,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
diff --git a/examples/co2injection_ncp_ecfv.cpp b/examples/co2injection_ncp_ecfv.cpp
index a5dd24489..69c5179dd 100644
--- a/examples/co2injection_ncp_ecfv.cpp
+++ b/examples/co2injection_ncp_ecfv.cpp
@@ -28,6 +28,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/ncp/ncpmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
diff --git a/examples/co2injection_ncp_ni_ecfv.cpp b/examples/co2injection_ncp_ni_ecfv.cpp
index 61d608acf..0c44fcaa2 100644
--- a/examples/co2injection_ncp_ni_ecfv.cpp
+++ b/examples/co2injection_ncp_ni_ecfv.cpp
@@ -28,6 +28,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/ncp/ncpmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
diff --git a/examples/co2injection_ncp_ni_vcfv.cpp b/examples/co2injection_ncp_ni_vcfv.cpp
index de8013e2e..3aeea9598 100644
--- a/examples/co2injection_ncp_ni_vcfv.cpp
+++ b/examples/co2injection_ncp_ni_vcfv.cpp
@@ -28,6 +28,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/ncp/ncpmodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
diff --git a/examples/co2injection_ncp_vcfv.cpp b/examples/co2injection_ncp_vcfv.cpp
index f4446fa87..474ca007b 100644
--- a/examples/co2injection_ncp_vcfv.cpp
+++ b/examples/co2injection_ncp_vcfv.cpp
@@ -28,6 +28,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/ncp/ncpmodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
diff --git a/examples/co2injection_pvs_ecfv.cpp b/examples/co2injection_pvs_ecfv.cpp
index a7b690394..d0e2f63e9 100644
--- a/examples/co2injection_pvs_ecfv.cpp
+++ b/examples/co2injection_pvs_ecfv.cpp
@@ -28,6 +28,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
diff --git a/examples/co2injection_pvs_ni_ecfv.cpp b/examples/co2injection_pvs_ni_ecfv.cpp
index 139660145..25d86bbf4 100644
--- a/examples/co2injection_pvs_ni_ecfv.cpp
+++ b/examples/co2injection_pvs_ni_ecfv.cpp
@@ -28,6 +28,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
diff --git a/examples/co2injection_pvs_ni_vcfv.cpp b/examples/co2injection_pvs_ni_vcfv.cpp
index 81195daee..a6c1f59eb 100644
--- a/examples/co2injection_pvs_ni_vcfv.cpp
+++ b/examples/co2injection_pvs_ni_vcfv.cpp
@@ -28,6 +28,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
diff --git a/examples/co2injection_pvs_vcfv.cpp b/examples/co2injection_pvs_vcfv.cpp
index e053eef52..e3696db39 100644
--- a/examples/co2injection_pvs_vcfv.cpp
+++ b/examples/co2injection_pvs_vcfv.cpp
@@ -28,6 +28,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
diff --git a/examples/cuvette_pvs.cpp b/examples/cuvette_pvs.cpp
index a7f0798c9..1ed50fa87 100644
--- a/examples/cuvette_pvs.cpp
+++ b/examples/cuvette_pvs.cpp
@@ -27,6 +27,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
diff --git a/examples/groundwater_immiscible.cpp b/examples/groundwater_immiscible.cpp
index a360dbc3e..cb5e1b7f4 100644
--- a/examples/groundwater_immiscible.cpp
+++ b/examples/groundwater_immiscible.cpp
@@ -27,6 +27,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include "problems/groundwaterproblem.hh"
diff --git a/examples/infiltration_pvs.cpp b/examples/infiltration_pvs.cpp
index c9a6ed0ea..998aa1fc4 100644
--- a/examples/infiltration_pvs.cpp
+++ b/examples/infiltration_pvs.cpp
@@ -27,6 +27,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
diff --git a/examples/lens_richards_ecfv.cpp b/examples/lens_richards_ecfv.cpp
index 4cd312a68..51c5976f3 100644
--- a/examples/lens_richards_ecfv.cpp
+++ b/examples/lens_richards_ecfv.cpp
@@ -27,6 +27,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
diff --git a/examples/lens_richards_vcfv.cpp b/examples/lens_richards_vcfv.cpp
index af673dd78..bcded2002 100644
--- a/examples/lens_richards_vcfv.cpp
+++ b/examples/lens_richards_vcfv.cpp
@@ -27,6 +27,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
diff --git a/examples/obstacle_immiscible.cpp b/examples/obstacle_immiscible.cpp
index 5e828f612..3c11904f4 100644
--- a/examples/obstacle_immiscible.cpp
+++ b/examples/obstacle_immiscible.cpp
@@ -28,6 +28,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
 #include <opm/models/immiscible/immisciblemodel.hh>
diff --git a/examples/obstacle_ncp.cpp b/examples/obstacle_ncp.cpp
index d98171493..28b08e29d 100644
--- a/examples/obstacle_ncp.cpp
+++ b/examples/obstacle_ncp.cpp
@@ -27,6 +27,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/ncp/ncpmodel.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
diff --git a/examples/obstacle_pvs.cpp b/examples/obstacle_pvs.cpp
index 838ba7cb2..608df82d7 100644
--- a/examples/obstacle_pvs.cpp
+++ b/examples/obstacle_pvs.cpp
@@ -29,6 +29,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
diff --git a/examples/outflow_pvs.cpp b/examples/outflow_pvs.cpp
index 3d5ea6772..fc498f96f 100644
--- a/examples/outflow_pvs.cpp
+++ b/examples/outflow_pvs.cpp
@@ -27,6 +27,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
diff --git a/examples/reservoir_blackoil_ecfv.cpp b/examples/reservoir_blackoil_ecfv.cpp
index df1506508..191d3b3ad 100644
--- a/examples/reservoir_blackoil_ecfv.cpp
+++ b/examples/reservoir_blackoil_ecfv.cpp
@@ -28,6 +28,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/blackoil/blackoilmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
diff --git a/examples/reservoir_blackoil_vcfv.cpp b/examples/reservoir_blackoil_vcfv.cpp
index d0fc8a5c8..bcdb862e3 100644
--- a/examples/reservoir_blackoil_vcfv.cpp
+++ b/examples/reservoir_blackoil_vcfv.cpp
@@ -27,6 +27,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/blackoil/blackoilmodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
diff --git a/examples/reservoir_ncp_ecfv.cpp b/examples/reservoir_ncp_ecfv.cpp
index 11c1a1ecc..40952fe27 100644
--- a/examples/reservoir_ncp_ecfv.cpp
+++ b/examples/reservoir_ncp_ecfv.cpp
@@ -27,6 +27,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/ncp/ncpmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
diff --git a/examples/reservoir_ncp_vcfv.cpp b/examples/reservoir_ncp_vcfv.cpp
index 187788ffb..1ad4f9650 100644
--- a/examples/reservoir_ncp_vcfv.cpp
+++ b/examples/reservoir_ncp_vcfv.cpp
@@ -28,6 +28,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/ncp/ncpmodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
diff --git a/examples/waterair_pvs_ni.cpp b/examples/waterair_pvs_ni.cpp
index 7c88a49b3..4dc529239 100644
--- a/examples/waterair_pvs_ni.cpp
+++ b/examples/waterair_pvs_ni.cpp
@@ -27,6 +27,7 @@
  */
 #include "config.h"
 
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include "problems/waterairproblem.hh"
diff --git a/opm/models/common/multiphasebaseproblem.hh b/opm/models/common/multiphasebaseproblem.hh
index 298f6e028..84d8d39ec 100644
--- a/opm/models/common/multiphasebaseproblem.hh
+++ b/opm/models/common/multiphasebaseproblem.hh
@@ -28,20 +28,22 @@
 #ifndef EWOMS_MULTI_PHASE_BASE_PROBLEM_HH
 #define EWOMS_MULTI_PHASE_BASE_PROBLEM_HH
 
-#include "multiphasebaseproperties.hh"
+#include <dune/common/fvector.hh>
+#include <dune/common/fmatrix.hh>
 
-#include <opm/models/common/directionalmobility.hh>
-#include <opm/models/discretization/common/fvbaseproblem.hh>
-#include <opm/models/discretization/common/fvbaseproperties.hh>
+#include <dune/grid/common/partitionset.hh>
 
 #include <opm/material/fluidmatrixinteractions/NullMaterial.hpp>
 #include <opm/material/common/Means.hpp>
 #include <opm/material/densead/Evaluation.hpp>
 
-#include <opm/utility/CopyablePtr.hpp>
+#include <opm/models/common/directionalmobility.hh>
+#include <opm/models/common/multiphasebaseproperties.hh>
 
-#include <dune/common/fvector.hh>
-#include <dune/common/fmatrix.hh>
+#include <opm/models/discretization/common/fvbaseproblem.hh>
+#include <opm/models/discretization/common/fvbaseproperties.hh>
+
+#include <opm/utility/CopyablePtr.hpp>
 
 namespace Opm {
 /*!
diff --git a/opm/models/discretization/common/fvbaseproperties.hh b/opm/models/discretization/common/fvbaseproperties.hh
index 1d093ec41..dba1b2611 100644
--- a/opm/models/discretization/common/fvbaseproperties.hh
+++ b/opm/models/discretization/common/fvbaseproperties.hh
@@ -31,7 +31,6 @@
 #define EWOMS_FV_BASE_PROPERTIES_HH
 
 #include <opm/models/utils/basicproperties.hh>
-#include <opm/models/io/dgfvanguard.hh>
 
 namespace Opm::Properties {
 
@@ -257,9 +256,6 @@ struct UseVolumetricResidual { using type = UndefinedProperty; };
 template<class TypeTag, class MyTypeTag>
 struct EnableExperiments { using type = UndefinedProperty; };
 
-template<class TypeTag>
-struct Vanguard<TypeTag, TTag::NumericModel> { using type = Opm::DgfVanguard<TypeTag>; };
-
 } // namespace Opm::Properties
 
 #endif
diff --git a/opm/models/utils/basicproperties.hh b/opm/models/utils/basicproperties.hh
index 413858be7..be7bccf64 100644
--- a/opm/models/utils/basicproperties.hh
+++ b/opm/models/utils/basicproperties.hh
@@ -38,6 +38,12 @@
 #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
 #endif
 
+namespace Opm {
+
+template<class TypeTag> class DgfVanguard;
+
+}
+
 namespace Opm::Properties {
 
 ///////////////////////////////////
@@ -254,6 +260,8 @@ struct RestartTime<TypeTag, TTag::NumericModel>
 template<class TypeTag>
 struct PredeterminedTimeStepsFile<TypeTag, TTag::NumericModel> { static constexpr auto value = ""; };
 
+template<class TypeTag>
+struct Vanguard<TypeTag, TTag::NumericModel> { using type = Opm::DgfVanguard<TypeTag>; };
 
 } // namespace Opm::Properties