diff --git a/cmake/Modules/UseWarnings.cmake b/cmake/Modules/UseWarnings.cmake
index bb92657b..c4cab18d 100644
--- a/cmake/Modules/UseWarnings.cmake
+++ b/cmake/Modules/UseWarnings.cmake
@@ -14,8 +14,8 @@ if (CXX_COMPAT_GCC)
 endif ()
 
 option(SILENCE_DUNE_WARNINGS "Disable warnings from DUNE?" OFF)
-if(SILENCE_DUNE_WARNINGS AND CXX_COMPAT_GCC)
-  file(WRITE ${CMAKE_BINARY_DIR}/dune_disable_pragmas.h "
+if(SILENCE_EXTERNAL_WARNINGS AND CXX_COMPAT_GCC)
+  file(WRITE ${CMAKE_BINARY_DIR}/disable_warning_pragmas.h "
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored \"-Wdeprecated-declarations\"
 #pragma GCC diagnostic ignored \"-Wdeprecated-register\"
@@ -24,8 +24,8 @@ if(SILENCE_DUNE_WARNINGS AND CXX_COMPAT_GCC)
 #pragma GCC diagnostic ignored \"-Wshadow\"
 #pragma GCC diagnostic ignored \"-Wsign-compare\"
 #pragma GCC diagnostic ignored \"-Wunused-parameter\"")
-  file(WRITE ${CMAKE_BINARY_DIR}/dune_reenable_pragmas.h "#pragma GCC diagnostic pop")
+  file(WRITE ${CMAKE_BINARY_DIR}/reenable_warning_pragmas.h "#pragma GCC diagnostic pop")
 else()
-    file(WRITE ${CMAKE_BINARY_DIR}/dune_disable_pragmas.h "")
-    file(WRITE ${CMAKE_BINARY_DIR}/dune_reenable_pragmas.h "")
+    file(WRITE ${CMAKE_BINARY_DIR}/disable_warning_pragmas.h "")
+    file(WRITE ${CMAKE_BINARY_DIR}/reenable_warning_pragmas.h "")
 endif()
diff --git a/opm/core/linalg/LinearSolverIstl.cpp b/opm/core/linalg/LinearSolverIstl.cpp
index db11ba0c..f7ffd732 100644
--- a/opm/core/linalg/LinearSolverIstl.cpp
+++ b/opm/core/linalg/LinearSolverIstl.cpp
@@ -30,7 +30,7 @@
 // the deprecated member anyway (in this compilation unit)
 #define DUNE_COMMON_FIELDVECTOR_SIZE_IS_METHOD 1
 
-#include "dune_disable_pragmas.h"
+#include "disable_warning_pragmas.h"
 
 // TODO: clean up includes.
 #include <dune/common/deprecated.hh>
@@ -51,7 +51,7 @@
 #include <dune/istl/paamg/fastamg.hh>
 #endif
 
-#include "dune_reenable_pragmas.h"
+#include "reenable_warning_pragmas.h"
 
 #include <stdexcept>
 #include <iostream>