diff --git a/opm/material/eos/PengRobinsonParamsMixture.hpp b/opm/material/eos/PengRobinsonParamsMixture.hpp
index 7a6d80f0a..3d7b552e5 100644
--- a/opm/material/eos/PengRobinsonParamsMixture.hpp
+++ b/opm/material/eos/PengRobinsonParamsMixture.hpp
@@ -27,10 +27,12 @@
 #ifndef OPM_PENG_ROBINSON_PARAMS_MIXTURE_HPP
 #define OPM_PENG_ROBINSON_PARAMS_MIXTURE_HPP
 
-#include <algorithm>
+#include "PengRobinsonParams.hpp"
+
+#include <opm/material/common/MathToolbox.hpp>
 #include <opm/material/Constants.hpp>
 
-#include "PengRobinsonParams.hpp"
+#include <algorithm>
 
 namespace Opm
 {
diff --git a/opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp b/opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp
index 541a07b6f..f34bdc63a 100644
--- a/opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp
+++ b/opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp
@@ -46,6 +46,7 @@
 #include <opm/common/ErrorMacros.hpp>
 
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
+#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 
 #include <algorithm>
diff --git a/opm/material/fluidmatrixinteractions/EclStone1MaterialParams.hpp b/opm/material/fluidmatrixinteractions/EclStone1MaterialParams.hpp
index 4dfb74f3c..d140457c7 100644
--- a/opm/material/fluidmatrixinteractions/EclStone1MaterialParams.hpp
+++ b/opm/material/fluidmatrixinteractions/EclStone1MaterialParams.hpp
@@ -27,6 +27,8 @@
 #ifndef OPM_ECL_STONE1_MATERIAL_PARAMS_HPP
 #define OPM_ECL_STONE1_MATERIAL_PARAMS_HPP
 
+#include <opm/material/common/EnsureFinalized.hpp>
+
 #include <type_traits>
 #include <cassert>
 #include <memory>
diff --git a/opm/material/fluidmatrixinteractions/EclStone2MaterialParams.hpp b/opm/material/fluidmatrixinteractions/EclStone2MaterialParams.hpp
index 0a57d35f2..ce321dd5f 100644
--- a/opm/material/fluidmatrixinteractions/EclStone2MaterialParams.hpp
+++ b/opm/material/fluidmatrixinteractions/EclStone2MaterialParams.hpp
@@ -27,6 +27,8 @@
 #ifndef OPM_ECL_STONE2_MATERIAL_PARAMS_HPP
 #define OPM_ECL_STONE2_MATERIAL_PARAMS_HPP
 
+#include <opm/material/common/EnsureFinalized.hpp>
+
 #include <type_traits>
 #include <cassert>
 #include <memory>
diff --git a/opm/material/heatconduction/DummyHeatConductionLaw.hpp b/opm/material/heatconduction/DummyHeatConductionLaw.hpp
index 1abdb96ee..ee9d8b75e 100644
--- a/opm/material/heatconduction/DummyHeatConductionLaw.hpp
+++ b/opm/material/heatconduction/DummyHeatConductionLaw.hpp
@@ -27,6 +27,7 @@
 #ifndef OPM_DUMMY_HEATCONDUCTION_LAW_HPP
 #define OPM_DUMMY_HEATCONDUCTION_LAW_HPP
 
+#include <opm/common/Unused.hpp>
 #include <opm/common/Exceptions.hpp>
 #include <opm/common/ErrorMacros.hpp>