diff --git a/test/entt/core/any.cpp b/test/entt/core/any.cpp
index 97bac5ee1..cb48109b2 100644
--- a/test/entt/core/any.cpp
+++ b/test/entt/core/any.cpp
@@ -2,7 +2,6 @@
 #include <array>
 #include <cstdint>
 #include <cstring>
-#include <iterator>
 #include <memory>
 #include <type_traits>
 #include <unordered_map>
diff --git a/test/entt/entity/entity.cpp b/test/entt/entity/entity.cpp
index c0d3ad762..5f5439086 100644
--- a/test/entt/entity/entity.cpp
+++ b/test/entt/entity/entity.cpp
@@ -1,4 +1,7 @@
+#include <cstddef>
+#include <cstdint>
 #include <gtest/gtest.h>
+#include <entt/config/config.h>
 #include <entt/entity/entity.hpp>
 #include "../common/custom_entity.h"
 
diff --git a/test/entt/entity/runtime_view.cpp b/test/entt/entity/runtime_view.cpp
index ff8355cff..d00b6cd9e 100644
--- a/test/entt/entity/runtime_view.cpp
+++ b/test/entt/entity/runtime_view.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <memory>
 #include <utility>
 #include <gtest/gtest.h>
 #include <entt/entity/entity.hpp>
diff --git a/test/entt/entity/sparse_set.cpp b/test/entt/entity/sparse_set.cpp
index df85f9d1d..5631717d4 100644
--- a/test/entt/entity/sparse_set.cpp
+++ b/test/entt/entity/sparse_set.cpp
@@ -3,7 +3,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <functional>
-#include <iterator>
 #include <memory>
 #include <utility>
 #include <gtest/gtest.h>
diff --git a/test/entt/entity/storage.cpp b/test/entt/entity/storage.cpp
index 291b5f009..54d95710f 100644
--- a/test/entt/entity/storage.cpp
+++ b/test/entt/entity/storage.cpp
@@ -1,7 +1,6 @@
 #include <algorithm>
 #include <array>
 #include <cstddef>
-#include <iterator>
 #include <memory>
 #include <tuple>
 #include <type_traits>
diff --git a/test/entt/entity/storage_no_instance.cpp b/test/entt/entity/storage_no_instance.cpp
index 5aa0f982a..a8f46a827 100644
--- a/test/entt/entity/storage_no_instance.cpp
+++ b/test/entt/entity/storage_no_instance.cpp
@@ -1,7 +1,6 @@
 #include <algorithm>
 #include <array>
 #include <functional>
-#include <iterator>
 #include <memory>
 #include <tuple>
 #include <type_traits>
diff --git a/test/entt/meta/meta_any.cpp b/test/entt/meta/meta_any.cpp
index 795553baa..0e705b741 100644
--- a/test/entt/meta/meta_any.cpp
+++ b/test/entt/meta/meta_any.cpp
@@ -1,7 +1,6 @@
 #include <algorithm>
 #include <array>
 #include <cstddef>
-#include <iterator>
 #include <memory>
 #include <utility>
 #include <gtest/gtest.h>
diff --git a/test/example/reserved_bits.cpp b/test/example/reserved_bits.cpp
index b666ae37a..bd30caeb1 100644
--- a/test/example/reserved_bits.cpp
+++ b/test/example/reserved_bits.cpp
@@ -1,6 +1,10 @@
+#include <cstddef>
+#include <cstdint>
 #include <iterator>
 #include <gtest/gtest.h>
+#include <entt/config/config.h>
 #include <entt/core/enum.hpp>
+#include <entt/core/fwd.hpp>
 #include <entt/entity/entity.hpp>
 #include <entt/entity/registry.hpp>
 
diff --git a/test/example/signal_less.cpp b/test/example/signal_less.cpp
index c935ef3a7..3de4cc202 100644
--- a/test/example/signal_less.cpp
+++ b/test/example/signal_less.cpp
@@ -1,5 +1,4 @@
 #include <array>
-#include <iterator>
 #include <type_traits>
 #include <gtest/gtest.h>
 #include <entt/entity/entity.hpp>