diff --git a/modules/beast_asio/basics/SSLContext.h b/modules/beast_asio/basics/SSLContext.h
index 3949db3d5..847927cb6 100644
--- a/modules/beast_asio/basics/SSLContext.h
+++ b/modules/beast_asio/basics/SSLContext.h
@@ -20,6 +20,8 @@
 #ifndef BEAST_ASIO_BASICS_SSLCONTEXT_H_INCLUDED
 #define BEAST_ASIO_BASICS_SSLCONTEXT_H_INCLUDED
 
+#include <boost/asio/ssl/context.hpp>
+
 namespace beast {
 namespace asio {
 
diff --git a/modules/beast_asio/http/HTTPField.h b/modules/beast_asio/http/HTTPField.h
index 6a7c39012..9671de6a4 100644
--- a/modules/beast_asio/http/HTTPField.h
+++ b/modules/beast_asio/http/HTTPField.h
@@ -20,6 +20,8 @@
 #ifndef BEAST_ASIO_HTTPFIELD_H_INCLUDED
 #define BEAST_ASIO_HTTPFIELD_H_INCLUDED
 
+#include "../../../beast/strings/String.h"
+
 namespace beast {
 
 /** A single header.
diff --git a/modules/beast_asio/http/HTTPHeaders.h b/modules/beast_asio/http/HTTPHeaders.h
index 12688f714..e3360327b 100644
--- a/modules/beast_asio/http/HTTPHeaders.h
+++ b/modules/beast_asio/http/HTTPHeaders.h
@@ -20,6 +20,10 @@
 #ifndef BEAST_ASIO_HTTPHEADERS_H_INCLUDED
 #define BEAST_ASIO_HTTPHEADERS_H_INCLUDED
 
+#include "HTTPField.h"
+
+#include "../../beast_core/text/StringPairArray.h"
+
 namespace beast {
 
 /** A set of HTTP headers. */
diff --git a/modules/beast_asio/http/HTTPMessage.h b/modules/beast_asio/http/HTTPMessage.h
index 7a7a75463..588b830ce 100644
--- a/modules/beast_asio/http/HTTPMessage.h
+++ b/modules/beast_asio/http/HTTPMessage.h
@@ -20,7 +20,12 @@
 #ifndef BEAST_ASIO_HTTPMESSAGE_H_INCLUDED
 #define BEAST_ASIO_HTTPMESSAGE_H_INCLUDED
 
+#include "HTTPHeaders.h"
+#include "HTTPVersion.h"
+
+#include "../../../beast/smart_ptr/SharedObject.h"
 #include "../../../beast/net/DynamicBuffer.h"
+#include "../../beast_core/text/StringPairArray.h"
 
 namespace beast {
 
diff --git a/modules/beast_asio/http/HTTPParser.h b/modules/beast_asio/http/HTTPParser.h
index 3d559e66a..791f981bf 100644
--- a/modules/beast_asio/http/HTTPParser.h
+++ b/modules/beast_asio/http/HTTPParser.h
@@ -20,6 +20,9 @@
 #ifndef BEAST_ASIO_HTTPPARSER_H_INCLUDED
 #define BEAST_ASIO_HTTPPARSER_H_INCLUDED
 
+#include "HTTPRequest.h"
+#include "HTTPResponse.h"
+
 namespace beast {
 
 class HTTPParserImpl;
diff --git a/modules/beast_asio/http/HTTPRequest.h b/modules/beast_asio/http/HTTPRequest.h
index 730dce52f..ee3d9db93 100644
--- a/modules/beast_asio/http/HTTPRequest.h
+++ b/modules/beast_asio/http/HTTPRequest.h
@@ -20,6 +20,8 @@
 #ifndef BEAST_ASIO_HTTPREQUEST_H_INCLUDED
 #define BEAST_ASIO_HTTPREQUEST_H_INCLUDED
 
+#include "HTTPMessage.h"
+
 namespace beast {
 
 class HTTPRequest : public HTTPMessage
diff --git a/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h b/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h
index 423a6c5d4..329232e88 100644
--- a/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h
+++ b/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h
@@ -20,6 +20,9 @@
 #ifndef BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTLOGICPROXY_H_INCLUDED
 #define BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTLOGICPROXY_H_INCLUDED
 
+#include "HandshakeDetectLogic.h"
+#include "InputParser.h"
+
 namespace beast {
 namespace asio {
 
diff --git a/modules/beast_asio/protocol/InputParser.h b/modules/beast_asio/protocol/InputParser.h
index f9314d988..d6bb3e84e 100644
--- a/modules/beast_asio/protocol/InputParser.h
+++ b/modules/beast_asio/protocol/InputParser.h
@@ -20,6 +20,8 @@
 #ifndef BEAST_ASIO_HANDSHAKE_INPUTPARSER_H_INCLUDED
 #define BEAST_ASIO_HANDSHAKE_INPUTPARSER_H_INCLUDED
 
+#include "../basics/FixedInputBuffer.h"
+
 namespace beast {
 namespace asio {
 
diff --git a/modules/beast_core/text/StringArray.h b/modules/beast_core/text/StringArray.h
index 426b98ed4..1957fe9b4 100644
--- a/modules/beast_core/text/StringArray.h
+++ b/modules/beast_core/text/StringArray.h
@@ -35,7 +35,7 @@ namespace beast {
 
     @see String, StringPairArray
 */
-class StringArray : LeakChecked <StringArray>
+class StringArray
 {
 public:
     //==============================================================================