diff --git a/xcode/editor/editor.xcodeproj/project.pbxproj b/xcode/editor/editor.xcodeproj/project.pbxproj
index 08d8c01168..63f3e19d2a 100644
--- a/xcode/editor/editor.xcodeproj/project.pbxproj
+++ b/xcode/editor/editor.xcodeproj/project.pbxproj
@@ -215,7 +215,6 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -254,7 +253,6 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj
index 5abf1997e2..54aebc83f4 100644
--- a/xcode/indexer/indexer.xcodeproj/project.pbxproj
+++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj
@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		340DF9D01C1FF04D00B5C7EC /* osm_editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340DF9CF1C1FF04D00B5C7EC /* osm_editor.cpp */; };
-		340DF9D21C1FF09400B5C7EC /* osm_editor.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 340DF9D11C1FF09400B5C7EC /* osm_editor.hpp */; };
 		347F337B1C454242009758CC /* rank_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33721C454242009758CC /* rank_table.cpp */; };
 		347F337C1C454242009758CC /* rank_table.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33731C454242009758CC /* rank_table.hpp */; };
 		347F337D1C454242009758CC /* succinct_trie_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33741C454242009758CC /* succinct_trie_builder.hpp */; };
@@ -632,7 +631,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				340DF9D21C1FF09400B5C7EC /* osm_editor.hpp in Sources */,
 				340DF9D01C1FF04D00B5C7EC /* osm_editor.cpp in Sources */,
 				67F183731BD4FCF500AB1840 /* map_style.cpp in Sources */,
 				670D04AB1B0BA8580013A7AC /* feature_loader_101.cpp in Sources */,
diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj
index dfbcf484b2..6da6614dba 100644
--- a/xcode/map/map.xcodeproj/project.pbxproj
+++ b/xcode/map/map.xcodeproj/project.pbxproj
@@ -263,6 +263,13 @@
 		674A2A341B2700B2001A525C /* libs */ = {
 			isa = PBXGroup;
 			children = (
+				67F183871BD5050900AB1840 /* SystemConfiguration.framework */,
+				67F183851BD504ED00AB1840 /* libsystem_configuration.tbd */,
+				67F1837D1BD5049500AB1840 /* libagg.a */,
+				67F1837E1BD5049500AB1840 /* liblodepng.a */,
+				67F1837F1BD5049500AB1840 /* libminizip.a */,
+				67F183801BD5049500AB1840 /* libtess2.a */,
+				67F183741BD5041700AB1840 /* libz.tbd */,
 				674A2A321B26FFE9001A525C /* OpenGL.framework */,
 				674A2A2D1B26FF4F001A525C /* Cocoa.framework */,
 				674A2A2B1B26FF38001A525C /* IOKit.framework */,
@@ -298,13 +305,6 @@
 		675345B21A4054AD00A0A8C3 = {
 			isa = PBXGroup;
 			children = (
-				67F183871BD5050900AB1840 /* SystemConfiguration.framework */,
-				67F183851BD504ED00AB1840 /* libsystem_configuration.tbd */,
-				67F1837D1BD5049500AB1840 /* libagg.a */,
-				67F1837E1BD5049500AB1840 /* liblodepng.a */,
-				67F1837F1BD5049500AB1840 /* libminizip.a */,
-				67F183801BD5049500AB1840 /* libtess2.a */,
-				67F183741BD5041700AB1840 /* libz.tbd */,
 				670D05A41B0DF4250013A7AC /* defaults.xcconfig */,
 				674A2A341B2700B2001A525C /* libs */,
 				675345BD1A4054AD00A0A8C3 /* map */,
diff --git a/xcode/oauthcpp/oauthcpp.xcodeproj/project.pbxproj b/xcode/oauthcpp/oauthcpp.xcodeproj/project.pbxproj
index 94a53f362c..29b289f76b 100644
--- a/xcode/oauthcpp/oauthcpp.xcodeproj/project.pbxproj
+++ b/xcode/oauthcpp/oauthcpp.xcodeproj/project.pbxproj
@@ -195,6 +195,7 @@
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
@@ -204,7 +205,6 @@
 					"$(BOOST_ROOT)",
 					"$(OMIM_ROOT)/3party/liboauthcpp/include",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -239,6 +239,7 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
@@ -248,7 +249,6 @@
 					"$(BOOST_ROOT)",
 					"$(OMIM_ROOT)/3party/liboauthcpp/include",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
@@ -290,6 +290,7 @@
 				340C20F51C3E5E5000111D22 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
diff --git a/xcode/pugixml/pugixml.xcodeproj/project.pbxproj b/xcode/pugixml/pugixml.xcodeproj/project.pbxproj
index e1a82154cb..fc23c494dd 100644
--- a/xcode/pugixml/pugixml.xcodeproj/project.pbxproj
+++ b/xcode/pugixml/pugixml.xcodeproj/project.pbxproj
@@ -171,7 +171,6 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -210,7 +209,6 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
diff --git a/xcode/sdf_image/sdf_image.xcodeproj/project.pbxproj b/xcode/sdf_image/sdf_image.xcodeproj/project.pbxproj
index b920eabefb..fcfda897b9 100644
--- a/xcode/sdf_image/sdf_image.xcodeproj/project.pbxproj
+++ b/xcode/sdf_image/sdf_image.xcodeproj/project.pbxproj
@@ -163,6 +163,7 @@
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
@@ -201,6 +202,7 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
diff --git a/xcode/stb_image/stb_image.xcodeproj/project.pbxproj b/xcode/stb_image/stb_image.xcodeproj/project.pbxproj
index caa4bbfc34..7dbbf603d7 100644
--- a/xcode/stb_image/stb_image.xcodeproj/project.pbxproj
+++ b/xcode/stb_image/stb_image.xcodeproj/project.pbxproj
@@ -163,6 +163,7 @@
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
@@ -201,6 +202,7 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;