diff --git a/drape/static_texture.cpp b/drape/static_texture.cpp
index ecabbc1b36..6654ac6bcb 100644
--- a/drape/static_texture.cpp
+++ b/drape/static_texture.cpp
@@ -105,8 +105,8 @@ StaticTexture::StaticTexture(ref_ptr<dp::GraphicsContext> context, std::string c
   : m_textureName(textureName)
   , m_skinPathName(skinPathName)
   , m_format(format)
-  , m_info(make_unique_dp<StaticResourceInfo>())
   , m_allowOptional(allowOptional)
+  , m_info(make_unique_dp<StaticResourceInfo>())
 {
   m_isLoadingCorrect = Load(context, allocator);
 }
diff --git a/geometry/region2d/boost_concept.hpp b/geometry/region2d/boost_concept.hpp
index ba03a7d403..f7beb98bbe 100644
--- a/geometry/region2d/boost_concept.hpp
+++ b/geometry/region2d/boost_concept.hpp
@@ -8,7 +8,6 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wreturn-std-move"
 #pragma clang diagnostic ignored "-Wshorten-64-to-32"
-#pragma clang diagnostic ignored "-Wunused-but-set-variable"
 #endif
 #include <boost/polygon/polygon.hpp>
 #ifdef __clang__
diff --git a/std/boost_geometry.hpp b/std/boost_geometry.hpp
index 6596169d71..9a72d020cd 100644
--- a/std/boost_geometry.hpp
+++ b/std/boost_geometry.hpp
@@ -1,12 +1,3 @@
 #pragma once
 
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-but-set-variable"
-#endif
-
 #include <boost/geometry.hpp>
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif