diff --git a/common.pri b/common.pri
index c6fa2b1700..c3d0b77944 100644
--- a/common.pri
+++ b/common.pri
@@ -35,11 +35,6 @@ INCLUDEPATH *= $$ROOT_DIR/3party/glm
 
 CONFIG *= c++11
 
-!win32* {
-  QMAKE_CFLAGS   *= -Wno-deprecated-register
-  QMAKE_CXXFLAGS *= -Wno-deprecated-register
-}
-
 # Automatically enable release config for production
 CONFIG(production) {
   CONFIG *= release
@@ -136,7 +131,10 @@ win32-msvc201* {
 unix|win32-g++ {
   LIBS *= -lz
   QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare -Wno-strict-aliasing -Wno-unused-parameter \
-      -Werror=return-type
+                            -Werror=return-type -Wno-deprecated-register
+  !android* {
+    QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedef
+  }
   *-clang {
     QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion
   }
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index d0ef12192f..41b61491ca 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -2770,7 +2770,10 @@
 					"$(PROJECT_DIR)/MyTracker",
 					"$(PROJECT_DIR)/Statistics",
 				);
-				OTHER_CFLAGS = "-Wall";
+				OTHER_CFLAGS = (
+					"-Wall",
+					"-Wno-unused-local-typedef",
+				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DUSE_DRAPE",
@@ -2884,7 +2887,10 @@
 					"$(PROJECT_DIR)/Statistics",
 				);
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = "-Wall";
+				OTHER_CFLAGS = (
+					"-Wall",
+					"-Wno-unused-local-typedef",
+				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DUSE_DRAPE",
@@ -3397,7 +3403,10 @@
 					"$(PROJECT_DIR)/MyTracker",
 					"$(PROJECT_DIR)/Statistics",
 				);
-				OTHER_CFLAGS = "-Wall";
+				OTHER_CFLAGS = (
+					"-Wall",
+					"-Wno-unused-local-typedef",
+				);
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = (
 					"-lstats_client",
@@ -3507,7 +3516,10 @@
 					"$(PROJECT_DIR)/Statistics",
 				);
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = "-Wall";
+				OTHER_CFLAGS = (
+					"-Wall",
+					"-Wno-unused-local-typedef",
+				);
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = (
 					"-lstats_client",
@@ -3620,7 +3632,10 @@
 					"$(PROJECT_DIR)/MyTracker",
 					"$(PROJECT_DIR)/Statistics",
 				);
-				OTHER_CFLAGS = "-Wall";
+				OTHER_CFLAGS = (
+					"-Wall",
+					"-Wno-unused-local-typedef",
+				);
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = (
 					"-lstats_client",
@@ -3734,7 +3749,10 @@
 					"$(PROJECT_DIR)/MyTracker",
 					"$(PROJECT_DIR)/Statistics",
 				);
-				OTHER_CFLAGS = "-Wall";
+				OTHER_CFLAGS = (
+					"-Wall",
+					"-Wno-unused-local-typedef",
+				);
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = (
 					"-lstats_client",
@@ -3847,7 +3865,10 @@
 					"$(PROJECT_DIR)/Statistics",
 				);
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = "-Wall";
+				OTHER_CFLAGS = (
+					"-Wall",
+					"-Wno-unused-local-typedef",
+				);
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = (
 					"-lstats_client",
@@ -3958,7 +3979,10 @@
 					"$(PROJECT_DIR)/MyTracker",
 					"$(PROJECT_DIR)/Statistics",
 				);
-				OTHER_CFLAGS = "-Wall";
+				OTHER_CFLAGS = (
+					"-Wall",
+					"-Wno-unused-local-typedef",
+				);
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = (
 					"-lstats_client",