diff --git a/generator/booking_dataset.hpp b/generator/booking_dataset.hpp
index e1257e8e82..2542fc4c63 100644
--- a/generator/booking_dataset.hpp
+++ b/generator/booking_dataset.hpp
@@ -61,7 +61,7 @@ struct BookingHotel
   std::string m_translations;
 };
 
-ostream & operator<<(ostream & s, BookingHotel const & h);
+std::ostream & operator<<(std::ostream & s, BookingHotel const & h);
 
 NEWTYPE_SIMPLE_OUTPUT(BookingHotel::ObjectId);
 using BookingDataset = SponsoredDataset<BookingHotel>;
diff --git a/generator/opentable_dataset.hpp b/generator/opentable_dataset.hpp
index 7fec7aa516..be14df6348 100644
--- a/generator/opentable_dataset.hpp
+++ b/generator/opentable_dataset.hpp
@@ -53,7 +53,7 @@ struct OpentableRestaurant
   // string m_translations;
 };
 
-ostream & operator<<(ostream & s, OpentableRestaurant const & r);
+std::ostream & operator<<(std::ostream & s, OpentableRestaurant const & r);
 
 NEWTYPE_SIMPLE_OUTPUT(OpentableRestaurant::ObjectId);
 using OpentableDataset = SponsoredDataset<OpentableRestaurant>;
diff --git a/generator/routing_index_generator.cpp b/generator/routing_index_generator.cpp
index f1d1680d3e..fe49d376ba 100644
--- a/generator/routing_index_generator.cpp
+++ b/generator/routing_index_generator.cpp
@@ -36,6 +36,7 @@
 #include "base/checked_cast.hpp"
 #include "base/logging.hpp"
 #include "base/osm_id.hpp"
+#include "base/timer.hpp"
 
 #include <algorithm>
 #include <cstdint>
diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index 49ba919a59..f91b9262a9 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -1,14 +1,13 @@
 #include "indexer/classificator.hpp"
 #include "indexer/feature.hpp"
 
+#include "indexer/editable_map_object.hpp"
 #include "indexer/feature_algo.hpp"
 #include "indexer/feature_impl.hpp"
 #include "indexer/feature_loader_base.hpp"
 #include "indexer/feature_utils.hpp"
 #include "indexer/feature_visibility.hpp"
 
-#include "editor/osm_editor.hpp"
-
 #include "platform/preferred_languages.hpp"
 
 #include "geometry/distance.hpp"
diff --git a/indexer/feature.hpp b/indexer/feature.hpp
index c69e0762ef..ccecb48906 100644
--- a/indexer/feature.hpp
+++ b/indexer/feature.hpp
@@ -8,8 +8,6 @@
 
 #include "base/buffer_vector.hpp"
 
-#include "editor/xml_feature.hpp"
-
 #include "std/iterator.hpp"
 #include "std/string.hpp"
 #include "std/utility.hpp"
diff --git a/indexer/feature_covering.hpp b/indexer/feature_covering.hpp
index befc31c5a0..48a27487ff 100644
--- a/indexer/feature_covering.hpp
+++ b/indexer/feature_covering.hpp
@@ -107,6 +107,8 @@ class CoveringGetter
 public:
   CoveringGetter(m2::RectD const & r, CoveringMode mode) : m_rect(r), m_mode(mode) {}
 
+  inline m2::RectD const & GetRect() const { return m_rect; }
+
   template <int DEPTH_LEVELS>
   Intervals const & Get(int scale)
   {
diff --git a/map/traffic_manager.hpp b/map/traffic_manager.hpp
index 47eb5ba91a..d27479b18d 100644
--- a/map/traffic_manager.hpp
+++ b/map/traffic_manager.hpp
@@ -161,7 +161,7 @@ private:
   map<MwmSet::MwmId, CacheEntry> m_mwmCache;
 
   bool m_isRunning;
-  condition_variable m_condition;
+  std::condition_variable m_condition;
 
   vector<MwmSet::MwmId> m_lastDrapeMwmsByRect;
   set<MwmSet::MwmId> m_activeDrapeMwms;