diff --git a/indexer/search_string_utils.hpp b/indexer/search_string_utils.hpp
index 3462785879..b729e08327 100644
--- a/indexer/search_string_utils.hpp
+++ b/indexer/search_string_utils.hpp
@@ -1,12 +1,10 @@
 #pragma once
 #include "../base/string_utils.hpp"
-#include "../base/base.hpp"
 
 namespace search
 {
 
-using strings::UniChar;
-
+// This function should be used for all search strings normalization.
 inline strings::UniString NormalizeAndSimplifyString(string const & s)
 {
   strings::UniString uniS = strings::MakeLowerCase(strings::MakeUniString(s));
diff --git a/search/approximate_string_match.cpp b/search/approximate_string_match.cpp
index 03921d31c7..693cc4ba92 100644
--- a/search/approximate_string_match.cpp
+++ b/search/approximate_string_match.cpp
@@ -8,6 +8,8 @@
 namespace search
 {
 
+using strings::UniChar;
+
 uint32_t DefaultMatchCost::Cost10(UniChar) const
 {
   return 256;
diff --git a/search/approximate_string_match.hpp b/search/approximate_string_match.hpp
index 493b643ff0..34bfa392c9 100644
--- a/search/approximate_string_match.hpp
+++ b/search/approximate_string_match.hpp
@@ -36,13 +36,13 @@ void PushMatchCost(PriorityQueyeT & q, uint32_t maxCost, uint32_t a, uint32_t b,
 class DefaultMatchCost
 {
 public:
-  uint32_t Cost10(UniChar a) const;
-  uint32_t Cost01(UniChar b) const;
-  uint32_t Cost11(UniChar a, UniChar b) const;
-  uint32_t Cost12(UniChar a, UniChar const * pB) const;
-  uint32_t Cost21(UniChar const * pA, UniChar b) const;
-  uint32_t Cost22(UniChar const * pA, UniChar const * pB) const;
-  uint32_t SwapCost(UniChar a1, UniChar a2) const;
+  uint32_t Cost10(strings::UniChar a) const;
+  uint32_t Cost01(strings::UniChar b) const;
+  uint32_t Cost11(strings::UniChar a, strings::UniChar b) const;
+  uint32_t Cost12(strings::UniChar a, strings::UniChar const * pB) const;
+  uint32_t Cost21(strings::UniChar const * pA, strings::UniChar b) const;
+  uint32_t Cost22(strings::UniChar const * pA, strings::UniChar const * pB) const;
+  uint32_t SwapCost(strings::UniChar a1, strings::UniChar a2) const;
 };
 
 template <typename CharT, typename CostF>