diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 70a6342b..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,4 +0,0 @@
-[submodule "docca"]
-	path = doc/docca
-	url = https://github.com/vinniefalco/docca.git
-    branch = .
diff --git a/doc/Jamfile b/doc/Jamfile
index 1df3373b..854a69cc 100644
--- a/doc/Jamfile
+++ b/doc/Jamfile
@@ -92,18 +92,19 @@ else
 #        an invocation of extract-xml-pages.xsl (which
 #        imports the former) must be run again.
 #
-make extract-xml-pages.xsl      : docca/include/docca/extract-xml-pages.xsl      : @copy_script ;
-make base-extract-xml-pages.xsl : docca/include/docca/base-extract-xml-pages.xsl : @copy_script ;
-make common.xsl                 : docca/include/docca/common.xsl                 : @copy_script ;
-make stage1.xsl                 : docca/include/docca/stage1.xsl                 : @copy_script ;
-make base-stage1.xsl            : docca/include/docca/base-stage1.xsl            : @copy_script ;
-make stage2.xsl                 : docca/include/docca/stage2.xsl                 : @copy_script ;
-make assemble-quickbook.xsl     : docca/include/docca/assemble-quickbook.xsl     : @copy_script ;
-make emphasized-types.xsl       : docca/include/docca/emphasized-types.xsl       : @copy_script ;
+path-constant docca : ../../../tools/docca ;
+make extract-xml-pages.xsl      : $(docca)/include/docca/extract-xml-pages.xsl      : @copy_script ;
+make base-extract-xml-pages.xsl : $(docca)/include/docca/base-extract-xml-pages.xsl : @copy_script ;
+make common.xsl                 : $(docca)/include/docca/common.xsl                 : @copy_script ;
+make stage1.xsl                 : $(docca)/include/docca/stage1.xsl                 : @copy_script ;
+make base-stage1.xsl            : $(docca)/include/docca/base-stage1.xsl            : @copy_script ;
+make stage2.xsl                 : $(docca)/include/docca/stage2.xsl                 : @copy_script ;
+make assemble-quickbook.xsl     : $(docca)/include/docca/assemble-quickbook.xsl     : @copy_script ;
+make emphasized-types.xsl       : $(docca)/include/docca/emphasized-types.xsl       : @copy_script ;
 
 make config.xsl
     :
-        docca/include/docca/config.xsl
+        $(docca)/include/docca/config.xsl
         xsl/config.xsl
         xsl/class_detail.xsl
         xsl/includes.xsl
diff --git a/doc/docca b/doc/docca
deleted file mode 160000
index 56f09f9f..00000000
--- a/doc/docca
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 56f09f9fda80dd15a5148db14cfe5fe5e508aedb
diff --git a/include/boost/beast/websocket/stream_base.hpp b/include/boost/beast/websocket/stream_base.hpp
index a214553f..8553e5a6 100644
--- a/include/boost/beast/websocket/stream_base.hpp
+++ b/include/boost/beast/websocket/stream_base.hpp
@@ -159,7 +159,12 @@ struct stream_base
         }
     };
 
-protected:
+private:
+    template<
+        class NextLayer,
+        bool deflateSupported>
+    friend class stream;
+
     enum class status
     {
         //none,