diff --git a/dune/stuff/common/math.hh b/dune/stuff/common/math.hh
index a03e426509fdadec1ae219bfb7e97efc262d21a8..53bc6070703be2422cb067cd34efa2d5b401a922 100644
--- a/dune/stuff/common/math.hh
+++ b/dune/stuff/common/math.hh
@@ -27,7 +27,9 @@
 #include <boost/math/special_functions/fpclassify.hpp>
 
 #if HAVE_DUNE_FEM
+#include <dune/stuff/common/disable_warnings.hh>
 #include <dune/fem/function/blockvectorfunction/blockvectorfunction.hh>
+#include <dune/stuff/common/reenable_warnings.hh>
 
 #include <dune/stuff/fem/namespace.hh>
 
diff --git a/dune/stuff/common/ranges.hh b/dune/stuff/common/ranges.hh
index 4afb25a9d069ab217f5e8d6ac9fe3798ff8ee059..e25227822ede112a3801aebe830e36ee5d110370 100644
--- a/dune/stuff/common/ranges.hh
+++ b/dune/stuff/common/ranges.hh
@@ -8,7 +8,9 @@
 #endif // ifdef HAVE_CMAKE_CONFIG
 
 #if HAVE_DUNE_GRID
+#include <dune/stuff/common/disable_warnings.hh>
 #include <dune/grid/common/gridview.hh>
+#include <dune/stuff/common/reenable_warnings.hh>
 #include <boost/serialization/static_warning.hpp>
 #endif