diff --git a/src/beast/include/beast/http/detail/write_preparation.hpp b/src/beast/include/beast/http/detail/write_preparation.hpp
index 5456eb2ff..937ecafd0 100644
--- a/src/beast/include/beast/http/detail/write_preparation.hpp
+++ b/src/beast/include/beast/http/detail/write_preparation.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_DETAIL_WRITE_PREPARATION_HPP
 #define BEAST_HTTP_DETAIL_WRITE_PREPARATION_HPP
 
+#include <beast/http/error.hpp>
 #include <beast/streambuf.hpp>
 
 namespace beast {
diff --git a/src/beast/include/beast/http/impl/message.ipp b/src/beast/include/beast/http/impl/message.ipp
index f9dcb3671..7984b3b83 100644
--- a/src/beast/include/beast/http/impl/message.ipp
+++ b/src/beast/include/beast/http/impl/message.ipp
@@ -12,8 +12,10 @@
 #include <beast/http/type_check.hpp>
 #include <beast/http/detail/writes.hpp>
 #include <beast/http/detail/write_preparation.hpp>
+#include <beast/http/resume_context.hpp>
 #include <beast/http/rfc2616.hpp>
 #include <boost/asio/buffer.hpp>
+#include <boost/logic/tribool.hpp>
 #include <condition_variable>
 #include <mutex>
 
diff --git a/src/beast/include/beast/http/type_check.hpp b/src/beast/include/beast/http/type_check.hpp
index a5192bd44..4e9dc457b 100644
--- a/src/beast/include/beast/http/type_check.hpp
+++ b/src/beast/include/beast/http/type_check.hpp
@@ -8,34 +8,11 @@
 #ifndef BEAST_HTTP_TYPE_CHECK_HPP
 #define BEAST_HTTP_TYPE_CHECK_HPP
 
-#include <beast/http/error.hpp>
-#include <beast/http/message.hpp>
-#include <beast/http/resume_context.hpp>
-#include <beast/type_check.hpp>
-#include <boost/asio/buffer.hpp>
-#include <boost/logic/tribool.hpp>
-#include <boost/system/error_code.hpp>
-#include <functional>
 #include <type_traits>
 
 namespace beast {
 namespace http {
 
-#if GENERATING_DOCS
-namespace detail {
-#else
-namespace concept {
-#endif
-
-struct Reader
-{
-    template<bool isRequest, class Body, class Headers>
-    Reader(message<isRequest, Body, Headers>&) noexcept;
-    void write(void const*, std::size_t, error_code&) noexcept;
-};
-
-} // concept
-
 /// Evaluates to std::true_type if `T` models Body
 template<class T>
 struct is_Body : std::true_type