diff --git a/base/SRC_FIRST.hpp b/base/SRC_FIRST.hpp
index 1215ca4ca4..b948f256c9 100644
--- a/base/SRC_FIRST.hpp
+++ b/base/SRC_FIRST.hpp
@@ -1,2 +1,2 @@
 #pragma once
-#include "base.hpp"
+#include "base/base.hpp"
diff --git a/base/array_adapters.hpp b/base/array_adapters.hpp
index 301c4227d7..a542ab97ed 100644
--- a/base/array_adapters.hpp
+++ b/base/array_adapters.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "assert.hpp"
+#include "base/assert.hpp"
 
 
 namespace detail
diff --git a/base/assert.hpp b/base/assert.hpp
index ea3bcd944f..de51536c67 100644
--- a/base/assert.hpp
+++ b/base/assert.hpp
@@ -1,9 +1,9 @@
 #pragma once
-#include "base.hpp"
-#include "internal/message.hpp"
-#include "src_point.hpp"
+#include "base/base.hpp"
+#include "base/internal/message.hpp"
+#include "base/src_point.hpp"
 
-#include "../std/string.hpp"
+#include "std/string.hpp"
 
 
 namespace my
diff --git a/base/base.cpp b/base/base.cpp
index 36430da855..3dcd92d61d 100644
--- a/base/base.cpp
+++ b/base/base.cpp
@@ -1,9 +1,9 @@
-#include "base.hpp"
-#include "assert.hpp"
-#include "exception.hpp"
+#include "base/base.hpp"
+#include "base/assert.hpp"
+#include "base/exception.hpp"
 
-#include "../std/target_os.hpp"
-#include "../std/iostream.hpp"
+#include "std/target_os.hpp"
+#include "std/iostream.hpp"
 
 #include <cassert>
 
diff --git a/base/base.hpp b/base/base.hpp
index 9ac32afb33..f1c02b7f13 100644
--- a/base/base.hpp
+++ b/base/base.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../std/stdint.hpp"
-#include "../std/static_assert.hpp"
+#include "std/stdint.hpp"
+#include "std/static_assert.hpp"
 
 #if defined(DEBUG) || defined(_DEBUG) || defined(NRELEASE) || defined(QT_DEBUG)
 #define MY_DEBUG_DEFINED 1
@@ -37,4 +37,4 @@ STATIC_ASSERT(MY_DEBUG_DEFINED || MY_RELEASE_DEFINED);
 #endif
 
 // platform macroses
-#include "../std/target_os.hpp"
+#include "std/target_os.hpp"
diff --git a/base/bits.hpp b/base/bits.hpp
index b026193b33..26ad241d81 100644
--- a/base/bits.hpp
+++ b/base/bits.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "assert.hpp"
+#include "base/assert.hpp"
 
-#include "../std/type_traits.hpp"
-#include "../std/stdint.hpp"
+#include "std/type_traits.hpp"
+#include "std/stdint.hpp"
 
 
 namespace bits
diff --git a/base/buffer_vector.hpp b/base/buffer_vector.hpp
index a9d8d9664d..870c854ad5 100644
--- a/base/buffer_vector.hpp
+++ b/base/buffer_vector.hpp
@@ -1,12 +1,12 @@
 #pragma once
-#include "assert.hpp"
-#include "swap.hpp"
-#include "stl_iterator.hpp"
+#include "base/assert.hpp"
+#include "base/swap.hpp"
+#include "base/stl_iterator.hpp"
 
-#include "../std/algorithm.hpp"
-#include "../std/vector.hpp"
-#include "../std/type_traits.hpp"
-#include "../std/utility.hpp"
+#include "std/algorithm.hpp"
+#include "std/vector.hpp"
+#include "std/type_traits.hpp"
+#include "std/utility.hpp"
 #include "../std/cstring.hpp"       // for memcpy
 
 
diff --git a/base/cache.hpp b/base/cache.hpp
index 2bd778ac4b..30b51f2911 100644
--- a/base/cache.hpp
+++ b/base/cache.hpp
@@ -1,8 +1,8 @@
-#include "assert.hpp"
-#include "base.hpp"
-#include "../std/type_traits.hpp"
-#include "../std/utility.hpp"
-#include "../std/vector.hpp"
+#include "base/assert.hpp"
+#include "base/base.hpp"
+#include "std/type_traits.hpp"
+#include "std/utility.hpp"
+#include "std/vector.hpp"
 
 namespace my
 {
diff --git a/base/cancellable.hpp b/base/cancellable.hpp
index a24d6eba50..b95b276555 100644
--- a/base/cancellable.hpp
+++ b/base/cancellable.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../std/atomic.hpp"
+#include "std/atomic.hpp"
 
 namespace my
 {
diff --git a/base/commands_queue.cpp b/base/commands_queue.cpp
index 99a54052dc..d5eb210394 100644
--- a/base/commands_queue.cpp
+++ b/base/commands_queue.cpp
@@ -1,11 +1,11 @@
-#include "../base/SRC_FIRST.hpp"
+#include "base/SRC_FIRST.hpp"
 
-#include "../base/logging.hpp"
-#include "../base/assert.hpp"
+#include "base/logging.hpp"
+#include "base/assert.hpp"
 
-#include "../std/bind.hpp"
+#include "std/bind.hpp"
 
-#include "commands_queue.hpp"
+#include "base/commands_queue.hpp"
 
 namespace core
 {
diff --git a/base/commands_queue.hpp b/base/commands_queue.hpp
index 50326ce99b..92b3998299 100644
--- a/base/commands_queue.hpp
+++ b/base/commands_queue.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "../std/function.hpp"
-#include "../std/shared_ptr.hpp"
-#include "../std/vector.hpp"
+#include "std/function.hpp"
+#include "std/shared_ptr.hpp"
+#include "std/vector.hpp"
 
-#include "cancellable.hpp"
-#include "thread.hpp"
-#include "threaded_list.hpp"
+#include "base/cancellable.hpp"
+#include "base/thread.hpp"
+#include "base/threaded_list.hpp"
 
 namespace core
 {
diff --git a/base/condition.cpp b/base/condition.cpp
index 4fe713ef56..4a612965d1 100644
--- a/base/condition.cpp
+++ b/base/condition.cpp
@@ -1,4 +1,4 @@
-#include "../std/target_os.hpp"
+#include "std/target_os.hpp"
 
 #if defined(OMIM_OS_WINDOWS_NATIVE)
   #include "condition_windows_native.cpp"
diff --git a/base/condition_bada.cpp b/base/condition_bada.cpp
index c909cd9b21..22ed384169 100644
--- a/base/condition_bada.cpp
+++ b/base/condition_bada.cpp
@@ -1,8 +1,8 @@
-#include "../std/target_os.hpp"
+#include "std/target_os.hpp"
 
 #ifdef OMIM_OS_BADA
 
-#include "condition.hpp"
+#include "base/condition.hpp"
 
 #include <FBaseRtThreadMonitor.h>
 
diff --git a/base/condition_posix.cpp b/base/condition_posix.cpp
index 0610427bf6..f021362e4d 100644
--- a/base/condition_posix.cpp
+++ b/base/condition_posix.cpp
@@ -1,13 +1,13 @@
-#include "../std/target_os.hpp"
+#include "std/target_os.hpp"
 
 #if !defined(OMIM_OS_WINDOWS_NATIVE)
 
-#include "condition.hpp"
-#include "mutex.hpp"
+#include "base/condition.hpp"
+#include "base/mutex.hpp"
 
-#include "../std/stdint.hpp"
-#include "../std/systime.hpp"
-#include "../std/errno.hpp"
+#include "std/stdint.hpp"
+#include "std/systime.hpp"
+#include "std/errno.hpp"
 
 #include <pthread.h>
 
diff --git a/base/condition_windows_native.cpp b/base/condition_windows_native.cpp
index bee69f79a2..3f6a69d7c3 100644
--- a/base/condition_windows_native.cpp
+++ b/base/condition_windows_native.cpp
@@ -1,11 +1,11 @@
-#include "../std/target_os.hpp"
+#include "std/target_os.hpp"
 
 #ifdef OMIM_OS_WINDOWS_NATIVE
 
-#include "condition.hpp"
-#include "mutex.hpp"
+#include "base/condition.hpp"
+#include "base/mutex.hpp"
 
-#include "../std/windows.hpp"
+#include "std/windows.hpp"
 
 typedef void (WINAPI *InitFn)(PCONDITION_VARIABLE);
 typedef void (WINAPI *WakeFn)(PCONDITION_VARIABLE);
diff --git a/base/exception.cpp b/base/exception.cpp
index 389cb86af0..78853d0150 100644
--- a/base/exception.cpp
+++ b/base/exception.cpp
@@ -1,4 +1,4 @@
-#include "exception.hpp"
+#include "base/exception.hpp"
 
 char const * RootException::what() const throw()
 {
diff --git a/base/exception.hpp b/base/exception.hpp
index 14756e926a..195ff101ee 100644
--- a/base/exception.hpp
+++ b/base/exception.hpp
@@ -1,9 +1,9 @@
 #pragma once
-#include "internal/message.hpp"
-#include "macros.hpp"
+#include "base/internal/message.hpp"
+#include "base/macros.hpp"
 
-#include "../std/exception.hpp"
-#include "../std/string.hpp"
+#include "std/exception.hpp"
+#include "std/string.hpp"
 
 class RootException : public exception
 {
diff --git a/base/fence_manager.cpp b/base/fence_manager.cpp
index 823440b916..8caa41a047 100644
--- a/base/fence_manager.cpp
+++ b/base/fence_manager.cpp
@@ -1,7 +1,7 @@
-#include "fence_manager.hpp"
+#include "base/fence_manager.hpp"
 
-#include "../base/assert.hpp"
-#include "../base/logging.hpp"
+#include "base/assert.hpp"
+#include "base/logging.hpp"
 
 FenceManager::FenceManager(int conditionPoolSize)
   : m_currentFence(0),
diff --git a/base/fence_manager.hpp b/base/fence_manager.hpp
index 5bfdbf49a0..98e04f1dee 100644
--- a/base/fence_manager.hpp
+++ b/base/fence_manager.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../base/condition.hpp"
-#include "../base/mutex.hpp"
+#include "base/condition.hpp"
+#include "base/mutex.hpp"
 
-#include "../std/map.hpp"
-#include "../std/list.hpp"
+#include "std/map.hpp"
+#include "std/list.hpp"
 
 class FenceManager
 {
diff --git a/base/internal/message.cpp b/base/internal/message.cpp
index 8c468f382a..2cc829d616 100644
--- a/base/internal/message.cpp
+++ b/base/internal/message.cpp
@@ -1,4 +1,4 @@
-#include "message.hpp"
+#include "base/internal/message.hpp"
 
 string DebugPrint(string const & t)
 {
diff --git a/base/internal/message.hpp b/base/internal/message.hpp
index a2f05ed22f..9e61de2032 100644
--- a/base/internal/message.hpp
+++ b/base/internal/message.hpp
@@ -1,13 +1,13 @@
 #pragma once
-#include "../../std/iterator.hpp"
-#include "../../std/list.hpp"
-#include "../../std/map.hpp"
-#include "../../std/set.hpp"
-#include "../../std/sstream.hpp"
-#include "../../std/string.hpp"
-#include "../../std/utility.hpp"
-#include "../../std/vector.hpp"
-#include "../../std/initializer_list.hpp"
+#include "std/iterator.hpp"
+#include "std/list.hpp"
+#include "std/map.hpp"
+#include "std/set.hpp"
+#include "std/sstream.hpp"
+#include "std/string.hpp"
+#include "std/utility.hpp"
+#include "std/vector.hpp"
+#include "std/initializer_list.hpp"
 
 
 /// @name Declarations.
diff --git a/base/limited_priority_queue.hpp b/base/limited_priority_queue.hpp
index 42b7023188..281108ef86 100644
--- a/base/limited_priority_queue.hpp
+++ b/base/limited_priority_queue.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "../base/base.hpp"
-#include "../base/assert.hpp"
+#include "base/base.hpp"
+#include "base/assert.hpp"
 
-#include "../std/algorithm.hpp"
-#include "../std/functional.hpp"
-#include "../std/vector.hpp"
+#include "std/algorithm.hpp"
+#include "std/functional.hpp"
+#include "std/vector.hpp"
 
 namespace my
 {
diff --git a/base/logging.cpp b/base/logging.cpp
index 6ffe13d27c..627f9d0beb 100644
--- a/base/logging.cpp
+++ b/base/logging.cpp
@@ -1,15 +1,15 @@
-#include "assert.hpp"
-#include "logging.hpp"
-#include "macros.hpp"
-#include "timer.hpp"
-#include "thread.hpp"
-#include "mutex.hpp"
+#include "base/assert.hpp"
+#include "base/logging.hpp"
+#include "base/macros.hpp"
+#include "base/timer.hpp"
+#include "base/thread.hpp"
+#include "base/mutex.hpp"
 
-#include "../std/iostream.hpp"
-#include "../std/iomanip.hpp"
-#include "../std/sstream.hpp"
-#include "../std/target_os.hpp"
-#include "../std/windows.hpp"
+#include "std/iostream.hpp"
+#include "std/iomanip.hpp"
+#include "std/sstream.hpp"
+#include "std/target_os.hpp"
+#include "std/windows.hpp"
 
 namespace my
 {
diff --git a/base/logging.hpp b/base/logging.hpp
index b6b9b345d5..765c447ff7 100644
--- a/base/logging.hpp
+++ b/base/logging.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "base.hpp"
-#include "internal/message.hpp"
-#include "src_point.hpp"
+#include "base/base.hpp"
+#include "base/internal/message.hpp"
+#include "base/src_point.hpp"
 
 namespace my
 {
diff --git a/base/lower_case.cpp b/base/lower_case.cpp
index 2f451f7603..cc6b69ddb9 100644
--- a/base/lower_case.cpp
+++ b/base/lower_case.cpp
@@ -2,7 +2,7 @@
 /// to rules in ftp://ftp.unicode.org/Public/UNIDATA/CaseFolding.txt
 /// This beautiful code has been inspired by Zurich area in 2011 (Alex Zolotarev).
 
-#include "string_utils.hpp"
+#include "base/string_utils.hpp"
 
 namespace strings
 {
diff --git a/base/macros.hpp b/base/macros.hpp
index d53b0d89a0..d3be701d28 100644
--- a/base/macros.hpp
+++ b/base/macros.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "base.hpp"
+#include "base/base.hpp"
 
 namespace my
 {
diff --git a/base/math.hpp b/base/math.hpp
index 6f1b2c1466..ba9df9cba9 100644
--- a/base/math.hpp
+++ b/base/math.hpp
@@ -1,10 +1,10 @@
 #pragma once
-#include "assert.hpp"
+#include "base/assert.hpp"
 
-#include "../std/cmath.hpp"
-#include "../std/limits.hpp"
-#include "../std/type_traits.hpp"
-#include "../std/algorithm.hpp"
+#include "std/cmath.hpp"
+#include "std/limits.hpp"
+#include "std/type_traits.hpp"
+#include "std/algorithm.hpp"
 
 #include <boost/integer.hpp>
 
diff --git a/base/matrix.hpp b/base/matrix.hpp
index cfebdba43f..b61f9c5ef2 100644
--- a/base/matrix.hpp
+++ b/base/matrix.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "math.hpp"
+#include "base/math.hpp"
 
-#include "../std/iomanip.hpp"
-#include "../std/initializer_list.hpp"
+#include "std/iomanip.hpp"
+#include "std/initializer_list.hpp"
 
 
 namespace math
diff --git a/base/mem_trie.hpp b/base/mem_trie.hpp
index bb0b373ebb..dd19256f0a 100644
--- a/base/mem_trie.hpp
+++ b/base/mem_trie.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "macros.hpp"
+#include "base/macros.hpp"
 
-#include "../std/map.hpp"
-#include "../std/vector.hpp"
+#include "std/map.hpp"
+#include "std/vector.hpp"
 
 namespace my
 {
diff --git a/base/mru_cache.hpp b/base/mru_cache.hpp
index 70fab40853..98dd0b220b 100644
--- a/base/mru_cache.hpp
+++ b/base/mru_cache.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "assert.hpp"
-#include "logging.hpp"
+#include "base/assert.hpp"
+#include "base/logging.hpp"
 
-#include "../std/list.hpp"
-#include "../std/map.hpp"
+#include "std/list.hpp"
+#include "std/map.hpp"
 
 
 namespace my
diff --git a/base/mutex.hpp b/base/mutex.hpp
index e4e8b95d21..1bf626a18a 100644
--- a/base/mutex.hpp
+++ b/base/mutex.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "assert.hpp"
+#include "base/assert.hpp"
 
-#include "../std/target_os.hpp"
+#include "std/target_os.hpp"
 
 #if defined(OMIM_OS_WINDOWS_NATIVE)
   #include "../std/windows.hpp"
diff --git a/base/normalize_unicode.cpp b/base/normalize_unicode.cpp
index b95c56f72a..497a513a83 100644
--- a/base/normalize_unicode.cpp
+++ b/base/normalize_unicode.cpp
@@ -2,7 +2,7 @@
 /// to rules in ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt
 /// This beautiful code has been inspired by Zurich area in 2011 (Alex Zolotarev).
 
-#include "string_utils.hpp"
+#include "base/string_utils.hpp"
 
 namespace strings
 {
diff --git a/base/object_tracker.cpp b/base/object_tracker.cpp
index f114991a30..a8862b0315 100644
--- a/base/object_tracker.cpp
+++ b/base/object_tracker.cpp
@@ -1,8 +1,8 @@
-#include "object_tracker.hpp"
-#include "assert.hpp"
-#include "logging.hpp"
+#include "base/object_tracker.hpp"
+#include "base/assert.hpp"
+#include "base/logging.hpp"
 
-#include "../std/target_os.hpp"
+#include "std/target_os.hpp"
 
 #ifndef OMIM_OS_WINDOWS
   #include <signal.h>
diff --git a/base/object_tracker.hpp b/base/object_tracker.hpp
index f38f4dd705..377f511e96 100644
--- a/base/object_tracker.hpp
+++ b/base/object_tracker.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "base.hpp"
-#include "mutex.hpp"
+#include "base/base.hpp"
+#include "base/mutex.hpp"
 
-#include "../std/map.hpp"
+#include "std/map.hpp"
 
 
 #define TRACKER_MULTITHREADED
diff --git a/base/pseudo_random.cpp b/base/pseudo_random.cpp
index a79146851e..c26293e1d7 100644
--- a/base/pseudo_random.cpp
+++ b/base/pseudo_random.cpp
@@ -1,4 +1,4 @@
-#include "pseudo_random.hpp"
+#include "base/pseudo_random.hpp"
 
 
 namespace rnd
diff --git a/base/pseudo_random.hpp b/base/pseudo_random.hpp
index 87d8665cfe..751451af8f 100644
--- a/base/pseudo_random.hpp
+++ b/base/pseudo_random.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../base/base.hpp"
+#include "base/base.hpp"
 
-#include "../std/string.hpp"
+#include "std/string.hpp"
 
 
 class LCG32
diff --git a/base/resource_pool.cpp b/base/resource_pool.cpp
index 46ce9d46d5..5380ec1a99 100644
--- a/base/resource_pool.cpp
+++ b/base/resource_pool.cpp
@@ -1,6 +1,6 @@
-#include "../base/SRC_FIRST.hpp"
+#include "base/SRC_FIRST.hpp"
 
-#include "resource_pool.hpp"
+#include "base/resource_pool.hpp"
 
 BasePoolElemFactory::BasePoolElemFactory(char const * resName,
                                          size_t elemSize,
diff --git a/base/resource_pool.hpp b/base/resource_pool.hpp
index 9f4328f140..ad3ef66cb9 100644
--- a/base/resource_pool.hpp
+++ b/base/resource_pool.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "thread.hpp"
-#include "threaded_list.hpp"
-#include "logging.hpp"
-#include "assert.hpp"
+#include "base/thread.hpp"
+#include "base/threaded_list.hpp"
+#include "base/logging.hpp"
+#include "base/assert.hpp"
 
-#include "../std/bind.hpp"
-#include "../std/unique_ptr.hpp"
+#include "std/bind.hpp"
+#include "std/unique_ptr.hpp"
 
 struct BasePoolElemFactory
 {
diff --git a/base/rolling_hash.hpp b/base/rolling_hash.hpp
index 48ee18b05a..79d9077fe8 100644
--- a/base/rolling_hash.hpp
+++ b/base/rolling_hash.hpp
@@ -1,10 +1,10 @@
 #pragma once
-#include "assert.hpp"
-#include "base.hpp"
-#include "bits.hpp"
-#include "math.hpp"
+#include "base/assert.hpp"
+#include "base/base.hpp"
+#include "base/bits.hpp"
+#include "base/math.hpp"
 #ifdef DEBUG
-#include "../std/queue.hpp"
+#include "std/queue.hpp"
 #endif
 
 
diff --git a/base/runner.cpp b/base/runner.cpp
index 198117f97f..bec87ac37c 100644
--- a/base/runner.cpp
+++ b/base/runner.cpp
@@ -1,6 +1,6 @@
-#include "runner.hpp"
-#include "logging.hpp"
-#include "exception.hpp"
+#include "base/runner.hpp"
+#include "base/logging.hpp"
+#include "base/exception.hpp"
 
 void threads::IRunner::CallAndCatchAll(RunnerFuncT const & f)
 {
diff --git a/base/runner.hpp b/base/runner.hpp
index 1705e5ec37..966b4a45f2 100644
--- a/base/runner.hpp
+++ b/base/runner.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../std/function.hpp"
+#include "std/function.hpp"
 
 namespace threads
 {
diff --git a/base/scheduled_task.cpp b/base/scheduled_task.cpp
index 1400909db9..09ac7504b0 100644
--- a/base/scheduled_task.cpp
+++ b/base/scheduled_task.cpp
@@ -1,5 +1,5 @@
-#include "scheduled_task.hpp"
-#include "timer.hpp"
+#include "base/scheduled_task.hpp"
+#include "base/timer.hpp"
 
 #include "../base/logging.hpp"
 
diff --git a/base/scheduled_task.hpp b/base/scheduled_task.hpp
index 99e5cbd303..0ad46bbb66 100644
--- a/base/scheduled_task.hpp
+++ b/base/scheduled_task.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "condition.hpp"
-#include "thread.hpp"
+#include "base/condition.hpp"
+#include "base/thread.hpp"
 
-#include "../std/condition_variable.hpp"
-#include "../std/function.hpp"
-#include "../std/mutex.hpp"
-#include "../std/unique_ptr.hpp"
+#include "std/condition_variable.hpp"
+#include "std/function.hpp"
+#include "std/mutex.hpp"
+#include "std/unique_ptr.hpp"
 
 /// Class, which performs any function when the specified
 /// amount of time is elapsed.
diff --git a/base/scope_guard.hpp b/base/scope_guard.hpp
index 038b31ccdf..7954949acf 100644
--- a/base/scope_guard.hpp
+++ b/base/scope_guard.hpp
@@ -3,7 +3,7 @@
 /// @brief	See http://gzip.rsdn.ru/forum/Message.aspx?mid=389127&only=1.
 
 #pragma once
-#include "base.hpp"
+#include "base/base.hpp"
 
 namespace my
 {
diff --git a/base/set_operations.hpp b/base/set_operations.hpp
index 6d9dd606ea..4b28d93edf 100644
--- a/base/set_operations.hpp
+++ b/base/set_operations.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../std/algorithm.hpp"
+#include "std/algorithm.hpp"
 
 // Similar to set_difference(), but if element is present n times in the first sequence and once in
 // the second sequence, all n copies are filtered, insted of one.
diff --git a/base/shared_buffer_manager.cpp b/base/shared_buffer_manager.cpp
index 2d20148560..3c6f1d5f1a 100644
--- a/base/shared_buffer_manager.cpp
+++ b/base/shared_buffer_manager.cpp
@@ -1,4 +1,4 @@
-#include "shared_buffer_manager.hpp"
+#include "base/shared_buffer_manager.hpp"
 
 
 SharedBufferManager & SharedBufferManager::instance()
diff --git a/base/shared_buffer_manager.hpp b/base/shared_buffer_manager.hpp
index 2dd745a348..297d469d53 100644
--- a/base/shared_buffer_manager.hpp
+++ b/base/shared_buffer_manager.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../base/mutex.hpp"
-#include "../std/vector.hpp"
-#include "../std/shared_ptr.hpp"
-#include "../std/list.hpp"
-#include "../std/map.hpp"
+#include "base/mutex.hpp"
+#include "std/vector.hpp"
+#include "std/shared_ptr.hpp"
+#include "std/list.hpp"
+#include "std/map.hpp"
 
 class SharedBufferManager
 {
diff --git a/base/src_point.cpp b/base/src_point.cpp
index b6e7f55975..54b8976c18 100644
--- a/base/src_point.cpp
+++ b/base/src_point.cpp
@@ -1,7 +1,7 @@
-#include "src_point.hpp"
+#include "base/src_point.hpp"
 
-#include "../std/algorithm.hpp"
-#include "../std/sstream.hpp"
+#include "std/algorithm.hpp"
+#include "std/sstream.hpp"
 
 
 namespace my
diff --git a/base/src_point.hpp b/base/src_point.hpp
index dd60d85c29..d7552deba3 100644
--- a/base/src_point.hpp
+++ b/base/src_point.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../std/string.hpp"
+#include "std/string.hpp"
 
 
 #ifndef SRC_LOGGING
diff --git a/base/stats.hpp b/base/stats.hpp
index f050dc2107..93982659f3 100644
--- a/base/stats.hpp
+++ b/base/stats.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "base.hpp"
+#include "base/base.hpp"
 
-#include "../std/sstream.hpp"
-#include "../std/string.hpp"
+#include "std/sstream.hpp"
+#include "std/string.hpp"
 
 
 namespace my
diff --git a/base/std_serialization.hpp b/base/std_serialization.hpp
index a491f13f40..b9767d8634 100644
--- a/base/std_serialization.hpp
+++ b/base/std_serialization.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "../base/base.hpp"
+#include "base/base.hpp"
 
-#include "../std/map.hpp"
-#include "../std/set.hpp"
-#include "../std/unordered_map.hpp"
-#include "../std/vector.hpp"
-#include "../std/array.hpp"
-#include "../std/utility.hpp"
+#include "std/map.hpp"
+#include "std/set.hpp"
+#include "std/unordered_map.hpp"
+#include "std/vector.hpp"
+#include "std/array.hpp"
+#include "std/utility.hpp"
 
 
 /// @name std containers serialization
diff --git a/base/stl_add.hpp b/base/stl_add.hpp
index 0bb3e9fa08..7a1331358c 100644
--- a/base/stl_add.hpp
+++ b/base/stl_add.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "../std/functional.hpp"
-#include "../std/iterator.hpp"
-#include "../std/algorithm.hpp"
+#include "std/functional.hpp"
+#include "std/iterator.hpp"
+#include "std/algorithm.hpp"
 
 
 template <class ContainerT> class BackInsertFunctor
diff --git a/base/stl_iterator.hpp b/base/stl_iterator.hpp
index 25e91acdd7..f944f27d0d 100644
--- a/base/stl_iterator.hpp
+++ b/base/stl_iterator.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../std/iterator_facade.hpp"
+#include "std/iterator_facade.hpp"
 
 namespace detail
 {
diff --git a/base/string_format.cpp b/base/string_format.cpp
index 2de89527a1..86a7447743 100644
--- a/base/string_format.cpp
+++ b/base/string_format.cpp
@@ -1,6 +1,6 @@
-#include "string_format.hpp"
+#include "base/string_format.hpp"
 
-#include "../std/list.hpp"
+#include "std/list.hpp"
 
 
 namespace strings
diff --git a/base/string_format.hpp b/base/string_format.hpp
index 5bb29ca5de..05875cac48 100644
--- a/base/string_format.hpp
+++ b/base/string_format.hpp
@@ -1,9 +1,9 @@
 #pragma once
-#include "base.hpp"
-#include "macros.hpp"
+#include "base/base.hpp"
+#include "base/macros.hpp"
 
-#include "../std/string.hpp"
-#include "../std/sstream.hpp"
+#include "std/string.hpp"
+#include "std/sstream.hpp"
 
 
 namespace strings
diff --git a/base/string_utils.cpp b/base/string_utils.cpp
index e35df80cdd..6f7a019088 100644
--- a/base/string_utils.cpp
+++ b/base/string_utils.cpp
@@ -1,10 +1,10 @@
-#include "string_utils.hpp"
-#include "assert.hpp"
+#include "base/string_utils.hpp"
+#include "base/assert.hpp"
 
-#include "../std/target_os.hpp"
-#include "../std/iterator.hpp"
-#include "../std/cmath.hpp"
-#include "../std/iomanip.hpp"
+#include "std/target_os.hpp"
+#include "std/iterator.hpp"
+#include "std/cmath.hpp"
+#include "std/iomanip.hpp"
 
 #include <boost/algorithm/string.hpp> // boost::trim
 
diff --git a/base/string_utils.hpp b/base/string_utils.hpp
index 5dd1274530..49f3587188 100644
--- a/base/string_utils.hpp
+++ b/base/string_utils.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "../base/buffer_vector.hpp"
+#include "base/buffer_vector.hpp"
 
-#include "../std/string.hpp"
-#include "../std/stdint.hpp"
-#include "../std/sstream.hpp"
-#include "../std/limits.hpp"
+#include "std/string.hpp"
+#include "std/stdint.hpp"
+#include "std/sstream.hpp"
+#include "std/limits.hpp"
 
-#include "../3party/utfcpp/source/utf8/unchecked.h"
+#include "3party/utfcpp/source/utf8/unchecked.h"
 
 
 /// All methods work with strings in utf-8 format
diff --git a/base/strings_bundle.cpp b/base/strings_bundle.cpp
index 72243a4592..fcfdecb7a8 100644
--- a/base/strings_bundle.cpp
+++ b/base/strings_bundle.cpp
@@ -1,4 +1,4 @@
-#include "strings_bundle.hpp"
+#include "base/strings_bundle.hpp"
 
 
 void StringsBundle::SetDefaultString(string const & name, string const & value)
diff --git a/base/strings_bundle.hpp b/base/strings_bundle.hpp
index b2d8ea0b90..5fc90eca04 100644
--- a/base/strings_bundle.hpp
+++ b/base/strings_bundle.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../std/string.hpp"
-#include "../std/map.hpp"
+#include "std/string.hpp"
+#include "std/map.hpp"
 
 
 class StringsBundle
diff --git a/base/swap.hpp b/base/swap.hpp
index 354878a8e7..6d817e3ff6 100644
--- a/base/swap.hpp
+++ b/base/swap.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../std/algorithm.hpp"
+#include "std/algorithm.hpp"
 
 // Calls swap() function using argument dependant lookup.
 // Do NOT override this function, but override swap() function instead!
diff --git a/base/thread.cpp b/base/thread.cpp
index 111ae7ca73..16880cdb1a 100644
--- a/base/thread.cpp
+++ b/base/thread.cpp
@@ -1,9 +1,9 @@
-#include "thread.hpp"
+#include "base/thread.hpp"
 
-#include "../base/logging.hpp"
+#include "base/logging.hpp"
 
-#include "../std/chrono.hpp"
-#include "../std/exception.hpp"
+#include "std/chrono.hpp"
+#include "std/exception.hpp"
 
 #if defined(OMIM_OS_ANDROID)
 void AndroidThreadAttachToJVM();
diff --git a/base/thread.hpp b/base/thread.hpp
index 6452360a62..85e1f277a2 100644
--- a/base/thread.hpp
+++ b/base/thread.hpp
@@ -1,18 +1,18 @@
 #pragma once
 
-#include "../base/assert.hpp"
-#include "../base/cancellable.hpp"
-#include "../base/macros.hpp"
+#include "base/assert.hpp"
+#include "base/cancellable.hpp"
+#include "base/macros.hpp"
 
-#include "../std/target_os.hpp"
+#include "std/target_os.hpp"
 
-#include "../std/noncopyable.hpp"
-#include "../std/shared_ptr.hpp"
-#include "../std/stdint.hpp"
-#include "../std/thread.hpp"
-#include "../std/unique_ptr.hpp"
-#include "../std/utility.hpp"
-#include "../std/vector.hpp"
+#include "std/noncopyable.hpp"
+#include "std/shared_ptr.hpp"
+#include "std/stdint.hpp"
+#include "std/thread.hpp"
+#include "std/unique_ptr.hpp"
+#include "std/utility.hpp"
+#include "std/vector.hpp"
 
 #ifdef OMIM_OS_WINDOWS
 #include "../std/windows.hpp"  // for DWORD
diff --git a/base/thread_checker.cpp b/base/thread_checker.cpp
index b488e86d14..0a6ea92444 100644
--- a/base/thread_checker.cpp
+++ b/base/thread_checker.cpp
@@ -1,4 +1,4 @@
-#include "thread_checker.hpp"
+#include "base/thread_checker.hpp"
 
 ThreadChecker::ThreadChecker() : m_id(this_thread::get_id()) {}
 
diff --git a/base/thread_checker.hpp b/base/thread_checker.hpp
index f9d80ce624..f46c3c9fa3 100644
--- a/base/thread_checker.hpp
+++ b/base/thread_checker.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "macros.hpp"
+#include "base/macros.hpp"
 
-#include "../std/thread.hpp"
+#include "std/thread.hpp"
 
 /// This class remembers id of a thread on which it was created, and
 /// then can be used to verify that CalledOnOriginalThread() is called
diff --git a/base/thread_pool.cpp b/base/thread_pool.cpp
index e546c54dc6..626061fd2b 100644
--- a/base/thread_pool.cpp
+++ b/base/thread_pool.cpp
@@ -1,11 +1,11 @@
-#include "thread_pool.hpp"
+#include "base/thread_pool.hpp"
 
-#include "thread.hpp"
-#include "threaded_list.hpp"
+#include "base/thread.hpp"
+#include "base/threaded_list.hpp"
 
-#include "../std/vector.hpp"
-#include "../std/utility.hpp"
-#include "../std/bind.hpp"
+#include "std/vector.hpp"
+#include "std/utility.hpp"
+#include "std/bind.hpp"
 
 namespace threads
 {
diff --git a/base/thread_pool.hpp b/base/thread_pool.hpp
index 58ac247ff6..292799b42b 100644
--- a/base/thread_pool.hpp
+++ b/base/thread_pool.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../base/base.hpp"
+#include "base/base.hpp"
 
-#include "../std/function.hpp"
+#include "std/function.hpp"
 
 namespace threads
 {
diff --git a/base/threaded_container.cpp b/base/threaded_container.cpp
index 988f86404d..5d76aa569a 100644
--- a/base/threaded_container.cpp
+++ b/base/threaded_container.cpp
@@ -1,4 +1,4 @@
-#include "threaded_container.hpp"
+#include "base/threaded_container.hpp"
 
 ThreadedContainer::ThreadedContainer() : m_WaitTime(0) {}
 
diff --git a/base/threaded_container.hpp b/base/threaded_container.hpp
index bd83f83e97..1e075525e0 100644
--- a/base/threaded_container.hpp
+++ b/base/threaded_container.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "cancellable.hpp"
-#include "condition.hpp"
-#include "timer.hpp"
+#include "base/cancellable.hpp"
+#include "base/condition.hpp"
+#include "base/timer.hpp"
 
 struct ThreadedContainer : public my::Cancellable
 {
diff --git a/base/threaded_list.hpp b/base/threaded_list.hpp
index fc5f673a64..c07d416c31 100644
--- a/base/threaded_list.hpp
+++ b/base/threaded_list.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "condition.hpp"
-#include "logging.hpp"
-#include "../std/list.hpp"
+#include "base/condition.hpp"
+#include "base/logging.hpp"
+#include "std/list.hpp"
 
-#include "threaded_container.hpp"
+#include "base/threaded_container.hpp"
 
 template <typename T>
 class ThreadedList : public ThreadedContainer
diff --git a/base/threaded_priority_queue.hpp b/base/threaded_priority_queue.hpp
index f8dbabb6ef..7d5a10caa9 100644
--- a/base/threaded_priority_queue.hpp
+++ b/base/threaded_priority_queue.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "threaded_container.hpp"
-#include "../std/queue.hpp"
+#include "base/threaded_container.hpp"
+#include "std/queue.hpp"
 
 template <typename T>
 class ThreadedPriorityQueue : public ThreadedContainer
diff --git a/base/timer.cpp b/base/timer.cpp
index a7d979b80b..4e90d00d55 100644
--- a/base/timer.cpp
+++ b/base/timer.cpp
@@ -1,13 +1,13 @@
-#include "timer.hpp"
-#include "assert.hpp"
-#include "macros.hpp"
+#include "base/timer.hpp"
+#include "base/assert.hpp"
+#include "base/macros.hpp"
 
-#include "../std/target_os.hpp"
-#include "../std/systime.hpp"
-#include "../std/cstdio.hpp"
-#include "../std/sstream.hpp"
-#include "../std/iomanip.hpp"
-#include "../std/algorithm.hpp"
+#include "std/target_os.hpp"
+#include "std/systime.hpp"
+#include "std/cstdio.hpp"
+#include "std/sstream.hpp"
+#include "std/iomanip.hpp"
+#include "std/algorithm.hpp"
 
 
 namespace my
diff --git a/base/timer.hpp b/base/timer.hpp
index 6e8be8c4f8..cfede8afd2 100644
--- a/base/timer.hpp
+++ b/base/timer.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../std/stdint.hpp"
-#include "../std/string.hpp"
-#include "../std/ctime.hpp"
-#include "../std/chrono.hpp"
+#include "std/stdint.hpp"
+#include "std/string.hpp"
+#include "std/ctime.hpp"
+#include "std/chrono.hpp"
 
 
 namespace my
diff --git a/base/worker_thread.hpp b/base/worker_thread.hpp
index 4463279ad2..4943e96da9 100644
--- a/base/worker_thread.hpp
+++ b/base/worker_thread.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "macros.hpp"
-#include "thread_checker.hpp"
+#include "base/macros.hpp"
+#include "base/thread_checker.hpp"
 
-#include "../std/condition_variable.hpp"
-#include "../std/mutex.hpp"
-#include "../std/queue.hpp"
-#include "../std/shared_ptr.hpp"
-#include "../std/thread.hpp"
+#include "std/condition_variable.hpp"
+#include "std/mutex.hpp"
+#include "std/queue.hpp"
+#include "std/shared_ptr.hpp"
+#include "std/thread.hpp"
 
 namespace my
 {