diff --git a/base/mem_trie.hpp b/base/mem_trie.hpp
index 1238ad951d..f70bbf9242 100644
--- a/base/mem_trie.hpp
+++ b/base/mem_trie.hpp
@@ -4,11 +4,9 @@
 #include "base/macros.hpp"
 
 #include <algorithm>
-#include <cstddef>
-#include <functional>
 #include <map>
 #include <memory>
-#include <utility>
+#include <string>
 #include <vector>
 
 namespace base
@@ -221,7 +219,7 @@ public:
     template <typename ToDo>
     void ForEachInNode(ToDo && toDo) const
     {
-      m_node.m_values.ForEach(std::forward<ToDo>(toDo));
+      m_node.m_values.ForEach(toDo);
     }
 
     String GetLabel() const { return m_node.m_edge.template As<String>(); }
@@ -291,7 +289,7 @@ public:
   void ForEachInTrie(ToDo && toDo) const
   {
     String prefix;
-    ForEachInSubtree(m_root, prefix, std::forward<ToDo>(toDo));
+    ForEachInSubtree(m_root, prefix, toDo);
   }
 
   // Calls |toDo| for each key-value pair in the node that is reachable
@@ -302,7 +300,7 @@ public:
   {
     MoveTo(prefix, true /* fullMatch */,
            [&](Node const & node, Edge const & /* edge */, size_t /* offset */) {
-             node.m_values.ForEach(std::forward<ToDo>(toDo));
+             node.m_values.ForEach(toDo);
            });
   }
 
@@ -323,7 +321,7 @@ public:
       String p = prefix;
       for (; offset < edge.Size(); ++offset)
         p.push_back(edge[offset]);
-      ForEachInSubtree(node, p, std::forward<ToDo>(toDo));
+      ForEachInSubtree(node, p, toDo);
     });
   }
 
diff --git a/indexer/categories_holder.hpp b/indexer/categories_holder.hpp
index 88ac3ea98e..111e54d489 100644
--- a/indexer/categories_holder.hpp
+++ b/indexer/categories_holder.hpp
@@ -1,18 +1,13 @@
 #pragma once
 
 #include "base/mem_trie.hpp"
-#include "base/stl_helpers.hpp"
 #include "base/string_utils.hpp"
 
 #include <algorithm>
 #include <array>
-#include <cstdint>
-#include <iostream>
-#include <map>
 #include <memory>
 #include <string>
 #include <unordered_map>
-#include <utility>
 #include <vector>
 
 class Reader;
@@ -173,7 +168,7 @@ public:
   void ForEachTypeByName(int8_t locale, strings::UniString const & name, ToDo && toDo) const
   {
     auto const localePrefix = strings::UniString(1, static_cast<strings::UniChar>(locale));
-    m_name2type.ForEachInNode(localePrefix + name, std::forward<ToDo>(toDo));
+    m_name2type.ForEachInNode(localePrefix + name, toDo);
   }
 
   GroupTranslations const & GetGroupTranslations() const { return m_groupTranslations; }
diff --git a/search/processor.cpp b/search/processor.cpp
index d10e05b2f5..4e3690e1b4 100644
--- a/search/processor.cpp
+++ b/search/processor.cpp
@@ -494,14 +494,13 @@ Locales Processor::GetCategoryLocales() const
 template <typename ToDo>
 void Processor::ForEachCategoryType(StringSliceBase const & slice, ToDo && toDo) const
 {
-  ::search::ForEachCategoryType(slice, GetCategoryLocales(), m_categories, forward<ToDo>(toDo));
+  ::search::ForEachCategoryType(slice, GetCategoryLocales(), m_categories, toDo);
 }
 
 template <typename ToDo>
 void Processor::ForEachCategoryTypeFuzzy(StringSliceBase const & slice, ToDo && toDo) const
 {
-  ::search::ForEachCategoryTypeFuzzy(slice, GetCategoryLocales(), m_categories,
-                                     forward<ToDo>(toDo));
+  ::search::ForEachCategoryTypeFuzzy(slice, GetCategoryLocales(), m_categories, toDo);
 }
 
 void Processor::Search(SearchParams params)
diff --git a/search/utils.hpp b/search/utils.hpp
index a7421a24c0..ed623db72f 100644
--- a/search/utils.hpp
+++ b/search/utils.hpp
@@ -6,19 +6,14 @@
 
 #include "indexer/categories_holder.hpp"
 #include "indexer/feature_decl.hpp"
-#include "indexer/mwm_set.hpp"
-#include "indexer/search_delimiters.hpp"
 #include "indexer/search_string_utils.hpp"
 #include "indexer/trie.hpp"
 
 #include "geometry/rect2d.hpp"
 
 #include "base/levenshtein_dfa.hpp"
-#include "base/stl_helpers.hpp"
 #include "base/string_utils.hpp"
 
-#include <cstddef>
-#include <cstdint>
 #include <functional>
 #include <memory>
 #include <vector>
@@ -36,14 +31,14 @@ void ForEachCategoryType(StringSliceBase const & slice, Locales const & locales,
   {
     auto const & token = slice.Get(i);
     for (int8_t const locale : locales)
-      categories.ForEachTypeByName(locale, token, std::bind<void>(todo, i, std::placeholders::_1));
+      categories.ForEachTypeByName(locale, token, [&todo, i](uint32_t type) { todo(i, type); });
 
     // Special case processing of 2 codepoints emoji (e.g. black guy on a bike).
     // Only emoji synonyms can have one codepoint.
     if (token.size() > 1)
     {
       categories.ForEachTypeByName(CategoriesHolder::kEnglishCode, strings::UniString(1, token[0]),
-                                   std::bind<void>(todo, i, std::placeholders::_1));
+                                   [&todo, i](uint32_t type) { todo(i, type); });
     }
   }
 }
@@ -71,8 +66,9 @@ void ForEachCategoryTypeFuzzy(StringSliceBase const & slice, Locales const & loc
     request.m_names.push_back(BuildLevenshteinDFA(slice.Get(i)));
     request.SetLangs(locales);
 
-    MatchFeaturesInTrie(request, iterator, [&](uint32_t /* type */) { return true; } /* filter */,
-                        std::bind<void>(todo, i, std::placeholders::_1));
+    MatchFeaturesInTrie(request, iterator,
+                        [](uint32_t) { return true; } /* filter */,
+                        [&todo, i](uint32_t type, bool) { todo(i, type); } /* todo */);
   }
 }