diff --git a/doc/Jamfile b/doc/Jamfile
index ef61c10b..548172a0 100644
--- a/doc/Jamfile
+++ b/doc/Jamfile
@@ -22,7 +22,7 @@ if ! [ type.registered IPP ]
 docca.reference reference.qbk
     :
         xsl/custom-overrides.xsl
-        [ glob-tree-ex ../include/boost/beast : *.hpp *.ipp : detail impl ]
+        [ glob-tree-ex ../include/boost/beast : *.hpp *.ipp : detail impl unit_test ]
     :
         <doxygen:param>PROJECT_NAME=Beast
         <doxygen:param>PROJECT_BRIEF="C++ Networking Library"
diff --git a/doc/qbk/04_http/02_message.qbk b/doc/qbk/04_http/02_message.qbk
index 724f2c49..9d7bc50b 100644
--- a/doc/qbk/04_http/02_message.qbk
+++ b/doc/qbk/04_http/02_message.qbk
@@ -160,7 +160,7 @@ meet the requirements, or use the ones that come with the library:
     [link beast.ref.boost__beast__http__span_body `span_body`]
 ][
     A body whose `value_type` is a
-    [link beast.ref.boost__beast__span `span`],
+    [@boost:/libs/core/doc/html/core/span.html `span`],
     a non-owning reference to a single linear buffer of bytes.
     Messages with this body type may be serialized and parsed.
 ]]
diff --git a/doc/qbk/quickref.xml b/doc/qbk/quickref.xml
index cc4b3fd2..51aaf28c 100644
--- a/doc/qbk/quickref.xml
+++ b/doc/qbk/quickref.xml
@@ -41,7 +41,6 @@
       <entry valign="top">
         <bridgehead renderas="sect3">Classes&nbsp;<emphasis role="normal">(2 of 2)</emphasis></bridgehead>
         <simplelist type="vert" columns="1">
-          <member><link linkend="beast.ref.boost__beast__span">span</link></member>
           <member><link linkend="beast.ref.boost__beast__static_string">static_string</link></member>
           <member><link linkend="beast.ref.boost__beast__stable_async_base">stable_async_base</link></member>
           <member><link linkend="beast.ref.boost__beast__string_view">string_view</link></member>
diff --git a/include/boost/beast/core/buffers_adaptor.hpp b/include/boost/beast/core/buffers_adaptor.hpp
index b8e5ce30..7709e17b 100644
--- a/include/boost/beast/core/buffers_adaptor.hpp
+++ b/include/boost/beast/core/buffers_adaptor.hpp
@@ -222,7 +222,9 @@ private:
     subrange<false>
     make_subrange(std::size_t pos, std::size_t n) const;
 
+#ifndef BOOST_BEAST_DOXYGEN
     friend struct buffers_adaptor_test_hook;
+#endif
 
 };
 
diff --git a/include/boost/beast/core/rate_policy.hpp b/include/boost/beast/core/rate_policy.hpp
index 6375b118..23798fbc 100644
--- a/include/boost/beast/core/rate_policy.hpp
+++ b/include/boost/beast/core/rate_policy.hpp
@@ -41,8 +41,10 @@ namespace beast {
 class rate_policy_access
 {
 private:
+#ifndef BOOST_BEAST_DOXYGEN
     template<class, class, class>
     friend class basic_stream;
+#endif
 
     template<class Policy>
     static
@@ -101,7 +103,9 @@ private:
 */
 class unlimited_rate_policy
 {
+#ifndef BOOST_BEAST_DOXYGEN
     friend class rate_policy_access;
+#endif
 
     static std::size_t constexpr all =
         (std::numeric_limits<std::size_t>::max)();
@@ -149,7 +153,9 @@ class unlimited_rate_policy
 */
 class simple_rate_policy
 {
+#ifndef BOOST_BEAST_DOXYGEN
     friend class rate_policy_access;
+#endif
 
     static std::size_t constexpr all =
         (std::numeric_limits<std::size_t>::max)();
diff --git a/include/boost/beast/http/basic_file_body.hpp b/include/boost/beast/http/basic_file_body.hpp
index ae1351d2..25ea2685 100644
--- a/include/boost/beast/http/basic_file_body.hpp
+++ b/include/boost/beast/http/basic_file_body.hpp
@@ -85,9 +85,11 @@ class basic_file_body<File>::value_type
     // This body container holds a handle to the file
     // when it is open, and also caches the size when set.
 
+#ifndef BOOST_BEAST_DOXYGEN
     friend class reader;
     friend class writer;
     friend struct basic_file_body;
+#endif
 
     // This represents the open file
     File file_;
diff --git a/include/boost/beast/http/basic_parser.hpp b/include/boost/beast/http/basic_parser.hpp
index 6f9bf8a8..2ca19040 100644
--- a/include/boost/beast/http/basic_parser.hpp
+++ b/include/boost/beast/http/basic_parser.hpp
@@ -130,7 +130,9 @@ class basic_parser
     template<bool OtherIsRequest>
     friend class basic_parser;
 
+#ifndef BOOST_BEAST_DOXYGEN
     friend class basic_parser_test;
+#endif
 
 protected:
     /// Default constructor
diff --git a/include/boost/beast/http/fields.hpp b/include/boost/beast/http/fields.hpp
index d47239cd..3cd0a631 100644
--- a/include/boost/beast/http/fields.hpp
+++ b/include/boost/beast/http/fields.hpp
@@ -59,7 +59,9 @@ class basic_fields
         std::allocator_traits<Allocator>::pointer>::value,
         "Allocator must use regular pointers");
 
+#ifndef BOOST_BEAST_DOXYGEN
     friend class fields_test; // for `header`
+#endif
 
     struct element;
 
@@ -72,7 +74,9 @@ public:
     /// The type of element used to represent a field
     class value_type
     {
+#ifndef BOOST_BEAST_DOXYGEN
         friend class basic_fields;
+#endif
 
         off_t off_;
         off_t len_;
diff --git a/include/boost/beast/websocket/stream.hpp b/include/boost/beast/websocket/stream.hpp
index 2823e4b1..f0cab54b 100644
--- a/include/boost/beast/websocket/stream.hpp
+++ b/include/boost/beast/websocket/stream.hpp
@@ -139,6 +139,7 @@ class stream
     using control_cb_type =
         std::function<void(frame_type, string_view)>;
 
+#ifndef BOOST_BEAST_DOXYGEN
     friend class close_test;
     friend class frame_test;
     friend class ping_test;
@@ -153,6 +154,7 @@ class stream
     */
     static std::size_t constexpr max_control_frame_size = 2 + 8 + 4 + 125;
     static std::size_t constexpr tcp_frame_size = 1536;
+#endif
 
     static time_point never() noexcept
     {
diff --git a/include/boost/beast/websocket/stream_base.hpp b/include/boost/beast/websocket/stream_base.hpp
index a214553f..0968e80e 100644
--- a/include/boost/beast/websocket/stream_base.hpp
+++ b/include/boost/beast/websocket/stream_base.hpp
@@ -54,8 +54,10 @@ struct stream_base
     {
         detail::decorator d_;
 
+#ifndef BOOST_BEAST_DOXYGEN
         template<class, bool>
         friend class stream;
+#endif
 
     public:
         // Move Constructor