diff --git a/include/boost/lockfree/lockfree_forward.hpp b/include/boost/lockfree/lockfree_forward.hpp
index 3b9c717..00e3db2 100644
--- a/include/boost/lockfree/lockfree_forward.hpp
+++ b/include/boost/lockfree/lockfree_forward.hpp
@@ -8,13 +8,18 @@
 #ifndef BOOST_LOCKFREE_FORWARD_HPP_INCLUDED
 #define BOOST_LOCKFREE_FORWARD_HPP_INCLUDED
 
+#include <boost/config.hpp>
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#    pragma once
+#endif
+
 
 #ifndef BOOST_DOXYGEN_INVOKED
 
 #    include <cstddef>
-#    include <type_traits>
-
-#    include <boost/config.hpp>
+#    if !defined( BOOST_NO_CXX20_HDR_CONCEPTS )
+#        include <type_traits>
+#    endif
 
 namespace boost { namespace lockfree {
 
@@ -57,5 +62,4 @@ struct spsc_value;
 }}     // namespace boost::lockfree
 
 #endif // BOOST_DOXYGEN_INVOKED
-
 #endif // BOOST_LOCKFREE_FORWARD_HPP_INCLUDED
diff --git a/include/boost/lockfree/policies.hpp b/include/boost/lockfree/policies.hpp
index 334e5a0..5dc3d6c 100644
--- a/include/boost/lockfree/policies.hpp
+++ b/include/boost/lockfree/policies.hpp
@@ -9,6 +9,11 @@
 #ifndef BOOST_LOCKFREE_POLICIES_HPP_INCLUDED
 #define BOOST_LOCKFREE_POLICIES_HPP_INCLUDED
 
+#include <boost/config.hpp>
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#    pragma once
+#endif
+
 #include <boost/parameter/template_keyword.hpp>
 
 #include <type_traits>
diff --git a/include/boost/lockfree/queue.hpp b/include/boost/lockfree/queue.hpp
index ce9ac48..6e7bcf0 100644
--- a/include/boost/lockfree/queue.hpp
+++ b/include/boost/lockfree/queue.hpp
@@ -11,8 +11,12 @@
 #ifndef BOOST_LOCKFREE_FIFO_HPP_INCLUDED
 #define BOOST_LOCKFREE_FIFO_HPP_INCLUDED
 
+#include <boost/config.hpp>
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#    pragma once
+#endif
+
 #include <boost/assert.hpp>
-#include <boost/config.hpp> // for BOOST_LIKELY & BOOST_ALIGNMENT
 #include <boost/core/allocator_access.hpp>
 #include <boost/parameter/optional.hpp>
 #include <boost/parameter/parameters.hpp>
@@ -26,10 +30,6 @@
 #include <boost/lockfree/detail/uses_optional.hpp>
 #include <boost/lockfree/lockfree_forward.hpp>
 
-#ifdef BOOST_HAS_PRAGMA_ONCE
-#    pragma once
-#endif
-
 
 #if defined( _MSC_VER )
 #    pragma warning( push )
diff --git a/include/boost/lockfree/spsc_queue.hpp b/include/boost/lockfree/spsc_queue.hpp
index ee99869..f2db625 100644
--- a/include/boost/lockfree/spsc_queue.hpp
+++ b/include/boost/lockfree/spsc_queue.hpp
@@ -10,13 +10,17 @@
 #ifndef BOOST_LOCKFREE_SPSC_QUEUE_HPP_INCLUDED
 #define BOOST_LOCKFREE_SPSC_QUEUE_HPP_INCLUDED
 
+#include <boost/config.hpp>
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#    pragma once
+#endif
+
 #include <algorithm>
 #include <memory>
 #include <type_traits>
 
 #include <boost/aligned_storage.hpp>
 #include <boost/assert.hpp>
-#include <boost/config.hpp> // for BOOST_LIKELY
 #include <boost/core/allocator_access.hpp>
 #include <boost/core/span.hpp>
 #include <boost/parameter/optional.hpp>
@@ -30,10 +34,6 @@
 #include <boost/lockfree/detail/uses_optional.hpp>
 #include <boost/lockfree/lockfree_forward.hpp>
 
-#ifdef BOOST_HAS_PRAGMA_ONCE
-#    pragma once
-#endif
-
 namespace boost { namespace lockfree {
 namespace detail {
 
diff --git a/include/boost/lockfree/stack.hpp b/include/boost/lockfree/stack.hpp
index 168ef15..19d5e7d 100644
--- a/include/boost/lockfree/stack.hpp
+++ b/include/boost/lockfree/stack.hpp
@@ -7,6 +7,12 @@
 #ifndef BOOST_LOCKFREE_STACK_HPP_INCLUDED
 #define BOOST_LOCKFREE_STACK_HPP_INCLUDED
 
+#include <boost/config.hpp>
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#    pragma once
+#endif
+
+
 #include <boost/assert.hpp>
 #include <boost/core/allocator_access.hpp>
 #include <boost/core/no_exceptions_support.hpp>
@@ -26,10 +32,6 @@
 #include <tuple>
 #include <type_traits>
 
-#ifdef BOOST_HAS_PRAGMA_ONCE
-#    pragma once
-#endif
-
 namespace boost { namespace lockfree {
 namespace detail {