diff --git a/test/benchmark/benchmark.cpp b/test/benchmark/benchmark.cpp
index f4ae8ca33..cb9a93a53 100644
--- a/test/benchmark/benchmark.cpp
+++ b/test/benchmark/benchmark.cpp
@@ -1,8 +1,8 @@
 #include <chrono>
-#include <cstddef>
 #include <cstdint>
 #include <iostream>
-#include <iterator>
+#include <utility>
+#include <vector>
 #include <gtest/gtest.h>
 #include <entt/core/type_info.hpp>
 #include <entt/entity/registry.hpp>
@@ -15,7 +15,7 @@ struct position {
 struct velocity: position {};
 struct stable_position: position {};
 
-template<std::size_t>
+template<auto>
 struct comp { int x; };
 
 template<>
diff --git a/test/entt/container/dense_map.cpp b/test/entt/container/dense_map.cpp
index ca05ab76d..9918a5ee7 100644
--- a/test/entt/container/dense_map.cpp
+++ b/test/entt/container/dense_map.cpp
@@ -1,6 +1,7 @@
-#include <cmath>
+#include <cstddef>
 #include <functional>
 #include <iterator>
+#include <memory>
 #include <tuple>
 #include <type_traits>
 #include <utility>
diff --git a/test/entt/container/dense_set.cpp b/test/entt/container/dense_set.cpp
index 66a70a1f2..b7ac6dfdf 100644
--- a/test/entt/container/dense_set.cpp
+++ b/test/entt/container/dense_set.cpp
@@ -1,6 +1,7 @@
-#include <cmath>
+#include <cstddef>
 #include <functional>
 #include <iterator>
+#include <memory>
 #include <tuple>
 #include <type_traits>
 #include <utility>
diff --git a/test/entt/core/algorithm.cpp b/test/entt/core/algorithm.cpp
index 9fd5c799e..625b72923 100644
--- a/test/entt/core/algorithm.cpp
+++ b/test/entt/core/algorithm.cpp
@@ -1,4 +1,5 @@
 #include <array>
+#include <vector>
 #include <gtest/gtest.h>
 #include <entt/core/algorithm.hpp>
 
diff --git a/test/entt/core/any.cpp b/test/entt/core/any.cpp
index cd367e144..0fe8f81a2 100644
--- a/test/entt/core/any.cpp
+++ b/test/entt/core/any.cpp
@@ -1,10 +1,14 @@
 #include <algorithm>
-#include <string>
+#include <cstdint>
+#include <cstring>
+#include <iterator>
 #include <type_traits>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 #include <gtest/gtest.h>
 #include <entt/core/any.hpp>
+#include <entt/core/type_info.hpp>
 
 struct empty {
     ~empty() {
@@ -1434,11 +1438,11 @@ TEST_F(Any, DeducedArrayType) {
 
     ASSERT_TRUE(any);
     ASSERT_EQ(any.type(), entt::type_id<const char *>());
-    ASSERT_EQ((strcmp("array of char", entt::any_cast<const char *>(any))), 0);
+    ASSERT_EQ((std::strcmp("array of char", entt::any_cast<const char *>(any))), 0);
 
     any = "another array of char";
 
     ASSERT_TRUE(any);
     ASSERT_EQ(any.type(), entt::type_id<const char *>());
-    ASSERT_EQ((strcmp("another array of char", entt::any_cast<const char *>(any))), 0);
+    ASSERT_EQ((std::strcmp("another array of char", entt::any_cast<const char *>(any))), 0);
 }
diff --git a/test/entt/core/compressed_pair.cpp b/test/entt/core/compressed_pair.cpp
index c2097a6b3..f84bd4d41 100644
--- a/test/entt/core/compressed_pair.cpp
+++ b/test/entt/core/compressed_pair.cpp
@@ -2,6 +2,7 @@
 #include <type_traits>
 #include <utility>
 #include <gtest/gtest.h>
+#include <entt/config/config.h>
 #include <entt/core/compressed_pair.hpp>
 
 struct empty_type {};
diff --git a/test/entt/core/enum.cpp b/test/entt/core/enum.cpp
index 65b8fb605..5d5d281eb 100644
--- a/test/entt/core/enum.cpp
+++ b/test/entt/core/enum.cpp
@@ -1,7 +1,7 @@
-#include <cstddef>
+#include <cstdint>
+#include <type_traits>
 #include <gtest/gtest.h>
 #include <entt/core/enum.hpp>
-#include <entt/core/type_traits.hpp>
 
 enum class detected {
     foo = 0x01,
diff --git a/test/entt/core/hashed_string.cpp b/test/entt/core/hashed_string.cpp
index 581868621..a1f2033b9 100644
--- a/test/entt/core/hashed_string.cpp
+++ b/test/entt/core/hashed_string.cpp
@@ -1,3 +1,4 @@
+#include <cstdint>
 #include <string>
 #include <string_view>
 #include <type_traits>
diff --git a/test/entt/core/iterator.cpp b/test/entt/core/iterator.cpp
index 4ea1678c7..725836858 100644
--- a/test/entt/core/iterator.cpp
+++ b/test/entt/core/iterator.cpp
@@ -1,3 +1,4 @@
+#include <type_traits>
 #include <utility>
 #include <vector>
 #include <gtest/gtest.h>
diff --git a/test/entt/core/memory.cpp b/test/entt/core/memory.cpp
index c2d6c8ea3..012a6f117 100644
--- a/test/entt/core/memory.cpp
+++ b/test/entt/core/memory.cpp
@@ -1,6 +1,9 @@
 #include <cmath>
+#include <cstddef>
 #include <limits>
 #include <memory>
+#include <type_traits>
+#include <utility>
 #include <gtest/gtest.h>
 #include <entt/core/memory.hpp>
 
diff --git a/test/entt/core/type_info.cpp b/test/entt/core/type_info.cpp
index dc0733a1f..9f165a524 100644
--- a/test/entt/core/type_info.cpp
+++ b/test/entt/core/type_info.cpp
@@ -1,7 +1,8 @@
 #include <string_view>
 #include <type_traits>
+#include <utility>
 #include <gtest/gtest.h>
-#include <entt/core/hashed_string.hpp>
+#include <entt/config/config.h>
 #include <entt/core/type_info.hpp>
 #include <entt/core/type_traits.hpp>
 
diff --git a/test/entt/core/type_traits.cpp b/test/entt/core/type_traits.cpp
index fe155a03a..be2d823c0 100644
--- a/test/entt/core/type_traits.cpp
+++ b/test/entt/core/type_traits.cpp
@@ -1,11 +1,10 @@
 #include <functional>
-#include <iterator>
 #include <tuple>
 #include <type_traits>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 #include <gtest/gtest.h>
-#include <entt/config/config.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/core/type_traits.hpp>
 
diff --git a/test/entt/entity/entity.cpp b/test/entt/entity/entity.cpp
index 25a02646e..b8212bc52 100644
--- a/test/entt/entity/entity.cpp
+++ b/test/entt/entity/entity.cpp
@@ -1,5 +1,3 @@
-#include <functional>
-#include <type_traits>
 #include <gtest/gtest.h>
 #include <entt/entity/entity.hpp>
 #include <entt/entity/registry.hpp>
diff --git a/test/entt/entity/group.cpp b/test/entt/entity/group.cpp
index df44ea0c4..08494e8e1 100644
--- a/test/entt/entity/group.cpp
+++ b/test/entt/entity/group.cpp
@@ -1,5 +1,8 @@
 #include <algorithm>
+#include <cstddef>
+#include <functional>
 #include <iterator>
+#include <tuple>
 #include <type_traits>
 #include <utility>
 #include <gtest/gtest.h>
diff --git a/test/entt/entity/handle.cpp b/test/entt/entity/handle.cpp
index 61cee235d..7e37d45f8 100644
--- a/test/entt/entity/handle.cpp
+++ b/test/entt/entity/handle.cpp
@@ -1,3 +1,4 @@
+#include <tuple>
 #include <type_traits>
 #include <utility>
 #include <gtest/gtest.h>
diff --git a/test/entt/entity/helper.cpp b/test/entt/entity/helper.cpp
index 0fa8378d9..c15a177ee 100644
--- a/test/entt/entity/helper.cpp
+++ b/test/entt/entity/helper.cpp
@@ -1,5 +1,4 @@
 #include <gtest/gtest.h>
-#include <entt/core/hashed_string.hpp>
 #include <entt/core/type_traits.hpp>
 #include <entt/entity/entity.hpp>
 #include <entt/entity/helper.hpp>
diff --git a/test/entt/entity/observer.cpp b/test/entt/entity/observer.cpp
index 6bb420e82..fba7c931c 100644
--- a/test/entt/entity/observer.cpp
+++ b/test/entt/entity/observer.cpp
@@ -1,6 +1,4 @@
-#include <cstddef>
-#include <tuple>
-#include <type_traits>
+#include <utility>
 #include <gtest/gtest.h>
 #include <entt/entity/observer.hpp>
 #include <entt/entity/registry.hpp>
diff --git a/test/entt/entity/organizer.cpp b/test/entt/entity/organizer.cpp
index e9cbd3faf..b3351b32b 100644
--- a/test/entt/entity/organizer.cpp
+++ b/test/entt/entity/organizer.cpp
@@ -1,3 +1,4 @@
+#include <cstddef>
 #include <gtest/gtest.h>
 #include <entt/entity/organizer.hpp>
 #include <entt/entity/registry.hpp>
diff --git a/test/entt/entity/registry.cpp b/test/entt/entity/registry.cpp
index b565a037c..4841cde61 100644
--- a/test/entt/entity/registry.cpp
+++ b/test/entt/entity/registry.cpp
@@ -1,10 +1,13 @@
-#include <cstdint>
+#include <cstddef>
 #include <functional>
 #include <iterator>
 #include <memory>
+#include <tuple>
 #include <type_traits>
 #include <unordered_set>
+#include <utility>
 #include <gtest/gtest.h>
+#include <entt/core/hashed_string.hpp>
 #include <entt/core/type_traits.hpp>
 #include <entt/entity/component.hpp>
 #include <entt/entity/entity.hpp>
diff --git a/test/entt/entity/registry_no_eto.cpp b/test/entt/entity/registry_no_eto.cpp
index 771ceeb45..c3725162a 100644
--- a/test/entt/entity/registry_no_eto.cpp
+++ b/test/entt/entity/registry_no_eto.cpp
@@ -1,3 +1,5 @@
+#include <tuple>
+#include <utility>
 #include <gtest/gtest.h>
 #include <entt/entity/registry.hpp>
 
diff --git a/test/entt/entity/runtime_view.cpp b/test/entt/entity/runtime_view.cpp
index 576c092d9..e5f8a9b12 100644
--- a/test/entt/entity/runtime_view.cpp
+++ b/test/entt/entity/runtime_view.cpp
@@ -1,7 +1,7 @@
 #include <algorithm>
-#include <iterator>
+#include <type_traits>
+#include <utility>
 #include <gtest/gtest.h>
-#include <entt/core/type_info.hpp>
 #include <entt/entity/component.hpp>
 #include <entt/entity/registry.hpp>
 #include <entt/entity/runtime_view.hpp>
diff --git a/test/entt/entity/sigh_storage_mixin.cpp b/test/entt/entity/sigh_storage_mixin.cpp
index 1c35f2032..c5c544b71 100644
--- a/test/entt/entity/sigh_storage_mixin.cpp
+++ b/test/entt/entity/sigh_storage_mixin.cpp
@@ -1,5 +1,4 @@
 #include <iterator>
-#include <type_traits>
 #include <gtest/gtest.h>
 #include <entt/entity/component.hpp>
 #include <entt/entity/registry.hpp>
diff --git a/test/entt/entity/snapshot.cpp b/test/entt/entity/snapshot.cpp
index 679514aea..3a6f1c875 100644
--- a/test/entt/entity/snapshot.cpp
+++ b/test/entt/entity/snapshot.cpp
@@ -1,3 +1,4 @@
+#include <cstddef>
 #include <map>
 #include <queue>
 #include <tuple>
@@ -308,7 +309,7 @@ TEST(Snapshot, Continuous) {
     });
 
     src.view<map_component>().each([&entities](auto, auto &map_component) {
-        for(size_t i = 0; i < entities.size(); ++i) {
+        for(std::size_t i = 0; i < entities.size(); ++i) {
             map_component.keys.insert({entities[i], int(i)});
             map_component.values.insert({int(i), entities[i]});
             map_component.both.insert({entities[entities.size() - i - 1], entities[i]});
diff --git a/test/entt/entity/sparse_set.cpp b/test/entt/entity/sparse_set.cpp
index d53c96791..9a00d4e7d 100644
--- a/test/entt/entity/sparse_set.cpp
+++ b/test/entt/entity/sparse_set.cpp
@@ -1,5 +1,4 @@
 #include <algorithm>
-#include <cstdint>
 #include <functional>
 #include <iterator>
 #include <type_traits>
diff --git a/test/entt/entity/storage.cpp b/test/entt/entity/storage.cpp
index 41824d176..4a6c0bab7 100644
--- a/test/entt/entity/storage.cpp
+++ b/test/entt/entity/storage.cpp
@@ -1,6 +1,8 @@
-#include <exception>
+#include <algorithm>
+#include <cstddef>
 #include <iterator>
 #include <memory>
+#include <tuple>
 #include <type_traits>
 #include <unordered_set>
 #include <utility>
diff --git a/test/entt/entity/view.cpp b/test/entt/entity/view.cpp
index 9ab72ff76..a0a091b7e 100644
--- a/test/entt/entity/view.cpp
+++ b/test/entt/entity/view.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <iterator>
 #include <tuple>
 #include <type_traits>
 #include <utility>
diff --git a/test/entt/locator/locator.cpp b/test/entt/locator/locator.cpp
index 4cd573fdd..89bed29f0 100644
--- a/test/entt/locator/locator.cpp
+++ b/test/entt/locator/locator.cpp
@@ -1,3 +1,4 @@
+#include <memory>
 #include <gtest/gtest.h>
 #include <entt/locator/locator.hpp>
 
diff --git a/test/entt/meta/meta_any.cpp b/test/entt/meta/meta_any.cpp
index bbd34984b..1440b6073 100644
--- a/test/entt/meta/meta_any.cpp
+++ b/test/entt/meta/meta_any.cpp
@@ -1,5 +1,8 @@
 #include <algorithm>
+#include <cstddef>
+#include <iterator>
 #include <type_traits>
+#include <utility>
 #include <gtest/gtest.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/meta/factory.hpp>
diff --git a/test/entt/meta/meta_base.cpp b/test/entt/meta/meta_base.cpp
index 412d3e87e..d140e349f 100644
--- a/test/entt/meta/meta_base.cpp
+++ b/test/entt/meta/meta_base.cpp
@@ -1,4 +1,6 @@
+#include <utility>
 #include <gtest/gtest.h>
+#include <entt/core/hashed_string.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/node.hpp>
diff --git a/test/entt/meta/meta_container.cpp b/test/entt/meta/meta_container.cpp
index 77befe38e..7f48ef53f 100644
--- a/test/entt/meta/meta_container.cpp
+++ b/test/entt/meta/meta_container.cpp
@@ -1,3 +1,8 @@
+#include <array>
+#include <map>
+#include <set>
+#include <utility>
+#include <vector>
 #include <gtest/gtest.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/meta/container.hpp>
diff --git a/test/entt/meta/meta_conv.cpp b/test/entt/meta/meta_conv.cpp
index 8d9d4b17e..7801e68cd 100644
--- a/test/entt/meta/meta_conv.cpp
+++ b/test/entt/meta/meta_conv.cpp
@@ -1,5 +1,6 @@
 #include <utility>
 #include <gtest/gtest.h>
+#include <entt/core/hashed_string.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/node.hpp>
diff --git a/test/entt/meta/meta_ctor.cpp b/test/entt/meta/meta_ctor.cpp
index ce34a1b42..c5a240d76 100644
--- a/test/entt/meta/meta_ctor.cpp
+++ b/test/entt/meta/meta_ctor.cpp
@@ -1,3 +1,4 @@
+#include <utility>
 #include <gtest/gtest.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/core/utility.hpp>
diff --git a/test/entt/meta/meta_data.cpp b/test/entt/meta/meta_data.cpp
index a6e042a10..8b0d0d509 100644
--- a/test/entt/meta/meta_data.cpp
+++ b/test/entt/meta/meta_data.cpp
@@ -1,9 +1,12 @@
 #include <cstdlib>
 #include <string>
+#include <utility>
 #include <gtest/gtest.h>
 #include <entt/core/hashed_string.hpp>
+#include <entt/core/type_traits.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
+#include <entt/meta/node.hpp>
 #include <entt/meta/resolve.hpp>
 
 struct base_t {
diff --git a/test/entt/meta/meta_dtor.cpp b/test/entt/meta/meta_dtor.cpp
index 4e87c1d44..60aaf5115 100644
--- a/test/entt/meta/meta_dtor.cpp
+++ b/test/entt/meta/meta_dtor.cpp
@@ -1,5 +1,6 @@
 #include <utility>
 #include <gtest/gtest.h>
+#include <entt/core/hashed_string.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/node.hpp>
diff --git a/test/entt/meta/meta_func.cpp b/test/entt/meta/meta_func.cpp
index a11e51082..f478a74a5 100644
--- a/test/entt/meta/meta_func.cpp
+++ b/test/entt/meta/meta_func.cpp
@@ -1,3 +1,5 @@
+#include <cstddef>
+#include <utility>
 #include <gtest/gtest.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/core/utility.hpp>
diff --git a/test/entt/meta/meta_handle.cpp b/test/entt/meta/meta_handle.cpp
index ff83ae067..73d862e3c 100644
--- a/test/entt/meta/meta_handle.cpp
+++ b/test/entt/meta/meta_handle.cpp
@@ -1,8 +1,8 @@
+#include <utility>
 #include <gtest/gtest.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
-#include <entt/meta/resolve.hpp>
 
 struct clazz_t {
     clazz_t()
diff --git a/test/entt/meta/meta_pointer.cpp b/test/entt/meta/meta_pointer.cpp
index e16f5f452..fc9765b66 100644
--- a/test/entt/meta/meta_pointer.cpp
+++ b/test/entt/meta/meta_pointer.cpp
@@ -1,7 +1,7 @@
 #include <memory>
 #include <type_traits>
+#include <utility>
 #include <gtest/gtest.h>
-#include <entt/core/hashed_string.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/pointer.hpp>
 #include <entt/meta/resolve.hpp>
diff --git a/test/entt/meta/meta_prop.cpp b/test/entt/meta/meta_prop.cpp
index 21a9407ac..48fef1526 100644
--- a/test/entt/meta/meta_prop.cpp
+++ b/test/entt/meta/meta_prop.cpp
@@ -1,5 +1,6 @@
+#include <cstring>
 #include <tuple>
-#include <string>
+#include <utility>
 #include <gtest/gtest.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/meta/factory.hpp>
diff --git a/test/entt/meta/meta_range.cpp b/test/entt/meta/meta_range.cpp
index 34739836f..03a1501ed 100644
--- a/test/entt/meta/meta_range.cpp
+++ b/test/entt/meta/meta_range.cpp
@@ -1,3 +1,4 @@
+#include <type_traits>
 #include <gtest/gtest.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/meta/factory.hpp>
diff --git a/test/entt/meta/meta_type.cpp b/test/entt/meta/meta_type.cpp
index 279d6afa6..f0440b4df 100644
--- a/test/entt/meta/meta_type.cpp
+++ b/test/entt/meta/meta_type.cpp
@@ -1,10 +1,14 @@
+#include <algorithm>
 #include <map>
 #include <memory>
 #include <utility>
 #include <vector>
 #include <gtest/gtest.h>
 #include <entt/core/hashed_string.hpp>
+#include <entt/core/type_info.hpp>
+#include <entt/core/utility.hpp>
 #include <entt/meta/container.hpp>
+#include <entt/meta/ctx.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/pointer.hpp>
diff --git a/test/entt/meta/meta_utility.cpp b/test/entt/meta/meta_utility.cpp
index afc62e9c4..2ae71dec0 100644
--- a/test/entt/meta/meta_utility.cpp
+++ b/test/entt/meta/meta_utility.cpp
@@ -1,5 +1,7 @@
-#include <type_traits>
+#include <utility>
 #include <gtest/gtest.h>
+#include <entt/core/type_traits.hpp>
+#include <entt/meta/meta.hpp>
 #include <entt/meta/resolve.hpp>
 #include <entt/meta/utility.hpp>
 
diff --git a/test/entt/poly/poly.cpp b/test/entt/poly/poly.cpp
index 5b8ab278b..d0db23e05 100644
--- a/test/entt/poly/poly.cpp
+++ b/test/entt/poly/poly.cpp
@@ -1,6 +1,8 @@
-#include <functional>
-#include <type_traits>
+#include <cstddef>
+#include <cstdint>
+#include <utility>
 #include <gtest/gtest.h>
+#include <entt/core/type_info.hpp>
 #include <entt/core/type_traits.hpp>
 #include <entt/poly/poly.hpp>
 
diff --git a/test/entt/process/scheduler.cpp b/test/entt/process/scheduler.cpp
index 5d7c98911..0febf87e4 100644
--- a/test/entt/process/scheduler.cpp
+++ b/test/entt/process/scheduler.cpp
@@ -1,4 +1,5 @@
 #include <functional>
+#include <utility>
 #include <gtest/gtest.h>
 #include <entt/process/process.hpp>
 #include <entt/process/scheduler.hpp>
diff --git a/test/entt/resource/resource.cpp b/test/entt/resource/resource.cpp
index 0cee8b5bb..6d56fcbc8 100644
--- a/test/entt/resource/resource.cpp
+++ b/test/entt/resource/resource.cpp
@@ -1,8 +1,13 @@
+#include <memory>
 #include <type_traits>
+#include <utility>
 #include <gtest/gtest.h>
+#include <entt/config/config.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/core/type_info.hpp>
 #include <entt/resource/cache.hpp>
+#include <entt/resource/handle.hpp>
+#include <entt/resource/loader.hpp>
 
 struct resource {
     virtual ~resource() = default;
diff --git a/test/entt/signal/delegate.cpp b/test/entt/signal/delegate.cpp
index 225ce5e10..5eb582c19 100644
--- a/test/entt/signal/delegate.cpp
+++ b/test/entt/signal/delegate.cpp
@@ -1,5 +1,6 @@
 #include <memory>
 #include <type_traits>
+#include <utility>
 #include <gtest/gtest.h>
 #include <entt/signal/delegate.hpp>
 
diff --git a/test/entt/signal/dispatcher.cpp b/test/entt/signal/dispatcher.cpp
index b1a8a5bfe..08a7bb539 100644
--- a/test/entt/signal/dispatcher.cpp
+++ b/test/entt/signal/dispatcher.cpp
@@ -1,4 +1,4 @@
-#include <type_traits>
+#include <utility>
 #include <gtest/gtest.h>
 #include <entt/core/type_traits.hpp>
 #include <entt/signal/dispatcher.hpp>
diff --git a/test/entt/signal/sigh.cpp b/test/entt/signal/sigh.cpp
index e142f914c..45ddca596 100644
--- a/test/entt/signal/sigh.cpp
+++ b/test/entt/signal/sigh.cpp
@@ -3,7 +3,6 @@
 #include <gtest/gtest.h>
 #include <entt/signal/sigh.hpp>
 #include "../common/throwing_allocator.hpp"
-#include "../common/throwing_type.hpp"
 
 struct sigh_listener {
     static void f(int &v) {
diff --git a/test/example/custom_identifier.cpp b/test/example/custom_identifier.cpp
index 188803ec9..5611da3b6 100644
--- a/test/example/custom_identifier.cpp
+++ b/test/example/custom_identifier.cpp
@@ -1,5 +1,6 @@
-#include <type_traits>
+#include <cstdint>
 #include <gtest/gtest.h>
+#include <entt/config/config.h>
 #include <entt/entity/entity.hpp>
 #include <entt/entity/registry.hpp>
 
diff --git a/test/example/entity_copy.cpp b/test/example/entity_copy.cpp
index 254cb89dc..fdbd1579f 100644
--- a/test/example/entity_copy.cpp
+++ b/test/example/entity_copy.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <entt/core/utility.hpp>
+#include <entt/core/hashed_string.hpp>
 #include <entt/entity/registry.hpp>
 
 enum class my_entity : entt::id_type {};
diff --git a/test/lib/dispatcher/main.cpp b/test/lib/dispatcher/main.cpp
index d6aa70fc1..edffe2561 100644
--- a/test/lib/dispatcher/main.cpp
+++ b/test/lib/dispatcher/main.cpp
@@ -2,6 +2,7 @@
 #include <entt/core/attribute.h>
 #include <entt/core/utility.hpp>
 #include <entt/signal/dispatcher.hpp>
+#include <entt/signal/sigh.hpp>
 #include "types.h"
 
 ENTT_API void trigger(entt::dispatcher &);
diff --git a/test/lib/dispatcher_plugin/main.cpp b/test/lib/dispatcher_plugin/main.cpp
index 6651b1146..1192faa84 100644
--- a/test/lib/dispatcher_plugin/main.cpp
+++ b/test/lib/dispatcher_plugin/main.cpp
@@ -3,6 +3,7 @@
 #include <gtest/gtest.h>
 #include <cr.h>
 #include <entt/signal/dispatcher.hpp>
+#include <entt/signal/sigh.hpp>
 #include "types.h"
 
 struct listener {
diff --git a/test/lib/meta/lib.cpp b/test/lib/meta/lib.cpp
index b5b27efd7..c508c013f 100644
--- a/test/lib/meta/lib.cpp
+++ b/test/lib/meta/lib.cpp
@@ -2,7 +2,6 @@
 #include <entt/core/hashed_string.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
-#include <entt/meta/resolve.hpp>
 #include "types.h"
 
 position create_position(int x, int y) {
diff --git a/test/lib/meta/main.cpp b/test/lib/meta/main.cpp
index e9d3c02a5..d1a77136d 100644
--- a/test/lib/meta/main.cpp
+++ b/test/lib/meta/main.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 #include <entt/core/attribute.h>
+#include <entt/core/hashed_string.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/resolve.hpp>
diff --git a/test/lib/meta_plugin/main.cpp b/test/lib/meta_plugin/main.cpp
index ab4d73205..999168c1a 100644
--- a/test/lib/meta_plugin/main.cpp
+++ b/test/lib/meta_plugin/main.cpp
@@ -2,6 +2,7 @@
 
 #include <gtest/gtest.h>
 #include <cr.h>
+#include <entt/core/hashed_string.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/resolve.hpp>
diff --git a/test/lib/meta_plugin/plugin.cpp b/test/lib/meta_plugin/plugin.cpp
index 43b115e48..8724fd662 100644
--- a/test/lib/meta_plugin/plugin.cpp
+++ b/test/lib/meta_plugin/plugin.cpp
@@ -1,8 +1,8 @@
 #include <cr.h>
 #include <entt/core/hashed_string.hpp>
+#include <entt/meta/ctx.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
-#include <entt/meta/resolve.hpp>
 #include "types.h"
 
 position create_position(int x, int y) {
diff --git a/test/lib/meta_plugin_std/main.cpp b/test/lib/meta_plugin_std/main.cpp
index ab4d73205..999168c1a 100644
--- a/test/lib/meta_plugin_std/main.cpp
+++ b/test/lib/meta_plugin_std/main.cpp
@@ -2,6 +2,7 @@
 
 #include <gtest/gtest.h>
 #include <cr.h>
+#include <entt/core/hashed_string.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/resolve.hpp>
diff --git a/test/lib/meta_plugin_std/plugin.cpp b/test/lib/meta_plugin_std/plugin.cpp
index 43b115e48..8724fd662 100644
--- a/test/lib/meta_plugin_std/plugin.cpp
+++ b/test/lib/meta_plugin_std/plugin.cpp
@@ -1,8 +1,8 @@
 #include <cr.h>
 #include <entt/core/hashed_string.hpp>
+#include <entt/meta/ctx.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
-#include <entt/meta/resolve.hpp>
 #include "types.h"
 
 position create_position(int x, int y) {
diff --git a/test/snapshot/snapshot.cpp b/test/snapshot/snapshot.cpp
index 177d6d60a..b0483ff95 100644
--- a/test/snapshot/snapshot.cpp
+++ b/test/snapshot/snapshot.cpp
@@ -2,6 +2,7 @@
 #include <vector>
 #include <gtest/gtest.h>
 #include <cereal/archives/json.hpp>
+#include <entt/core/hashed_string.hpp>
 #include <entt/entity/helper.hpp>
 #include <entt/entity/registry.hpp>
 #include <entt/entity/snapshot.hpp>