diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fb8dd55bf..cc4381281 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -44,7 +44,7 @@ else()
     set_target_properties(gmock_main PROPERTIES CXX_CLANG_TIDY "")
 endif()
 
-include_directories($<TARGET_PROPERTY:EnTT,INTERFACE_INCLUDE_DIRECTORIES> ${CMAKE_CURRENT_SOURCE_DIR})
+include_directories($<TARGET_PROPERTY:EnTT,INTERFACE_INCLUDE_DIRECTORIES>)
 add_compile_options($<TARGET_PROPERTY:EnTT,INTERFACE_COMPILE_OPTIONS>)
 
 function(SETUP_TARGET TARGET_NAME)
diff --git a/test/entt/container/dense_map.cpp b/test/entt/container/dense_map.cpp
index c0b2d5a8c..afc7b4c81 100644
--- a/test/entt/container/dense_map.cpp
+++ b/test/entt/container/dense_map.cpp
@@ -9,15 +9,15 @@
 #include <utility>
 #include <vector>
 #include <gtest/gtest.h>
-#include "common/config.h"
-#include "common/linter.hpp"
-#include "common/throwing_allocator.hpp"
-#include "common/tracked_memory_resource.hpp"
-#include "common/transparent_equal_to.h"
 #include <entt/container/dense_map.hpp>
 #include <entt/core/iterator.hpp>
 #include <entt/core/memory.hpp>
 #include <entt/core/utility.hpp>
+#include "../../common/config.h"
+#include "../../common/linter.hpp"
+#include "../../common/throwing_allocator.hpp"
+#include "../../common/tracked_memory_resource.hpp"
+#include "../../common/transparent_equal_to.h"
 
 TEST(DenseMap, Functionalities) {
     entt::dense_map<int, int, entt::identity, test::transparent_equal_to> map;
diff --git a/test/entt/container/dense_set.cpp b/test/entt/container/dense_set.cpp
index a3e8f01a1..a878041db 100644
--- a/test/entt/container/dense_set.cpp
+++ b/test/entt/container/dense_set.cpp
@@ -9,13 +9,13 @@
 #include <utility>
 #include <vector>
 #include <gtest/gtest.h>
-#include "common/linter.hpp"
-#include "common/throwing_allocator.hpp"
-#include "common/tracked_memory_resource.hpp"
-#include "common/transparent_equal_to.h"
 #include <entt/container/dense_set.hpp>
 #include <entt/core/memory.hpp>
 #include <entt/core/utility.hpp>
+#include "../../common/linter.hpp"
+#include "../../common/throwing_allocator.hpp"
+#include "../../common/tracked_memory_resource.hpp"
+#include "../../common/transparent_equal_to.h"
 
 TEST(DenseSet, Functionalities) {
     entt::dense_set<int, entt::identity, test::transparent_equal_to> set;
diff --git a/test/entt/core/algorithm.cpp b/test/entt/core/algorithm.cpp
index 899bcb172..76f939245 100644
--- a/test/entt/core/algorithm.cpp
+++ b/test/entt/core/algorithm.cpp
@@ -1,8 +1,8 @@
 #include <array>
 #include <vector>
 #include <gtest/gtest.h>
-#include "common/boxed_type.h"
 #include <entt/core/algorithm.hpp>
+#include "../../common/boxed_type.h"
 
 TEST(Algorithm, StdSort) {
     // well, I'm pretty sure it works, it's std::sort!!
diff --git a/test/entt/core/any.cpp b/test/entt/core/any.cpp
index 92c5bd88a..169eb7221 100644
--- a/test/entt/core/any.cpp
+++ b/test/entt/core/any.cpp
@@ -7,13 +7,13 @@
 #include <utility>
 #include <vector>
 #include <gtest/gtest.h>
-#include "common/aggregate.h"
-#include "common/config.h"
-#include "common/linter.hpp"
-#include "common/non_comparable.h"
-#include "common/non_movable.h"
 #include <entt/core/any.hpp>
 #include <entt/core/type_info.hpp>
+#include "../../common/aggregate.h"
+#include "../../common/config.h"
+#include "../../common/linter.hpp"
+#include "../../common/non_comparable.h"
+#include "../../common/non_movable.h"
 
 template<std::size_t Len>
 struct tracker {
diff --git a/test/entt/core/compressed_pair.cpp b/test/entt/core/compressed_pair.cpp
index 9a6778678..922951289 100644
--- a/test/entt/core/compressed_pair.cpp
+++ b/test/entt/core/compressed_pair.cpp
@@ -5,9 +5,9 @@
 #include <utility>
 #include <vector>
 #include <gtest/gtest.h>
-#include "common/empty.h"
-#include "common/non_default_constructible.h"
 #include <entt/core/compressed_pair.hpp>
+#include "../../common/empty.h"
+#include "../../common/non_default_constructible.h"
 
 TEST(CompressedPair, Size) {
     struct local {
diff --git a/test/entt/core/ident.cpp b/test/entt/core/ident.cpp
index 7820e6dc1..d3deebd8c 100644
--- a/test/entt/core/ident.cpp
+++ b/test/entt/core/ident.cpp
@@ -1,8 +1,8 @@
 #include <type_traits>
 #include <gtest/gtest.h>
-#include "common/boxed_type.h"
-#include "common/empty.h"
 #include <entt/core/ident.hpp>
+#include "../../common/boxed_type.h"
+#include "../../common/empty.h"
 
 TEST(Ident, Uniqueness) {
     using id = entt::ident<test::empty, test::boxed_int>;
diff --git a/test/entt/core/iterator.cpp b/test/entt/core/iterator.cpp
index 90c1d71b7..96ea39876 100644
--- a/test/entt/core/iterator.cpp
+++ b/test/entt/core/iterator.cpp
@@ -2,8 +2,8 @@
 #include <utility>
 #include <vector>
 #include <gtest/gtest.h>
-#include "common/boxed_type.h"
 #include <entt/core/iterator.hpp>
+#include "../../common/boxed_type.h"
 
 TEST(InputIteratorPointer, Functionalities) {
     entt::input_iterator_pointer ptr{test::boxed_int{0}};
diff --git a/test/entt/core/memory.cpp b/test/entt/core/memory.cpp
index e4fabdba3..3074eb5ce 100644
--- a/test/entt/core/memory.cpp
+++ b/test/entt/core/memory.cpp
@@ -8,12 +8,12 @@
 #include <utility>
 #include <vector>
 #include <gtest/gtest.h>
-#include "common/basic_test_allocator.hpp"
-#include "common/config.h"
-#include "common/throwing_allocator.hpp"
-#include "common/throwing_type.hpp"
-#include "common/tracked_memory_resource.hpp"
 #include <entt/core/memory.hpp>
+#include "../../common/basic_test_allocator.hpp"
+#include "../../common/config.h"
+#include "../../common/throwing_allocator.hpp"
+#include "../../common/throwing_type.hpp"
+#include "../../common/tracked_memory_resource.hpp"
 
 TEST(ToAddress, Functionalities) {
     const std::shared_ptr<int> shared = std::make_shared<int>();
diff --git a/test/entt/core/type_traits.cpp b/test/entt/core/type_traits.cpp
index f72ee441d..63d5141db 100644
--- a/test/entt/core/type_traits.cpp
+++ b/test/entt/core/type_traits.cpp
@@ -6,9 +6,9 @@
 #include <utility>
 #include <vector>
 #include <gtest/gtest.h>
-#include "common/non_comparable.h"
 #include <entt/core/hashed_string.hpp>
 #include <entt/core/type_traits.hpp>
+#include "../../common/non_comparable.h"
 
 struct nlohmann_json_like final {
     using value_type = nlohmann_json_like;
diff --git a/test/entt/entity/component.cpp b/test/entt/entity/component.cpp
index 833936da6..ba2102e39 100644
--- a/test/entt/entity/component.cpp
+++ b/test/entt/entity/component.cpp
@@ -1,9 +1,9 @@
 #include <gtest/gtest.h>
-#include "common/boxed_type.h"
-#include "common/empty.h"
-#include "common/non_movable.h"
 #include <entt/config/config.h>
 #include <entt/entity/component.hpp>
+#include "../../common/boxed_type.h"
+#include "../../common/empty.h"
+#include "../../common/non_movable.h"
 
 struct self_contained {
     static constexpr auto in_place_delete = true;
diff --git a/test/entt/entity/entity.cpp b/test/entt/entity/entity.cpp
index b892ea3c9..1e5dc0661 100644
--- a/test/entt/entity/entity.cpp
+++ b/test/entt/entity/entity.cpp
@@ -1,9 +1,9 @@
 #include <cstddef>
 #include <cstdint>
 #include <gtest/gtest.h>
-#include "common/entity.h"
 #include <entt/config/config.h>
 #include <entt/entity/entity.hpp>
+#include "../../common/entity.h"
 
 struct entity_traits {
     using value_type = test::entity;
diff --git a/test/entt/entity/group.cpp b/test/entt/entity/group.cpp
index a4eb042b5..d13bf9f86 100644
--- a/test/entt/entity/group.cpp
+++ b/test/entt/entity/group.cpp
@@ -5,11 +5,11 @@
 #include <tuple>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/boxed_type.h"
-#include "common/config.h"
-#include "common/empty.h"
 #include <entt/entity/group.hpp>
 #include <entt/entity/registry.hpp>
+#include "../../common/boxed_type.h"
+#include "../../common/config.h"
+#include "../../common/empty.h"
 
 TEST(NonOwningGroup, Functionalities) {
     entt::registry registry;
diff --git a/test/entt/entity/helper.cpp b/test/entt/entity/helper.cpp
index 5cd89550c..e93d8c6d0 100644
--- a/test/entt/entity/helper.cpp
+++ b/test/entt/entity/helper.cpp
@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
-#include "common/pointer_stable.h"
 #include <entt/core/hashed_string.hpp>
 #include <entt/entity/component.hpp>
 #include <entt/entity/entity.hpp>
 #include <entt/entity/helper.hpp>
 #include <entt/entity/registry.hpp>
+#include "../../common/pointer_stable.h"
 
 struct clazz {
     void func(entt::registry &, entt::entity curr) {
diff --git a/test/entt/entity/registry.cpp b/test/entt/entity/registry.cpp
index ca5e83128..70937c9f0 100644
--- a/test/entt/entity/registry.cpp
+++ b/test/entt/entity/registry.cpp
@@ -9,18 +9,18 @@
 #include <utility>
 #include <vector>
 #include <gtest/gtest.h>
-#include "common/aggregate.h"
-#include "common/config.h"
-#include "common/empty.h"
-#include "common/entity.h"
-#include "common/non_default_constructible.h"
-#include "common/pointer_stable.h"
 #include <entt/config/config.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/core/type_info.hpp>
 #include <entt/entity/entity.hpp>
 #include <entt/entity/registry.hpp>
 #include <entt/entity/view.hpp>
+#include "../../common/aggregate.h"
+#include "../../common/config.h"
+#include "../../common/empty.h"
+#include "../../common/entity.h"
+#include "../../common/non_default_constructible.h"
+#include "../../common/pointer_stable.h"
 
 struct no_eto_type {
     static constexpr std::size_t page_size = 1024u;
diff --git a/test/entt/entity/runtime_view.cpp b/test/entt/entity/runtime_view.cpp
index 6d7cafe4c..616e5fb25 100644
--- a/test/entt/entity/runtime_view.cpp
+++ b/test/entt/entity/runtime_view.cpp
@@ -2,11 +2,11 @@
 #include <memory>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/linter.hpp"
-#include "common/pointer_stable.h"
 #include <entt/entity/entity.hpp>
 #include <entt/entity/registry.hpp>
 #include <entt/entity/runtime_view.hpp>
+#include "../../common/linter.hpp"
+#include "../../common/pointer_stable.h"
 
 template<typename Type>
 struct RuntimeView: testing::Test {
diff --git a/test/entt/entity/sigh_mixin.cpp b/test/entt/entity/sigh_mixin.cpp
index b61ab85c6..666d76e94 100644
--- a/test/entt/entity/sigh_mixin.cpp
+++ b/test/entt/entity/sigh_mixin.cpp
@@ -4,12 +4,6 @@
 #include <type_traits>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/entity.h"
-#include "common/linter.hpp"
-#include "common/non_default_constructible.h"
-#include "common/pointer_stable.h"
-#include "common/throwing_allocator.hpp"
-#include "common/throwing_type.hpp"
 #include <entt/core/any.hpp>
 #include <entt/core/type_info.hpp>
 #include <entt/entity/component.hpp>
@@ -17,6 +11,12 @@
 #include <entt/entity/mixin.hpp>
 #include <entt/entity/registry.hpp>
 #include <entt/entity/storage.hpp>
+#include "../../common/entity.h"
+#include "../../common/linter.hpp"
+#include "../../common/non_default_constructible.h"
+#include "../../common/pointer_stable.h"
+#include "../../common/throwing_allocator.hpp"
+#include "../../common/throwing_type.hpp"
 
 template<typename Registry>
 void listener(std::size_t &counter, Registry &, typename Registry::entity_type) {
diff --git a/test/entt/entity/snapshot.cpp b/test/entt/entity/snapshot.cpp
index de84e854c..f7ec875d3 100644
--- a/test/entt/entity/snapshot.cpp
+++ b/test/entt/entity/snapshot.cpp
@@ -4,14 +4,14 @@
 #include <utility>
 #include <vector>
 #include <gtest/gtest.h>
-#include "common/config.h"
-#include "common/empty.h"
 #include <entt/core/any.hpp>
 #include <entt/core/hashed_string.hpp>
 #include <entt/entity/entity.hpp>
 #include <entt/entity/registry.hpp>
 #include <entt/entity/snapshot.hpp>
 #include <entt/signal/sigh.hpp>
+#include "../../common/config.h"
+#include "../../common/empty.h"
 
 struct shadow {
     entt::entity target{entt::null};
diff --git a/test/entt/entity/sparse_set.cpp b/test/entt/entity/sparse_set.cpp
index 87a1ef61c..f46ddf4ff 100644
--- a/test/entt/entity/sparse_set.cpp
+++ b/test/entt/entity/sparse_set.cpp
@@ -6,15 +6,15 @@
 #include <memory>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/config.h"
-#include "common/entity.h"
-#include "common/linter.hpp"
-#include "common/throwing_allocator.hpp"
 #include <entt/config/config.h>
 #include <entt/core/any.hpp>
 #include <entt/core/type_info.hpp>
 #include <entt/entity/entity.hpp>
 #include <entt/entity/sparse_set.hpp>
+#include "../../common/config.h"
+#include "../../common/entity.h"
+#include "../../common/linter.hpp"
+#include "../../common/throwing_allocator.hpp"
 
 struct entity_traits {
     using value_type = test::entity;
diff --git a/test/entt/entity/storage.cpp b/test/entt/entity/storage.cpp
index c63e335c4..f61bb0147 100644
--- a/test/entt/entity/storage.cpp
+++ b/test/entt/entity/storage.cpp
@@ -7,18 +7,18 @@
 #include <unordered_set>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/aggregate.h"
-#include "common/config.h"
-#include "common/linter.hpp"
-#include "common/pointer_stable.h"
-#include "common/throwing_allocator.hpp"
-#include "common/throwing_type.hpp"
-#include "common/tracked_memory_resource.hpp"
 #include <entt/core/iterator.hpp>
 #include <entt/core/type_info.hpp>
 #include <entt/entity/component.hpp>
 #include <entt/entity/entity.hpp>
 #include <entt/entity/storage.hpp>
+#include "../../common/aggregate.h"
+#include "../../common/config.h"
+#include "../../common/linter.hpp"
+#include "../../common/pointer_stable.h"
+#include "../../common/throwing_allocator.hpp"
+#include "../../common/throwing_type.hpp"
+#include "../../common/tracked_memory_resource.hpp"
 
 struct update_from_destructor {
     update_from_destructor(entt::storage<update_from_destructor> &ref, entt::entity other)
diff --git a/test/entt/entity/storage_entity.cpp b/test/entt/entity/storage_entity.cpp
index 943af7648..1d665232d 100644
--- a/test/entt/entity/storage_entity.cpp
+++ b/test/entt/entity/storage_entity.cpp
@@ -7,12 +7,12 @@
 #include <type_traits>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/config.h"
-#include "common/linter.hpp"
 #include <entt/core/iterator.hpp>
 #include <entt/core/type_info.hpp>
 #include <entt/entity/entity.hpp>
 #include <entt/entity/storage.hpp>
+#include "../../common/config.h"
+#include "../../common/linter.hpp"
 
 TEST(StorageEntity, Constructors) {
     entt::storage<entt::entity> pool;
diff --git a/test/entt/entity/storage_no_instance.cpp b/test/entt/entity/storage_no_instance.cpp
index a9eac4f41..d025b929c 100644
--- a/test/entt/entity/storage_no_instance.cpp
+++ b/test/entt/entity/storage_no_instance.cpp
@@ -6,13 +6,13 @@
 #include <type_traits>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/config.h"
-#include "common/empty.h"
-#include "common/linter.hpp"
 #include <entt/core/iterator.hpp>
 #include <entt/core/type_info.hpp>
 #include <entt/entity/entity.hpp>
 #include <entt/entity/storage.hpp>
+#include "../../common/config.h"
+#include "../../common/empty.h"
+#include "../../common/linter.hpp"
 
 template<typename Type>
 struct StorageNoInstance: testing::Test {
diff --git a/test/entt/entity/view.cpp b/test/entt/entity/view.cpp
index 43302602b..daf052201 100644
--- a/test/entt/entity/view.cpp
+++ b/test/entt/entity/view.cpp
@@ -4,15 +4,15 @@
 #include <tuple>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/boxed_type.h"
-#include "common/empty.h"
-#include "common/pointer_stable.h"
 #include <entt/core/any.hpp>
 #include <entt/core/hashed_string.hpp>
 #include <entt/core/type_info.hpp>
 #include <entt/entity/entity.hpp>
 #include <entt/entity/registry.hpp>
 #include <entt/entity/view.hpp>
+#include "../../common/boxed_type.h"
+#include "../../common/empty.h"
+#include "../../common/pointer_stable.h"
 
 TEST(SingleComponentView, Functionalities) {
     entt::registry registry;
diff --git a/test/entt/graph/adjacency_matrix.cpp b/test/entt/graph/adjacency_matrix.cpp
index ad3180180..0c75089e1 100644
--- a/test/entt/graph/adjacency_matrix.cpp
+++ b/test/entt/graph/adjacency_matrix.cpp
@@ -2,9 +2,9 @@
 #include <memory>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/linter.hpp"
-#include "common/throwing_allocator.hpp"
 #include <entt/graph/adjacency_matrix.hpp>
+#include "../../common/linter.hpp"
+#include "../../common/throwing_allocator.hpp"
 
 TEST(AdjacencyMatrix, Resize) {
     entt::adjacency_matrix<entt::directed_tag> adjacency_matrix{2};
diff --git a/test/entt/graph/flow.cpp b/test/entt/graph/flow.cpp
index e56ab7e01..7c83e76fd 100644
--- a/test/entt/graph/flow.cpp
+++ b/test/entt/graph/flow.cpp
@@ -3,11 +3,11 @@
 #include <memory>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/config.h"
-#include "common/linter.hpp"
-#include "common/throwing_allocator.hpp"
 #include <entt/core/hashed_string.hpp>
 #include <entt/graph/flow.hpp>
+#include "../../common/config.h"
+#include "../../common/linter.hpp"
+#include "../../common/throwing_allocator.hpp"
 
 TEST(Flow, Constructors) {
     entt::flow flow{};
diff --git a/test/entt/locator/locator.cpp b/test/entt/locator/locator.cpp
index 01215cae4..f7709a2c1 100644
--- a/test/entt/locator/locator.cpp
+++ b/test/entt/locator/locator.cpp
@@ -1,7 +1,7 @@
 #include <memory>
 #include <gtest/gtest.h>
-#include "common/config.h"
 #include <entt/locator/locator.hpp>
+#include "../../common/config.h"
 
 struct base_service {
     virtual ~base_service() = default;
diff --git a/test/entt/meta/meta_any.cpp b/test/entt/meta/meta_any.cpp
index cd88e3f0d..0642878bc 100644
--- a/test/entt/meta/meta_any.cpp
+++ b/test/entt/meta/meta_any.cpp
@@ -4,13 +4,13 @@
 #include <memory>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/config.h"
-#include "common/linter.hpp"
-#include "common/non_comparable.h"
 #include <entt/core/hashed_string.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/resolve.hpp>
+#include "../../common/config.h"
+#include "../../common/linter.hpp"
+#include "../../common/non_comparable.h"
 
 struct clazz {
     void member(int i) {
diff --git a/test/entt/meta/meta_container.cpp b/test/entt/meta/meta_container.cpp
index 689fa2977..4298a2707 100644
--- a/test/entt/meta/meta_container.cpp
+++ b/test/entt/meta/meta_container.cpp
@@ -6,14 +6,14 @@
 #include <utility>
 #include <vector>
 #include <gtest/gtest.h>
-#include "common/config.h"
-#include "common/empty.h"
-#include "common/non_default_constructible.h"
 #include <entt/container/dense_map.hpp>
 #include <entt/container/dense_set.hpp>
 #include <entt/meta/container.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/resolve.hpp>
+#include "../../common/config.h"
+#include "../../common/empty.h"
+#include "../../common/non_default_constructible.h"
 
 TEST(MetaContainer, Invalid) {
     ASSERT_FALSE(entt::meta_any{0}.as_sequence_container());
diff --git a/test/entt/meta/meta_context.cpp b/test/entt/meta/meta_context.cpp
index 5df9cbd80..567c01f94 100644
--- a/test/entt/meta/meta_context.cpp
+++ b/test/entt/meta/meta_context.cpp
@@ -3,7 +3,6 @@
 #include <utility>
 #include <vector>
 #include <gtest/gtest.h>
-#include "common/empty.h"
 #include <entt/core/hashed_string.hpp>
 #include <entt/core/type_info.hpp>
 #include <entt/meta/container.hpp>
@@ -13,6 +12,7 @@
 #include <entt/meta/pointer.hpp>
 #include <entt/meta/resolve.hpp>
 #include <entt/meta/template.hpp>
+#include "../../common/empty.h"
 
 struct base {
     base() = default;
diff --git a/test/entt/meta/meta_data.cpp b/test/entt/meta/meta_data.cpp
index 60f53cc62..e891ab3dd 100644
--- a/test/entt/meta/meta_data.cpp
+++ b/test/entt/meta/meta_data.cpp
@@ -2,7 +2,6 @@
 #include <string>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/config.h"
 #include <entt/core/hashed_string.hpp>
 #include <entt/core/type_traits.hpp>
 #include <entt/locator/locator.hpp>
@@ -13,6 +12,7 @@
 #include <entt/meta/policy.hpp>
 #include <entt/meta/range.hpp>
 #include <entt/meta/resolve.hpp>
+#include "../../common/config.h"
 
 struct base {
     virtual ~base() = default;
diff --git a/test/entt/meta/meta_func.cpp b/test/entt/meta/meta_func.cpp
index 4e19ce836..64691705c 100644
--- a/test/entt/meta/meta_func.cpp
+++ b/test/entt/meta/meta_func.cpp
@@ -1,7 +1,6 @@
 #include <cstddef>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/config.h"
 #include <entt/core/hashed_string.hpp>
 #include <entt/core/utility.hpp>
 #include <entt/entity/registry.hpp>
@@ -10,6 +9,7 @@
 #include <entt/meta/policy.hpp>
 #include <entt/meta/range.hpp>
 #include <entt/meta/resolve.hpp>
+#include "../../common/config.h"
 
 struct base {
     base() = default;
diff --git a/test/entt/meta/meta_pointer.cpp b/test/entt/meta/meta_pointer.cpp
index 9268a3a28..1cc2cddb0 100644
--- a/test/entt/meta/meta_pointer.cpp
+++ b/test/entt/meta/meta_pointer.cpp
@@ -2,12 +2,12 @@
 #include <type_traits>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/config.h"
 #include <entt/meta/adl_pointer.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/pointer.hpp>
 #include <entt/meta/resolve.hpp>
 #include <entt/meta/type_traits.hpp>
+#include "../../common/config.h"
 
 template<typename Type>
 struct wrapped_shared_ptr {
diff --git a/test/entt/meta/meta_type.cpp b/test/entt/meta/meta_type.cpp
index 5b0845083..4638a8819 100644
--- a/test/entt/meta/meta_type.cpp
+++ b/test/entt/meta/meta_type.cpp
@@ -4,7 +4,6 @@
 #include <utility>
 #include <vector>
 #include <gtest/gtest.h>
-#include "common/config.h"
 #include <entt/core/hashed_string.hpp>
 #include <entt/core/type_info.hpp>
 #include <entt/core/utility.hpp>
@@ -17,6 +16,7 @@
 #include <entt/meta/range.hpp>
 #include <entt/meta/resolve.hpp>
 #include <entt/meta/template.hpp>
+#include "../../common/config.h"
 
 template<typename Type>
 void set(Type &prop, Type value) {
diff --git a/test/entt/meta/meta_utility.cpp b/test/entt/meta/meta_utility.cpp
index c1698df74..eb7c1d555 100644
--- a/test/entt/meta/meta_utility.cpp
+++ b/test/entt/meta/meta_utility.cpp
@@ -2,13 +2,13 @@
 #include <iterator>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/config.h"
-#include "common/empty.h"
 #include <entt/core/type_traits.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/policy.hpp>
 #include <entt/meta/resolve.hpp>
 #include <entt/meta/utility.hpp>
+#include "../../common/config.h"
+#include "../../common/empty.h"
 
 struct clazz {
     void setter(int v) {
diff --git a/test/entt/poly/poly.cpp b/test/entt/poly/poly.cpp
index 1150c8e8c..0e705a8fe 100644
--- a/test/entt/poly/poly.cpp
+++ b/test/entt/poly/poly.cpp
@@ -3,11 +3,11 @@
 #include <cstdint>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/config.h"
-#include "common/linter.hpp"
 #include <entt/core/type_info.hpp>
 #include <entt/core/type_traits.hpp>
 #include <entt/poly/poly.hpp>
+#include "../../common/config.h"
+#include "../../common/linter.hpp"
 
 template<typename Base>
 struct common_type: Base {
diff --git a/test/entt/process/process.cpp b/test/entt/process/process.cpp
index b2dc10cd3..3ad5726da 100644
--- a/test/entt/process/process.cpp
+++ b/test/entt/process/process.cpp
@@ -1,7 +1,7 @@
 #include <cstdint>
 #include <gtest/gtest.h>
-#include "common/empty.h"
 #include <entt/process/process.hpp>
+#include "../../common/empty.h"
 
 template<typename Delta>
 struct fake_process: entt::process<fake_process<Delta>, Delta> {
diff --git a/test/entt/resource/resource.cpp b/test/entt/resource/resource.cpp
index bfdb87855..aadce9a71 100644
--- a/test/entt/resource/resource.cpp
+++ b/test/entt/resource/resource.cpp
@@ -1,9 +1,9 @@
 #include <memory>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/linter.hpp"
 #include <entt/core/type_info.hpp>
 #include <entt/resource/resource.hpp>
+#include "../../common/linter.hpp"
 
 struct base {
     virtual ~base() = default;
diff --git a/test/entt/resource/resource_cache.cpp b/test/entt/resource/resource_cache.cpp
index e2c44c055..3a93d009e 100644
--- a/test/entt/resource/resource_cache.cpp
+++ b/test/entt/resource/resource_cache.cpp
@@ -3,14 +3,14 @@
 #include <tuple>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/linter.hpp"
-#include "common/throwing_allocator.hpp"
 #include <entt/container/dense_map.hpp>
 #include <entt/core/hashed_string.hpp>
 #include <entt/core/iterator.hpp>
 #include <entt/resource/cache.hpp>
 #include <entt/resource/loader.hpp>
 #include <entt/resource/resource.hpp>
+#include "../../common/linter.hpp"
+#include "../../common/throwing_allocator.hpp"
 
 struct broken_tag {};
 struct with_callback {};
diff --git a/test/entt/signal/delegate.cpp b/test/entt/signal/delegate.cpp
index b43b94192..4a48a3962 100644
--- a/test/entt/signal/delegate.cpp
+++ b/test/entt/signal/delegate.cpp
@@ -1,8 +1,8 @@
 #include <memory>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/config.h"
 #include <entt/signal/delegate.hpp>
+#include "../../common/config.h"
 
 int power_of_two(const int &i) {
     return i * i;
diff --git a/test/entt/signal/emitter.cpp b/test/entt/signal/emitter.cpp
index ab94690e7..4bdb111b5 100644
--- a/test/entt/signal/emitter.cpp
+++ b/test/entt/signal/emitter.cpp
@@ -2,11 +2,11 @@
 #include <memory>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/boxed_type.h"
-#include "common/emitter.h"
-#include "common/empty.h"
-#include "common/linter.hpp"
 #include <entt/signal/emitter.hpp>
+#include "../../common/boxed_type.h"
+#include "../../common/emitter.h"
+#include "../../common/empty.h"
+#include "../../common/linter.hpp"
 
 TEST(Emitter, Move) {
     test::emitter emitter{};
diff --git a/test/entt/signal/sigh.cpp b/test/entt/signal/sigh.cpp
index 0ddd3a6d9..7ae0b50ed 100644
--- a/test/entt/signal/sigh.cpp
+++ b/test/entt/signal/sigh.cpp
@@ -1,8 +1,8 @@
 #include <memory>
 #include <utility>
 #include <gtest/gtest.h>
-#include "common/linter.hpp"
 #include <entt/signal/sigh.hpp>
+#include "../../common/linter.hpp"
 
 struct sigh_listener {
     static void f(int &v) {
diff --git a/test/lib/dispatcher/plugin/main.cpp b/test/lib/dispatcher/plugin/main.cpp
index e2086459c..77e89b891 100644
--- a/test/lib/dispatcher/plugin/main.cpp
+++ b/test/lib/dispatcher/plugin/main.cpp
@@ -1,10 +1,10 @@
 #define CR_HOST
 
 #include <gtest/gtest.h>
-#include "common/boxed_type.h"
-#include "common/listener.h"
 #include <cr.h>
 #include <entt/signal/dispatcher.hpp>
+#include "../../../common/boxed_type.h"
+#include "../../../common/listener.h"
 
 struct listener {
     void on(test::boxed_int msg) {
diff --git a/test/lib/dispatcher/plugin/plugin.cpp b/test/lib/dispatcher/plugin/plugin.cpp
index 88e42914d..86461b386 100644
--- a/test/lib/dispatcher/plugin/plugin.cpp
+++ b/test/lib/dispatcher/plugin/plugin.cpp
@@ -1,7 +1,7 @@
-#include "common/boxed_type.h"
-#include "common/empty.h"
 #include <cr.h>
 #include <entt/signal/dispatcher.hpp>
+#include "../../../common/boxed_type.h"
+#include "../../../common/empty.h"
 
 CR_EXPORT int cr_main(cr_plugin *ctx, cr_op operation) {
     switch(operation) {
diff --git a/test/lib/dispatcher/shared/lib.cpp b/test/lib/dispatcher/shared/lib.cpp
index 3f993bae3..b1a81b72f 100644
--- a/test/lib/dispatcher/shared/lib.cpp
+++ b/test/lib/dispatcher/shared/lib.cpp
@@ -1,7 +1,7 @@
-#include "common/boxed_type.h"
-#include "common/empty.h"
 #include <entt/core/attribute.h>
 #include <entt/signal/dispatcher.hpp>
+#include "../../../common/boxed_type.h"
+#include "../../../common/empty.h"
 
 ENTT_API void trigger(entt::dispatcher &dispatcher) {
     dispatcher.trigger<test::empty>();
diff --git a/test/lib/dispatcher/shared/main.cpp b/test/lib/dispatcher/shared/main.cpp
index 184bbf9e4..c83288e8f 100644
--- a/test/lib/dispatcher/shared/main.cpp
+++ b/test/lib/dispatcher/shared/main.cpp
@@ -1,9 +1,9 @@
 #include <gtest/gtest.h>
-#include "common/boxed_type.h"
-#include "common/listener.h"
 #include <entt/core/attribute.h>
 #include <entt/core/utility.hpp>
 #include <entt/signal/dispatcher.hpp>
+#include "../../../common/boxed_type.h"
+#include "../../../common/listener.h"
 
 ENTT_API void trigger(entt::dispatcher &);
 
diff --git a/test/lib/emitter/plugin/main.cpp b/test/lib/emitter/plugin/main.cpp
index ad10ca957..16d956b32 100644
--- a/test/lib/emitter/plugin/main.cpp
+++ b/test/lib/emitter/plugin/main.cpp
@@ -2,9 +2,9 @@
 
 #include <functional>
 #include <gtest/gtest.h>
-#include "common/boxed_type.h"
-#include "common/emitter.h"
 #include <cr.h>
+#include "../../../common/boxed_type.h"
+#include "../../../common/emitter.h"
 
 TEST(Lib, Emitter) {
     test::emitter emitter;
diff --git a/test/lib/emitter/plugin/plugin.cpp b/test/lib/emitter/plugin/plugin.cpp
index 9dcae5fba..722573c53 100644
--- a/test/lib/emitter/plugin/plugin.cpp
+++ b/test/lib/emitter/plugin/plugin.cpp
@@ -1,7 +1,7 @@
-#include "common/boxed_type.h"
-#include "common/emitter.h"
-#include "common/empty.h"
 #include <cr.h>
+#include "../../../common/boxed_type.h"
+#include "../../../common/emitter.h"
+#include "../../../common/empty.h"
 
 CR_EXPORT int cr_main(cr_plugin *ctx, cr_op operation) {
     switch(operation) {
diff --git a/test/lib/emitter/shared/lib.cpp b/test/lib/emitter/shared/lib.cpp
index 5bbfd3074..5a5e19adc 100644
--- a/test/lib/emitter/shared/lib.cpp
+++ b/test/lib/emitter/shared/lib.cpp
@@ -1,7 +1,7 @@
-#include "common/boxed_type.h"
-#include "common/emitter.h"
-#include "common/empty.h"
 #include <entt/core/attribute.h>
+#include "../../../common/boxed_type.h"
+#include "../../../common/emitter.h"
+#include "../../../common/empty.h"
 
 ENTT_API void emit(test::emitter &emitter) {
     emitter.publish(test::empty{});
diff --git a/test/lib/emitter/shared/main.cpp b/test/lib/emitter/shared/main.cpp
index c46dffc06..8f77c70f4 100644
--- a/test/lib/emitter/shared/main.cpp
+++ b/test/lib/emitter/shared/main.cpp
@@ -1,8 +1,8 @@
 #include <functional>
 #include <gtest/gtest.h>
-#include "common/boxed_type.h"
-#include "common/emitter.h"
 #include <entt/core/attribute.h>
+#include "../../../common/boxed_type.h"
+#include "../../../common/emitter.h"
 
 ENTT_API void emit(test::emitter &);
 
diff --git a/test/lib/locator/plugin/main.cpp b/test/lib/locator/plugin/main.cpp
index 8c13d625b..2ff0672a9 100644
--- a/test/lib/locator/plugin/main.cpp
+++ b/test/lib/locator/plugin/main.cpp
@@ -1,9 +1,9 @@
 #define CR_HOST
 
 #include <gtest/gtest.h>
-#include "common/boxed_type.h"
 #include <cr.h>
 #include <entt/locator/locator.hpp>
+#include "../../../common/boxed_type.h"
 #include "userdata.h"
 
 TEST(Lib, Locator) {
diff --git a/test/lib/locator/plugin/plugin.cpp b/test/lib/locator/plugin/plugin.cpp
index 786492b18..96ec57de6 100644
--- a/test/lib/locator/plugin/plugin.cpp
+++ b/test/lib/locator/plugin/plugin.cpp
@@ -1,6 +1,6 @@
-#include "common/boxed_type.h"
 #include <cr.h>
 #include <entt/locator/locator.hpp>
+#include "../../../common/boxed_type.h"
 #include "userdata.h"
 
 CR_EXPORT int cr_main(cr_plugin *ctx, cr_op operation) {
diff --git a/test/lib/locator/plugin/userdata.h b/test/lib/locator/plugin/userdata.h
index fed7a877c..4c0da0c54 100644
--- a/test/lib/locator/plugin/userdata.h
+++ b/test/lib/locator/plugin/userdata.h
@@ -1,8 +1,8 @@
 #ifndef ENTT_LIB_LOCATOR_PLUGIN_USERDATA_H
 #define ENTT_LIB_LOCATOR_PLUGIN_USERDATA_H
 
-#include "common/boxed_type.h"
 #include <entt/locator/locator.hpp>
+#include "../../../common/boxed_type.h"
 
 struct userdata {
     typename entt::locator<test::boxed_int>::node_type handle{};
diff --git a/test/lib/locator/shared/lib.cpp b/test/lib/locator/shared/lib.cpp
index 9795111de..51230c839 100644
--- a/test/lib/locator/shared/lib.cpp
+++ b/test/lib/locator/shared/lib.cpp
@@ -1,6 +1,6 @@
-#include "common/boxed_type.h"
 #include <entt/core/attribute.h>
 #include <entt/locator/locator.hpp>
+#include "../../../common/boxed_type.h"
 
 ENTT_API void set_up(const entt::locator<test::boxed_int>::node_type &handle) {
     entt::locator<test::boxed_int>::reset(handle);
diff --git a/test/lib/locator/shared/main.cpp b/test/lib/locator/shared/main.cpp
index d0c22f8b9..f74fa6a82 100644
--- a/test/lib/locator/shared/main.cpp
+++ b/test/lib/locator/shared/main.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
-#include "common/boxed_type.h"
 #include <entt/core/attribute.h>
 #include <entt/locator/locator.hpp>
+#include "../../../common/boxed_type.h"
 
 ENTT_API void set_up(const entt::locator<test::boxed_int>::node_type &);
 ENTT_API void use_service(int);
diff --git a/test/lib/meta/plugin/plugin.cpp b/test/lib/meta/plugin/plugin.cpp
index e005cdefd..40fe7869b 100644
--- a/test/lib/meta/plugin/plugin.cpp
+++ b/test/lib/meta/plugin/plugin.cpp
@@ -1,11 +1,11 @@
-#include "common/boxed_type.h"
-#include "common/empty.h"
 #include <cr.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/locator/locator.hpp>
 #include <entt/meta/context.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
+#include "../../../common/boxed_type.h"
+#include "../../../common/empty.h"
 #include "userdata.h"
 
 test::boxed_int create_boxed_int(int value) {
diff --git a/test/lib/meta/plugin_std/plugin.cpp b/test/lib/meta/plugin_std/plugin.cpp
index e005cdefd..40fe7869b 100644
--- a/test/lib/meta/plugin_std/plugin.cpp
+++ b/test/lib/meta/plugin_std/plugin.cpp
@@ -1,11 +1,11 @@
-#include "common/boxed_type.h"
-#include "common/empty.h"
 #include <cr.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/locator/locator.hpp>
 #include <entt/meta/context.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
+#include "../../../common/boxed_type.h"
+#include "../../../common/empty.h"
 #include "userdata.h"
 
 test::boxed_int create_boxed_int(int value) {
diff --git a/test/lib/meta/plugin_std/userdata.h b/test/lib/meta/plugin_std/userdata.h
index 3fbbca01f..104b70a1c 100644
--- a/test/lib/meta/plugin_std/userdata.h
+++ b/test/lib/meta/plugin_std/userdata.h
@@ -2,12 +2,12 @@
 #define ENTT_LIB_META_PLUGIN_STD_USERDATA_H
 
 #include <type_traits>
-#include "common/boxed_type.h"
-#include "common/empty.h"
 #include <entt/core/hashed_string.hpp>
 #include <entt/core/type_info.hpp>
 #include <entt/meta/context.hpp>
 #include <entt/meta/meta.hpp>
+#include "../../../common/boxed_type.h"
+#include "../../../common/empty.h"
 
 #define ASSIGN_TYPE_ID(clazz) \
     template<> \
diff --git a/test/lib/meta/shared/lib.cpp b/test/lib/meta/shared/lib.cpp
index 93b624edd..8c69e37e8 100644
--- a/test/lib/meta/shared/lib.cpp
+++ b/test/lib/meta/shared/lib.cpp
@@ -1,11 +1,11 @@
-#include "common/boxed_type.h"
-#include "common/empty.h"
 #include <entt/core/attribute.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/locator/locator.hpp>
 #include <entt/meta/context.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
+#include "../../../common/boxed_type.h"
+#include "../../../common/empty.h"
 
 test::boxed_int create_boxed_int(int value) {
     return test::boxed_int{value};
@@ -19,7 +19,7 @@ ENTT_API void set_up() {
     using namespace entt::literals;
 
     entt::meta<test::boxed_int>()
-        .type(mboxed_intm_hs)
+        .type("boxed_int"_hs)
         .ctor<&create_boxed_int>()
         .data<&test::boxed_int::value>("value"_hs);
 
diff --git a/test/lib/meta/shared/main.cpp b/test/lib/meta/shared/main.cpp
index 561c8ba3c..de50c845f 100644
--- a/test/lib/meta/shared/main.cpp
+++ b/test/lib/meta/shared/main.cpp
@@ -1,12 +1,12 @@
 #include <gtest/gtest.h>
-#include "common/boxed_type.h"
-#include "common/empty.h"
 #include <entt/core/attribute.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/locator/locator.hpp>
 #include <entt/meta/context.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/resolve.hpp>
+#include "../../../common/boxed_type.h"
+#include "../../../common/empty.h"
 
 ENTT_API void share(const entt::locator<entt::meta_ctx>::node_type &);
 ENTT_API void set_up();
@@ -16,7 +16,7 @@ ENTT_API entt::meta_any wrap_int(int);
 TEST(Lib, Meta) {
     using namespace entt::literals;
 
-    ASSERT_FALSE(entt::resolve(mboxed_int"_hs));
+    ASSERT_FALSE(entt::resolve("boxed_int"_hs));
     ASSERT_FALSE(entt::resolve("empty"_hs));
 
     share(entt::locator<entt::meta_ctx>::handle());
diff --git a/test/lib/registry/plugin/main.cpp b/test/lib/registry/plugin/main.cpp
index 735f776ba..ec7375737 100644
--- a/test/lib/registry/plugin/main.cpp
+++ b/test/lib/registry/plugin/main.cpp
@@ -1,12 +1,12 @@
 #define CR_HOST
 
 #include <gtest/gtest.h>
-#include "common/boxed_type.h"
-#include "common/empty.h"
 #include <cr.h>
 #include <entt/entity/entity.hpp>
 #include <entt/entity/registry.hpp>
 #include <entt/entity/view.hpp>
+#include "../../../common/boxed_type.h"
+#include "../../../common/empty.h"
 
 TEST(Lib, Registry) {
     constexpr auto count = 3;
diff --git a/test/lib/registry/plugin/plugin.cpp b/test/lib/registry/plugin/plugin.cpp
index 31780c8e8..4d9d221ee 100644
--- a/test/lib/registry/plugin/plugin.cpp
+++ b/test/lib/registry/plugin/plugin.cpp
@@ -1,7 +1,7 @@
-#include "common/boxed_type.h"
-#include "common/empty.h"
 #include <cr.h>
 #include <entt/entity/registry.hpp>
+#include "../../../common/boxed_type.h"
+#include "../../../common/empty.h"
 
 CR_EXPORT int cr_main(cr_plugin *ctx, cr_op operation) {
     constexpr auto count = 3;
diff --git a/test/lib/registry/shared/lib.cpp b/test/lib/registry/shared/lib.cpp
index d68f27e32..cc48842ea 100644
--- a/test/lib/registry/shared/lib.cpp
+++ b/test/lib/registry/shared/lib.cpp
@@ -1,7 +1,7 @@
-#include "common/boxed_type.h"
-#include "common/empty.h"
 #include <entt/core/attribute.h>
 #include <entt/entity/registry.hpp>
+#include "../../../common/boxed_type.h"
+#include "../../../common/empty.h"
 
 template class entt::basic_registry<entt::entity>;
 
diff --git a/test/lib/registry/shared/main.cpp b/test/lib/registry/shared/main.cpp
index a094e5ab2..00f7f7c8d 100644
--- a/test/lib/registry/shared/main.cpp
+++ b/test/lib/registry/shared/main.cpp
@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
-#include "common/boxed_type.h"
-#include "common/empty.h"
 #include <entt/core/attribute.h>
 #include <entt/entity/entity.hpp>
 #include <entt/entity/registry.hpp>
 #include <entt/entity/view.hpp>
+#include "../../../common/boxed_type.h"
+#include "../../../common/empty.h"
 
 ENTT_API void update(entt::registry &, int);
 ENTT_API void insert(entt::registry &);