diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index f23288bf0..60e4826dd 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -541,7 +541,7 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/models/blackoil/blackoilnewtonmethodparameters.hh
   opm/models/blackoil/blackoilonephaseindices.hh
   opm/models/blackoil/blackoilpolymermodules.hh
-  opm/models/blackoil/blackoilpolymerparams.hh
+  opm/models/blackoil/blackoilpolymerparams.hpp
   opm/models/blackoil/blackoilprimaryvariables.hh
   opm/models/blackoil/blackoilproblem.hh
   opm/models/blackoil/blackoilproperties.hh
diff --git a/opm/models/blackoil/blackoilpolymermodules.hh b/opm/models/blackoil/blackoilpolymermodules.hh
index e5d6ef21e..9b5fbfea6 100644
--- a/opm/models/blackoil/blackoilpolymermodules.hh
+++ b/opm/models/blackoil/blackoilpolymermodules.hh
@@ -28,13 +28,17 @@
 #ifndef EWOMS_BLACK_OIL_POLYMER_MODULE_HH
 #define EWOMS_BLACK_OIL_POLYMER_MODULE_HH
 
-#include "blackoilproperties.hh"
-
-#include <opm/models/blackoil/blackoilpolymerparams.hh>
-#include <opm/models/io/vtkblackoilpolymermodule.hh>
+#include <dune/common/fvector.hh>
 
 #include <opm/common/OpmLog/OpmLog.hpp>
 
+#include <opm/models/blackoil/blackoilpolymerparams.hpp>
+#include <opm/models/blackoil/blackoilproperties.hh>
+
+#include <opm/models/io/vtkblackoilpolymermodule.hh>
+
+#include <opm/models/utils/propertysystem.hh>
+
 #if HAVE_ECL_INPUT
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/PlyadsTable.hpp>
@@ -44,8 +48,6 @@
 #include <opm/input/eclipse/EclipseState/Tables/PlyviscTable.hpp>
 #endif
 
-#include <dune/common/fvector.hh>
-
 #include <cmath>
 #include <stdexcept>
 #include <string>
@@ -1133,7 +1135,6 @@ public:
     { throw std::runtime_error("waterShearFactor() called but polymers are disabled"); }
 };
 
-
 } // namespace Opm
 
 #endif
diff --git a/opm/models/blackoil/blackoilpolymerparams.hh b/opm/models/blackoil/blackoilpolymerparams.hpp
similarity index 97%
rename from opm/models/blackoil/blackoilpolymerparams.hh
rename to opm/models/blackoil/blackoilpolymerparams.hpp
index 9fdb63608..63f06a40d 100644
--- a/opm/models/blackoil/blackoilpolymerparams.hh
+++ b/opm/models/blackoil/blackoilpolymerparams.hpp
@@ -25,8 +25,8 @@
  *
  * \brief Contains the parameters required to extend the black-oil model by polymer.
  */
-#ifndef EWOMS_BLACK_OIL_POLYMER_PARAMS_HH
-#define EWOMS_BLACK_OIL_POLYMER_PARAMS_HH
+#ifndef OPM_BLACK_OIL_POLYMER_PARAMS_HPP
+#define OPM_BLACK_OIL_POLYMER_PARAMS_HPP
 
 #include <opm/material/common/Tabulated1DFunction.hpp>
 #include <opm/material/common/IntervalTabulated2DFunction.hpp>
@@ -132,4 +132,4 @@ struct BlackOilPolymerParams {
 
 } // namespace Opm
 
-#endif
+#endif // OPM_BLACK_OIL_POLYMER_PARAMS_HPP