diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index 3de0346048..9ee47096f7 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -206,7 +206,6 @@ set(
   translator_world.hpp
   translators_pool.cpp
   translators_pool.hpp
-  tree_node.hpp
   type_helper.cpp
   type_helper.hpp
   ugc_db.cpp
diff --git a/generator/hierarchy.hpp b/generator/hierarchy.hpp
index bc7873c2a0..3d81692021 100644
--- a/generator/hierarchy.hpp
+++ b/generator/hierarchy.hpp
@@ -3,11 +3,11 @@
 #include "generator/feature_builder.hpp"
 #include "generator/gen_mwm_info.hpp"
 #include "generator/platform_helpers.hpp"
-#include "generator/tree_node.hpp"
 #include "generator/utils.hpp"
 
 #include "indexer/classificator.hpp"
 #include "indexer/ftypes_matcher.hpp"
+#include "indexer/tree_node.hpp"
 
 #include "geometry/point2d.hpp"
 #include "geometry/tree4d.hpp"
diff --git a/indexer/CMakeLists.txt b/indexer/CMakeLists.txt
index be7277b02e..7daf9fbcfd 100644
--- a/indexer/CMakeLists.txt
+++ b/indexer/CMakeLists.txt
@@ -118,6 +118,7 @@ set(
   string_slice.hpp
   succinct_trie_builder.hpp
   succinct_trie_reader.hpp
+  tree_node.hpp
   tree_structure.hpp
   trie.hpp
   trie_builder.hpp
diff --git a/generator/tree_node.hpp b/indexer/tree_node.hpp
similarity index 100%
rename from generator/tree_node.hpp
rename to indexer/tree_node.hpp