diff --git a/doc/modules/ROOT/examples/accept_no_visitors.cpp b/doc/modules/ROOT/examples/accept_no_visitors.cpp
index b63875eb9..b29df6a5b 100644
--- a/doc/modules/ROOT/examples/accept_no_visitors.cpp
+++ b/doc/modules/ROOT/examples/accept_no_visitors.cpp
@@ -6,6 +6,7 @@
 #include <iostream>
 #include <memory>
 #include <string>
+#include <utility>
 
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/interop/std_shared_ptr.hpp>
diff --git a/doc/modules/ROOT/examples/adl_registry.cpp b/doc/modules/ROOT/examples/adl_registry.cpp
index 4584adc54..1880c6b8a 100644
--- a/doc/modules/ROOT/examples/adl_registry.cpp
+++ b/doc/modules/ROOT/examples/adl_registry.cpp
@@ -4,6 +4,7 @@
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <string>
+#include <type_traits>
 
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/initialize.hpp>
diff --git a/doc/modules/ROOT/examples/ast_unique_ptr.cpp b/doc/modules/ROOT/examples/ast_unique_ptr.cpp
index 822b41afb..10475011b 100644
--- a/doc/modules/ROOT/examples/ast_unique_ptr.cpp
+++ b/doc/modules/ROOT/examples/ast_unique_ptr.cpp
@@ -37,6 +37,8 @@ struct Times : Node {
 };
 
 #include <iostream>
+#include <memory>
+#include <utility>
 
 BOOST_OPENMETHOD(postfix, (virtual_ptr<const Node> node, std::ostream& os), void);
 
diff --git a/doc/modules/ROOT/examples/custom_rtti/1/custom_rtti.cpp b/doc/modules/ROOT/examples/custom_rtti/1/custom_rtti.cpp
index 2b84cf5e9..6e3ada529 100644
--- a/doc/modules/ROOT/examples/custom_rtti/1/custom_rtti.cpp
+++ b/doc/modules/ROOT/examples/custom_rtti/1/custom_rtti.cpp
@@ -83,6 +83,7 @@ struct custom_registry : boost::openmethod::registry<
 // end::registry[]
 
 #include <iostream>
+#include <type_traits>
 
 using boost::openmethod::virtual_ptr;
 
diff --git a/doc/modules/ROOT/examples/custom_rtti/2/custom_rtti.cpp b/doc/modules/ROOT/examples/custom_rtti/2/custom_rtti.cpp
index b5c7d5607..87fc96571 100644
--- a/doc/modules/ROOT/examples/custom_rtti/2/custom_rtti.cpp
+++ b/doc/modules/ROOT/examples/custom_rtti/2/custom_rtti.cpp
@@ -79,6 +79,7 @@ struct custom_registry : boost::openmethod::registry<
 // end::registry[]
 
 #include <iostream>
+#include <type_traits>
 
 using boost::openmethod::virtual_ptr;
 
diff --git a/doc/modules/ROOT/examples/default_error_handler.cpp b/doc/modules/ROOT/examples/default_error_handler.cpp
index a7952b61c..f00b02926 100644
--- a/doc/modules/ROOT/examples/default_error_handler.cpp
+++ b/doc/modules/ROOT/examples/default_error_handler.cpp
@@ -5,7 +5,9 @@
 
 // tag::example[]
 #include <iostream>
+#include <stdexcept>
 #include <variant>
+#include <vector>
 
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/initialize.hpp>
diff --git a/doc/modules/ROOT/examples/friendship.cpp b/doc/modules/ROOT/examples/friendship.cpp
index 93d0d7053..b9ceb1612 100644
--- a/doc/modules/ROOT/examples/friendship.cpp
+++ b/doc/modules/ROOT/examples/friendship.cpp
@@ -6,6 +6,7 @@
 // clang-format off
 
 #include <iostream>
+#include <memory>
 #include <string>
 #include <boost/openmethod.hpp>
 
diff --git a/doc/modules/ROOT/examples/friendship_across_namespaces.cpp b/doc/modules/ROOT/examples/friendship_across_namespaces.cpp
index 99ba4e516..7252e0509 100644
--- a/doc/modules/ROOT/examples/friendship_across_namespaces.cpp
+++ b/doc/modules/ROOT/examples/friendship_across_namespaces.cpp
@@ -6,6 +6,7 @@
 // clang-format off
 
 #include <iostream>
+#include <memory>
 #include <string>
 #include <boost/openmethod.hpp>
 
diff --git a/doc/modules/ROOT/examples/headers_namespaces/main.cpp b/doc/modules/ROOT/examples/headers_namespaces/main.cpp
index ceb1b08f3..be05d35e9 100644
--- a/doc/modules/ROOT/examples/headers_namespaces/main.cpp
+++ b/doc/modules/ROOT/examples/headers_namespaces/main.cpp
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <memory>
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/initialize.hpp>
 
diff --git a/doc/modules/ROOT/examples/headers_namespaces/main_using_directive.cpp b/doc/modules/ROOT/examples/headers_namespaces/main_using_directive.cpp
index 473784f7d..7ea02ab3c 100644
--- a/doc/modules/ROOT/examples/headers_namespaces/main_using_directive.cpp
+++ b/doc/modules/ROOT/examples/headers_namespaces/main_using_directive.cpp
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <memory>
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/initialize.hpp>
 
diff --git a/doc/modules/ROOT/examples/hello_world.cpp b/doc/modules/ROOT/examples/hello_world.cpp
index 6891d99b0..a3180affa 100644
--- a/doc/modules/ROOT/examples/hello_world.cpp
+++ b/doc/modules/ROOT/examples/hello_world.cpp
@@ -6,6 +6,7 @@
 // clang-format off
 
 // tag::domain_classes[]
+#include <memory>
 #include <string>
 
 struct Animal {
diff --git a/doc/modules/ROOT/examples/matrix.cpp b/doc/modules/ROOT/examples/matrix.cpp
index cfdd42f68..4c9e0e6e6 100644
--- a/doc/modules/ROOT/examples/matrix.cpp
+++ b/doc/modules/ROOT/examples/matrix.cpp
@@ -9,6 +9,7 @@
 #include <memory>
 #include <string>
 #include <typeinfo>
+#include <utility>
 
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/policies/static_rtti.hpp>
diff --git a/doc/modules/ROOT/examples/shared_libs/dynamic_loading/extensions.cpp b/doc/modules/ROOT/examples/shared_libs/dynamic_loading/extensions.cpp
index 1c60a13dd..691ac6d71 100644
--- a/doc/modules/ROOT/examples/shared_libs/dynamic_loading/extensions.cpp
+++ b/doc/modules/ROOT/examples/shared_libs/dynamic_loading/extensions.cpp
@@ -8,6 +8,8 @@
 
 #include "animals.hpp"
 
+#include <string>
+
 using namespace boost::openmethod;
 
 BOOST_OPENMETHOD_OVERRIDE(
diff --git a/doc/modules/ROOT/examples/shared_libs/dynamic_loading/main.cpp b/doc/modules/ROOT/examples/shared_libs/dynamic_loading/main.cpp
index b7a1cda8e..c607d30f9 100644
--- a/doc/modules/ROOT/examples/shared_libs/dynamic_loading/main.cpp
+++ b/doc/modules/ROOT/examples/shared_libs/dynamic_loading/main.cpp
@@ -15,6 +15,7 @@
 #include <boost/dll/shared_library.hpp>
 #include <iostream>
 #include <memory>
+#include <string>
 
 using namespace boost::openmethod;
 
diff --git a/doc/modules/ROOT/examples/shared_libs/implicit_linking/extensions.cpp b/doc/modules/ROOT/examples/shared_libs/implicit_linking/extensions.cpp
index feab96fb6..cb7f816df 100644
--- a/doc/modules/ROOT/examples/shared_libs/implicit_linking/extensions.cpp
+++ b/doc/modules/ROOT/examples/shared_libs/implicit_linking/extensions.cpp
@@ -10,6 +10,8 @@
 
 #include "animals.hpp"
 
+#include <string>
+
 using namespace boost::openmethod;
 
 BOOST_OPENMETHOD_INSTANTIATE_REGISTRY(boost::openmethod::default_registry);
diff --git a/doc/modules/ROOT/examples/shared_libs/implicit_linking/main.cpp b/doc/modules/ROOT/examples/shared_libs/implicit_linking/main.cpp
index 1f844b816..3cc49f9a7 100644
--- a/doc/modules/ROOT/examples/shared_libs/implicit_linking/main.cpp
+++ b/doc/modules/ROOT/examples/shared_libs/implicit_linking/main.cpp
@@ -10,6 +10,7 @@
 #include <boost/openmethod/initialize.hpp>
 #include <iostream>
 #include <memory>
+#include <string>
 
 using namespace boost::openmethod::aliases;
 
diff --git a/doc/modules/ROOT/examples/shared_libs/indirect_vptr/extensions.cpp b/doc/modules/ROOT/examples/shared_libs/indirect_vptr/extensions.cpp
index 041f917b3..44f6c1cc1 100644
--- a/doc/modules/ROOT/examples/shared_libs/indirect_vptr/extensions.cpp
+++ b/doc/modules/ROOT/examples/shared_libs/indirect_vptr/extensions.cpp
@@ -8,6 +8,8 @@
 
 #include "animals.hpp"
 
+#include <string>
+
 using namespace boost::openmethod;
 
 BOOST_OPENMETHOD_OVERRIDE(
diff --git a/doc/modules/ROOT/examples/shared_libs/indirect_vptr/main.cpp b/doc/modules/ROOT/examples/shared_libs/indirect_vptr/main.cpp
index a8dd1aebb..8bec58761 100644
--- a/doc/modules/ROOT/examples/shared_libs/indirect_vptr/main.cpp
+++ b/doc/modules/ROOT/examples/shared_libs/indirect_vptr/main.cpp
@@ -15,6 +15,7 @@
 #include <boost/openmethod/interop/std_unique_ptr.hpp>
 #include <boost/dll/shared_library.hpp>
 #include <iostream>
+#include <string>
 
 using namespace boost::openmethod::aliases;
 
diff --git a/doc/modules/ROOT/examples/slides.cpp b/doc/modules/ROOT/examples/slides.cpp
index c0526718c..fe86eb5d1 100644
--- a/doc/modules/ROOT/examples/slides.cpp
+++ b/doc/modules/ROOT/examples/slides.cpp
@@ -4,6 +4,7 @@
 #include <iostream>
 #include <string>
 #include <typeindex>
+#include <typeinfo>
 #include <unordered_map>
 #include <utility>
 
diff --git a/doc/modules/ROOT/examples/snippets/errors_missing_base.cpp b/doc/modules/ROOT/examples/snippets/errors_missing_base.cpp
index fc557b5e9..5161b4aac 100644
--- a/doc/modules/ROOT/examples/snippets/errors_missing_base.cpp
+++ b/doc/modules/ROOT/examples/snippets/errors_missing_base.cpp
@@ -11,6 +11,8 @@
 
 #include "error_harness.hpp"
 
+#include <string>
+
 using namespace boost::openmethod;
 
 struct Animal {
diff --git a/doc/modules/ROOT/examples/snippets/errors_missing_class_call.cpp b/doc/modules/ROOT/examples/snippets/errors_missing_class_call.cpp
index 5f6a2bc19..7184a9060 100644
--- a/doc/modules/ROOT/examples/snippets/errors_missing_class_call.cpp
+++ b/doc/modules/ROOT/examples/snippets/errors_missing_class_call.cpp
@@ -15,6 +15,8 @@
 
 #include "error_harness.hpp"
 
+#include <string>
+
 using namespace boost::openmethod;
 
 struct Animal {
diff --git a/doc/modules/ROOT/examples/snippets/errors_missing_class_method.cpp b/doc/modules/ROOT/examples/snippets/errors_missing_class_method.cpp
index 4c4095c5a..fd4ae2729 100644
--- a/doc/modules/ROOT/examples/snippets/errors_missing_class_method.cpp
+++ b/doc/modules/ROOT/examples/snippets/errors_missing_class_method.cpp
@@ -11,6 +11,8 @@
 
 #include "error_harness.hpp"
 
+#include <string>
+
 using namespace boost::openmethod;
 
 struct Animal {
diff --git a/doc/modules/ROOT/examples/snippets/errors_missing_class_overrider.cpp b/doc/modules/ROOT/examples/snippets/errors_missing_class_overrider.cpp
index 31ad6bbb8..08f3d9368 100644
--- a/doc/modules/ROOT/examples/snippets/errors_missing_class_overrider.cpp
+++ b/doc/modules/ROOT/examples/snippets/errors_missing_class_overrider.cpp
@@ -11,6 +11,8 @@
 
 #include "error_harness.hpp"
 
+#include <string>
+
 using namespace boost::openmethod;
 
 struct Animal {
diff --git a/doc/modules/ROOT/examples/snippets/initialize.cpp b/doc/modules/ROOT/examples/snippets/initialize.cpp
index eec85226d..068ae3231 100644
--- a/doc/modules/ROOT/examples/snippets/initialize.cpp
+++ b/doc/modules/ROOT/examples/snippets/initialize.cpp
@@ -11,6 +11,8 @@
 
 #include "capture.hpp"
 
+#include <string>
+
 namespace bom = boost::openmethod;
 
 struct Animal {
diff --git a/doc/modules/ROOT/examples/snippets/inplace_vptr.cpp b/doc/modules/ROOT/examples/snippets/inplace_vptr.cpp
index 7387555dd..8b1eace18 100644
--- a/doc/modules/ROOT/examples/snippets/inplace_vptr.cpp
+++ b/doc/modules/ROOT/examples/snippets/inplace_vptr.cpp
@@ -8,6 +8,7 @@
 #include <boost/openmethod/initialize.hpp>
 
 #include <memory>
+#include <string>
 
 #define BOOST_TEST_MODULE openmethod
 #include <boost/test/unit_test.hpp>
diff --git a/doc/modules/ROOT/examples/snippets/intrusive_ptr.cpp b/doc/modules/ROOT/examples/snippets/intrusive_ptr.cpp
index 029ebefc9..adcbdcf45 100644
--- a/doc/modules/ROOT/examples/snippets/intrusive_ptr.cpp
+++ b/doc/modules/ROOT/examples/snippets/intrusive_ptr.cpp
@@ -15,6 +15,8 @@
 
 #include "capture.hpp"
 
+#include <string>
+
 using namespace boost::openmethod;
 
 // tag::classes[]
diff --git a/doc/modules/ROOT/examples/snippets/policies.cpp b/doc/modules/ROOT/examples/snippets/policies.cpp
index eed827a2c..0fdce0c08 100644
--- a/doc/modules/ROOT/examples/snippets/policies.cpp
+++ b/doc/modules/ROOT/examples/snippets/policies.cpp
@@ -12,6 +12,7 @@
 #include <boost/openmethod/policies/vptr_map.hpp>
 
 #include <stdexcept>
+#include <string>
 #include <variant>
 
 #define BOOST_TEST_MODULE openmethod
diff --git a/doc/modules/ROOT/examples/snippets/smart_pointers.cpp b/doc/modules/ROOT/examples/snippets/smart_pointers.cpp
index 26291743b..b35425ce0 100644
--- a/doc/modules/ROOT/examples/snippets/smart_pointers.cpp
+++ b/doc/modules/ROOT/examples/snippets/smart_pointers.cpp
@@ -14,6 +14,10 @@
 
 #include "capture.hpp"
 
+#include <memory>
+#include <string>
+#include <utility>
+
 using namespace boost::openmethod;
 
 // tag::classes[]
diff --git a/doc/modules/ROOT/examples/snippets/static_rtti.cpp b/doc/modules/ROOT/examples/snippets/static_rtti.cpp
index 6d447b6cf..397e29952 100644
--- a/doc/modules/ROOT/examples/snippets/static_rtti.cpp
+++ b/doc/modules/ROOT/examples/snippets/static_rtti.cpp
@@ -25,6 +25,8 @@ struct static_registry :
 
 #include "capture.hpp"
 
+#include <string>
+
 using namespace boost::openmethod::aliases;
 
 // tag::classes[]
diff --git a/doc/modules/ROOT/examples/snippets/virtual_ptr.cpp b/doc/modules/ROOT/examples/snippets/virtual_ptr.cpp
index 25da3d20c..affe9a55c 100644
--- a/doc/modules/ROOT/examples/snippets/virtual_ptr.cpp
+++ b/doc/modules/ROOT/examples/snippets/virtual_ptr.cpp
@@ -13,6 +13,11 @@
 
 #include "capture.hpp"
 
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <utility>
+
 using namespace boost::openmethod;
 
 namespace polymorphic_classes {
diff --git a/doc/modules/ROOT/examples/throw_error_handler.cpp b/doc/modules/ROOT/examples/throw_error_handler.cpp
index d8a0a3dce..f951f46a0 100644
--- a/doc/modules/ROOT/examples/throw_error_handler.cpp
+++ b/doc/modules/ROOT/examples/throw_error_handler.cpp
@@ -11,6 +11,7 @@ struct custom_registry;
 #include <boost/openmethod/initialize.hpp>
 
 #include <iostream>
+#include <vector>
 
 struct Animal {
     virtual ~Animal() = default;
diff --git a/doc/modules/ROOT/examples/virtual_func.cpp b/doc/modules/ROOT/examples/virtual_func.cpp
index f68d5f9f4..1c363b6bf 100644
--- a/doc/modules/ROOT/examples/virtual_func.cpp
+++ b/doc/modules/ROOT/examples/virtual_func.cpp
@@ -9,6 +9,7 @@
 
 #include <iostream>
 #include <memory>
+#include <string>
 
 struct Animal {
     Animal(std::string name) : name(name) {}
diff --git a/doc/modules/ROOT/examples/virtual_ptr.cpp b/doc/modules/ROOT/examples/virtual_ptr.cpp
index f81c35ba9..81fd65cf9 100644
--- a/doc/modules/ROOT/examples/virtual_ptr.cpp
+++ b/doc/modules/ROOT/examples/virtual_ptr.cpp
@@ -4,6 +4,7 @@
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <iostream>
+#include <memory>
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/initialize.hpp>
 
diff --git a/include/boost/openmethod/core.hpp b/include/boost/openmethod/core.hpp
index 226a5e1ec..c0deca8df 100644
--- a/include/boost/openmethod/core.hpp
+++ b/include/boost/openmethod/core.hpp
@@ -7,9 +7,8 @@
 #define BOOST_OPENMETHOD_CORE_HPP
 
 #include <stdint.h>
-#include <algorithm>
+#include <cstddef>
 #include <cstdlib>
-#include <tuple>
 #include <type_traits>
 #include <utility>
 
diff --git a/include/boost/openmethod/detail/ostdstream.hpp b/include/boost/openmethod/detail/ostdstream.hpp
index 25b533bd1..1a2233481 100644
--- a/include/boost/openmethod/detail/ostdstream.hpp
+++ b/include/boost/openmethod/detail/ostdstream.hpp
@@ -7,9 +7,10 @@
 #define BOOST_OPENMETHOD_DETAIL_OSTDSTREAM_HPP
 
 #include <array>
+#include <cstddef>
+#include <cstdint>
 #include <cstdio>
 #include <charconv>
-#include <random>
 #include <string_view>
 
 namespace boost::openmethod {
diff --git a/include/boost/openmethod/detail/static_list.hpp b/include/boost/openmethod/detail/static_list.hpp
index 7a6763ac9..98e33976b 100644
--- a/include/boost/openmethod/detail/static_list.hpp
+++ b/include/boost/openmethod/detail/static_list.hpp
@@ -6,9 +6,11 @@
 #ifndef BOOST_OPENMETHOD_DETAIL_STATIC_LIST_HPP
 #define BOOST_OPENMETHOD_DETAIL_STATIC_LIST_HPP
 
-#include <algorithm>
 #include <boost/assert.hpp>
 
+#include <cstddef>
+#include <iterator>
+
 namespace boost::openmethod {
 
 namespace detail {
diff --git a/include/boost/openmethod/initialize.hpp b/include/boost/openmethod/initialize.hpp
index 73aa6d64e..a1a069eb1 100644
--- a/include/boost/openmethod/initialize.hpp
+++ b/include/boost/openmethod/initialize.hpp
@@ -10,14 +10,16 @@
 #include <boost/openmethod/detail/ostdstream.hpp>
 
 #include <algorithm>
+#include <cstddef>
 #include <cstdint>
+#include <cstdlib>
 #include <deque>
+#include <iterator>
 #include <limits>
 #include <map>
-#include <memory>
 #include <numeric>
-#include <string>
 #include <tuple>
+#include <type_traits>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
@@ -25,6 +27,9 @@
 
 #include <boost/assert.hpp>
 #include <boost/dynamic_bitset.hpp>
+#include <boost/mp11/algorithm.hpp>
+#include <boost/mp11/integral.hpp>
+#include <boost/mp11/list.hpp>
 
 #ifdef _MSC_VER
 #pragma warning(push)
diff --git a/include/boost/openmethod/inplace_vptr.hpp b/include/boost/openmethod/inplace_vptr.hpp
index f73c13286..3f6a04d47 100644
--- a/include/boost/openmethod/inplace_vptr.hpp
+++ b/include/boost/openmethod/inplace_vptr.hpp
@@ -3,6 +3,10 @@
 
 #include <boost/openmethod/core.hpp>
 
+#include <boost/mp11/list.hpp>
+
+#include <type_traits>
+
 // =============================================================================
 // inplace_vptr
 
diff --git a/include/boost/openmethod/interop/boost_any.hpp b/include/boost/openmethod/interop/boost_any.hpp
index ee1e6f2e5..9864c7b6e 100644
--- a/include/boost/openmethod/interop/boost_any.hpp
+++ b/include/boost/openmethod/interop/boost_any.hpp
@@ -11,6 +11,9 @@
 #include <boost/openmethod/interop/virtual_any.hpp>
 #include <boost/openmethod/policies/std_rtti.hpp>
 
+#include <type_traits>
+#include <utility>
+
 // Dispatch on the type contained in a `boost::any`.
 //
 // This interop is based on a design contributed by Steven Watanabe:
diff --git a/include/boost/openmethod/interop/boost_intrusive_ptr.hpp b/include/boost/openmethod/interop/boost_intrusive_ptr.hpp
index 039a92cde..7c58e2922 100644
--- a/include/boost/openmethod/interop/boost_intrusive_ptr.hpp
+++ b/include/boost/openmethod/interop/boost_intrusive_ptr.hpp
@@ -8,7 +8,9 @@
 
 #include <boost/openmethod/core.hpp>
 #include <boost/smart_ptr/intrusive_ptr.hpp>
-#include <memory>
+
+#include <type_traits>
+#include <utility>
 
 namespace boost::openmethod {
 
diff --git a/include/boost/openmethod/interop/std_any.hpp b/include/boost/openmethod/interop/std_any.hpp
index d8ff4a893..2f0181e7e 100644
--- a/include/boost/openmethod/interop/std_any.hpp
+++ b/include/boost/openmethod/interop/std_any.hpp
@@ -7,6 +7,8 @@
 #define BOOST_OPENMETHOD_INTEROP_STD_ANY_HPP
 
 #include <any>
+#include <type_traits>
+#include <utility>
 #include <boost/openmethod/core.hpp>
 #include <boost/openmethod/interop/virtual_any.hpp>
 #include <boost/openmethod/policies/std_rtti.hpp>
diff --git a/include/boost/openmethod/interop/std_shared_ptr.hpp b/include/boost/openmethod/interop/std_shared_ptr.hpp
index 4c9b67cba..7adb27407 100644
--- a/include/boost/openmethod/interop/std_shared_ptr.hpp
+++ b/include/boost/openmethod/interop/std_shared_ptr.hpp
@@ -8,6 +8,8 @@
 
 #include <boost/openmethod/core.hpp>
 #include <memory>
+#include <type_traits>
+#include <utility>
 
 namespace boost::openmethod {
 namespace detail {
diff --git a/include/boost/openmethod/interop/std_unique_ptr.hpp b/include/boost/openmethod/interop/std_unique_ptr.hpp
index 58c82b7ad..8ff7a2923 100644
--- a/include/boost/openmethod/interop/std_unique_ptr.hpp
+++ b/include/boost/openmethod/interop/std_unique_ptr.hpp
@@ -9,6 +9,8 @@
 #include <boost/openmethod/core.hpp>
 
 #include <memory>
+#include <type_traits>
+#include <utility>
 
 namespace boost::openmethod {
 
diff --git a/include/boost/openmethod/interop/std_weak_ptr.hpp b/include/boost/openmethod/interop/std_weak_ptr.hpp
index 778202c55..82a62bc41 100644
--- a/include/boost/openmethod/interop/std_weak_ptr.hpp
+++ b/include/boost/openmethod/interop/std_weak_ptr.hpp
@@ -7,7 +7,9 @@
 #define BOOST_OPENMETHOD_INTEROP_WEAK_PTR_HPP
 
 #include <boost/openmethod/interop/std_shared_ptr.hpp>
+#include <cstddef>
 #include <memory>
+#include <type_traits>
 #include <utility>
 
 namespace boost::openmethod {
diff --git a/include/boost/openmethod/interop/virtual_any.hpp b/include/boost/openmethod/interop/virtual_any.hpp
index c0179f37a..b597b6ae1 100644
--- a/include/boost/openmethod/interop/virtual_any.hpp
+++ b/include/boost/openmethod/interop/virtual_any.hpp
@@ -8,6 +8,11 @@
 
 #include <boost/openmethod/core.hpp>
 
+#include <boost/assert.hpp>
+#include <boost/mp11/algorithm.hpp>
+#include <boost/mp11/bind.hpp>
+#include <boost/mp11/list.hpp>
+
 #include <type_traits>
 #include <utility>
 
diff --git a/include/boost/openmethod/macros.hpp b/include/boost/openmethod/macros.hpp
index b772c2c80..998fbd921 100644
--- a/include/boost/openmethod/macros.hpp
+++ b/include/boost/openmethod/macros.hpp
@@ -6,10 +6,16 @@
 #ifndef BOOST_OPENMETHOD_MACROS_HPP
 #define BOOST_OPENMETHOD_MACROS_HPP
 
+#include <boost/config.hpp>
+#include <boost/mp11/algorithm.hpp>
+#include <boost/mp11/list.hpp>
 #include <boost/preprocessor/cat.hpp>
 
 #include <boost/openmethod/core.hpp>
 
+#include <type_traits>
+#include <utility>
+
 namespace boost::openmethod::detail {
 
 template<typename, class Method, typename ReturnType, typename... Parameters>
diff --git a/include/boost/openmethod/policies/default_error_handler.hpp b/include/boost/openmethod/policies/default_error_handler.hpp
index b9706e0c2..dcc222f0a 100644
--- a/include/boost/openmethod/policies/default_error_handler.hpp
+++ b/include/boost/openmethod/policies/default_error_handler.hpp
@@ -8,7 +8,11 @@
 
 #include <boost/openmethod/preamble.hpp>
 
+#include <boost/mp11/list.hpp>
+
 #include <functional>
+#include <type_traits>
+#include <utility>
 #include <variant>
 
 namespace boost::openmethod {
diff --git a/include/boost/openmethod/policies/fast_perfect_hash.hpp b/include/boost/openmethod/policies/fast_perfect_hash.hpp
index 2cf2b2e0e..adfdae459 100644
--- a/include/boost/openmethod/policies/fast_perfect_hash.hpp
+++ b/include/boost/openmethod/policies/fast_perfect_hash.hpp
@@ -8,11 +8,19 @@
 
 #include <boost/openmethod/preamble.hpp>
 
+#include <boost/config.hpp>
+#include <boost/mp11/algorithm.hpp>
+#include <boost/mp11/list.hpp>
+
+#include <algorithm>
+#include <cstddef>
 #include <limits>
 #include <random>
 #include <tuple>
 #include <type_traits>
+#include <utility>
 #include <variant>
+#include <vector>
 
 #ifdef _MSC_VER
 #pragma warning(push)
diff --git a/include/boost/openmethod/policies/minimal_cover_hash.hpp b/include/boost/openmethod/policies/minimal_cover_hash.hpp
index 7c19b9e39..c13617ecc 100644
--- a/include/boost/openmethod/policies/minimal_cover_hash.hpp
+++ b/include/boost/openmethod/policies/minimal_cover_hash.hpp
@@ -8,12 +8,16 @@
 
 #include <boost/openmethod/preamble.hpp>
 
+#include <boost/config.hpp>
+
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
 #include <cstdint>
 #include <limits>
 #include <tuple>
 #include <type_traits>
+#include <utility>
 #include <variant>
 #include <vector>
 
diff --git a/include/boost/openmethod/policies/minimal_perfect_hash.hpp b/include/boost/openmethod/policies/minimal_perfect_hash.hpp
index db64c578e..edecde7e2 100644
--- a/include/boost/openmethod/policies/minimal_perfect_hash.hpp
+++ b/include/boost/openmethod/policies/minimal_perfect_hash.hpp
@@ -9,12 +9,15 @@
 #include <boost/openmethod/preamble.hpp>
 
 #include <boost/assert.hpp>
+#include <boost/config.hpp>
 
 #include <algorithm>
+#include <cstddef>
 #include <cstdint>
 #include <numeric>
 #include <tuple>
 #include <type_traits>
+#include <utility>
 #include <variant>
 #include <vector>
 
diff --git a/include/boost/openmethod/policies/std_rtti.hpp b/include/boost/openmethod/policies/std_rtti.hpp
index 60d455e0f..ceb10e34d 100644
--- a/include/boost/openmethod/policies/std_rtti.hpp
+++ b/include/boost/openmethod/policies/std_rtti.hpp
@@ -9,7 +9,10 @@
 #include <boost/openmethod/preamble.hpp>
 #include <boost/openmethod/detail/type_key.hpp>
 
+#include <boost/config.hpp>
+
 #include <string_view>
+#include <type_traits>
 
 #ifndef BOOST_NO_RTTI
 #include <typeindex>
diff --git a/include/boost/openmethod/policies/two_level_hash.hpp b/include/boost/openmethod/policies/two_level_hash.hpp
index b5d09df9e..f9ae833d0 100644
--- a/include/boost/openmethod/policies/two_level_hash.hpp
+++ b/include/boost/openmethod/policies/two_level_hash.hpp
@@ -9,12 +9,15 @@
 #include <boost/openmethod/preamble.hpp>
 
 #include <boost/assert.hpp>
+#include <boost/config.hpp>
 
 #include <algorithm>
+#include <cstddef>
 #include <cstdint>
 #include <numeric>
 #include <tuple>
 #include <type_traits>
+#include <utility>
 #include <variant>
 #include <vector>
 
diff --git a/include/boost/openmethod/policies/vptr_map.hpp b/include/boost/openmethod/policies/vptr_map.hpp
index d87abc76e..174b78263 100644
--- a/include/boost/openmethod/policies/vptr_map.hpp
+++ b/include/boost/openmethod/policies/vptr_map.hpp
@@ -8,7 +8,11 @@
 
 #include <boost/openmethod/preamble.hpp>
 
+#include <boost/mp11/utility.hpp>
+
+#include <cstdlib>
 #include <tuple>
+#include <type_traits>
 #include <unordered_map>
 
 #ifdef _MSC_VER
diff --git a/include/boost/openmethod/policies/vptr_vector.hpp b/include/boost/openmethod/policies/vptr_vector.hpp
index 99fd0cf59..ab6ec1c1c 100644
--- a/include/boost/openmethod/policies/vptr_vector.hpp
+++ b/include/boost/openmethod/policies/vptr_vector.hpp
@@ -8,8 +8,12 @@
 
 #include <boost/openmethod/preamble.hpp>
 
+#include <boost/mp11/algorithm.hpp>
+
+#include <algorithm>
+#include <cstddef>
 #include <tuple>
-#include <variant>
+#include <type_traits>
 #include <vector>
 
 #ifdef _MSC_VER
diff --git a/include/boost/openmethod/preamble.hpp b/include/boost/openmethod/preamble.hpp
index f3e75bbd9..112242fb2 100644
--- a/include/boost/openmethod/preamble.hpp
+++ b/include/boost/openmethod/preamble.hpp
@@ -11,6 +11,9 @@
 #include <boost/preprocessor/cat.hpp>
 
 #include <stdlib.h>
+#include <cstddef>
+#include <type_traits>
+#include <utility>
 #include <vector>
 #include <cstdint>
 #include <limits>
diff --git a/test/compile_fail_boost_any_mutable_ref_to_rvalue_ref.cpp b/test/compile_fail_boost_any_mutable_ref_to_rvalue_ref.cpp
index 1114f366f..a850021f4 100644
--- a/test/compile_fail_boost_any_mutable_ref_to_rvalue_ref.cpp
+++ b/test/compile_fail_boost_any_mutable_ref_to_rvalue_ref.cpp
@@ -7,6 +7,7 @@
 // expected-error: no matching
 
 #include <string>
+#include <utility>
 #include <boost/any.hpp>
 
 #include <boost/openmethod.hpp>
diff --git a/test/compile_fail_final_virtual_ptr_weak_ptr.cpp b/test/compile_fail_final_virtual_ptr_weak_ptr.cpp
index bb91a4b08..6b17253b5 100644
--- a/test/compile_fail_final_virtual_ptr_weak_ptr.cpp
+++ b/test/compile_fail_final_virtual_ptr_weak_ptr.cpp
@@ -9,6 +9,8 @@
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/interop/std_weak_ptr.hpp>
 
+#include <memory>
+
 using namespace boost::openmethod;
 
 struct Animal {
diff --git a/test/compile_fail_weak_ptr_parameter.cpp b/test/compile_fail_weak_ptr_parameter.cpp
index 2ff9031a3..53599e8a1 100644
--- a/test/compile_fail_weak_ptr_parameter.cpp
+++ b/test/compile_fail_weak_ptr_parameter.cpp
@@ -10,6 +10,8 @@
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/interop/std_weak_ptr.hpp>
 
+#include <memory>
+
 using namespace boost::openmethod;
 
 struct Animal {
diff --git a/test/compile_fail_weak_virtual_ptr_parameter.cpp b/test/compile_fail_weak_virtual_ptr_parameter.cpp
index 4fb6de6a4..1be273d2d 100644
--- a/test/compile_fail_weak_virtual_ptr_parameter.cpp
+++ b/test/compile_fail_weak_virtual_ptr_parameter.cpp
@@ -10,6 +10,8 @@
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/interop/std_weak_ptr.hpp>
 
+#include <memory>
+
 using namespace boost::openmethod;
 
 struct Animal {
diff --git a/test/dynamic_loading/main.cpp b/test/dynamic_loading/main.cpp
index 0f863cd59..6de766953 100644
--- a/test/dynamic_loading/main.cpp
+++ b/test/dynamic_loading/main.cpp
@@ -25,6 +25,8 @@
 
 #include <iomanip>
 #include <stdexcept>
+#include <string>
+#include <typeinfo>
 
 using namespace boost::openmethod;
 
diff --git a/test/dynamic_loading/overrider.cpp b/test/dynamic_loading/overrider.cpp
index d3ca07a3a..ef2e38308 100644
--- a/test/dynamic_loading/overrider.cpp
+++ b/test/dynamic_loading/overrider.cpp
@@ -11,6 +11,8 @@
 #include "shared_overrider.hpp"
 #include "../test_classes.hpp"
 
+#include <string>
+
 #if defined(_WIN32) || defined(__CYGWIN__)
 #include <boost/config.hpp>
 #else
diff --git a/test/implicit_shared_libraries/default_registry/lib.cpp b/test/implicit_shared_libraries/default_registry/lib.cpp
index f584ad7ba..c803bc2c6 100644
--- a/test/implicit_shared_libraries/default_registry/lib.cpp
+++ b/test/implicit_shared_libraries/default_registry/lib.cpp
@@ -13,6 +13,8 @@
 #include "lib.hpp"
 #include "../../test_classes.hpp"
 
+#include <typeinfo>
+
 using namespace boost::openmethod;
 
 // The one definition of the shared state. It carries no visibility attribute:
diff --git a/test/mix_release_debug/main.cpp b/test/mix_release_debug/main.cpp
index 98ce804ee..9b5473fcc 100644
--- a/test/mix_release_debug/main.cpp
+++ b/test/mix_release_debug/main.cpp
@@ -11,6 +11,8 @@
 
 #include "lib.hpp"
 
+#include <variant>
+
 using namespace boost::openmethod;
 
 BOOST_AUTO_TEST_CASE(mix_release_debug) {
diff --git a/test/test_adl_registry.cpp b/test/test_adl_registry.cpp
index ad20edb01..209caabac 100644
--- a/test/test_adl_registry.cpp
+++ b/test/test_adl_registry.cpp
@@ -8,6 +8,7 @@
 // and the methods that take the class as a virtual parameter.
 
 #include <string>
+#include <type_traits>
 
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/initialize.hpp>
diff --git a/test/test_adl_registry_hidden_friend.cpp b/test/test_adl_registry_hidden_friend.cpp
index a7971f57e..35de6390d 100644
--- a/test/test_adl_registry_hidden_friend.cpp
+++ b/test/test_adl_registry_hidden_friend.cpp
@@ -8,6 +8,7 @@
 // broken. Argument-dependent lookup finds it from anywhere.
 
 #include <string>
+#include <type_traits>
 
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/initialize.hpp>
diff --git a/test/test_adl_registry_inheritance.cpp b/test/test_adl_registry_inheritance.cpp
index 5212b33da..f852608a0 100644
--- a/test/test_adl_registry_inheritance.cpp
+++ b/test/test_adl_registry_inheritance.cpp
@@ -13,6 +13,8 @@
 #define BOOST_TEST_MODULE adl_registry_inheritance
 #include <boost/test/unit_test.hpp>
 
+#include <type_traits>
+
 using namespace boost::openmethod;
 
 struct zoo_registry : default_registry::with<policies::runtime_checks> {};
diff --git a/test/test_adl_registry_inplace.cpp b/test/test_adl_registry_inplace.cpp
index 479ccbcf0..ce736aa26 100644
--- a/test/test_adl_registry_inplace.cpp
+++ b/test/test_adl_registry_inplace.cpp
@@ -8,6 +8,7 @@
 // registry argument nor an override of the default-registry macro.
 
 #include <string>
+#include <type_traits>
 
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/inplace_vptr.hpp>
diff --git a/test/test_adl_registry_scan.cpp b/test/test_adl_registry_scan.cpp
index f79b435e0..004a9c4ee 100644
--- a/test/test_adl_registry_scan.cpp
+++ b/test/test_adl_registry_scan.cpp
@@ -9,6 +9,7 @@
 // the declaration wins outright, and no scan happens.
 
 #include <string>
+#include <type_traits>
 
 #include <boost/openmethod.hpp>
 
diff --git a/test/test_adl_registry_smart_ptr.cpp b/test/test_adl_registry_smart_ptr.cpp
index 35ab94c63..687be65d8 100644
--- a/test/test_adl_registry_smart_ptr.cpp
+++ b/test/test_adl_registry_smart_ptr.cpp
@@ -8,6 +8,7 @@
 
 #include <memory>
 #include <string>
+#include <type_traits>
 
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/interop/boost_intrusive_ptr.hpp>
diff --git a/test/test_adl_registry_static_rtti.cpp b/test/test_adl_registry_static_rtti.cpp
index 16ce07d50..9dde3ca81 100644
--- a/test/test_adl_registry_static_rtti.cpp
+++ b/test/test_adl_registry_static_rtti.cpp
@@ -9,6 +9,7 @@
 // has to be created where the exact class is known.
 
 #include <string>
+#include <type_traits>
 
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/policies/static_rtti.hpp>
diff --git a/test/test_adl_registry_two_registries.cpp b/test/test_adl_registry_two_registries.cpp
index 3b8bc77fc..134d11ee1 100644
--- a/test/test_adl_registry_two_registries.cpp
+++ b/test/test_adl_registry_two_registries.cpp
@@ -8,6 +8,7 @@
 // dispatch independently.
 
 #include <string>
+#include <type_traits>
 
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/initialize.hpp>
diff --git a/test/test_class_registration_own_state.cpp b/test/test_class_registration_own_state.cpp
index fe39fb4f1..1ad4a5851 100644
--- a/test/test_class_registration_own_state.cpp
+++ b/test/test_class_registration_own_state.cpp
@@ -11,6 +11,8 @@
 #define BOOST_TEST_MODULE class_registration_own_state
 #include <boost/test/unit_test.hpp>
 
+#include <type_traits>
+
 using namespace boost::openmethod;
 
 BOOST_AUTO_TEST_CASE(registry_own_state) {
diff --git a/test/test_core.cpp b/test/test_core.cpp
index 136833fda..4618471eb 100644
--- a/test/test_core.cpp
+++ b/test/test_core.cpp
@@ -4,7 +4,10 @@
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <iostream>
+#include <memory>
+#include <tuple>
 #include <type_traits>
+#include <typeinfo>
 
 #define BOOST_TEST_MODULE core
 #include <boost/test/unit_test.hpp>
diff --git a/test/test_custom_rtti_deferred.cpp b/test/test_custom_rtti_deferred.cpp
index d818c0587..32e83e668 100644
--- a/test/test_custom_rtti_deferred.cpp
+++ b/test/test_custom_rtti_deferred.cpp
@@ -12,6 +12,8 @@ struct test_registry;
 #include "test_classes.hpp"
 
 #include <cstddef>
+#include <sstream>
+#include <type_traits>
 
 namespace {
 constexpr std::size_t non_polymorphic_high_bit = std::size_t(1)
diff --git a/test/test_custom_rtti_simple.cpp b/test/test_custom_rtti_simple.cpp
index 9c4e2328d..195253d86 100644
--- a/test/test_custom_rtti_simple.cpp
+++ b/test/test_custom_rtti_simple.cpp
@@ -12,6 +12,8 @@ struct test_registry;
 #include "test_classes.hpp"
 
 #include <cstddef>
+#include <sstream>
+#include <type_traits>
 
 namespace {
 constexpr std::size_t non_polymorphic_high_bit = std::size_t(1)
diff --git a/test/test_custom_rtti_simple_projection.cpp b/test/test_custom_rtti_simple_projection.cpp
index 15930b9c7..5c4914cb3 100644
--- a/test/test_custom_rtti_simple_projection.cpp
+++ b/test/test_custom_rtti_simple_projection.cpp
@@ -83,6 +83,9 @@ struct test_registry :
 #include <boost/test/unit_test.hpp>
 #include <boost/utility/identity_type.hpp>
 
+#include <sstream>
+#include <type_traits>
+
 using namespace boost::openmethod;
 
 BOOST_OPENMETHOD_TEST_CLASSES(Animal, Dog, Cat);
diff --git a/test/test_custom_rtti_virtual_base.cpp b/test/test_custom_rtti_virtual_base.cpp
index 2c259d9e3..9d5820462 100644
--- a/test/test_custom_rtti_virtual_base.cpp
+++ b/test/test_custom_rtti_virtual_base.cpp
@@ -12,6 +12,8 @@ struct test_registry;
 #include "test_classes.hpp"
 
 #include <cstddef>
+#include <sstream>
+#include <type_traits>
 
 namespace {
 constexpr std::size_t non_polymorphic_high_bit = std::size_t(1)
diff --git a/test/test_dispatch_boost_any.cpp b/test/test_dispatch_boost_any.cpp
index e79cf8ef6..8601ddd5c 100644
--- a/test/test_dispatch_boost_any.cpp
+++ b/test/test_dispatch_boost_any.cpp
@@ -3,7 +3,9 @@
 // See accompanying file LICENSE_1_0.txt
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <sstream>
 #include <string>
+#include <utility>
 #include <boost/any.hpp>
 
 #include <boost/openmethod.hpp>
diff --git a/test/test_dispatch_intrusive_ptr.cpp b/test/test_dispatch_intrusive_ptr.cpp
index 58cdbdcce..977c95fd5 100644
--- a/test/test_dispatch_intrusive_ptr.cpp
+++ b/test/test_dispatch_intrusive_ptr.cpp
@@ -8,6 +8,7 @@
 #include <string>
 #include <type_traits>
 #include <any>
+#include <utility>
 
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/interop/boost_intrusive_ptr.hpp>
diff --git a/test/test_dispatch_minimal_cover_hash.cpp b/test/test_dispatch_minimal_cover_hash.cpp
index 1cbcb9c3d..5e1aaf715 100644
--- a/test/test_dispatch_minimal_cover_hash.cpp
+++ b/test/test_dispatch_minimal_cover_hash.cpp
@@ -39,8 +39,10 @@ struct test_registry :
 
 #if BOOST_OPENMETHOD_HAS_PEXT
 
+#include <cstddef>
 #include <set>
 #include <string>
+#include <typeinfo>
 
 using namespace boost::openmethod;
 
diff --git a/test/test_dispatch_minimal_perfect_hash.cpp b/test/test_dispatch_minimal_perfect_hash.cpp
index c107c5998..9dc69286b 100644
--- a/test/test_dispatch_minimal_perfect_hash.cpp
+++ b/test/test_dispatch_minimal_perfect_hash.cpp
@@ -24,8 +24,10 @@ struct test_registry :
 #define BOOST_TEST_MODULE dispatch_minimal_perfect_hash
 #include <boost/test/unit_test.hpp>
 
+#include <cstddef>
 #include <set>
 #include <string>
+#include <typeinfo>
 
 using namespace boost::openmethod;
 
diff --git a/test/test_dispatch_rvalue_refs.cpp b/test/test_dispatch_rvalue_refs.cpp
index 8a1255cb4..c74f3e5cc 100644
--- a/test/test_dispatch_rvalue_refs.cpp
+++ b/test/test_dispatch_rvalue_refs.cpp
@@ -4,6 +4,7 @@
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <memory>
+#include <utility>
 
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/initialize.hpp>
diff --git a/test/test_dispatch_std_any.cpp b/test/test_dispatch_std_any.cpp
index ac54b5ef3..098abdfff 100644
--- a/test/test_dispatch_std_any.cpp
+++ b/test/test_dispatch_std_any.cpp
@@ -3,8 +3,11 @@
 // See accompanying file LICENSE_1_0.txt
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <sstream>
 #include <string>
 #include <any>
+#include <type_traits>
+#include <utility>
 
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/interop/std_any.hpp>
diff --git a/test/test_dispatch_two_level_hash.cpp b/test/test_dispatch_two_level_hash.cpp
index 759653fdf..5f5a8560a 100644
--- a/test/test_dispatch_two_level_hash.cpp
+++ b/test/test_dispatch_two_level_hash.cpp
@@ -24,8 +24,10 @@ struct test_registry :
 #define BOOST_TEST_MODULE dispatch_two_level_hash
 #include <boost/test/unit_test.hpp>
 
+#include <cstddef>
 #include <set>
 #include <string>
+#include <typeinfo>
 
 using namespace boost::openmethod;
 
diff --git a/test/test_dispatch_unique_ptr.cpp b/test/test_dispatch_unique_ptr.cpp
index 004e653e1..9a0123f7b 100644
--- a/test/test_dispatch_unique_ptr.cpp
+++ b/test/test_dispatch_unique_ptr.cpp
@@ -5,6 +5,7 @@
 
 #include <memory>
 #include <string>
+#include <utility>
 
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/initialize.hpp>
diff --git a/test/test_hash_policies.cpp b/test/test_hash_policies.cpp
index c2886fd3f..fdd3244e7 100644
--- a/test/test_hash_policies.cpp
+++ b/test/test_hash_policies.cpp
@@ -24,9 +24,11 @@
 #include <boost/test/unit_test.hpp>
 
 #include <algorithm>
+#include <cstddef>
 #include <cstdint>
 #include <set>
 #include <tuple>
+#include <utility>
 #include <vector>
 
 namespace bom = boost::openmethod;
diff --git a/test/test_initialize_context.cpp b/test/test_initialize_context.cpp
index 6a3dcd596..0030c4751 100644
--- a/test/test_initialize_context.cpp
+++ b/test/test_initialize_context.cpp
@@ -21,6 +21,7 @@
 
 #include "test_util.hpp"
 
+#include <cstddef>
 #include <iterator>
 #include <string>
 #include <tuple>
diff --git a/test/test_inplace_vptr.cpp b/test/test_inplace_vptr.cpp
index a20facfd7..41c1a1f38 100644
--- a/test/test_inplace_vptr.cpp
+++ b/test/test_inplace_vptr.cpp
@@ -12,6 +12,8 @@ struct test_registry;
 #include <boost/openmethod/initialize.hpp>
 
 #include <iostream>
+#include <memory>
+#include <sstream>
 #include <string>
 
 namespace bom = boost::openmethod;
diff --git a/test/test_n2216_covariant_return_type.cpp b/test/test_n2216_covariant_return_type.cpp
index 0e66fcd82..9b6f3c5c9 100644
--- a/test/test_n2216_covariant_return_type.cpp
+++ b/test/test_n2216_covariant_return_type.cpp
@@ -4,6 +4,7 @@
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <memory>
+#include <type_traits>
 
 #include <boost/openmethod.hpp>
 #include <boost/openmethod/initialize.hpp>
diff --git a/test/test_policies.cpp b/test/test_policies.cpp
index 46ed89626..cd3b7f8a2 100644
--- a/test/test_policies.cpp
+++ b/test/test_policies.cpp
@@ -4,6 +4,7 @@
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <iostream>
+#include <tuple>
 #include <type_traits>
 
 #define BOOST_TEST_MODULE policies
diff --git a/test/test_reflection.cpp b/test/test_reflection.cpp
index 429db115e..60f74bdbd 100644
--- a/test/test_reflection.cpp
+++ b/test/test_reflection.cpp
@@ -8,6 +8,7 @@
 // reflection there is nothing to test, and the whole file reduces to one test
 // case that says so.
 
+#include <cstddef>
 #include <sstream>
 #include <string>
 #include <utility>
diff --git a/test/test_runtime_errors_bad_call.cpp b/test/test_runtime_errors_bad_call.cpp
index 7274e0c36..a26abef70 100644
--- a/test/test_runtime_errors_bad_call.cpp
+++ b/test/test_runtime_errors_bad_call.cpp
@@ -12,6 +12,8 @@
 #define BOOST_TEST_MODULE runtime_errors_bad_call
 #include <boost/test/unit_test.hpp>
 
+#include <string>
+
 using namespace boost::openmethod;
 using namespace test_matrices;
 
diff --git a/test/test_runtime_errors_bad_call_type_ids.cpp b/test/test_runtime_errors_bad_call_type_ids.cpp
index d22126bf1..c13d8e243 100644
--- a/test/test_runtime_errors_bad_call_type_ids.cpp
+++ b/test/test_runtime_errors_bad_call_type_ids.cpp
@@ -12,6 +12,8 @@
 #define BOOST_TEST_MODULE runtime_errors_bad_call_type_ids
 #include <boost/test/unit_test.hpp>
 
+#include <typeinfo>
+
 using namespace boost::openmethod;
 using namespace test_matrices;
 
diff --git a/test/test_runtime_errors_bad_call_type_ids_smart_ptr.cpp b/test/test_runtime_errors_bad_call_type_ids_smart_ptr.cpp
index e89bdd521..d6f4a9d8d 100644
--- a/test/test_runtime_errors_bad_call_type_ids_smart_ptr.cpp
+++ b/test/test_runtime_errors_bad_call_type_ids_smart_ptr.cpp
@@ -13,6 +13,8 @@
 #define BOOST_TEST_MODULE runtime_errors_bad_call_type_ids_smart_ptr
 #include <boost/test/unit_test.hpp>
 
+#include <typeinfo>
+
 using namespace boost::openmethod;
 using namespace test_matrices;
 
diff --git a/test/test_runtime_errors_call_unknown_class.cpp b/test/test_runtime_errors_call_unknown_class.cpp
index 6530eb2dd..037792185 100644
--- a/test/test_runtime_errors_call_unknown_class.cpp
+++ b/test/test_runtime_errors_call_unknown_class.cpp
@@ -12,6 +12,8 @@
 #define BOOST_TEST_MODULE runtime_errors_call_unknown_class
 #include <boost/test/unit_test.hpp>
 
+#include <string>
+
 using namespace boost::openmethod;
 using namespace test_matrices;
 
diff --git a/test/test_runtime_errors_duplicate_overrider.cpp b/test/test_runtime_errors_duplicate_overrider.cpp
index e2e064eb1..7d9b4aff0 100644
--- a/test/test_runtime_errors_duplicate_overrider.cpp
+++ b/test/test_runtime_errors_duplicate_overrider.cpp
@@ -12,6 +12,8 @@
 #define BOOST_TEST_MODULE runtime_errors_duplicate_overrider
 #include <boost/test/unit_test.hpp>
 
+#include <string>
+
 using namespace boost::openmethod;
 
 using capture = capture_errors<test_registry>;
diff --git a/test/test_runtime_errors_initialize_unknown_class.cpp b/test/test_runtime_errors_initialize_unknown_class.cpp
index 1dc508568..feb1d1d71 100644
--- a/test/test_runtime_errors_initialize_unknown_class.cpp
+++ b/test/test_runtime_errors_initialize_unknown_class.cpp
@@ -12,6 +12,8 @@
 #define BOOST_TEST_MODULE runtime_errors_initialize_unknown_class
 #include <boost/test/unit_test.hpp>
 
+#include <string>
+
 using namespace boost::openmethod;
 using namespace test_matrices;
 
diff --git a/test/test_runtime_errors_no_initialization.cpp b/test/test_runtime_errors_no_initialization.cpp
index 48abf921d..76d676d30 100644
--- a/test/test_runtime_errors_no_initialization.cpp
+++ b/test/test_runtime_errors_no_initialization.cpp
@@ -13,6 +13,8 @@
 #define BOOST_TEST_MODULE runtime_errors_no_initialization
 #include <boost/test/unit_test.hpp>
 
+#include <memory>
+
 using namespace boost::openmethod;
 using namespace test_matrices;
 
diff --git a/test/test_runtime_errors_throw_error.cpp b/test/test_runtime_errors_throw_error.cpp
index 352b697df..b73b2b87f 100644
--- a/test/test_runtime_errors_throw_error.cpp
+++ b/test/test_runtime_errors_throw_error.cpp
@@ -19,6 +19,9 @@ struct test_registry :
 #define BOOST_TEST_MODULE runtime_errors_throw_error
 #include <boost/test/unit_test.hpp>
 
+#include <stdexcept>
+#include <string>
+
 using namespace boost::openmethod;
 using namespace test_matrices;
 
diff --git a/test/test_shared_virtual_ptr_dispatch.cpp b/test/test_shared_virtual_ptr_dispatch.cpp
index f59ff804f..35dc3a93a 100644
--- a/test/test_shared_virtual_ptr_dispatch.cpp
+++ b/test/test_shared_virtual_ptr_dispatch.cpp
@@ -12,6 +12,8 @@
 
 #include "test_util.hpp"
 
+#include <string>
+
 using boost::mp11::mp_list;
 using namespace boost::openmethod;
 using namespace boost::openmethod::detail;
diff --git a/test/test_shared_virtual_ptr_value_semantics.cpp b/test/test_shared_virtual_ptr_value_semantics.cpp
index e79eaf6dc..cef37be12 100644
--- a/test/test_shared_virtual_ptr_value_semantics.cpp
+++ b/test/test_shared_virtual_ptr_value_semantics.cpp
@@ -13,6 +13,8 @@
 #include "test_virtual_ptr_value_semantics.hpp"
 
 #include <memory>
+#include <type_traits>
+#include <utility>
 
 static_assert(SameSmartPtr<
     std::shared_ptr<Animal>, std::shared_ptr<Dog>, default_registry>);
diff --git a/test/test_slot_allocator.cpp b/test/test_slot_allocator.cpp
index 0e4e36ea5..a9f563718 100644
--- a/test/test_slot_allocator.cpp
+++ b/test/test_slot_allocator.cpp
@@ -4,14 +4,20 @@
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <algorithm>
+#include <cstddef>
 #include <iostream>
 #include <limits>
 #include <memory>
 #include <numeric>
 #include <random>
 #include <sstream>
+#include <string>
+#include <tuple>
 #include <type_traits>
+#include <typeinfo>
 #include <unordered_map>
+#include <unordered_set>
+#include <utility>
 #include <vector>
 
 #include <boost/mp11/algorithm.hpp>
diff --git a/test/test_smart_virtual_ptr_value_semantics.cpp b/test/test_smart_virtual_ptr_value_semantics.cpp
index 47b6333dc..0eef11ac0 100644
--- a/test/test_smart_virtual_ptr_value_semantics.cpp
+++ b/test/test_smart_virtual_ptr_value_semantics.cpp
@@ -16,6 +16,8 @@
 #include "test_virtual_ptr_value_semantics.hpp"
 
 #include <memory>
+#include <type_traits>
+#include <utility>
 
 #ifdef BOOST_GCC
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
diff --git a/test/test_static_rtti.cpp b/test/test_static_rtti.cpp
index 1c658e84c..5bb04a02e 100644
--- a/test/test_static_rtti.cpp
+++ b/test/test_static_rtti.cpp
@@ -19,6 +19,8 @@ struct static_registry :
 
 #include "test_classes.hpp"
 
+#include <sstream>
+
 struct Animal {};
 
 struct Dog : Animal {};
diff --git a/test/test_static_rtti_errors.cpp b/test/test_static_rtti_errors.cpp
index 1a0d9c977..dd07561c9 100644
--- a/test/test_static_rtti_errors.cpp
+++ b/test/test_static_rtti_errors.cpp
@@ -20,6 +20,7 @@
 
 #include <boost/mp11/list.hpp>
 
+#include <cstddef>
 #include <sstream>
 #include <string_view>
 #include <type_traits>
diff --git a/test/test_unique_virtual_ptr_value_semantics.cpp b/test/test_unique_virtual_ptr_value_semantics.cpp
index d3a1a4b30..8b20d2e63 100644
--- a/test/test_unique_virtual_ptr_value_semantics.cpp
+++ b/test/test_unique_virtual_ptr_value_semantics.cpp
@@ -11,6 +11,8 @@
 #include "test_virtual_ptr_value_semantics.hpp"
 
 #include <memory>
+#include <type_traits>
+#include <utility>
 
 using namespace detail;
 
diff --git a/test/test_util.hpp b/test/test_util.hpp
index 824301bb3..cb5fe8a7b 100644
--- a/test/test_util.hpp
+++ b/test/test_util.hpp
@@ -8,6 +8,7 @@
 
 #include <iostream>
 #include <string>
+#include <utility>
 
 #include <boost/mp11/list.hpp>
 #include <boost/openmethod/core.hpp>
diff --git a/test/test_virtual_ptr_dispatch.cpp b/test/test_virtual_ptr_dispatch.cpp
index eb3a84559..9b61ff92e 100644
--- a/test/test_virtual_ptr_dispatch.cpp
+++ b/test/test_virtual_ptr_dispatch.cpp
@@ -11,6 +11,8 @@
 
 #include "test_util.hpp"
 
+#include <string>
+
 using boost::mp11::mp_list;
 using namespace boost::openmethod;
 using namespace boost::openmethod::detail;
diff --git a/test/test_virtual_ptr_final.cpp b/test/test_virtual_ptr_final.cpp
index 29be3c635..cbf87d642 100644
--- a/test/test_virtual_ptr_final.cpp
+++ b/test/test_virtual_ptr_final.cpp
@@ -11,6 +11,8 @@
 
 #include "test_util.hpp"
 
+#include <string>
+
 using boost::mp11::mp_list;
 using namespace boost::openmethod;
 using namespace boost::openmethod::detail;
diff --git a/test/test_virtual_ptr_value_semantics.cpp b/test/test_virtual_ptr_value_semantics.cpp
index c5e716f0b..f1f420f9e 100644
--- a/test/test_virtual_ptr_value_semantics.cpp
+++ b/test/test_virtual_ptr_value_semantics.cpp
@@ -8,6 +8,11 @@
 
 #include "test_virtual_ptr_value_semantics.hpp"
 
+#include <type_traits>
+#include <typeinfo>
+#include <utility>
+#include <variant>
+
 BOOST_AUTO_TEST_CASE_TEMPLATE(
     plain_virtual_ptr_value, Registry, test_policies) {
     static_assert(std::is_same_v<
diff --git a/test/test_weak_virtual_ptr.cpp b/test/test_weak_virtual_ptr.cpp
index 29e413ac0..32c04c2cc 100644
--- a/test/test_weak_virtual_ptr.cpp
+++ b/test/test_weak_virtual_ptr.cpp
@@ -14,6 +14,7 @@
 #include <set>
 #include <string>
 #include <type_traits>
+#include <utility>
 
 // A weak virtual_ptr is not a virtual_ptr at all: neither a smart one in the
 // `IsSmartPtr` sense (no `virtual_traits`, no `rebind`) nor a plain one.