diff --git a/base/base.pro b/base/base.pro
index 84fd50c4e4..58df037f98 100644
--- a/base/base.pro
+++ b/base/base.pro
@@ -69,5 +69,5 @@ HEADERS += \
     threaded_list.hpp \
     resource_pool.hpp \
     limited_priority_queue.hpp \
-    threaded_priority_queue.hpp
-
+    threaded_priority_queue.hpp \
+    std_serialization.hpp \
diff --git a/coding/coding.pro b/coding/coding.pro
index 1b6eb763f6..f02f3c46f1 100644
--- a/coding/coding.pro
+++ b/coding/coding.pro
@@ -77,3 +77,5 @@ HEADERS += \
     trie_reader.hpp \
     mmap_reader.hpp \
     read_write_utils.hpp \
+    file_reader_stream.hpp \
+    file_writer_stream.hpp \
diff --git a/indexer/file_reader_stream.hpp b/coding/file_reader_stream.hpp
similarity index 100%
rename from indexer/file_reader_stream.hpp
rename to coding/file_reader_stream.hpp
diff --git a/indexer/file_writer_stream.hpp b/coding/file_writer_stream.hpp
similarity index 100%
rename from indexer/file_writer_stream.hpp
rename to coding/file_writer_stream.hpp
diff --git a/generator/classif_routine.cpp b/generator/classif_routine.cpp
index 5076b28675..2f62ffd2ef 100644
--- a/generator/classif_routine.cpp
+++ b/generator/classif_routine.cpp
@@ -3,11 +3,12 @@
 
 #include "../indexer/classificator.hpp"
 #include "../indexer/drawing_rules.hpp"
-#include "../indexer/file_reader_stream.hpp"
 #include "../indexer/scales.hpp"
 
 #include "../platform/platform.hpp"
 
+#include "../coding/file_reader_stream.hpp"
+
 #include "../base/logging.hpp"
 
 
diff --git a/generator/data_cache_file.hpp b/generator/data_cache_file.hpp
index c19c709534..74f50502e9 100644
--- a/generator/data_cache_file.hpp
+++ b/generator/data_cache_file.hpp
@@ -2,11 +2,8 @@
 
 #include "osm_decl.hpp"
 
-#include "../indexer/file_reader_stream.hpp"
-#include "../indexer/file_writer_stream.hpp"
-
-#include "../coding/file_reader.hpp"
-#include "../coding/file_writer.hpp"
+#include "../coding/file_reader_stream.hpp"
+#include "../coding/file_writer_stream.hpp"
 
 #include "../base/logging.hpp"
 
diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp
index f0122150af..28b3464bc0 100644
--- a/indexer/classificator_loader.cpp
+++ b/indexer/classificator_loader.cpp
@@ -1,8 +1,8 @@
 #include "classificator_loader.hpp"
-#include "file_reader_stream.hpp"
 #include "classificator.hpp"
 #include "drawing_rules.hpp"
 
+#include "../coding/file_reader_stream.hpp"
 #include "../coding/file_reader.hpp"
 
 #include "../base/logging.hpp"
diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp
index 09bd84c54e..b63fd2248d 100644
--- a/indexer/drawing_rules.cpp
+++ b/indexer/drawing_rules.cpp
@@ -1,12 +1,10 @@
 #include "../base/SRC_FIRST.hpp"
 
 #include "drawing_rules.hpp"
-#include "file_reader_stream.hpp"
-#include "file_writer_stream.hpp"
 #include "scales.hpp"
 
-#include "../coding/file_reader.hpp"
-#include "../coding/file_writer.hpp"
+#include "../coding/file_writer_stream.hpp"
+#include "../coding/file_reader_stream.hpp"
 
 #include "../base/std_serialization.hpp"
 #include "../base/assert.hpp"
diff --git a/indexer/indexer.pro b/indexer/indexer.pro
index beb4bbbf54..b212d89707 100644
--- a/indexer/indexer.pro
+++ b/indexer/indexer.pro
@@ -61,8 +61,6 @@ HEADERS += \
     feature_covering.hpp \
     mercator.hpp \
     feature_processor.hpp \
-    file_reader_stream.hpp \
-    file_writer_stream.hpp \
     feature_visibility.hpp \
     data_header.hpp \
     tree_structure.hpp \