Merge pull request #1 from mapsme/fix-xcode

Update xcode projects
2019-09-23 12:50:28 +03:00 · 2019-09-23 12:50:28 +03:00 · e601568120
commit e601568120
parent 3bad959ac8 7b5088d46e
11 changed files with 990 additions and 958 deletions
--- a/xcode/MAPSME.plist
+++ b/xcode/MAPSME.plist
@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeIconFiles</key>
+			<array>
+				<string>320-pro.png</string>
+				<string>64-pro.png</string>
+				<string>44x58-pro.png</string>
+				<string>22x29-pro.png</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Google Earth KML Document</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>com.google.earth.kml</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeIconFiles</key>
+			<array>
+				<string>320-pro.png</string>
+				<string>64-pro.png</string>
+				<string>44x58-pro.png</string>
+				<string>22x29-pro.png</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Google Earth KMZ Document</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>com.google.earth.kmz</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${CURRENT_PROJECT_VERSION}</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>CFBundleURLName</key>
+			<string>com.mapswithme.maps</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>mapswithme</string>
+				<string>mapsme</string>
+				<string>ge0</string>
+				<string>geo</string>
+				<string>fb185237551520383</string>
+				<string>mapswithmepro</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>com.googleusercontent.apps.1033279251462-k2pp753lp1f39dacjn0pkurcc8pbbvsi</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>0</string>
+	<key>Fabric</key>
+	<dict>
+		<key>APIKey</key>
+		<string>2773ac2121a74ed96c8cfd4009ed7ea1eb0d2313</string>
+		<key>Kits</key>
+		<array>
+			<dict>
+				<key>KitInfo</key>
+				<dict/>
+				<key>KitName</key>
+				<string>Crashlytics</string>
+			</dict>
+		</array>
+	</dict>
+	<key>FacebookAppID</key>
+	<string>185237551520383</string>
+	<key>FacebookDisplayName</key>
+	<string>MapsWithMe, offline maps</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>fbapi</string>
+		<string>fb-messenger-api</string>
+		<string>fbauth2</string>
+		<string>fbshareextension</string>
+		<string>uber</string>
+		<string>yandextaxi</string>
+		<string>tel</string>
+		<string>booking</string>
+		<string>maximzakaz</string>
+		<string>vzt</string>
+	</array>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+		<key>NSExceptionDomains</key>
+		<dict>
+			<key>akamaihd.net</key>
+			<dict>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+				<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
+				<false/>
+			</dict>
+			<key>facebook.com</key>
+			<dict>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+				<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
+				<false/>
+			</dict>
+			<key>fbcdn.net</key>
+			<dict>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+				<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
+				<false/>
+			</dict>
+			<key>maps.me</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+			</dict>
+			<key>mapswithme.com</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+			</dict>
+		</dict>
+	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string>Unused by an application</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Unused by an application</string>
+	<key>PW_USE_GPS</key>
+	<false/>
+	<key>Pushwoosh_APPID</key>
+	<string>84E00-0F767</string>
+	<key>Pushwoosh_LOG_LEVEL</key>
+	<string>WARNING</string>
+	<key>UIApplicationShortcutItems</key>
+	<array>
+		<dict>
+			<key>UIApplicationShortcutItemIconFile</key>
+			<string>ic_3dtouch_search</string>
+			<key>UIApplicationShortcutItemTitle</key>
+			<string>search</string>
+			<key>UIApplicationShortcutItemType</key>
+			<string>me.maps.3daction.search</string>
+		</dict>
+		<dict>
+			<key>UIApplicationShortcutItemIconFile</key>
+			<string>ic_3dtouch_bookmarks</string>
+			<key>UIApplicationShortcutItemTitle</key>
+			<string>bookmarks</string>
+			<key>UIApplicationShortcutItemType</key>
+			<string>me.maps.3daction.bookmarks</string>
+		</dict>
+		<dict>
+			<key>UIApplicationShortcutItemIconFile</key>
+			<string>ic_3dtouch_planing_route</string>
+			<key>UIApplicationShortcutItemTitle</key>
+			<string>route</string>
+			<key>UIApplicationShortcutItemType</key>
+			<string>me.maps.3daction.route</string>
+		</dict>
+	</array>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>audio</string>
+		<string>fetch</string>
+		<string>location</string>
+		<string>remote-notification</string>
+	</array>
+	<key>UIFileSharingEnabled</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIPrerenderedIcon</key>
+	<true/>
+	<key>UIStatusBarHidden</key>
+	<false/>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UTImportedTypeDeclarations</key>
+	<array>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.xml</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Google Earth KML Document</string>
+			<key>UTTypeIdentifier</key>
+			<string>com.google.earth.kml</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://earth.google.com/kml/</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>com.apple.ostype</key>
+				<string>GKml</string>
+				<key>public.filename-extension</key>
+				<array>
+					<string>kml</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.google-earth.kml+xml</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>com.pkware.zip-archive</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Google Earth KMZ Document</string>
+			<key>UTTypeIdentifier</key>
+			<string>com.google.earth.kmz</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://earth.google.com/kmz/</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>com.apple.ostype</key>
+				<string>GKmz</string>
+				<key>public.filename-extension</key>
+				<array>
+					<string>kmz</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.google-earth.kmz+xml</string>
+			</dict>
+		</dict>
+	</array>
+</dict>
+</plist>
--- a/xcode/base/base.xcodeproj/project.pbxproj
+++ b/xcode/base/base.xcodeproj/project.pbxproj
@ -344,53 +344,53 @@
 		39FD26C71CC659D200AFF551 /* base_tests */ = {
 			isa = PBXGroup;
 			children = (
-				395784CE2303034000F2CC07 /* thread_safe_queue_tests.cpp */,
-				395784CF2303034000F2CC07 /* url_helpers_tests.cpp */,
-				397DC50F22BB8ECD007126DB /* bidirectional_map_tests.cpp */,
-				F61B9796229BFDF1000E878B /* non_intersecting_intervals_tests.cpp */,
-				390F1C0F2294299A00EA58E3 /* file_name_utils_tests.cpp */,
-				E1B7FFC521FA1A2100F094DC /* thread_pool_computational_tests.cpp */,
-				E1B7FFC621FA1A2200F094DC /* thread_pool_delayed_tests.cpp */,
-				39F1E53021C961B800D961DC /* beam_tests.cpp */,
-				395FEB3321492F320036395C /* stl_helpers_tests.cpp */,
-				3917FA60211E00F100937DF4 /* geo_object_id_tests.cpp */,
-				39F995DF20F55B8A0034F977 /* move_to_front_tests.cpp */,
-				39F995E120F55B8A0034F977 /* suffix_array_tests.cpp */,
-				39F995E220F55B8A0034F977 /* visitor_tests.cpp */,
-				39BC707520F55B6700A6EC20 /* bwt_tests.cpp */,
-				39BC707420F55B6700A6EC20 /* clustering_map_tests.cpp */,
-				564BB446206E8A4D00BDD211 /* fifo_cache_test.cpp */,
-				39B89C391FD1898A001104AF /* control_flow_tests.cpp */,
-				67E40EC71E4DC0D500A6D200 /* small_set_test.cpp */,
-				3446C67E1DDCAA6E00146687 /* newtype_test.cpp */,
-				3446C67F1DDCAA6E00146687 /* ref_counted_tests.cpp */,
-				3446C6781DDCAA2500146687 /* levenshtein_dfa_test.cpp */,
-				3446C6791DDCAA2500146687 /* uni_string_dfa_test.cpp */,
-				39FD27011CC65A2800AFF551 /* testingmain.cpp */,
 				39FD26C81CC65A0E00AFF551 /* assert_test.cpp */,
+				39F1E53021C961B800D961DC /* beam_tests.cpp */,
+				397DC50F22BB8ECD007126DB /* bidirectional_map_tests.cpp */,
 				39FD26CA1CC65A0E00AFF551 /* bits_test.cpp */,
 				39FD26CB1CC65A0E00AFF551 /* buffer_vector_test.cpp */,
+				39BC707520F55B6700A6EC20 /* bwt_tests.cpp */,
 				39FD26CC1CC65A0E00AFF551 /* cache_test.cpp */,
+				39BC707420F55B6700A6EC20 /* clustering_map_tests.cpp */,
 				39FD26CD1CC65A0E00AFF551 /* collection_cast_test.cpp */,
 				39FD26CE1CC65A0E00AFF551 /* condition_test.cpp */,
 				39FD26D01CC65A0E00AFF551 /* containers_test.cpp */,
+				39B89C391FD1898A001104AF /* control_flow_tests.cpp */,
+				564BB446206E8A4D00BDD211 /* fifo_cache_test.cpp */,
+				390F1C0F2294299A00EA58E3 /* file_name_utils_tests.cpp */,
+				3917FA60211E00F100937DF4 /* geo_object_id_tests.cpp */,
+				3446C6781DDCAA2500146687 /* levenshtein_dfa_test.cpp */,
 				39FD26D11CC65A0E00AFF551 /* logging_test.cpp */,
 				39FD26D21CC65A0E00AFF551 /* math_test.cpp */,
 				39FD26D31CC65A0E00AFF551 /* matrix_test.cpp */,
 				39FD26D41CC65A0E00AFF551 /* mem_trie_test.cpp */,
+				39F995DF20F55B8A0034F977 /* move_to_front_tests.cpp */,
+				3446C67E1DDCAA6E00146687 /* newtype_test.cpp */,
+				F61B9796229BFDF1000E878B /* non_intersecting_intervals_tests.cpp */,
 				39FD26D51CC65A0E00AFF551 /* observer_list_test.cpp */,
 				39FD26D61CC65A0E00AFF551 /* range_iterator_test.cpp */,
+				3446C67F1DDCAA6E00146687 /* ref_counted_tests.cpp */,
 				39FD26D71CC65A0E00AFF551 /* regexp_test.cpp */,
 				39FD26D81CC65A0E00AFF551 /* rolling_hash_test.cpp */,
 				39FD26D91CC65A0E00AFF551 /* scope_guard_test.cpp */,
+				67E40EC71E4DC0D500A6D200 /* small_set_test.cpp */,
+				395FEB3321492F320036395C /* stl_helpers_tests.cpp */,
 				39FD26DC1CC65A0E00AFF551 /* string_format_test.cpp */,
 				39FD26DD1CC65A0E00AFF551 /* string_utils_test.cpp */,
+				39F995E120F55B8A0034F977 /* suffix_array_tests.cpp */,
 				39FD26DE1CC65A0E00AFF551 /* sunrise_sunset_test.cpp */,
+				39FD27011CC65A2800AFF551 /* testingmain.cpp */,
+				E1B7FFC521FA1A2100F094DC /* thread_pool_computational_tests.cpp */,
+				E1B7FFC621FA1A2200F094DC /* thread_pool_delayed_tests.cpp */,
 				39FD26DF1CC65A0E00AFF551 /* thread_pool_tests.cpp */,
+				395784CE2303034000F2CC07 /* thread_safe_queue_tests.cpp */,
 				39FD26E01CC65A0E00AFF551 /* threaded_list_test.cpp */,
 				39FD26E11CC65A0E00AFF551 /* threads_test.cpp */,
 				39FD26E21CC65A0E00AFF551 /* timegm_test.cpp */,
 				39FD26E31CC65A0E00AFF551 /* timer_test.cpp */,
+				3446C6791DDCAA2500146687 /* uni_string_dfa_test.cpp */,
+				395784CF2303034000F2CC07 /* url_helpers_tests.cpp */,
+				39F995E220F55B8A0034F977 /* visitor_tests.cpp */,
 			);
 			name = base_tests;
 			path = ../../base/base_tests;
@ -420,29 +420,13 @@
 		675341791A3F57BF00A0A8C3 /* base */ = {
 			isa = PBXGroup;
 			children = (
-				3989E363230302EA00D63F84 /* thread_safe_queue.hpp */,
-				397DC50B22BB8EBF007126DB /* bidirectional_map.hpp */,
-				397DC50C22BB8EBF007126DB /* non_intersecting_intervals.hpp */,
-				390F1C0C2294298E00EA58E3 /* file_name_utils.cpp */,
-				390F1C0B2294298E00EA58E3 /* file_name_utils.hpp */,
-				E1B7FFBD21FA19FD00F094DC /* thread_pool_computational.hpp */,
-				E1B7FFC021FA19FE00F094DC /* thread_pool_delayed.cpp */,
-				E1B7FFBE21FA19FD00F094DC /* thread_pool_delayed.hpp */,
-				E1B7FFBF21FA19FD00F094DC /* thread_utils.hpp */,
-				39F1E52E21C961A800D961DC /* beam.hpp */,
-				3D1BE645212D775500ACD94A /* atomic_shared_ptr.hpp */,
-				3917FA5E211E00C300937DF4 /* suffix_array.hpp */,
-				3917FA5A211E00BA00937DF4 /* pprof.cpp */,
-				3917FA5B211E00BB00937DF4 /* pprof.hpp */,
-				3917FA54211E009700937DF4 /* geo_object_id.cpp */,
-				3917FA55211E009700937DF4 /* geo_object_id.hpp */,
-				3917FA56211E009700937DF4 /* get_time.hpp */,
-				3917FA52211E008C00937DF4 /* clustering_map.hpp */,
-				564BB444206E89ED00BDD211 /* fifo_cache.hpp */,
 				675341851A3F57E400A0A8C3 /* array_adapters.hpp */,
 				675341861A3F57E400A0A8C3 /* assert.hpp */,
+				3D1BE645212D775500ACD94A /* atomic_shared_ptr.hpp */,
 				675341871A3F57E400A0A8C3 /* base.cpp */,
 				675341881A3F57E400A0A8C3 /* base.hpp */,
+				39F1E52E21C961A800D961DC /* beam.hpp */,
+				397DC50B22BB8EBF007126DB /* bidirectional_map.hpp */,
 				675341891A3F57E400A0A8C3 /* bits.hpp */,
 				6753418A1A3F57E400A0A8C3 /* buffer_vector.hpp */,
 				3D74EF0E1F8B902B0081202C /* bwt.cpp */,
@ -450,6 +434,7 @@
 				6753418B1A3F57E400A0A8C3 /* cache.hpp */,
 				672DD4B01E04255F0078E13C /* cancellable.hpp */,
 				67C79B9E1E2929DB00C40034 /* checked_cast.hpp */,
+				3917FA52211E008C00937DF4 /* clustering_map.hpp */,
 				672DD4B11E04255F0078E13C /* collection_cast.hpp */,
 				672DD4B31E04255F0078E13C /* condition.cpp */,
 				672DD4B41E04255F0078E13C /* condition.hpp */,
@ -459,6 +444,12 @@
 				3446C66C1DDCA96300146687 /* dfa_helpers.hpp */,
 				675341941A3F57E400A0A8C3 /* exception.cpp */,
 				675341951A3F57E400A0A8C3 /* exception.hpp */,
+				564BB444206E89ED00BDD211 /* fifo_cache.hpp */,
+				390F1C0C2294298E00EA58E3 /* file_name_utils.cpp */,
+				390F1C0B2294298E00EA58E3 /* file_name_utils.hpp */,
+				3917FA54211E009700937DF4 /* geo_object_id.cpp */,
+				3917FA55211E009700937DF4 /* geo_object_id.hpp */,
+				3917FA56211E009700937DF4 /* get_time.hpp */,
 				671182EE1C807C0A00CB8177 /* gmtime.cpp */,
 				671182EF1C807C0A00CB8177 /* gmtime.hpp */,
 				675345381A3F6F5E00A0A8C3 /* internal */,
@ -476,8 +467,11 @@
 				3D74EF0A1F8B902A0081202C /* move_to_front.hpp */,
 				675341A11A3F57E400A0A8C3 /* mutex.hpp */,
 				672DD4B61E04255F0078E13C /* newtype.hpp */,
+				397DC50C22BB8EBF007126DB /* non_intersecting_intervals.hpp */,
 				675341A21A3F57E400A0A8C3 /* normalize_unicode.cpp */,
 				672DD4B71E04255F0078E13C /* observer_list.hpp */,
+				3917FA5A211E00BA00937DF4 /* pprof.cpp */,
+				3917FA5B211E00BB00937DF4 /* pprof.hpp */,
 				56B1A0711E69DE4D00395022 /* random.cpp */,
 				56B1A0721E69DE4D00395022 /* random.hpp */,
 				672DD4B81E0425600078E13C /* range_iterator.hpp */,
@ -501,13 +495,19 @@
 				675341BE1A3F57E400A0A8C3 /* strings_bundle.cpp */,
 				675341BF1A3F57E400A0A8C3 /* strings_bundle.hpp */,
 				3D74EF0B1F8B902B0081202C /* suffix_array.cpp */,
+				3917FA5E211E00C300937DF4 /* suffix_array.hpp */,
 				670E39421C46C76900E9C0A6 /* sunrise_sunset.cpp */,
 				670E39431C46C76900E9C0A6 /* sunrise_sunset.hpp */,
 				3D7815711F3A145F0068B6AC /* task_loop.hpp */,
 				67B52B5E1AD3C84E00664C17 /* thread_checker.cpp */,
 				67B52B5F1AD3C84E00664C17 /* thread_checker.hpp */,
+				E1B7FFBD21FA19FD00F094DC /* thread_pool_computational.hpp */,
+				E1B7FFC021FA19FE00F094DC /* thread_pool_delayed.cpp */,
+				E1B7FFBE21FA19FD00F094DC /* thread_pool_delayed.hpp */,
 				675341C11A3F57E400A0A8C3 /* thread_pool.cpp */,
 				675341C21A3F57E400A0A8C3 /* thread_pool.hpp */,
+				3989E363230302EA00D63F84 /* thread_safe_queue.hpp */,
+				E1B7FFBF21FA19FD00F094DC /* thread_utils.hpp */,
 				675341C31A3F57E400A0A8C3 /* thread.cpp */,
 				675341C41A3F57E400A0A8C3 /* thread.hpp */,
 				675341C51A3F57E400A0A8C3 /* threaded_container.cpp */,
@ -818,7 +818,21 @@
 					"$(inherited)",
 					"GEOCORE_UNIT_TEST_DISABLE_PLATFORM_INIT=1",
 				);
-				INFOPLIST_FILE = "$(GEOCORE_ROOT)/iphone/Maps/MAPSME.plist";
+				INFOPLIST_FILE = "$(GEOCORE_ROOT)/xcode/MAPSME.plist";
+				"OTHER_LDFLAGS[sdk=macosx*]" = (
+					"-framework",
+					Cocoa,
+					"-framework",
+					IOKit,
+					"-framework",
+					SystemConfiguration,
+					"-framework",
+					CFNetwork,
+					"-lboost_filesystem",
+					"-lboost_serialization",
+					"-lboost_iostreams",
+					"-lgtest",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = maps.me.base_tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@ -831,7 +845,7 @@
 					"$(inherited)",
 					"GEOCORE_UNIT_TEST_DISABLE_PLATFORM_INIT=1",
 				);
-				INFOPLIST_FILE = "$(GEOCORE_ROOT)/iphone/Maps/MAPSME.plist";
+				INFOPLIST_FILE = "$(GEOCORE_ROOT)/xcode/MAPSME.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = maps.me.base_tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				VALIDATE_PRODUCT = YES;
@ -842,7 +856,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 34BA2D6A1DBE169E00FAB345 /* common-debug.xcconfig */;
 			buildSettings = {
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
+				GCC_PREFIX_HEADER = "";
 			};
 			name = Debug;
 		};
@ -850,7 +864,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 34BA2D6B1DBE169E00FAB345 /* common-release.xcconfig */;
 			buildSettings = {
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
+				GCC_PREFIX_HEADER = "";
 			};
 			name = Release;
 		};
@ -874,7 +888,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 34BA2D6B1DBE169E00FAB345 /* common-release.xcconfig */;
 			buildSettings = {
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
+				GCC_PREFIX_HEADER = "";
 			};
 			name = "Production Full";
 		};
@ -893,7 +907,7 @@
 					"$(inherited)",
 					"GEOCORE_UNIT_TEST_DISABLE_PLATFORM_INIT=1",
 				);
-				INFOPLIST_FILE = "$(GEOCORE_ROOT)/iphone/Maps/MAPSME.plist";
+				INFOPLIST_FILE = "$(GEOCORE_ROOT)/xcode/MAPSME.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = maps.me.base_tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				VALIDATE_PRODUCT = YES;
--- a/xcode/coding/coding.xcodeproj/project.pbxproj
+++ b/xcode/coding/coding.xcodeproj/project.pbxproj
@ -14,8 +14,6 @@
 		347F333B1C4540F0009758CC /* simple_dense_coding.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33351C4540F0009758CC /* simple_dense_coding.hpp */; };
 		347F333C1C4540F0009758CC /* succinct_mapper.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33361C4540F0009758CC /* succinct_mapper.hpp */; };
 		3496AB6E1DC1F53500C5DDBA /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3496AB6D1DC1F53500C5DDBA /* libalohalitics.a */; };
-		34A129D31DF99E43001B4531 /* zlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34A129D11DF99E43001B4531 /* zlib.cpp */; };
-		34A129D41DF99E43001B4531 /* zlib.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34A129D21DF99E43001B4531 /* zlib.hpp */; };
 		394916E41BAC3ACF002A8C4F /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6753421B1A3F586300A0A8C3 /* libcoding.a */; };
 		394917201BAC3BE0002A8C4F /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3949171F1BAC3BE0002A8C4F /* testingmain.cpp */; };
 		3949172B1BAC3CAC002A8C4F /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 394917271BAC3CAC002A8C4F /* libbase.a */; };
@ -105,10 +103,6 @@
 		675342CE1A3F588C00A0A8C3 /* varint.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675342791A3F588C00A0A8C3 /* varint.hpp */; };
 		675342CF1A3F588C00A0A8C3 /* write_to_sink.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753427A1A3F588C00A0A8C3 /* write_to_sink.hpp */; };
 		675342D01A3F588C00A0A8C3 /* writer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753427B1A3F588C00A0A8C3 /* writer.hpp */; };
-		675342D11A3F588C00A0A8C3 /* zip_creator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753427C1A3F588C00A0A8C3 /* zip_creator.cpp */; };
-		675342D21A3F588C00A0A8C3 /* zip_creator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753427D1A3F588C00A0A8C3 /* zip_creator.hpp */; };
-		675342D31A3F588C00A0A8C3 /* zip_reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753427E1A3F588C00A0A8C3 /* zip_reader.cpp */; };
-		675342D41A3F588C00A0A8C3 /* zip_reader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753427F1A3F588C00A0A8C3 /* zip_reader.hpp */; };
 		675E889C1DB7B0D000F8EBDA /* traffic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675E889A1DB7B0D000F8EBDA /* traffic.cpp */; };
 		675E889D1DB7B0D000F8EBDA /* traffic.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675E889B1DB7B0D000F8EBDA /* traffic.hpp */; };
 		676818201DC3ABD80094C0AC /* traffic_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6768181F1DC3ABD80094C0AC /* traffic_test.cpp */; };
@ -166,8 +160,6 @@
 		347F33351C4540F0009758CC /* simple_dense_coding.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = simple_dense_coding.hpp; sourceTree = "<group>"; };
 		347F33361C4540F0009758CC /* succinct_mapper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = succinct_mapper.hpp; sourceTree = "<group>"; };
 		3496AB6D1DC1F53500C5DDBA /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "../../../geocore-build/xcode/Debug-iphonesimulator/libalohalitics.a"; sourceTree = "<group>"; };
-		34A129D11DF99E43001B4531 /* zlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zlib.cpp; sourceTree = "<group>"; };
-		34A129D21DF99E43001B4531 /* zlib.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = zlib.hpp; sourceTree = "<group>"; };
 		34A72A431DBE4989003D1F5F /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = "<group>"; };
 		34A72A441DBE4989003D1F5F /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; };
 		3949168F1BAC3A5F002A8C4F /* coding_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = coding_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
@ -262,10 +254,6 @@
 		675342791A3F588C00A0A8C3 /* varint.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = varint.hpp; sourceTree = "<group>"; };
 		6753427A1A3F588C00A0A8C3 /* write_to_sink.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = write_to_sink.hpp; sourceTree = "<group>"; };
 		6753427B1A3F588C00A0A8C3 /* writer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = writer.hpp; sourceTree = "<group>"; };
-		6753427C1A3F588C00A0A8C3 /* zip_creator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zip_creator.cpp; sourceTree = "<group>"; };
-		6753427D1A3F588C00A0A8C3 /* zip_creator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = zip_creator.hpp; sourceTree = "<group>"; };
-		6753427E1A3F588C00A0A8C3 /* zip_reader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zip_reader.cpp; sourceTree = "<group>"; };
-		6753427F1A3F588C00A0A8C3 /* zip_reader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = zip_reader.hpp; sourceTree = "<group>"; };
 		675E889A1DB7B0D000F8EBDA /* traffic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = traffic.cpp; sourceTree = "<group>"; };
 		675E889B1DB7B0D000F8EBDA /* traffic.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traffic.hpp; sourceTree = "<group>"; };
 		6768181F1DC3ABD80094C0AC /* traffic_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = traffic_test.cpp; sourceTree = "<group>"; };
@ -507,12 +495,6 @@
 				675342791A3F588C00A0A8C3 /* varint.hpp */,
 				6753427A1A3F588C00A0A8C3 /* write_to_sink.hpp */,
 				6753427B1A3F588C00A0A8C3 /* writer.hpp */,
-				6753427C1A3F588C00A0A8C3 /* zip_creator.cpp */,
-				6753427D1A3F588C00A0A8C3 /* zip_creator.hpp */,
-				6753427E1A3F588C00A0A8C3 /* zip_reader.cpp */,
-				6753427F1A3F588C00A0A8C3 /* zip_reader.hpp */,
-				34A129D11DF99E43001B4531 /* zlib.cpp */,
-				34A129D21DF99E43001B4531 /* zlib.hpp */,
 			);
 			name = coding;
 			path = ../../coding;
@ -577,7 +559,6 @@
 				675342BA1A3F588C00A0A8C3 /* reader_writer_ops.hpp in Headers */,
 				675342C61A3F588C00A0A8C3 /* uri.hpp in Headers */,
 				6753429B1A3F588C00A0A8C3 /* file_container.hpp in Headers */,
-				34A129D41DF99E43001B4531 /* zlib.hpp in Headers */,
 				670D04BD1B0BA92D0013A7AC /* expat_impl.h in Headers */,
 				675342A81A3F588C00A0A8C3 /* hex.hpp in Headers */,
 				6753428C1A3F588C00A0A8C3 /* byte_stream.hpp in Headers */,
@ -590,10 +571,8 @@
 				675342C71A3F588C00A0A8C3 /* url_encode.hpp in Headers */,
 				675342BC1A3F588C00A0A8C3 /* reader.hpp in Headers */,
 				39B2B9811FB4694300AB85A1 /* memory_region.hpp in Headers */,
-				675342D21A3F588C00A0A8C3 /* zip_creator.hpp in Headers */,
 				3D74EF211F8F55740081202C /* csv_reader.hpp in Headers */,
 				39B2B97D1FB4693500AB85A1 /* bwt_coder.hpp in Headers */,
-				675342D41A3F588C00A0A8C3 /* zip_reader.hpp in Headers */,
 				675342A41A3F588C00A0A8C3 /* file_writer.hpp in Headers */,
 				675342C01A3F588C00A0A8C3 /* streams_sink.hpp in Headers */,
 				670D04C11B0BA92D0013A7AC /* xmlparser.hpp in Headers */,
@ -726,16 +705,13 @@
 			buildActionMask = 2147483647;
 			files = (
 				347F333A1C4540F0009758CC /* simple_dense_coding.cpp in Sources */,
-				675342D11A3F588C00A0A8C3 /* zip_creator.cpp in Sources */,
 				675342B61A3F588C00A0A8C3 /* reader_streambuf.cpp in Sources */,
 				3DAB4B6E23018E0500F7E5EB /* buffered_file_writer.cpp in Sources */,
 				675342821A3F588C00A0A8C3 /* base64.cpp in Sources */,
-				675342D31A3F588C00A0A8C3 /* zip_reader.cpp in Sources */,
 				4563B062205909290057556D /* sha1.cpp in Sources */,
 				347F33371C4540F0009758CC /* compressed_bit_vector.cpp in Sources */,
 				3D74EF221F8F55740081202C /* csv_reader.cpp in Sources */,
 				6753429F1A3F588C00A0A8C3 /* file_reader.cpp in Sources */,
-				34A129D31DF99E43001B4531 /* zlib.cpp in Sources */,
 				3973743221C17EFE0003807A /* string_utf8_multilang.cpp in Sources */,
 				676818201DC3ABD80094C0AC /* traffic_test.cpp in Sources */,
 				BB537C5F1E8490120074D9D3 /* transliteration.cpp in Sources */,
@ -817,7 +793,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@ -826,7 +801,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@ -853,7 +827,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = "Production Full";
--- a/xcode/common.xcconfig
+++ b/xcode/common.xcconfig
@ -2,11 +2,11 @@ CURRENT_PROJECT_VERSION = 9.2.0

 // Paths
 GEOCORE_ROOT = $(PROJECT_DIR)/../..
-QT_PATH = /usr/local/opt/qt5
-BOOST_ROOT = $(GEOCORE_ROOT)/3party/boost
+BOOST_ROOT = /usr/local/opt/boost
+
+HEADER_SEARCH_PATHS = $(inherited) $(GEOCORE_ROOT) $(BOOST_ROOT)/include /usr/local/include
+LIBRARY_SEARCH_PATHS[sdk=macosx*] = $(BOOST_ROOT)/lib /usr/local/lib

-HEADER_SEARCH_PATHS = $(inherited) $(GEOCORE_ROOT) $(BOOST_ROOT)
-FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(QT_PATH)/lib

 // Deployment target
 IPHONEOS_DEPLOYMENT_TARGET = 10.0
@ -16,8 +16,8 @@ MACOSX_DEPLOYMENT_TARGET = 10.12
 SUPPORTED_PLATFORMS = macosx iphonesimulator iphoneos

 // Linked frameworks
-OTHER_LDFLAGS[sdk=macosx*] = -framework Cocoa -framework IOKit -framework OpenGL -framework QtCore -framework QtGui -framework QtNetwork -framework QtOpenGL -framework QtWidgets -framework SystemConfiguration -framework CFNetwork
-OTHER_LDFLAGS[sdk=iphone*] = -framework AdSupport -framework CoreGraphics -framework Foundation -framework IOKit -framework OpenGLES -framework SystemConfiguration -framework UIKit -framework CFNetwork -ObjC
+OTHER_LDFLAGS[sdk=macosx*] = -framework Cocoa -framework IOKit -framework SystemConfiguration -framework CFNetwork -lboost_filesystem -lboost_serialization -lboost_iostreams -lgtest
+OTHER_LDFLAGS[sdk=iphone*] = -framework Foundation -framework IOKit -framework SystemConfiguration -framework CFNetwork -ObjC

 // Warnings settings
 CLANG_WARN_ASSIGN_ENUM = YES
@ -68,7 +68,6 @@ DEBUG_INFORMATION_FORMAT = dwarf
 ENABLE_BITCODE = YES
 ENABLE_STRICT_OBJC_MSGSEND = YES
 GCC_NO_COMMON_BLOCKS = YES
-GCC_PRECOMPILE_PREFIX_HEADER = YES
 ONLY_ACTIVE_ARCH = YES
 PRODUCT_NAME = $(TARGET_NAME)
 SKIP_INSTALL = YES
--- a/xcode/generator/generator.xcodeproj/project.pbxproj
+++ b/xcode/generator/generator.xcodeproj/project.pbxproj
--- a/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj
+++ b/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj
@ -7,10 +7,6 @@
 	objects = {

 /* Begin PBXBuildFile section */
-		3462FD911DC1E1C400906FD7 /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD901DC1E1C400906FD7 /* libalohalitics.a */; };
-		3462FD931DC1E1DD00906FD7 /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD921DC1E1DD00906FD7 /* libeditor.a */; };
-		3462FD951DC1E1EF00906FD7 /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD941DC1E1EF00906FD7 /* libpugixml.a */; };
-		3462FD971DC1E1FC00906FD7 /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD961DC1E1FC00906FD7 /* liboauthcpp.a */; };
 		3462FD981DC1E22800906FD7 /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD901DC1E1C400906FD7 /* libalohalitics.a */; };
 		3462FD9A1DC1E24400906FD7 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD991DC1E24400906FD7 /* libjansson.a */; };
 		3462FD9B1DC1E26800906FD7 /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD921DC1E1DD00906FD7 /* libeditor.a */; };
@ -34,13 +30,9 @@
 		397057C022CB57F9001A55CA /* cities_ids_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 397057BD22CB57F8001A55CA /* cities_ids_tests.cpp */; };
 		397057C122CB57F9001A55CA /* translation_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 397057BE22CB57F9001A55CA /* translation_test.cpp */; };
 		39C4345222CE13F00002AEE3 /* booking_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39C4345122CE13F00002AEE3 /* booking_tests.cpp */; };
-		401E3189225C988500DE7EB8 /* libdescriptions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 401E3188225C988500DE7EB8 /* libdescriptions.a */; };
 		4491F494213D6B470011834F /* speed_cameras_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4491F490213D46380011834F /* speed_cameras_test.cpp */; };
 		4491F496213D6B8E0011834F /* osm2meta_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 677E2A0B1CAAC7CB001DC42A /* osm2meta_test.cpp */; };
 		4491F497213D6BA00011834F /* tag_admixer_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 677E2A0C1CAAC7CB001DC42A /* tag_admixer_test.cpp */; };
-		562147271F6AA36A002D2214 /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 562147261F6AA36A002D2214 /* libbsdiff.a */; };
-		562147291F6AA37E002D2214 /* libmwm_diff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 562147281F6AA37E002D2214 /* libmwm_diff.a */; };
-		562D42941FD8460500A995F3 /* libugc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 562D42951FD8460500A995F3 /* libugc.a */; };
 		562D42961FD8463700A995F3 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7BC61EF992F600A8E9ED /* libsqlite3.tbd */; };
 		56829A4C2134238800A09A28 /* cities_boundaries_checker_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56829A4A2134238700A09A28 /* cities_boundaries_checker_tests.cpp */; };
 		56829A4D2134238800A09A28 /* city_roads_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56829A4B2134238800A09A28 /* city_roads_tests.cpp */; };
@ -49,11 +41,8 @@
 		56A6C3D3219AFDEE00A52855 /* common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56A6C3CF219AFDEE00A52855 /* common.cpp */; };
 		56A6C3D4219AFDEE00A52855 /* regions_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56A6C3D0219AFDEE00A52855 /* regions_tests.cpp */; };
 		56A6C3D5219AFDEE00A52855 /* region_info_collector_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56A6C3D1219AFDEE00A52855 /* region_info_collector_tests.cpp */; };
-		56EE14CD1FE803EA0036F20C /* libtransit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14CE1FE803EA0036F20C /* libtransit.a */; };
 		56EE14CF1FE803FE0036F20C /* libtransit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14D01FE803FE0036F20C /* libtransit.a */; };
 		670E7BBC1EF9832200A8E9ED /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7BBB1EF9832200A8E9ED /* libicu.a */; };
-		670E7BBE1EF9839C00A8E9ED /* librouting_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7BBD1EF9839C00A8E9ED /* librouting_common.a */; };
-		670E7BC01EF983A400A8E9ED /* libtraffic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7BBF1EF983A400A8E9ED /* libtraffic.a */; };
 		670E7BC21EF9853500A8E9ED /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7BBB1EF9832200A8E9ED /* libicu.a */; };
 		670E7BC31EF9853C00A8E9ED /* librouting_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7BBD1EF9839C00A8E9ED /* librouting_common.a */; };
 		670E7BC51EF9860100A8E9ED /* ugc_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670E7BC41EF9860100A8E9ED /* ugc_test.cpp */; };
@ -61,9 +50,7 @@
 		670F291B1BA6CE4F00F2ABF4 /* check_mwms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1E31A4C28D5005EEA39 /* check_mwms.cpp */; };
 		670F291C1BA6CEE400F2ABF4 /* libmap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67AB92C61B73D03500AB5194 /* libmap.a */; };
 		670F88791CE4CA81003F68BA /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670F88781CE4CA81003F68BA /* libopening_hours.a */; };
-		670F887A1CE4CA9C003F68BA /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670F88781CE4CA81003F68BA /* libopening_hours.a */; };
 		6719DD5E1B95AB0F0018166F /* libtess2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6719DD5D1B95AB0F0018166F /* libtess2.a */; };
-		6719DD5F1B95AB570018166F /* libtess2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6719DD5D1B95AB0F0018166F /* libtess2.a */; };
 		671C2D8122AFDAB4008B2B8B /* street_geometry_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C2D7A22AFDAB4008B2B8B /* street_geometry_tests.cpp */; };
 		671C2D8222AFDAB4008B2B8B /* descriptions_section_builder_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C2D7B22AFDAB4008B2B8B /* descriptions_section_builder_tests.cpp */; };
 		671C2D8322AFDAB4008B2B8B /* camera_collector_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C2D7C22AFDAB4008B2B8B /* camera_collector_tests.cpp */; };
@ -119,17 +106,13 @@
 		674A28E51B1C80EA001A525C /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CD1B1C7FED001A525C /* libindexer.a */; };
 		674A28E61B1C80EA001A525C /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D31B1C8001001A525C /* libplatform.a */; };
 		674A28E71B1C80EA001A525C /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28DB1B1C801D001A525C /* libprotobuf.a */; };
-		674A28E81B1C80EA001A525C /* librouting.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D41B1C8001001A525C /* librouting.a */; };
-		674A28EC1B1C80F4001A525C /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28EB1B1C80F4001A525C /* libstorage.a */; };
 		674A28EE1B1C80FB001A525C /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28ED1B1C80FB001A525C /* libjansson.a */; };
-		674A28F01B1C8104001A525C /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28EF1B1C8104001A525C /* libsearch.a */; };
 		674A28F21B1C8119001A525C /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28F11B1C8119001A525C /* libsuccinct.a */; };
 		675341631A3F54F600A0A8C3 /* generator_tool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675341621A3F54F600A0A8C3 /* generator_tool.cpp */; };
-		675343E31A3F607600A0A8C3 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343E21A3F607600A0A8C3 /* Cocoa.framework */; };
-		675344431A3F65E800A0A8C3 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343E01A3F600D00A0A8C3 /* IOKit.framework */; };
+		67633E73232B9E7800684E04 /* build_version.hpp.in in Sources */ = {isa = PBXBuildFile; fileRef = 67633E4B232A84C700684E04 /* build_version.hpp.in */; };
+		67633ED4233298B900684E04 /* libgeocoder.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67633ED3233298B900684E04 /* libgeocoder.a */; };
 		677792521C1B2E9700EC9499 /* metadata_parser_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 677792501C1B2E9300EC9499 /* metadata_parser_test.cpp */; };
 		677E2A0A1CAAC771001DC42A /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 677E2A091CAAC771001DC42A /* libz.tbd */; };
-		677E2A191CAACCB3001DC42A /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 677E2A091CAAC771001DC42A /* libz.tbd */; };
 		679624661D100F7C00AE4E3C /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D71B1C800D001A525C /* libbase.a */; };
 		679624671D100F7C00AE4E3C /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28C91B1C7FED001A525C /* libcoding.a */; };
 		679624681D100F7C00AE4E3C /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28C71B1C7FC9001A525C /* libexpat.a */; };
@ -170,19 +153,23 @@
 		67AB92D61B75157700AB5194 /* tesselator_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1EB1A4C28D5005EEA39 /* tesselator_test.cpp */; };
 		67AB92D71B75157A00AB5194 /* triangles_tree_coding_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1EC1A4C28D5005EEA39 /* triangles_tree_coding_test.cpp */; };
 		67AB92D91B75158300AB5194 /* osm_o5m_source_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6764B8931ADD6FC100DD8B15 /* osm_o5m_source_test.cpp */; };
-		67BC92BC1D17FD5800A4A378 /* libagg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624CC1D11775F00AE4E3C /* libagg.a */; };
-		67BC92BD1D17FD5800A4A378 /* libdrape_frontend.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624B71D11775300AE4E3C /* libdrape_frontend.a */; };
-		67BC92BE1D17FD5800A4A378 /* libdrape.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624B81D11775300AE4E3C /* libdrape.a */; };
-		67BC92BF1D17FD5800A4A378 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624B91D11775300AE4E3C /* libfreetype.a */; };
-		67BC92C21D17FD5800A4A378 /* libmap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67AB92C61B73D03500AB5194 /* libmap.a */; };
-		67BC92C31D17FD5800A4A378 /* libminizip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624BC1D11775300AE4E3C /* libminizip.a */; };
-		67BC92C41D17FD5800A4A378 /* libsdf_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624BE1D11775300AE4E3C /* libsdf_image.a */; };
-		67BC92C51D17FD5800A4A378 /* libstb_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624BF1D11775300AE4E3C /* libstb_image.a */; };
-		67BC92C61D17FDE600A4A378 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624CE1D11779700AE4E3C /* OpenGL.framework */; };
-		67BC92C71D17FDF800A4A378 /* libapi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624B61D11775300AE4E3C /* libapi.a */; };
 		E9502E301D2BD6E600CAB86B /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 677E2A091CAAC771001DC42A /* libz.tbd */; };
 /* End PBXBuildFile section */

+/* Begin PBXBuildRule section */
+		67633E74232B9E7F00684E04 /* PBXBuildRule */ = {
+			isa = PBXBuildRule;
+			compilerSpec = com.apple.compilers.proxy.script;
+			filePatterns = "*.hpp.in";
+			fileType = pattern.proxy;
+			isEditable = 1;
+			outputFiles = (
+				"$(DERIVED_FILE_DIR)/${INPUT_FILE_BASE}",
+			);
+			script = "export GIT_HASH=$(git log --pretty=format:'%h' -n 1)\nexport GIT_TIMESTAMP=$(git log --pretty=format:'%at' -n 1)\nexport GIT_TAG=\"LOCAL\"\nexport PROJECT_NAME=\"geocore\"\nsed -e 's/@PROJECT_NAME@/geocore/g' -e \"s/@GIT_TAG@/${GIT_TAG}/\" -e \"s/@GIT_TIMESTAMP@/${GIT_TIMESTAMP}/\" -e \"s/@GIT_HASH@/${GIT_HASH}/\" ${INPUT_FILE_PATH} > ${DERIVED_FILE_DIR}/${INPUT_FILE_BASE}\n";
+		};
+/* End PBXBuildRule section */
+
 /* Begin PBXCopyFilesBuildPhase section */
 		6726C2311A4C2BBD005EEA39 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
@ -315,6 +302,8 @@
 		675343DE1A3F5FE500A0A8C3 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
 		675343E01A3F600D00A0A8C3 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		675343E21A3F607600A0A8C3 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
+		67633E4B232A84C700684E04 /* build_version.hpp.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = build_version.hpp.in; path = ../../build_version.hpp.in; sourceTree = "<group>"; };
+		67633ED3233298B900684E04 /* libgeocoder.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgeocoder.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		6764B8931ADD6FC100DD8B15 /* osm_o5m_source_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_o5m_source_test.cpp; sourceTree = "<group>"; };
 		677792501C1B2E9300EC9499 /* metadata_parser_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = metadata_parser_test.cpp; sourceTree = "<group>"; };
 		677E2A091CAAC771001DC42A /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
@ -414,37 +403,12 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				401E3189225C988500DE7EB8 /* libdescriptions.a in Frameworks */,
-				56EE14CD1FE803EA0036F20C /* libtransit.a in Frameworks */,
+				67633ED4233298B900684E04 /* libgeocoder.a in Frameworks */,
 				562D42961FD8463700A995F3 /* libsqlite3.tbd in Frameworks */,
-				562D42941FD8460500A995F3 /* libugc.a in Frameworks */,
-				562147291F6AA37E002D2214 /* libmwm_diff.a in Frameworks */,
-				562147271F6AA36A002D2214 /* libbsdiff.a in Frameworks */,
-				670E7BC01EF983A400A8E9ED /* libtraffic.a in Frameworks */,
-				670E7BBE1EF9839C00A8E9ED /* librouting_common.a in Frameworks */,
 				670E7BBC1EF9832200A8E9ED /* libicu.a in Frameworks */,
-				3462FD971DC1E1FC00906FD7 /* liboauthcpp.a in Frameworks */,
-				3462FD951DC1E1EF00906FD7 /* libpugixml.a in Frameworks */,
-				3462FD931DC1E1DD00906FD7 /* libeditor.a in Frameworks */,
-				3462FD911DC1E1C400906FD7 /* libalohalitics.a in Frameworks */,
 				34F558571DBF3CD800A4FC11 /* libstdc++.tbd in Frameworks */,
-				67BC92C71D17FDF800A4A378 /* libapi.a in Frameworks */,
-				67BC92C61D17FDE600A4A378 /* OpenGL.framework in Frameworks */,
-				67BC92BC1D17FD5800A4A378 /* libagg.a in Frameworks */,
-				67BC92BD1D17FD5800A4A378 /* libdrape_frontend.a in Frameworks */,
-				67BC92BE1D17FD5800A4A378 /* libdrape.a in Frameworks */,
-				67BC92BF1D17FD5800A4A378 /* libfreetype.a in Frameworks */,
-				67BC92C21D17FD5800A4A378 /* libmap.a in Frameworks */,
-				67BC92C31D17FD5800A4A378 /* libminizip.a in Frameworks */,
-				67BC92C41D17FD5800A4A378 /* libsdf_image.a in Frameworks */,
-				67BC92C51D17FD5800A4A378 /* libstb_image.a in Frameworks */,
-				677E2A191CAACCB3001DC42A /* libz.tbd in Frameworks */,
-				6719DD5F1B95AB570018166F /* libtess2.a in Frameworks */,
-				670F887A1CE4CA9C003F68BA /* libopening_hours.a in Frameworks */,
 				674A28F21B1C8119001A525C /* libsuccinct.a in Frameworks */,
-				674A28F01B1C8104001A525C /* libsearch.a in Frameworks */,
 				674A28EE1B1C80FB001A525C /* libjansson.a in Frameworks */,
-				674A28EC1B1C80F4001A525C /* libstorage.a in Frameworks */,
 				674A28DF1B1C80EA001A525C /* libbase.a in Frameworks */,
 				674A28E01B1C80EA001A525C /* libcoding.a in Frameworks */,
 				674A28E11B1C80EA001A525C /* libexpat.a in Frameworks */,
@ -454,9 +418,6 @@
 				674A28E51B1C80EA001A525C /* libindexer.a in Frameworks */,
 				674A28E61B1C80EA001A525C /* libplatform.a in Frameworks */,
 				674A28E71B1C80EA001A525C /* libprotobuf.a in Frameworks */,
-				674A28E81B1C80EA001A525C /* librouting.a in Frameworks */,
-				675344431A3F65E800A0A8C3 /* IOKit.framework in Frameworks */,
-				675343E31A3F607600A0A8C3 /* Cocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -504,6 +465,7 @@
 		34F558551DBF3CD800A4FC11 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				67633ED3233298B900684E04 /* libgeocoder.a */,
 				671C2D8A22AFE2F7008B2B8B /* libdescriptions.a */,
 				671C2D8822AFE250008B2B8B /* libtraffic.a */,
 				401E3188225C988500DE7EB8 /* libdescriptions.a */,
@ -625,6 +587,7 @@
 		6753415A1A3F54D800A0A8C3 /* generator_tool */ = {
 			isa = PBXGroup;
 			children = (
+				67633E4B232A84C700684E04 /* build_version.hpp.in */,
 				675341621A3F54F600A0A8C3 /* generator_tool.cpp */,
 			);
 			name = generator_tool;
@ -720,6 +683,7 @@
 				675341561A3F54D800A0A8C3 /* CopyFiles */,
 			);
 			buildRules = (
+				67633E74232B9E7F00684E04 /* PBXBuildRule */,
 			);
 			dependencies = (
 			);
@ -849,6 +813,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				67633E73232B9E7800684E04 /* build_version.hpp.in in Sources */,
 				675341631A3F54F600A0A8C3 /* generator_tool.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@ -935,7 +900,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@ -945,7 +909,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@ -982,7 +945,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
--- a/xcode/geocoder/geocoder.xcodeproj/project.pbxproj
+++ b/xcode/geocoder/geocoder.xcodeproj/project.pbxproj
@ -0,0 +1,403 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		67633E9823328E2600684E04 /* house_numbers_matcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67633E8823328E2500684E04 /* house_numbers_matcher.cpp */; };
+		67633E9923328E2600684E04 /* hierarchy.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67633E8923328E2500684E04 /* hierarchy.hpp */; };
+		67633E9A23328E2600684E04 /* geocoder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67633E8A23328E2500684E04 /* geocoder.hpp */; };
+		67633E9B23328E2600684E04 /* index.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67633E8B23328E2500684E04 /* index.hpp */; };
+		67633E9C23328E2600684E04 /* name_dictionary.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67633E8C23328E2500684E04 /* name_dictionary.hpp */; };
+		67633E9D23328E2600684E04 /* hierarchy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67633E8D23328E2500684E04 /* hierarchy.cpp */; };
+		67633E9E23328E2600684E04 /* hierarchy_reader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67633E8E23328E2500684E04 /* hierarchy_reader.hpp */; };
+		67633E9F23328E2600684E04 /* result.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67633E8F23328E2500684E04 /* result.cpp */; };
+		67633EA023328E2600684E04 /* hierarchy_reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67633E9023328E2500684E04 /* hierarchy_reader.cpp */; };
+		67633EA123328E2600684E04 /* types.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67633E9123328E2500684E04 /* types.hpp */; };
+		67633EA223328E2600684E04 /* result.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67633E9223328E2500684E04 /* result.hpp */; };
+		67633EA323328E2600684E04 /* name_dictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67633E9323328E2500684E04 /* name_dictionary.cpp */; };
+		67633EA423328E2600684E04 /* geocoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67633E9423328E2500684E04 /* geocoder.cpp */; };
+		67633EA523328E2600684E04 /* index.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67633E9523328E2600684E04 /* index.cpp */; };
+		67633EA623328E2600684E04 /* types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67633E9623328E2600684E04 /* types.cpp */; };
+		67633EA723328E2600684E04 /* house_numbers_matcher.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67633E9723328E2600684E04 /* house_numbers_matcher.hpp */; };
+		67633EB82332902100684E04 /* geocoder_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67633EAC23328F7700684E04 /* geocoder_tests.cpp */; };
+		67633EB92332902100684E04 /* house_numbers_matcher_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67633EAB23328F7700684E04 /* house_numbers_matcher_test.cpp */; };
+		67633EBC2332904900684E04 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67633EBB2332904900684E04 /* libbase.a */; };
+		67633EBE2332904900684E04 /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67633EBD2332904900684E04 /* libcoding.a */; };
+		67633EC02332904900684E04 /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67633EBF2332904900684E04 /* libgeometry.a */; };
+		67633EC22332904900684E04 /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67633EC12332904900684E04 /* libindexer.a */; };
+		67633EC32332904900684E04 /* libgeocoder.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67633E8023328DBA00684E04 /* libgeocoder.a */; };
+		67633EC52332905300684E04 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67633EC42332905300684E04 /* libjansson.a */; };
+		67633EC7233290AA00684E04 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 67633EC6233290AA00684E04 /* libz.tbd */; };
+		67633ECB2332957F00684E04 /* libplatform_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67633ECA2332957F00684E04 /* libplatform_tests_support.a */; };
+		67633ECD2332958B00684E04 /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67633ECC2332958B00684E04 /* libplatform.a */; };
+		67633ECF233295C100684E04 /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67633ECE233295C100684E04 /* testingmain.cpp */; };
+		67633ED12332965900684E04 /* path.hpp.in in Sources */ = {isa = PBXBuildFile; fileRef = 67633ED02332965100684E04 /* path.hpp.in */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXBuildRule section */
+		67633ED22332965D00684E04 /* PBXBuildRule */ = {
+			isa = PBXBuildRule;
+			compilerSpec = com.apple.compilers.proxy.script;
+			filePatterns = "*.hpp.in";
+			fileType = pattern.proxy;
+			isEditable = 1;
+			outputFiles = (
+				"$(DERIVED_FILE_DIR)/testing/${INPUT_FILE_BASE}",
+			);
+			script = "export GIT_HASH=$(git log --pretty=format:'%h' -n 1)\nexport GIT_TIMESTAMP=$(git log --pretty=format:'%at' -n 1)\nexport GIT_TAG=\"LOCAL\"\nexport PROJECT_NAME=\"geocore\"\nsed -e 's/@PROJECT_NAME@/geocore/g' -e \"s|@GEOCORE_ROOT@|${GEOCORE_ROOT}|g\" -e \"s/@GIT_TAG@/${GIT_TAG}/\" -e \"s/@GIT_TIMESTAMP@/${GIT_TIMESTAMP}/\" -e \"s/@GIT_HASH@/${GIT_HASH}/\" ${INPUT_FILE_PATH} > ${DERIVED_FILE_DIR}/testing/${INPUT_FILE_BASE}\n";
+		};
+/* End PBXBuildRule section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		67633EAF23328F9000684E04 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		67633E8023328DBA00684E04 /* libgeocoder.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgeocoder.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		67633E8823328E2500684E04 /* house_numbers_matcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = house_numbers_matcher.cpp; sourceTree = "<group>"; };
+		67633E8923328E2500684E04 /* hierarchy.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = hierarchy.hpp; sourceTree = "<group>"; };
+		67633E8A23328E2500684E04 /* geocoder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = geocoder.hpp; sourceTree = "<group>"; };
+		67633E8B23328E2500684E04 /* index.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = index.hpp; sourceTree = "<group>"; };
+		67633E8C23328E2500684E04 /* name_dictionary.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = name_dictionary.hpp; sourceTree = "<group>"; };
+		67633E8D23328E2500684E04 /* hierarchy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hierarchy.cpp; sourceTree = "<group>"; };
+		67633E8E23328E2500684E04 /* hierarchy_reader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = hierarchy_reader.hpp; sourceTree = "<group>"; };
+		67633E8F23328E2500684E04 /* result.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = result.cpp; sourceTree = "<group>"; };
+		67633E9023328E2500684E04 /* hierarchy_reader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hierarchy_reader.cpp; sourceTree = "<group>"; };
+		67633E9123328E2500684E04 /* types.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = types.hpp; sourceTree = "<group>"; };
+		67633E9223328E2500684E04 /* result.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = result.hpp; sourceTree = "<group>"; };
+		67633E9323328E2500684E04 /* name_dictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = name_dictionary.cpp; sourceTree = "<group>"; };
+		67633E9423328E2500684E04 /* geocoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geocoder.cpp; sourceTree = "<group>"; };
+		67633E9523328E2600684E04 /* index.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = index.cpp; sourceTree = "<group>"; };
+		67633E9623328E2600684E04 /* types.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = types.cpp; sourceTree = "<group>"; };
+		67633E9723328E2600684E04 /* house_numbers_matcher.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = house_numbers_matcher.hpp; sourceTree = "<group>"; };
+		67633EA823328E4B00684E04 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; };
+		67633EA923328E4B00684E04 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = "<group>"; };
+		67633EAB23328F7700684E04 /* house_numbers_matcher_test.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = house_numbers_matcher_test.cpp; sourceTree = "<group>"; };
+		67633EAC23328F7700684E04 /* geocoder_tests.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = geocoder_tests.cpp; sourceTree = "<group>"; };
+		67633EB123328F9000684E04 /* geocoder_tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = geocoder_tests; sourceTree = BUILT_PRODUCTS_DIR; };
+		67633EBB2332904900684E04 /* libbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbase.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		67633EBD2332904900684E04 /* libcoding.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcoding.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		67633EBF2332904900684E04 /* libgeometry.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgeometry.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		67633EC12332904900684E04 /* libindexer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libindexer.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		67633EC42332905300684E04 /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		67633EC6233290AA00684E04 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+		67633ECA2332957F00684E04 /* libplatform_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libplatform_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		67633ECC2332958B00684E04 /* libplatform.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libplatform.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		67633ECE233295C100684E04 /* testingmain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = testingmain.cpp; sourceTree = "<group>"; };
+		67633ED02332965100684E04 /* path.hpp.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = path.hpp.in; path = ../../testing/path.hpp.in; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		67633E7E23328DBA00684E04 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		67633EAE23328F9000684E04 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				67633ECD2332958B00684E04 /* libplatform.a in Frameworks */,
+				67633ECB2332957F00684E04 /* libplatform_tests_support.a in Frameworks */,
+				67633EC7233290AA00684E04 /* libz.tbd in Frameworks */,
+				67633EC52332905300684E04 /* libjansson.a in Frameworks */,
+				67633EC32332904900684E04 /* libgeocoder.a in Frameworks */,
+				67633EBC2332904900684E04 /* libbase.a in Frameworks */,
+				67633EBE2332904900684E04 /* libcoding.a in Frameworks */,
+				67633EC02332904900684E04 /* libgeometry.a in Frameworks */,
+				67633EC22332904900684E04 /* libindexer.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		67633E7723328DBA00684E04 = {
+			isa = PBXGroup;
+			children = (
+				67633EA923328E4B00684E04 /* common-debug.xcconfig */,
+				67633EA823328E4B00684E04 /* common-release.xcconfig */,
+				67633EAA23328F2B00684E04 /* geocoder_tests */,
+				67633E8723328DEF00684E04 /* geocoder */,
+				67633E8123328DBA00684E04 /* Products */,
+				67633EBA2332904900684E04 /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		67633E8123328DBA00684E04 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				67633E8023328DBA00684E04 /* libgeocoder.a */,
+				67633EB123328F9000684E04 /* geocoder_tests */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		67633E8723328DEF00684E04 /* geocoder */ = {
+			isa = PBXGroup;
+			children = (
+				67633E9423328E2500684E04 /* geocoder.cpp */,
+				67633E8A23328E2500684E04 /* geocoder.hpp */,
+				67633E9023328E2500684E04 /* hierarchy_reader.cpp */,
+				67633E8E23328E2500684E04 /* hierarchy_reader.hpp */,
+				67633E8D23328E2500684E04 /* hierarchy.cpp */,
+				67633E8923328E2500684E04 /* hierarchy.hpp */,
+				67633E8823328E2500684E04 /* house_numbers_matcher.cpp */,
+				67633E9723328E2600684E04 /* house_numbers_matcher.hpp */,
+				67633E9523328E2600684E04 /* index.cpp */,
+				67633E8B23328E2500684E04 /* index.hpp */,
+				67633E9323328E2500684E04 /* name_dictionary.cpp */,
+				67633E8C23328E2500684E04 /* name_dictionary.hpp */,
+				67633E8F23328E2500684E04 /* result.cpp */,
+				67633E9223328E2500684E04 /* result.hpp */,
+				67633E9623328E2600684E04 /* types.cpp */,
+				67633E9123328E2500684E04 /* types.hpp */,
+			);
+			name = geocoder;
+			path = ../../geocoder;
+			sourceTree = "<group>";
+		};
+		67633EAA23328F2B00684E04 /* geocoder_tests */ = {
+			isa = PBXGroup;
+			children = (
+				67633ED02332965100684E04 /* path.hpp.in */,
+				67633ECE233295C100684E04 /* testingmain.cpp */,
+				67633EAC23328F7700684E04 /* geocoder_tests.cpp */,
+				67633EAB23328F7700684E04 /* house_numbers_matcher_test.cpp */,
+			);
+			name = geocoder_tests;
+			path = ../../geocoder/geocoder_tests;
+			sourceTree = "<group>";
+		};
+		67633EBA2332904900684E04 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				67633ECC2332958B00684E04 /* libplatform.a */,
+				67633ECA2332957F00684E04 /* libplatform_tests_support.a */,
+				67633EC6233290AA00684E04 /* libz.tbd */,
+				67633EC42332905300684E04 /* libjansson.a */,
+				67633EBB2332904900684E04 /* libbase.a */,
+				67633EBD2332904900684E04 /* libcoding.a */,
+				67633EBF2332904900684E04 /* libgeometry.a */,
+				67633EC12332904900684E04 /* libindexer.a */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		67633E7C23328DBA00684E04 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				67633E9E23328E2600684E04 /* hierarchy_reader.hpp in Headers */,
+				67633EA723328E2600684E04 /* house_numbers_matcher.hpp in Headers */,
+				67633E9A23328E2600684E04 /* geocoder.hpp in Headers */,
+				67633EA123328E2600684E04 /* types.hpp in Headers */,
+				67633E9923328E2600684E04 /* hierarchy.hpp in Headers */,
+				67633EA223328E2600684E04 /* result.hpp in Headers */,
+				67633E9B23328E2600684E04 /* index.hpp in Headers */,
+				67633E9C23328E2600684E04 /* name_dictionary.hpp in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		67633E7F23328DBA00684E04 /* geocoder */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 67633E8423328DBA00684E04 /* Build configuration list for PBXNativeTarget "geocoder" */;
+			buildPhases = (
+				67633E7C23328DBA00684E04 /* Headers */,
+				67633E7D23328DBA00684E04 /* Sources */,
+				67633E7E23328DBA00684E04 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = geocoder;
+			productName = geocoder;
+			productReference = 67633E8023328DBA00684E04 /* libgeocoder.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		67633EB023328F9000684E04 /* geocoder_tests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 67633EB523328F9100684E04 /* Build configuration list for PBXNativeTarget "geocoder_tests" */;
+			buildPhases = (
+				67633EAD23328F9000684E04 /* Sources */,
+				67633EAE23328F9000684E04 /* Frameworks */,
+				67633EAF23328F9000684E04 /* CopyFiles */,
+			);
+			buildRules = (
+				67633ED22332965D00684E04 /* PBXBuildRule */,
+			);
+			dependencies = (
+			);
+			name = geocoder_tests;
+			productName = geocoder_tests;
+			productReference = 67633EB123328F9000684E04 /* geocoder_tests */;
+			productType = "com.apple.product-type.tool";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		67633E7823328DBA00684E04 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 1030;
+				ORGANIZATIONNAME = Mail.Ru;
+				TargetAttributes = {
+					67633E7F23328DBA00684E04 = {
+						CreatedOnToolsVersion = 10.3;
+					};
+					67633EB023328F9000684E04 = {
+						CreatedOnToolsVersion = 10.3;
+					};
+				};
+			};
+			buildConfigurationList = 67633E7B23328DBA00684E04 /* Build configuration list for PBXProject "geocoder" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 67633E7723328DBA00684E04;
+			productRefGroup = 67633E8123328DBA00684E04 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				67633E7F23328DBA00684E04 /* geocoder */,
+				67633EB023328F9000684E04 /* geocoder_tests */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		67633E7D23328DBA00684E04 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				67633E9823328E2600684E04 /* house_numbers_matcher.cpp in Sources */,
+				67633EA423328E2600684E04 /* geocoder.cpp in Sources */,
+				67633E9D23328E2600684E04 /* hierarchy.cpp in Sources */,
+				67633EA523328E2600684E04 /* index.cpp in Sources */,
+				67633EA323328E2600684E04 /* name_dictionary.cpp in Sources */,
+				67633EA023328E2600684E04 /* hierarchy_reader.cpp in Sources */,
+				67633E9F23328E2600684E04 /* result.cpp in Sources */,
+				67633EA623328E2600684E04 /* types.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		67633EAD23328F9000684E04 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				67633ED12332965900684E04 /* path.hpp.in in Sources */,
+				67633ECF233295C100684E04 /* testingmain.cpp in Sources */,
+				67633EB82332902100684E04 /* geocoder_tests.cpp in Sources */,
+				67633EB92332902100684E04 /* house_numbers_matcher_test.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		67633E8223328DBA00684E04 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 67633EA923328E4B00684E04 /* common-debug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		67633E8323328DBA00684E04 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 67633EA823328E4B00684E04 /* common-release.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		67633E8523328DBA00684E04 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				EXECUTABLE_PREFIX = lib;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		67633E8623328DBA00684E04 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				EXECUTABLE_PREFIX = lib;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		67633EB623328F9100684E04 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_STYLE = Automatic;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		67633EB723328F9100684E04 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_STYLE = Automatic;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		67633E7B23328DBA00684E04 /* Build configuration list for PBXProject "geocoder" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				67633E8223328DBA00684E04 /* Debug */,
+				67633E8323328DBA00684E04 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		67633E8423328DBA00684E04 /* Build configuration list for PBXNativeTarget "geocoder" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				67633E8523328DBA00684E04 /* Debug */,
+				67633E8623328DBA00684E04 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		67633EB523328F9100684E04 /* Build configuration list for PBXNativeTarget "geocoder_tests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				67633EB623328F9100684E04 /* Debug */,
+				67633EB723328F9100684E04 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 67633E7823328DBA00684E04 /* Project object */;
+}
--- a/xcode/geocore.xcworkspace/contents.xcworkspacedata
+++ b/xcode/geocore.xcworkspace/contents.xcworkspacedata
@ -134,7 +134,7 @@
         location = "group:../std/string.hpp">
      </FileRef>
      <FileRef
-         location = "group:../platform/target_os.hpp">
+         location = "group:../std/target_os.hpp">
      </FileRef>
      <FileRef
         location = "group:../std/tuple.hpp">
@ -167,34 +167,12 @@
         location = "group:../std/windows.hpp">
      </FileRef>
   </Group>
-   <Group
-      location = "container:../pyhelpers"
-      name = "pyhelpers">
-      <FileRef
-         location = "group:pair.hpp">
-      </FileRef>
-      <FileRef
-         location = "group:vector_uint8.hpp">
-      </FileRef>
-   </Group>
   <Group
      location = "container:"
      name = "3party">
-      <FileRef
-         location = "container:agg/agg.xcodeproj">
-      </FileRef>
-      <FileRef
-         location = "container:alohalitics/alohalitics.xcodeproj">
-      </FileRef>
-      <FileRef
-         location = "container:bsdiff/bsdiff.xcodeproj">
-      </FileRef>
      <FileRef
         location = "container:expat/expat.xcodeproj">
      </FileRef>
-      <FileRef
-         location = "container:freetype/freetype.xcodeproj">
-      </FileRef>
      <FileRef
         location = "container:gflags/gflags.xcodeproj">
      </FileRef>
@ -204,67 +182,19 @@
      <FileRef
         location = "container:jansson/jansson.xcodeproj">
      </FileRef>
-      <FileRef
-         location = "container:minizip/minizip.xcodeproj">
-      </FileRef>
-      <FileRef
-         location = "container:oauthcpp/oauthcpp.xcodeproj">
-      </FileRef>
-      <FileRef
-         location = "container:open_location_code/open_location_code.xcodeproj">
-      </FileRef>
-      <FileRef
-         location = "container:opening_hours/opening_hours.xcodeproj">
-      </FileRef>
-      <FileRef
-         location = "container:osrm/osrm.xcodeproj">
-      </FileRef>
      <FileRef
         location = "container:protobuf/protobuf.xcodeproj">
      </FileRef>
-      <FileRef
-         location = "container:pugixml/pugixml.xcodeproj">
-      </FileRef>
-      <FileRef
-         location = "container:sdf_image/sdf_image.xcodeproj">
-      </FileRef>
-      <FileRef
-         location = "container:stb_image/stb_image.xcodeproj">
-      </FileRef>
      <FileRef
         location = "container:succinct/succinct.xcodeproj">
      </FileRef>
-      <FileRef
-         location = "container:tess2/tess2.xcodeproj">
-      </FileRef>
-      <FileRef
-         location = "group:vulkan_wrapper/vulkan_wrapper.xcodeproj">
-      </FileRef>
   </Group>
-   <FileRef
-      location = "container:api/api.xcodeproj">
-   </FileRef>
   <FileRef
      location = "container:base/base.xcodeproj">
   </FileRef>
   <FileRef
      location = "container:coding/coding.xcodeproj">
   </FileRef>
-   <FileRef
-      location = "group:descriptions/descriptions.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "container:drape/drape.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "container:drape_frontend/drape_frontend.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:shaders/shaders.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "container:editor/editor.xcodeproj">
-   </FileRef>
   <FileRef
      location = "container:geometry/geometry.xcodeproj">
   </FileRef>
@ -272,7 +202,7 @@
      location = "container:generator/generator.xcodeproj">
   </FileRef>
   <FileRef
-      location = "container:mwm_diff/mwm_diff.xcodeproj">
+      location = "group:geocoder/geocoder.xcodeproj">
   </FileRef>
   <FileRef
      location = "container:generator_tool/generator_tool.xcodeproj">
@ -280,64 +210,7 @@
   <FileRef
      location = "container:indexer/indexer.xcodeproj">
   </FileRef>
-   <FileRef
-      location = "container:local_ads/local_ads.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "container:map/map.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "container:mapshot/mapshot.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:metrics/metrics.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "container:openlr/openlr.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "container:partners_api/partners_api.xcodeproj">
-   </FileRef>
   <FileRef
      location = "container:platform/platform.xcodeproj">
   </FileRef>
-   <FileRef
-      location = "container:routing/routing.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "container:routing_common/routing_common.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "container:search/search.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "container:storage/storage.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "container:traffic/traffic.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "container:tracking/tracking.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:transit/transit.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "container:qtMapsMe/qtMapsMe.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "container:ugc/ugc.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "container:software_renderer/software_renderer.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "container:kml/kml.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:../iphone/Maps/Maps.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:../iphone/Maps/Pods/Pods.xcodeproj">
-   </FileRef>
 </Workspace>
--- a/xcode/geometry/geometry.xcodeproj/project.pbxproj
+++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj
@ -605,7 +605,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@ -614,7 +613,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@ -630,7 +628,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = "Production Full";
--- a/xcode/indexer/indexer.xcodeproj/project.pbxproj
+++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj
@ -47,9 +47,6 @@
 		39F376C3207D32510058E8E0 /* scale_index_reading_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39F376C1207D324E0058E8E0 /* scale_index_reading_tests.cpp */; };
 		3D12E3D72111B4BE0015A9A9 /* caching_rank_table_loader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D12E3D52111B4BD0015A9A9 /* caching_rank_table_loader.cpp */; };
 		3D12E3D82111B4BE0015A9A9 /* caching_rank_table_loader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D12E3D62111B4BD0015A9A9 /* caching_rank_table_loader.hpp */; };
-		3D452AFA1EE6D9F5009EAB9B /* wheelchair_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D452AF71EE6D9F5009EAB9B /* wheelchair_tests.cpp */; };
-		3D452AFB1EE6D9F5009EAB9B /* feature_names_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D452AF81EE6D9F5009EAB9B /* feature_names_test.cpp */; };
-		3D452AFC1EE6D9F5009EAB9B /* centers_table_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D452AF91EE6D9F5009EAB9B /* centers_table_test.cpp */; };
 		3D489BC61D3D220F0052AA38 /* editable_map_object_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D489BA71D3D1F8A0052AA38 /* editable_map_object_test.cpp */; };
 		3D489BC71D3D22150052AA38 /* features_vector_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D489BA81D3D1F8A0052AA38 /* features_vector_test.cpp */; };
 		3D489BC81D3D22190052AA38 /* string_slice_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D489BA91D3D1F8A0052AA38 /* string_slice_tests.cpp */; };
@ -62,7 +59,6 @@
 		3D51BC431D5E4E2B00F1FA8D /* test_mwm_set.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C74C2D1C749E8100B71B9F /* test_mwm_set.hpp */; };
 		3D51BC451D5E4EBF00F1FA8D /* libsearch_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D51BC441D5E4EBF00F1FA8D /* libsearch_tests_support.a */; };
 		3D74ABBC1EA67C1E0063A898 /* ftypes_mapping.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D74ABBB1EA67C1E0063A898 /* ftypes_mapping.hpp */; };
-		3D74EF241F8F559D0081202C /* ugc_types_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D74EF231F8F559D0081202C /* ugc_types_test.cpp */; };
 		3D928F671D50F9FE001670E0 /* data_source_helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D928F651D50F9FE001670E0 /* data_source_helpers.cpp */; };
 		3D928F681D50F9FE001670E0 /* data_source_helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D928F661D50F9FE001670E0 /* data_source_helpers.hpp */; };
 		40009062201F5CB000963E18 /* cell_value_pair.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4000905D201F5CAF00963E18 /* cell_value_pair.hpp */; };
@ -70,18 +66,13 @@
 		40009064201F5CB000963E18 /* locality_index_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4000905F201F5CAF00963E18 /* locality_index_builder.hpp */; };
 		40009065201F5CB000963E18 /* locality_object.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 40009060201F5CB000963E18 /* locality_object.hpp */; };
 		40009066201F5CB000963E18 /* locality_index_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40009061201F5CB000963E18 /* locality_index_builder.cpp */; };
-		406970A221AEF2F20024DDB2 /* brands_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 406970A121AEF2F10024DDB2 /* brands_tests.cpp */; };
 		406B37F4207FBABB000F3648 /* borders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 406B37F2207FBABA000F3648 /* borders.cpp */; };
 		406B37F5207FBABB000F3648 /* borders.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 406B37F3207FBABA000F3648 /* borders.hpp */; };
-		406B37F7207FBAC7000F3648 /* borders_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 406B37F6207FBAC7000F3648 /* borders_test.cpp */; };
 		4088CE2021AE993F00E2702A /* brands_holder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4088CE1E21AE993F00E2702A /* brands_holder.hpp */; };
 		4088CE2121AE993F00E2702A /* brands_holder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4088CE1F21AE993F00E2702A /* brands_holder.cpp */; };
 		4095DEB22020AC0000C591A3 /* locality_index.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4095DEB12020AC0000C591A3 /* locality_index.hpp */; };
 		4099F6491FC7142A002A7B05 /* fake_feature_ids.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4099F6471FC71429002A7B05 /* fake_feature_ids.cpp */; };
 		4099F64A1FC7142A002A7B05 /* fake_feature_ids.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4099F6481FC7142A002A7B05 /* fake_feature_ids.hpp */; };
-		40A1C30A202B321000F71672 /* locality_index_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40A1C309202B321000F71672 /* locality_index_test.cpp */; };
-		40C3C091205BF9F400CED188 /* bounds.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 40C3C090205BF9F400CED188 /* bounds.hpp */; };
-		40DF582D2174979200E4E0FC /* classificator_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40DF582C2174979200E4E0FC /* classificator_tests.cpp */; };
 		456B3FB41EDEEB65009B3D1F /* scales_patch.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 456B3FB31EDEEB65009B3D1F /* scales_patch.hpp */; };
 		456E1B181F90E5B7009C32E1 /* cities_boundaries_serdes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 456E1B141F90E5B6009C32E1 /* cities_boundaries_serdes.hpp */; };
 		456E1B191F90E5B7009C32E1 /* ftypes_sponsored.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 456E1B151F90E5B6009C32E1 /* ftypes_sponsored.cpp */; };
@ -206,6 +197,13 @@
 		6758AED41BB4413000C26E27 /* drules_selector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6758AED01BB4413000C26E27 /* drules_selector.hpp */; };
 		675B562320D25C9800A521D2 /* feature_source.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675B562120D25C9800A521D2 /* feature_source.cpp */; };
 		675B562420D25C9800A521D2 /* feature_source.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675B562220D25C9800A521D2 /* feature_source.hpp */; };
+		67633E44232A7E6200684E04 /* wheelchair_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D452AF71EE6D9F5009EAB9B /* wheelchair_tests.cpp */; };
+		67633E45232A7E7300684E04 /* locality_index_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40A1C309202B321000F71672 /* locality_index_test.cpp */; };
+		67633E46232A7E8000684E04 /* feature_names_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D452AF81EE6D9F5009EAB9B /* feature_names_test.cpp */; };
+		67633E47232A7E8700684E04 /* classificator_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40DF582C2174979200E4E0FC /* classificator_tests.cpp */; };
+		67633E48232A7E9000684E04 /* centers_table_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D452AF91EE6D9F5009EAB9B /* centers_table_test.cpp */; };
+		67633E49232A7E9A00684E04 /* bounds.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 40C3C090205BF9F400CED188 /* bounds.hpp */; };
+		67633E4A232A7EA100684E04 /* borders_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 406B37F6207FBAC7000F3648 /* borders_test.cpp */; };
 		67BC92F31D21476500A4A378 /* string_set.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BC92EF1D21476500A4A378 /* string_set.hpp */; };
 		67BC92F41D21476500A4A378 /* string_slice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67BC92F01D21476500A4A378 /* string_slice.cpp */; };
 		67BC92F51D21476500A4A378 /* string_slice.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BC92F11D21476500A4A378 /* string_slice.hpp */; };
@ -290,7 +288,6 @@
 		3D51BC401D5E4CFA00F1FA8D /* libtess2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtess2.a; path = "../../../geocore-xcode-build/Debug/libtess2.a"; sourceTree = "<group>"; };
 		3D51BC441D5E4EBF00F1FA8D /* libsearch_tests_support.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsearch_tests_support.a; path = "../../../geocore-xcode-build/Debug/libsearch_tests_support.a"; sourceTree = "<group>"; };
 		3D74ABBB1EA67C1E0063A898 /* ftypes_mapping.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ftypes_mapping.hpp; sourceTree = "<group>"; };
-		3D74EF231F8F559D0081202C /* ugc_types_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ugc_types_test.cpp; sourceTree = "<group>"; };
 		3D928F651D50F9FE001670E0 /* data_source_helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = data_source_helpers.cpp; sourceTree = "<group>"; };
 		3D928F661D50F9FE001670E0 /* data_source_helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = data_source_helpers.hpp; sourceTree = "<group>"; };
 		4000905D201F5CAF00963E18 /* cell_value_pair.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cell_value_pair.hpp; sourceTree = "<group>"; };
@ -299,7 +296,6 @@
 		40009060201F5CB000963E18 /* locality_object.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = locality_object.hpp; sourceTree = "<group>"; };
 		40009061201F5CB000963E18 /* locality_index_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locality_index_builder.cpp; sourceTree = "<group>"; };
 		4052928E21496D2B00D821F1 /* categories_cuisines.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = categories_cuisines.txt; path = ../../data/categories_cuisines.txt; sourceTree = "<group>"; };
-		406970A121AEF2F10024DDB2 /* brands_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = brands_tests.cpp; sourceTree = "<group>"; };
 		406B37F2207FBABA000F3648 /* borders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = borders.cpp; sourceTree = "<group>"; };
 		406B37F3207FBABA000F3648 /* borders.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = borders.hpp; sourceTree = "<group>"; };
 		406B37F6207FBAC7000F3648 /* borders_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = borders_test.cpp; sourceTree = "<group>"; };
@ -575,7 +571,6 @@
 			isa = PBXGroup;
 			children = (
 				391C0C8522BD255E003DC252 /* feature_to_osm_tests.cpp */,
-				406970A121AEF2F10024DDB2 /* brands_tests.cpp */,
 				406B37F6207FBAC7000F3648 /* borders_test.cpp */,
 				40C3C090205BF9F400CED188 /* bounds.hpp */,
 				56C74C261C749E8100B71B9F /* categories_test.cpp */,
@ -608,7 +603,6 @@
 				670C610A1AB065B100C38A8C /* test_type.cpp */,
 				670C611F1AB065E100C38A8C /* testingmain.cpp */,
 				56C74C2E1C749E8100B71B9F /* trie_test.cpp */,
-				3D74EF231F8F559D0081202C /* ugc_types_test.cpp */,
 				670C610B1AB065B100C38A8C /* visibility_test.cpp */,
 				3D452AF71EE6D9F5009EAB9B /* wheelchair_tests.cpp */,
 			);
@ -789,6 +783,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				3D51BC431D5E4E2B00F1FA8D /* test_mwm_set.hpp in Headers */,
+				67633E49232A7E9A00684E04 /* bounds.hpp in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -865,7 +860,6 @@
 				3D928F681D50F9FE001670E0 /* data_source_helpers.hpp in Headers */,
 				675341041A3F540F00A0A8C3 /* classificator.hpp in Headers */,
 				391C0C8422BD2551003DC252 /* feature_to_osm.hpp in Headers */,
-				40C3C091205BF9F400CED188 /* bounds.hpp in Headers */,
 				675341261A3F540F00A0A8C3 /* feature.hpp in Headers */,
 				34583BCA1C88552100F94664 /* editable_map_object.hpp in Headers */,
 				34583BCC1C88552100F94664 /* map_object.hpp in Headers */,
@ -940,6 +934,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 675340911A3F53CB00A0A8C3;
@ -982,8 +977,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				670BAA9D1D0B06E1000302DA /* interval_index_test.cpp in Sources */,
+				67633E48232A7E9000684E04 /* centers_table_test.cpp in Sources */,
 				670BAAA31D0B06E1000302DA /* test_type.cpp in Sources */,
 				670BAA961D0B06E1000302DA /* cell_id_test.cpp in Sources */,
+				67633E44232A7E6200684E04 /* wheelchair_tests.cpp in Sources */,
 				670BAA971D0B06E1000302DA /* checker_test.cpp in Sources */,
 				670BAA8E1D0B06A1000302DA /* search_string_utils_test.cpp in Sources */,
 				3D489BC71D3D22150052AA38 /* features_vector_test.cpp in Sources */,
@ -996,16 +993,20 @@
 				39F376C0207D32450058E8E0 /* cities_boundaries_serdes_tests.cpp in Sources */,
 				670BAA8F1D0B06A6000302DA /* rank_table_test.cpp in Sources */,
 				670BAA981D0B06E1000302DA /* features_offsets_table_test.cpp in Sources */,
+				67633E45232A7E7300684E04 /* locality_index_test.cpp in Sources */,
 				670BAAA01D0B06E1000302DA /* scales_test.cpp in Sources */,
 				670BAA9E1D0B06E1000302DA /* mwm_set_test.cpp in Sources */,
 				670BAA911D0B06B4000302DA /* categories_test.cpp in Sources */,
 				3D489BC81D3D22190052AA38 /* string_slice_tests.cpp in Sources */,
 				670BAAA11D0B06E1000302DA /* sort_and_merge_intervals_test.cpp in Sources */,
 				670BAA9C1D0B06E1000302DA /* data_source_test.cpp in Sources */,
+				67633E47232A7E8700684E04 /* classificator_tests.cpp in Sources */,
 				670BAA9B1D0B06E1000302DA /* index_builder_test.cpp in Sources */,
 				670C612C1AB0663400C38A8C /* testingmain.cpp in Sources */,
 				3D489BC61D3D220F0052AA38 /* editable_map_object_test.cpp in Sources */,
+				67633E4A232A7EA100684E04 /* borders_test.cpp in Sources */,
 				670BAA8D1D0B069A000302DA /* succinct_trie_test.cpp in Sources */,
+				67633E46232A7E8000684E04 /* feature_names_test.cpp in Sources */,
 				670BAA951D0B06E1000302DA /* cell_coverer_test.cpp in Sources */,
 				670BAA8C1D0B0673000302DA /* trie_test.cpp in Sources */,
 			);
@ -1023,17 +1024,13 @@
 				6753411A1A3F540F00A0A8C3 /* feature_impl.cpp in Sources */,
 				394E1E0A22BBB5EB00E4BC75 /* utils.cpp in Sources */,
 				56C74C1C1C749E4700B71B9F /* categories_holder_loader.cpp in Sources */,
-				3D74EF241F8F559D0081202C /* ugc_types_test.cpp in Sources */,
 				406B37F4207FBABB000F3648 /* borders.cpp in Sources */,
-				40DF582D2174979200E4E0FC /* classificator_tests.cpp in Sources */,
-				40A1C30A202B321000F71672 /* locality_index_test.cpp in Sources */,
 				6753410D1A3F540F00A0A8C3 /* drawing_rules.cpp in Sources */,
 				675341301A3F540F00A0A8C3 /* data_source.cpp in Sources */,
 				34664CF61D49FEC1003D7096 /* centers_table.cpp in Sources */,
 				3D12E3D72111B4BE0015A9A9 /* caching_rank_table_loader.cpp in Sources */,
 				6753414D1A3F540F00A0A8C3 /* types_mapping.cpp in Sources */,
 				34583BC71C88552100F94664 /* cuisines.cpp in Sources */,
-				3D452AFA1EE6D9F5009EAB9B /* wheelchair_tests.cpp in Sources */,
 				675341121A3F540F00A0A8C3 /* feature_algo.cpp in Sources */,
 				675341211A3F540F00A0A8C3 /* feature_utils.cpp in Sources */,
 				4099F6491FC7142A002A7B05 /* fake_feature_ids.cpp in Sources */,
@ -1050,8 +1047,6 @@
 				675341091A3F540F00A0A8C3 /* data_header.cpp in Sources */,
 				F61F83061E4B187500B37B7A /* road_shields_parser.cpp in Sources */,
 				670EE56C1B60033A001E8064 /* features_vector.cpp in Sources */,
-				3D452AFB1EE6D9F5009EAB9B /* feature_names_test.cpp in Sources */,
-				3D452AFC1EE6D9F5009EAB9B /* centers_table_test.cpp in Sources */,
 				34664CF31D49FEC1003D7096 /* altitude_loader.cpp in Sources */,
 				6726C1D11A49DAAC005EEA39 /* feature_meta.cpp in Sources */,
 				6753411C1A3F540F00A0A8C3 /* shared_load_info.cpp in Sources */,
@ -1066,7 +1061,6 @@
 				674125131B4C02F100A3E828 /* map_style_reader.cpp in Sources */,
 				675341141A3F540F00A0A8C3 /* feature_covering.cpp in Sources */,
 				4088CE2121AE993F00E2702A /* brands_holder.cpp in Sources */,
-				406970A221AEF2F20024DDB2 /* brands_tests.cpp in Sources */,
 				56C74C1D1C749E4700B71B9F /* categories_holder.cpp in Sources */,
 				675341371A3F540F00A0A8C3 /* mwm_set.cpp in Sources */,
 				675341181A3F540F00A0A8C3 /* feature_decl.cpp in Sources */,
@ -1076,7 +1070,6 @@
 				675341101A3F540F00A0A8C3 /* drules_struct.pb.cc in Sources */,
 				6758AED11BB4413000C26E27 /* drules_selector_parser.cpp in Sources */,
 				E906DE3B1CF44934004C4F5E /* postcodes_matcher.cpp in Sources */,
-				406B37F7207FBAC7000F3648 /* borders_test.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -1131,7 +1124,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@ -1140,7 +1132,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@ -1160,7 +1151,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = "Production Full";
--- a/xcode/platform/platform.xcodeproj/project.pbxproj
+++ b/xcode/platform/platform.xcodeproj/project.pbxproj
@ -9,39 +9,21 @@
 /* Begin PBXBuildFile section */
 		333A416F21C3E13B00AF26F6 /* http_session_manager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 333A416D21C3E13A00AF26F6 /* http_session_manager.mm */; };
 		333A417021C3E13B00AF26F6 /* http_session_manager.h in Headers */ = {isa = PBXBuildFile; fileRef = 333A416E21C3E13B00AF26F6 /* http_session_manager.h */; };
-		34513AFA1DCB37C100471BDA /* marketing_service_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34513AF71DCB37C100471BDA /* marketing_service_ios.mm */; };
-		34513AFB1DCB37C100471BDA /* marketing_service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34513AF81DCB37C100471BDA /* marketing_service.cpp */; };
-		34513AFC1DCB37C100471BDA /* marketing_service.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34513AF91DCB37C100471BDA /* marketing_service.hpp */; };
 		3496AB711DC1F5AB00C5DDBA /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3496AB701DC1F5AB00C5DDBA /* libalohalitics.a */; };
 		34C624BD1DABCCD100510300 /* socket_apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C624BB1DABCCD100510300 /* socket_apple.mm */; };
 		34C624BE1DABCCD100510300 /* socket.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34C624BC1DABCCD100510300 /* socket.hpp */; };
 		3D15ACE1214A707900F725D5 /* localization.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D15ACDF214A707800F725D5 /* localization.mm */; };
 		3D15ACE2214A707900F725D5 /* localization.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D15ACE0214A707800F725D5 /* localization.hpp */; };
-		3D30587D1D8320E4004AC712 /* http_client.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D30587B1D8320E4004AC712 /* http_client.hpp */; };
-		3D30587F1D880910004AC712 /* http_client_apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D30587E1D880910004AC712 /* http_client_apple.mm */; };
-		3D318A062021DD8B007B2607 /* http_uploader_apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D318A042021DD8A007B2607 /* http_uploader_apple.mm */; };
 		3D318A072021DD8B007B2607 /* http_uploader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D318A052021DD8B007B2607 /* http_uploader.hpp */; };
-		3D78156E1F3A14090068B6AC /* gui_thread_apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D78156B1F3A14090068B6AC /* gui_thread_apple.mm */; };
-		3D78156F1F3A14090068B6AC /* gui_thread.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D78156C1F3A14090068B6AC /* gui_thread.hpp */; };
-		3D78157D1F3D8A0A0068B6AC /* safe_callback.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D78157C1F3D8A0A0068B6AC /* safe_callback.hpp */; };
-		3D97F64B1D9C05E800380945 /* http_client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D97F64A1D9C05E800380945 /* http_client.cpp */; };
 		3DE8B98F1DEC3115000E6083 /* network_policy.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DE8B98E1DEC3115000E6083 /* network_policy.hpp */; };
-		3DEE1AE721F7091100054A91 /* battery_tracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DEE1AE521F7091100054A91 /* battery_tracker.cpp */; };
-		3DEE1AE821F7091100054A91 /* battery_tracker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DEE1AE621F7091100054A91 /* battery_tracker.hpp */; };
-		451E32A01F73A8B000964C9F /* secure_storage_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 451E329D1F73A8B000964C9F /* secure_storage_ios.mm */; };
-		451E32A11F73A8B000964C9F /* secure_storage_qt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 451E329E1F73A8B000964C9F /* secure_storage_qt.cpp */; };
 		451E32A21F73A8B000964C9F /* secure_storage.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 451E329F1F73A8B000964C9F /* secure_storage.hpp */; };
-		4564FA7E2094978D0043CCFB /* remote_file.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4564FA7C2094978C0043CCFB /* remote_file.hpp */; };
-		4564FA7F2094978D0043CCFB /* remote_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4564FA7D2094978D0043CCFB /* remote_file.cpp */; };
 		45D7ADBA210F48E500160DE3 /* http_user_agent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45D7ADB7210F48E400160DE3 /* http_user_agent.cpp */; };
-		45D7ADBB210F48E500160DE3 /* http_user_agent_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 45D7ADB8210F48E400160DE3 /* http_user_agent_ios.mm */; };
 		45D7ADBC210F48E500160DE3 /* http_user_agent.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 45D7ADB9210F48E400160DE3 /* http_user_agent.hpp */; };
 		5661A5CC20DD57DA00C6B1D1 /* async_gui_thread.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 5661A5CB20DD57DA00C6B1D1 /* async_gui_thread.hpp */; };
 		56EB1EDC1C6B6E6C0022D831 /* file_logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56EB1ED81C6B6E6C0022D831 /* file_logging.cpp */; };
 		56EB1EDD1C6B6E6C0022D831 /* file_logging.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56EB1ED91C6B6E6C0022D831 /* file_logging.hpp */; };
 		56EB1EDE1C6B6E6C0022D831 /* mwm_traits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56EB1EDA1C6B6E6C0022D831 /* mwm_traits.cpp */; };
 		56EB1EDF1C6B6E6C0022D831 /* mwm_traits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56EB1EDB1C6B6E6C0022D831 /* mwm_traits.hpp */; };
-		670E8C761BB318AB00094197 /* platform_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 670E8C741BB318AB00094197 /* platform_ios.mm */; };
 		671182F31C80AC4200CB8177 /* WorldCoasts_obsolete.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 671182F21C80AC3D00CB8177 /* WorldCoasts_obsolete.mwm */; };
 		671C62061AE9014C00076BD0 /* measurement_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C62041AE9014C00076BD0 /* measurement_utils.cpp */; };
 		671C62071AE9014C00076BD0 /* measurement_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671C62051AE9014C00076BD0 /* measurement_utils.hpp */; };
@ -61,33 +43,24 @@
 		675341261C58C616002CF0D9 /* scoped_file.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340F71C58C4B3002CF0D9 /* scoped_file.hpp */; };
 		675341271C58C61D002CF0D9 /* scoped_dir.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340F51C58C4B3002CF0D9 /* scoped_dir.hpp */; };
 		675341281C58C61D002CF0D9 /* scoped_mwm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340F91C58C4B3002CF0D9 /* scoped_mwm.hpp */; };
-		675343B11A3F5D5A00A0A8C3 /* apple_location_service.mm in Sources */ = {isa = PBXBuildFile; fileRef = 675343861A3F5D5900A0A8C3 /* apple_location_service.mm */; };
 		675343B31A3F5D5A00A0A8C3 /* chunks_download_strategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343881A3F5D5900A0A8C3 /* chunks_download_strategy.cpp */; };
 		675343B41A3F5D5A00A0A8C3 /* chunks_download_strategy.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343891A3F5D5900A0A8C3 /* chunks_download_strategy.hpp */; };
 		675343B51A3F5D5A00A0A8C3 /* constants.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753438A1A3F5D5900A0A8C3 /* constants.hpp */; };
 		675343B61A3F5D5A00A0A8C3 /* http_request.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753438B1A3F5D5900A0A8C3 /* http_request.cpp */; };
 		675343B71A3F5D5A00A0A8C3 /* http_request.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753438C1A3F5D5900A0A8C3 /* http_request.hpp */; };
-		675343B81A3F5D5A00A0A8C3 /* http_thread_apple.h in Headers */ = {isa = PBXBuildFile; fileRef = 6753438D1A3F5D5900A0A8C3 /* http_thread_apple.h */; };
-		675343B91A3F5D5A00A0A8C3 /* http_thread_apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6753438E1A3F5D5900A0A8C3 /* http_thread_apple.mm */; };
 		675343BA1A3F5D5A00A0A8C3 /* http_thread_callback.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753438F1A3F5D5A00A0A8C3 /* http_thread_callback.hpp */; };
-		675343C01A3F5D5A00A0A8C3 /* location_service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343951A3F5D5A00A0A8C3 /* location_service.cpp */; };
-		675343C11A3F5D5A00A0A8C3 /* location_service.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343961A3F5D5A00A0A8C3 /* location_service.hpp */; };
-		675343C21A3F5D5A00A0A8C3 /* location.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343971A3F5D5A00A0A8C3 /* location.hpp */; };
 		675343C91A3F5D5A00A0A8C3 /* platform_unix_impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753439E1A3F5D5A00A0A8C3 /* platform_unix_impl.cpp */; };
 		675343CA1A3F5D5A00A0A8C3 /* platform_unix_impl.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753439F1A3F5D5A00A0A8C3 /* platform_unix_impl.hpp */; };
 		675343CC1A3F5D5A00A0A8C3 /* platform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343A11A3F5D5A00A0A8C3 /* platform.cpp */; };
 		675343CD1A3F5D5A00A0A8C3 /* platform.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343A21A3F5D5A00A0A8C3 /* platform.hpp */; };
 		675343CE1A3F5D5A00A0A8C3 /* preferred_languages.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343A31A3F5D5A00A0A8C3 /* preferred_languages.cpp */; };
 		675343CF1A3F5D5A00A0A8C3 /* preferred_languages.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343A41A3F5D5A00A0A8C3 /* preferred_languages.hpp */; };
-		675343D11A3F5D5A00A0A8C3 /* servers_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343A61A3F5D5A00A0A8C3 /* servers_list.cpp */; };
-		675343D21A3F5D5A00A0A8C3 /* servers_list.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343A71A3F5D5A00A0A8C3 /* servers_list.hpp */; };
 		675343D31A3F5D5A00A0A8C3 /* settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343A81A3F5D5A00A0A8C3 /* settings.cpp */; };
 		675343D41A3F5D5A00A0A8C3 /* settings.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343A91A3F5D5A00A0A8C3 /* settings.hpp */; };
-		675343D91A3F5D5A00A0A8C3 /* wifi_info_windows.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343AE1A3F5D5A00A0A8C3 /* wifi_info_windows.cpp */; };
 		675343DA1A3F5D5A00A0A8C3 /* wifi_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343AF1A3F5D5A00A0A8C3 /* wifi_info.hpp */; };
-		675343DB1A3F5D5A00A0A8C3 /* wifi_location_service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343B01A3F5D5A00A0A8C3 /* wifi_location_service.cpp */; };
 		675E88A01DB7B0F200F8EBDA /* test_socket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675E889E1DB7B0F200F8EBDA /* test_socket.cpp */; };
 		675E88A11DB7B0F200F8EBDA /* test_socket.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675E889F1DB7B0F200F8EBDA /* test_socket.hpp */; };
+		67633E76232B9EFE00684E04 /* platform_std.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67633E75232B9EFE00684E04 /* platform_std.cpp */; };
 		676C84211C64CD3300DC9603 /* mwm_traits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 676C841F1C64CD3300DC9603 /* mwm_traits.hpp */; };
 		678338951C6DE59200FD6263 /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675341141C58C4D8002CF0D9 /* testingmain.cpp */; };
 		678338961C6DE59200FD6263 /* apk_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675341001C58C4C9002CF0D9 /* apk_test.cpp */; };
@ -111,15 +84,12 @@
 		678338AE1C6DF51D00FD6263 /* minsk-pass.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 678338AC1C6DF50700FD6263 /* minsk-pass.mwm */; };
 		678338B21C6E016F00FD6263 /* WorldCoasts.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 678338B11C6E016700FD6263 /* WorldCoasts.mwm */; };
 		678338B31C6E017200FD6263 /* World.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 678338B01C6E016700FD6263 /* World.mwm */; };
-		67A2526A1BB40E100063F8A8 /* platform_qt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753439C1A3F5D5A00A0A8C3 /* platform_qt.cpp */; };
 		67A2526B1BB40E520063F8A8 /* platform_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6753439B1A3F5D5A00A0A8C3 /* platform_mac.mm */; };
 		67AB92DC1B7B3D7300AB5194 /* mwm_version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67AB92DA1B7B3D7300AB5194 /* mwm_version.cpp */; };
 		67AB92DD1B7B3D7300AB5194 /* mwm_version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67AB92DB1B7B3D7300AB5194 /* mwm_version.hpp */; };
 		67AB92EA1B7B3E9100AB5194 /* get_text_by_id.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67AB92E81B7B3E9100AB5194 /* get_text_by_id.cpp */; };
 		67AB92EB1B7B3E9100AB5194 /* get_text_by_id.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67AB92E91B7B3E9100AB5194 /* get_text_by_id.hpp */; };
 		67B30B2A2084B7D8008AEBFD /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67B30B292084B7D7008AEBFD /* CoreLocation.framework */; };
-		EB60B4DC204C130300E4953B /* network_policy_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = EB60B4DB204C130300E4953B /* network_policy_ios.mm */; };
-		EB60B4DE204C175700E4953B /* network_policy_ios.h in Headers */ = {isa = PBXBuildFile; fileRef = EB60B4DD204C175700E4953B /* network_policy_ios.h */; };
 		F6DF73581EC9EAE700D8BA0B /* string_storage_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6DF73561EC9EAE700D8BA0B /* string_storage_base.cpp */; };
 		F6DF73591EC9EAE700D8BA0B /* string_storage_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6DF73561EC9EAE700D8BA0B /* string_storage_base.cpp */; };
 		F6DF735A1EC9EAE700D8BA0B /* string_storage_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6DF73561EC9EAE700D8BA0B /* string_storage_base.cpp */; };
@ -130,10 +100,6 @@
 /* Begin PBXFileReference section */
 		333A416D21C3E13A00AF26F6 /* http_session_manager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = http_session_manager.mm; sourceTree = "<group>"; };
 		333A416E21C3E13B00AF26F6 /* http_session_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = http_session_manager.h; sourceTree = "<group>"; };
-		344D8A2E204945D000CF532F /* platform_ios.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = platform_ios.h; sourceTree = "<group>"; };
-		34513AF71DCB37C100471BDA /* marketing_service_ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = marketing_service_ios.mm; sourceTree = "<group>"; };
-		34513AF81DCB37C100471BDA /* marketing_service.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = marketing_service.cpp; sourceTree = "<group>"; };
-		34513AF91DCB37C100471BDA /* marketing_service.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = marketing_service.hpp; sourceTree = "<group>"; };
 		3496AB701DC1F5AB00C5DDBA /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "../../../geocore-build/xcode/Debug-iphonesimulator/libalohalitics.a"; sourceTree = "<group>"; };
 		34C624BB1DABCCD100510300 /* socket_apple.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = socket_apple.mm; sourceTree = "<group>"; };
 		34C624BC1DABCCD100510300 /* socket.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = socket.hpp; sourceTree = "<group>"; };
@ -141,31 +107,16 @@
 		34F558341DBF273C00A4FC11 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; };
 		3D15ACDF214A707800F725D5 /* localization.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = localization.mm; sourceTree = "<group>"; };
 		3D15ACE0214A707800F725D5 /* localization.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = localization.hpp; sourceTree = "<group>"; };
-		3D30587B1D8320E4004AC712 /* http_client.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = http_client.hpp; sourceTree = "<group>"; };
-		3D30587E1D880910004AC712 /* http_client_apple.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = http_client_apple.mm; sourceTree = "<group>"; };
-		3D318A042021DD8A007B2607 /* http_uploader_apple.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = http_uploader_apple.mm; sourceTree = "<group>"; };
 		3D318A052021DD8B007B2607 /* http_uploader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = http_uploader.hpp; sourceTree = "<group>"; };
-		3D78156B1F3A14090068B6AC /* gui_thread_apple.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = gui_thread_apple.mm; sourceTree = "<group>"; };
-		3D78156C1F3A14090068B6AC /* gui_thread.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = gui_thread.hpp; sourceTree = "<group>"; };
-		3D78157C1F3D8A0A0068B6AC /* safe_callback.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = safe_callback.hpp; sourceTree = "<group>"; };
-		3D97F64A1D9C05E800380945 /* http_client.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = http_client.cpp; sourceTree = "<group>"; };
 		3DE8B98E1DEC3115000E6083 /* network_policy.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = network_policy.hpp; sourceTree = "<group>"; };
-		3DEE1AE521F7091100054A91 /* battery_tracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = battery_tracker.cpp; sourceTree = "<group>"; };
-		3DEE1AE621F7091100054A91 /* battery_tracker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = battery_tracker.hpp; sourceTree = "<group>"; };
-		451E329D1F73A8B000964C9F /* secure_storage_ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = secure_storage_ios.mm; sourceTree = "<group>"; };
-		451E329E1F73A8B000964C9F /* secure_storage_qt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = secure_storage_qt.cpp; sourceTree = "<group>"; };
 		451E329F1F73A8B000964C9F /* secure_storage.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = secure_storage.hpp; sourceTree = "<group>"; };
-		4564FA7C2094978C0043CCFB /* remote_file.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = remote_file.hpp; sourceTree = "<group>"; };
-		4564FA7D2094978D0043CCFB /* remote_file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = remote_file.cpp; sourceTree = "<group>"; };
 		45D7ADB7210F48E400160DE3 /* http_user_agent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = http_user_agent.cpp; sourceTree = "<group>"; };
-		45D7ADB8210F48E400160DE3 /* http_user_agent_ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = http_user_agent_ios.mm; sourceTree = "<group>"; };
 		45D7ADB9210F48E400160DE3 /* http_user_agent.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = http_user_agent.hpp; sourceTree = "<group>"; };
 		5661A5CB20DD57DA00C6B1D1 /* async_gui_thread.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = async_gui_thread.hpp; sourceTree = "<group>"; };
 		56EB1ED81C6B6E6C0022D831 /* file_logging.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_logging.cpp; sourceTree = "<group>"; };
 		56EB1ED91C6B6E6C0022D831 /* file_logging.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = file_logging.hpp; sourceTree = "<group>"; };
 		56EB1EDA1C6B6E6C0022D831 /* mwm_traits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_traits.cpp; sourceTree = "<group>"; };
 		56EB1EDB1C6B6E6C0022D831 /* mwm_traits.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_traits.hpp; sourceTree = "<group>"; };
-		670E8C741BB318AB00094197 /* platform_ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platform_ios.mm; sourceTree = "<group>"; };
 		671182F21C80AC3D00CB8177 /* WorldCoasts_obsolete.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = WorldCoasts_obsolete.mwm; sourceTree = "<group>"; };
 		671C62041AE9014C00076BD0 /* measurement_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = measurement_utils.cpp; sourceTree = "<group>"; };
 		671C62051AE9014C00076BD0 /* measurement_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = measurement_utils.hpp; sourceTree = "<group>"; };
@ -203,37 +154,26 @@
 		675341341C58C786002CF0D9 /* libminizip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libminizip.a; path = "../../../geocore-xcode-build/Debug/libminizip.a"; sourceTree = "<group>"; };
 		6753413B1C58C79C002CF0D9 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		675343781A3F5CF500A0A8C3 /* libplatform.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libplatform.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		675343861A3F5D5900A0A8C3 /* apple_location_service.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = apple_location_service.mm; sourceTree = "<group>"; };
 		675343881A3F5D5900A0A8C3 /* chunks_download_strategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chunks_download_strategy.cpp; sourceTree = "<group>"; };
 		675343891A3F5D5900A0A8C3 /* chunks_download_strategy.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = chunks_download_strategy.hpp; sourceTree = "<group>"; };
 		6753438A1A3F5D5900A0A8C3 /* constants.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = constants.hpp; sourceTree = "<group>"; };
 		6753438B1A3F5D5900A0A8C3 /* http_request.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = http_request.cpp; sourceTree = "<group>"; };
 		6753438C1A3F5D5900A0A8C3 /* http_request.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = http_request.hpp; sourceTree = "<group>"; };
-		6753438D1A3F5D5900A0A8C3 /* http_thread_apple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = http_thread_apple.h; sourceTree = "<group>"; };
-		6753438E1A3F5D5900A0A8C3 /* http_thread_apple.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = http_thread_apple.mm; sourceTree = "<group>"; };
 		6753438F1A3F5D5A00A0A8C3 /* http_thread_callback.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = http_thread_callback.hpp; sourceTree = "<group>"; };
-		675343951A3F5D5A00A0A8C3 /* location_service.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = location_service.cpp; sourceTree = "<group>"; };
-		675343961A3F5D5A00A0A8C3 /* location_service.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = location_service.hpp; sourceTree = "<group>"; };
-		675343971A3F5D5A00A0A8C3 /* location.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = location.hpp; sourceTree = "<group>"; };
-		675343981A3F5D5A00A0A8C3 /* platform_android.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platform_android.cpp; sourceTree = "<group>"; };
 		6753439A1A3F5D5A00A0A8C3 /* platform_linux.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platform_linux.cpp; sourceTree = "<group>"; };
 		6753439B1A3F5D5A00A0A8C3 /* platform_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platform_mac.mm; sourceTree = "<group>"; };
-		6753439C1A3F5D5A00A0A8C3 /* platform_qt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platform_qt.cpp; sourceTree = "<group>"; };
 		6753439E1A3F5D5A00A0A8C3 /* platform_unix_impl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platform_unix_impl.cpp; sourceTree = "<group>"; };
 		6753439F1A3F5D5A00A0A8C3 /* platform_unix_impl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = platform_unix_impl.hpp; sourceTree = "<group>"; };
 		675343A11A3F5D5A00A0A8C3 /* platform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platform.cpp; sourceTree = "<group>"; };
 		675343A21A3F5D5A00A0A8C3 /* platform.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = platform.hpp; sourceTree = "<group>"; };
 		675343A31A3F5D5A00A0A8C3 /* preferred_languages.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = preferred_languages.cpp; sourceTree = "<group>"; };
 		675343A41A3F5D5A00A0A8C3 /* preferred_languages.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = preferred_languages.hpp; sourceTree = "<group>"; };
-		675343A61A3F5D5A00A0A8C3 /* servers_list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = servers_list.cpp; sourceTree = "<group>"; };
-		675343A71A3F5D5A00A0A8C3 /* servers_list.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = servers_list.hpp; sourceTree = "<group>"; };
 		675343A81A3F5D5A00A0A8C3 /* settings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = settings.cpp; sourceTree = "<group>"; };
 		675343A91A3F5D5A00A0A8C3 /* settings.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = settings.hpp; sourceTree = "<group>"; };
-		675343AE1A3F5D5A00A0A8C3 /* wifi_info_windows.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wifi_info_windows.cpp; sourceTree = "<group>"; };
 		675343AF1A3F5D5A00A0A8C3 /* wifi_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = wifi_info.hpp; sourceTree = "<group>"; };
-		675343B01A3F5D5A00A0A8C3 /* wifi_location_service.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wifi_location_service.cpp; sourceTree = "<group>"; };
 		675E889E1DB7B0F200F8EBDA /* test_socket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_socket.cpp; sourceTree = "<group>"; };
 		675E889F1DB7B0F200F8EBDA /* test_socket.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_socket.hpp; sourceTree = "<group>"; };
+		67633E75232B9EFE00684E04 /* platform_std.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platform_std.cpp; sourceTree = "<group>"; };
 		676C841F1C64CD3300DC9603 /* mwm_traits.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_traits.hpp; sourceTree = "<group>"; };
 		6783387E1C6DE54700FD6263 /* platform_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = platform_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		678338AB1C6DF50700FD6263 /* classificator.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = classificator.txt; sourceTree = "<group>"; };
@ -245,8 +185,6 @@
 		67AB92E81B7B3E9100AB5194 /* get_text_by_id.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = get_text_by_id.cpp; sourceTree = "<group>"; };
 		67AB92E91B7B3E9100AB5194 /* get_text_by_id.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = get_text_by_id.hpp; sourceTree = "<group>"; };
 		67B30B292084B7D7008AEBFD /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
-		EB60B4DB204C130300E4953B /* network_policy_ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = network_policy_ios.mm; sourceTree = "<group>"; };
-		EB60B4DD204C175700E4953B /* network_policy_ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = network_policy_ios.h; sourceTree = "<group>"; };
 		F6DF73561EC9EAE700D8BA0B /* string_storage_base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_storage_base.cpp; sourceTree = "<group>"; };
 		F6DF73571EC9EAE700D8BA0B /* string_storage_base.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_storage_base.hpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@ -374,13 +312,7 @@
 		6753437A1A3F5CF500A0A8C3 /* platform */ = {
 			isa = PBXGroup;
 			children = (
-				3DEE1AE521F7091100054A91 /* battery_tracker.cpp */,
-				3DEE1AE621F7091100054A91 /* battery_tracker.hpp */,
-				333A416E21C3E13B00AF26F6 /* http_session_manager.h */,
-				333A416D21C3E13A00AF26F6 /* http_session_manager.mm */,
-				3D15ACE0214A707800F725D5 /* localization.hpp */,
-				3D15ACDF214A707800F725D5 /* localization.mm */,
-				675343861A3F5D5900A0A8C3 /* apple_location_service.mm */,
+				67633E75232B9EFE00684E04 /* platform_std.cpp */,
 				675343881A3F5D5900A0A8C3 /* chunks_download_strategy.cpp */,
 				675343891A3F5D5900A0A8C3 /* chunks_download_strategy.hpp */,
 				6753438A1A3F5D5900A0A8C3 /* constants.hpp */,
@ -392,69 +324,43 @@
 				56EB1ED91C6B6E6C0022D831 /* file_logging.hpp */,
 				67AB92E81B7B3E9100AB5194 /* get_text_by_id.cpp */,
 				67AB92E91B7B3E9100AB5194 /* get_text_by_id.hpp */,
-				3D78156B1F3A14090068B6AC /* gui_thread_apple.mm */,
-				3D78156C1F3A14090068B6AC /* gui_thread.hpp */,
-				3D30587E1D880910004AC712 /* http_client_apple.mm */,
-				3D97F64A1D9C05E800380945 /* http_client.cpp */,
-				3D30587B1D8320E4004AC712 /* http_client.hpp */,
 				6753438B1A3F5D5900A0A8C3 /* http_request.cpp */,
 				6753438C1A3F5D5900A0A8C3 /* http_request.hpp */,
-				6753438D1A3F5D5900A0A8C3 /* http_thread_apple.h */,
-				6753438E1A3F5D5900A0A8C3 /* http_thread_apple.mm */,
+				333A416E21C3E13B00AF26F6 /* http_session_manager.h */,
+				333A416D21C3E13A00AF26F6 /* http_session_manager.mm */,
 				6753438F1A3F5D5A00A0A8C3 /* http_thread_callback.hpp */,
-				3D318A042021DD8A007B2607 /* http_uploader_apple.mm */,
 				3D318A052021DD8B007B2607 /* http_uploader.hpp */,
-				45D7ADB8210F48E400160DE3 /* http_user_agent_ios.mm */,
 				45D7ADB7210F48E400160DE3 /* http_user_agent.cpp */,
 				45D7ADB9210F48E400160DE3 /* http_user_agent.hpp */,
 				674125041B4C00CC00A3E828 /* local_country_file_utils.cpp */,
 				674125051B4C00CC00A3E828 /* local_country_file_utils.hpp */,
 				674125061B4C00CC00A3E828 /* local_country_file.cpp */,
 				674125071B4C00CC00A3E828 /* local_country_file.hpp */,
-				675343951A3F5D5A00A0A8C3 /* location_service.cpp */,
-				675343961A3F5D5A00A0A8C3 /* location_service.hpp */,
-				675343971A3F5D5A00A0A8C3 /* location.hpp */,
-				34513AF71DCB37C100471BDA /* marketing_service_ios.mm */,
-				34513AF81DCB37C100471BDA /* marketing_service.cpp */,
-				34513AF91DCB37C100471BDA /* marketing_service.hpp */,
+				3D15ACE0214A707800F725D5 /* localization.hpp */,
+				3D15ACDF214A707800F725D5 /* localization.mm */,
 				671C62041AE9014C00076BD0 /* measurement_utils.cpp */,
 				671C62051AE9014C00076BD0 /* measurement_utils.hpp */,
 				56EB1EDA1C6B6E6C0022D831 /* mwm_traits.cpp */,
 				56EB1EDB1C6B6E6C0022D831 /* mwm_traits.hpp */,
 				67AB92DA1B7B3D7300AB5194 /* mwm_version.cpp */,
 				67AB92DB1B7B3D7300AB5194 /* mwm_version.hpp */,
-				EB60B4DD204C175700E4953B /* network_policy_ios.h */,
-				EB60B4DB204C130300E4953B /* network_policy_ios.mm */,
 				3DE8B98E1DEC3115000E6083 /* network_policy.hpp */,
-				675343981A3F5D5A00A0A8C3 /* platform_android.cpp */,
-				344D8A2E204945D000CF532F /* platform_ios.h */,
-				670E8C741BB318AB00094197 /* platform_ios.mm */,
 				6753439A1A3F5D5A00A0A8C3 /* platform_linux.cpp */,
 				6753439B1A3F5D5A00A0A8C3 /* platform_mac.mm */,
-				6753439C1A3F5D5A00A0A8C3 /* platform_qt.cpp */,
 				6753439E1A3F5D5A00A0A8C3 /* platform_unix_impl.cpp */,
 				6753439F1A3F5D5A00A0A8C3 /* platform_unix_impl.hpp */,
 				675343A11A3F5D5A00A0A8C3 /* platform.cpp */,
 				675343A21A3F5D5A00A0A8C3 /* platform.hpp */,
 				675343A31A3F5D5A00A0A8C3 /* preferred_languages.cpp */,
 				675343A41A3F5D5A00A0A8C3 /* preferred_languages.hpp */,
-				4564FA7D2094978D0043CCFB /* remote_file.cpp */,
-				4564FA7C2094978C0043CCFB /* remote_file.hpp */,
-				3D78157C1F3D8A0A0068B6AC /* safe_callback.hpp */,
-				451E329D1F73A8B000964C9F /* secure_storage_ios.mm */,
-				451E329E1F73A8B000964C9F /* secure_storage_qt.cpp */,
 				451E329F1F73A8B000964C9F /* secure_storage.hpp */,
-				675343A61A3F5D5A00A0A8C3 /* servers_list.cpp */,
-				675343A71A3F5D5A00A0A8C3 /* servers_list.hpp */,
 				675343A81A3F5D5A00A0A8C3 /* settings.cpp */,
 				675343A91A3F5D5A00A0A8C3 /* settings.hpp */,
 				34C624BB1DABCCD100510300 /* socket_apple.mm */,
 				34C624BC1DABCCD100510300 /* socket.hpp */,
 				F6DF73561EC9EAE700D8BA0B /* string_storage_base.cpp */,
 				F6DF73571EC9EAE700D8BA0B /* string_storage_base.hpp */,
-				675343AE1A3F5D5A00A0A8C3 /* wifi_info_windows.cpp */,
 				675343AF1A3F5D5A00A0A8C3 /* wifi_info.hpp */,
-				675343B01A3F5D5A00A0A8C3 /* wifi_location_service.cpp */,
 			);
 			name = platform;
 			path = ../../platform;
@ -502,27 +408,17 @@
 			files = (
 				675343B71A3F5D5A00A0A8C3 /* http_request.hpp in Headers */,
 				6741250B1B4C00CC00A3E828 /* country_file.hpp in Headers */,
-				675343B81A3F5D5A00A0A8C3 /* http_thread_apple.h in Headers */,
-				EB60B4DE204C175700E4953B /* network_policy_ios.h in Headers */,
 				56EB1EDF1C6B6E6C0022D831 /* mwm_traits.hpp in Headers */,
-				675343C21A3F5D5A00A0A8C3 /* location.hpp in Headers */,
-				3DEE1AE821F7091100054A91 /* battery_tracker.hpp in Headers */,
 				67AB92EB1B7B3E9100AB5194 /* get_text_by_id.hpp in Headers */,
 				675343D41A3F5D5A00A0A8C3 /* settings.hpp in Headers */,
 				675343B51A3F5D5A00A0A8C3 /* constants.hpp in Headers */,
 				34C624BE1DABCCD100510300 /* socket.hpp in Headers */,
-				675343C11A3F5D5A00A0A8C3 /* location_service.hpp in Headers */,
 				67AB92DD1B7B3D7300AB5194 /* mwm_version.hpp in Headers */,
-				34513AFC1DCB37C100471BDA /* marketing_service.hpp in Headers */,
 				675343CA1A3F5D5A00A0A8C3 /* platform_unix_impl.hpp in Headers */,
-				675343D21A3F5D5A00A0A8C3 /* servers_list.hpp in Headers */,
 				675343BA1A3F5D5A00A0A8C3 /* http_thread_callback.hpp in Headers */,
 				676C84211C64CD3300DC9603 /* mwm_traits.hpp in Headers */,
 				675343B41A3F5D5A00A0A8C3 /* chunks_download_strategy.hpp in Headers */,
 				67247FFE1C60BD6500EDE56A /* writable_dir_changer.hpp in Headers */,
-				3D78157D1F3D8A0A0068B6AC /* safe_callback.hpp in Headers */,
-				4564FA7E2094978D0043CCFB /* remote_file.hpp in Headers */,
-				3D78156F1F3A14090068B6AC /* gui_thread.hpp in Headers */,
 				451E32A21F73A8B000964C9F /* secure_storage.hpp in Headers */,
 				45D7ADBC210F48E500160DE3 /* http_user_agent.hpp in Headers */,
 				674125091B4C00CC00A3E828 /* country_defines.hpp in Headers */,
@ -532,7 +428,6 @@
 				3DE8B98F1DEC3115000E6083 /* network_policy.hpp in Headers */,
 				675E88A11DB7B0F200F8EBDA /* test_socket.hpp in Headers */,
 				675343CF1A3F5D5A00A0A8C3 /* preferred_languages.hpp in Headers */,
-				3D30587D1D8320E4004AC712 /* http_client.hpp in Headers */,
 				56EB1EDD1C6B6E6C0022D831 /* file_logging.hpp in Headers */,
 				333A417021C3E13B00AF26F6 /* http_session_manager.h in Headers */,
 				F6DF735B1EC9EAE700D8BA0B /* string_storage_base.hpp in Headers */,
@ -623,6 +518,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@ -669,49 +565,30 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3DEE1AE721F7091100054A91 /* battery_tracker.cpp in Sources */,
-				675343D11A3F5D5A00A0A8C3 /* servers_list.cpp in Sources */,
+				67633E76232B9EFE00684E04 /* platform_std.cpp in Sources */,
 				675343C91A3F5D5A00A0A8C3 /* platform_unix_impl.cpp in Sources */,
 				67AB92DC1B7B3D7300AB5194 /* mwm_version.cpp in Sources */,
 				67A2526B1BB40E520063F8A8 /* platform_mac.mm in Sources */,
 				3D15ACE1214A707900F725D5 /* localization.mm in Sources */,
 				6741250A1B4C00CC00A3E828 /* country_file.cpp in Sources */,
-				4564FA7F2094978D0043CCFB /* remote_file.cpp in Sources */,
 				674125081B4C00CC00A3E828 /* country_defines.cpp in Sources */,
-				EB60B4DC204C130300E4953B /* network_policy_ios.mm in Sources */,
 				6741250E1B4C00CC00A3E828 /* local_country_file.cpp in Sources */,
-				670E8C761BB318AB00094197 /* platform_ios.mm in Sources */,
 				675E88A01DB7B0F200F8EBDA /* test_socket.cpp in Sources */,
-				67A2526A1BB40E100063F8A8 /* platform_qt.cpp in Sources */,
-				675343D91A3F5D5A00A0A8C3 /* wifi_info_windows.cpp in Sources */,
 				56EB1EDE1C6B6E6C0022D831 /* mwm_traits.cpp in Sources */,
-				3D30587F1D880910004AC712 /* http_client_apple.mm in Sources */,
 				F6DF73581EC9EAE700D8BA0B /* string_storage_base.cpp in Sources */,
-				3D318A062021DD8B007B2607 /* http_uploader_apple.mm in Sources */,
-				3D78156E1F3A14090068B6AC /* gui_thread_apple.mm in Sources */,
 				67247FFD1C60BD6500EDE56A /* writable_dir_changer.cpp in Sources */,
 				45D7ADBA210F48E500160DE3 /* http_user_agent.cpp in Sources */,
-				34513AFB1DCB37C100471BDA /* marketing_service.cpp in Sources */,
 				6741250C1B4C00CC00A3E828 /* local_country_file_utils.cpp in Sources */,
-				3D97F64B1D9C05E800380945 /* http_client.cpp in Sources */,
 				67AB92EA1B7B3E9100AB5194 /* get_text_by_id.cpp in Sources */,
 				34C624BD1DABCCD100510300 /* socket_apple.mm in Sources */,
 				333A416F21C3E13B00AF26F6 /* http_session_manager.mm in Sources */,
-				451E32A11F73A8B000964C9F /* secure_storage_qt.cpp in Sources */,
 				671C62061AE9014C00076BD0 /* measurement_utils.cpp in Sources */,
 				675343B61A3F5D5A00A0A8C3 /* http_request.cpp in Sources */,
 				675343CC1A3F5D5A00A0A8C3 /* platform.cpp in Sources */,
-				451E32A01F73A8B000964C9F /* secure_storage_ios.mm in Sources */,
-				675343DB1A3F5D5A00A0A8C3 /* wifi_location_service.cpp in Sources */,
 				56EB1EDC1C6B6E6C0022D831 /* file_logging.cpp in Sources */,
-				675343B11A3F5D5A00A0A8C3 /* apple_location_service.mm in Sources */,
 				675343B31A3F5D5A00A0A8C3 /* chunks_download_strategy.cpp in Sources */,
-				34513AFA1DCB37C100471BDA /* marketing_service_ios.mm in Sources */,
-				675343C01A3F5D5A00A0A8C3 /* location_service.cpp in Sources */,
-				45D7ADBB210F48E500160DE3 /* http_user_agent_ios.mm in Sources */,
 				675343D31A3F5D5A00A0A8C3 /* settings.cpp in Sources */,
 				675343CE1A3F5D5A00A0A8C3 /* preferred_languages.cpp in Sources */,
-				675343B91A3F5D5A00A0A8C3 /* http_thread_apple.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -884,7 +761,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "platform-Bridging-Header.h";
@ -895,7 +771,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "platform-Bridging-Header.h";
@ -994,7 +869,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
-				GCC_PREFIX_HEADER = "$(GEOCORE_ROOT)/precompiled_headers.hpp";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "platform-Bridging-Header.h";