diff --git a/3party/fribidi/config.h b/3party/fribidi/config.h
index 76e7b8d642..80280a1c88 100644
--- a/3party/fribidi/config.h
+++ b/3party/fribidi/config.h
@@ -1,4 +1,4 @@
-#include "../../std/target_os.hpp"
+#include "std/target_os.hpp"
 
 #if defined(OMIM_OS_MAC)
   #include "config_mac.h"
diff --git a/3party/jansson/jansson_handle.hpp b/3party/jansson/jansson_handle.hpp
index 1eb5efedbe..efdeccb168 100644
--- a/3party/jansson/jansson_handle.hpp
+++ b/3party/jansson/jansson_handle.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../std/algorithm.hpp"
+#include "std/algorithm.hpp"
 
 
 struct json_struct_t;
diff --git a/3party/jansson/myjansson.hpp b/3party/jansson/myjansson.hpp
index 0f9c2b0ecc..d64f213477 100644
--- a/3party/jansson/myjansson.hpp
+++ b/3party/jansson/myjansson.hpp
@@ -2,7 +2,7 @@
 
 #include "jansson_handle.hpp"
 
-#include "../../base/exception.hpp"
+#include "base/exception.hpp"
 
 #include <jansson.h>
 
diff --git a/base/base_tests/observer_list_test.cpp b/base/base_tests/observer_list_test.cpp
index 6e3a4ba48f..342c3254e0 100644
--- a/base/base_tests/observer_list_test.cpp
+++ b/base/base_tests/observer_list_test.cpp
@@ -1,8 +1,8 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../observer_list.hpp"
+#include "base/observer_list.hpp"
 
-#include "../../std/string.hpp"
+#include "std/string.hpp"
 
 namespace
 {
diff --git a/base/mutex.hpp b/base/mutex.hpp
index 1bf626a18a..76cf67d1eb 100644
--- a/base/mutex.hpp
+++ b/base/mutex.hpp
@@ -5,7 +5,7 @@
 #include "std/target_os.hpp"
 
 #if defined(OMIM_OS_WINDOWS_NATIVE)
-  #include "../std/windows.hpp"
+  #include "std/windows.hpp"
 #else
   #include <pthread.h>
 #endif
diff --git a/base/object_tracker.cpp b/base/object_tracker.cpp
index 1362725e09..acad6d0a15 100644
--- a/base/object_tracker.cpp
+++ b/base/object_tracker.cpp
@@ -8,7 +8,7 @@
   #include <signal.h>
   #include <unistd.h>
 #else
-  #include "../std/windows.hpp"
+  #include "std/windows.hpp"
 #endif
 
 
diff --git a/base/observer_list.hpp b/base/observer_list.hpp
index 0afe6de7c3..04aab44b9b 100644
--- a/base/observer_list.hpp
+++ b/base/observer_list.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../base/logging.hpp"
+#include "base/logging.hpp"
 
-#include "../std/algorithm.hpp"
-#include "../std/mutex.hpp"
-#include "../std/vector.hpp"
+#include "std/algorithm.hpp"
+#include "std/mutex.hpp"
+#include "std/vector.hpp"
 
 namespace my
 {
diff --git a/base/thread.hpp b/base/thread.hpp
index c24f9e4deb..c5bc84bcd5 100644
--- a/base/thread.hpp
+++ b/base/thread.hpp
@@ -16,7 +16,7 @@
 #include "std/vector.hpp"
 
 #ifdef OMIM_OS_WINDOWS
-#include "../std/windows.hpp"  // for DWORD
+#include "std/windows.hpp"  // for DWORD
 #endif
 
 namespace threads
diff --git a/coding/internal/file_data.cpp b/coding/internal/file_data.cpp
index 785fd9b53f..c02650f47e 100644
--- a/coding/internal/file_data.cpp
+++ b/coding/internal/file_data.cpp
@@ -1,7 +1,7 @@
 #include "coding/internal/file_data.hpp"
 
-#include "../reader.hpp" // For Reader exceptions.
-#include "../writer.hpp" // For Writer exceptions.
+#include "reader.hpp" // For Reader exceptions.
+#include "writer.hpp" // For Writer exceptions.
 #include "coding/constants.hpp"
 
 #include "base/exception.hpp"
diff --git a/coding/read_write_utils.hpp b/coding/read_write_utils.hpp
index 1a894b0bde..9c0ecd2362 100644
--- a/coding/read_write_utils.hpp
+++ b/coding/read_write_utils.hpp
@@ -8,7 +8,6 @@
 #include "std/vector.hpp"
 #include "std/type_traits.hpp"
 
-
 namespace rw
 {
   template <class TSink>
diff --git a/drape/attribute_provider.cpp b/drape/attribute_provider.cpp
index 940030240b..ef0655b136 100644
--- a/drape/attribute_provider.cpp
+++ b/drape/attribute_provider.cpp
@@ -6,7 +6,7 @@
   #define CHECK_STREAMS CheckStreams()
   #define INIT_STREAM(x) InitCheckStream((x))
 #else
-  #include "../../base/macros.hpp"
+  #include "base/macros.hpp"
   #define INIT_CHECK_INFO(x) UNUSED_VALUE((x))
   #define CHECK_STREAMS
   #define INIT_STREAM(x) UNUSED_VALUE((x))
diff --git a/drape/data_buffer_impl.hpp b/drape/data_buffer_impl.hpp
index f5a6554c2a..23b8496764 100644
--- a/drape/data_buffer_impl.hpp
+++ b/drape/data_buffer_impl.hpp
@@ -3,7 +3,8 @@
 #include "data_buffer.hpp"
 #include "cpu_buffer.hpp"
 #include "gpu_buffer.hpp"
-#include "../std/utility.hpp"
+
+#include "std/utility.hpp"
 
 namespace dp
 {
diff --git a/drape/drape_common.pri b/drape/drape_common.pri
index dd8b06fb1d..2256b284b4 100644
--- a/drape/drape_common.pri
+++ b/drape/drape_common.pri
@@ -58,6 +58,7 @@ HEADERS += \
     $$DRAPE_DIR/cpu_buffer.hpp \
     $$DRAPE_DIR/data_buffer.hpp \
     $$DRAPE_DIR/data_buffer_impl.hpp \
+    $$DRAPE_DIR/depth_constants.hpp \
     $$DRAPE_DIR/drape_global.hpp \
     $$DRAPE_DIR/dynamic_texture.hpp \
     $$DRAPE_DIR/font_texture.hpp \
@@ -82,7 +83,7 @@ HEADERS += \
     $$DRAPE_DIR/overlay_tree.hpp \
     $$DRAPE_DIR/pointers.hpp \
     $$DRAPE_DIR/render_bucket.hpp \
-    $$DRAPE_DIR/sdf_image.h \
+    $$DRAPE_DIR/sdf_image.hpp \
     $$DRAPE_DIR/shader.hpp \
     $$DRAPE_DIR/shader_def.hpp \
     $$DRAPE_DIR/stipple_pen_resource.hpp \
@@ -97,6 +98,5 @@ HEADERS += \
     $$DRAPE_DIR/utils/projection.hpp \
     $$DRAPE_DIR/utils/vertex_decl.hpp \
     $$DRAPE_DIR/vertex_array_buffer.hpp \
-    $$ROOT_DIR/stb_image/stb_image.h \
     $$ROOT_DIR/sdf_image/sdf_image.h \
-    $$PWD/depth_constants.hpp
+    $$ROOT_DIR/stb_image/stb_image.h \
diff --git a/drape/fribidi.hpp b/drape/fribidi.hpp
index 6f5a8e0928..b3db34601d 100644
--- a/drape/fribidi.hpp
+++ b/drape/fribidi.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../base/string_utils.hpp"
+#include "base/string_utils.hpp"
 
-#include "../3party/fribidi/lib/fribidi.h"
+#include "3party/fribidi/lib/fribidi.h"
 
 namespace fribidi
 {
diff --git a/drape/glIncludes.hpp b/drape/glIncludes.hpp
index 70378f0454..5f87f1670e 100644
--- a/drape/glIncludes.hpp
+++ b/drape/glIncludes.hpp
@@ -10,10 +10,10 @@
   #include <OpenGL/gl.h>
   #include <OpenGL/glext.h>
 #elif defined(OMIM_OS_WINDOWS)
-  #include "../std/windows.hpp"
+  #include "std/windows.hpp"
   #define GL_GLEXT_PROTOTYPES
   #include <GL/gl.h>
-  #include "../3party/GL/glext.h"
+  #include "3party/GL/glext.h"
 #elif defined(OMIM_OS_ANDROID)
   #include <EGL/egl.h>
   #include <GLES2/gl2.h>
diff --git a/drape/glextensions_list.cpp b/drape/glextensions_list.cpp
index fe801bb95f..5948f2fb64 100644
--- a/drape/glextensions_list.cpp
+++ b/drape/glextensions_list.cpp
@@ -9,7 +9,7 @@ namespace dp
 {
 
 #ifdef DEBUG
-  #include "../std/map.hpp"
+  #include "std/map.hpp"
 
   class GLExtensionsList::Impl
   {
@@ -43,7 +43,7 @@ namespace dp
     map<GLExtensionsList::ExtensionName, bool> m_supportedMap;
   };
 #else
-  #include "../std/set.hpp"
+  #include "std/set.hpp"
 
   class GLExtensionsList::Impl
   {
diff --git a/drape/gpu_program.cpp b/drape/gpu_program.cpp
index b0d6a7e3e1..91e567da28 100644
--- a/drape/gpu_program.cpp
+++ b/drape/gpu_program.cpp
@@ -5,7 +5,7 @@
 #include "base/logging.hpp"
 
 #ifdef DEBUG
-  #include "../std/map.hpp"
+  #include "std/map.hpp"
 #endif
 
 namespace dp
diff --git a/drape/gpu_program.hpp b/drape/gpu_program.hpp
index 09c03724f2..1e47dbd073 100644
--- a/drape/gpu_program.hpp
+++ b/drape/gpu_program.hpp
@@ -7,7 +7,7 @@
 #include "std/string.hpp"
 
 #ifdef DEBUG
-  #include "../std/unique_ptr.hpp"
+  #include "std/unique_ptr.hpp"
 #endif
 
 namespace dp
diff --git a/drape/index_buffer_mutator.cpp b/drape/index_buffer_mutator.cpp
index 8179122789..6634e00594 100644
--- a/drape/index_buffer_mutator.cpp
+++ b/drape/index_buffer_mutator.cpp
@@ -1,8 +1,8 @@
 #include "drape/index_buffer_mutator.hpp"
 #include "drape/vertex_array_buffer.hpp"
 
-#include "../std/cstring.hpp"    // for memcpy
-#include "../std/algorithm.hpp" // for max
+#include "std/cstring.hpp"    // for memcpy
+#include "std/algorithm.hpp" // for max
 
 namespace dp
 {
diff --git a/drape/oglcontextfactory.hpp b/drape/oglcontextfactory.hpp
index d14b5371e4..c015781843 100644
--- a/drape/oglcontextfactory.hpp
+++ b/drape/oglcontextfactory.hpp
@@ -5,7 +5,7 @@
 #include "base/condition.hpp"
 #include "base/assert.hpp"
 
-#include "/std/function.hpp"
+#include "std/function.hpp"
 
 namespace dp
 {
diff --git a/drape/utils/glyph_usage_tracker.cpp b/drape/utils/glyph_usage_tracker.cpp
index fd199c5b0d..b4d4a0f67b 100644
--- a/drape/utils/glyph_usage_tracker.cpp
+++ b/drape/utils/glyph_usage_tracker.cpp
@@ -1,8 +1,10 @@
-#include "glyph_usage_tracker.hpp"
+#include "drape/utils/glyph_usage_tracker.hpp"
 
-#include "../../base/assert.hpp"
-#include "../../std/sstream.hpp"
-#include "../../platform/preferred_languages.hpp"
+#include "platform/preferred_languages.hpp"
+
+#include "base/assert.hpp"
+
+#include "std/sstream.hpp"
 
 namespace dp
 {
diff --git a/drape/utils/glyph_usage_tracker.hpp b/drape/utils/glyph_usage_tracker.hpp
index 1b9697ab05..74a9e61dfa 100644
--- a/drape/utils/glyph_usage_tracker.hpp
+++ b/drape/utils/glyph_usage_tracker.hpp
@@ -1,11 +1,12 @@
 #pragma once
 
-#include "../../base/string_utils.hpp"
-#include "../../std/map.hpp"
-#include "../../std/set.hpp"
-#include "../../std/list.hpp"
-#include "../../std/mutex.hpp"
-#include "../../std/unordered_set.hpp"
+#include "base/string_utils.hpp"
+
+#include "std/map.hpp"
+#include "std/set.hpp"
+#include "std/list.hpp"
+#include "std/mutex.hpp"
+#include "std/unordered_set.hpp"
 
 //#define TRACK_GLYPH_USAGE
 
diff --git a/drape/utils/gpu_mem_tracker.cpp b/drape/utils/gpu_mem_tracker.cpp
index 8c867ba49d..83faee4026 100644
--- a/drape/utils/gpu_mem_tracker.cpp
+++ b/drape/utils/gpu_mem_tracker.cpp
@@ -1,7 +1,7 @@
-#include "gpu_mem_tracker.hpp"
+#include "drape/utils/gpu_mem_tracker.hpp"
 
-#include "../../std/tuple.hpp"
-#include "../../std/sstream.hpp"
+#include "std/tuple.hpp"
+#include "std/sstream.hpp"
 
 namespace dp
 {
diff --git a/drape/utils/gpu_mem_tracker.hpp b/drape/utils/gpu_mem_tracker.hpp
index 16e1034fa0..4a58c52d71 100644
--- a/drape/utils/gpu_mem_tracker.hpp
+++ b/drape/utils/gpu_mem_tracker.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../../base/mutex.hpp"
+#include "base/mutex.hpp"
 
-#include "../../std/map.hpp"
-#include "../../std/noncopyable.hpp"
+#include "std/map.hpp"
+#include "std/noncopyable.hpp"
 
 //#define TRACK_GPU_MEM
 
diff --git a/drape/utils/projection.hpp b/drape/utils/projection.hpp
index cee2b20c96..d0051f545d 100644
--- a/drape/utils/projection.hpp
+++ b/drape/utils/projection.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../std/array.hpp"
+#include "std/array.hpp"
 
 namespace dp
 {
diff --git a/drape_frontend/apply_feature_functors.cpp b/drape_frontend/apply_feature_functors.cpp
index c59d7d243a..b18473414b 100644
--- a/drape_frontend/apply_feature_functors.cpp
+++ b/drape_frontend/apply_feature_functors.cpp
@@ -18,8 +18,6 @@
 #include "drape/stipple_pen_resource.hpp"
 #include "drape/utils/projection.hpp"
 
-#include "graphics/defines.hpp"
-
 #include "std/algorithm.hpp"
 #include "std/utility.hpp"
 
diff --git a/drape_frontend/backend_renderer.cpp b/drape_frontend/backend_renderer.cpp
index 899d940ba4..7e4e98de1f 100644
--- a/drape_frontend/backend_renderer.cpp
+++ b/drape_frontend/backend_renderer.cpp
@@ -49,6 +49,11 @@ BackendRenderer::~BackendRenderer()
   StopThread();
 }
 
+unique_ptr<threads::IRoutine> BackendRenderer::CreateRoutine()
+{
+  return make_unique<Routine>(*this);
+}
+
 void BackendRenderer::RecacheGui(gui::Skin::ElementName elements)
 {
   using TLayerRenderer = dp::TransferPointer<gui::LayerRenderer>;
@@ -155,18 +160,6 @@ void BackendRenderer::AcceptMessage(dp::RefPointer<Message> message)
 /////////////////////////////////////////
 //             ThreadPart              //
 /////////////////////////////////////////
-void BackendRenderer::StartThread()
-{
-  m_selfThread.Create(make_unique<Routine>(*this));
-}
-
-void BackendRenderer::StopThread()
-{
-  m_selfThread.GetRoutine()->Cancel();
-  CloseQueue();
-  m_selfThread.Join();
-}
-
 void BackendRenderer::ReleaseResources()
 {
   m_readManager->Stop();
diff --git a/drape_frontend/backend_renderer.hpp b/drape_frontend/backend_renderer.hpp
index bd394ae19b..78284d3f5b 100644
--- a/drape_frontend/backend_renderer.hpp
+++ b/drape_frontend/backend_renderer.hpp
@@ -32,6 +32,9 @@ public:
 
   ~BackendRenderer() override;
 
+protected:
+  unique_ptr<threads::IRoutine> CreateRoutine() override;
+
 private:
   void RecacheGui(gui::Skin::ElementName elements);
 
@@ -64,8 +67,6 @@ private:
     BackendRenderer & m_renderer;
   };
 
-  void StartThread();
-  void StopThread();
   void ReleaseResources();
 
   void InitGLDependentResource();
diff --git a/drape_frontend/base_renderer.cpp b/drape_frontend/base_renderer.cpp
index 0b726a63f4..2b59d74874 100644
--- a/drape_frontend/base_renderer.cpp
+++ b/drape_frontend/base_renderer.cpp
@@ -1,7 +1,7 @@
-#include "base_renderer.hpp"
-#include "message_subclasses.hpp"
+#include "drape_frontend/base_renderer.hpp"
+#include "drape_frontend/message_subclasses.hpp"
 
-#include "../std/utility.hpp"
+#include "std/utility.hpp"
 
 namespace df
 {
@@ -21,7 +21,7 @@ BaseRenderer::BaseRenderer(ThreadsCommutator::ThreadName name,
 
 void BaseRenderer::StartThread()
 {
-  m_selfThread.Create(this);
+  m_selfThread.Create(CreateRoutine());
 }
 
 void BaseRenderer::StopThread()
@@ -124,13 +124,13 @@ void BaseRenderer::WakeUp()
 
 void BaseRenderer::ProcessStopRenderingMessage()
 {
-  IRoutine::Cancel();
+  m_selfThread.GetRoutine()->Cancel();
   CloseQueue();
 }
 
 bool BaseRenderer::CanReceiveMessage()
 {
-  return !IsCancelled();
+  return !m_selfThread.GetRoutine()->IsCancelled();
 }
 
 } // namespace df
diff --git a/drape_frontend/base_renderer.hpp b/drape_frontend/base_renderer.hpp
index 59f0771735..b7696b862d 100644
--- a/drape_frontend/base_renderer.hpp
+++ b/drape_frontend/base_renderer.hpp
@@ -1,22 +1,22 @@
 #pragma once
 
-#include "message_acceptor.hpp"
-#include "threads_commutator.hpp"
-#include "tile_utils.hpp"
+#include "drape_frontend/message_acceptor.hpp"
+#include "drape_frontend/threads_commutator.hpp"
+#include "drape_frontend/tile_utils.hpp"
 
-#include "../drape/oglcontextfactory.hpp"
-#include "../base/thread.hpp"
+#include "drape/oglcontextfactory.hpp"
 
-#include "../std/atomic.hpp"
-#include "../std/condition_variable.hpp"
-#include "../std/function.hpp"
-#include "../std/mutex.hpp"
+#include "base/thread.hpp"
+
+#include "std/atomic.hpp"
+#include "std/condition_variable.hpp"
+#include "std/function.hpp"
+#include "std/mutex.hpp"
 
 namespace df
 {
 
-class BaseRenderer : public MessageAcceptor,
-                     public threads::IRoutine
+class BaseRenderer : public MessageAcceptor
 {
 public:
   using TCompletionHandler = function<void()>;
@@ -37,6 +37,8 @@ protected:
   void CheckRenderingEnabled();
   void ProcessStopRenderingMessage();
 
+  virtual unique_ptr<threads::IRoutine> CreateRoutine() = 0;
+
 private:
   bool CanReceiveMessage() override;
 
diff --git a/drape_frontend/drape_frontend_tests/tile_utils_tests.cpp b/drape_frontend/drape_frontend_tests/tile_utils_tests.cpp
index a116c53988..cbbf41113f 100644
--- a/drape_frontend/drape_frontend_tests/tile_utils_tests.cpp
+++ b/drape_frontend/drape_frontend_tests/tile_utils_tests.cpp
@@ -1,6 +1,6 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../../drape_frontend/tile_utils.hpp"
+#include "drape_frontend/tile_utils.hpp"
 
 namespace
 {
diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
index dbd3a49edc..6eec8946f2 100755
--- a/drape_frontend/frontend_renderer.cpp
+++ b/drape_frontend/frontend_renderer.cpp
@@ -219,6 +219,11 @@ void FrontendRenderer::AcceptMessage(dp::RefPointer<Message> message)
   }
 }
 
+unique_ptr<threads::IRoutine> FrontendRenderer::CreateRoutine()
+{
+  return make_unique<Routine>(*this);
+}
+
 void FrontendRenderer::AddToRenderGroup(vector<unique_ptr<RenderGroup>> & groups,
                                         dp::GLState const & state,
                                         dp::MasterPointer<dp::RenderBucket> & renderBucket,
@@ -428,18 +433,6 @@ void FrontendRenderer::ResolveTileKeys(int tileScale)
   m_tileTree->EndRequesting();
 }
 
-void FrontendRenderer::StartThread()
-{
-  m_selfThread.Create(make_unique<Routine>(*this));
-}
-
-void FrontendRenderer::StopThread()
-{
-  m_selfThread.GetRoutine()->Cancel();
-  CloseQueue();
-  m_selfThread.Join();
-}
-
 FrontendRenderer::Routine::Routine(FrontendRenderer & renderer) : m_renderer(renderer) {}
 
 void FrontendRenderer::Routine::Do()
diff --git a/drape_frontend/frontend_renderer.hpp b/drape_frontend/frontend_renderer.hpp
index d39baea4a1..c3098f5dde 100755
--- a/drape_frontend/frontend_renderer.hpp
+++ b/drape_frontend/frontend_renderer.hpp
@@ -61,6 +61,7 @@ public:
 
 protected:
   virtual void AcceptMessage(dp::RefPointer<Message> message);
+  unique_ptr<threads::IRoutine> CreateRoutine() override;
 
 private:
   void RenderScene();
@@ -84,8 +85,6 @@ private:
     FrontendRenderer & m_renderer;
   };
 
-  void StartThread();
-  void StopThread();
   void ReleaseResources();
 
 private:
diff --git a/drape_frontend/message_acceptor.hpp b/drape_frontend/message_acceptor.hpp
index 147a9c99b0..ca410a898a 100644
--- a/drape_frontend/message_acceptor.hpp
+++ b/drape_frontend/message_acceptor.hpp
@@ -11,9 +11,6 @@ class Message;
 
 class MessageAcceptor
 {
-public:
-  virtual ~MessageAcceptor() {}
-
 protected:
   virtual ~MessageAcceptor(){}
 
diff --git a/drape_frontend/my_position.cpp b/drape_frontend/my_position.cpp
index e11fa28413..9dfdeb4070 100644
--- a/drape_frontend/my_position.cpp
+++ b/drape_frontend/my_position.cpp
@@ -1,11 +1,11 @@
 #include "my_position.hpp"
 
-#include "../drape/batcher.hpp"
-#include "../drape/depth_constants.hpp"
-#include "../drape/glsl_func.hpp"
-#include "../drape/glsl_types.hpp"
-#include "../drape/render_bucket.hpp"
-#include "../drape/shader_def.hpp"
+#include "drape/batcher.hpp"
+#include "drape/depth_constants.hpp"
+#include "drape/glsl_func.hpp"
+#include "drape/glsl_types.hpp"
+#include "drape/render_bucket.hpp"
+#include "drape/shader_def.hpp"
 
 namespace df
 {
@@ -15,6 +15,13 @@ namespace
 
 struct Vertex
 {
+  Vertex() = default;
+  Vertex(glsl::vec2 const & normal, glsl::vec2 const & texCoord)
+    : m_normal(normal)
+    , m_texCoord(texCoord)
+  {
+  }
+
   glsl::vec2 m_normal;
   glsl::vec2 m_texCoord;
 };
@@ -108,16 +115,14 @@ void MyPosition::CacheAccuracySector(dp::RefPointer<dp::TextureManager> mng)
   glsl::vec2 colorCoord = glsl::ToVec2(color.GetTexRect().Center());
 
   buffer_vector<Vertex, TriangleCount> buffer;
-  // TODO UVR, change on emplace_back afer rebase on master
-  buffer.push_back({ glsl::vec2(0.0f, 0.0f), colorCoord });
+  buffer.emplace_back(glsl::vec2(0.0f, 0.0f), colorCoord);
 
   glsl::vec2 startNormal(0.0f, 1.0f);
 
   for (size_t i = 0; i < TriangleCount + 1; ++i)
   {
     glsl::vec2 rotatedNormal = glsl::rotate(startNormal, -(i * etalonSector));
-    // TODO UVR, change on emplace_back afer rebase on master
-    buffer.push_back({ rotatedNormal, colorCoord });
+    buffer.emplace_back(rotatedNormal, colorCoord);
   }
 
   dp::GLState state(gpu::ACCURACY_PROGRAM, dp::GLState::OverlayLayer);
diff --git a/drape_frontend/my_position.hpp b/drape_frontend/my_position.hpp
index d73f3f8482..b485390d03 100644
--- a/drape_frontend/my_position.hpp
+++ b/drape_frontend/my_position.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "../drape/vertex_array_buffer.hpp"
-#include "../drape/glstate.hpp"
-#include "../drape/gpu_program_manager.hpp"
-#include "../drape/texture_manager.hpp"
-#include "../drape/uniform_values_storage.hpp"
+#include "drape/vertex_array_buffer.hpp"
+#include "drape/glstate.hpp"
+#include "drape/gpu_program_manager.hpp"
+#include "drape/texture_manager.hpp"
+#include "drape/uniform_values_storage.hpp"
 
-#include "../geometry/screenbase.hpp"
+#include "geometry/screenbase.hpp"
 
 namespace df
 {
diff --git a/drape_frontend/tile_tree.cpp b/drape_frontend/tile_tree.cpp
index 28c86b86db..365a8772e1 100755
--- a/drape_frontend/tile_tree.cpp
+++ b/drape_frontend/tile_tree.cpp
@@ -1,7 +1,7 @@
 #include "tile_tree.hpp"
 
-#include "../std/algorithm.hpp"
-#include "../std/utility.hpp"
+#include "std/algorithm.hpp"
+#include "std/utility.hpp"
 
 namespace df
 {
diff --git a/drape_frontend/tile_tree.hpp b/drape_frontend/tile_tree.hpp
index 9c59365786..89cabcfcfe 100755
--- a/drape_frontend/tile_tree.hpp
+++ b/drape_frontend/tile_tree.hpp
@@ -3,14 +3,14 @@
 #include "tile_utils.hpp"
 #include "render_group.hpp"
 
-#include "../drape/glstate.hpp"
-#include "../drape/pointers.hpp"
-#include "../geometry/rect2d.hpp"
+#include "drape/glstate.hpp"
+#include "drape/pointers.hpp"
+#include "geometry/rect2d.hpp"
 
-#include "../std/function.hpp"
-#include "../std/list.hpp"
-#include "../std/sstream.hpp"
-#include "../std/unique_ptr.hpp"
+#include "std/function.hpp"
+#include "std/list.hpp"
+#include "std/sstream.hpp"
+#include "std/unique_ptr.hpp"
 
 namespace df
 {
diff --git a/drape_frontend/tile_utils.cpp b/drape_frontend/tile_utils.cpp
index 44df86679d..bc6f3ca67e 100755
--- a/drape_frontend/tile_utils.cpp
+++ b/drape_frontend/tile_utils.cpp
@@ -1,7 +1,7 @@
 #include "tile_utils.hpp"
 
-#include "../base/assert.hpp"
-#include "../base/stl_add.hpp"
+#include "base/assert.hpp"
+#include "base/stl_add.hpp"
 
 namespace df
 {
diff --git a/drape_frontend/tile_utils.hpp b/drape_frontend/tile_utils.hpp
index dbde566369..c7bb1669ac 100755
--- a/drape_frontend/tile_utils.hpp
+++ b/drape_frontend/tile_utils.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "tile_key.hpp"
-#include "../std/function.hpp"
-#include "../std/set.hpp"
+#include "std/function.hpp"
+#include "std/set.hpp"
 
 namespace df
 {
diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp
index 98300b4275..f198606816 100644
--- a/drape_frontend/user_mark_shapes.cpp
+++ b/drape_frontend/user_mark_shapes.cpp
@@ -2,11 +2,11 @@
 
 #include "line_shape.hpp"
 
-#include "../drape/utils/vertex_decl.hpp"
-#include "../drape/shader_def.hpp"
-#include "../drape/attribute_provider.hpp"
+#include "drape/utils/vertex_decl.hpp"
+#include "drape/shader_def.hpp"
+#include "drape/attribute_provider.hpp"
 
-#include "../geometry/spline.hpp"
+#include "geometry/spline.hpp"
 
 namespace df
 {
diff --git a/drape_frontend/user_mark_shapes.hpp b/drape_frontend/user_mark_shapes.hpp
index 734e34a8f6..9cb3f8dc29 100644
--- a/drape_frontend/user_mark_shapes.hpp
+++ b/drape_frontend/user_mark_shapes.hpp
@@ -3,12 +3,12 @@
 #include "tile_key.hpp"
 #include "user_marks_provider.hpp"
 
-#include "../drape/batcher.hpp"
-#include "../drape/texture_manager.hpp"
+#include "drape/batcher.hpp"
+#include "drape/texture_manager.hpp"
 
-#include "../geometry/point2d.hpp"
+#include "geometry/point2d.hpp"
 
-#include "../std/function.hpp"
+#include "std/function.hpp"
 
 namespace df
 {
diff --git a/drape_frontend/user_marks_provider.hpp b/drape_frontend/user_marks_provider.hpp
index 224ee544be..2ae2156ea1 100644
--- a/drape_frontend/user_marks_provider.hpp
+++ b/drape_frontend/user_marks_provider.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "../drape/drape_global.hpp"
+#include "drape/drape_global.hpp"
 
-#include "../geometry/point2d.hpp"
+#include "geometry/point2d.hpp"
 
-#include "../base/mutex.hpp"
+#include "base/mutex.hpp"
 
-#include "../std/atomic.hpp"
+#include "std/atomic.hpp"
 
 namespace df
 {
diff --git a/drape_gui/button.cpp b/drape_gui/button.cpp
index ec4977aa0c..4011696dbf 100644
--- a/drape_gui/button.cpp
+++ b/drape_gui/button.cpp
@@ -1,11 +1,11 @@
 #include "button.hpp"
 #include "gui_text.hpp"
 
-#include "../drape/batcher.hpp"
-#include "../drape/shader_def.hpp"
-#include "../drape/utils/vertex_decl.hpp"
+#include "drape/batcher.hpp"
+#include "drape/shader_def.hpp"
+#include "drape/utils/vertex_decl.hpp"
 
-#include "../std/bind.hpp"
+#include "std/bind.hpp"
 
 namespace gui
 {
diff --git a/drape_gui/button.hpp b/drape_gui/button.hpp
index f0755b4108..653b2d1e92 100644
--- a/drape_gui/button.hpp
+++ b/drape_gui/button.hpp
@@ -2,8 +2,8 @@
 
 #include "shape.hpp"
 
-#include "../std/function.hpp"
-#include "../std/string.hpp"
+#include "std/function.hpp"
+#include "std/string.hpp"
 
 namespace gui
 {
diff --git a/drape_gui/compass.cpp b/drape_gui/compass.cpp
index 456c7c9d94..8f0a9d78a7 100644
--- a/drape_gui/compass.cpp
+++ b/drape_gui/compass.cpp
@@ -1,12 +1,12 @@
 #include "compass.hpp"
 
-#include "../drape/glsl_types.hpp"
-#include "../drape/glsl_func.hpp"
-#include "../drape/shader_def.hpp"
+#include "drape/glsl_types.hpp"
+#include "drape/glsl_func.hpp"
+#include "drape/shader_def.hpp"
 
-#include "../drape/utils/vertex_decl.hpp"
+#include "drape/utils/vertex_decl.hpp"
 
-#include "../std/bind.hpp"
+#include "std/bind.hpp"
 
 namespace gui
 {
diff --git a/drape_gui/copyright_label.cpp b/drape_gui/copyright_label.cpp
index 68704393f8..8c5d30e532 100644
--- a/drape_gui/copyright_label.cpp
+++ b/drape_gui/copyright_label.cpp
@@ -3,9 +3,9 @@
 #include "gui_text.hpp"
 #include "ruler_helper.hpp"
 
-#include "../base/timer.hpp"
+#include "base/timer.hpp"
 
-#include "../std/bind.hpp"
+#include "std/bind.hpp"
 
 namespace gui
 {
diff --git a/drape_gui/country_status.cpp b/drape_gui/country_status.cpp
index 4522dfc766..53862c44c9 100644
--- a/drape_gui/country_status.cpp
+++ b/drape_gui/country_status.cpp
@@ -4,11 +4,11 @@
 #include "drape_gui.hpp"
 #include "gui_text.hpp"
 
-#include "../drape/batcher.hpp"
-#include "../drape/glsl_func.hpp"
+#include "drape/batcher.hpp"
+#include "drape/glsl_func.hpp"
 
-#include "../std/algorithm.hpp"
-#include "../std/bind.hpp"
+#include "std/algorithm.hpp"
+#include "std/bind.hpp"
 
 namespace gui
 {
diff --git a/drape_gui/country_status_helper.cpp b/drape_gui/country_status_helper.cpp
index 2432118a1f..453319ee67 100644
--- a/drape_gui/country_status_helper.cpp
+++ b/drape_gui/country_status_helper.cpp
@@ -1,11 +1,11 @@
 #include "country_status_helper.hpp"
 #include "drape_gui.hpp"
 
-#include "../storage/index.hpp"
+#include "storage/index.hpp"
 
-#include "../base/stl_add.hpp"
-#include "../base/string_utils.hpp"
-#include "../base/string_format.hpp"
+#include "base/stl_add.hpp"
+#include "base/string_utils.hpp"
+#include "base/string_format.hpp"
 
 namespace gui
 {
diff --git a/drape_gui/country_status_helper.hpp b/drape_gui/country_status_helper.hpp
index 20d1ac30f0..d2df9006fd 100644
--- a/drape_gui/country_status_helper.hpp
+++ b/drape_gui/country_status_helper.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "../drape/pointers.hpp"
+#include "drape/pointers.hpp"
 
-#include "../base/buffer_vector.hpp"
+#include "base/buffer_vector.hpp"
 
-#include "../std/atomic.hpp"
-#include "../std/string.hpp"
+#include "std/atomic.hpp"
+#include "std/string.hpp"
 
 namespace storage { struct TIndex; }
 
diff --git a/drape_gui/drape_gui.cpp b/drape_gui/drape_gui.cpp
index d057fa27d6..b2d89a55ad 100644
--- a/drape_gui/drape_gui.cpp
+++ b/drape_gui/drape_gui.cpp
@@ -2,7 +2,7 @@
 #include "drape_gui.hpp"
 #include "ruler_helper.hpp"
 
-#include "../base/assert.hpp"
+#include "base/assert.hpp"
 
 namespace gui
 {
diff --git a/drape_gui/drape_gui.hpp b/drape_gui/drape_gui.hpp
index c0da0baeb8..5316167643 100644
--- a/drape_gui/drape_gui.hpp
+++ b/drape_gui/drape_gui.hpp
@@ -2,13 +2,13 @@
 
 #include "skin.hpp"
 
-#include "../storage/index.hpp"
-#include "../storage/storage_defines.hpp"
+#include "storage/index.hpp"
+#include "storage/storage_defines.hpp"
 
-#include "../drape/pointers.hpp"
+#include "drape/pointers.hpp"
 
-#include "../std/function.hpp"
-#include "../std/unique_ptr.hpp"
+#include "std/function.hpp"
+#include "std/unique_ptr.hpp"
 
 class ScreenBase;
 
diff --git a/drape_gui/drape_gui_tests/skin_tests.cpp b/drape_gui/drape_gui_tests/skin_tests.cpp
index e089ffcdbd..c330b4cb5c 100644
--- a/drape_gui/drape_gui_tests/skin_tests.cpp
+++ b/drape_gui/drape_gui_tests/skin_tests.cpp
@@ -1,8 +1,8 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "../skin.hpp"
-#include "../drape_gui.hpp"
+#include "drape_gui/skin.hpp"
+#include "drape_gui/drape_gui.hpp"
 
 UNIT_TEST(ParseDefaultSkinTest)
 {
diff --git a/drape_gui/gui_text.cpp b/drape_gui/gui_text.cpp
index 493138d01d..2930c5a477 100644
--- a/drape_gui/gui_text.cpp
+++ b/drape_gui/gui_text.cpp
@@ -1,17 +1,17 @@
 #include "gui_text.hpp"
 #include "drape_gui.hpp"
 
-#include "../base/string_utils.hpp"
-#include "../base/stl_add.hpp"
+#include "base/string_utils.hpp"
+#include "base/stl_add.hpp"
 
-#include "../drape/fribidi.hpp"
-#include "../drape/glsl_func.hpp"
-#include "../drape/shader_def.hpp"
+#include "drape/fribidi.hpp"
+#include "drape/glsl_func.hpp"
+#include "drape/shader_def.hpp"
 
-#include "../std/algorithm.hpp"
-#include "../std/static_assert.hpp"
-#include "../std/type_traits.hpp"
-#include "../std/unique_ptr.hpp"
+#include "std/algorithm.hpp"
+#include "std/static_assert.hpp"
+#include "std/type_traits.hpp"
+#include "std/unique_ptr.hpp"
 
 namespace gui
 {
diff --git a/drape_gui/gui_text.hpp b/drape_gui/gui_text.hpp
index 1cd463a1db..610b606727 100644
--- a/drape_gui/gui_text.hpp
+++ b/drape_gui/gui_text.hpp
@@ -2,14 +2,14 @@
 
 #include "shape.hpp"
 
-#include "../drape/binding_info.hpp"
-#include "../drape/drape_global.hpp"
-#include "../drape/glsl_types.hpp"
-#include "../drape/glstate.hpp"
-#include "../drape/texture_manager.hpp"
+#include "drape/binding_info.hpp"
+#include "drape/drape_global.hpp"
+#include "drape/glsl_types.hpp"
+#include "drape/glstate.hpp"
+#include "drape/texture_manager.hpp"
 
-#include "../std/stdint.hpp"
-#include "../std/utility.hpp"
+#include "std/stdint.hpp"
+#include "std/utility.hpp"
 
 namespace gui
 {
diff --git a/drape_gui/layer_render.cpp b/drape_gui/layer_render.cpp
index 02724ac280..0f844a2b3d 100644
--- a/drape_gui/layer_render.cpp
+++ b/drape_gui/layer_render.cpp
@@ -7,12 +7,12 @@
 #include "ruler.hpp"
 #include "ruler_helper.hpp"
 
-#include "../drape/batcher.hpp"
-#include "../drape/render_bucket.hpp"
+#include "drape/batcher.hpp"
+#include "drape/render_bucket.hpp"
 
-#include "../base/stl_add.hpp"
+#include "base/stl_add.hpp"
 
-#include "../std/bind.hpp"
+#include "std/bind.hpp"
 
 namespace gui
 {
diff --git a/drape_gui/layer_render.hpp b/drape_gui/layer_render.hpp
index e740787760..26fa8b6770 100644
--- a/drape_gui/layer_render.hpp
+++ b/drape_gui/layer_render.hpp
@@ -3,13 +3,13 @@
 #include "skin.hpp"
 #include "shape.hpp"
 
-#include "../drape/texture_manager.hpp"
-#include "../drape/gpu_program_manager.hpp"
+#include "drape/texture_manager.hpp"
+#include "drape/gpu_program_manager.hpp"
 
-#include "../geometry/screenbase.hpp"
+#include "geometry/screenbase.hpp"
 
-#include "../std/map.hpp"
-#include "../std/unique_ptr.hpp"
+#include "std/map.hpp"
+#include "std/unique_ptr.hpp"
 
 namespace gui
 {
diff --git a/drape_gui/ruler.cpp b/drape_gui/ruler.cpp
index 3680dae4d1..d6c2370f7c 100644
--- a/drape_gui/ruler.cpp
+++ b/drape_gui/ruler.cpp
@@ -3,11 +3,11 @@
 #include "ruler.hpp"
 #include "ruler_helper.hpp"
 
-#include "../drape/glsl_func.hpp"
-#include "../drape/glsl_types.hpp"
-#include "../drape/shader_def.hpp"
+#include "drape/glsl_func.hpp"
+#include "drape/glsl_types.hpp"
+#include "drape/shader_def.hpp"
 
-#include "../std/bind.hpp"
+#include "std/bind.hpp"
 
 namespace gui
 {
diff --git a/drape_gui/ruler_helper.cpp b/drape_gui/ruler_helper.cpp
index 1b3bf9e18e..383ce30f8e 100644
--- a/drape_gui/ruler_helper.cpp
+++ b/drape_gui/ruler_helper.cpp
@@ -1,16 +1,17 @@
-#include "ruler_helper.hpp"
-#include "drape_gui.hpp"
+#include "drape_gui/ruler_helper.hpp"
+#include "drape_gui/drape_gui.hpp"
 
-#include "../platform/settings.hpp"
-#include "../indexer/mercator.hpp"
-#include "../indexer/measurement_utils.hpp"
-#include "../geometry/screenbase.hpp"
+#include "platform/settings.hpp"
+#include "platform/measurement_utils.hpp"
 
-#include "../base/macros.hpp"
+#include "indexer/mercator.hpp"
+#include "geometry/screenbase.hpp"
 
-#include "../std/algorithm.hpp"
-#include "../std/numeric.hpp"
-#include "../std/iterator.hpp"
+#include "base/macros.hpp"
+
+#include "std/algorithm.hpp"
+#include "std/numeric.hpp"
+#include "std/iterator.hpp"
 
 namespace gui
 {
diff --git a/drape_gui/ruler_helper.hpp b/drape_gui/ruler_helper.hpp
index ded3cc8d20..fd024dac35 100644
--- a/drape_gui/ruler_helper.hpp
+++ b/drape_gui/ruler_helper.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../std/string.hpp"
+#include "std/string.hpp"
 
 class ScreenBase;
 
diff --git a/drape_gui/shape.cpp b/drape_gui/shape.cpp
index eddae874f5..eec8f24425 100644
--- a/drape_gui/shape.cpp
+++ b/drape_gui/shape.cpp
@@ -1,7 +1,7 @@
 #include "shape.hpp"
 
-#include "../drape/glsl_func.hpp"
-#include "../drape/utils/projection.hpp"
+#include "drape/glsl_func.hpp"
+#include "drape/utils/projection.hpp"
 
 namespace gui
 {
diff --git a/drape_gui/shape.hpp b/drape_gui/shape.hpp
index f233c05d34..cd4f2ba4ea 100644
--- a/drape_gui/shape.hpp
+++ b/drape_gui/shape.hpp
@@ -2,13 +2,13 @@
 
 #include "skin.hpp"
 
-#include "../drape/batcher.hpp"
-#include "../drape/glsl_types.hpp"
-#include "../drape/glstate.hpp"
-#include "../drape/gpu_program_manager.hpp"
-#include "../drape/overlay_handle.hpp"
-#include "../drape/texture_manager.hpp"
-#include "../drape/vertex_array_buffer.hpp"
+#include "drape/batcher.hpp"
+#include "drape/glsl_types.hpp"
+#include "drape/glstate.hpp"
+#include "drape/gpu_program_manager.hpp"
+#include "drape/overlay_handle.hpp"
+#include "drape/texture_manager.hpp"
+#include "drape/vertex_array_buffer.hpp"
 
 namespace gui
 {
diff --git a/drape_gui/skin.cpp b/drape_gui/skin.cpp
index 4792bc8d70..a606adde99 100644
--- a/drape_gui/skin.cpp
+++ b/drape_gui/skin.cpp
@@ -1,10 +1,10 @@
 #include "skin.hpp"
 #include "drape_gui.hpp"
 
-#include "../platform/platform.hpp"
-#include "../coding/parse_xml.hpp"
-#include "../base/string_utils.hpp"
-#include "../std/function.hpp"
+#include "platform/platform.hpp"
+#include "coding/parse_xml.hpp"
+#include "base/string_utils.hpp"
+#include "std/function.hpp"
 
 namespace gui
 {
diff --git a/drape_gui/skin.hpp b/drape_gui/skin.hpp
index b090154cf5..71b701033a 100644
--- a/drape_gui/skin.hpp
+++ b/drape_gui/skin.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../drape/drape_global.hpp"
-#include "../geometry/point2d.hpp"
-#include "../coding/reader.hpp"
+#include "drape/drape_global.hpp"
+#include "geometry/point2d.hpp"
+#include "coding/reader.hpp"
 
-#include "../std/map.hpp"
+#include "std/map.hpp"
 
 namespace gui
 {
diff --git a/geometry/robust_orientation.cpp b/geometry/robust_orientation.cpp
index 18844a8e93..e7f2e99aad 100644
--- a/geometry/robust_orientation.cpp
+++ b/geometry/robust_orientation.cpp
@@ -9,10 +9,10 @@ extern "C"
 #if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wconditional-uninitialized"
-#include "../3party/robust/predicates.c"
+#include "3party/robust/predicates.c"
 #pragma clang diagnostic pop
 #else
-#include "../3party/robust/predicates.c"
+#include "3party/robust/predicates.c"
 #endif
 }
 
diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index d46961bdf0..899e751f34 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -8,7 +8,7 @@
 
 #include "platform/preferred_languages.hpp"
 
-#include "../defines.hpp" // just for file extensions
+#include "defines.hpp" // just for file extensions
 
 
 using namespace feature;
diff --git a/indexer/indexer_tests/indexer_tests.pro b/indexer/indexer_tests/indexer_tests.pro
index d96eb346cc..fa2b705834 100644
--- a/indexer/indexer_tests/indexer_tests.pro
+++ b/indexer/indexer_tests/indexer_tests.pro
@@ -37,4 +37,3 @@ SOURCES += \
     test_polylines.cpp \
     test_type.cpp \
     visibility_test.cpp \
-    measurement_tests.cpp \
diff --git a/indexer/indexer_tests/search_string_utils_test.cpp b/indexer/indexer_tests/search_string_utils_test.cpp
index 10d92a9c59..b4cf3eecb1 100644
--- a/indexer/indexer_tests/search_string_utils_test.cpp
+++ b/indexer/indexer_tests/search_string_utils_test.cpp
@@ -1,7 +1,7 @@
-#include "../../testing/testing.hpp"
-#include "../search_string_utils.hpp"
+#include "testing/testing.hpp"
+#include "indexer/search_string_utils.hpp"
 
-#include "../../base/string_utils.hpp"
+#include "base/string_utils.hpp"
 
 UNIT_TEST(FeatureTypeToString)
 {
diff --git a/indexer/indexer_tests/test_polylines.hpp b/indexer/indexer_tests/test_polylines.hpp
index 12e80f4fe2..77171d2a5a 100644
--- a/indexer/indexer_tests/test_polylines.hpp
+++ b/indexer/indexer_tests/test_polylines.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../geometry/point2d.hpp"
+#include "geometry/point2d.hpp"
 
 namespace index_test
 {
diff --git a/indexer/search_index_builder.cpp b/indexer/search_index_builder.cpp
index 0048ad9108..6ac289ce5a 100644
--- a/indexer/search_index_builder.cpp
+++ b/indexer/search_index_builder.cpp
@@ -12,7 +12,7 @@
 #include "indexer/string_file.hpp"
 #include "indexer/string_file_values.hpp"
 
-#include "../search/search_common.hpp"    // for MAX_TOKENS constant
+#include "search/search_common.hpp"    // for MAX_TOKENS constant
 
 #include "defines.hpp"
 
diff --git a/map/bookmark.cpp b/map/bookmark.cpp
index adde3dbb76..61470cc16f 100644
--- a/map/bookmark.cpp
+++ b/map/bookmark.cpp
@@ -11,7 +11,7 @@
 #include "indexer/mercator.hpp"
 
 #include "coding/file_reader.hpp"
-#include "../coding/parse_xml.hpp"  // LoadFromKML
+#include "coding/parse_xml.hpp"  // LoadFromKML
 #include "coding/internal/file_data.hpp"
 #include "coding/hex.hpp"
 
diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp
index b917b65218..ed3f3024fe 100644
--- a/map/bookmark_manager.cpp
+++ b/map/bookmark_manager.cpp
@@ -2,8 +2,6 @@
 #include "map/framework.hpp"
 #include "map/user_mark.hpp"
 
-#include "graphics/depth_constants.hpp"
-
 #include "platform/platform.hpp"
 #include "platform/settings.hpp"
 
diff --git a/map/compass_arrow.cpp b/map/compass_arrow.cpp
index 7f1ca34338..7cf8ac146a 100644
--- a/map/compass_arrow.cpp
+++ b/map/compass_arrow.cpp
@@ -4,16 +4,8 @@
 
 #include "anim/controller.hpp"
 
-#include "gui/controller.hpp"
-
 #include "geometry/transformations.hpp"
 
-#include "graphics/display_list.hpp"
-#include "graphics/screen.hpp"
-
-
-using namespace graphics;
-
 CompassArrow::Params::Params()
   : m_framework(0)
 {}
diff --git a/map/map_tests/bookmarks_test.cpp b/map/map_tests/bookmarks_test.cpp
index b44278ef5a..b38cf3324b 100644
--- a/map/map_tests/bookmarks_test.cpp
+++ b/map/map_tests/bookmarks_test.cpp
@@ -9,8 +9,6 @@
 #include "platform/platform.hpp"
 #include "platform/preferred_languages.hpp"
 
-#include "graphics/color.hpp"
-
 #include "coding/internal/file_data.hpp"
 
 #include "std/fstream.hpp"
diff --git a/map/storage_bridge.hpp b/map/storage_bridge.hpp
index 772f5a3825..e0ab642e4e 100644
--- a/map/storage_bridge.hpp
+++ b/map/storage_bridge.hpp
@@ -2,10 +2,10 @@
 
 #include "active_maps_layout.hpp"
 
-#include "../drape_gui/drape_gui.hpp"
+#include "drape_gui/drape_gui.hpp"
 
-#include "../storage/index.hpp"
-#include "../storage/storage_defines.hpp"
+#include "storage/index.hpp"
+#include "storage/storage_defines.hpp"
 
 /// Provide access to Storage in DrapeGui subsystem. Need to CountryStatus buttons
 class StorageBridge : public gui::StorageAccessor
diff --git a/map/user_mark_container.cpp b/map/user_mark_container.cpp
index de97a6499c..275bcf3f82 100644
--- a/map/user_mark_container.cpp
+++ b/map/user_mark_container.cpp
@@ -1,6 +1,5 @@
-#include "map/user_mark_container.hpp"
-
 #include "map/framework.hpp"
+#include "map/user_mark_container.hpp"
 
 #include "drape_frontend/drape_engine.hpp"
 #include "drape_frontend/tile_key.hpp"
diff --git a/platform/http_thread_apple.h b/platform/http_thread_apple.h
index f0a1ccd3b6..19cc40e0ea 100644
--- a/platform/http_thread_apple.h
+++ b/platform/http_thread_apple.h
@@ -2,8 +2,8 @@
 
 #import <Foundation/Foundation.h>
 
-#include "../std/string.hpp"
-#include "../std/target_os.hpp"
+#include "std/string.hpp"
+#include "std/target_os.hpp"
 
 namespace downloader { class IHttpThreadCallback; }
 
diff --git a/platform/preferred_languages.cpp b/platform/preferred_languages.cpp
index c931a98cc9..7cae56ece0 100644
--- a/platform/preferred_languages.cpp
+++ b/platform/preferred_languages.cpp
@@ -12,12 +12,12 @@
   #include <CoreFoundation/CFString.h>
 
 #elif defined(OMIM_OS_WINDOWS)
-  #include "../std/windows.hpp"
+  #include "std/windows.hpp"
   // for XP it's not defined
   #define MUI_LANGUAGE_NAME 0x8
 
 #elif defined(OMIM_OS_LINUX)
-  #include "../std/cstdlib.hpp"
+  #include "std/cstdlib.hpp"
 
 #elif defined(OMIM_OS_ANDROID)
   /// Body for this function is inside android/jni sources
diff --git a/routing/routing_integration_tests/osrm_route_test.cpp b/routing/routing_integration_tests/osrm_route_test.cpp
index e17e11a3e2..b100b0334a 100644
--- a/routing/routing_integration_tests/osrm_route_test.cpp
+++ b/routing/routing_integration_tests/osrm_route_test.cpp
@@ -2,7 +2,7 @@
 
 #include "routing/routing_integration_tests/routing_test_tools.hpp"
 
-#include "../../indexer/mercator.hpp"
+#include "indexer/mercator.hpp"
 
 using namespace routing;
 
diff --git a/search/feature_offset_match.hpp b/search/feature_offset_match.hpp
index 4179e29b6f..bccfa178a4 100644
--- a/search/feature_offset_match.hpp
+++ b/search/feature_offset_match.hpp
@@ -17,7 +17,6 @@
 #include "std/utility.hpp"
 #include "std/vector.hpp"
 
-
 namespace search
 {
 namespace impl
diff --git a/tools/autobuild/shader_preprocessor.py b/tools/autobuild/shader_preprocessor.py
index 729e980bba..76634897d0 100644
--- a/tools/autobuild/shader_preprocessor.py
+++ b/tools/autobuild/shader_preprocessor.py
@@ -145,7 +145,7 @@ def writeImplementationFile(programsDef, programIndex, shaderIndex, shaderDir, i
     fragmentShaders = [s for s in shaders if s.endswith(".fsh")]
     file = open(formatOutFilePath(shaderDir, implFile), 'w')
     file.write("#include \"%s\"\n\n" % (defFile))
-    file.write("#include \"../std/utility.hpp\"\n\n")
+    file.write("#include \"std/utility.hpp\"\n\n")
 
     file.write("namespace gpu\n")
     file.write("{\n\n")