diff --git a/base/base_tests/assert_test.cpp b/base/base_tests/assert_test.cpp
index 7710f911d8..7056d244d7 100644
--- a/base/base_tests/assert_test.cpp
+++ b/base/base_tests/assert_test.cpp
@@ -1,9 +1,9 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "../../base/base.hpp"
-#include "../../base/exception.hpp"
-#include "../../base/logging.hpp"
+#include "base/base.hpp"
+#include "base/exception.hpp"
+#include "base/logging.hpp"
 
 
 UNIT_TEST(Assert_Smoke)
diff --git a/base/base_tests/bits_test.cpp b/base/base_tests/bits_test.cpp
index e919e154e0..ecbaa08d8e 100644
--- a/base/base_tests/bits_test.cpp
+++ b/base/base_tests/bits_test.cpp
@@ -1,8 +1,8 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "../bits.hpp"
-#include "../../std/cstdlib.hpp"
+#include "base/bits.hpp"
+#include "std/cstdlib.hpp"
 
 namespace
 {
diff --git a/base/base_tests/buffer_vector_test.cpp b/base/base_tests/buffer_vector_test.cpp
index 4d43fac388..40a34b5615 100644
--- a/base/base_tests/buffer_vector_test.cpp
+++ b/base/base_tests/buffer_vector_test.cpp
@@ -1,7 +1,7 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../buffer_vector.hpp"
-#include "../string_utils.hpp"
+#include "base/buffer_vector.hpp"
+#include "base/string_utils.hpp"
 
 
 namespace
diff --git a/base/base_tests/cache_test.cpp b/base/base_tests/cache_test.cpp
index 94b8d0d8a3..8447d03d22 100644
--- a/base/base_tests/cache_test.cpp
+++ b/base/base_tests/cache_test.cpp
@@ -1,7 +1,7 @@
-#include "../../testing/testing.hpp"
-#include "../cache.hpp"
-#include "../macros.hpp"
-#include "../stl_add.hpp"
+#include "testing/testing.hpp"
+#include "base/cache.hpp"
+#include "base/macros.hpp"
+#include "base/stl_add.hpp"
 
 UNIT_TEST(CacheSmoke)
 {
diff --git a/base/base_tests/commands_queue_test.cpp b/base/base_tests/commands_queue_test.cpp
index fde4ce0949..75b4f65163 100644
--- a/base/base_tests/commands_queue_test.cpp
+++ b/base/base_tests/commands_queue_test.cpp
@@ -1,11 +1,11 @@
-#include "../../testing/testing.hpp"
-#include "../commands_queue.hpp"
-#include "../macros.hpp"
-#include "../thread.hpp"
-#include "../logging.hpp"
+#include "testing/testing.hpp"
+#include "base/commands_queue.hpp"
+#include "base/macros.hpp"
+#include "base/thread.hpp"
+#include "base/logging.hpp"
 
-#include "../../std/atomic.hpp"
-#include "../../std/bind.hpp"
+#include "std/atomic.hpp"
+#include "std/bind.hpp"
 
 void add_int(core::CommandsQueue::Environment const & env,
              atomic<int> & i,
diff --git a/base/base_tests/condition_test.cpp b/base/base_tests/condition_test.cpp
index d745c8dbd9..45c8e6216c 100644
--- a/base/base_tests/condition_test.cpp
+++ b/base/base_tests/condition_test.cpp
@@ -1,11 +1,11 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "../thread.hpp"
-#include "../threaded_list.hpp"
-#include "../condition.hpp"
+#include "base/thread.hpp"
+#include "base/threaded_list.hpp"
+#include "base/condition.hpp"
 
-#include "../../base/logging.hpp"
+#include "base/logging.hpp"
 
 struct ConditionThread : public threads::IRoutine
 {
diff --git a/base/base_tests/const_helper.cpp b/base/base_tests/const_helper.cpp
index 95ba92a569..b46ce9dc93 100644
--- a/base/base_tests/const_helper.cpp
+++ b/base/base_tests/const_helper.cpp
@@ -1,8 +1,8 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "../const_helper.hpp"
-#include "../../std/typeinfo.hpp"
+#include "base/const_helper.hpp"
+#include "std/typeinfo.hpp"
 
 UNIT_TEST(ConstHelper)
 {
diff --git a/base/base_tests/containers_test.cpp b/base/base_tests/containers_test.cpp
index be24db626f..1ed3e807ab 100644
--- a/base/base_tests/containers_test.cpp
+++ b/base/base_tests/containers_test.cpp
@@ -1,7 +1,7 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "../limited_priority_queue.hpp"
+#include "base/limited_priority_queue.hpp"
 
 
 using namespace my;
diff --git a/base/base_tests/fence_manager_test.cpp b/base/base_tests/fence_manager_test.cpp
index c255f69bd4..04a59a8b17 100644
--- a/base/base_tests/fence_manager_test.cpp
+++ b/base/base_tests/fence_manager_test.cpp
@@ -1,7 +1,7 @@
-#include "../../testing/testing.hpp"
-#include "../commands_queue.hpp"
-#include "../fence_manager.hpp"
-#include "../../std/bind.hpp"
+#include "testing/testing.hpp"
+#include "base/commands_queue.hpp"
+#include "base/fence_manager.hpp"
+#include "std/bind.hpp"
 
 void add_int(core::CommandsQueue::Environment const & env,
              int fenceID,
diff --git a/base/base_tests/logging_test.cpp b/base/base_tests/logging_test.cpp
index bca3f04efc..b3776da773 100644
--- a/base/base_tests/logging_test.cpp
+++ b/base/base_tests/logging_test.cpp
@@ -1,10 +1,10 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "../logging.hpp"
+#include "base/logging.hpp"
 
-#include "../../std/utility.hpp"
-#include "../../std/vector.hpp"
+#include "std/utility.hpp"
+#include "std/vector.hpp"
 
 
 namespace
diff --git a/base/base_tests/math_test.cpp b/base/base_tests/math_test.cpp
index cd0606dc7e..342621f4e9 100644
--- a/base/base_tests/math_test.cpp
+++ b/base/base_tests/math_test.cpp
@@ -1,6 +1,6 @@
-#include "../../testing/testing.hpp"
-#include "../math.hpp"
-#include "../../std/limits.hpp"
+#include "testing/testing.hpp"
+#include "base/math.hpp"
+#include "std/limits.hpp"
 
 #include <boost/math/special_functions/next.hpp>
 
diff --git a/base/base_tests/matrix_test.cpp b/base/base_tests/matrix_test.cpp
index 52e9148994..6ec3a38a3b 100644
--- a/base/base_tests/matrix_test.cpp
+++ b/base/base_tests/matrix_test.cpp
@@ -1,6 +1,6 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../matrix.hpp"
+#include "base/matrix.hpp"
 
 
 UNIT_TEST(Matrix_Inverse_Simple)
diff --git a/base/base_tests/mem_trie_test.cpp b/base/base_tests/mem_trie_test.cpp
index d4634dd950..15e2ad75c2 100644
--- a/base/base_tests/mem_trie_test.cpp
+++ b/base/base_tests/mem_trie_test.cpp
@@ -1,11 +1,11 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../mem_trie.hpp"
+#include "base/mem_trie.hpp"
 
-#include "../../std/algorithm.hpp"
-#include "../../std/string.hpp"
-#include "../../std/utility.hpp"
-#include "../../std/vector.hpp"
+#include "std/algorithm.hpp"
+#include "std/string.hpp"
+#include "std/utility.hpp"
+#include "std/vector.hpp"
 
 UNIT_TEST(MemTrie_Basic)
 {
diff --git a/base/base_tests/mru_cache_test.cpp b/base/base_tests/mru_cache_test.cpp
index 3bb673b05c..d018a6e4e2 100644
--- a/base/base_tests/mru_cache_test.cpp
+++ b/base/base_tests/mru_cache_test.cpp
@@ -1,7 +1,7 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "../mru_cache.hpp"
+#include "base/mru_cache.hpp"
 
 UNIT_TEST(MRUCache_Test)
 {
diff --git a/base/base_tests/regexp_test.cpp b/base/base_tests/regexp_test.cpp
index 7621e1a5da..b5e2cabaff 100644
--- a/base/base_tests/regexp_test.cpp
+++ b/base/base_tests/regexp_test.cpp
@@ -1,8 +1,8 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../regexp.hpp"
+#include "base/regexp.hpp"
 
-#include "../../base/stl_add.hpp"
+#include "base/stl_add.hpp"
 
 
 UNIT_TEST(RegExp_Or)
diff --git a/base/base_tests/rolling_hash_test.cpp b/base/base_tests/rolling_hash_test.cpp
index f59d4d9bf4..b96e41452a 100644
--- a/base/base_tests/rolling_hash_test.cpp
+++ b/base/base_tests/rolling_hash_test.cpp
@@ -1,10 +1,10 @@
-#include "../../testing/benchmark.hpp"
-#include "../../testing/testing.hpp"
-#include "../rolling_hash.hpp"
+#include "testing/benchmark.hpp"
+#include "testing/testing.hpp"
+#include "base/rolling_hash.hpp"
 
-#include "../base.hpp"
-#include "../logging.hpp"
-#include "../macros.hpp"
+#include "base/base.hpp"
+#include "base/logging.hpp"
+#include "base/macros.hpp"
 
 
 namespace
diff --git a/base/base_tests/scheduled_task_test.cpp b/base/base_tests/scheduled_task_test.cpp
index 7d0c3e920d..7e2334dc2f 100644
--- a/base/base_tests/scheduled_task_test.cpp
+++ b/base/base_tests/scheduled_task_test.cpp
@@ -1,9 +1,9 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../scheduled_task.hpp"
+#include "base/scheduled_task.hpp"
 
-#include "../../std/atomic.hpp"
-#include "../../std/bind.hpp"
+#include "std/atomic.hpp"
+#include "std/bind.hpp"
 
 
 namespace
diff --git a/base/base_tests/scope_guard_test.cpp b/base/base_tests/scope_guard_test.cpp
index e83b40fa01..b66a474948 100644
--- a/base/base_tests/scope_guard_test.cpp
+++ b/base/base_tests/scope_guard_test.cpp
@@ -1,7 +1,7 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "../scope_guard.hpp"
+#include "base/scope_guard.hpp"
 
 static bool b = false;
 
diff --git a/base/base_tests/stl_add_test.cpp b/base/base_tests/stl_add_test.cpp
index 094ed9f5af..ae3e8e9181 100644
--- a/base/base_tests/stl_add_test.cpp
+++ b/base/base_tests/stl_add_test.cpp
@@ -1,10 +1,10 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../macros.hpp"
+#include "base/macros.hpp"
 
-#include "../stl_add.hpp"
+#include "base/stl_add.hpp"
 
-#include "../../std/deque.hpp"
+#include "std/deque.hpp"
 
 
 UNIT_TEST(STLAdd_IsSorted)
diff --git a/base/base_tests/string_format_test.cpp b/base/base_tests/string_format_test.cpp
index 0fcd9f730a..cea938f58c 100644
--- a/base/base_tests/string_format_test.cpp
+++ b/base/base_tests/string_format_test.cpp
@@ -1,5 +1,5 @@
-#include "../../testing/testing.hpp"
-#include "../string_format.hpp"
+#include "testing/testing.hpp"
+#include "base/string_format.hpp"
 
 UNIT_TEST(StringFormat_Smoke)
 {
diff --git a/base/base_tests/string_utils_test.cpp b/base/base_tests/string_utils_test.cpp
index 6436ccd82f..56603829ab 100644
--- a/base/base_tests/string_utils_test.cpp
+++ b/base/base_tests/string_utils_test.cpp
@@ -1,12 +1,12 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../string_utils.hpp"
-#include "../logging.hpp"
+#include "base/string_utils.hpp"
+#include "base/logging.hpp"
 
-#include "../../std/iomanip.hpp"
-#include "../../std/fstream.hpp"
-#include "../../std/bind.hpp"
-#include "../../std/unordered_map.hpp"
+#include "std/iomanip.hpp"
+#include "std/fstream.hpp"
+#include "std/bind.hpp"
+#include "std/unordered_map.hpp"
 
 
 /// internal function in base
diff --git a/base/base_tests/thread_pool_tests.cpp b/base/base_tests/thread_pool_tests.cpp
index 0a3cd038c9..063d9086da 100644
--- a/base/base_tests/thread_pool_tests.cpp
+++ b/base/base_tests/thread_pool_tests.cpp
@@ -1,12 +1,12 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../mutex.hpp"
-#include "../thread.hpp"
-#include "../thread_pool.hpp"
-#include "../condition.hpp"
+#include "base/mutex.hpp"
+#include "base/thread.hpp"
+#include "base/thread_pool.hpp"
+#include "base/condition.hpp"
 
-#include "../../std/vector.hpp"
-#include "../../std/bind.hpp"
+#include "std/vector.hpp"
+#include "std/bind.hpp"
 
 namespace
 {
diff --git a/base/base_tests/threaded_list_test.cpp b/base/base_tests/threaded_list_test.cpp
index c7c34bc5a5..5deeba40ef 100644
--- a/base/base_tests/threaded_list_test.cpp
+++ b/base/base_tests/threaded_list_test.cpp
@@ -1,13 +1,13 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "../threaded_list.hpp"
-#include "../threaded_priority_queue.hpp"
-#include "../thread.hpp"
+#include "base/threaded_list.hpp"
+#include "base/threaded_priority_queue.hpp"
+#include "base/thread.hpp"
 
-#include "../../base/logging.hpp"
+#include "base/logging.hpp"
 
-#include "../../std/mutex.hpp"
+#include "std/mutex.hpp"
 
 struct ThreadedListProcessor : public threads::IRoutine
 {
diff --git a/base/base_tests/threads_test.cpp b/base/base_tests/threads_test.cpp
index 51e8ba64a7..a72d42f9ff 100644
--- a/base/base_tests/threads_test.cpp
+++ b/base/base_tests/threads_test.cpp
@@ -1,8 +1,8 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../thread.hpp"
+#include "base/thread.hpp"
 
-#include "../../std/vector.hpp"
+#include "std/vector.hpp"
 
 
 typedef std::vector<int> Vector;
diff --git a/base/base_tests/timer_test.cpp b/base/base_tests/timer_test.cpp
index f6932153bb..d2d8198659 100644
--- a/base/base_tests/timer_test.cpp
+++ b/base/base_tests/timer_test.cpp
@@ -1,7 +1,7 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../timer.hpp"
-#include "../logging.hpp"
+#include "base/timer.hpp"
+#include "base/logging.hpp"
 
 
 UNIT_TEST(Timer_Seconds)
diff --git a/base/base_tests/worker_thread_test.cpp b/base/base_tests/worker_thread_test.cpp
index bc1f38a471..a5f3ac456c 100644
--- a/base/base_tests/worker_thread_test.cpp
+++ b/base/base_tests/worker_thread_test.cpp
@@ -1,9 +1,9 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../worker_thread.hpp"
+#include "base/worker_thread.hpp"
 
-#include "../../std/shared_ptr.hpp"
-#include "../../std/vector.hpp"
+#include "std/shared_ptr.hpp"
+#include "std/vector.hpp"
 
 struct Task
 {