diff --git a/storage/app_store.hpp b/storage/app_store.hpp
index ca3e3a7f17..74991b2a56 100644
--- a/storage/app_store.hpp
+++ b/storage/app_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../std/stdint.hpp"
+#include "std/stdint.hpp"
 
 struct HttpFinishedParams;
 
diff --git a/storage/countries.cpp b/storage/countries.cpp
index 0f14909047..02646e1326 100644
--- a/storage/countries.cpp
+++ b/storage/countries.cpp
@@ -1,11 +1,11 @@
-#include "countries.hpp"
-#include "simple_tree.hpp"
+#include "storage/countries.hpp"
+#include "storage/simple_tree.hpp"
 
-#include "../base/string_utils.hpp"
+#include "base/string_utils.hpp"
 
-#include "../geometry/cellid.hpp"
+#include "geometry/cellid.hpp"
 
-#include "../std/iostream.hpp"
+#include "std/iostream.hpp"
 
 typedef m2::CellId<9> CountryCellId;
 
diff --git a/storage/countries.hpp b/storage/countries.hpp
index 891833c832..f41e402492 100644
--- a/storage/countries.hpp
+++ b/storage/countries.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "../base/base.hpp"
+#include "base/base.hpp"
 
-#include "../std/string.hpp"
-#include "../std/vector.hpp"
+#include "std/string.hpp"
+#include "std/vector.hpp"
 
 template <class T> class SimpleTree;
 
diff --git a/storage/country.cpp b/storage/country.cpp
index 7821e73fa7..4dd8067bb0 100644
--- a/storage/country.cpp
+++ b/storage/country.cpp
@@ -1,10 +1,10 @@
-#include "country.hpp"
+#include "storage/country.hpp"
 
-#include "../platform/platform.hpp"
+#include "platform/platform.hpp"
 
-#include "../base/logging.hpp"
+#include "base/logging.hpp"
 
-#include "../3party/jansson/myjansson.hpp"
+#include "3party/jansson/myjansson.hpp"
 
 
 namespace storage
diff --git a/storage/country.hpp b/storage/country.hpp
index 95e5287ec0..a5ce677a4c 100644
--- a/storage/country.hpp
+++ b/storage/country.hpp
@@ -1,17 +1,17 @@
 #pragma once
 
-#include "storage_defines.hpp"
-#include "simple_tree.hpp"
-#include "country_decl.hpp"
+#include "storage/storage_defines.hpp"
+#include "storage/simple_tree.hpp"
+#include "storage/country_decl.hpp"
 
-#include "../defines.hpp"
+#include "defines.hpp"
 
-#include "../geometry/rect2d.hpp"
+#include "geometry/rect2d.hpp"
 
-#include "../base/buffer_vector.hpp"
+#include "base/buffer_vector.hpp"
 
-#include "../std/string.hpp"
-#include "../std/vector.hpp"
+#include "std/string.hpp"
+#include "std/vector.hpp"
 
 
 namespace update { class SizeUpdater; }
diff --git a/storage/country_decl.cpp b/storage/country_decl.cpp
index 534acd784c..1abb3c2a0c 100644
--- a/storage/country_decl.cpp
+++ b/storage/country_decl.cpp
@@ -1,4 +1,4 @@
-#include "country_decl.hpp"
+#include "storage/country_decl.hpp"
 
 
 void storage::CountryInfo::FileName2FullName(string & fName)
diff --git a/storage/country_decl.hpp b/storage/country_decl.hpp
index 5759e26863..229aaa54a4 100644
--- a/storage/country_decl.hpp
+++ b/storage/country_decl.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../geometry/rect2d.hpp"
+#include "geometry/rect2d.hpp"
 
-#include "../std/string.hpp"
+#include "std/string.hpp"
 
 
 namespace storage
diff --git a/storage/country_info.cpp b/storage/country_info.cpp
index c3f7e9dfb6..6d14d67ae1 100644
--- a/storage/country_info.cpp
+++ b/storage/country_info.cpp
@@ -1,14 +1,14 @@
-#include "country_info.hpp"
-#include "country_polygon.hpp"
-#include "country.hpp"
+#include "storage/country_info.hpp"
+#include "storage/country_polygon.hpp"
+#include "storage/country.hpp"
 
-#include "../indexer/geometry_serialization.hpp"
+#include "indexer/geometry_serialization.hpp"
 
-#include "../geometry/region2d.hpp"
+#include "geometry/region2d.hpp"
 
-#include "../coding/read_write_utils.hpp"
+#include "coding/read_write_utils.hpp"
 
-#include "../base/string_utils.hpp"
+#include "base/string_utils.hpp"
 
 
 namespace storage
diff --git a/storage/country_info.hpp b/storage/country_info.hpp
index fc893af5a0..a042183d05 100644
--- a/storage/country_info.hpp
+++ b/storage/country_info.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "country_decl.hpp"
+#include "storage/country_decl.hpp"
 
-#include "../geometry/region2d.hpp"
+#include "geometry/region2d.hpp"
 
-#include "../coding/file_container.hpp"
+#include "coding/file_container.hpp"
 
-#include "../base/cache.hpp"
+#include "base/cache.hpp"
 
 
 namespace storage
diff --git a/storage/country_polygon.hpp b/storage/country_polygon.hpp
index ec4492cabd..630fdd7c8f 100644
--- a/storage/country_polygon.hpp
+++ b/storage/country_polygon.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "country_decl.hpp"
+#include "storage/country_decl.hpp"
 
-#include "../indexer/point_to_int64.hpp"
-#include "../indexer/coding_params.hpp"
+#include "indexer/point_to_int64.hpp"
+#include "indexer/coding_params.hpp"
 
-#include "../coding/read_write_utils.hpp"
+#include "coding/read_write_utils.hpp"
 
 
 namespace storage
diff --git a/storage/data_header.cpp b/storage/data_header.cpp
index 4b3805b2c7..ea6543545d 100644
--- a/storage/data_header.cpp
+++ b/storage/data_header.cpp
@@ -1,14 +1,14 @@
-#include "data_header.hpp"
+#include "storage/data_header.hpp"
 
-#include "../base/string_utils.hpp"
+#include "base/string_utils.hpp"
 
-#include "../platform/platform.hpp"
+#include "platform/platform.hpp"
 
-#include "../coding/file_writer.hpp"
+#include "coding/file_writer.hpp"
 
-#include "../indexer/cell_id.hpp"
+#include "indexer/cell_id.hpp"
 
-#include "../base/start_mem_debug.hpp"
+#include "base/start_mem_debug.hpp"
 
 namespace feature
 {
diff --git a/storage/data_header.hpp b/storage/data_header.hpp
index fa7decf310..d7cdee8dfc 100644
--- a/storage/data_header.hpp
+++ b/storage/data_header.hpp
@@ -1,17 +1,17 @@
 #pragma once
 
-#include "../base/std_serialization.hpp"
+#include "base/std_serialization.hpp"
 
-#include "../storage/defines.hpp"
+#include "storage/defines.hpp"
 
-#include "../coding/streams_sink.hpp"
+#include "coding/streams_sink.hpp"
 
-#include "../geometry/rect2d.hpp"
+#include "geometry/rect2d.hpp"
 
-#include "../std/string.hpp"
-#include "../std/tuple.hpp"
+#include "std/string.hpp"
+#include "std/tuple.hpp"
 
-#include "../base/start_mem_debug.hpp"
+#include "base/start_mem_debug.hpp"
 
 namespace feature
 {   
@@ -66,4 +66,4 @@ namespace feature
 
 }
 
-#include "../base/stop_mem_debug.hpp"
+#include "base/stop_mem_debug.hpp"
diff --git a/storage/data_header_reader.cpp b/storage/data_header_reader.cpp
index be77ac65bc..deb033c917 100644
--- a/storage/data_header_reader.cpp
+++ b/storage/data_header_reader.cpp
@@ -1,10 +1,10 @@
-#include "data_header_reader.hpp"
-#include "data_header.hpp"
+#include "storage/data_header_reader.hpp"
+#include "storage/data_header.hpp"
 
-#include "../coding/file_reader.hpp"
-#include "../coding/file_writer.hpp"
+#include "coding/file_reader.hpp"
+#include "coding/file_writer.hpp"
 
-#include "../base/start_mem_debug.hpp"
+#include "base/start_mem_debug.hpp"
 
 namespace feature
 {
diff --git a/storage/data_header_reader.hpp b/storage/data_header_reader.hpp
index c731d10e57..bb927503bc 100644
--- a/storage/data_header_reader.hpp
+++ b/storage/data_header_reader.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "../base/base.hpp"
+#include "base/base.hpp"
 
-#include "../std/string.hpp"
+#include "std/string.hpp"
 
 class Writer;
 class Reader;
diff --git a/storage/index.cpp b/storage/index.cpp
index 462467c4d9..ab10cf0a19 100644
--- a/storage/index.cpp
+++ b/storage/index.cpp
@@ -1,6 +1,6 @@
-#include "index.hpp"
+#include "storage/index.hpp"
 
-#include "../std/sstream.hpp"
+#include "std/sstream.hpp"
 
 
 namespace storage
diff --git a/storage/index.hpp b/storage/index.hpp
index 8c0a9eab9d..8892ee51ae 100644
--- a/storage/index.hpp
+++ b/storage/index.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../std/string.hpp"
+#include "std/string.hpp"
 
 
 namespace storage
diff --git a/storage/simple_tree.hpp b/storage/simple_tree.hpp
index c00b1b4998..a38dd97fd5 100644
--- a/storage/simple_tree.hpp
+++ b/storage/simple_tree.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../std/vector.hpp"
-#include "../std/algorithm.hpp"
+#include "std/vector.hpp"
+#include "std/algorithm.hpp"
 
 template <class T>
 class SimpleTree
diff --git a/storage/storage.cpp b/storage/storage.cpp
index bf8f9f44a2..aa09e46ce9 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -1,24 +1,24 @@
-#include "storage.hpp"
+#include "storage/storage.hpp"
 
-#include "../defines.hpp"
+#include "defines.hpp"
 
-#include "../platform/platform.hpp"
-#include "../platform/servers_list.hpp"
-#include "../platform/settings.hpp"
+#include "platform/platform.hpp"
+#include "platform/servers_list.hpp"
+#include "platform/settings.hpp"
 
-#include "../coding/file_writer.hpp"
-#include "../coding/file_reader.hpp"
-#include "../coding/file_container.hpp"
-#include "../coding/url_encode.hpp"
-#include "../coding/file_name_utils.hpp"
+#include "coding/file_writer.hpp"
+#include "coding/file_reader.hpp"
+#include "coding/file_container.hpp"
+#include "coding/url_encode.hpp"
+#include "coding/file_name_utils.hpp"
 
-#include "../base/logging.hpp"
-#include "../base/string_utils.hpp"
+#include "base/logging.hpp"
+#include "base/string_utils.hpp"
 
-#include "../std/algorithm.hpp"
-#include "../std/target_os.hpp"
-#include "../std/bind.hpp"
-#include "../std/sstream.hpp"
+#include "std/algorithm.hpp"
+#include "std/target_os.hpp"
+#include "std/bind.hpp"
+#include "std/sstream.hpp"
 
 
 using namespace downloader;
diff --git a/storage/storage.hpp b/storage/storage.hpp
index de1a25566d..7f446dbae4 100644
--- a/storage/storage.hpp
+++ b/storage/storage.hpp
@@ -1,17 +1,17 @@
 #pragma once
 
-#include "storage_defines.hpp"
-#include "country.hpp"
-#include "index.hpp"
+#include "storage/storage_defines.hpp"
+#include "storage/country.hpp"
+#include "storage/index.hpp"
 
-#include "../platform/http_request.hpp"
+#include "platform/http_request.hpp"
 
-#include "../std/vector.hpp"
-#include "../std/list.hpp"
-#include "../std/string.hpp"
-#include "../std/set.hpp"
-#include "../std/function.hpp"
-#include "../std/unique_ptr.hpp"
+#include "std/vector.hpp"
+#include "std/list.hpp"
+#include "std/string.hpp"
+#include "std/set.hpp"
+#include "std/function.hpp"
+#include "std/unique_ptr.hpp"
 
 
 namespace storage
diff --git a/storage/storage_defines.hpp b/storage/storage_defines.hpp
index ebbef4c568..834586a76a 100644
--- a/storage/storage_defines.hpp
+++ b/storage/storage_defines.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../3party/enum_flags.hpp"
+#include "3party/enum_flags.hpp"
 
-#include "../std/stdint.hpp"
-#include "../std/utility.hpp"
+#include "std/stdint.hpp"
+#include "std/utility.hpp"
 
 namespace storage
 {
diff --git a/storage/storage_tests/country_info_test.cpp b/storage/storage_tests/country_info_test.cpp
index d3d016b6e4..ba8863ff3e 100644
--- a/storage/storage_tests/country_info_test.cpp
+++ b/storage/storage_tests/country_info_test.cpp
@@ -1,13 +1,13 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../country_info.hpp"
-#include "../country.hpp"
+#include "storage/country_info.hpp"
+#include "storage/country.hpp"
 
-#include "../../indexer/mercator.hpp"
+#include "indexer/mercator.hpp"
 
-#include "../../platform/platform.hpp"
+#include "platform/platform.hpp"
 
-#include "../../base/logging.hpp"
+#include "base/logging.hpp"
 
 
 using namespace storage;
diff --git a/storage/storage_tests/simple_tree_test.cpp b/storage/storage_tests/simple_tree_test.cpp
index 903e7d8d00..89d4a5b003 100644
--- a/storage/storage_tests/simple_tree_test.cpp
+++ b/storage/storage_tests/simple_tree_test.cpp
@@ -1,6 +1,6 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../simple_tree.hpp"
+#include "storage/simple_tree.hpp"
 
 
 namespace
diff --git a/storage/storage_tests/storage_tests.cpp b/storage/storage_tests/storage_tests.cpp
index 15f9e63264..6ffa32660c 100644
--- a/storage/storage_tests/storage_tests.cpp
+++ b/storage/storage_tests/storage_tests.cpp
@@ -1,8 +1,8 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../storage.hpp"
+#include "storage/storage.hpp"
 
-#include "../../defines.hpp"
+#include "defines.hpp"
 
 
 using namespace storage;