diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93a9d591..1f0f0a16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Version 151:
 WebSocket:
 
 * Control callback is invoked on the execution context
+* Add stream_fwd.hpp
 
 --------------------------------------------------------------------------------
 
diff --git a/include/boost/beast/websocket.hpp b/include/boost/beast/websocket.hpp
index 24b9d25e..551eaff4 100644
--- a/include/boost/beast/websocket.hpp
+++ b/include/boost/beast/websocket.hpp
@@ -16,6 +16,7 @@
 #include <boost/beast/websocket/option.hpp>
 #include <boost/beast/websocket/rfc6455.hpp>
 #include <boost/beast/websocket/stream.hpp>
+#include <boost/beast/websocket/stream_fwd.hpp>
 #include <boost/beast/websocket/teardown.hpp>
 
 #endif
diff --git a/include/boost/beast/websocket/stream.hpp b/include/boost/beast/websocket/stream.hpp
index 0e19e391..03fe853b 100644
--- a/include/boost/beast/websocket/stream.hpp
+++ b/include/boost/beast/websocket/stream.hpp
@@ -15,6 +15,7 @@
 #include <boost/beast/websocket/option.hpp>
 #include <boost/beast/websocket/role.hpp>
 #include <boost/beast/websocket/rfc6455.hpp>
+#include <boost/beast/websocket/stream_fwd.hpp>
 #include <boost/beast/websocket/detail/frame.hpp>
 #include <boost/beast/websocket/detail/hybi13.hpp>
 #include <boost/beast/websocket/detail/mask.hpp>
diff --git a/include/boost/beast/websocket/stream_fwd.hpp b/include/boost/beast/websocket/stream_fwd.hpp
new file mode 100644
index 00000000..d8e9778b
--- /dev/null
+++ b/include/boost/beast/websocket/stream_fwd.hpp
@@ -0,0 +1,27 @@
+//
+// Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+#ifndef BOOST_BEAST_WEBSOCKET_STREAM_FWD_HPP
+#define BOOST_BEAST_WEBSOCKET_STREAM_FWD_HPP
+
+#include <boost/beast/core/detail/config.hpp>
+
+namespace boost {
+namespace beast {
+namespace websocket {
+
+template<
+    class NextLayer>
+class stream;
+
+} // websocket
+} // beast
+} // boost
+
+#endif
diff --git a/test/beast/websocket/CMakeLists.txt b/test/beast/websocket/CMakeLists.txt
index a0fd7a1f..a9984897 100644
--- a/test/beast/websocket/CMakeLists.txt
+++ b/test/beast/websocket/CMakeLists.txt
@@ -31,6 +31,7 @@ add_executable (tests-beast-websocket
     rfc6455.cpp
     role.cpp
     stream.cpp
+    stream_fwd.cpp
     teardown.cpp
     utf8_checker.cpp
     write.cpp
diff --git a/test/beast/websocket/Jamfile b/test/beast/websocket/Jamfile
index 890562bc..e54d5b84 100644
--- a/test/beast/websocket/Jamfile
+++ b/test/beast/websocket/Jamfile
@@ -21,6 +21,7 @@ local SOURCES =
     rfc6455.cpp
     role.cpp
     stream.cpp
+    stream_fwd.cpp
     teardown.cpp
     utf8_checker.cpp
     write.cpp
diff --git a/test/beast/websocket/stream_fwd.cpp b/test/beast/websocket/stream_fwd.cpp
new file mode 100644
index 00000000..389436d8
--- /dev/null
+++ b/test/beast/websocket/stream_fwd.cpp
@@ -0,0 +1,11 @@
+//
+// Copyright (w) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+// Test that header file is self-contained.
+#include <boost/beast/websocket/stream_fwd.hpp>