diff --git a/examples/reservoir_blackoil_ecfv.cpp b/examples/reservoir_blackoil_ecfv.cpp
index e05431c590..2e924bfe89 100644
--- a/examples/reservoir_blackoil_ecfv.cpp
+++ b/examples/reservoir_blackoil_ecfv.cpp
@@ -28,11 +28,13 @@
  */
 #include "config.h"
 
-#include <opm/models/io/dgfvanguard.hh>
-#include <opm/models/utils/start.hh>
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+#include <opm/models/blackoil/blackoildarcyfluxmodule.hh>
 #include <opm/models/blackoil/blackoilmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
+#include <opm/models/io/dgfvanguard.hh>
+#include <opm/models/utils/start.hh>
+
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
 
 #include "problems/reservoirproblem.hh"
@@ -57,6 +59,12 @@ template<class TypeTag>
 struct LocalLinearizerSplice<TypeTag, TTag::ReservoirBlackOilEcfvProblem>
 { using type = TTag::AutoDiffLocalLinearizer; };
 
+//! Use the the velocity module which is aware of the black-oil specific model extensions
+//! (i.e., the polymer and solvent extensions)
+template<class TypeTag>
+struct FluxModule<TypeTag, TTag::ReservoirBlackOilEcfvProblem>
+{ using type = BlackOilDarcyFluxModule<TypeTag>; };
+
 } // namespace Opm::Properties
 
 int main(int argc, char **argv)
diff --git a/examples/reservoir_blackoil_vcfv.cpp b/examples/reservoir_blackoil_vcfv.cpp
index 0c119e03ed..e33d14e08b 100644
--- a/examples/reservoir_blackoil_vcfv.cpp
+++ b/examples/reservoir_blackoil_vcfv.cpp
@@ -27,10 +27,12 @@
  */
 #include "config.h"
 
+#include <opm/models/blackoil/blackoilmodel.hh>
+#include <opm/models/blackoil/blackoildarcyfluxmodule.hh>
+#include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
 #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>
+
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
 
 #include "problems/reservoirproblem.hh"
@@ -50,6 +52,12 @@ template<class TypeTag>
 struct SpatialDiscretizationSplice<TypeTag, TTag::ReservoirBlackOilVcfvProblem>
 { using type = TTag::VcfvDiscretization; };
 
+//! Use the the velocity module which is aware of the black-oil specific model extensions
+//! (i.e., the polymer and solvent extensions)
+template<class TypeTag>
+struct FluxModule<TypeTag, TTag::ReservoirBlackOilVcfvProblem>
+{ using type = BlackOilDarcyFluxModule<TypeTag>; };
+
 } // namespace Opm::Properties
 
 int main(int argc, char **argv)
diff --git a/flowexperimental/comp/flow_comp.hpp b/flowexperimental/comp/flow_comp.hpp
index 708c69629c..fdbcc87be5 100644
--- a/flowexperimental/comp/flow_comp.hpp
+++ b/flowexperimental/comp/flow_comp.hpp
@@ -22,6 +22,7 @@
 #include <opm/material/constraintsolvers/PTFlash.hpp>
 #include <opm/material/fluidsystems/GenericOilGasWaterFluidSystem.hpp>
 
+#include <opm/models/common/darcyfluxmodule.hh>
 #include <opm/models/discretization/common/baseauxiliarymodule.hh>
 #include <opm/models/nonlinear/newtonmethod.hh>
 #include <opm/models/ptflash/flashmodel.hh>
diff --git a/flowexperimental/comp/flowexp_comp.hpp b/flowexperimental/comp/flowexp_comp.hpp
index 1142f3f9d3..eb4efd1efc 100644
--- a/flowexperimental/comp/flowexp_comp.hpp
+++ b/flowexperimental/comp/flowexp_comp.hpp
@@ -22,6 +22,7 @@
 #include <opm/material/constraintsolvers/PTFlash.hpp>
 #include <opm/material/fluidsystems/GenericOilGasWaterFluidSystem.hpp>
 
+#include <opm/models/common/darcyfluxmodule.hh>
 #include <opm/models/discretization/common/baseauxiliarymodule.hh>
 #include <opm/models/ptflash/flashmodel.hh>
 
diff --git a/opm/models/blackoil/blackoilmodel.hh b/opm/models/blackoil/blackoilmodel.hh
index 94d05bdd83..e0a08bf4ef 100644
--- a/opm/models/blackoil/blackoilmodel.hh
+++ b/opm/models/blackoil/blackoilmodel.hh
@@ -34,7 +34,6 @@
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilboundaryratevector.hh>
-#include <opm/models/blackoil/blackoildarcyfluxmodule.hh>
 #include <opm/models/blackoil/blackoilextensivequantities.hh>
 #include <opm/models/blackoil/blackoilvariableandequationindices.hh>
 #include <opm/models/blackoil/blackoilintensivequantities.hh>
@@ -127,12 +126,6 @@ template<class TypeTag>
 struct ExtensiveQuantities<TypeTag, TTag::BlackOilModel>
 { using type = BlackOilExtensiveQuantities<TypeTag>; };
 
-//! Use the the velocity module which is aware of the black-oil specific model extensions
-//! (i.e., the polymer and solvent extensions)
-template<class TypeTag>
-struct FluxModule<TypeTag, TTag::BlackOilModel>
-{ using type = BlackOilDarcyFluxModule<TypeTag>; };
-
 //! The indices required by the model
 template<class TypeTag>
 struct Indices<TypeTag, TTag::BlackOilModel>