diff --git a/src/Makefile.am b/src/Makefile.am
index 97c02bae25338a62ecd4f1a35fb4617149b2a89d..74a9199700f826601283e2202722d61cdcc23b19 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,21 +31,8 @@ one_body_sample_3D_CPPFLAGS = \
 AM_CXXFLAGS = \
 	-Wall \
 	-Wextra \
-	-Wno-c++11-compat \
-	-Wno-c++11-extensions \
-	-Wno-deprecated-declarations \
-	-Wno-empty-body \
-	-Wno-ignored-qualifiers \
-	-Wno-mismatched-tags \
-	-Wno-missing-declarations \
-	-Wno-overloaded-virtual \
-	-Wno-reorder \
-	-Wno-sign-compare \
-	-Wno-tautological-compare \
-	-Wno-type-limits \
-	-Wno-unneeded-internal-declaration \
 	-Wno-unused-parameter \
-	-Wno-unused-variable
+	-Wno-overloaded-virtual
 
 AM_CPPFLAGS = \
 	-DDUNE_FMatrix_WITH_CHECKING \
diff --git a/src/assemblers_tmpl.cc b/src/assemblers_tmpl.cc
index 325eaee8e6bce3925c881bc2e9a03479720d6f73..8b6dd794f5b9af20bbeabc3776e0f585323743a9 100644
--- a/src/assemblers_tmpl.cc
+++ b/src/assemblers_tmpl.cc
@@ -4,7 +4,10 @@
 
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wignored-qualifiers"
 #include <dune/grid/alugrid.hh>
+#pragma clang diagnostic pop
 #include <dune/istl/bvector.hh>
 #include <dune/istl/bcrsmatrix.hh>
 
diff --git a/src/mysolver_tmpl.cc b/src/mysolver_tmpl.cc
index a4c726ec4b59ca9d4f1c99cc0ebf325e84810d2d..5e9809b6a625b9593af2227e9be4c5fb7ccae2bc 100644
--- a/src/mysolver_tmpl.cc
+++ b/src/mysolver_tmpl.cc
@@ -4,7 +4,12 @@
 
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wignored-qualifiers"
 #include <dune/grid/alugrid.hh>
+#pragma clang diagnostic pop
+
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/bvector.hh>
 
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index becc9ea2494a764a51f800efb8fbcd37635efba9..1d35f35f3ba2d94fb2981e3e760e7f0815ec6f64 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -39,7 +39,12 @@
 #include <dune/common/parametertreeparser.hh>
 #include <dune/common/shared_ptr.hh>
 #include <dune/common/timer.hh>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wignored-qualifiers"
 #include <dune/grid/alugrid.hh>
+#pragma clang diagnostic pop
+
 #include <dune/grid/common/mcmgmapper.hh>
 #include <dune/grid/utility/structuredgridfactory.hh>
 #include <dune/istl/bcrsmatrix.hh>
diff --git a/src/vtk_tmpl.cc b/src/vtk_tmpl.cc
index 9347e7b587e973d7a5ccfa0222d0f1e89dc99175..fb018952cb118a81147b867066906b48ae7738ae 100644
--- a/src/vtk_tmpl.cc
+++ b/src/vtk_tmpl.cc
@@ -4,7 +4,12 @@
 
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wignored-qualifiers"
 #include <dune/grid/alugrid.hh>
+#pragma clang diagnostic pop
+
 #include <dune/istl/bvector.hh>
 
 #include <dune/fufem/functionspacebases/p0basis.hh>