diff --git a/opm/core/grid/GridHelpers.hpp b/opm/core/grid/GridHelpers.hpp
index fc7bfcee..cb78562f 100644
--- a/opm/core/grid/GridHelpers.hpp
+++ b/opm/core/grid/GridHelpers.hpp
@@ -20,8 +20,13 @@
 */
 #ifndef OPM_CORE_GRIDHELPERS_HEADER_INCLUDED
 #define OPM_CORE_GRIDHELPERS_HEADER_INCLUDED
+
 #include <opm/core/grid.h>
+
+#include <opm/common/utility/platform_dependent/disable_warnings.h>
 #include <boost/range/iterator_range.hpp>
+#include <opm/common/utility/platform_dependent/reenable_warnings.h>
+
 
 namespace Opm
 {
diff --git a/opm/core/utility/thresholdPressures.hpp b/opm/core/utility/thresholdPressures.hpp
index 244d708b..33eb64bf 100644
--- a/opm/core/utility/thresholdPressures.hpp
+++ b/opm/core/utility/thresholdPressures.hpp
@@ -314,7 +314,7 @@ void computeMaxDp(std::map<std::pair<int, int>, double>& maxDp,
 
 
     template <class Grid>
-    std::vector<double> thresholdPressures(const DeckConstPtr& deck,
+    std::vector<double> thresholdPressures(const DeckConstPtr& /* deck */,
                                            EclipseStateConstPtr eclipseState,
                                            const Grid& grid,
                                            const std::map<std::pair<int, int>, double>& maxDp)