diff --git a/3party/freetype/CMakeLists.txt b/3party/freetype/CMakeLists.txt
index ebdf9808b9..bc4005c2b9 100644
--- a/3party/freetype/CMakeLists.txt
+++ b/3party/freetype/CMakeLists.txt
@@ -6,13 +6,9 @@ if (PLATFORM_LINUX AND CMAKE_COMPILER_IS_GNUCXX)
   add_definitions(-DOMIM_FULL_FREETYPE)
 endif ()
 
-add_compile_options(
-  "-Wall"
-)
+add_compile_options("-Wall")
 
-add_clang_compile_options(
-  "-Wno-unused-function"
-)
+add_clang_compile_options("-Wno-unused-function")
 
 include_directories(include)
 
diff --git a/3party/icu/CMakeLists.txt b/3party/icu/CMakeLists.txt
index ce5f6dd29c..7c1ffbc423 100644
--- a/3party/icu/CMakeLists.txt
+++ b/3party/icu/CMakeLists.txt
@@ -10,9 +10,7 @@ add_definitions(
   -DU_ENABLE_DYLOAD=0
 )
 
-add_clang_compile_options(
-  "-Wno-deprecated-declarations"
-)
+add_clang_compile_options("-Wno-deprecated-declarations")
 
 set(CMAKE_PREFIX_PATH ./)
 
diff --git a/3party/liboauthcpp/CMakeLists.txt b/3party/liboauthcpp/CMakeLists.txt
index 12546541f8..0f5e83fbd8 100644
--- a/3party/liboauthcpp/CMakeLists.txt
+++ b/3party/liboauthcpp/CMakeLists.txt
@@ -2,9 +2,7 @@ project(oauthcpp)
 
 include_directories(include src)
 
-add_clang_compile_options(
-  "-Wno-shorten-64-to-32"
-)
+add_clang_compile_options("-Wno-shorten-64-to-32")
 
 set(
   SRC
diff --git a/3party/minizip/CMakeLists.txt b/3party/minizip/CMakeLists.txt
index b1c763870d..e27d393012 100644
--- a/3party/minizip/CMakeLists.txt
+++ b/3party/minizip/CMakeLists.txt
@@ -2,9 +2,7 @@ project(minizip)
 
 add_definitions(-DUSE_FILE32ZPI -DNOCRYPT)
 
-add_clang_compile_options(
-  "-Wno-unused-value"
-)
+add_clang_compile_options("-Wno-unused-value")
 
 set(
   SRC
diff --git a/3party/opening_hours/CMakeLists.txt b/3party/opening_hours/CMakeLists.txt
index 26996808b7..b26ac5981b 100644
--- a/3party/opening_hours/CMakeLists.txt
+++ b/3party/opening_hours/CMakeLists.txt
@@ -11,6 +11,8 @@ add_compile_options(
   "-std=c++11"
 )
 
+add_clang_compile_options("-Wno-unused-local-typedef")
+
 set(
   SRC
   opening_hours.hpp
diff --git a/3party/osrm/CMakeLists.txt b/3party/osrm/CMakeLists.txt
index e24c9557be..01fe271b40 100644
--- a/3party/osrm/CMakeLists.txt
+++ b/3party/osrm/CMakeLists.txt
@@ -7,6 +7,7 @@ include_directories(
 )
 
 add_clang_compile_options(
+  "-Wno-unused-local-typedef"
   "-Wno-overloaded-virtual"
 )
 
diff --git a/3party/protobuf/CMakeLists.txt b/3party/protobuf/CMakeLists.txt
index 6aabf86543..1a9addabf9 100644
--- a/3party/protobuf/CMakeLists.txt
+++ b/3party/protobuf/CMakeLists.txt
@@ -6,10 +6,7 @@ if (NOT PLATFORM_WIN)
   add_definitions(-DHAVE_PTHREAD)
 endif ()
 
-add_clang_compile_options(
-  "-Wno-deprecated-declarations"
-  "-Wno-shorten-64-to-32"
-)
+add_clang_compile_options("-Wno-shorten-64-to-32")
 
 set(
   SRC
diff --git a/3party/sdf_image/CMakeLists.txt b/3party/sdf_image/CMakeLists.txt
index 83c8cf416f..535df18777 100644
--- a/3party/sdf_image/CMakeLists.txt
+++ b/3party/sdf_image/CMakeLists.txt
@@ -1,8 +1,6 @@
 project(sdf_image)
 
-add_clang_compile_options(
-  "-Wno-shorten-64-to-32"
-)
+add_clang_compile_options("-Wno-shorten-64-to-32")
 
 set(
   SRC
diff --git a/3party/succinct/CMakeLists.txt b/3party/succinct/CMakeLists.txt
index 30ee3eedf5..030f2f055b 100644
--- a/3party/succinct/CMakeLists.txt
+++ b/3party/succinct/CMakeLists.txt
@@ -4,6 +4,8 @@ add_definitions(-DLTC_NO_ROLC)
 
 include_directories(src/headers)
 
+add_clang_compile_options("-Wno-unused-local-typedef")
+
 set(
   SRC
   bit_vector.hpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac8cedcea4..0923884ad3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -262,11 +262,9 @@ function(link_qt5_network target)
   )
 endfunction()
 
-function(add_clang_compile_options options)
+function(add_clang_compile_options)
   if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    add_compile_options(
-        ${options}
-    )
+    add_compile_options(${ARGN})
   endif()
 endfunction()
 
@@ -291,12 +289,7 @@ add_compile_options(
   "-std=c++11"
 )
 
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  add_compile_options(
-    "-Wshorten-64-to-32"
-    "-Wno-unused-local-typedef"
-  )
-endif()
+add_clang_compile_options("-Wshorten-64-to-32")
 
 if (USE_ASAN)
   add_compile_options(
diff --git a/coding/base64.cpp b/coding/base64.cpp
index e370f5332f..3b7642cb2f 100644
--- a/coding/base64.cpp
+++ b/coding/base64.cpp
@@ -2,10 +2,19 @@
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wreorder"
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
+
 #include <boost/algorithm/string.hpp>
 #include <boost/archive/iterators/base64_from_binary.hpp>
 #include <boost/archive/iterators/binary_from_base64.hpp>
 #include <boost/archive/iterators/transform_width.hpp>
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 #pragma GCC diagnostic pop
 
 namespace base64
diff --git a/coding/simple_dense_coding.cpp b/coding/simple_dense_coding.cpp
index 6a18241cd1..efb712c2da 100644
--- a/coding/simple_dense_coding.cpp
+++ b/coding/simple_dense_coding.cpp
@@ -5,8 +5,17 @@
 #include "std/algorithm.hpp"
 #include "std/limits.hpp"
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
+
 #include <boost/range/adaptor/transformed.hpp>
 
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
 namespace coding
 {
 namespace
diff --git a/coding/simple_dense_coding.hpp b/coding/simple_dense_coding.hpp
index dee95e6804..5f91af4ba0 100644
--- a/coding/simple_dense_coding.hpp
+++ b/coding/simple_dense_coding.hpp
@@ -2,8 +2,17 @@
 
 #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/coding/succinct_mapper.hpp b/coding/succinct_mapper.hpp
index e6f856bbc6..7ff21d2254 100644
--- a/coding/succinct_mapper.hpp
+++ b/coding/succinct_mapper.hpp
@@ -7,9 +7,18 @@
 
 #include "std/type_traits.hpp"
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
+
 #include "3party/succinct/mappable_vector.hpp"
 #include "3party/succinct/mapper.hpp"
 
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
 namespace coding
 {
 template <typename T>
diff --git a/indexer/features_offsets_table.hpp b/indexer/features_offsets_table.hpp
index 7bd4861746..dcf1093c9d 100644
--- a/indexer/features_offsets_table.hpp
+++ b/indexer/features_offsets_table.hpp
@@ -9,9 +9,17 @@
 #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
 {
diff --git a/routing/osrm_data_facade.hpp b/routing/osrm_data_facade.hpp
index a0f293b336..8f4f26a91f 100644
--- a/routing/osrm_data_facade.hpp
+++ b/routing/osrm_data_facade.hpp
@@ -17,10 +17,19 @@
 #include "3party/succinct/rs_bit_vector.hpp"
 #include "3party/succinct/mapper.hpp"
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
+
 // TODO (ldragunov) exclude osrm specific headers from here! They causes "coordinate" problem
 #include "3party/osrm/osrm-backend/server/data_structures/datafacade_base.hpp"
 #include "3party/osrm/osrm-backend/data_structures/travel_mode.hpp"
 
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
 namespace routing
 {
 
diff --git a/tracking/connection.hpp b/tracking/connection.hpp
index 1ff04cc121..84134464df 100644
--- a/tracking/connection.hpp
+++ b/tracking/connection.hpp
@@ -7,8 +7,17 @@
 #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 "boost/circular_buffer.hpp"
 
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
 namespace platform
 {
 class Socket;
diff --git a/tracking/protocol.hpp b/tracking/protocol.hpp
index da1752b80d..b6cca2d73d 100644
--- a/tracking/protocol.hpp
+++ b/tracking/protocol.hpp
@@ -5,8 +5,17 @@
 #include "std/string.hpp"
 #include "std/vector.hpp"
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
+
 #include "boost/circular_buffer.hpp"
 
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
 namespace tracking
 {
 class Protocol