Fix include path for drape

95 files changed, 389 insertions, 389 deletions

diff --git a/drape/attribute_buffer_mutator.cpp b/drape/attribute_buffer_mutator.cpp
index 4554482385..f112652542 100644
--- a/drape/attribute_buffer_mutator.cpp
+++ b/drape/attribute_buffer_mutator.cpp
@@ -1,4 +1,4 @@
-#include "attribute_buffer_mutator.hpp"
+#include "drape/attribute_buffer_mutator.hpp"
 
 namespace dp
 {
diff --git a/drape/attribute_buffer_mutator.hpp b/drape/attribute_buffer_mutator.hpp
index dfc77359e2..32c2c152fb 100644
--- a/drape/attribute_buffer_mutator.hpp
+++ b/drape/attribute_buffer_mutator.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "pointers.hpp"
-#include "binding_info.hpp"
+#include "drape/pointers.hpp"
+#include "drape/binding_info.hpp"
 
-#include "../base/shared_buffer_manager.hpp"
+#include "base/shared_buffer_manager.hpp"
 
-#include "../std/stdint.hpp"
-#include "../std/map.hpp"
+#include "std/stdint.hpp"
+#include "std/map.hpp"
 
 namespace dp
 {
diff --git a/drape/attribute_provider.cpp b/drape/attribute_provider.cpp
index 3efc106de0..940030240b 100644
--- a/drape/attribute_provider.cpp
+++ b/drape/attribute_provider.cpp
@@ -1,5 +1,5 @@
-#include "attribute_provider.hpp"
-#include "../base/assert.hpp"
+#include "drape/attribute_provider.hpp"
+#include "base/assert.hpp"
 
 #ifdef DEBUG
   #define INIT_CHECK_INFO(x) m_checkInfo = vector<bool>((vector<bool>::size_type)(x), false);
diff --git a/drape/attribute_provider.hpp b/drape/attribute_provider.hpp
index fb371a96f7..8aa473d334 100644
--- a/drape/attribute_provider.hpp
+++ b/drape/attribute_provider.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "pointers.hpp"
-#include "binding_info.hpp"
+#include "drape/pointers.hpp"
+#include "drape/binding_info.hpp"
 
-#include "../std/vector.hpp"
+#include "std/vector.hpp"
 
 namespace dp
 {
diff --git a/drape/batcher.cpp b/drape/batcher.cpp
index c38cc5c45e..cbb7159a89 100644
--- a/drape/batcher.cpp
+++ b/drape/batcher.cpp
@@ -1,11 +1,11 @@
-#include "batcher.hpp"
-#include "cpu_buffer.hpp"
-#include "batcher_helpers.hpp"
-#include "vertex_array_buffer.hpp"
+#include "drape/batcher.hpp"
+#include "drape/cpu_buffer.hpp"
+#include "drape/batcher_helpers.hpp"
+#include "drape/vertex_array_buffer.hpp"
 
-#include "../base/assert.hpp"
+#include "base/assert.hpp"
 
-#include "../std/bind.hpp"
+#include "std/bind.hpp"
 
 namespace dp
 {
diff --git a/drape/batcher.hpp b/drape/batcher.hpp
index 1ee8e0a4f7..82b6d835bc 100644
--- a/drape/batcher.hpp
+++ b/drape/batcher.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "pointers.hpp"
-#include "glstate.hpp"
-#include "render_bucket.hpp"
-#include "attribute_provider.hpp"
-#include "overlay_handle.hpp"
-
-#include "../std/map.hpp"
-#include "../std/function.hpp"
+#include "drape/pointers.hpp"
+#include "drape/glstate.hpp"
+#include "drape/render_bucket.hpp"
+#include "drape/attribute_provider.hpp"
+#include "drape/overlay_handle.hpp"
+
+#include "std/map.hpp"
+#include "std/function.hpp"
 
 namespace dp
 {
diff --git a/drape/batcher_helpers.cpp b/drape/batcher_helpers.cpp
index 1e104bd9d5..3b92aaec37 100644
--- a/drape/batcher_helpers.cpp
+++ b/drape/batcher_helpers.cpp
@@ -1,10 +1,10 @@
-#include "batcher_helpers.hpp"
-#include "attribute_provider.hpp"
-#include "cpu_buffer.hpp"
+#include "drape/batcher_helpers.hpp"
+#include "drape/attribute_provider.hpp"
+#include "drape/cpu_buffer.hpp"
 
-#include "../base/assert.hpp"
+#include "base/assert.hpp"
 
-#include "../std/algorithm.hpp"
+#include "std/algorithm.hpp"
 
 namespace dp
 {
diff --git a/drape/batcher_helpers.hpp b/drape/batcher_helpers.hpp
index 844083c02b..0270e097ec 100644
--- a/drape/batcher_helpers.hpp
+++ b/drape/batcher_helpers.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "pointers.hpp"
+#include "drape/pointers.hpp"
 
-#include "../std/function.hpp"
+#include "std/function.hpp"
 
 namespace dp
 {
diff --git a/drape/binding_info.cpp b/drape/binding_info.cpp
index 48a9bfcdf4..a1be34d59f 100644
--- a/drape/binding_info.cpp
+++ b/drape/binding_info.cpp
@@ -1,6 +1,6 @@
-#include "binding_info.hpp"
+#include "drape/binding_info.hpp"
 
-#include "../base/assert.hpp"
+#include "base/assert.hpp"
 
 namespace dp
 {
@@ -8,7 +8,7 @@ namespace dp
 namespace
 {
 
-#include "glIncludes.hpp"
+#include "drape/glIncludes.hpp"
 uint16_t sizeOfType(glConst type)
 {
   if (type == gl_const::GLByteType || type == gl_const::GLUnsignedByteType)
diff --git a/drape/binding_info.hpp b/drape/binding_info.hpp
index d334f6fbb6..3aa858d37a 100644
--- a/drape/binding_info.hpp
+++ b/drape/binding_info.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "glfunctions.hpp"
+#include "drape/glfunctions.hpp"
 
-#include "../std/string.hpp"
-#include "../std/shared_array.hpp"
+#include "std/string.hpp"
+#include "std/shared_array.hpp"
 
 namespace dp
 {
diff --git a/drape/buffer_base.cpp b/drape/buffer_base.cpp
index 7e97ca7cfa..34aa81bcdb 100644
--- a/drape/buffer_base.cpp
+++ b/drape/buffer_base.cpp
@@ -1,5 +1,5 @@
-#include "buffer_base.hpp"
-#include "../base/assert.hpp"
+#include "drape/buffer_base.hpp"
+#include "base/assert.hpp"
 
 namespace dp
 {
diff --git a/drape/buffer_base.hpp b/drape/buffer_base.hpp
index a27f49f2cf..2be7849249 100644
--- a/drape/buffer_base.hpp
+++ b/drape/buffer_base.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../std/stdint.hpp"
+#include "std/stdint.hpp"
 
 namespace dp
 {
diff --git a/drape/color.cpp b/drape/color.cpp
index b4269ec7e6..32f3ca9886 100644
--- a/drape/color.cpp
+++ b/drape/color.cpp
@@ -1,4 +1,4 @@
-#include "color.hpp"
+#include "drape/color.hpp"
 
 namespace dp
 {
diff --git a/drape/color.hpp b/drape/color.hpp
index 2507c13a39..0f1ada0b1d 100644
--- a/drape/color.hpp
+++ b/drape/color.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../std/stdint.hpp"
+#include "std/stdint.hpp"
 
 namespace dp
 {
diff --git a/drape/cpu_buffer.cpp b/drape/cpu_buffer.cpp
index 3ba8abe26d..c22d38502d 100644
--- a/drape/cpu_buffer.cpp
+++ b/drape/cpu_buffer.cpp
@@ -1,10 +1,10 @@
-#include "cpu_buffer.hpp"
+#include "drape/cpu_buffer.hpp"
 
-#include "../base/math.hpp"
-#include "../base/shared_buffer_manager.hpp"
-#include "../base/assert.hpp"
+#include "base/math.hpp"
+#include "base/shared_buffer_manager.hpp"
+#include "base/assert.hpp"
 
-#include "../std/cstring.hpp"
+#include "std/cstring.hpp"
 
 namespace dp
 {
diff --git a/drape/cpu_buffer.hpp b/drape/cpu_buffer.hpp
index a0bff314b6..d0836919b9 100644
--- a/drape/cpu_buffer.hpp
+++ b/drape/cpu_buffer.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "buffer_base.hpp"
+#include "drape/buffer_base.hpp"
 
-#include "../std/vector.hpp"
-#include "../std/shared_ptr.hpp"
+#include "std/vector.hpp"
+#include "std/shared_ptr.hpp"
 
 namespace dp
 {
diff --git a/drape/data_buffer.cpp b/drape/data_buffer.cpp
index 961ed65412..e5180739d7 100644
--- a/drape/data_buffer.cpp
+++ b/drape/data_buffer.cpp
@@ -1,4 +1,4 @@
-#include "data_buffer.hpp"
+#include "drape/data_buffer.hpp"
 
 namespace dp
 {
diff --git a/drape/data_buffer.hpp b/drape/data_buffer.hpp
index 0607d6469a..f22c7a31c9 100644
--- a/drape/data_buffer.hpp
+++ b/drape/data_buffer.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "gpu_buffer.hpp"
+#include "drape/gpu_buffer.hpp"
 
 namespace dp
 {
diff --git a/drape/drape_tests/attribute_provides_tests.cpp b/drape/drape_tests/attribute_provides_tests.cpp
index 3713ea864b..abacefdb1e 100644
--- a/drape/drape_tests/attribute_provides_tests.cpp
+++ b/drape/drape_tests/attribute_provides_tests.cpp
@@ -1,6 +1,6 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../attribute_provider.hpp"
+#include "drape/attribute_provider.hpp"
 
 #include <gmock/gmock.h>
 
diff --git a/drape/drape_tests/batcher_tests.cpp b/drape/drape_tests/batcher_tests.cpp
index bf488235fb..77ec0edde3 100644
--- a/drape/drape_tests/batcher_tests.cpp
+++ b/drape/drape_tests/batcher_tests.cpp
@@ -1,21 +1,21 @@
-#include "../../testing/testing.hpp"
-#include "memory_comparer.hpp"
+#include "testing/testing.hpp"
+#include "drape/drape_tests/memory_comparer.hpp"
 
-#include "../glconstants.hpp"
-#include "../batcher.hpp"
-#include "../gpu_program_manager.hpp"
-#include "../shader_def.hpp"
-#include "../vertex_array_buffer.hpp"
+#include "drape/glconstants.hpp"
+#include "drape/batcher.hpp"
+#include "drape/gpu_program_manager.hpp"
+#include "drape/shader_def.hpp"
+#include "drape/vertex_array_buffer.hpp"
 
-#include "glmock_functions.hpp"
+#include "drape/drape_tests/glmock_functions.hpp"
 
-#include "../../base/stl_add.hpp"
+#include "base/stl_add.hpp"
 
-#include "../../std/bind.hpp"
-#include "../../std/scoped_ptr.hpp"
-#include "../../std/cstring.hpp"
-#include "../../std/function.hpp"
-#include "../../std/bind.hpp"
+#include "std/bind.hpp"
+#include "std/scoped_ptr.hpp"
+#include "std/cstring.hpp"
+#include "std/function.hpp"
+#include "std/bind.hpp"
 
 #include <gmock/gmock.h>
 
diff --git a/drape/drape_tests/bingind_info_tests.cpp b/drape/drape_tests/bingind_info_tests.cpp
index d78231916d..e63c60d0a3 100644
--- a/drape/drape_tests/bingind_info_tests.cpp
+++ b/drape/drape_tests/bingind_info_tests.cpp
@@ -1,6 +1,6 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../../drape/binding_info.hpp"
+#include "drape/binding_info.hpp"
 
 using namespace dp;
 
diff --git a/drape/drape_tests/buffer_tests.cpp b/drape/drape_tests/buffer_tests.cpp
index 65a94cd688..116c4d7a3d 100644
--- a/drape/drape_tests/buffer_tests.cpp
+++ b/drape/drape_tests/buffer_tests.cpp
@@ -1,12 +1,12 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "glmock_functions.hpp"
+#include "drape/drape_tests/glmock_functions.hpp"
 
-#include "../gpu_buffer.hpp"
-#include "../data_buffer.hpp"
-#include "../index_buffer.hpp"
+#include "drape/gpu_buffer.hpp"
+#include "drape/data_buffer.hpp"
+#include "drape/index_buffer.hpp"
 
-#include "../../std/cstdlib.hpp"
+#include "std/cstdlib.hpp"
 
 #include <gmock/gmock.h>
 
diff --git a/drape/drape_tests/compile_shaders_test.cpp b/drape/drape_tests/compile_shaders_test.cpp
index 9b6dafbec9..2962581d73 100644
--- a/drape/drape_tests/compile_shaders_test.cpp
+++ b/drape/drape_tests/compile_shaders_test.cpp
@@ -1,19 +1,19 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../../drape/shader_def.hpp"
-#include "../../drape/shader.hpp"
+#include "drape/shader_def.hpp"
+#include "drape/shader.hpp"
 
-#include "../glconstants.hpp"
+#include "drape/glconstants.hpp"
 
-#include "glmock_functions.hpp"
+#include "drape/drape_tests/glmock_functions.hpp"
 
-#include "../../base/scope_guard.hpp"
-#include "../../platform/platform.hpp"
+#include "base/scope_guard.hpp"
+#include "platform/platform.hpp"
 
-#include "../../std/sstream.hpp"
-#include "../../std/target_os.hpp"
-#include "../../std/vector.hpp"
-#include "../../std/string.hpp"
+#include "std/sstream.hpp"
+#include "std/target_os.hpp"
+#include "std/vector.hpp"
+#include "std/string.hpp"
 
 #include <QtCore/QProcess>
 #include <QtCore/QDebug>
diff --git a/drape/drape_tests/dummy_texture.hpp b/drape/drape_tests/dummy_texture.hpp
index ebbdcbc0fb..50ab40df2f 100644
--- a/drape/drape_tests/dummy_texture.hpp
+++ b/drape/drape_tests/dummy_texture.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../pointers.hpp"
-#include "../texture.hpp"
+#include "drape/pointers.hpp"
+#include "drape/texture.hpp"
 
 class DummyTexture : public dp::Texture
 {
diff --git a/drape/drape_tests/failure_reporter.cpp b/drape/drape_tests/failure_reporter.cpp
index 56f80a9d6c..94a4161c94 100644
--- a/drape/drape_tests/failure_reporter.cpp
+++ b/drape/drape_tests/failure_reporter.cpp
@@ -1,6 +1,6 @@
 #include <gmock/internal/gmock-internal-utils.h>
 
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
 namespace testing
 {
diff --git a/drape/drape_tests/font_texture_tests.cpp b/drape/drape_tests/font_texture_tests.cpp
index 07b6d44f13..c60f4c502c 100644
--- a/drape/drape_tests/font_texture_tests.cpp
+++ b/drape/drape_tests/font_texture_tests.cpp
@@ -1,19 +1,19 @@
-#include "../../testing/testing.hpp"
-#include "img.hpp"
-#include "dummy_texture.hpp"
+#include "testing/testing.hpp"
+#include "drape/drape_tests/img.hpp"
+#include "drape/drape_tests/dummy_texture.hpp"
 
-#include "../font_texture.hpp"
-#include "../glyph_manager.hpp"
+#include "drape/font_texture.hpp"
+#include "drape/glyph_manager.hpp"
 
-#include "../../platform/platform.hpp"
-#include "../../qt_tstfrm/test_main_loop.hpp"
+#include "platform/platform.hpp"
+#include "qt_tstfrm/test_main_loop.hpp"
 
-#include "../../std/bind.hpp"
+#include "std/bind.hpp"
 
 #include <QtGui/QPainter>
 #include <QtCore/QPoint>
 
-#include "glmock_functions.hpp"
+#include "drape/drape_tests/glmock_functions.hpp"
 
 #include <gmock/gmock.h>
 
diff --git a/drape/drape_tests/glfunctions.cpp b/drape/drape_tests/glfunctions.cpp
index e308d1e5c3..13ae00e13c 100644
--- a/drape/drape_tests/glfunctions.cpp
+++ b/drape/drape_tests/glfunctions.cpp
@@ -1,7 +1,7 @@
-#include "../glfunctions.hpp"
-#include "glmock_functions.hpp"
+#include "drape/glfunctions.hpp"
+#include "drape/drape_tests/glmock_functions.hpp"
 
-#include "../../base/assert.hpp"
+#include "base/assert.hpp"
 
 using namespace emul;
 
diff --git a/drape/drape_tests/glmock_functions.cpp b/drape/drape_tests/glmock_functions.cpp
index 25cf406d18..0d7ff6e746 100644
--- a/drape/drape_tests/glmock_functions.cpp
+++ b/drape/drape_tests/glmock_functions.cpp
@@ -1,4 +1,4 @@
-#include "glmock_functions.hpp"
+#include "drape/drape_tests/glmock_functions.hpp"
 
 namespace emul
 {
diff --git a/drape/drape_tests/glmock_functions.hpp b/drape/drape_tests/glmock_functions.hpp
index d3517ea82c..b4442a9c44 100644
--- a/drape/drape_tests/glmock_functions.hpp
+++ b/drape/drape_tests/glmock_functions.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../glconstants.hpp"
-#include "../../std/string.hpp"
+#include "drape/glconstants.hpp"
+#include "std/string.hpp"
 
 #include <gmock/gmock.h>
 
diff --git a/drape/drape_tests/glyph_mng_tests.cpp b/drape/drape_tests/glyph_mng_tests.cpp
index 10b8278760..3f1cd2b002 100644
--- a/drape/drape_tests/glyph_mng_tests.cpp
+++ b/drape/drape_tests/glyph_mng_tests.cpp
@@ -1,17 +1,17 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "img.hpp"
+#include "drape/drape_tests/img.hpp"
 
 #include <QtGui/QPainter>
 
-#include "../../qt_tstfrm/test_main_loop.hpp"
+#include "qt_tstfrm/test_main_loop.hpp"
 
-#include "../glyph_manager.hpp"
-#include "../../platform/platform.hpp"
+#include "drape/glyph_manager.hpp"
+#include "platform/platform.hpp"
 
-#include "../../std/cstring.hpp"
-#include "../../std/function.hpp"
-#include "../../std/bind.hpp"
+#include "std/cstring.hpp"
+#include "std/function.hpp"
+#include "std/bind.hpp"
 
 namespace
 {
diff --git a/drape/drape_tests/glyph_packer_test.cpp b/drape/drape_tests/glyph_packer_test.cpp
index 15f32a3057..3004cd65f9 100644
--- a/drape/drape_tests/glyph_packer_test.cpp
+++ b/drape/drape_tests/glyph_packer_test.cpp
@@ -1,5 +1,5 @@
-#include "../../testing/testing.hpp"
-#include "../font_texture.hpp"
+#include "testing/testing.hpp"
+#include "drape/font_texture.hpp"
 
 UNIT_TEST(SimplePackTest)
 {
diff --git a/drape/drape_tests/img.cpp b/drape/drape_tests/img.cpp
index b05088debf..34492d1129 100644
--- a/drape/drape_tests/img.cpp
+++ b/drape/drape_tests/img.cpp
@@ -1,4 +1,4 @@
-#include "img.hpp"
+#include "drape/drape_tests/img.hpp"
 
 void cleanUpQImageMemory(void * mem)
 {
diff --git a/drape/drape_tests/memory_comparer.hpp b/drape/drape_tests/memory_comparer.hpp
index 7eca3b2afa..d7cdd0e003 100644
--- a/drape/drape_tests/memory_comparer.hpp
+++ b/drape/drape_tests/memory_comparer.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../../testing/testing.hpp"
-#include "../glconstants.hpp"
-#include "../../base/logging.hpp"
+#include "testing/testing.hpp"
+#include "drape/glconstants.hpp"
+#include "base/logging.hpp"
 
-#include "../../std/cstring.hpp"
+#include "std/cstring.hpp"
 
 namespace dp
 {
diff --git a/drape/drape_tests/pointers_tests.cpp b/drape/drape_tests/pointers_tests.cpp
index c9b7ee446f..6fe1b527ff 100644
--- a/drape/drape_tests/pointers_tests.cpp
+++ b/drape/drape_tests/pointers_tests.cpp
@@ -1,11 +1,11 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../../drape/pointers.hpp"
+#include "drape/pointers.hpp"
 
-#include "../../base/assert.hpp"
+#include "base/assert.hpp"
 
-#include "../../std/string.hpp"
-#include "../../std/shared_ptr.hpp"
+#include "std/string.hpp"
+#include "std/shared_ptr.hpp"
 
 #include <gmock/gmock.h>
 
diff --git a/drape/drape_tests/stipple_pen_tests.cpp b/drape/drape_tests/stipple_pen_tests.cpp
index 642d78ece2..a336c587dc 100644
--- a/drape/drape_tests/stipple_pen_tests.cpp
+++ b/drape/drape_tests/stipple_pen_tests.cpp
@@ -1,14 +1,14 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "memory_comparer.hpp"
-#include "dummy_texture.hpp"
+#include "drape/drape_tests/memory_comparer.hpp"
+#include "drape/drape_tests/dummy_texture.hpp"
 
-#include "../glconstants.hpp"
-#include "../stipple_pen_resource.hpp"
-#include "../texture.hpp"
+#include "drape/glconstants.hpp"
+#include "drape/stipple_pen_resource.hpp"
+#include "drape/texture.hpp"
 
 
-#include "glmock_functions.hpp"
+#include "drape/drape_tests/glmock_functions.hpp"
 
 #include <gmock/gmock.h>
 
diff --git a/drape/drape_tests/testingmain.cpp b/drape/drape_tests/testingmain.cpp
index 90a1696221..d1f6c6fa60 100644
--- a/drape/drape_tests/testingmain.cpp
+++ b/drape/drape_tests/testingmain.cpp
@@ -1,17 +1,17 @@
-#include "../../testing/testregister.hpp"
-#include "../../testing/testing.hpp"
+#include "testing/testregister.hpp"
+#include "testing/testing.hpp"
 
-#include "../../base/logging.hpp"
-#include "../../base/scope_guard.hpp"
+#include "base/logging.hpp"
+#include "base/scope_guard.hpp"
 
-#include "../../std/algorithm.hpp"
-#include "../../std/iostream.hpp"
-#include "../../std/string.hpp"
-#include "../../std/vector.hpp"
-#include "../../std/target_os.hpp"
-#include "../../std/bind.hpp"
+#include "std/algorithm.hpp"
+#include "std/iostream.hpp"
+#include "std/string.hpp"
+#include "std/vector.hpp"
+#include "std/target_os.hpp"
+#include "std/bind.hpp"
 
-#include "glmock_functions.hpp"
+#include "drape/drape_tests/glmock_functions.hpp"
 
 
 #ifdef OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP
diff --git a/drape/drape_tests/texture_of_colors_tests.cpp b/drape/drape_tests/texture_of_colors_tests.cpp
index 612e9bdce2..7be8585a07 100644
--- a/drape/drape_tests/texture_of_colors_tests.cpp
+++ b/drape/drape_tests/texture_of_colors_tests.cpp
@@ -1,13 +1,13 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "memory_comparer.hpp"
-#include "dummy_texture.hpp"
+#include "drape/drape_tests/memory_comparer.hpp"
+#include "drape/drape_tests/dummy_texture.hpp"
 
-#include "../glconstants.hpp"
-#include "../texture_of_colors.hpp"
-#include "../texture.hpp"
+#include "drape/glconstants.hpp"
+#include "drape/texture_of_colors.hpp"
+#include "drape/texture.hpp"
 
-#include "glmock_functions.hpp"
+#include "drape/drape_tests/glmock_functions.hpp"
 
 #include <gmock/gmock.h>
 
diff --git a/drape/drape_tests/uniform_value_tests.cpp b/drape/drape_tests/uniform_value_tests.cpp
index 3917975669..728471906d 100644
--- a/drape/drape_tests/uniform_value_tests.cpp
+++ b/drape/drape_tests/uniform_value_tests.cpp
@@ -1,13 +1,13 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../gpu_program_manager.hpp"
-#include "../gpu_program.hpp"
-#include "../shader_def.hpp"
-#include "../uniform_value.hpp"
+#include "drape/gpu_program_manager.hpp"
+#include "drape/gpu_program.hpp"
+#include "drape/shader_def.hpp"
+#include "drape/uniform_value.hpp"
 
-#include "glmock_functions.hpp"
+#include "drape/drape_tests/glmock_functions.hpp"
 
-#include "../../std/cstring.hpp"
+#include "std/cstring.hpp"
 
 #include <gmock/gmock.h>
 
diff --git a/drape/dynamic_texture.hpp b/drape/dynamic_texture.hpp
index 655f23c561..c35e84f035 100644
--- a/drape/dynamic_texture.hpp
+++ b/drape/dynamic_texture.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "texture.hpp"
-#include "glconstants.hpp"
+#include "drape/texture.hpp"
+#include "drape/glconstants.hpp"
 
 namespace dp
 {
diff --git a/drape/font_texture.cpp b/drape/font_texture.cpp
index 82832ffea1..0182a80f78 100644
--- a/drape/font_texture.cpp
+++ b/drape/font_texture.cpp
@@ -1,18 +1,18 @@
-#include "font_texture.hpp"
-#include "pointers.hpp"
-#include "utils/stb_image.h"
+#include "drape/font_texture.hpp"
+#include "drape/pointers.hpp"
+#include "drape/utils/stb_image.h"
 
-#include "../platform/platform.hpp"
-#include "../coding/reader.hpp"
+#include "platform/platform.hpp"
+#include "coding/reader.hpp"
 
-#include "../base/logging.hpp"
-#include "../base/string_utils.hpp"
-#include "../base/stl_add.hpp"
+#include "base/logging.hpp"
+#include "base/string_utils.hpp"
+#include "base/stl_add.hpp"
 
-#include "../std/string.hpp"
-#include "../std/vector.hpp"
-#include "../std/map.hpp"
-#include "../std/bind.hpp"
+#include "std/string.hpp"
+#include "std/vector.hpp"
+#include "std/map.hpp"
+#include "std/bind.hpp"
 
 #include <boost/gil/algorithm.hpp>
 #include <boost/gil/typedefs.hpp>
diff --git a/drape/font_texture.hpp b/drape/font_texture.hpp
index 87247399a3..633920c924 100644
--- a/drape/font_texture.hpp
+++ b/drape/font_texture.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "pointers.hpp"
-#include "texture.hpp"
-#include "glyph_manager.hpp"
-#include "dynamic_texture.hpp"
-
-#include "../std/map.hpp"
-#include "../std/vector.hpp"
-#include "../std/string.hpp"
+#include "drape/pointers.hpp"
+#include "drape/texture.hpp"
+#include "drape/glyph_manager.hpp"
+#include "drape/dynamic_texture.hpp"
+
+#include "std/map.hpp"
+#include "std/vector.hpp"
+#include "std/string.hpp"
 
 namespace dp
 {
diff --git a/drape/glIncludes.hpp b/drape/glIncludes.hpp
index 50264aa900..3dd15129b9 100644
--- a/drape/glIncludes.hpp
+++ b/drape/glIncludes.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../std/target_os.hpp"
+#include "std/target_os.hpp"
 
 #if defined(OMIM_OS_IPHONE)
   #define USE_OPENGLES20_IF_AVAILABLE 1
diff --git a/drape/glconstants.cpp b/drape/glconstants.cpp
index 8d54dd4465..bd7d524899 100644
--- a/drape/glconstants.cpp
+++ b/drape/glconstants.cpp
@@ -1,5 +1,5 @@
-#include "glconstants.hpp"
-#include "glIncludes.hpp"
+#include "drape/glconstants.hpp"
+#include "drape/glIncludes.hpp"
 
 #if !defined(GL_RGBA8_OES)
   #define GL_RGBA8_OES 0x8058
diff --git a/drape/glconstants.hpp b/drape/glconstants.hpp
index fa200ffb5d..5abfbb7df1 100644
--- a/drape/glconstants.hpp
+++ b/drape/glconstants.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../std/stdint.hpp"
+#include "std/stdint.hpp"
 
 typedef uint32_t glConst;
 
diff --git a/drape/glextensions_list.cpp b/drape/glextensions_list.cpp
index 0f255ba868..385e0be348 100644
--- a/drape/glextensions_list.cpp
+++ b/drape/glextensions_list.cpp
@@ -1,9 +1,9 @@
-#include "glextensions_list.hpp"
-#include "glfunctions.hpp"
+#include "drape/glextensions_list.hpp"
+#include "drape/glfunctions.hpp"
 
-#include "../base/assert.hpp"
+#include "base/assert.hpp"
 
-#include "../std/string.hpp"
+#include "std/string.hpp"
 
 namespace dp
 {
diff --git a/drape/glextensions_list.hpp b/drape/glextensions_list.hpp
index 55f714cc83..49b36ebfce 100644
--- a/drape/glextensions_list.hpp
+++ b/drape/glextensions_list.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../std/noncopyable.hpp"
+#include "std/noncopyable.hpp"
 
 namespace dp
 {
diff --git a/drape/glfunctions.cpp b/drape/glfunctions.cpp
index 622743f0ab..759bfaf039 100644
--- a/drape/glfunctions.cpp
+++ b/drape/glfunctions.cpp
@@ -1,16 +1,16 @@
-#include "glfunctions.hpp"
-#include "glIncludes.hpp"
+#include "drape/glfunctions.hpp"
+#include "drape/glIncludes.hpp"
 
-#include "../base/assert.hpp"
-#include "../base/logging.hpp"
+#include "base/assert.hpp"
+#include "base/logging.hpp"
 
 #ifdef DEBUG
-#include "../base/thread.hpp"
-#include "../base/mutex.hpp"
-#include "../std/map.hpp"
+#include "base/thread.hpp"
+#include "base/mutex.hpp"
+#include "std/map.hpp"
 #endif
 
-#include "../std/cstring.hpp"
+#include "std/cstring.hpp"
 
 #ifndef OMIM_OS_WINDOWS
 #define APIENTRY
diff --git a/drape/glfunctions.hpp b/drape/glfunctions.hpp
index 34045ef28d..5dbc544a30 100644
--- a/drape/glfunctions.hpp
+++ b/drape/glfunctions.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "glconstants.hpp"
-#include "../std/string.hpp"
+#include "drape/glconstants.hpp"
+#include "std/string.hpp"
 
 class GLFunctions
 {
diff --git a/drape/glsl_types.hpp b/drape/glsl_types.hpp
index e65ab85d10..fb3244bf69 100644
--- a/drape/glsl_types.hpp
+++ b/drape/glsl_types.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../geometry/point2d.hpp"
+#include "geometry/point2d.hpp"
 
 #include <glm_config.hpp>
 #include <glm/vec2.hpp>
diff --git a/drape/glstate.cpp b/drape/glstate.cpp
index e076d71ebd..495cf9f193 100644
--- a/drape/glstate.cpp
+++ b/drape/glstate.cpp
@@ -1,8 +1,8 @@
-#include "glstate.hpp"
-#include "glfunctions.hpp"
+#include "drape/glstate.hpp"
+#include "drape/glfunctions.hpp"
 
-#include "../base/buffer_vector.hpp"
-#include "../std/bind.hpp"
+#include "base/buffer_vector.hpp"
+#include "std/bind.hpp"
 
 #define TEXTURE_BIT 0x1
 
diff --git a/drape/glstate.hpp b/drape/glstate.hpp
index 2f6dd8f8ad..32da30401e 100644
--- a/drape/glstate.hpp
+++ b/drape/glstate.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "pointers.hpp"
-#include "texture.hpp"
-#include "gpu_program.hpp"
-#include "uniform_values_storage.hpp"
+#include "drape/pointers.hpp"
+#include "drape/texture.hpp"
+#include "drape/gpu_program.hpp"
+#include "drape/uniform_values_storage.hpp"
 
 namespace dp
 {
diff --git a/drape/glyph_manager.cpp b/drape/glyph_manager.cpp
index 4c50fe997a..35f27db51f 100644
--- a/drape/glyph_manager.cpp
+++ b/drape/glyph_manager.cpp
@@ -1,14 +1,14 @@
-#include "glyph_manager.hpp"
-#include "sdf_image.h"
+#include "drape/glyph_manager.hpp"
+#include "drape/sdf_image.h"
 
-#include "../platform/platform.hpp"
+#include "platform/platform.hpp"
 
-#include "../coding/reader.hpp"
+#include "coding/reader.hpp"
 
-#include "../base/string_utils.hpp"
-#include "../base/logging.hpp"
-#include "../base/math.hpp"
-#include "../base/timer.hpp"
+#include "base/string_utils.hpp"
+#include "base/logging.hpp"
+#include "base/math.hpp"
+#include "base/timer.hpp"
 
 #include <ft2build.h>
 #include FT_TYPES_H
diff --git a/drape/glyph_manager.hpp b/drape/glyph_manager.hpp
index 24b4a74d92..9102c6c13e 100644
--- a/drape/glyph_manager.hpp
+++ b/drape/glyph_manager.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "../base/shared_buffer_manager.hpp"
-#include "../base/string_utils.hpp"
+#include "base/shared_buffer_manager.hpp"
+#include "base/string_utils.hpp"
 
-#include "../std/unique_ptr.hpp"
-#include "../std/string.hpp"
-#include "../std/vector.hpp"
+#include "std/unique_ptr.hpp"
+#include "std/string.hpp"
+#include "std/vector.hpp"
 
-#include "../std/function.hpp"
+#include "std/function.hpp"
 
 namespace dp
 {
diff --git a/drape/gpu_buffer.cpp b/drape/gpu_buffer.cpp
index 8a9e2674e3..5577ec860d 100644
--- a/drape/gpu_buffer.cpp
+++ b/drape/gpu_buffer.cpp
@@ -1,10 +1,10 @@
-#include "gpu_buffer.hpp"
-#include "glfunctions.hpp"
-#include "glextensions_list.hpp"
+#include "drape/gpu_buffer.hpp"
+#include "drape/glfunctions.hpp"
+#include "drape/glextensions_list.hpp"
 
-#include "../base/assert.hpp"
+#include "base/assert.hpp"
 
-#include "../std/cstring.hpp"
+#include "std/cstring.hpp"
 
 namespace dp
 {
diff --git a/drape/gpu_buffer.hpp b/drape/gpu_buffer.hpp
index 572ab88403..7617379c09 100644
--- a/drape/gpu_buffer.hpp
+++ b/drape/gpu_buffer.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "pointers.hpp"
-#include "buffer_base.hpp"
+#include "drape/pointers.hpp"
+#include "drape/buffer_base.hpp"
 
 namespace dp
 {
diff --git a/drape/gpu_program.cpp b/drape/gpu_program.cpp
index fcd0691936..b0d6a7e3e1 100644
--- a/drape/gpu_program.cpp
+++ b/drape/gpu_program.cpp
@@ -1,8 +1,8 @@
-#include "gpu_program.hpp"
-#include "glfunctions.hpp"
+#include "drape/gpu_program.hpp"
+#include "drape/glfunctions.hpp"
 
-#include "../base/assert.hpp"
-#include "../base/logging.hpp"
+#include "base/assert.hpp"
+#include "base/logging.hpp"
 
 #ifdef DEBUG
   #include "../std/map.hpp"
diff --git a/drape/gpu_program.hpp b/drape/gpu_program.hpp
index b195c37440..09c03724f2 100644
--- a/drape/gpu_program.hpp
+++ b/drape/gpu_program.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "shader.hpp"
-#include "pointers.hpp"
-#include "glconstants.hpp"
+#include "drape/shader.hpp"
+#include "drape/pointers.hpp"
+#include "drape/glconstants.hpp"
 
-#include "../std/string.hpp"
+#include "std/string.hpp"
 
 #ifdef DEBUG
   #include "../std/unique_ptr.hpp"
diff --git a/drape/gpu_program_manager.cpp b/drape/gpu_program_manager.cpp
index 71cb7c178d..b47b1cb1fa 100644
--- a/drape/gpu_program_manager.cpp
+++ b/drape/gpu_program_manager.cpp
@@ -1,8 +1,8 @@
-#include "gpu_program_manager.hpp"
-#include "shader_def.hpp"
+#include "drape/gpu_program_manager.hpp"
+#include "drape/shader_def.hpp"
 
-#include "../base/stl_add.hpp"
-#include "../base/assert.hpp"
+#include "base/stl_add.hpp"
+#include "base/assert.hpp"
 
 namespace dp
 {
diff --git a/drape/gpu_program_manager.hpp b/drape/gpu_program_manager.hpp
index e3d27dd04d..5a7a5662d9 100644
--- a/drape/gpu_program_manager.hpp
+++ b/drape/gpu_program_manager.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "pointers.hpp"
-#include "gpu_program.hpp"
-#include "shader.hpp"
+#include "drape/pointers.hpp"
+#include "drape/gpu_program.hpp"
+#include "drape/shader.hpp"
 
-#include "../std/map.hpp"
-#include "../std/noncopyable.hpp"
+#include "std/map.hpp"
+#include "std/noncopyable.hpp"
 
 namespace dp
 {
diff --git a/drape/index_buffer.cpp b/drape/index_buffer.cpp
index d2607123ea..60fff3d9c5 100644
--- a/drape/index_buffer.cpp
+++ b/drape/index_buffer.cpp
@@ -1,4 +1,4 @@
-#include "index_buffer.hpp"
+#include "drape/index_buffer.hpp"
 
 namespace dp
 {
diff --git a/drape/index_buffer.hpp b/drape/index_buffer.hpp
index 14fe83b63c..7572854d30 100644
--- a/drape/index_buffer.hpp
+++ b/drape/index_buffer.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "gpu_buffer.hpp"
+#include "drape/gpu_buffer.hpp"
 
 namespace dp
 {
diff --git a/drape/index_buffer_mutator.cpp b/drape/index_buffer_mutator.cpp
index 48a5e7876c..8179122789 100644
--- a/drape/index_buffer_mutator.cpp
+++ b/drape/index_buffer_mutator.cpp
@@ -1,5 +1,5 @@
-#include "index_buffer_mutator.hpp"
-#include "vertex_array_buffer.hpp"
+#include "drape/index_buffer_mutator.hpp"
+#include "drape/vertex_array_buffer.hpp"
 
 #include "../std/cstring.hpp"    // for memcpy
 #include "../std/algorithm.hpp" // for max
diff --git a/drape/index_buffer_mutator.hpp b/drape/index_buffer_mutator.hpp
index 62fb81f57e..06799d3138 100644
--- a/drape/index_buffer_mutator.hpp
+++ b/drape/index_buffer_mutator.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "pointers.hpp"
+#include "drape/pointers.hpp"
 
 namespace dp
 {
diff --git a/drape/object_pool.hpp b/drape/object_pool.hpp
index 3f325df1e9..3240ec6540 100644
--- a/drape/object_pool.hpp
+++ b/drape/object_pool.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../base/assert.hpp"
-#include "../base/mutex.hpp"
+#include "base/assert.hpp"
+#include "base/mutex.hpp"
 
-#include "../std/list.hpp"
-#include "../std/set.hpp"
+#include "std/list.hpp"
+#include "std/set.hpp"
 
 template <typename T, typename Factory>
 class ObjectPool
diff --git a/drape/oglcontextfactory.cpp b/drape/oglcontextfactory.cpp
index 90665fd0d4..f4ffcc19fc 100644
--- a/drape/oglcontextfactory.cpp
+++ b/drape/oglcontextfactory.cpp
@@ -1,4 +1,4 @@
-#include "oglcontextfactory.hpp"
+#include "drape/oglcontextfactory.hpp"
 
 namespace dp
 {
diff --git a/drape/oglcontextfactory.hpp b/drape/oglcontextfactory.hpp
index 0eae1995ad..9d725c80df 100644
--- a/drape/oglcontextfactory.hpp
+++ b/drape/oglcontextfactory.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "oglcontext.hpp"
+#include "drape/oglcontext.hpp"
 
-#include "../base/mutex.hpp"
+#include "base/mutex.hpp"
 
 namespace dp
 {
diff --git a/drape/overlay_handle.cpp b/drape/overlay_handle.cpp
index ee63b58086..9aa17e16d0 100644
--- a/drape/overlay_handle.cpp
+++ b/drape/overlay_handle.cpp
@@ -1,6 +1,6 @@
-#include "overlay_handle.hpp"
+#include "drape/overlay_handle.hpp"
 
-#include "../base/macros.hpp"
+#include "base/macros.hpp"
 
 namespace dp
 {
diff --git a/drape/overlay_handle.hpp b/drape/overlay_handle.hpp
index 164ec5a53d..fbbd235db7 100644
--- a/drape/overlay_handle.hpp
+++ b/drape/overlay_handle.hpp
@@ -1,17 +1,17 @@
 #pragma once
 
-#include "drape_global.hpp"
-#include "binding_info.hpp"
-#include "index_buffer_mutator.hpp"
-#include "attribute_buffer_mutator.hpp"
+#include "drape/drape_global.hpp"
+#include "drape/binding_info.hpp"
+#include "drape/index_buffer_mutator.hpp"
+#include "drape/attribute_buffer_mutator.hpp"
 
-#include "../indexer/feature_decl.hpp"
+#include "indexer/feature_decl.hpp"
 
-#include "../geometry/screenbase.hpp"
-#include "../geometry/point2d.hpp"
-#include "../geometry/rect2d.hpp"
+#include "geometry/screenbase.hpp"
+#include "geometry/point2d.hpp"
+#include "geometry/rect2d.hpp"
 
-#include "../base/buffer_vector.hpp"
+#include "base/buffer_vector.hpp"
 
 namespace dp
 {
diff --git a/drape/overlay_tree.cpp b/drape/overlay_tree.cpp
index 478f225463..846025ce56 100644
--- a/drape/overlay_tree.cpp
+++ b/drape/overlay_tree.cpp
@@ -1,6 +1,6 @@
-#include "overlay_tree.hpp"
+#include "drape/overlay_tree.hpp"
 
-#include "../std/bind.hpp"
+#include "std/bind.hpp"
 
 namespace dp
 {
diff --git a/drape/overlay_tree.hpp b/drape/overlay_tree.hpp
index 2b7b994690..252c60dab4 100644
--- a/drape/overlay_tree.hpp
+++ b/drape/overlay_tree.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "overlay_handle.hpp"
+#include "drape/overlay_handle.hpp"
 
-#include "../geometry/screenbase.hpp"
-#include "../geometry/tree4d.hpp"
+#include "geometry/screenbase.hpp"
+#include "geometry/tree4d.hpp"
 
 
 namespace dp
diff --git a/drape/pointers.cpp b/drape/pointers.cpp
index a59107e5c9..fef3831d88 100644
--- a/drape/pointers.cpp
+++ b/drape/pointers.cpp
@@ -1,4 +1,4 @@
-#include "pointers.hpp"
+#include "drape/pointers.hpp"
 
 namespace dp
 {
diff --git a/drape/pointers.hpp b/drape/pointers.hpp
index b3d6926017..72812562f7 100644
--- a/drape/pointers.hpp
+++ b/drape/pointers.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../base/assert.hpp"
-#include "../base/mutex.hpp"
+#include "base/assert.hpp"
+#include "base/mutex.hpp"
 
-#include "../std/map.hpp"
+#include "std/map.hpp"
 
 namespace dp
 {
diff --git a/drape/render_bucket.cpp b/drape/render_bucket.cpp
index 79d55c9ab4..6242cdf2cb 100644
--- a/drape/render_bucket.cpp
+++ b/drape/render_bucket.cpp
@@ -1,12 +1,12 @@
-#include "render_bucket.hpp"
+#include "drape/render_bucket.hpp"
 
-#include "overlay_handle.hpp"
-#include "attribute_buffer_mutator.hpp"
-#include "vertex_array_buffer.hpp"
-#include "overlay_tree.hpp"
+#include "drape/overlay_handle.hpp"
+#include "drape/attribute_buffer_mutator.hpp"
+#include "drape/vertex_array_buffer.hpp"
+#include "drape/overlay_tree.hpp"
 
-#include "../base/stl_add.hpp"
-#include "../std/bind.hpp"
+#include "base/stl_add.hpp"
+#include "std/bind.hpp"
 
 namespace dp
 {
diff --git a/drape/render_bucket.hpp b/drape/render_bucket.hpp
index b0964016cb..d2948f1e9a 100644
--- a/drape/render_bucket.hpp
+++ b/drape/render_bucket.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "pointers.hpp"
+#include "drape/pointers.hpp"
 
 class ScreenBase;
 
diff --git a/drape/sdf_image.cpp b/drape/sdf_image.cpp
index 76f3ea8978..9e259dc644 100644
--- a/drape/sdf_image.cpp
+++ b/drape/sdf_image.cpp
@@ -20,13 +20,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "sdf_image.h"
+#include "drape/sdf_image.h"
 
-#include "../base/math.hpp"
-#include "../base/scope_guard.hpp"
+#include "base/math.hpp"
+#include "base/scope_guard.hpp"
 
-#include "../std/limits.hpp"
-#include "../std/bind.hpp"
+#include "std/limits.hpp"
+#include "std/bind.hpp"
 
 namespace dp
 {
diff --git a/drape/shader.cpp b/drape/shader.cpp
index 8af53238de..9c40212153 100644
--- a/drape/shader.cpp
+++ b/drape/shader.cpp
@@ -1,8 +1,8 @@
-#include "shader.hpp"
-#include "shader_def.hpp"
+#include "drape/shader.hpp"
+#include "drape/shader_def.hpp"
 
-#include "../base/assert.hpp"
-#include "../base/string_utils.hpp"
+#include "base/assert.hpp"
+#include "base/string_utils.hpp"
 
 namespace dp
 {
diff --git a/drape/shader.hpp b/drape/shader.hpp
index 30997bdbe8..6b0990cd40 100644
--- a/drape/shader.hpp
+++ b/drape/shader.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "glfunctions.hpp"
+#include "drape/glfunctions.hpp"
 
-#include "../std/string.hpp"
-#include "../std/stdint.hpp"
+#include "std/string.hpp"
+#include "std/stdint.hpp"
 
 namespace dp
 {
diff --git a/drape/stipple_pen_resource.cpp b/drape/stipple_pen_resource.cpp
index fd16237a52..dd41e0b637 100644
--- a/drape/stipple_pen_resource.cpp
+++ b/drape/stipple_pen_resource.cpp
@@ -1,12 +1,12 @@
-#include "stipple_pen_resource.hpp"
+#include "drape/stipple_pen_resource.hpp"
 
-#include "texture.hpp"
+#include "drape/texture.hpp"
 
-#include "../base/shared_buffer_manager.hpp"
+#include "base/shared_buffer_manager.hpp"
 
-#include "../std/numeric.hpp"
-#include "../std/sstream.hpp"
-#include "../std/cstring.hpp"
+#include "std/numeric.hpp"
+#include "std/sstream.hpp"
+#include "std/cstring.hpp"
 
 namespace dp
 {
diff --git a/drape/stipple_pen_resource.hpp b/drape/stipple_pen_resource.hpp
index 769c98bda9..e976bc0a9e 100644
--- a/drape/stipple_pen_resource.hpp
+++ b/drape/stipple_pen_resource.hpp
@@ -1,16 +1,16 @@
 #pragma once
 
-#include "drape_global.hpp"
-#include "pointers.hpp"
-#include "texture.hpp"
-#include "dynamic_texture.hpp"
+#include "drape/drape_global.hpp"
+#include "drape/pointers.hpp"
+#include "drape/texture.hpp"
+#include "drape/dynamic_texture.hpp"
 
-#include "../base/buffer_vector.hpp"
+#include "base/buffer_vector.hpp"
 
-#include "../geometry/point2d.hpp"
-#include "../geometry/rect2d.hpp"
+#include "geometry/point2d.hpp"
+#include "geometry/rect2d.hpp"
 
-#include "../std/map.hpp"
+#include "std/map.hpp"
 
 namespace dp
 {
diff --git a/drape/symbols_texture.cpp b/drape/symbols_texture.cpp
index c75062d26b..6197255d65 100644
--- a/drape/symbols_texture.cpp
+++ b/drape/symbols_texture.cpp
@@ -1,12 +1,12 @@
-#include "symbols_texture.hpp"
-#include "utils/stb_image.h"
+#include "drape/symbols_texture.hpp"
+#include "drape/utils/stb_image.h"
 
-#include "../platform/platform.hpp"
+#include "platform/platform.hpp"
 
-#include "../coding/reader.hpp"
-#include "../coding/parse_xml.hpp"
+#include "coding/reader.hpp"
+#include "coding/parse_xml.hpp"
 
-#include "../base/string_utils.hpp"
+#include "base/string_utils.hpp"
 
 namespace dp
 {
diff --git a/drape/symbols_texture.hpp b/drape/symbols_texture.hpp
index d55ab7c471..c2c80c06d4 100644
--- a/drape/symbols_texture.hpp
+++ b/drape/symbols_texture.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "texture.hpp"
+#include "drape/texture.hpp"
 
-#include "../std/string.hpp"
-#include "../std/map.hpp"
+#include "std/string.hpp"
+#include "std/map.hpp"
 
 namespace dp
 {
diff --git a/drape/texture.cpp b/drape/texture.cpp
index e0bbbbd841..84a37232d9 100644
--- a/drape/texture.cpp
+++ b/drape/texture.cpp
@@ -1,9 +1,9 @@
-#include "texture.hpp"
+#include "drape/texture.hpp"
 
-#include "glfunctions.hpp"
-#include "glextensions_list.hpp"
+#include "drape/glfunctions.hpp"
+#include "drape/glextensions_list.hpp"
 
-#include "../base/math.hpp"
+#include "base/math.hpp"
 
 #define ASSERT_ID ASSERT(GetID() != -1, ())
 
diff --git a/drape/texture.hpp b/drape/texture.hpp
index 71c27570d2..544c7a3497 100644
--- a/drape/texture.hpp
+++ b/drape/texture.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "pointers.hpp"
-#include "glconstants.hpp"
-#include "drape_global.hpp"
+#include "drape/pointers.hpp"
+#include "drape/glconstants.hpp"
+#include "drape/drape_global.hpp"
 
-#include "../geometry/rect2d.hpp"
+#include "geometry/rect2d.hpp"
 
-#include "../std/stdint.hpp"
-#include "../std/function.hpp"
+#include "std/stdint.hpp"
+#include "std/function.hpp"
 
 namespace dp
 {
diff --git a/drape/texture_manager.cpp b/drape/texture_manager.cpp
index f53821789b..e30deb3c85 100644
--- a/drape/texture_manager.cpp
+++ b/drape/texture_manager.cpp
@@ -1,19 +1,19 @@
-#include "texture_manager.hpp"
-#include "symbols_texture.hpp"
-#include "font_texture.hpp"
-#include "stipple_pen_resource.hpp"
-#include "texture_of_colors.hpp"
+#include "drape/texture_manager.hpp"
+#include "drape/symbols_texture.hpp"
+#include "drape/font_texture.hpp"
+#include "drape/stipple_pen_resource.hpp"
+#include "drape/texture_of_colors.hpp"
 
-#include "glfunctions.hpp"
+#include "drape/glfunctions.hpp"
 
-#include "../platform/platform.hpp"
+#include "platform/platform.hpp"
 
-#include "../coding/file_name_utils.hpp"
+#include "coding/file_name_utils.hpp"
 
-#include "../base/stl_add.hpp"
+#include "base/stl_add.hpp"
 
-#include "../std/vector.hpp"
-#include "../std/bind.hpp"
+#include "std/vector.hpp"
+#include "std/bind.hpp"
 
 namespace dp
 {
diff --git a/drape/texture_manager.hpp b/drape/texture_manager.hpp
index 9b7d42616f..68a41b39f7 100644
--- a/drape/texture_manager.hpp
+++ b/drape/texture_manager.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "../base/string_utils.hpp"
+#include "base/string_utils.hpp"
 
-#include "color.hpp"
-#include "pointers.hpp"
-#include "texture.hpp"
-#include "glyph_manager.hpp"
+#include "drape/color.hpp"
+#include "drape/pointers.hpp"
+#include "drape/texture.hpp"
+#include "drape/glyph_manager.hpp"
 
 namespace dp
 {
diff --git a/drape/texture_of_colors.cpp b/drape/texture_of_colors.cpp
index 95bdaa916c..fe290f1668 100644
--- a/drape/texture_of_colors.cpp
+++ b/drape/texture_of_colors.cpp
@@ -1,9 +1,9 @@
-#include "texture_of_colors.hpp"
+#include "drape/texture_of_colors.hpp"
 
-#include "../base/shared_buffer_manager.hpp"
-#include "../base/stl_add.hpp"
+#include "base/shared_buffer_manager.hpp"
+#include "base/stl_add.hpp"
 
-#include "../std/cstring.hpp"
+#include "std/cstring.hpp"
 
 
 namespace  dp
diff --git a/drape/texture_of_colors.hpp b/drape/texture_of_colors.hpp
index 5619692bfa..e96884add7 100644
--- a/drape/texture_of_colors.hpp
+++ b/drape/texture_of_colors.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "texture.hpp"
-#include "color.hpp"
-#include "dynamic_texture.hpp"
+#include "drape/texture.hpp"
+#include "drape/color.hpp"
+#include "drape/dynamic_texture.hpp"
 
-#include "../base/buffer_vector.hpp"
+#include "base/buffer_vector.hpp"
 
 namespace dp
 {
diff --git a/drape/uniform_value.cpp b/drape/uniform_value.cpp
index 3eb7c5f51a..9baeacb3a6 100644
--- a/drape/uniform_value.cpp
+++ b/drape/uniform_value.cpp
@@ -1,7 +1,7 @@
-#include "uniform_value.hpp"
-#include "glfunctions.hpp"
-#include "../base/assert.hpp"
-#include "../std/cstring.hpp"
+#include "drape/uniform_value.hpp"
+#include "drape/glfunctions.hpp"
+#include "base/assert.hpp"
+#include "std/cstring.hpp"
 
 namespace dp
 {
diff --git a/drape/uniform_value.hpp b/drape/uniform_value.hpp
index 9307e2a879..16503637c4 100644
--- a/drape/uniform_value.hpp
+++ b/drape/uniform_value.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "pointers.hpp"
-#include "gpu_program.hpp"
+#include "drape/pointers.hpp"
+#include "drape/gpu_program.hpp"
 
-#include "../std/string.hpp"
-#include "../std/shared_array.hpp"
-#include "../std/cstring.hpp"
+#include "std/string.hpp"
+#include "std/shared_array.hpp"
+#include "std/cstring.hpp"
 
 namespace dp
 {
diff --git a/drape/uniform_values_storage.cpp b/drape/uniform_values_storage.cpp
index 2cbbc7645c..bf6dc28c76 100644
--- a/drape/uniform_values_storage.cpp
+++ b/drape/uniform_values_storage.cpp
@@ -1,9 +1,9 @@
-#include "uniform_values_storage.hpp"
+#include "drape/uniform_values_storage.hpp"
 
-#include "../base/assert.hpp"
+#include "base/assert.hpp"
 
-#include "../std/algorithm.hpp"
-#include "../std/bind.hpp"
+#include "std/algorithm.hpp"
+#include "std/bind.hpp"
 
 namespace dp
 {
diff --git a/drape/uniform_values_storage.hpp b/drape/uniform_values_storage.hpp
index 7a319c64c9..cd91ab24d6 100644
--- a/drape/uniform_values_storage.hpp
+++ b/drape/uniform_values_storage.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "uniform_value.hpp"
+#include "drape/uniform_value.hpp"
 
-#include "../std/vector.hpp"
-#include "../std/string.hpp"
-#include "../std/function.hpp"
+#include "std/vector.hpp"
+#include "std/string.hpp"
+#include "std/function.hpp"
 
 namespace dp
 {
diff --git a/drape/utils/vertex_decl.cpp b/drape/utils/vertex_decl.cpp
index f1fbdf44bd..e6385412a5 100644
--- a/drape/utils/vertex_decl.cpp
+++ b/drape/utils/vertex_decl.cpp
@@ -1,4 +1,4 @@
-#include "vertex_decl.hpp"
+#include "drape/utils/vertex_decl.hpp"
 
 namespace gpu
 {
diff --git a/drape/utils/vertex_decl.hpp b/drape/utils/vertex_decl.hpp
index 3ae565d61d..9a9c888f42 100644
--- a/drape/utils/vertex_decl.hpp
+++ b/drape/utils/vertex_decl.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../glsl_types.hpp"
-#include "../binding_info.hpp"
+#include "drape/glsl_types.hpp"
+#include "drape/binding_info.hpp"
 
-#include "../../base/buffer_vector.hpp"
+#include "base/buffer_vector.hpp"
 
 namespace gpu
 {
diff --git a/drape/vertex_array_buffer.cpp b/drape/vertex_array_buffer.cpp
index baa3b0d5fc..9a528e66d1 100644
--- a/drape/vertex_array_buffer.cpp
+++ b/drape/vertex_array_buffer.cpp
@@ -1,9 +1,9 @@
-#include "vertex_array_buffer.hpp"
-#include "glfunctions.hpp"
-#include "glextensions_list.hpp"
+#include "drape/vertex_array_buffer.hpp"
+#include "drape/glfunctions.hpp"
+#include "drape/glextensions_list.hpp"
 
-#include "../base/stl_add.hpp"
-#include "../base/assert.hpp"
+#include "base/stl_add.hpp"
+#include "base/assert.hpp"
 
 namespace dp
 {
diff --git a/drape/vertex_array_buffer.hpp b/drape/vertex_array_buffer.hpp
index 0b2d80b101..1c50564dd5 100644
--- a/drape/vertex_array_buffer.hpp
+++ b/drape/vertex_array_buffer.hpp
@@ -1,14 +1,14 @@
 #pragma once
 
-#include "index_buffer_mutator.hpp"
-#include "attribute_buffer_mutator.hpp"
-#include "pointers.hpp"
-#include "index_buffer.hpp"
-#include "data_buffer.hpp"
-#include "binding_info.hpp"
-#include "gpu_program.hpp"
+#include "drape/index_buffer_mutator.hpp"
+#include "drape/attribute_buffer_mutator.hpp"
+#include "drape/pointers.hpp"
+#include "drape/index_buffer.hpp"
+#include "drape/data_buffer.hpp"
+#include "drape/binding_info.hpp"
+#include "drape/gpu_program.hpp"
 
-#include "../std/map.hpp"
+#include "std/map.hpp"
 
 namespace dp
 {