diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13fb489f..1dade117 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+1.0.0-b33
+
+* Require Visual Studio 2015 Update 3 or later
+
+--------------------------------------------------------------------------------
+
 1.0.0-b32
 
 * Add io_service completion invariants test
diff --git a/README.md b/README.md
index 8706010a..1dcf4b52 100644
--- a/README.md
+++ b/README.md
@@ -76,6 +76,8 @@ The library has been submitted to the
 * Boost 1.58 or later
 * C++11 or later
 
+When using Microsoft Visual C++, Visual Studio 2015 Update 3 or later is required.
+
 These components are optionally required in order to build the
 tests and examples:
 
@@ -103,19 +105,27 @@ Boost.Coroutine library. Please visit the Boost documentation for
 instructions on how to do this for your particular build system.
 
 For the examples and tests, Beast provides build scripts for Boost.Build (bjam)
-and CMake. Developers using Microsoft Visual Studio can generate Visual Studio
+and CMake. It is possible to generate Microsoft Visual Studio or Apple
+Developers using Microsoft Visual Studio can generate Visual Studio
 project files by executing these commands from the root of the repository:
 
-
 ```
 cd bin
-cmake ..                                    # for 32-bit Windows build
+cmake ..                                    # for 32-bit Windows builds
 
 cd ../bin64
 cmake ..                                    # for Linux/Mac builds, OR
 cmake -G"Visual Studio 14 2015 Win64" ..    # for 64-bit Windows builds
 ```
 
+When using Apple Xcode it is possible to generate Xcode project files
+using these commands:
+
+```
+cd bin
+cmake -G Xcode ..                           # for Apple Xcode builds
+```
+
 To build with Boost.Build, it is necessary to have the bjam executable
 in your path. And bjam needs to know how to find the Boost sources. The
 easiest way to do this is make sure that the version of bjam in your path
diff --git a/include/beast/config.hpp b/include/beast/config.hpp
new file mode 100644
index 00000000..b87262c7
--- /dev/null
+++ b/include/beast/config.hpp
@@ -0,0 +1,27 @@
+//
+// Copyright (c) 2013-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)
+//
+
+#ifndef BEAST_CONFIG_HPP
+#define BEAST_CONFIG_HPP
+
+/*
+	_MSC_VER and _MSC_FULL_VER by version:
+
+	14.0 (2015)	        1900	190023026
+	14.0 (2015 Update 1)	1900	190023506
+	14.0 (2015 Update 2)	1900	190023918
+	14.0 (2015 Update 3)	1900	190024210
+*/
+
+#if defined(_MSC_FULL_VER)
+#if _MSC_FULL_VER < 190024210
+static_assert(false,
+	"This library requires Visual Studio 2015 Update 3 or later");
+#endif
+#endif
+
+#endif
diff --git a/include/beast/core.hpp b/include/beast/core.hpp
index ed777e54..9377cd99 100644
--- a/include/beast/core.hpp
+++ b/include/beast/core.hpp
@@ -8,6 +8,8 @@
 #ifndef BEAST_CORE_HPP
 #define BEAST_CORE_HPP
 
+#include <beast/config.hpp>
+
 #include <beast/core/async_completion.hpp>
 #include <beast/core/bind_handler.hpp>
 #include <beast/core/buffer_cat.hpp>
diff --git a/include/beast/core/async_completion.hpp b/include/beast/core/async_completion.hpp
index af5c67d2..8c7f64d9 100644
--- a/include/beast/core/async_completion.hpp
+++ b/include/beast/core/async_completion.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_ASYNC_COMPLETION_HPP
 #define BEAST_ASYNC_COMPLETION_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/handler_concepts.hpp>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/handler_type.hpp>
diff --git a/include/beast/core/bind_handler.hpp b/include/beast/core/bind_handler.hpp
index a9094abb..1b2d11da 100644
--- a/include/beast/core/bind_handler.hpp
+++ b/include/beast/core/bind_handler.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_BIND_HANDLER_HPP
 #define BEAST_BIND_HANDLER_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/handler_concepts.hpp>
 #include <beast/core/detail/bind_handler.hpp>
 #include <type_traits>
diff --git a/include/beast/core/buffer_cat.hpp b/include/beast/core/buffer_cat.hpp
index cd206262..a0c892a7 100644
--- a/include/beast/core/buffer_cat.hpp
+++ b/include/beast/core/buffer_cat.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_BUFFER_CAT_HPP
 #define BEAST_BUFFER_CAT_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/detail/buffer_cat.hpp>
 #include <boost/asio/buffer.hpp>
 #include <cstdint>
diff --git a/include/beast/core/buffer_concepts.hpp b/include/beast/core/buffer_concepts.hpp
index 5348724b..545689eb 100644
--- a/include/beast/core/buffer_concepts.hpp
+++ b/include/beast/core/buffer_concepts.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_BUFFER_CONCEPTS_HPP
 #define BEAST_BUFFER_CONCEPTS_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/detail/buffer_concepts.hpp>
 #include <boost/asio/buffer.hpp>
 #include <type_traits>
diff --git a/include/beast/core/buffers_adapter.hpp b/include/beast/core/buffers_adapter.hpp
index 9dadf7f1..36220d05 100644
--- a/include/beast/core/buffers_adapter.hpp
+++ b/include/beast/core/buffers_adapter.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_BUFFERS_ADAPTER_HPP
 #define BEAST_BUFFERS_ADAPTER_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/buffer_concepts.hpp>
 #include <boost/asio/buffer.hpp>
 #include <type_traits>
diff --git a/include/beast/core/consuming_buffers.hpp b/include/beast/core/consuming_buffers.hpp
index 8e09ac58..4d8d42a6 100644
--- a/include/beast/core/consuming_buffers.hpp
+++ b/include/beast/core/consuming_buffers.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_CONSUMING_BUFFERS_HPP
 #define BEAST_CONSUMING_BUFFERS_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/buffer_concepts.hpp>
 #include <boost/asio/buffer.hpp>
 #include <cstdint>
diff --git a/include/beast/core/dynabuf_readstream.hpp b/include/beast/core/dynabuf_readstream.hpp
index 622301cb..e914d434 100644
--- a/include/beast/core/dynabuf_readstream.hpp
+++ b/include/beast/core/dynabuf_readstream.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_DYNABUF_READSTREAM_HPP
 #define BEAST_DYNABUF_READSTREAM_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/async_completion.hpp>
 #include <beast/core/buffer_concepts.hpp>
 #include <beast/core/error.hpp>
diff --git a/include/beast/core/error.hpp b/include/beast/core/error.hpp
index 42248b87..b8c78687 100644
--- a/include/beast/core/error.hpp
+++ b/include/beast/core/error.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_ERROR_HPP
 #define BEAST_ERROR_HPP
 
+#include <beast/config.hpp>
 #include <boost/system/error_code.hpp>
 #include <boost/system/system_error.hpp>
 
diff --git a/include/beast/core/handler_alloc.hpp b/include/beast/core/handler_alloc.hpp
index 4037efc5..08a395c3 100644
--- a/include/beast/core/handler_alloc.hpp
+++ b/include/beast/core/handler_alloc.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HANDLER_ALLOC_HPP
 #define BEAST_HANDLER_ALLOC_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/handler_helpers.hpp>
 #include <cstdlib>
 #include <memory>
diff --git a/include/beast/core/handler_concepts.hpp b/include/beast/core/handler_concepts.hpp
index 2e3854d3..e118072a 100644
--- a/include/beast/core/handler_concepts.hpp
+++ b/include/beast/core/handler_concepts.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HANDLER_CONCEPTS_HPP
 #define BEAST_HANDLER_CONCEPTS_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/detail/is_call_possible.hpp>
 #include <type_traits>
 
diff --git a/include/beast/core/handler_helpers.hpp b/include/beast/core/handler_helpers.hpp
index 2ff589ad..53112e7f 100644
--- a/include/beast/core/handler_helpers.hpp
+++ b/include/beast/core/handler_helpers.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HANDLER_HELPERS_HPP
 #define BEAST_HANDLER_HELPERS_HPP
 
+#include <beast/config.hpp>
 #include <boost/asio/handler_alloc_hook.hpp>
 #include <boost/asio/handler_continuation_hook.hpp>
 #include <boost/asio/handler_invoke_hook.hpp>
diff --git a/include/beast/core/handler_ptr.hpp b/include/beast/core/handler_ptr.hpp
index 46dc5265..52650656 100644
--- a/include/beast/core/handler_ptr.hpp
+++ b/include/beast/core/handler_ptr.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HANDLER_PTR_HPP
 #define BEAST_HANDLER_PTR_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/detail/type_traits.hpp>
 #include <atomic>
 #include <cstdint>
diff --git a/include/beast/core/placeholders.hpp b/include/beast/core/placeholders.hpp
index 5272bb28..c1127789 100644
--- a/include/beast/core/placeholders.hpp
+++ b/include/beast/core/placeholders.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_PLACEHOLDERS_HPP
 #define BEAST_PLACEHOLDERS_HPP
 
+#include <beast/config.hpp>
 #include <functional>
 
 namespace beast {
diff --git a/include/beast/core/prepare_buffer.hpp b/include/beast/core/prepare_buffer.hpp
index 2d05aa31..ab0fae64 100644
--- a/include/beast/core/prepare_buffer.hpp
+++ b/include/beast/core/prepare_buffer.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_PREPARE_BUFFER_HPP
 #define BEAST_PREPARE_BUFFER_HPP
 
+#include <beast/config.hpp>
 #include <boost/asio/buffer.hpp>
 #include <algorithm>
 
diff --git a/include/beast/core/prepare_buffers.hpp b/include/beast/core/prepare_buffers.hpp
index 4f1d6f1a..7db31b5b 100644
--- a/include/beast/core/prepare_buffers.hpp
+++ b/include/beast/core/prepare_buffers.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_PREPARE_BUFFERS_HPP
 #define BEAST_PREPARE_BUFFERS_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/detail/prepare_buffers.hpp>
 #include <boost/asio/buffer.hpp>
 #include <algorithm>
diff --git a/include/beast/core/static_streambuf.hpp b/include/beast/core/static_streambuf.hpp
index 748111b0..75ced50a 100644
--- a/include/beast/core/static_streambuf.hpp
+++ b/include/beast/core/static_streambuf.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_STATIC_STREAMBUF_HPP
 #define BEAST_STATIC_STREAMBUF_HPP
 
+#include <beast/config.hpp>
 #include <boost/utility/base_from_member.hpp>
 #include <algorithm>
 #include <array>
diff --git a/include/beast/core/static_string.hpp b/include/beast/core/static_string.hpp
index 96e842ef..6ba5332c 100644
--- a/include/beast/core/static_string.hpp
+++ b/include/beast/core/static_string.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_WEBSOCKET_STATIC_STRING_HPP
 #define BEAST_WEBSOCKET_STATIC_STRING_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/detail/type_traits.hpp>
 #include <array>
 #include <cstdint>
diff --git a/include/beast/core/stream_concepts.hpp b/include/beast/core/stream_concepts.hpp
index 6e776573..5f0ba3ad 100644
--- a/include/beast/core/stream_concepts.hpp
+++ b/include/beast/core/stream_concepts.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_STREAM_CONCEPTS_HPP
 #define BEAST_STREAM_CONCEPTS_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/detail/stream_concepts.hpp>
 #include <type_traits>
 
diff --git a/include/beast/core/streambuf.hpp b/include/beast/core/streambuf.hpp
index 3683f68a..537094c1 100644
--- a/include/beast/core/streambuf.hpp
+++ b/include/beast/core/streambuf.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_STREAMBUF_HPP
 #define BEAST_STREAMBUF_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/detail/empty_base_optimization.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/intrusive/list.hpp>
diff --git a/include/beast/core/to_string.hpp b/include/beast/core/to_string.hpp
index 110022e0..e391ea2d 100644
--- a/include/beast/core/to_string.hpp
+++ b/include/beast/core/to_string.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_TO_STRING_HPP
 #define BEAST_TO_STRING_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/buffer_concepts.hpp>
 #include <boost/asio/buffer.hpp>
 #include <string>
diff --git a/include/beast/core/write_dynabuf.hpp b/include/beast/core/write_dynabuf.hpp
index 54c365a5..646e7874 100644
--- a/include/beast/core/write_dynabuf.hpp
+++ b/include/beast/core/write_dynabuf.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_WRITE_DYNABUF_HPP
 #define BEAST_WRITE_DYNABUF_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/buffer_concepts.hpp>
 #include <beast/core/detail/write_dynabuf.hpp>
 #include <type_traits>
diff --git a/include/beast/http.hpp b/include/beast/http.hpp
index a4bbfb52..b4c7734f 100644
--- a/include/beast/http.hpp
+++ b/include/beast/http.hpp
@@ -8,6 +8,8 @@
 #ifndef BEAST_HTTP_HPP
 #define BEAST_HTTP_HPP
 
+#include <beast/config.hpp>
+
 #include <beast/http/basic_fields.hpp>
 #include <beast/http/basic_parser_v1.hpp>
 #include <beast/http/chunk_encode.hpp>
diff --git a/include/beast/http/basic_dynabuf_body.hpp b/include/beast/http/basic_dynabuf_body.hpp
index d619cad6..a2c09014 100644
--- a/include/beast/http/basic_dynabuf_body.hpp
+++ b/include/beast/http/basic_dynabuf_body.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_BASIC_DYNABUF_BODY_HPP
 #define BEAST_HTTP_BASIC_DYNABUF_BODY_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/error.hpp>
 #include <beast/http/message.hpp>
 #include <beast/core/detail/type_traits.hpp>
diff --git a/include/beast/http/basic_fields.hpp b/include/beast/http/basic_fields.hpp
index 30913c8f..2589c827 100644
--- a/include/beast/http/basic_fields.hpp
+++ b/include/beast/http/basic_fields.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_BASIC_FIELDS_HPP
 #define BEAST_HTTP_BASIC_FIELDS_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/detail/empty_base_optimization.hpp>
 #include <beast/http/detail/basic_fields.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/include/beast/http/basic_parser_v1.hpp b/include/beast/http/basic_parser_v1.hpp
index 939cf2c6..cda14a00 100644
--- a/include/beast/http/basic_parser_v1.hpp
+++ b/include/beast/http/basic_parser_v1.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_BASIC_PARSER_v1_HPP
 #define BEAST_HTTP_BASIC_PARSER_v1_HPP
 
+#include <beast/config.hpp>
 #include <beast/http/message.hpp>
 #include <beast/http/parse_error.hpp>
 #include <beast/http/rfc7230.hpp>
diff --git a/include/beast/http/chunk_encode.hpp b/include/beast/http/chunk_encode.hpp
index fabdd1b5..a437fe18 100644
--- a/include/beast/http/chunk_encode.hpp
+++ b/include/beast/http/chunk_encode.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_CHUNK_ENCODE_HPP
 #define BEAST_HTTP_CHUNK_ENCODE_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/buffer_cat.hpp>
 #include <beast/http/detail/chunk_encode.hpp>
 #include <boost/asio/buffer.hpp>
diff --git a/include/beast/http/concepts.hpp b/include/beast/http/concepts.hpp
index 27185d0d..2e83fe7a 100644
--- a/include/beast/http/concepts.hpp
+++ b/include/beast/http/concepts.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_TYPE_CHECK_HPP
 #define BEAST_HTTP_TYPE_CHECK_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/error.hpp>
 #include <beast/core/detail/type_traits.hpp>
 #include <boost/asio/buffer.hpp>
diff --git a/include/beast/http/empty_body.hpp b/include/beast/http/empty_body.hpp
index 9aa372b8..40f549d9 100644
--- a/include/beast/http/empty_body.hpp
+++ b/include/beast/http/empty_body.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_EMPTY_BODY_HPP
 #define BEAST_HTTP_EMPTY_BODY_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/error.hpp>
 #include <beast/http/message.hpp>
 #include <beast/core/detail/type_traits.hpp>
diff --git a/include/beast/http/fields.hpp b/include/beast/http/fields.hpp
index 649fbf77..7c2ef2a5 100644
--- a/include/beast/http/fields.hpp
+++ b/include/beast/http/fields.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_FIELDS_HPP
 #define BEAST_HTTP_FIELDS_HPP
 
+#include <beast/config.hpp>
 #include <beast/http/basic_fields.hpp>
 #include <memory>
 
diff --git a/include/beast/http/header_parser_v1.hpp b/include/beast/http/header_parser_v1.hpp
index 40f53205..c6f732d2 100644
--- a/include/beast/http/header_parser_v1.hpp
+++ b/include/beast/http/header_parser_v1.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_HEADERS_PARSER_V1_HPP
 #define BEAST_HTTP_HEADERS_PARSER_V1_HPP
 
+#include <beast/config.hpp>
 #include <beast/http/basic_parser_v1.hpp>
 #include <beast/http/concepts.hpp>
 #include <beast/http/message.hpp>
diff --git a/include/beast/http/message.hpp b/include/beast/http/message.hpp
index 51cd8ae6..70cfbf19 100644
--- a/include/beast/http/message.hpp
+++ b/include/beast/http/message.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_MESSAGE_HPP
 #define BEAST_HTTP_MESSAGE_HPP
 
+#include <beast/config.hpp>
 #include <beast/http/fields.hpp>
 #include <beast/core/detail/integer_sequence.hpp>
 #include <memory>
diff --git a/include/beast/http/parse.hpp b/include/beast/http/parse.hpp
index b99fb57f..bcc8b0f5 100644
--- a/include/beast/http/parse.hpp
+++ b/include/beast/http/parse.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_PARSE_HPP
 #define BEAST_HTTP_PARSE_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/error.hpp>
 #include <beast/core/async_completion.hpp>
 
diff --git a/include/beast/http/parse_error.hpp b/include/beast/http/parse_error.hpp
index 3dfcc037..7b0dc08c 100644
--- a/include/beast/http/parse_error.hpp
+++ b/include/beast/http/parse_error.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_PARSE_ERROR_HPP
 #define BEAST_HTTP_PARSE_ERROR_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/error.hpp>
 
 namespace beast {
diff --git a/include/beast/http/parser_v1.hpp b/include/beast/http/parser_v1.hpp
index a86ac050..be1aed1e 100644
--- a/include/beast/http/parser_v1.hpp
+++ b/include/beast/http/parser_v1.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_PARSER_V1_HPP
 #define BEAST_HTTP_PARSER_V1_HPP
 
+#include <beast/config.hpp>
 #include <beast/http/concepts.hpp>
 #include <beast/http/header_parser_v1.hpp>
 #include <beast/http/message.hpp>
diff --git a/include/beast/http/read.hpp b/include/beast/http/read.hpp
index 59818036..54dd5796 100644
--- a/include/beast/http/read.hpp
+++ b/include/beast/http/read.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_READ_HPP
 #define BEAST_HTTP_READ_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/async_completion.hpp>
 #include <beast/core/error.hpp>
 #include <beast/http/message.hpp>
diff --git a/include/beast/http/reason.hpp b/include/beast/http/reason.hpp
index 1cdeced9..fce97e9d 100644
--- a/include/beast/http/reason.hpp
+++ b/include/beast/http/reason.hpp
@@ -8,6 +8,8 @@
 #ifndef BEAST_HTTP_REASON_HPP
 #define BEAST_HTTP_REASON_HPP
 
+#include <beast/config.hpp>
+
 namespace beast {
 namespace http {
 
diff --git a/include/beast/http/rfc7230.hpp b/include/beast/http/rfc7230.hpp
index defca9bf..1f73194d 100644
--- a/include/beast/http/rfc7230.hpp
+++ b/include/beast/http/rfc7230.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_RFC7230_HPP
 #define BEAST_HTTP_RFC7230_HPP
 
+#include <beast/config.hpp>
 #include <beast/http/detail/rfc7230.hpp>
 
 namespace beast {
diff --git a/include/beast/http/streambuf_body.hpp b/include/beast/http/streambuf_body.hpp
index 0e0186a9..974a3f3c 100644
--- a/include/beast/http/streambuf_body.hpp
+++ b/include/beast/http/streambuf_body.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_STREAMBUF_BODY_HPP
 #define BEAST_HTTP_STREAMBUF_BODY_HPP
 
+#include <beast/config.hpp>
 #include <beast/http/basic_dynabuf_body.hpp>
 #include <beast/core/streambuf.hpp>
 
diff --git a/include/beast/http/string_body.hpp b/include/beast/http/string_body.hpp
index df110403..707709c1 100644
--- a/include/beast/http/string_body.hpp
+++ b/include/beast/http/string_body.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_STRING_BODY_HPP
 #define BEAST_HTTP_STRING_BODY_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/error.hpp>
 #include <beast/http/message.hpp>
 #include <beast/core/detail/type_traits.hpp>
diff --git a/include/beast/http/write.hpp b/include/beast/http/write.hpp
index d5d7e1f2..b190e2e6 100644
--- a/include/beast/http/write.hpp
+++ b/include/beast/http/write.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_HTTP_WRITE_HPP
 #define BEAST_HTTP_WRITE_HPP
 
+#include <beast/config.hpp>
 #include <beast/http/message.hpp>
 #include <beast/core/error.hpp>
 #include <beast/core/async_completion.hpp>
diff --git a/include/beast/version.hpp b/include/beast/version.hpp
index ff8ab4fc..27c660c6 100644
--- a/include/beast/version.hpp
+++ b/include/beast/version.hpp
@@ -8,6 +8,8 @@
 #ifndef BEAST_VERSION_HPP
 #define BEAST_VERSION_HPP
 
+#include <beast/config.hpp>
+
 // follows http://semver.org
 
 //  BEAST_VERSION % 100 is the patch level
diff --git a/include/beast/websocket.hpp b/include/beast/websocket.hpp
index 55ec413b..1cec37cd 100644
--- a/include/beast/websocket.hpp
+++ b/include/beast/websocket.hpp
@@ -8,6 +8,8 @@
 #ifndef BEAST_WEBSOCKET_HPP
 #define BEAST_WEBSOCKET_HPP
 
+#include <beast/config.hpp>
+
 #include <beast/websocket/error.hpp>
 #include <beast/websocket/option.hpp>
 #include <beast/websocket/rfc6455.hpp>
diff --git a/include/beast/websocket/error.hpp b/include/beast/websocket/error.hpp
index b41e8d6d..8189a1c2 100644
--- a/include/beast/websocket/error.hpp
+++ b/include/beast/websocket/error.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_WEBSOCKET_ERROR_HPP
 #define BEAST_WEBSOCKET_ERROR_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/error.hpp>
 
 namespace beast {
diff --git a/include/beast/websocket/option.hpp b/include/beast/websocket/option.hpp
index 7d7ca602..005ae7b2 100644
--- a/include/beast/websocket/option.hpp
+++ b/include/beast/websocket/option.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_WEBSOCKET_OPTION_HPP
 #define BEAST_WEBSOCKET_OPTION_HPP
 
+#include <beast/config.hpp>
 #include <beast/websocket/rfc6455.hpp>
 #include <beast/websocket/detail/decorator.hpp>
 #include <beast/core/detail/type_traits.hpp>
diff --git a/include/beast/websocket/rfc6455.hpp b/include/beast/websocket/rfc6455.hpp
index de72e9c2..3acb11e5 100644
--- a/include/beast/websocket/rfc6455.hpp
+++ b/include/beast/websocket/rfc6455.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_WEBSOCKET_RFC6455_HPP
 #define BEAST_WEBSOCKET_RFC6455_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/static_string.hpp>
 #include <boost/optional.hpp>
 #include <array>
diff --git a/include/beast/websocket/ssl.hpp b/include/beast/websocket/ssl.hpp
index 39492959..d10dafdf 100644
--- a/include/beast/websocket/ssl.hpp
+++ b/include/beast/websocket/ssl.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_WEBSOCKET_SSL_HPP
 #define BEAST_WEBSOCKET_SSL_HPP
 
+#include <beast/config.hpp>
 #include <beast/websocket/teardown.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/stream.hpp>
diff --git a/include/beast/websocket/stream.hpp b/include/beast/websocket/stream.hpp
index 3a469c90..5f58042a 100644
--- a/include/beast/websocket/stream.hpp
+++ b/include/beast/websocket/stream.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_WEBSOCKET_STREAM_HPP
 #define BEAST_WEBSOCKET_STREAM_HPP
 
+#include <beast/config.hpp>
 #include <beast/websocket/option.hpp>
 #include <beast/websocket/detail/stream_base.hpp>
 #include <beast/http/message.hpp>
diff --git a/include/beast/websocket/teardown.hpp b/include/beast/websocket/teardown.hpp
index 6666d8f5..a4227976 100644
--- a/include/beast/websocket/teardown.hpp
+++ b/include/beast/websocket/teardown.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_WEBSOCKET_TEARDOWN_HPP
 #define BEAST_WEBSOCKET_TEARDOWN_HPP
 
+#include <beast/config.hpp>
 #include <beast/websocket/error.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <type_traits>
diff --git a/include/beast/zlib.hpp b/include/beast/zlib.hpp
index 80e3cf07..16bbb78f 100644
--- a/include/beast/zlib.hpp
+++ b/include/beast/zlib.hpp
@@ -8,6 +8,8 @@
 #ifndef BEAST_ZLIB_HPP
 #define BEAST_ZLIB_HPP
 
+#include <beast/config.hpp>
+
 #include <beast/zlib/deflate_stream.hpp>
 #include <beast/zlib/inflate_stream.hpp>
 
diff --git a/include/beast/zlib/deflate_stream.hpp b/include/beast/zlib/deflate_stream.hpp
index 31fd5735..aae355d0 100644
--- a/include/beast/zlib/deflate_stream.hpp
+++ b/include/beast/zlib/deflate_stream.hpp
@@ -35,6 +35,7 @@
 #ifndef BEAST_ZLIB_DEFLATE_STREAM_HPP
 #define BEAST_ZLIB_DEFLATE_STREAM_HPP
 
+#include <beast/config.hpp>
 #include <beast/zlib/error.hpp>
 #include <beast/zlib/zlib.hpp>
 #include <beast/zlib/detail/deflate_stream.hpp>
diff --git a/include/beast/zlib/error.hpp b/include/beast/zlib/error.hpp
index 489d0922..d593917b 100644
--- a/include/beast/zlib/error.hpp
+++ b/include/beast/zlib/error.hpp
@@ -35,6 +35,7 @@
 #ifndef BEAST_ZLIB_ERROR_HPP
 #define BEAST_ZLIB_ERROR_HPP
 
+#include <beast/config.hpp>
 #include <beast/core/error.hpp>
 
 namespace beast {
diff --git a/include/beast/zlib/inflate_stream.hpp b/include/beast/zlib/inflate_stream.hpp
index 6f2b49e9..e6c42021 100644
--- a/include/beast/zlib/inflate_stream.hpp
+++ b/include/beast/zlib/inflate_stream.hpp
@@ -35,6 +35,7 @@
 #ifndef BEAST_ZLIB_INFLATE_STREAM_HPP
 #define BEAST_ZLIB_INFLATE_STREAM_HPP
 
+#include <beast/config.hpp>
 #include <beast/zlib/detail/inflate_stream.hpp>
 
 namespace beast {
diff --git a/include/beast/zlib/zlib.hpp b/include/beast/zlib/zlib.hpp
index e038998f..b06f679e 100644
--- a/include/beast/zlib/zlib.hpp
+++ b/include/beast/zlib/zlib.hpp
@@ -35,6 +35,7 @@
 #ifndef BEAST_ZLIB_ZLIB_HPP
 #define BEAST_ZLIB_ZLIB_HPP
 
+#include <beast/config.hpp>
 #include <cstdint>
 #include <cstdlib>
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 740e4c7a..ff15cb4d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -8,6 +8,7 @@ add_executable (lib-tests
     ${BEAST_INCLUDES}
     ${EXTRAS_INCLUDES}
     ../extras/beast/unit_test/main.cpp
+    config.cpp
     core.cpp
     http.cpp
     version.cpp
diff --git a/test/Jamfile b/test/Jamfile
index 52f7b69d..018ec76f 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -7,6 +7,7 @@
 
 import os ;
 
+compile config.cpp : : ;
 compile core.cpp : : ;
 compile http.cpp : : ;
 compile version.cpp : : ;
diff --git a/test/config.cpp b/test/config.cpp
new file mode 100644
index 00000000..7b9efac2
--- /dev/null
+++ b/test/config.cpp
@@ -0,0 +1,9 @@
+//
+// Copyright (c) 2013-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)
+//
+
+// Test that header file is self-contained.
+#include <beast/config.hpp>