diff --git a/3party/opening_hours/opening_hours_integration_tests/opening_hours_integration_tests.cpp b/3party/opening_hours/opening_hours_integration_tests/opening_hours_integration_tests.cpp
index fb1ae4eaf5..8ba656f697 100644
--- a/3party/opening_hours/opening_hours_integration_tests/opening_hours_integration_tests.cpp
+++ b/3party/opening_hours/opening_hours_integration_tests/opening_hours_integration_tests.cpp
@@ -4,6 +4,7 @@
 #define BOOST_TEST_MODULE OpeningHoursIntegration
 
 #include <algorithm>
+#include <array>
 #include <ctime>
 #include <map>
 
@@ -90,7 +91,7 @@ using TRuleFeatures = std::array<bool, Count_>;
 
 std::ostream & operator<<(std::ostream & ost, TRuleFeatures const & f)
 {
- std::copy(begin(f), end(f), std::ostream_iterator<bool>(ost, "\t"));
+ std::copy(std::begin(f), std::end(f), std::ostream_iterator<bool>(ost, "\t"));
  return ost;
 }
 
diff --git a/generator/booking_quality_check/CMakeLists.txt b/generator/booking_quality_check/CMakeLists.txt
index 97ee984590..be304abcf0 100644
--- a/generator/booking_quality_check/CMakeLists.txt
+++ b/generator/booking_quality_check/CMakeLists.txt
@@ -19,8 +19,8 @@ omim_link_libraries(
   routing
   routing_common
   indexer
-  geometry
   editor
+  geometry
   platform
   coding
   base
diff --git a/generator/feature_segments_checker/CMakeLists.txt b/generator/feature_segments_checker/CMakeLists.txt
index 53f9f931e6..811f2ae958 100644
--- a/generator/feature_segments_checker/CMakeLists.txt
+++ b/generator/feature_segments_checker/CMakeLists.txt
@@ -16,13 +16,13 @@ omim_link_libraries(
   ${PROJECT_NAME}
   generator
   map
-  editor
   routing
   traffic
   routing_common
-  storage
   ugc
   indexer
+  editor
+  storage
   platform
   geometry
   coding
diff --git a/generator/restaurants_info/CMakeLists.txt b/generator/restaurants_info/CMakeLists.txt
index e91f43dd8a..961c316421 100644
--- a/generator/restaurants_info/CMakeLists.txt
+++ b/generator/restaurants_info/CMakeLists.txt
@@ -19,8 +19,8 @@ omim_link_libraries(
   routing
   routing_common
   indexer
-  geometry
   editor
+  geometry
   platform
   coding
   base
diff --git a/generator/srtm_coverage_checker/CMakeLists.txt b/generator/srtm_coverage_checker/CMakeLists.txt
index 09ffec1861..5427912aab 100644
--- a/generator/srtm_coverage_checker/CMakeLists.txt
+++ b/generator/srtm_coverage_checker/CMakeLists.txt
@@ -16,7 +16,6 @@ omim_link_libraries(
   ${PROJECT_NAME}
   generator
   map
-  editor
   routing
   routing_common
   search
@@ -24,8 +23,8 @@ omim_link_libraries(
   ugc
   traffic
   indexer
-  platform
   editor
+  platform
   geometry
   coding
   base
diff --git a/generator/srtm_coverage_checker/srtm_coverage_checker.cpp b/generator/srtm_coverage_checker/srtm_coverage_checker.cpp
index 70054c0c27..c7a71c238b 100644
--- a/generator/srtm_coverage_checker/srtm_coverage_checker.cpp
+++ b/generator/srtm_coverage_checker/srtm_coverage_checker.cpp
@@ -15,6 +15,8 @@
 
 #include <algorithm>
 
+#include <sys/resource.h>
+
 #include "3party/gflags/src/gflags/gflags.h"
 
 DEFINE_string(srtm_path, "", "Path to directory with SRTM files");
diff --git a/map/CMakeLists.txt b/map/CMakeLists.txt
index 18e8a986ce..76fb692f23 100644
--- a/map/CMakeLists.txt
+++ b/map/CMakeLists.txt
@@ -85,4 +85,6 @@ omim_add_test_subdirectory(map_tests)
 omim_add_test_subdirectory(mwm_tests)
 omim_add_test_subdirectory(style_tests)
 
-add_subdirectory(benchmark_tool)
+if (PLATFORM_DESKTOP)
+  add_subdirectory(benchmark_tool)
+endif()
diff --git a/map/benchmark_tool/CMakeLists.txt b/map/benchmark_tool/CMakeLists.txt
index 2c591292c0..223bf562cb 100644
--- a/map/benchmark_tool/CMakeLists.txt
+++ b/map/benchmark_tool/CMakeLists.txt
@@ -20,22 +20,21 @@ omim_link_libraries(
   map
   ugc
   indexer
-  platform
   editor
   geometry
+  platform
   coding
   base
-  opening_hours
-  gflags
-  jansson
-  protobuf
-  succinct
-  pugixml
-  oauthcpp
-  gflags
-  stats_client
-  icu
   agg
+  gflags
+  icu
+  jansson
+  oauthcpp
+  opening_hours
+  protobuf
+  pugixml
+  stats_client
+  succinct
   ${LIBZ}
 )