Moved CategoriesHolder from search into indexer library. Need to access it from Editor.

37 files changed, 59 insertions, 58 deletions

diff --git a/generator/dumper.cpp b/generator/dumper.cpp
index 8357a3d05f..88a1960345 100644
--- a/generator/dumper.cpp
+++ b/generator/dumper.cpp
@@ -1,13 +1,13 @@
 #include "generator/dumper.hpp"
 
-#include "search/search_delimiters.hpp"
 #include "search/search_index_values.hpp"
-#include "search/search_string_utils.hpp"
 #include "search/search_trie.hpp"
 
 #include "indexer/classificator.hpp"
 #include "indexer/feature_processor.hpp"
 #include "indexer/trie_reader.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "coding/multilang_utf8_string.hpp"
 
diff --git a/generator/search_index_builder.cpp b/generator/search_index_builder.cpp
index 37bb7828e7..c49aff6a8a 100644
--- a/generator/search_index_builder.cpp
+++ b/generator/search_index_builder.cpp
@@ -1,12 +1,10 @@
 #include "search_index_builder.hpp"
 
-#include "search/categories_holder.hpp"
 #include "search/reverse_geocoder.hpp"
-#include "search/search_delimiters.hpp"
 #include "search/search_index_values.hpp"
-#include "search/search_string_utils.hpp"
 #include "search/search_trie.hpp"
 
+#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/feature_algo.hpp"
 #include "indexer/feature_utils.hpp"
@@ -14,6 +12,8 @@
 #include "indexer/features_vector.hpp"
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/index.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 #include "indexer/trie_builder.hpp"
 #include "indexer/types_skipper.hpp"
 
diff --git a/search/categories_holder.cpp b/indexer/categories_holder.cpp
index 06ad1e5e58..51ffd6de4f 100644
--- a/search/categories_holder.cpp
+++ b/indexer/categories_holder.cpp
@@ -1,9 +1,7 @@
-#include "categories_holder.hpp"
-
-#include "search_delimiters.hpp"
-#include "search_string_utils.hpp"
-
+#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "coding/reader.hpp"
 #include "coding/reader_streambuf.hpp"
diff --git a/search/categories_holder.hpp b/indexer/categories_holder.hpp
index b6717020ad..b6717020ad 100644
--- a/search/categories_holder.hpp
+++ b/indexer/categories_holder.hpp
diff --git a/indexer/indexer.pro b/indexer/indexer.pro
index 8036093582..ab1f530271 100644
--- a/indexer/indexer.pro
+++ b/indexer/indexer.pro
@@ -10,6 +10,7 @@ ROOT_DIR = ..
 include($$ROOT_DIR/common.pri)
 
 SOURCES += \
+    categories_holder.cpp \
     classificator.cpp \
     classificator_loader.cpp \
     coding_params.cpp \
@@ -46,10 +47,13 @@ SOURCES += \
     point_to_int64.cpp \
     rank_table.cpp \
     scales.cpp \
+    search_delimiters.cpp \    # it's in indexer because of CategoriesHolder dependency.
+    search_string_utils.cpp \  # it's in indexer because of CategoriesHolder dependency.
     types_mapping.cpp \
     types_skipper.cpp \
 
 HEADERS += \
+    categories_holder.hpp \
     cell_coverer.hpp \
     cell_id.hpp \
     classificator.hpp \
@@ -96,6 +100,8 @@ HEADERS += \
     scale_index.hpp \
     scale_index_builder.hpp \
     scales.hpp \
+    search_delimiters.hpp \      # it's in indexer because of CategoriesHolder dependency.
+    search_string_utils.hpp \    # it's in indexer because of CategoriesHolder dependency.
     succinct_trie_builder.hpp \
     succinct_trie_reader.hpp \
     tesselator_decl.hpp \
diff --git a/search/search_tests/categories_test.cpp b/indexer/indexer_tests/categories_test.cpp
index cbb9c43114..77d36a9153 100644
--- a/search/search_tests/categories_test.cpp
+++ b/indexer/indexer_tests/categories_test.cpp
@@ -1,7 +1,6 @@
 #include "testing/testing.hpp"
 
-#include "search/categories_holder.hpp"
-
+#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/classificator_loader.hpp"
 
diff --git a/indexer/indexer_tests/indexer_tests.pro b/indexer/indexer_tests/indexer_tests.pro
index e00bbcafcc..78a9ae5e11 100644
--- a/indexer/indexer_tests/indexer_tests.pro
+++ b/indexer/indexer_tests/indexer_tests.pro
@@ -17,6 +17,7 @@ HEADERS += \
 
 SOURCES += \
     ../../testing/testingmain.cpp \
+    categories_test.cpp \
     cell_coverer_test.cpp \
     cell_id_test.cpp \
     checker_test.cpp \
@@ -33,6 +34,7 @@ SOURCES += \
     point_to_int64_test.cpp \
     rank_table_test.cpp \
     scales_test.cpp \
+    search_string_utils_test.cpp \
     sort_and_merge_intervals_test.cpp \
     succinct_trie_test.cpp \
     test_polylines.cpp \
diff --git a/search/search_tests/search_string_utils_test.cpp b/indexer/indexer_tests/search_string_utils_test.cpp
index ecac3eeecf..21a4f0c0ac 100644
--- a/search/search_tests/search_string_utils_test.cpp
+++ b/indexer/indexer_tests/search_string_utils_test.cpp
@@ -1,6 +1,6 @@
 #include "testing/testing.hpp"
 
-#include "search/search_string_utils.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "base/string_utils.hpp"
 
diff --git a/search/search_delimiters.cpp b/indexer/search_delimiters.cpp
index 237942dc5b..237942dc5b 100644
--- a/search/search_delimiters.cpp
+++ b/indexer/search_delimiters.cpp
diff --git a/search/search_delimiters.hpp b/indexer/search_delimiters.hpp
index 3d7bf1ee0e..3d7bf1ee0e 100644
--- a/search/search_delimiters.hpp
+++ b/indexer/search_delimiters.hpp
diff --git a/search/search_string_utils.cpp b/indexer/search_string_utils.cpp
index f955c1fb79..f955c1fb79 100644
--- a/search/search_string_utils.cpp
+++ b/indexer/search_string_utils.cpp
diff --git a/search/search_string_utils.hpp b/indexer/search_string_utils.hpp
index a79851a92f..a79851a92f 100644
--- a/search/search_string_utils.hpp
+++ b/indexer/search_string_utils.hpp
diff --git a/map/address_finder.cpp b/map/address_finder.cpp
index 99189b8eb9..681ba372b3 100644
--- a/map/address_finder.cpp
+++ b/map/address_finder.cpp
@@ -1,11 +1,11 @@
 #include "map/framework.hpp"
 
-#include "search/categories_holder.hpp"
 #include "search/result.hpp"
 #include "search/reverse_geocoder.hpp"
 
 #include "drape_frontend/visual_params.hpp"
 
+#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/feature_algo.hpp"
 #include "indexer/feature_visibility.hpp"
diff --git a/map/framework.cpp b/map/framework.cpp
index f145b55b2a..930af0c2e5 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -13,7 +13,6 @@
 #include "routing/route.hpp"
 #include "routing/routing_algorithm.hpp"
 
-#include "search/categories_holder.hpp"
 #include "search/geometry_utils.hpp"
 #include "search/intermediate_result.hpp"
 #include "search/result.hpp"
@@ -29,6 +28,7 @@
 #include "drape_frontend/watch/cpu_drawer.hpp"
 #include "drape_frontend/watch/feature_processor.hpp"
 
+#include "indexer/categories_holder.hpp"
 #include "indexer/classificator_loader.hpp"
 #include "indexer/drawing_rules.hpp"
 #include "indexer/feature.hpp"
diff --git a/map/map_tests/address_tests.cpp b/map/map_tests/address_tests.cpp
index 691c64d366..7160fecff1 100644
--- a/map/map_tests/address_tests.cpp
+++ b/map/map_tests/address_tests.cpp
@@ -1,10 +1,10 @@
 #include "testing/testing.hpp"
 
 #include "search/reverse_geocoder.hpp"
-#include "search/search_string_utils.hpp"
 
 #include "indexer/classificator_loader.hpp"
 #include "indexer/index.hpp"
+#include "indexer/search_string_utils.hpp"
 
 
 using namespace search;
diff --git a/search/approximate_string_match.hpp b/search/approximate_string_match.hpp
index d597dbf8b9..840566adb9 100644
--- a/search/approximate_string_match.hpp
+++ b/search/approximate_string_match.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "search_string_utils.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "base/base.hpp"
 #include "base/buffer_vector.hpp"
diff --git a/search/house_detector.cpp b/search/house_detector.cpp
index 46f859d747..49072ee010 100644
--- a/search/house_detector.cpp
+++ b/search/house_detector.cpp
@@ -2,10 +2,10 @@
 
 #include "search/algos.hpp"
 #include "search/search_common.hpp"
-#include "search/search_string_utils.hpp"
 
 #include "indexer/classificator.hpp"
 #include "indexer/feature_impl.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "geometry/angles.hpp"
 #include "geometry/distance.hpp"
diff --git a/search/intermediate_result.cpp b/search/intermediate_result.cpp
index 04a8cf4804..5e22f6010b 100644
--- a/search/intermediate_result.cpp
+++ b/search/intermediate_result.cpp
@@ -1,12 +1,12 @@
-#include "categories_holder.hpp"
 #include "intermediate_result.hpp"
 #include "geometry_utils.hpp"
 
 #include "storage/country_info_getter.hpp"
 
-#include "indexer/ftypes_matcher.hpp"
+#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/feature.hpp"
+#include "indexer/ftypes_matcher.hpp"
 #include "indexer/scales.hpp"
 
 #include "geometry/angles.hpp"
diff --git a/search/keyword_lang_matcher.cpp b/search/keyword_lang_matcher.cpp
index d19fb543c8..2742e9f035 100644
--- a/search/keyword_lang_matcher.cpp
+++ b/search/keyword_lang_matcher.cpp
@@ -1,7 +1,7 @@
 #include "keyword_lang_matcher.hpp"
 
-#include "search_delimiters.hpp"
-#include "search_string_utils.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "base/stl_add.hpp"
 
diff --git a/search/keyword_matcher.cpp b/search/keyword_matcher.cpp
index 1fe10ea6ca..107f99befb 100644
--- a/search/keyword_matcher.cpp
+++ b/search/keyword_matcher.cpp
@@ -1,7 +1,7 @@
 #include "keyword_matcher.hpp"
 
-#include "search_delimiters.hpp"
-#include "search_string_utils.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "base/stl_add.hpp"
 
diff --git a/search/locality.cpp b/search/locality.cpp
index 7351d3c528..2b9a12df66 100644
--- a/search/locality.cpp
+++ b/search/locality.cpp
@@ -1,7 +1,7 @@
 #include "locality.hpp"
 
-#include "search_delimiters.hpp"
-#include "search_string_utils.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "base/assert.hpp"
 
diff --git a/search/retrieval.cpp b/search/retrieval.cpp
index d174dc53f7..706de67f2e 100644
--- a/search/retrieval.cpp
+++ b/search/retrieval.cpp
@@ -4,7 +4,6 @@
 #include "feature_offset_match.hpp"
 #include "interval_set.hpp"
 #include "search_index_values.hpp"
-#include "search_string_utils.hpp"
 #include "search_trie.hpp"
 
 #include "indexer/feature.hpp"
@@ -12,6 +11,7 @@
 #include "indexer/index.hpp"
 #include "indexer/osm_editor.hpp"
 #include "indexer/scales.hpp"
+#include "indexer/search_string_utils.hpp"
 #include "indexer/trie_reader.hpp"
 
 #include "platform/mwm_traits.hpp"
diff --git a/search/reverse_geocoder.cpp b/search/reverse_geocoder.cpp
index ed9a13e6a7..5f2666f596 100644
--- a/search/reverse_geocoder.cpp
+++ b/search/reverse_geocoder.cpp
@@ -1,5 +1,4 @@
 #include "reverse_geocoder.hpp"
-#include "search_string_utils.hpp"
 
 #include "search/v2/mwm_context.hpp"
 
@@ -8,6 +7,7 @@
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/index.hpp"
 #include "indexer/scales.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "base/stl_helpers.hpp"
 
diff --git a/search/search.pro b/search/search.pro
index ee5438acab..8d45f03d1a 100644
--- a/search/search.pro
+++ b/search/search.pro
@@ -12,7 +12,6 @@ HEADERS += \
     algos.hpp \
     approximate_string_match.hpp \
     cancel_exception.hpp \
-    categories_holder.hpp \
     dummy_rank_table.hpp \
     feature_offset_match.hpp \
     geometry_utils.hpp \
@@ -34,14 +33,12 @@ HEADERS += \
     retrieval.hpp \
     reverse_geocoder.hpp \
     search_common.hpp \
-    search_delimiters.hpp \
     search_engine.hpp \
     search_index_values.hpp \
     search_query.hpp \
     search_query_factory.hpp \
     search_query_params.hpp \
     search_string_intersection.hpp \
-    search_string_utils.hpp \
     search_trie.hpp \
     suggest.hpp \
     v2/cbv_ptr.hpp \
@@ -63,7 +60,6 @@ HEADERS += \
 
 SOURCES += \
     approximate_string_match.cpp \
-    categories_holder.cpp \
     dummy_rank_table.cpp \
     geometry_utils.cpp \
     house_detector.cpp \
@@ -81,11 +77,9 @@ SOURCES += \
     result.cpp \
     retrieval.cpp \
     reverse_geocoder.cpp \
-    search_delimiters.cpp \
     search_engine.cpp \
     search_query.cpp \
     search_query_params.cpp \
-    search_string_utils.cpp \
     v2/cbv_ptr.cpp \
     v2/features_filter.cpp \
     v2/features_layer.cpp \
diff --git a/search/search_engine.cpp b/search/search_engine.cpp
index 3fb71c0ae3..0a243a544b 100644
--- a/search/search_engine.cpp
+++ b/search/search_engine.cpp
@@ -1,14 +1,14 @@
 #include "search_engine.hpp"
 
-#include "categories_holder.hpp"
 #include "geometry_utils.hpp"
 #include "search_query.hpp"
-#include "search_string_utils.hpp"
 
 #include "storage/country_info_getter.hpp"
 
+#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/scales.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "platform/platform.hpp"
 
diff --git a/search/search_engine.hpp b/search/search_engine.hpp
index 502de88f14..26e2c6c413 100644
--- a/search/search_engine.hpp
+++ b/search/search_engine.hpp
@@ -1,11 +1,12 @@
 #pragma once
 
-#include "categories_holder.hpp"
 #include "params.hpp"
 #include "result.hpp"
 #include "search_query_factory.hpp"
 #include "suggest.hpp"
 
+#include "indexer/categories_holder.hpp"
+
 #include "geometry/rect2d.hpp"
 
 #include "coding/reader.hpp"
diff --git a/search/search_integration_tests/retrieval_test.cpp b/search/search_integration_tests/retrieval_test.cpp
index 719615941e..a302779dbe 100644
--- a/search/search_integration_tests/retrieval_test.cpp
+++ b/search/search_integration_tests/retrieval_test.cpp
@@ -1,9 +1,7 @@
 #include "testing/testing.hpp"
 
 #include "search/retrieval.hpp"
-#include "search/search_delimiters.hpp"
 #include "search/search_query_params.hpp"
-#include "search/search_string_utils.hpp"
 #include "search/search_tests_support/test_feature.hpp"
 #include "search/search_tests_support/test_mwm_builder.hpp"
 #include "search/search_tests_support/test_results_matching.hpp"
@@ -14,6 +12,8 @@
 #include "indexer/index.hpp"
 #include "indexer/mwm_set.hpp"
 #include "indexer/scales.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "storage/country_decl.hpp"
 #include "storage/country_info_getter.hpp"
diff --git a/search/search_query.cpp b/search/search_query.cpp
index 1f43cfb857..ccd5f7bdbe 100644
--- a/search/search_query.cpp
+++ b/search/search_query.cpp
@@ -1,6 +1,5 @@
 #include "search_query.hpp"
 
-#include "search/categories_holder.hpp"
 #include "search/dummy_rank_table.hpp"
 #include "search/feature_offset_match.hpp"
 #include "search/geometry_utils.hpp"
@@ -9,14 +8,13 @@
 #include "search/locality.hpp"
 #include "search/region.hpp"
 #include "search/search_common.hpp"
-#include "search/search_delimiters.hpp"
 #include "search/search_index_values.hpp"
 #include "search/search_query_params.hpp"
 #include "search/search_string_intersection.hpp"
-#include "search/search_string_utils.hpp"
 
 #include "storage/country_info_getter.hpp"
 
+#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/feature.hpp"
 #include "indexer/feature_algo.hpp"
@@ -25,6 +23,8 @@
 #include "indexer/features_vector.hpp"
 #include "indexer/index.hpp"
 #include "indexer/scales.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 #include "indexer/trie_reader.hpp"
 
 #include "platform/mwm_traits.hpp"
diff --git a/search/search_string_intersection.hpp b/search/search_string_intersection.hpp
index 4535541069..377e8e35d2 100644
--- a/search/search_string_intersection.hpp
+++ b/search/search_string_intersection.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "search_delimiters.hpp"
+#include "indexer/search_delimiters.hpp"
 
 
 namespace search
diff --git a/search/search_tests/house_detector_tests.cpp b/search/search_tests/house_detector_tests.cpp
index d18ec10aa4..38677ec996 100644
--- a/search/search_tests/house_detector_tests.cpp
+++ b/search/search_tests/house_detector_tests.cpp
@@ -1,18 +1,17 @@
 #include "testing/testing.hpp"
 
 #include "search/house_detector.hpp"
-#include "search/search_string_utils.hpp"
 
 #include "indexer/classificator_loader.hpp"
 #include "indexer/data_header.hpp"
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/index.hpp"
 #include "indexer/scales.hpp"
-
-#include "platform/platform.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "platform/local_country_file.hpp"
 #include "platform/local_country_file_utils.hpp"
+#include "platform/platform.hpp"
 
 #include "geometry/distance_on_sphere.hpp"
 
diff --git a/search/search_tests/keyword_lang_matcher_test.cpp b/search/search_tests/keyword_lang_matcher_test.cpp
index 052008d113..709e19190b 100644
--- a/search/search_tests/keyword_lang_matcher_test.cpp
+++ b/search/search_tests/keyword_lang_matcher_test.cpp
@@ -1,8 +1,9 @@
 #include "testing/testing.hpp"
 
 #include "search/keyword_lang_matcher.hpp"
-#include "search/search_delimiters.hpp"
-#include "search/search_string_utils.hpp"
+
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "base/stl_add.hpp"
 
diff --git a/search/search_tests/keyword_matcher_test.cpp b/search/search_tests/keyword_matcher_test.cpp
index 20da662447..c24061b08c 100644
--- a/search/search_tests/keyword_matcher_test.cpp
+++ b/search/search_tests/keyword_matcher_test.cpp
@@ -2,8 +2,9 @@
 
 #include "search/keyword_matcher.hpp"
 #include "search/search_common.hpp"
-#include "search/search_delimiters.hpp"
-#include "search/search_string_utils.hpp"
+
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "base/buffer_vector.hpp"
 #include "base/stl_add.hpp"
diff --git a/search/search_tests/locality_scorer_test.cpp b/search/search_tests/locality_scorer_test.cpp
index 93f1f5f346..537f3df82b 100644
--- a/search/search_tests/locality_scorer_test.cpp
+++ b/search/search_tests/locality_scorer_test.cpp
@@ -1,10 +1,11 @@
 #include "testing/testing.hpp"
 
 #include "search/dummy_rank_table.hpp"
-#include "search/search_delimiters.hpp"
-#include "search/search_string_utils.hpp"
 #include "search/v2/locality_scorer.hpp"
 
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
+
 #include "base/assert.hpp"
 #include "base/stl_add.hpp"
 #include "base/stl_helpers.hpp"
diff --git a/search/search_tests/search_tests.pro b/search/search_tests/search_tests.pro
index 69c898770a..0ed91bb1ad 100644
--- a/search/search_tests/search_tests.pro
+++ b/search/search_tests/search_tests.pro
@@ -17,7 +17,6 @@ macx-*: LIBS *= "-framework IOKit"
 SOURCES += \
     ../../testing/testingmain.cpp \
     algos_tests.cpp \
-    categories_test.cpp \
     house_detector_tests.cpp \
     house_numbers_matcher_test.cpp \
     interval_set_test.cpp \
@@ -27,7 +26,6 @@ SOURCES += \
     locality_finder_test.cpp \
     locality_scorer_test.cpp \
     query_saver_tests.cpp \
-    search_string_utils_test.cpp \
     string_intersection_test.cpp \
     string_match_test.cpp \
 
diff --git a/search/search_tests/string_match_test.cpp b/search/search_tests/string_match_test.cpp
index 21675977d9..ab154e0f55 100644
--- a/search/search_tests/string_match_test.cpp
+++ b/search/search_tests/string_match_test.cpp
@@ -1,7 +1,8 @@
 #include "testing/testing.hpp"
 
 #include "search/approximate_string_match.hpp"
-#include "search/search_delimiters.hpp"
+
+#include "indexer/search_delimiters.hpp"
 
 #include "search/search_tests/match_cost_mock.hpp"
 
diff --git a/search/search_tests_support/test_search_engine.cpp b/search/search_tests_support/test_search_engine.cpp
index 1a2fb7d964..725b0da7d1 100644
--- a/search/search_tests_support/test_search_engine.cpp
+++ b/search/search_tests_support/test_search_engine.cpp
@@ -1,10 +1,10 @@
 #include "search/search_tests_support/test_search_engine.hpp"
 
-#include "search/categories_holder.hpp"
 #include "search/search_query.hpp"
 #include "search/search_query_factory.hpp"
 #include "search/suggest.hpp"
 
+#include "indexer/categories_holder.hpp"
 #include "indexer/scales.hpp"
 
 #include "storage/country_info_getter.hpp"
diff --git a/search/v2/geocoder.cpp b/search/v2/geocoder.cpp
index e00914548f..d5572f8244 100644
--- a/search/v2/geocoder.cpp
+++ b/search/v2/geocoder.cpp
@@ -2,8 +2,6 @@
 
 #include "search/dummy_rank_table.hpp"
 #include "search/retrieval.hpp"
-#include "search/search_delimiters.hpp"
-#include "search/search_string_utils.hpp"
 #include "search/v2/cbv_ptr.hpp"
 #include "search/v2/features_filter.hpp"
 #include "search/v2/features_layer_matcher.hpp"
@@ -16,6 +14,8 @@
 #include "indexer/index.hpp"
 #include "indexer/mwm_set.hpp"
 #include "indexer/rank_table.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "storage/country_info_getter.hpp"