diff --git a/ql/math/integrals/discreteintegrals.cpp b/ql/math/integrals/discreteintegrals.cpp
index 76098f88ae1..d3381c83e0b 100644
--- a/ql/math/integrals/discreteintegrals.cpp
+++ b/ql/math/integrals/discreteintegrals.cpp
@@ -18,20 +18,13 @@
 */
 
 #include <ql/math/integrals/discreteintegrals.hpp>
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++11-extensions"
-#endif
 #include <boost/accumulators/accumulators.hpp>
 #include <boost/accumulators/statistics/sum.hpp>
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
 
 using namespace boost::accumulators;
 
 namespace QuantLib {
+
     Real DiscreteTrapezoidIntegral::operator()(
         const Array& x, const Array& f)    const {
 
diff --git a/ql/math/statistics/incrementalstatistics.hpp b/ql/math/statistics/incrementalstatistics.hpp
index fc3985d7f1d..d633dbdc3b0 100644
--- a/ql/math/statistics/incrementalstatistics.hpp
+++ b/ql/math/statistics/incrementalstatistics.hpp
@@ -30,11 +30,6 @@
 
 #include <ql/utilities/null.hpp>
 #include <ql/errors.hpp>
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++11-extensions"
-#endif
 #include <boost/accumulators/accumulators.hpp>
 #include <boost/accumulators/statistics/stats.hpp>
 #include <boost/accumulators/statistics/count.hpp>
@@ -46,9 +41,6 @@
 #include <boost/accumulators/statistics/weighted_skewness.hpp>
 #include <boost/accumulators/statistics/weighted_kurtosis.hpp>
 #include <boost/accumulators/statistics/weighted_moment.hpp>
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
 
 namespace QuantLib {
 
diff --git a/ql/methods/finitedifferences/meshers/fdmhestonvariancemesher.cpp b/ql/methods/finitedifferences/meshers/fdmhestonvariancemesher.cpp
index 4c89c15e8e2..aaded4274f9 100644
--- a/ql/methods/finitedifferences/meshers/fdmhestonvariancemesher.cpp
+++ b/ql/methods/finitedifferences/meshers/fdmhestonvariancemesher.cpp
@@ -26,18 +26,9 @@
 #include <ql/math/integrals/gausslobattointegral.hpp>
 #include <ql/termstructures/volatility/equityfx/localvoltermstructure.hpp>
 #include <ql/methods/finitedifferences/meshers/fdmhestonvariancemesher.hpp>
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++11-extensions"
-#endif
 #include <boost/accumulators/accumulators.hpp>
 #include <boost/accumulators/statistics/mean.hpp>
 #include <boost/accumulators/statistics/stats.hpp>
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 #include <set>
 #include <algorithm>
 
diff --git a/ql/termstructures/inflationtermstructure.cpp b/ql/termstructures/inflationtermstructure.cpp
index a5c87929d05..cf16cc7a54e 100644
--- a/ql/termstructures/inflationtermstructure.cpp
+++ b/ql/termstructures/inflationtermstructure.cpp
@@ -194,7 +194,7 @@ namespace QuantLib {
 #endif
 #if defined(__clang__)
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++11-extensions"
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif
 #if defined(QL_PATCH_MSVC)
 #pragma warning(push)
@@ -340,7 +340,7 @@ namespace QuantLib {
 #endif
 #if defined(__clang__)
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++11-extensions"
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif
 #if defined(QL_PATCH_MSVC)
 #pragma warning(push)