diff --git a/examples/reservoir_blackoil_ecfv.cpp b/examples/reservoir_blackoil_ecfv.cpp
index 394f1f1400..e05431c590 100644
--- a/examples/reservoir_blackoil_ecfv.cpp
+++ b/examples/reservoir_blackoil_ecfv.cpp
@@ -30,6 +30,7 @@
 
 #include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoilmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
diff --git a/flow/flow_biofilm.cpp b/flow/flow_biofilm.cpp
index ab2f450161..4ff4792b1f 100644
--- a/flow/flow_biofilm.cpp
+++ b/flow/flow_biofilm.cpp
@@ -18,16 +18,20 @@
 
 #include <flow/flow_biofilm.hpp>
 
+#include <opm/grid/CpGrid.hpp>
+
 #include <opm/material/common/ResetLocale.hpp>
+#include <opm/material/thermal/EnergyModuleType.hpp>
+
 #include <opm/models/blackoil/blackoilbioeffectsmodules.hh>
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
+
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
-#include <opm/grid/CpGrid.hpp>
 #include <opm/simulators/flow/Main.hpp>
 #include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
-#include <opm/material/thermal/EnergyModuleType.hpp>
 
 namespace Opm::Properties {
 
diff --git a/flow/flow_blackoil.cpp b/flow/flow_blackoil.cpp
index fd03073979..e8a40f3f62 100644
--- a/flow/flow_blackoil.cpp
+++ b/flow/flow_blackoil.cpp
@@ -23,6 +23,7 @@
 #include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
diff --git a/flow/flow_blackoil_alugrid.cpp b/flow/flow_blackoil_alugrid.cpp
index 85a23f89a7..2741383dc6 100644
--- a/flow/flow_blackoil_alugrid.cpp
+++ b/flow/flow_blackoil_alugrid.cpp
@@ -28,13 +28,16 @@
 // For more details, refer to the files gridfactory.hh and aluinline.hh located in the dune-alugrid/3d/
 
 #include <dune/alugrid/grid.hh>
-#include <opm/simulators/flow/Main.hpp>
 
 // for equilgrid in writer
 // need to include this before eclgenericwriter_impl.hh due to specializations.
 #include <opm/grid/CpGrid.hpp>
 #include <opm/grid/cpgrid/GridHelpers.hpp>
 
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+
+#include <opm/simulators/flow/Main.hpp>
+
 // these are not explicitly instanced in library
 #include <opm/simulators/flow/AluGridVanguard.hpp>
 #include <opm/simulators/flow/CollectDataOnIORank_impl.hpp>
diff --git a/flow/flow_blackoil_float_main.cpp b/flow/flow_blackoil_float_main.cpp
index 7855fb8bb1..c1ff13197c 100644
--- a/flow/flow_blackoil_float_main.cpp
+++ b/flow/flow_blackoil_float_main.cpp
@@ -18,9 +18,12 @@
 */
 #include <config.h>
 
-#include <opm/simulators/flow/Main.hpp>
 #include <flow/flow_blackoil.hpp>
 
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+
+#include <opm/simulators/flow/Main.hpp>
+
 namespace Opm::Properties {
 
 template<class TypeTag>
diff --git a/flow/flow_blackoil_legacyassembly.cpp b/flow/flow_blackoil_legacyassembly.cpp
index 00ddd9e912..41bf377124 100644
--- a/flow/flow_blackoil_legacyassembly.cpp
+++ b/flow/flow_blackoil_legacyassembly.cpp
@@ -19,8 +19,11 @@
 #include <flow/flow_blackoil_legacyassembly.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+
 #include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm {
 
diff --git a/flow/flow_blackoil_nohyst.cpp b/flow/flow_blackoil_nohyst.cpp
index 9699acacbb..0bfd37a738 100644
--- a/flow/flow_blackoil_nohyst.cpp
+++ b/flow/flow_blackoil_nohyst.cpp
@@ -25,6 +25,7 @@
 #include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
diff --git a/flow/flow_blackoil_polyhedralgrid.cpp b/flow/flow_blackoil_polyhedralgrid.cpp
index ab15bae752..a0176915d2 100644
--- a/flow/flow_blackoil_polyhedralgrid.cpp
+++ b/flow/flow_blackoil_polyhedralgrid.cpp
@@ -20,11 +20,13 @@
 
 #include <opm/grid/polyhedralgrid.hh>
 
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
+
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
-#include <opm/simulators/flow/PolyhedralGridVanguard.hpp>
 #include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/PolyhedralGridVanguard.hpp>
 
 // these are not explicitly instanced in library
 #include <opm/simulators/flow/CollectDataOnIORank_impl.hpp>
diff --git a/flow/flow_blackoil_temp.cpp b/flow/flow_blackoil_temp.cpp
index 82b1529f0f..010ee1f4fb 100644
--- a/flow/flow_blackoil_temp.cpp
+++ b/flow/flow_blackoil_temp.cpp
@@ -18,15 +18,19 @@
 
 #include <flow/flow_blackoil_temp.hpp>
 
-#include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
-#include <opm/simulators/flow/Main.hpp>
 
-#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
-#include <opm/models/discretization/common/tpfalinearizer.hh>
+#include <opm/material/common/ResetLocale.hpp>
 #include <opm/material/thermal/EnergyModuleType.hpp>
 
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
+
+#include <opm/models/discretization/common/tpfalinearizer.hh>
+
+#include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+
 namespace Opm::Properties {
 
 namespace TTag {
diff --git a/flow/flow_blackoil_tpsa.cpp b/flow/flow_blackoil_tpsa.cpp
index b5e80a65c6..1f3f5e6c2e 100644
--- a/flow/flow_blackoil_tpsa.cpp
+++ b/flow/flow_blackoil_tpsa.cpp
@@ -20,7 +20,9 @@
 */
 #include "config.h"
 
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
+
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
 #include <opm/simulators/flow/BlackoilModelProperties.hpp>
diff --git a/flow/flow_brine.cpp b/flow/flow_brine.cpp
index d3cb4026d3..76bf71c545 100644
--- a/flow/flow_brine.cpp
+++ b/flow/flow_brine.cpp
@@ -18,14 +18,18 @@
 
 #include <flow/flow_brine.hpp>
 
+#include <opm/grid/CpGrid.hpp>
+
 #include <opm/material/common/ResetLocale.hpp>
+
 #include <opm/models/blackoil/blackoilbrinemodules.hh>
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
+
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
-#include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 #include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm::Properties {
 
diff --git a/flow/flow_brine_energy.cpp b/flow/flow_brine_energy.cpp
index 4547db7b2c..a5b69a0ec4 100644
--- a/flow/flow_brine_energy.cpp
+++ b/flow/flow_brine_energy.cpp
@@ -16,12 +16,16 @@
 */
 #include "config.h"
 
-#include <opm/models/blackoil/blackoilbrinemodules.hh>
-#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
-#include <opm/models/discretization/common/tpfalinearizer.hh>
-#include <opm/simulators/flow/Main.hpp>
 #include <opm/material/thermal/EnergyModuleType.hpp>
 
+#include <opm/models/blackoil/blackoilbrinemodules.hh>
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
+
+#include <opm/models/discretization/common/tpfalinearizer.hh>
+
+#include <opm/simulators/flow/Main.hpp>
+
 namespace Opm::Properties {
 
 namespace TTag {
diff --git a/flow/flow_brine_precsalt_vapwat.cpp b/flow/flow_brine_precsalt_vapwat.cpp
index a30d814dc8..c655308306 100644
--- a/flow/flow_brine_precsalt_vapwat.cpp
+++ b/flow/flow_brine_precsalt_vapwat.cpp
@@ -18,14 +18,18 @@
 
 #include <flow/flow_brine_precsalt_vapwat.hpp>
 
+#include <opm/grid/CpGrid.hpp>
+
 #include <opm/material/common/ResetLocale.hpp>
+
 #include <opm/models/blackoil/blackoilbrinemodules.hh>
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
+
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
-#include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 #include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm::Properties {
 
diff --git a/flow/flow_brine_saltprecipitation.cpp b/flow/flow_brine_saltprecipitation.cpp
index a56d431d88..d02c3623c0 100644
--- a/flow/flow_brine_saltprecipitation.cpp
+++ b/flow/flow_brine_saltprecipitation.cpp
@@ -18,14 +18,18 @@
 
 #include <flow/flow_brine_saltprecipitation.hpp>
 
+#include <opm/grid/CpGrid.hpp>
+
 #include <opm/material/common/ResetLocale.hpp>
+
 #include <opm/models/blackoil/blackoilbrinemodules.hh>
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
+
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
-#include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 #include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm::Properties {
 
diff --git a/flow/flow_energy.cpp b/flow/flow_energy.cpp
index 200cb7e176..dea9e4c082 100644
--- a/flow/flow_energy.cpp
+++ b/flow/flow_energy.cpp
@@ -18,14 +18,19 @@
 
 #include <flow/flow_energy.hpp>
 
-#include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
-#include <opm/simulators/flow/Main.hpp>
+
+#include <opm/material/common/ResetLocale.hpp>
 #include <opm/material/thermal/EnergyModuleType.hpp>
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
+
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
+#include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+
 namespace Opm::Properties {
 
 namespace TTag {
diff --git a/flow/flow_extbo.cpp b/flow/flow_extbo.cpp
index 7806eec8b1..b2cc161bc9 100644
--- a/flow/flow_extbo.cpp
+++ b/flow/flow_extbo.cpp
@@ -18,10 +18,14 @@
 
 #include <flow/flow_extbo.hpp>
 
-#include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+
+#include <opm/material/common/ResetLocale.hpp>
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+
 #include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm::Properties {
 
diff --git a/flow/flow_foam.cpp b/flow/flow_foam.cpp
index e5cc7adaad..83cea80244 100644
--- a/flow/flow_foam.cpp
+++ b/flow/flow_foam.cpp
@@ -18,10 +18,14 @@
 
 #include <flow/flow_foam.hpp>
 
-#include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+
+#include <opm/material/common/ResetLocale.hpp>
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+
 #include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm::Properties {
 
diff --git a/flow/flow_gasoil.cpp b/flow/flow_gasoil.cpp
index 9cf8b55459..4e1f9d67fc 100644
--- a/flow/flow_gasoil.cpp
+++ b/flow/flow_gasoil.cpp
@@ -18,16 +18,19 @@
 
 #include <flow/flow_gasoil.hpp>
 
+#include <opm/grid/CpGrid.hpp>
+
 #include <opm/material/common/ResetLocale.hpp>
+#include <opm/material/thermal/EnergyModuleType.hpp>
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
-#include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
-#include <opm/simulators/flow/Main.hpp>
-
-#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
-#include <opm/material/thermal/EnergyModuleType.hpp>
+
+#include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm::Properties {
 
diff --git a/flow/flow_gasoil_energy.cpp b/flow/flow_gasoil_energy.cpp
index 8f415c7cf2..47f0c74427 100644
--- a/flow/flow_gasoil_energy.cpp
+++ b/flow/flow_gasoil_energy.cpp
@@ -18,15 +18,18 @@
 
 #include <flow/flow_gasoil_energy.hpp>
 
-#include <opm/material/common/ResetLocale.hpp>
-#include <opm/models/blackoil/blackoiltwophaseindices.hh>
-
 #include <opm/grid/CpGrid.hpp>
+
+#include <opm/material/common/ResetLocale.hpp>
+#include <opm/material/thermal/EnergyModuleType.hpp>
+
 #include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 #include <opm/simulators/flow/Main.hpp>
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
+#include <opm/models/blackoil/blackoiltwophaseindices.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
-#include <opm/material/thermal/EnergyModuleType.hpp>
 
 namespace Opm::Properties {
 
diff --git a/flow/flow_gasoildiffuse.cpp b/flow/flow_gasoildiffuse.cpp
index 6cc6b26e09..4fd3fff3ff 100644
--- a/flow/flow_gasoildiffuse.cpp
+++ b/flow/flow_gasoildiffuse.cpp
@@ -18,16 +18,20 @@
 
 #include <flow/flow_gasoil.hpp>
 
-#include <opm/material/common/ResetLocale.hpp>
-#include <opm/models/blackoil/blackoiltwophaseindices.hh>
-
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
-#include <opm/simulators/flow/Main.hpp>
-#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
-#include <opm/models/discretization/common/tpfalinearizer.hh>
+
+#include <opm/material/common/ResetLocale.hpp>
 #include <opm/material/thermal/EnergyModuleType.hpp>
 
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+#include <opm/models/blackoil/blackoiltwophaseindices.hh>
+#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
+
+#include <opm/models/discretization/common/tpfalinearizer.hh>
+
+#include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+
 namespace Opm::Properties {
 
 namespace TTag {
diff --git a/flow/flow_gaswater.cpp b/flow/flow_gaswater.cpp
index d113fb8353..fed32ee239 100644
--- a/flow/flow_gaswater.cpp
+++ b/flow/flow_gaswater.cpp
@@ -18,16 +18,19 @@
 
 #include <flow/flow_gaswater.hpp>
 
+#include <opm/grid/CpGrid.hpp>
+
 #include <opm/material/common/ResetLocale.hpp>
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
-#include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
-#include <opm/simulators/flow/Main.hpp>
-
-#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
+#include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+
 namespace Opm::Properties {
 
 template<class TypeTag>
diff --git a/flow/flow_gaswater_brine.cpp b/flow/flow_gaswater_brine.cpp
index 69f1c7457c..cf1ad965fd 100644
--- a/flow/flow_gaswater_brine.cpp
+++ b/flow/flow_gaswater_brine.cpp
@@ -18,16 +18,20 @@
 
 #include <flow/flow_gaswater_brine.hpp>
 
+#include <opm/grid/CpGrid.hpp>
+
 #include <opm/material/common/ResetLocale.hpp>
+#include <opm/material/thermal/EnergyModuleType.hpp>
+
 #include <opm/models/blackoil/blackoilbrinemodules.hh>
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
+
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
-#include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 #include <opm/simulators/flow/Main.hpp>
-#include <opm/material/thermal/EnergyModuleType.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm::Properties {
 
diff --git a/flow/flow_gaswater_dissolution.cpp b/flow/flow_gaswater_dissolution.cpp
index f4290f2fba..24e4b26a54 100644
--- a/flow/flow_gaswater_dissolution.cpp
+++ b/flow/flow_gaswater_dissolution.cpp
@@ -18,16 +18,19 @@
 
 #include <flow/flow_gaswater_dissolution.hpp>
 
+#include <opm/grid/CpGrid.hpp>
+
 #include <opm/material/common/ResetLocale.hpp>
+#include <opm/material/thermal/EnergyModuleType.hpp>
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
-#include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
-#include <opm/simulators/flow/Main.hpp>
-
-#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
-#include <opm/material/thermal/EnergyModuleType.hpp>
+
+#include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm::Properties {
 
diff --git a/flow/flow_gaswater_dissolution_diffuse.cpp b/flow/flow_gaswater_dissolution_diffuse.cpp
index 89f2197f9f..d257d88f2d 100644
--- a/flow/flow_gaswater_dissolution_diffuse.cpp
+++ b/flow/flow_gaswater_dissolution_diffuse.cpp
@@ -25,6 +25,7 @@
 #include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 #include <opm/material/thermal/EnergyModuleType.hpp>
diff --git a/flow/flow_gaswater_dissolution_tpsa.cpp b/flow/flow_gaswater_dissolution_tpsa.cpp
index 4b8a6158e3..7dd5b2406e 100644
--- a/flow/flow_gaswater_dissolution_tpsa.cpp
+++ b/flow/flow_gaswater_dissolution_tpsa.cpp
@@ -20,8 +20,10 @@
 */
 #include "config.h"
 
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
+
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
 #include <opm/simulators/flow/BlackoilModelProperties.hpp>
diff --git a/flow/flow_gaswater_energy.cpp b/flow/flow_gaswater_energy.cpp
index ad7a527c3f..10877251af 100644
--- a/flow/flow_gaswater_energy.cpp
+++ b/flow/flow_gaswater_energy.cpp
@@ -18,13 +18,15 @@
 
 #include <flow/flow_gaswater_energy.hpp>
 
+#include <opm/grid/CpGrid.hpp>
+
 #include <opm/material/common/ResetLocale.hpp>
 
-#include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
-#include <opm/simulators/flow/Main.hpp>
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 
 #include <opm/simulators/flow/FlowGasWaterEnergyTypeTag.hpp>
+#include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm {
 
diff --git a/flow/flow_gaswater_saltprec_energy.cpp b/flow/flow_gaswater_saltprec_energy.cpp
index 684a3486c1..00449dafa3 100644
--- a/flow/flow_gaswater_saltprec_energy.cpp
+++ b/flow/flow_gaswater_saltprec_energy.cpp
@@ -18,16 +18,20 @@
 
 #include <flow/flow_gaswater_saltprec_energy.hpp>
 
+#include <opm/grid/CpGrid.hpp>
+
 #include <opm/material/common/ResetLocale.hpp>
+#include <opm/material/thermal/EnergyModuleType.hpp>
+
 #include <opm/models/blackoil/blackoilbrinemodules.hh>
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
+
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
-#include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 #include <opm/simulators/flow/Main.hpp>
-#include <opm/material/thermal/EnergyModuleType.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm::Properties {
 
diff --git a/flow/flow_gaswater_saltprec_vapwat.cpp b/flow/flow_gaswater_saltprec_vapwat.cpp
index 2ad2fa9000..a5508ff9e1 100644
--- a/flow/flow_gaswater_saltprec_vapwat.cpp
+++ b/flow/flow_gaswater_saltprec_vapwat.cpp
@@ -18,16 +18,20 @@
 
 #include <flow/flow_gaswater_saltprec_vapwat.hpp>
 
+#include <opm/grid/CpGrid.hpp>
+
 #include <opm/material/common/ResetLocale.hpp>
+#include <opm/material/thermal/EnergyModuleType.hpp>
+
 #include <opm/models/blackoil/blackoilbrinemodules.hh>
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
+
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
-#include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 #include <opm/simulators/flow/Main.hpp>
-#include <opm/material/thermal/EnergyModuleType.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm::Properties {
 
diff --git a/flow/flow_gaswater_solvent.cpp b/flow/flow_gaswater_solvent.cpp
index 9a1de5b425..f398e1c09c 100644
--- a/flow/flow_gaswater_solvent.cpp
+++ b/flow/flow_gaswater_solvent.cpp
@@ -18,12 +18,15 @@
 
 #include <flow/flow_gaswater_solvent.hpp>
 
+#include <opm/grid/CpGrid.hpp>
+
 #include <opm/material/common/ResetLocale.hpp>
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
-#include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 #include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm::Properties {
 
diff --git a/flow/flow_micp.cpp b/flow/flow_micp.cpp
index 5ce6bd21cd..4fa9e8b12d 100644
--- a/flow/flow_micp.cpp
+++ b/flow/flow_micp.cpp
@@ -21,9 +21,12 @@
 #include <opm/grid/CpGrid.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
+
 #include <opm/models/blackoil/blackoilbioeffectsmodules.hh>
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoilonephaseindices.hh>
+
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
 #include <opm/simulators/flow/Main.hpp>
diff --git a/flow/flow_oilwater.cpp b/flow/flow_oilwater.cpp
index 92ffb857a8..7cf729d035 100644
--- a/flow/flow_oilwater.cpp
+++ b/flow/flow_oilwater.cpp
@@ -18,16 +18,19 @@
 
 #include <flow/flow_oilwater.hpp>
 
+#include <opm/grid/CpGrid.hpp>
+
 #include <opm/material/common/ResetLocale.hpp>
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
-#include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
-#include <opm/simulators/flow/Main.hpp>
-
-#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
+#include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+
 namespace Opm::Properties {
 
 namespace TTag {
diff --git a/flow/flow_oilwater_brine.cpp b/flow/flow_oilwater_brine.cpp
index f1d90ccf3f..7f9058385d 100644
--- a/flow/flow_oilwater_brine.cpp
+++ b/flow/flow_oilwater_brine.cpp
@@ -20,6 +20,7 @@
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/models/blackoil/blackoilbrinemodules.hh>
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
diff --git a/flow/flow_oilwater_polymer.cpp b/flow/flow_oilwater_polymer.cpp
index a296767e41..21a11e6bd9 100644
--- a/flow/flow_oilwater_polymer.cpp
+++ b/flow/flow_oilwater_polymer.cpp
@@ -18,12 +18,15 @@
 
 #include <flow/flow_oilwater_polymer.hpp>
 
+#include <opm/grid/CpGrid.hpp>
+
 #include <opm/material/common/ResetLocale.hpp>
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
-#include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 #include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm::Properties {
 
diff --git a/flow/flow_oilwater_polymer_injectivity.cpp b/flow/flow_oilwater_polymer_injectivity.cpp
index 739970bd77..6bc0099d6a 100644
--- a/flow/flow_oilwater_polymer_injectivity.cpp
+++ b/flow/flow_oilwater_polymer_injectivity.cpp
@@ -18,12 +18,15 @@
 
 #include <flow/flow_oilwater_polymer_injectivity.hpp>
 
+#include <opm/grid/CpGrid.hpp>
+
 #include <opm/material/common/ResetLocale.hpp>
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
-#include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 #include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm::Properties {
 
diff --git a/flow/flow_onephase.cpp b/flow/flow_onephase.cpp
index 3539dd690e..7ad059e878 100644
--- a/flow/flow_onephase.cpp
+++ b/flow/flow_onephase.cpp
@@ -19,12 +19,15 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <opm/simulators/flow/Main.hpp>
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoilonephaseindices.hh>
 
-#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
+#include <opm/simulators/flow/Main.hpp>
+
 namespace Opm::Properties {
 
 namespace TTag {
diff --git a/flow/flow_onephase_energy.cpp b/flow/flow_onephase_energy.cpp
index cb80c275dd..07e9e11da0 100644
--- a/flow/flow_onephase_energy.cpp
+++ b/flow/flow_onephase_energy.cpp
@@ -22,10 +22,13 @@
 
 #include <flow/flow_onephase_energy.hpp>
 
-#include <opm/simulators/flow/Main.hpp>
-#include <opm/models/blackoil/blackoilonephaseindices.hh>
 #include <opm/material/common/ResetLocale.hpp>
 
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+#include <opm/models/blackoil/blackoilonephaseindices.hh>
+
+#include <opm/simulators/flow/Main.hpp>
+
 namespace Opm::Properties {
 
 namespace TTag {
diff --git a/flow/flow_onephase_tpsa.cpp b/flow/flow_onephase_tpsa.cpp
index 91ed08499d..3d71e24c2a 100644
--- a/flow/flow_onephase_tpsa.cpp
+++ b/flow/flow_onephase_tpsa.cpp
@@ -20,8 +20,10 @@
 */
 #include "config.h"
 
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoilonephaseindices.hh>
+
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
 #include <opm/simulators/flow/BlackoilModelProperties.hpp>
diff --git a/flow/flow_polymer.cpp b/flow/flow_polymer.cpp
index 87bbdb91b5..afd6a778c5 100644
--- a/flow/flow_polymer.cpp
+++ b/flow/flow_polymer.cpp
@@ -18,10 +18,14 @@
 
 #include <flow/flow_polymer.hpp>
 
-#include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+
+#include <opm/material/common/ResetLocale.hpp>
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+
 #include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm::Properties {
 
diff --git a/flow/flow_solvent.cpp b/flow/flow_solvent.cpp
index 230fbc56c9..c7dd4bc7eb 100644
--- a/flow/flow_solvent.cpp
+++ b/flow/flow_solvent.cpp
@@ -18,10 +18,14 @@
 
 #include <flow/flow_solvent.hpp>
 
-#include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+
+#include <opm/material/common/ResetLocale.hpp>
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+
 #include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm::Properties {
 
diff --git a/flow/flow_solvent_foam.cpp b/flow/flow_solvent_foam.cpp
index e69e164e3a..e59145bce2 100644
--- a/flow/flow_solvent_foam.cpp
+++ b/flow/flow_solvent_foam.cpp
@@ -18,10 +18,14 @@
 
 #include <flow/flow_solvent_foam.hpp>
 
-#include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+
+#include <opm/material/common/ResetLocale.hpp>
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+
 #include <opm/simulators/flow/Main.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
 namespace Opm::Properties {
 
diff --git a/opm/models/blackoil/blackoilconvectivemixingmodule.hh b/opm/models/blackoil/blackoilconvectivemixingmodule.hh
index 981179f33d..de09c44c4a 100644
--- a/opm/models/blackoil/blackoilconvectivemixingmodule.hh
+++ b/opm/models/blackoil/blackoilconvectivemixingmodule.hh
@@ -36,6 +36,7 @@
 #include <opm/material/common/MathToolbox.hpp>
 #include <opm/material/common/Valgrind.hpp>
 
+#include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilconvectivemixingmoduleparam.hpp>
 #include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/common/multiphasebaseproperties.hh>
@@ -48,7 +49,6 @@
 namespace Opm {
 
 /*!
- * \copydoc Opm::BlackOilConvectiveMixingModule
  * \brief Provides the convective term in the transport flux for the brine
  * when convective mixing (enhanced dissolution of CO2 in brine) occurs.
  * Controlled by the regimes for a controlvolume:
@@ -60,18 +60,6 @@ namespace Opm {
  * has been completely dissolved)
  */
 
-template <class TypeTag, bool enableConvectiveMixing>
-class BlackOilConvectiveMixingModule;
-
-/*!
- * \copydoc Opm::BlackOilConvectiveMixingModule
- */
-
-template <class TypeTag>
-class BlackOilConvectiveMixingModule<TypeTag, /*enableConvectiveMixing=*/false>
-{
-};
-
 template <class TypeTag>
 class BlackOilConvectiveMixingModule<TypeTag, /*enableConvectiveMixing=*/true>
 {
@@ -89,7 +77,8 @@ class BlackOilConvectiveMixingModule<TypeTag, /*enableConvectiveMixing=*/true>
     enum { dimWorld = GridView::dimensionworld };
     enum { waterPhaseIdx = FluidSystem::waterPhaseIdx };
     enum { oilPhaseIdx = FluidSystem::oilPhaseIdx };
-    static constexpr bool enableFullyImplicitThermal = (getPropValue<TypeTag, Properties::EnergyModuleType>() == EnergyModules::FullyImplicitThermal);
+    static constexpr bool enableFullyImplicitThermal =
+        getPropValue<TypeTag, Properties::EnergyModuleType>() == EnergyModules::FullyImplicitThermal;
     static constexpr unsigned contiEnergyEqIdx = Indices::contiEnergyEqIdx;
 
 public:
@@ -345,9 +334,6 @@ public:
     }
 };
 
-template <class TypeTag, bool enableConvectiveMixingV>
-class BlackOilConvectiveMixingIntensiveQuantities;
-
 /*!
  * \ingroup BlackOil
  * \class Opm::BlackOilConvectiveMixingIntensiveQuantities
@@ -391,11 +377,6 @@ protected:
     Evaluation saturatedDissolutionFactor_;
 };
 
-template <class TypeTag>
-class BlackOilConvectiveMixingIntensiveQuantities<TypeTag, false>
-{
-};
-
 }
 
 #endif
diff --git a/opm/models/blackoil/blackoildiffusionmodule.hh b/opm/models/blackoil/blackoildiffusionmodule.hh
index 054b0efd46..6fec88a908 100644
--- a/opm/models/blackoil/blackoildiffusionmodule.hh
+++ b/opm/models/blackoil/blackoildiffusionmodule.hh
@@ -38,6 +38,7 @@
 #include <opm/material/common/Valgrind.hpp>
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
+#include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/common/multiphasebaseproperties.hh>
 #include <opm/models/discretization/common/fvbaseproperties.hh>
 
diff --git a/opm/models/blackoil/blackoilintensivequantities.hh b/opm/models/blackoil/blackoilintensivequantities.hh
index ca6c1c3337..b7bbacf8d0 100644
--- a/opm/models/blackoil/blackoilintensivequantities.hh
+++ b/opm/models/blackoil/blackoilintensivequantities.hh
@@ -38,7 +38,6 @@
 #include <opm/material/common/Valgrind.hpp>
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
-#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
 #include <opm/models/blackoil/blackoildispersionmodule.hh>
 #include <opm/models/blackoil/blackoilenergymodules.hh>
diff --git a/opm/models/blackoil/blackoillocalresidual.hh b/opm/models/blackoil/blackoillocalresidual.hh
index 49663b4f70..4531560b32 100644
--- a/opm/models/blackoil/blackoillocalresidual.hh
+++ b/opm/models/blackoil/blackoillocalresidual.hh
@@ -32,7 +32,6 @@
 #include <opm/material/fluidstates/BlackOilFluidState.hpp>
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
-#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
 #include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilextbomodules.hh>
diff --git a/opm/models/blackoil/blackoillocalresidualtpfa.hh b/opm/models/blackoil/blackoillocalresidualtpfa.hh
index b98de15ac8..6a875b1df4 100644
--- a/opm/models/blackoil/blackoillocalresidualtpfa.hh
+++ b/opm/models/blackoil/blackoillocalresidualtpfa.hh
@@ -36,7 +36,7 @@
 #include <opm/material/fluidstates/BlackOilFluidState.hpp>
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
-#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+#include <opm/models/blackoil/blackoilconvectivemixingmoduleparam.hpp>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
 #include <opm/models/blackoil/blackoildispersionmodule.hh>
 #include <opm/models/blackoil/blackoilenergymodules.hh>
diff --git a/opm/models/blackoil/blackoilmodules.hpp b/opm/models/blackoil/blackoilmodules.hpp
index 13e9027102..1f5bda4773 100644
--- a/opm/models/blackoil/blackoilmodules.hpp
+++ b/opm/models/blackoil/blackoilmodules.hpp
@@ -42,6 +42,7 @@ namespace Opm {
 
 DECLARE_MODULE(BlackOilBioeffects)
 DECLARE_MODULE(BlackOilBrine)
+DECLARE_MODULE(BlackOilConvectiveMixing)
 
 #undef DECLARE_MODULE
 
diff --git a/opm/simulators/flow/FlowProblemBlackoil.hpp b/opm/simulators/flow/FlowProblemBlackoil.hpp
index 8484db5978..e4ad9fcffa 100644
--- a/opm/simulators/flow/FlowProblemBlackoil.hpp
+++ b/opm/simulators/flow/FlowProblemBlackoil.hpp
@@ -40,8 +40,9 @@
 #include <opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp>
 #include <opm/material/fluidsystems/blackoilpvt/ConstantRsDeadOilPvt.hpp>
 
-#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+#include <opm/models/blackoil/blackoilconvectivemixingmoduleparam.hpp>
 #include <opm/models/blackoil/blackoilmoduleparams.hh>
+#include <opm/models/blackoil/blackoilmodules.hpp>
 
 #include <opm/output/eclipse/EclipseIO.hpp>
 
diff --git a/opm/simulators/flow/NewTranFluxModule.hpp b/opm/simulators/flow/NewTranFluxModule.hpp
index 4f6b9e3e92..6287607783 100644
--- a/opm/simulators/flow/NewTranFluxModule.hpp
+++ b/opm/simulators/flow/NewTranFluxModule.hpp
@@ -41,12 +41,14 @@
 
 #include <opm/material/common/MathToolbox.hpp>
 #include <opm/material/common/Valgrind.hpp>
+#include <opm/material/thermal/EnergyModuleType.hpp>
 
 #include <opm/models/discretization/common/fvbaseproperties.hh>
+#include <opm/models/blackoil/blackoilmodules.hpp>
+#include <opm/models/blackoil/blackoilconvectivemixingmoduleparam.hpp>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/utils/signum.hh>
 #include <opm/models/blackoil/blackoilmoduleparams.hh>
-#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 
 #include <opm/common/utility/gpuDecorators.hpp>
 
@@ -358,7 +360,7 @@ public:
         Scalar rhoEx = Toolbox::value(intQuantsEx.fluidState().density(phaseIdx));
         Evaluation rhoAvg = (rhoIn + rhoEx)/2;
 
-        if constexpr(enableConvectiveMixing) {
+        if constexpr (enableConvectiveMixing) {
             ConvectiveMixingModule::modifyAvgDensity(rhoAvg, intQuantsIn, intQuantsEx, phaseIdx, moduleParams.convectiveMixingModuleParam);
         }
 
diff --git a/python/simulators/PyBlackOilSimulator.cpp b/python/simulators/PyBlackOilSimulator.cpp
index 848fb0f9e0..5dd094e9da 100644
--- a/python/simulators/PyBlackOilSimulator.cpp
+++ b/python/simulators/PyBlackOilSimulator.cpp
@@ -18,13 +18,15 @@
 */
 
 #include "config.h"
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+
 #include <opm/simulators/flow/python/PyBlackOilSimulator.hpp>
 // NOTE: This file will be generated at compile time and placed in the build directory
 // See python/generate_docstring_hpp.py, and python/simulators/CMakeLists.txt for details
 #include <PyBlackOilSimulatorDoc.hpp>
 // NOTE: EXIT_SUCCESS, EXIT_FAILURE is defined in cstdlib
 #include <cstdlib>
-#include <stdexcept>
 #include <string>
 
 namespace py = pybind11;
diff --git a/python/simulators/PyGasWaterSimulator.cpp b/python/simulators/PyGasWaterSimulator.cpp
index bcdb2fd1c5..9c213a10e8 100644
--- a/python/simulators/PyGasWaterSimulator.cpp
+++ b/python/simulators/PyGasWaterSimulator.cpp
@@ -18,13 +18,15 @@
 */
 
 #include "config.h"
+
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+
 #include <opm/simulators/flow/python/PyGasWaterSimulator.hpp>
 // NOTE: This file will be generated at compile time and placed in the build directory
 // See python/generate_docstring_hpp.py, and python/simulators/CMakeLists.txt for details
 #include <PyGasWaterSimulatorDoc.hpp>
 // NOTE: EXIT_SUCCESS, EXIT_FAILURE is defined in cstdlib
 #include <cstdlib>
-#include <stdexcept>
 #include <string>
 
 namespace Opm {
diff --git a/python/simulators/PyOnePhaseSimulator.cpp b/python/simulators/PyOnePhaseSimulator.cpp
index a0b01cb306..344f3294fa 100644
--- a/python/simulators/PyOnePhaseSimulator.cpp
+++ b/python/simulators/PyOnePhaseSimulator.cpp
@@ -17,14 +17,16 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+
 #include <opm/models/blackoil/blackoilonephaseindices.hh>
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+
 #include <opm/simulators/flow/python/PyOnePhaseSimulator.hpp>
 // NOTE: This file will be generated at compile time and placed in the build directory
 // See python/generate_docstring_hpp.py, and python/simulators/CMakeLists.txt for details
 #include <PyOnePhaseSimulatorDoc.hpp>
 // NOTE: EXIT_SUCCESS, EXIT_FAILURE is defined in cstdlib
 #include <cstdlib>
-#include <stdexcept>
 #include <string>
 
 namespace Opm::Properties {