diff --git a/generator/cities_boundaries_builder.cpp b/generator/cities_boundaries_builder.cpp
index 169797c41f..3e56312c43 100644
--- a/generator/cities_boundaries_builder.cpp
+++ b/generator/cities_boundaries_builder.cpp
@@ -39,15 +39,6 @@ namespace generator
 {
 namespace
 {
-bool ParseFeatureIdToOsmIdMapping(string const & path,
-                                  map<uint32_t, vector<base::GeoObjectId>> & mapping)
-{
-  return ForEachOsmId2FeatureId(path,
-                                [&](base::GeoObjectId const & osmId, uint32_t const featureId) {
-                                  mapping[featureId].push_back(osmId);
-                                });
-}
-
 bool ParseFeatureIdToTestIdMapping(string const & path, map<uint32_t, vector<uint64_t>> & mapping)
 {
   bool success = true;
diff --git a/generator/utils.cpp b/generator/utils.cpp
index 7db49eb396..60cb8c28e0 100644
--- a/generator/utils.cpp
+++ b/generator/utils.cpp
@@ -44,4 +44,13 @@ void LoadDataSource(DataSource & dataSource)
     }
   }
 }
+
+bool ParseFeatureIdToOsmIdMapping(std::string const & path,
+                                  std::map<uint32_t, std::vector<base::GeoObjectId>> & mapping)
+{
+  return ForEachOsmId2FeatureId(path,
+                                [&](base::GeoObjectId const & osmId, uint32_t const featureId) {
+                                  mapping[featureId].push_back(osmId);
+                                });
+}
 }  // namespace generator
diff --git a/generator/utils.hpp b/generator/utils.hpp
index d6012e80af..1311e1b50a 100644
--- a/generator/utils.hpp
+++ b/generator/utils.hpp
@@ -15,7 +15,9 @@
 #include "base/logging.hpp"
 
 #include <cstdint>
+#include <map>
 #include <string>
+#include <vector>
 
 namespace generator
 {
@@ -60,4 +62,7 @@ bool ForEachOsmId2FeatureId(std::string const & path, ToDo && toDo)
 
   return true;
 }
+
+bool ParseFeatureIdToOsmIdMapping(std::string const & path,
+                                  std::map<uint32_t, std::vector<base::GeoObjectId>> & mapping);
 }  // namespace generator