diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f254ce8..4a16b9e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Version 57:
+
+* Fix message.hpp javadocs
+
+--------------------------------------------------------------------------------
+
 Version 56:
 
 * Add provisional IANA header field names
diff --git a/include/beast/http/message.hpp b/include/beast/http/message.hpp
index a92adee7..ea3f1d98 100644
--- a/include/beast/http/message.hpp
+++ b/include/beast/http/message.hpp
@@ -51,7 +51,11 @@ struct header<true, Fields> : Fields
 #endif
 {
     /// Indicates if the header is a request or response.
+#if BEAST_DOXYGEN
+    using is_request = isRequest;
+#else
     using is_request = std::true_type;
+#endif
 
     /// The type representing the fields.
     using fields_type = Fields;
@@ -84,29 +88,6 @@ struct header<true, Fields> : Fields
     /// Copy assignment
     header& operator=(header const&) = default;
 
-    /** Construct the header.
-
-        All arguments are forwarded to the constructor
-        of the `fields` member.
-
-        @note This constructor participates in overload resolution
-        if and only if the first parameter is not convertible to
-        `header`.
-    */
-#if BEAST_DOXYGEN
-    template<class... Args>
-    explicit
-    header(Args&&... args);
-
-#else
-    template<class Arg1, class... ArgN,
-        class = typename std::enable_if<
-            (sizeof...(ArgN) > 0) || ! std::is_convertible<
-                typename std::decay<Arg1>::type,
-                    header>::value>::type>
-    explicit
-    header(Arg1&& arg1, ArgN&&... argn);
-
     /** Return the request-method verb.
 
         If the request-method is not one of the recognized verbs,
@@ -172,6 +153,32 @@ struct header<true, Fields> : Fields
     void
     target(string_view s);
 
+    // VFALCO Don't move these declarations around,
+    //        otherwise the documentation will be wrong.
+
+    /** Construct the header.
+
+        All arguments are forwarded to the constructor
+        of the `fields` member.
+
+        @note This constructor participates in overload resolution
+        if and only if the first parameter is not convertible to
+        `header`.
+    */
+#if BEAST_DOXYGEN
+    template<class... Args>
+    explicit
+    header(Args&&... args);
+
+#else
+    template<class Arg1, class... ArgN,
+        class = typename std::enable_if<
+            (sizeof...(ArgN) > 0) || ! std::is_convertible<
+                typename std::decay<Arg1>::type,
+                    header>::value>::type>
+    explicit
+    header(Arg1&& arg1, ArgN&&... argn);
+
 private:
     template<bool, class, class>
     friend struct message;
@@ -327,6 +334,7 @@ struct header<false, Fields> : Fields
     reason(string_view s);
    
 private:
+#if ! BEAST_DOXYGEN
     template<bool, class, class>
     friend struct message;
 
@@ -336,6 +344,7 @@ private:
     swap(header<false, T>& m1, header<false, T>& m2);
 
     status result_;
+#endif
 };
 
 /** A container for a complete HTTP message.