diff --git a/map/framework.hpp b/map/framework.hpp
index 343f23972a..1a43dfbe21 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -833,7 +833,7 @@ public:
   storage::TCountriesVec GetTopmostCountries(ms::LatLon const & latlon) const;
 
 private:
-  std::unique_ptr<search::CityFinder> m_cityFinder;
+  unique_ptr<search::CityFinder> m_cityFinder;
   unique_ptr<ads::Engine> m_adsEngine;
   // The order matters here: storage::CountryInfoGetter and
   // search::CityFinder must be initialized before
diff --git a/map/taxi_delegate.cpp b/map/taxi_delegate.cpp
index 2e9ea9a978..a72f07aea2 100644
--- a/map/taxi_delegate.cpp
+++ b/map/taxi_delegate.cpp
@@ -1,6 +1,6 @@
 #include "map/taxi_delegate.hpp"
 
-#include "map/city_finder.hpp"
+#include "search/city_finder.hpp"
 
 #include "storage/country_info_getter.hpp"
 #include "storage/index.hpp"
@@ -11,7 +11,7 @@
 #include "geometry/mercator.hpp"
 
 TaxiDelegate::TaxiDelegate(storage::Storage const & st, storage::CountryInfoGetter const & ig,
-                           CityFinder & cf)
+                           search::CityFinder & cf)
   : m_storage(st), m_infoGetter(ig), m_cityFinder(cf)
 {
 }
diff --git a/map/taxi_delegate.hpp b/map/taxi_delegate.hpp
index 8b2c08f456..bf1a27313c 100644
--- a/map/taxi_delegate.hpp
+++ b/map/taxi_delegate.hpp
@@ -8,12 +8,15 @@ class Storage;
 class CountryInfoGetter;
 }
 
+namespace search
+{
 class CityFinder;
+}
 
 class TaxiDelegate : public taxi::Delegate
 {
 public:
-  TaxiDelegate(storage::Storage const & st, storage::CountryInfoGetter const & ig, CityFinder & cf);
+  TaxiDelegate(storage::Storage const & st, storage::CountryInfoGetter const & ig, search::CityFinder & cf);
 
   storage::TCountriesVec GetCountryIds(ms::LatLon const & latlon) override;
   std::string GetCityName(ms::LatLon const & latlon) override;
@@ -21,5 +24,5 @@ public:
 private:
   storage::Storage const & m_storage;
   storage::CountryInfoGetter const & m_infoGetter;
-  CityFinder & m_cityFinder;
+  search::CityFinder & m_cityFinder;
 };