diff --git a/flow/flow_biofilm.cpp b/flow/flow_biofilm.cpp
index f6032f2c0e..47d43fcf7d 100644
--- a/flow/flow_biofilm.cpp
+++ b/flow/flow_biofilm.cpp
@@ -27,6 +27,7 @@
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
 #include <opm/models/blackoil/blackoildispersionmodule.hh>
+#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
diff --git a/flow/flow_blackoil_temp.cpp b/flow/flow_blackoil_temp.cpp
index 010ee1f4fb..d6c99504ff 100644
--- a/flow/flow_blackoil_temp.cpp
+++ b/flow/flow_blackoil_temp.cpp
@@ -24,6 +24,7 @@
 #include <opm/material/thermal/EnergyModuleType.hpp>
 
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 
 #include <opm/models/discretization/common/tpfalinearizer.hh>
diff --git a/flow/flow_brine_energy.cpp b/flow/flow_brine_energy.cpp
index b09a966cf2..2bbd2fb0e8 100644
--- a/flow/flow_brine_energy.cpp
+++ b/flow/flow_brine_energy.cpp
@@ -21,6 +21,7 @@
 #include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
+#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 
 #include <opm/models/discretization/common/tpfalinearizer.hh>
diff --git a/flow/flow_energy.cpp b/flow/flow_energy.cpp
index f9f916998d..bf84724ebb 100644
--- a/flow/flow_energy.cpp
+++ b/flow/flow_energy.cpp
@@ -25,6 +25,7 @@
 
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
+#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 
 #include <opm/models/discretization/common/tpfalinearizer.hh>
diff --git a/flow/flow_gasoil.cpp b/flow/flow_gasoil.cpp
index 4e1f9d67fc..5bc33f6e09 100644
--- a/flow/flow_gasoil.cpp
+++ b/flow/flow_gasoil.cpp
@@ -24,6 +24,7 @@
 #include <opm/material/thermal/EnergyModuleType.hpp>
 
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
diff --git a/flow/flow_gasoil_energy.cpp b/flow/flow_gasoil_energy.cpp
index 6b4e1aae76..66b5bd2e9f 100644
--- a/flow/flow_gasoil_energy.cpp
+++ b/flow/flow_gasoil_energy.cpp
@@ -29,6 +29,7 @@
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
 #include <opm/models/blackoil/blackoildispersionmodule.hh>
+#include <opm/models/blackoil/blackoilenergymodules.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_gasoildiffuse.cpp b/flow/flow_gasoildiffuse.cpp
index cd9d28f929..ffbd4955f0 100644
--- a/flow/flow_gasoildiffuse.cpp
+++ b/flow/flow_gasoildiffuse.cpp
@@ -26,6 +26,7 @@
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
 #include <opm/models/blackoil/blackoildispersionmodule.hh>
+#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 
diff --git a/flow/flow_gaswater.cpp b/flow/flow_gaswater.cpp
index fed32ee239..4f8c1e233d 100644
--- a/flow/flow_gaswater.cpp
+++ b/flow/flow_gaswater.cpp
@@ -23,6 +23,7 @@
 #include <opm/material/common/ResetLocale.hpp>
 
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
diff --git a/flow/flow_gaswater_brine.cpp b/flow/flow_gaswater_brine.cpp
index b042056418..4e80f3087c 100644
--- a/flow/flow_gaswater_brine.cpp
+++ b/flow/flow_gaswater_brine.cpp
@@ -26,6 +26,7 @@
 #include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
+#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
diff --git a/flow/flow_gaswater_dissolution.cpp b/flow/flow_gaswater_dissolution.cpp
index 24e4b26a54..061bbe9570 100644
--- a/flow/flow_gaswater_dissolution.cpp
+++ b/flow/flow_gaswater_dissolution.cpp
@@ -24,6 +24,7 @@
 #include <opm/material/thermal/EnergyModuleType.hpp>
 
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
diff --git a/flow/flow_gaswater_dissolution_diffuse.cpp b/flow/flow_gaswater_dissolution_diffuse.cpp
index 7927abee1b..0e50c5051c 100644
--- a/flow/flow_gaswater_dissolution_diffuse.cpp
+++ b/flow/flow_gaswater_dissolution_diffuse.cpp
@@ -28,6 +28,7 @@
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
 #include <opm/models/blackoil/blackoildispersionmodule.hh>
+#include <opm/models/blackoil/blackoilenergymodules.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_energy.cpp b/flow/flow_gaswater_energy.cpp
index ac997f9f1e..ddf199f8c4 100644
--- a/flow/flow_gaswater_energy.cpp
+++ b/flow/flow_gaswater_energy.cpp
@@ -25,6 +25,7 @@
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
 #include <opm/models/blackoil/blackoildispersionmodule.hh>
+#include <opm/models/blackoil/blackoilenergymodules.hh>
 
 #include <opm/simulators/flow/FlowGasWaterEnergyTypeTag.hpp>
 #include <opm/simulators/flow/Main.hpp>
diff --git a/flow/flow_gaswater_saltprec_energy.cpp b/flow/flow_gaswater_saltprec_energy.cpp
index f589dd162a..8967f7d2ec 100644
--- a/flow/flow_gaswater_saltprec_energy.cpp
+++ b/flow/flow_gaswater_saltprec_energy.cpp
@@ -26,6 +26,7 @@
 #include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
+#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
diff --git a/flow/flow_gaswater_saltprec_vapwat.cpp b/flow/flow_gaswater_saltprec_vapwat.cpp
index 3cc06a674c..2c5d0070f9 100644
--- a/flow/flow_gaswater_saltprec_vapwat.cpp
+++ b/flow/flow_gaswater_saltprec_vapwat.cpp
@@ -26,6 +26,7 @@
 #include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
+#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
diff --git a/flow/flow_gaswater_solvent.cpp b/flow/flow_gaswater_solvent.cpp
index 6a59ae3731..58d362bc78 100644
--- a/flow/flow_gaswater_solvent.cpp
+++ b/flow/flow_gaswater_solvent.cpp
@@ -24,6 +24,7 @@
 
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
+#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilsolventmodules.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
diff --git a/flow/flow_gpu_gaswater_thermal.cu b/flow/flow_gpu_gaswater_thermal.cu
index 05868b6a5f..274cbca97b 100644
--- a/flow/flow_gpu_gaswater_thermal.cu
+++ b/flow/flow_gpu_gaswater_thermal.cu
@@ -30,6 +30,8 @@
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/material/thermal/EnergyModuleType.hpp>
+
+#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
 #include <opm/grid/CpGrid.hpp>
diff --git a/flow/flow_gpu_gaswater_thermal.hip b/flow/flow_gpu_gaswater_thermal.hip
index 2c676de355..172ec99f37 100644
--- a/flow/flow_gpu_gaswater_thermal.hip
+++ b/flow/flow_gpu_gaswater_thermal.hip
@@ -34,6 +34,7 @@
 #include <opm/simulators/flow/SimpleFIBlackOilModel.hpp>
 #include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
 
+#include <opm/models/blackoil/blackoilenergymodules.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_onephase_energy.cpp b/flow/flow_onephase_energy.cpp
index c2c0e63df4..0dcc4dc929 100644
--- a/flow/flow_onephase_energy.cpp
+++ b/flow/flow_onephase_energy.cpp
@@ -26,6 +26,7 @@
 
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
+#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilonephaseindices.hh>
 
 #include <opm/simulators/flow/Main.hpp>
diff --git a/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp b/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
index 550f58a1ea..d3203d0050 100644
--- a/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
+++ b/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
@@ -42,7 +42,6 @@
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilproperties.hh>
-#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/common/directionalmobility.hh>
 
diff --git a/opm/models/blackoil/blackoilboundaryratevector.hh b/opm/models/blackoil/blackoilboundaryratevector.hh
index 5141f3d6e8..1074d97949 100644
--- a/opm/models/blackoil/blackoilboundaryratevector.hh
+++ b/opm/models/blackoil/blackoilboundaryratevector.hh
@@ -31,7 +31,14 @@
 #include <opm/material/common/Valgrind.hpp>
 #include <opm/material/constraintsolvers/NcpFlash.hpp>
 
-#include <opm/models/blackoil/blackoilenergymodules.hh>
+#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>
+
+#include <opm/models/utils/propertysystem.hh>
 
 #include <algorithm>
 #include <type_traits>
diff --git a/opm/models/blackoil/blackoilconvectivemixingmodule.hh b/opm/models/blackoil/blackoilconvectivemixingmodule.hh
index 4d1edfc6a3..94ccac423c 100644
--- a/opm/models/blackoil/blackoilconvectivemixingmodule.hh
+++ b/opm/models/blackoil/blackoilconvectivemixingmodule.hh
@@ -30,6 +30,9 @@
 
 #include <dune/common/fvector.hh>
 
+#include <opm/common/utility/gpuistl_if_available.hpp>
+#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
+
 #include <opm/input/eclipse/Schedule/OilVaporizationProperties.hpp>
 #include <opm/input/eclipse/Schedule/Schedule.hpp>
 
@@ -37,13 +40,13 @@
 #include <opm/material/common/Valgrind.hpp>
 #include <opm/material/fluidsystems/BlackOilFluidSystem.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>
-#include <opm/models/discretization/common/fvbaseproperties.hh>
+#include <opm/models/blackoil/blackoilmodules.hpp>
+#include <opm/models/blackoil/blackoilproperties.hh>
 
-#include <opm/common/utility/gpuistl_if_available.hpp>
+#include <opm/models/common/multiphasebaseproperties.hh>
+
+#include <opm/models/discretization/common/fvbaseproperties.hh>
 
 #include <cstddef>
 
diff --git a/opm/models/blackoil/blackoilenergymodules.hh b/opm/models/blackoil/blackoilenergymodules.hh
index c09fe92439..784536b8fe 100644
--- a/opm/models/blackoil/blackoilenergymodules.hh
+++ b/opm/models/blackoil/blackoilenergymodules.hh
@@ -37,6 +37,7 @@
 #include <opm/material/common/Valgrind.hpp>
 #include <opm/material/fluidstates/BlackOilFluidState.hpp>
 
+#include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/common/quantitycallbacks.hh>
 #include <opm/models/discretization/common/linearizationtype.hh>
@@ -54,9 +55,6 @@
 
 namespace Opm {
 
-template <class TypeTag, EnergyModules activeModule>
-class BlackOilEnergyModule;
-
 /*!
  * \ingroup BlackOil
  * \brief Contains the high level supplements required to extend the black oil
@@ -311,9 +309,6 @@ public:
     }
 };
 
-template <class TypeTag, EnergyModules activeModule>
-class BlackOilEnergyIntensiveQuantities;
-
 /*!
  * \ingroup BlackOil
  * \class Opm::BlackOilEnergyIntensiveQuantities
@@ -594,14 +589,6 @@ protected:
 
 };
 
-template <class TypeTag>
-class BlackOilEnergyIntensiveQuantities<TypeTag, EnergyModules::NoTemperature>
-{
-};
-
-template <class TypeTag, EnergyModules activeModule>
-class BlackOilEnergyExtensiveQuantities;
-
 /*!
  * \ingroup BlackOil
  * \class Opm::BlackOilEnergyExtensiveQuantities
@@ -773,11 +760,6 @@ private:
     Evaluation energyFlux_;
 };
 
-template <class TypeTag>
-class BlackOilEnergyExtensiveQuantities<TypeTag, EnergyModules::ConstantTemperature>
-{
-};
-
 template <class TypeTag>
 class BlackOilEnergyExtensiveQuantities<TypeTag, EnergyModules::SequentialImplicitThermal>
 {
@@ -839,11 +821,6 @@ public:
     { OPM_THROW(std::logic_error, "Requested the energy flux, but energy is not conserved"); }
 };
 
-template <class TypeTag>
-class BlackOilEnergyExtensiveQuantities<TypeTag, EnergyModules::NoTemperature>
-{
-};
-
 } // namespace Opm
 
 #endif
diff --git a/opm/models/blackoil/blackoilextensivequantities.hh b/opm/models/blackoil/blackoilextensivequantities.hh
index 45353e8088..b9dd8d982e 100644
--- a/opm/models/blackoil/blackoilextensivequantities.hh
+++ b/opm/models/blackoil/blackoilextensivequantities.hh
@@ -29,7 +29,8 @@
 #define EWOMS_BLACK_OIL_EXTENSIVE_QUANTITIES_HH
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
-#include <opm/models/blackoil/blackoilenergymodules.hh>
+#include <opm/models/blackoil/blackoilproperties.hh>
+
 #include <opm/models/common/multiphasebaseextensivequantities.hh>
 
 namespace Opm {
diff --git a/opm/models/blackoil/blackoilintensivequantities.hh b/opm/models/blackoil/blackoilintensivequantities.hh
index 25fbcd581f..25c948ad91 100644
--- a/opm/models/blackoil/blackoilintensivequantities.hh
+++ b/opm/models/blackoil/blackoilintensivequantities.hh
@@ -30,7 +30,9 @@
 
 #include <dune/common/fmatrix.hh>
 
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/common/TimingMacros.hpp>
+#include <opm/common/utility/gpuDecorators.hpp>
 
 #include <opm/input/eclipse/EclipseState/Grid/FaceDir.hpp>
 
@@ -38,11 +40,10 @@
 #include <opm/material/common/Valgrind.hpp>
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
-#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/common/directionalmobility.hh>
-#include <opm/common/ErrorMacros.hpp>
-#include <opm/common/utility/gpuDecorators.hpp>
+
+#include <opm/models/discretization/common/linearizationtype.hh>
 
 #include <opm/utility/CopyablePtr.hpp>
 
diff --git a/opm/models/blackoil/blackoillocalresidual.hh b/opm/models/blackoil/blackoillocalresidual.hh
index 5e15f025ed..40ef253849 100644
--- a/opm/models/blackoil/blackoillocalresidual.hh
+++ b/opm/models/blackoil/blackoillocalresidual.hh
@@ -32,9 +32,10 @@
 #include <opm/material/fluidstates/BlackOilFluidState.hpp>
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
-#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
 
+#include <opm/models/discretization/common/fvbaseproperties.hh>
+
 #include <cassert>
 
 namespace Opm {
diff --git a/opm/models/blackoil/blackoillocalresidualtpfa.hh b/opm/models/blackoil/blackoillocalresidualtpfa.hh
index 5d3de0b6f0..c0f377f18f 100644
--- a/opm/models/blackoil/blackoillocalresidualtpfa.hh
+++ b/opm/models/blackoil/blackoillocalresidualtpfa.hh
@@ -37,10 +37,11 @@
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilconvectivemixingmoduleparam.hpp>
-#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilmoduleparams.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
 
+#include <opm/models/discretization/common/fvbaseproperties.hh>
+
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/utility/gpuDecorators.hpp>
 #include <opm/common/utility/gpuistl_if_available.hpp>
diff --git a/opm/models/blackoil/blackoilmodel.hh b/opm/models/blackoil/blackoilmodel.hh
index 486064501d..ea2343fa08 100644
--- a/opm/models/blackoil/blackoilmodel.hh
+++ b/opm/models/blackoil/blackoilmodel.hh
@@ -35,7 +35,6 @@
 #include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilboundaryratevector.hh>
 #include <opm/models/blackoil/blackoildarcyfluxmodule.hh>
-#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilextensivequantities.hh>
 #include <opm/models/blackoil/blackoilvariableandequationindices.hh>
 #include <opm/models/blackoil/blackoilintensivequantities.hh>
diff --git a/opm/models/blackoil/blackoilmodules.hpp b/opm/models/blackoil/blackoilmodules.hpp
index a689eecb6b..9fb32e8d53 100644
--- a/opm/models/blackoil/blackoilmodules.hpp
+++ b/opm/models/blackoil/blackoilmodules.hpp
@@ -30,6 +30,8 @@
 #ifndef OPM_BLACK_OIL_MODULES_HPP
 #define OPM_BLACK_OIL_MODULES_HPP
 
+#include <opm/material/thermal/EnergyModuleType.hpp>
+
 namespace Opm {
 
 #define DECLARE_MODULE(T) \
@@ -56,6 +58,21 @@ DECLARE_MODULE(BlackOilFoam)
 DECLARE_MODULE(BlackOilPolymer)
 DECLARE_MODULE(BlackOilSolvent)
 
+template<class TypeTag, EnergyModules activeModule>
+class BlackOilEnergyModule
+{
+};
+
+template <class TypeTag, EnergyModules activeModule>
+class BlackOilEnergyIntensiveQuantities
+{
+};
+
+template <class TypeTag, EnergyModules activeModule>
+class BlackOilEnergyExtensiveQuantities
+{
+};
+
 #undef DECLARE_MODULE
 
 } // namespace Opm
diff --git a/opm/models/blackoil/blackoilprimaryvariables.hh b/opm/models/blackoil/blackoilprimaryvariables.hh
index 40df6c452d..56ec4aca09 100644
--- a/opm/models/blackoil/blackoilprimaryvariables.hh
+++ b/opm/models/blackoil/blackoilprimaryvariables.hh
@@ -25,6 +25,7 @@
 #define EWOMS_BLACK_OIL_PRIMARY_VARIABLES_HH
 
 #include <dune/common/fvector.hh>
+
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/common/utility/gpuDecorators.hpp>
 
@@ -34,14 +35,11 @@
 #include <opm/material/fluidstates/SimpleModularFluidState.hpp>
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
-#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilmeanings.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
 
 #include <opm/models/discretization/common/fvbaseprimaryvariables.hh>
 
-#include <fmt/format.h>
-
 #include <algorithm>
 #include <array>
 #include <cassert>
@@ -49,6 +47,8 @@
 #include <stdexcept>
 #include <type_traits>
 
+#include <fmt/format.h>
+
 namespace Opm::Parameters {
 
 template<class Scalar>
diff --git a/opm/simulators/aquifers/AquiferAnalytical.hpp b/opm/simulators/aquifers/AquiferAnalytical.hpp
index 22dfad8ac6..0c4ce3e1ee 100644
--- a/opm/simulators/aquifers/AquiferAnalytical.hpp
+++ b/opm/simulators/aquifers/AquiferAnalytical.hpp
@@ -33,7 +33,6 @@
 #include <opm/material/densead/Math.hpp>
 #include <opm/material/fluidstates/BlackOilFluidState.hpp>
 
-#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/utils/basicproperties.hh>
 
diff --git a/opm/simulators/flow/CpGridVanguard.hpp b/opm/simulators/flow/CpGridVanguard.hpp
index 00941e3630..b67bd51d29 100644
--- a/opm/simulators/flow/CpGridVanguard.hpp
+++ b/opm/simulators/flow/CpGridVanguard.hpp
@@ -30,7 +30,6 @@
 #include <opm/common/TimingMacros.hpp>
 
 #include <opm/models/common/multiphasebaseproperties.hh>
-#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/simulators/flow/FemCpGridCompat.hpp>
 #include <opm/simulators/flow/FlowBaseVanguard.hpp>
diff --git a/opm/simulators/flow/EclWriter.hpp b/opm/simulators/flow/EclWriter.hpp
index 9286e460e1..bced3057f9 100644
--- a/opm/simulators/flow/EclWriter.hpp
+++ b/opm/simulators/flow/EclWriter.hpp
@@ -40,7 +40,6 @@
 #include <opm/output/eclipse/Inplace.hpp>
 #include <opm/output/eclipse/RestartValue.hpp>
 
-#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilproperties.hh> // Properties::EnableMech, EnableSolvent
 #include <opm/models/common/multiphasebaseproperties.hh> // Properties::FluidSystem
 
diff --git a/opm/simulators/flow/EquilInitializer.hpp b/opm/simulators/flow/EquilInitializer.hpp
index 5ed90435a1..ac8a831001 100644
--- a/opm/simulators/flow/EquilInitializer.hpp
+++ b/opm/simulators/flow/EquilInitializer.hpp
@@ -33,7 +33,6 @@
 #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
 #include <opm/material/fluidstates/BlackOilFluidState.hpp>
 
-#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/discretization/common/fvbaseproperties.hh>
 #include <opm/models/utils/propertysystem.hh>
diff --git a/opm/simulators/flow/OutputBlackoilModule.hpp b/opm/simulators/flow/OutputBlackoilModule.hpp
index 3a7519edbb..8ab4777553 100644
--- a/opm/simulators/flow/OutputBlackoilModule.hpp
+++ b/opm/simulators/flow/OutputBlackoilModule.hpp
@@ -43,7 +43,6 @@
 #include <opm/material/fluidstates/BlackOilFluidState.hpp>
 #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
 
-#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/discretization/common/fvbaseproperties.hh>
 #include <opm/models/utils/parametersystem.hpp>
diff --git a/opm/simulators/flow/OutputCompositionalModule.hpp b/opm/simulators/flow/OutputCompositionalModule.hpp
index a57a3b6d4d..841ec68cd7 100644
--- a/opm/simulators/flow/OutputCompositionalModule.hpp
+++ b/opm/simulators/flow/OutputCompositionalModule.hpp
@@ -40,7 +40,6 @@
 
 #include <opm/material/common/Valgrind.hpp>
 
-#include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/common/multiphasebaseproperties.hh>
 #include <opm/models/utils/parametersystem.hpp>