diff --git a/indexer/indexer.pro b/indexer/indexer.pro
index b004421c32..68539f6737 100644
--- a/indexer/indexer.pro
+++ b/indexer/indexer.pro
@@ -44,6 +44,7 @@ SOURCES += \
     old/feature_loader_101.cpp \
     point_to_int64.cpp \
     rank_table.cpp \
+    reverse_geocoder.cpp \
     scales.cpp \
     search_delimiters.cpp \
     search_index_builder.cpp \
@@ -95,6 +96,7 @@ HEADERS += \
     old/interval_index_101.hpp \
     point_to_int64.hpp \
     rank_table.hpp \
+    reverse_geocoder.hpp \
     scale_index.hpp \
     scale_index_builder.hpp \
     scales.hpp \
diff --git a/indexer/indexer_tests/trie_test.cpp b/indexer/indexer_tests/trie_test.cpp
index 522016da9c..ca3555648f 100644
--- a/indexer/indexer_tests/trie_test.cpp
+++ b/indexer/indexer_tests/trie_test.cpp
@@ -13,6 +13,7 @@
 #include "std/algorithm.hpp"
 #include "std/cstring.hpp"
 #include "std/string.hpp"
+#include "std/type_traits.hpp"
 #include "std/utility.hpp"
 #include "std/vector.hpp"
 
@@ -44,7 +45,9 @@ template <typename TPrimitive>
 class SingleValueSerializer
 {
 public:
+#if !defined(OMIM_OS_LINUX)
   static_assert(is_trivially_copyable<TPrimitive>::value, "");
+#endif
 
   template <typename TWriter>
   void Serialize(TWriter & writer, TPrimitive const & v) const
@@ -60,7 +63,9 @@ public:
   using TValue = TPrimitive;
   using TSerializer = SingleValueSerializer<TValue>;
 
+#if !defined(OMIM_OS_LINUX)
   static_assert(is_trivially_copyable<TPrimitive>::value, "");
+#endif
 
   ValueList() = default;
 
diff --git a/search/reverse_geocoder.cpp b/indexer/reverse_geocoder.cpp
similarity index 100%
rename from search/reverse_geocoder.cpp
rename to indexer/reverse_geocoder.cpp
diff --git a/search/reverse_geocoder.hpp b/indexer/reverse_geocoder.hpp
similarity index 100%
rename from search/reverse_geocoder.hpp
rename to indexer/reverse_geocoder.hpp
diff --git a/indexer/search_index_builder.cpp b/indexer/search_index_builder.cpp
index d97f70c089..caceb7e50b 100644
--- a/indexer/search_index_builder.cpp
+++ b/indexer/search_index_builder.cpp
@@ -1,7 +1,5 @@
 #include "indexer/search_index_builder.hpp"
 
-#include "search/reverse_geocoder.hpp"
-
 #include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/feature_algo.hpp"
@@ -9,6 +7,7 @@
 #include "indexer/feature_visibility.hpp"
 #include "indexer/features_vector.hpp"
 #include "indexer/index.hpp"
+#include "indexer/reverse_geocoder.hpp"
 #include "indexer/search_delimiters.hpp"
 #include "indexer/search_index_values.hpp"
 #include "indexer/search_string_utils.hpp"
diff --git a/mapshot/mapshot.pro b/mapshot/mapshot.pro
index 31cd6c05aa..8f7a2bd741 100644
--- a/mapshot/mapshot.pro
+++ b/mapshot/mapshot.pro
@@ -14,7 +14,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 # needed for Platform::WorkingDir() and unicode combining
-QT *= core network
+QT *= core network opengl
 
 macx-* {
   LIBS *= "-framework IOKit" "-framework SystemConfiguration"
diff --git a/search/search.pro b/search/search.pro
index a89163548e..8f78c4ec8b 100644
--- a/search/search.pro
+++ b/search/search.pro
@@ -28,7 +28,6 @@ HEADERS += \
     region.hpp \
     result.hpp \
     retrieval.hpp \
-    reverse_geocoder.hpp \
     search_common.hpp \
     search_engine.hpp \
     search_query.hpp \
@@ -59,7 +58,6 @@ SOURCES += \
     region.cpp \
     result.cpp \
     retrieval.cpp \
-    reverse_geocoder.cpp \
     search_engine.cpp \
     search_query.cpp \
     search_query_params.cpp \