diff --git a/3party/succinct/bit_vector.hpp b/3party/succinct/bit_vector.hpp
index 164ca31e1c..c735509e03 100644
--- a/3party/succinct/bit_vector.hpp
+++ b/3party/succinct/bit_vector.hpp
@@ -2,8 +2,17 @@
 
 #include <vector>
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
+
 #include <boost/range.hpp>
 
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
 #include "mappable_vector.hpp"
 #include "broadword.hpp"
 #include "util.hpp"
diff --git a/base/string_utils.cpp b/base/string_utils.cpp
index f90c24e7f8..c3398f4e40 100644
--- a/base/string_utils.cpp
+++ b/base/string_utils.cpp
@@ -8,8 +8,17 @@
 #include <iomanip>
 #include <iterator>
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
+
 #include <boost/algorithm/string/trim.hpp>
 
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
 namespace strings
 {
 bool UniString::IsEqualAscii(char const * s) const
diff --git a/coding/simple_dense_coding.hpp b/coding/simple_dense_coding.hpp
index 5f91af4ba0..dee95e6804 100644
--- a/coding/simple_dense_coding.hpp
+++ b/coding/simple_dense_coding.hpp
@@ -2,17 +2,8 @@
 
 #include "std/vector.hpp"
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
-
 #include "3party/succinct/elias_fano_compressed_list.hpp"
 
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 namespace coding
 {
 // This class represents a variant of a so-called simple dense coding
diff --git a/indexer/features_offsets_table.hpp b/indexer/features_offsets_table.hpp
index dcf1093c9d..138c75238d 100644
--- a/indexer/features_offsets_table.hpp
+++ b/indexer/features_offsets_table.hpp
@@ -9,18 +9,9 @@
 #include "std/unique_ptr.hpp"
 #include "std/vector.hpp"
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
-
 #include "3party/succinct/elias_fano.hpp"
 #include "3party/succinct/mapper.hpp"
 
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 namespace platform
 {
   class LocalCountryFile;