diff --git a/flow/flow_oilwater_polymer.cpp b/flow/flow_oilwater_polymer.cpp
index c43c4c86ec..92f5acd944 100644
--- a/flow/flow_oilwater_polymer.cpp
+++ b/flow/flow_oilwater_polymer.cpp
@@ -24,6 +24,7 @@
 
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
+#include <opm/models/blackoil/blackoilpolymermodules.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
 #include <opm/simulators/flow/Main.hpp>
diff --git a/flow/flow_oilwater_polymer_injectivity.cpp b/flow/flow_oilwater_polymer_injectivity.cpp
index 2a886091cd..49a30435f0 100644
--- a/flow/flow_oilwater_polymer_injectivity.cpp
+++ b/flow/flow_oilwater_polymer_injectivity.cpp
@@ -24,6 +24,7 @@
 
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
+#include <opm/models/blackoil/blackoilpolymermodules.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
 #include <opm/simulators/flow/Main.hpp>
diff --git a/flow/flow_polymer.cpp b/flow/flow_polymer.cpp
index a0f952f661..a24ef408dc 100644
--- a/flow/flow_polymer.cpp
+++ b/flow/flow_polymer.cpp
@@ -24,6 +24,7 @@
 
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
+#include <opm/models/blackoil/blackoilpolymermodules.hh>
 
 #include <opm/simulators/flow/Main.hpp>
 #include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
diff --git a/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp b/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
index 3484db1dc9..6ea4f5b108 100644
--- a/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
+++ b/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
@@ -43,7 +43,6 @@
 #include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/blackoil/blackoilsolventmodules.hh>
-#include <opm/models/blackoil/blackoilpolymermodules.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/blackoilextensivequantities.hh b/opm/models/blackoil/blackoilextensivequantities.hh
index 641c907e5e..8b725c5524 100644
--- a/opm/models/blackoil/blackoilextensivequantities.hh
+++ b/opm/models/blackoil/blackoilextensivequantities.hh
@@ -30,7 +30,6 @@
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilenergymodules.hh>
-#include <opm/models/blackoil/blackoilpolymermodules.hh>
 #include <opm/models/blackoil/blackoilsolventmodules.hh>
 #include <opm/models/common/multiphasebaseextensivequantities.hh>
 
diff --git a/opm/models/blackoil/blackoilintensivequantities.hh b/opm/models/blackoil/blackoilintensivequantities.hh
index 720e5d701f..e55b5177c3 100644
--- a/opm/models/blackoil/blackoilintensivequantities.hh
+++ b/opm/models/blackoil/blackoilintensivequantities.hh
@@ -39,7 +39,6 @@
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilenergymodules.hh>
-#include <opm/models/blackoil/blackoilpolymermodules.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/blackoil/blackoilsolventmodules.hh>
 #include <opm/models/common/directionalmobility.hh>
diff --git a/opm/models/blackoil/blackoillocalresidual.hh b/opm/models/blackoil/blackoillocalresidual.hh
index f07109099a..e7233f61bd 100644
--- a/opm/models/blackoil/blackoillocalresidual.hh
+++ b/opm/models/blackoil/blackoillocalresidual.hh
@@ -33,7 +33,6 @@
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilenergymodules.hh>
-#include <opm/models/blackoil/blackoilpolymermodules.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/blackoil/blackoilsolventmodules.hh>
 
diff --git a/opm/models/blackoil/blackoillocalresidualtpfa.hh b/opm/models/blackoil/blackoillocalresidualtpfa.hh
index 2d99ee2dc8..5c0ab9d0d7 100644
--- a/opm/models/blackoil/blackoillocalresidualtpfa.hh
+++ b/opm/models/blackoil/blackoillocalresidualtpfa.hh
@@ -39,7 +39,6 @@
 #include <opm/models/blackoil/blackoilconvectivemixingmoduleparam.hpp>
 #include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilmoduleparams.hh>
-#include <opm/models/blackoil/blackoilpolymermodules.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/blackoil/blackoilsolventmodules.hh>
 #include <opm/models/blackoil/blackoilmoduleparams.hh>
diff --git a/opm/models/blackoil/blackoilmodel.hh b/opm/models/blackoil/blackoilmodel.hh
index 3b32f51cb5..7ab38671f6 100644
--- a/opm/models/blackoil/blackoilmodel.hh
+++ b/opm/models/blackoil/blackoilmodel.hh
@@ -41,7 +41,6 @@
 #include <opm/models/blackoil/blackoilintensivequantities.hh>
 #include <opm/models/blackoil/blackoillocalresidual.hh>
 #include <opm/models/blackoil/blackoilnewtonmethod.hpp>
-#include <opm/models/blackoil/blackoilpolymermodules.hh>
 #include <opm/models/blackoil/blackoilprimaryvariables.hh>
 #include <opm/models/blackoil/blackoilproblem.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
@@ -539,7 +538,7 @@ public:
         }
 
         // deal with primary variables stemming from the energy module
-        else if (EnergyModule::primaryVarApplies(pvIdx)) {
+        if (EnergyModule::primaryVarApplies(pvIdx)) {
             return EnergyModule::primaryVarWeight(pvIdx);
         }
 
diff --git a/opm/models/blackoil/blackoilmodules.hpp b/opm/models/blackoil/blackoilmodules.hpp
index 0fe261af6e..6a5844d0e3 100644
--- a/opm/models/blackoil/blackoilmodules.hpp
+++ b/opm/models/blackoil/blackoilmodules.hpp
@@ -53,6 +53,7 @@ DECLARE_MODULE(BlackOilDiffusion)
 DECLARE_MODULE(BlackOilDispersion)
 DECLARE_MODULE(BlackOilExtbo)
 DECLARE_MODULE(BlackOilFoam)
+DECLARE_MODULE(BlackOilPolymer)
 
 #undef DECLARE_MODULE
 
diff --git a/opm/models/blackoil/blackoilpolymermodules.hh b/opm/models/blackoil/blackoilpolymermodules.hh
index c70e1ba157..5b6d817cae 100644
--- a/opm/models/blackoil/blackoilpolymermodules.hh
+++ b/opm/models/blackoil/blackoilpolymermodules.hh
@@ -35,6 +35,7 @@
 
 #include <opm/material/common/MathToolbox.hpp>
 
+#include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilpolymerparams.hpp>
 #include <opm/models/blackoil/blackoilproperties.hh>
 
@@ -55,9 +56,6 @@
 
 namespace Opm {
 
-template <class TypeTag, bool enablePolymerV>
-class BlackOilPolymerModule;
-
 /*!
  * \ingroup BlackOil
  * \brief Contains the high level supplements required to extend the black oil
@@ -541,18 +539,10 @@ private:
     static BlackOilPolymerParams<Scalar> params_;
 };
 
-template <class TypeTag>
-class BlackOilPolymerModule<TypeTag, false>
-{
-};
-
 template <class TypeTag>
 BlackOilPolymerParams<typename BlackOilPolymerModule<TypeTag, true>::Scalar>
 BlackOilPolymerModule<TypeTag, true>::params_;
 
-template <class TypeTag, bool enablePolymerV>
-class BlackOilPolymerIntensiveQuantities;
-
 /*!
  * \ingroup BlackOil
  * \class Opm::BlackOilPolymerIntensiveQuantities
@@ -706,14 +696,6 @@ protected:
     Evaluation waterViscosityCorrection_;
 };
 
-template <class TypeTag>
-class BlackOilPolymerIntensiveQuantities<TypeTag, false>
-{
-};
-
-template <class TypeTag, bool enablePolymerV>
-class BlackOilPolymerExtensiveQuantities;
-
 /*!
  * \ingroup BlackOil
  * \class Opm::BlackOilPolymerExtensiveQuantities
@@ -832,11 +814,6 @@ private:
     Evaluation waterShearFactor_;
 };
 
-template <class TypeTag>
-class BlackOilPolymerExtensiveQuantities<TypeTag, false>
-{
-};
-
 } // namespace Opm
 
 #endif
diff --git a/opm/models/blackoil/blackoilratevector.hh b/opm/models/blackoil/blackoilratevector.hh
index 56612d0d6f..863d37ddb2 100644
--- a/opm/models/blackoil/blackoilratevector.hh
+++ b/opm/models/blackoil/blackoilratevector.hh
@@ -35,7 +35,6 @@
 #include <opm/material/constraintsolvers/NcpFlash.hpp>
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
-#include <opm/models/blackoil/blackoilpolymermodules.hh>
 #include <opm/models/blackoil/blackoilsolventmodules.hh>
 #include <opm/models/common/multiphasebaseproperties.hh>
 #include <opm/models/discretization/common/fvbaseproperties.hh>
diff --git a/opm/simulators/flow/NewTranFluxModule.hpp b/opm/simulators/flow/NewTranFluxModule.hpp
index 36d8cb2589..2031de6ba7 100644
--- a/opm/simulators/flow/NewTranFluxModule.hpp
+++ b/opm/simulators/flow/NewTranFluxModule.hpp
@@ -44,13 +44,14 @@
 #include <opm/material/common/Valgrind.hpp>
 #include <opm/material/thermal/EnergyModuleType.hpp>
 
-#include <opm/models/discretization/common/fvbaseproperties.hh>
+#include <opm/models/blackoil/blackoilmoduleparams.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/discretization/common/fvbaseproperties.hh>
+
+#include <opm/models/utils/signum.hh>
 
 #include <array>
 
diff --git a/opm/simulators/wells/StandardWell.hpp b/opm/simulators/wells/StandardWell.hpp
index 85a73436ee..e7bc774d70 100644
--- a/opm/simulators/wells/StandardWell.hpp
+++ b/opm/simulators/wells/StandardWell.hpp
@@ -32,7 +32,6 @@
 #include <opm/simulators/wells/WellProdIndexCalculator.hpp>
 #include <opm/simulators/wells/ParallelWellInfo.hpp>
 
-#include <opm/models/blackoil/blackoilpolymermodules.hh>
 #include <opm/models/blackoil/blackoilsolventmodules.hh>
 #include <opm/models/blackoil/blackoilmodules.hpp>