diff --git a/pedestrian_routing_benchmarks/pedestrian_routing_benchmarks.cpp b/pedestrian_routing_benchmarks/pedestrian_routing_benchmarks.cpp
index 9c202986bf..006af64d4d 100644
--- a/pedestrian_routing_benchmarks/pedestrian_routing_benchmarks.cpp
+++ b/pedestrian_routing_benchmarks/pedestrian_routing_benchmarks.cpp
@@ -1,18 +1,18 @@
-#include "../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../indexer/index.hpp"
-#include "../indexer/classificator_loader.hpp"
+#include "indexer/index.hpp"
+#include "indexer/classificator_loader.hpp"
 
-#include "../routing/astar_router.hpp"
-#include "../routing/features_road_graph.hpp"
+#include "routing/astar_router.hpp"
+#include "routing/features_road_graph.hpp"
 
-#include "../base/logging.hpp"
-#include "../base/macros.hpp"
-#include "../base/timer.hpp"
+#include "base/logging.hpp"
+#include "base/macros.hpp"
+#include "base/timer.hpp"
 
-#include "../std/string.hpp"
-#include "../std/utility.hpp"
-#include "../std/vector.hpp"
+#include "std/string.hpp"
+#include "std/utility.hpp"
+#include "std/vector.hpp"
 
 pair<m2::PointD, m2::PointD> GetPointsAroundSeg(Index & index, MwmSet::MwmId id, uint32_t featureId,
                                                 uint32_t segId)
diff --git a/routing/astar_router.cpp b/routing/astar_router.cpp
index a93253fae4..39fa629c09 100644
--- a/routing/astar_router.cpp
+++ b/routing/astar_router.cpp
@@ -1,10 +1,10 @@
-#include "astar_router.hpp"
+#include "routing/astar_router.hpp"
 
-#include "../indexer/mercator.hpp"
-#include "../geometry/distance_on_sphere.hpp"
-#include "../base/logging.hpp"
-#include "../base/macros.hpp"
-#include "../std/algorithm.hpp"
+#include "indexer/mercator.hpp"
+#include "geometry/distance_on_sphere.hpp"
+#include "base/logging.hpp"
+#include "base/macros.hpp"
+#include "std/algorithm.hpp"
 
 namespace routing
 {
diff --git a/routing/astar_router.hpp b/routing/astar_router.hpp
index cf4f717244..e8badb9c79 100644
--- a/routing/astar_router.hpp
+++ b/routing/astar_router.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "road_graph_router.hpp"
-#include "../std/map.hpp"
-#include "../std/queue.hpp"
+#include "routing/road_graph_router.hpp"
+#include "std/map.hpp"
+#include "std/queue.hpp"
 
 
 namespace routing
diff --git a/routing/async_router.cpp b/routing/async_router.cpp
index 227389d778..a5cc034461 100644
--- a/routing/async_router.cpp
+++ b/routing/async_router.cpp
@@ -1,8 +1,8 @@
-#include "async_router.hpp"
+#include "routing/async_router.hpp"
 
-#include "../platform/platform.hpp"
-#include "../base/macros.hpp"
-#include "../base/logging.hpp"
+#include "platform/platform.hpp"
+#include "base/macros.hpp"
+#include "base/logging.hpp"
 
 namespace routing
 {
diff --git a/routing/async_router.hpp b/routing/async_router.hpp
index 593c5fc9b4..d62251f95f 100644
--- a/routing/async_router.hpp
+++ b/routing/async_router.hpp
@@ -1,12 +1,11 @@
 #pragma once
 
-#include "route.hpp"
-#include "router.hpp"
+#include "routing/route.hpp"
+#include "routing/router.hpp"
 
-#include "../std/mutex.hpp"
-
-#include "../std/atomic.hpp"
-#include "../std/unique_ptr.hpp"
+#include "std/atomic.hpp"
+#include "std/mutex.hpp"
+#include "std/unique_ptr.hpp"
 
 namespace routing
 {
diff --git a/routing/dijkstra_router.cpp b/routing/dijkstra_router.cpp
index 69995a55a6..1fbf1e1532 100644
--- a/routing/dijkstra_router.cpp
+++ b/routing/dijkstra_router.cpp
@@ -1,12 +1,12 @@
-#include "dijkstra_router.hpp"
+#include "routing/dijkstra_router.hpp"
 
-#include "../indexer/mercator.hpp"
+#include "indexer/mercator.hpp"
 
-#include "../base/logging.hpp"
+#include "base/logging.hpp"
 
-#include "../std/algorithm.hpp"
-#include "../std/map.hpp"
-#include "../std/queue.hpp"
+#include "std/algorithm.hpp"
+#include "std/map.hpp"
+#include "std/queue.hpp"
 
 namespace routing
 {
diff --git a/routing/dijkstra_router.hpp b/routing/dijkstra_router.hpp
index b3b9c64316..00e95502a1 100644
--- a/routing/dijkstra_router.hpp
+++ b/routing/dijkstra_router.hpp
@@ -1,8 +1,6 @@
 #pragma once
 
-#include "road_graph_router.hpp"
-
-#include "../std/map.hpp"
+#include "routing/road_graph_router.hpp"
 
 namespace routing
 {
diff --git a/routing/features_road_graph.cpp b/routing/features_road_graph.cpp
index ae56e22527..7a991220df 100644
--- a/routing/features_road_graph.cpp
+++ b/routing/features_road_graph.cpp
@@ -1,14 +1,14 @@
-#include "features_road_graph.hpp"
-#include "route.hpp"
-#include "vehicle_model.hpp"
+#include "routing/features_road_graph.hpp"
+#include "routing/route.hpp"
+#include "routing/vehicle_model.hpp"
 
-#include "../indexer/index.hpp"
-#include "../indexer/classificator.hpp"
-#include "../indexer/ftypes_matcher.hpp"
+#include "indexer/index.hpp"
+#include "indexer/classificator.hpp"
+#include "indexer/ftypes_matcher.hpp"
 
-#include "../geometry/distance_on_sphere.hpp"
+#include "geometry/distance_on_sphere.hpp"
 
-#include "../base/logging.hpp"
+#include "base/logging.hpp"
 
 namespace routing
 {
diff --git a/routing/features_road_graph.hpp b/routing/features_road_graph.hpp
index 073a64a6cf..21524fba14 100644
--- a/routing/features_road_graph.hpp
+++ b/routing/features_road_graph.hpp
@@ -1,15 +1,15 @@
 #pragma once
-#include "road_graph.hpp"
-#include "vehicle_model.hpp"
+#include "routing/road_graph.hpp"
+#include "routing/vehicle_model.hpp"
 
-#include "../indexer/feature_data.hpp"
+#include "indexer/feature_data.hpp"
 
-#include "../geometry/point2d.hpp"
+#include "geometry/point2d.hpp"
 
-#include "../base/cache.hpp"
+#include "base/cache.hpp"
 
-#include "../std/unique_ptr.hpp"
-#include "../std/vector.hpp"
+#include "std/unique_ptr.hpp"
+#include "std/vector.hpp"
 
 
 class Index;
diff --git a/routing/nearest_road_pos_finder.cpp b/routing/nearest_road_pos_finder.cpp
index 192410a7de..fabdc85e6a 100644
--- a/routing/nearest_road_pos_finder.cpp
+++ b/routing/nearest_road_pos_finder.cpp
@@ -1,10 +1,10 @@
-#include "nearest_road_pos_finder.hpp"
+#include "routing/nearest_road_pos_finder.hpp"
 
-#include "../geometry/distance.hpp"
+#include "geometry/distance.hpp"
 
-#include "../indexer/feature.hpp"
+#include "indexer/feature.hpp"
 
-#include "../base/assert.hpp"
+#include "base/assert.hpp"
 
 namespace routing
 {
diff --git a/routing/nearest_road_pos_finder.hpp b/routing/nearest_road_pos_finder.hpp
index 09a8b5aa2e..693649a839 100644
--- a/routing/nearest_road_pos_finder.hpp
+++ b/routing/nearest_road_pos_finder.hpp
@@ -1,15 +1,15 @@
 #pragma once
 
-#include "road_graph.hpp"
-#include "vehicle_model.hpp"
+#include "routing/road_graph.hpp"
+#include "routing/vehicle_model.hpp"
 
-#include "../geometry/point2d.hpp"
+#include "geometry/point2d.hpp"
 
-#include "../indexer/index.hpp"
-#include "../indexer/mwm_set.hpp"
+#include "indexer/index.hpp"
+#include "indexer/mwm_set.hpp"
 
-#include "../std/unique_ptr.hpp"
-#include "../std/vector.hpp"
+#include "std/unique_ptr.hpp"
+#include "std/vector.hpp"
 
 class FeatureType;
 
diff --git a/routing/road_graph.cpp b/routing/road_graph.cpp
index 91ffe08acf..b36c518486 100644
--- a/routing/road_graph.cpp
+++ b/routing/road_graph.cpp
@@ -1,9 +1,9 @@
-#include "road_graph.hpp"
+#include "routing/road_graph.hpp"
 
-#include "../base/assert.hpp"
+#include "base/assert.hpp"
 
-#include "../std/limits.hpp"
-#include "../std/sstream.hpp"
+#include "std/limits.hpp"
+#include "std/sstream.hpp"
 
 namespace routing
 {
diff --git a/routing/road_graph.hpp b/routing/road_graph.hpp
index e564ea7a07..e975c19d84 100644
--- a/routing/road_graph.hpp
+++ b/routing/road_graph.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../geometry/point2d.hpp"
+#include "geometry/point2d.hpp"
 
-#include "../base/string_utils.hpp"
+#include "base/string_utils.hpp"
 
-#include "../std/vector.hpp"
+#include "std/vector.hpp"
 
 namespace routing
 {
diff --git a/routing/road_graph_router.cpp b/routing/road_graph_router.cpp
index a01bd8e970..57b8504dd8 100644
--- a/routing/road_graph_router.cpp
+++ b/routing/road_graph_router.cpp
@@ -1,17 +1,17 @@
-#include "features_road_graph.hpp"
-#include "nearest_road_pos_finder.hpp"
-#include "road_graph_router.hpp"
-#include "route.hpp"
-#include "vehicle_model.hpp"
+#include "routing/features_road_graph.hpp"
+#include "routing/nearest_road_pos_finder.hpp"
+#include "routing/road_graph_router.hpp"
+#include "routing/route.hpp"
+#include "routing/vehicle_model.hpp"
 
-#include "../indexer/feature.hpp"
-#include "../indexer/ftypes_matcher.hpp"
-#include "../indexer/index.hpp"
+#include "indexer/feature.hpp"
+#include "indexer/ftypes_matcher.hpp"
+#include "indexer/index.hpp"
 
-#include "../geometry/distance.hpp"
+#include "geometry/distance.hpp"
 
-#include "../base/timer.hpp"
-#include "../base/logging.hpp"
+#include "base/timer.hpp"
+#include "base/logging.hpp"
 
 namespace
 {
diff --git a/routing/road_graph_router.hpp b/routing/road_graph_router.hpp
index 9315961455..97672974c4 100644
--- a/routing/road_graph_router.hpp
+++ b/routing/road_graph_router.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "road_graph.hpp"
-#include "router.hpp"
-#include "vehicle_model.hpp"
+#include "routing/road_graph.hpp"
+#include "routing/router.hpp"
+#include "routing/vehicle_model.hpp"
 
-#include "../geometry/point2d.hpp"
+#include "geometry/point2d.hpp"
 
-#include "../std/unique_ptr.hpp"
-#include "../std/vector.hpp"
+#include "std/unique_ptr.hpp"
+#include "std/vector.hpp"
 
 class Index;
 
diff --git a/routing/routing_tests/astar_router_test.cpp b/routing/routing_tests/astar_router_test.cpp
index 3d3f48d561..7c625f7150 100644
--- a/routing/routing_tests/astar_router_test.cpp
+++ b/routing/routing_tests/astar_router_test.cpp
@@ -1,16 +1,16 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "road_graph_builder.hpp"
-#include "features_road_graph_test.hpp"
+#include "routing/routing_tests/road_graph_builder.hpp"
+#include "routing/routing_tests/features_road_graph_test.hpp"
 
-#include "../astar_router.hpp"
-#include "../features_road_graph.hpp"
-#include "../route.hpp"
+#include "routing/astar_router.hpp"
+#include "routing/features_road_graph.hpp"
+#include "routing/route.hpp"
 
-#include "../../indexer/classificator_loader.hpp"
+#include "indexer/classificator_loader.hpp"
 
-#include "../../base/logging.hpp"
-#include "../../base/macros.hpp"
+#include "base/logging.hpp"
+#include "base/macros.hpp"
 
 
 using namespace routing;
diff --git a/routing/routing_tests/dijkstra_router_test.cpp b/routing/routing_tests/dijkstra_router_test.cpp
index 2a15093ddf..d35db5c4ba 100644
--- a/routing/routing_tests/dijkstra_router_test.cpp
+++ b/routing/routing_tests/dijkstra_router_test.cpp
@@ -1,16 +1,16 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "road_graph_builder.hpp"
-#include "features_road_graph_test.hpp"
+#include "routing/routing_tests/road_graph_builder.hpp"
+#include "routing/routing_tests/features_road_graph_test.hpp"
 
-#include "../dijkstra_router.hpp"
-#include "../features_road_graph.hpp"
-#include "../route.hpp"
+#include "routing/dijkstra_router.hpp"
+#include "routing/features_road_graph.hpp"
+#include "routing/route.hpp"
 
-#include "../../indexer/classificator_loader.hpp"
+#include "indexer/classificator_loader.hpp"
 
-#include "../../base/logging.hpp"
-#include "../../base/macros.hpp"
+#include "base/logging.hpp"
+#include "base/macros.hpp"
 
 
 using namespace routing;
diff --git a/routing/routing_tests/features_road_graph_test.cpp b/routing/routing_tests/features_road_graph_test.cpp
index 6d4f22e4a8..c12fe7c2cc 100644
--- a/routing/routing_tests/features_road_graph_test.cpp
+++ b/routing/routing_tests/features_road_graph_test.cpp
@@ -1,14 +1,14 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "features_road_graph_test.hpp"
+#include "routing/routing_tests/features_road_graph_test.hpp"
 
-#include "../route.hpp"
+#include "routing/route.hpp"
 
-#include "../../indexer/classificator_loader.hpp"
-#include "../../indexer/feature.hpp"
-#include "../../indexer/ftypes_matcher.hpp"
+#include "indexer/classificator_loader.hpp"
+#include "indexer/feature.hpp"
+#include "indexer/ftypes_matcher.hpp"
 
-#include "../../base/logging.hpp"
+#include "base/logging.hpp"
 
 
 using namespace routing;
diff --git a/routing/routing_tests/features_road_graph_test.hpp b/routing/routing_tests/features_road_graph_test.hpp
index f71b6b347b..3b65d5b48d 100644
--- a/routing/routing_tests/features_road_graph_test.hpp
+++ b/routing/routing_tests/features_road_graph_test.hpp
@@ -1,9 +1,10 @@
 #pragma once
-#include "../features_road_graph.hpp"
 
-#include "../../indexer/index.hpp"
+#include "routing/features_road_graph.hpp"
 
-#include "../../std/scoped_ptr.hpp"
+#include "indexer/index.hpp"
+
+#include "std/scoped_ptr.hpp"
 
 
 namespace routing_test
diff --git a/routing/routing_tests/road_graph_builder.hpp b/routing/routing_tests/road_graph_builder.hpp
index 65bf15e2e5..bf910927ea 100644
--- a/routing/routing_tests/road_graph_builder.hpp
+++ b/routing/routing_tests/road_graph_builder.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../road_graph.hpp"
+#include "routing/road_graph.hpp"
 
 namespace routing_test
 {