diff --git a/Builds/VisualStudio2013/Beast.props b/Builds/VisualStudio2013/Beast.props
index f1c7c4534..1a08f4920 100644
--- a/Builds/VisualStudio2013/Beast.props
+++ b/Builds/VisualStudio2013/Beast.props
@@ -2,16 +2,16 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-    <RepoDir>..\..</RepoDir>
+    <RepoDir>$(ProjectDir)\..\..\</RepoDir>
   </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>BEAST_INCLUDE_BEASTCONFIG=1;_CRTDBG_MAP_ALLOC;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>BEAST_INCLUDE_BEASTCONFIG=0;_CRTDBG_MAP_ALLOC;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
   </ItemDefinitionGroup>
diff --git a/beast/Arithmetic.h b/beast/Arithmetic.h
index bcbadc43d..a23b92650 100644
--- a/beast/Arithmetic.h
+++ b/beast/Arithmetic.h
@@ -24,9 +24,9 @@
 #ifndef BEAST_ARITHMETIC_H_INCLUDED
 #define BEAST_ARITHMETIC_H_INCLUDED
 
-#include "Config.h"
+#include <beast/Config.h>
 
-#include "utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 
 #include <cmath>
 #include <cstdint>
diff --git a/beast/Atomic.h b/beast/Atomic.h
index ffeb82a69..fcae075f4 100644
--- a/beast/Atomic.h
+++ b/beast/Atomic.h
@@ -24,10 +24,10 @@
 #ifndef BEAST_ATOMIC_H_INCLUDED
 #define BEAST_ATOMIC_H_INCLUDED
 
-#include "Config.h"
-#include "StaticAssert.h"
+#include <beast/Config.h>
+#include <beast/StaticAssert.h>
 
-#include "utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 
 #include <cstdint>
 
diff --git a/beast/Boost.h b/beast/Boost.h
index 708b63ab3..4746c0a87 100644
--- a/beast/Boost.h
+++ b/beast/Boost.h
@@ -22,6 +22,6 @@
 
 // These classes require boost in order to be used.
 
-#include "boost/ErrorCode.h"
+#include <beast/boost/ErrorCode.h>
 
 #endif
diff --git a/beast/ByteOrder.h b/beast/ByteOrder.h
index e17736d34..2bd069388 100644
--- a/beast/ByteOrder.h
+++ b/beast/ByteOrder.h
@@ -24,8 +24,8 @@
 #ifndef BEAST_BYTEORDER_H_INCLUDED
 #define BEAST_BYTEORDER_H_INCLUDED
 
-#include "Config.h"
-#include "Uncopyable.h"
+#include <beast/Config.h>
+#include <beast/Uncopyable.h>
 
 #include <cstdint>
 
diff --git a/beast/Chrono.h b/beast/Chrono.h
index 3e8b4220d..6aea7d82a 100644
--- a/beast/Chrono.h
+++ b/beast/Chrono.h
@@ -20,13 +20,13 @@
 #ifndef BEAST_CHRONO_H_INCLUDED
 #define BEAST_CHRONO_H_INCLUDED
 
-#include "chrono/abstract_clock.h"
-#include "chrono/basic_seconds_clock.h"
-#include "chrono/chrono_io.h"
-#include "chrono/chrono_util.h"
-#include "chrono/manual_clock.h"
-#include "chrono/ratio_io.h"
+#include <beast/chrono/abstract_clock.h>
+#include <beast/chrono/basic_seconds_clock.h>
+#include <beast/chrono/chrono_io.h>
+#include <beast/chrono/chrono_util.h>
+#include <beast/chrono/manual_clock.h>
+#include <beast/chrono/ratio_io.h>
 
-#include "chrono/RelativeTime.h"
+#include <beast/chrono/RelativeTime.h>
 
 #endif
diff --git a/beast/Config.h b/beast/Config.h
index b145d9fa3..0170f92ec 100644
--- a/beast/Config.h
+++ b/beast/Config.h
@@ -30,34 +30,34 @@
 #define BOOST_ASIO_HAS_STD_ARRAY 1
 
 #if !defined(BEAST_COMPILER_CONFIG) && !defined(BEAST_NO_COMPILER_CONFIG) && !defined(BEAST_NO_CONFIG)
-#include "config/SelectCompilerConfig.h"
+#include <beast/config/SelectCompilerConfig.h>
 #endif
 #ifdef   BEAST_COMPILER_CONFIG
 #include BEAST_COMPILER_CONFIG
 #endif
 
 #if !defined(BEAST_STDLIB_CONFIG) && !defined(BEAST_NO_STDLIB_CONFIG) && !defined(BEAST_NO_CONFIG) && defined(__cplusplus)
-#include "config/SelectStdlibConfig.h"
+#include <beast/config/SelectStdlibConfig.h>
 #endif
 #ifdef   BEAST_STDLIB_CONFIG
 #include BEAST_STDLIB_CONFIG
 #endif
 
 #if !defined(BEAST_PLATFORM_CONFIG) && !defined(BEAST_NO_PLATFORM_CONFIG) && !defined(BEAST_NO_CONFIG)
-#include "config/SelectCompilerConfig.h"
+#include <beast/config/SelectCompilerConfig.h>
 #endif
 #ifdef   BEAST_PLATFORM_CONFIG
 #include BEAST_PLATFORM_CONFIG
 #endif
 
 // Legacy
-#include "Version.h"
-#include "config/PlatformConfig.h"
-#include "config/CompilerConfig.h"
-#include "config/StandardConfig.h"
-#include "config/ConfigCheck.h"
+#include <beast/Version.h>
+#include <beast/config/PlatformConfig.h>
+#include <beast/config/CompilerConfig.h>
+#include <beast/config/StandardConfig.h>
+#include <beast/config/ConfigCheck.h>
 
 // Suffix
-#include "config/Suffix.h"
+#include <beast/config/Suffix.h>
     
 #endif
diff --git a/beast/Crypto.h b/beast/Crypto.h
index c84425be5..27e79e04c 100644
--- a/beast/Crypto.h
+++ b/beast/Crypto.h
@@ -20,11 +20,11 @@
 #ifndef BEAST_CRYPTO_H_INCLUDED
 #define BEAST_CRYPTO_H_INCLUDED
 
-#include "crypto/BinaryEncoding.h"
-#include "crypto/MurmurHash.h"
-#include "crypto/Sha256.h"
-#include "crypto/UnsignedInteger.h"
-#include "crypto/UnsignedIntegerCalc.h"
+#include <beast/crypto/BinaryEncoding.h>
+#include <beast/crypto/MurmurHash.h>
+#include <beast/crypto/Sha256.h>
+#include <beast/crypto/UnsignedInteger.h>
+#include <beast/crypto/UnsignedIntegerCalc.h>
 
 #endif
 
diff --git a/beast/HeapBlock.h b/beast/HeapBlock.h
index 9fdea3e98..cbbe097cf 100644
--- a/beast/HeapBlock.h
+++ b/beast/HeapBlock.h
@@ -28,8 +28,8 @@
 #include <cstdlib>
 #include <stdexcept>
 
-#include "Memory.h"
-#include "Uncopyable.h"
+#include <beast/Memory.h>
+#include <beast/Uncopyable.h>
 
 // If the MSVC debug heap headers were included, disable
 // the macros during the juce include since they conflict.
diff --git a/beast/Insight.h b/beast/Insight.h
index 2ec5b42ed..25c456827 100644
--- a/beast/Insight.h
+++ b/beast/Insight.h
@@ -20,18 +20,18 @@
 #ifndef BEAST_INSIGHT_H_INCLUDED
 #define BEAST_INSIGHT_H_INCLUDED
 
-#include "insight/Counter.h"
-#include "insight/CounterImpl.h"
-#include "insight/Event.h"
-#include "insight/EventImpl.h"
-#include "insight/Gauge.h"
-#include "insight/GaugeImpl.h"
-#include "insight/Group.h"
-#include "insight/Groups.h"
-#include "insight/Hook.h"
-#include "insight/HookImpl.h"
-#include "insight/Collector.h"
-#include "insight/NullCollector.h"
-#include "insight/StatsDCollector.h"
+#include <beast/insight/Counter.h>
+#include <beast/insight/CounterImpl.h>
+#include <beast/insight/Event.h>
+#include <beast/insight/EventImpl.h>
+#include <beast/insight/Gauge.h>
+#include <beast/insight/GaugeImpl.h>
+#include <beast/insight/Group.h>
+#include <beast/insight/Groups.h>
+#include <beast/insight/Hook.h>
+#include <beast/insight/HookImpl.h>
+#include <beast/insight/Collector.h>
+#include <beast/insight/NullCollector.h>
+#include <beast/insight/StatsDCollector.h>
 
 #endif
diff --git a/beast/Intrusive.h b/beast/Intrusive.h
index 89a3ace3b..2932453c5 100644
--- a/beast/Intrusive.h
+++ b/beast/Intrusive.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_INTRUSIVE_H_INCLUDED
 #define BEAST_INTRUSIVE_H_INCLUDED
 
-#include "intrusive/List.h"
-#include "intrusive/LockFreeStack.h"
+#include <beast/intrusive/List.h>
+#include <beast/intrusive/LockFreeStack.h>
 
 #endif
diff --git a/beast/Memory.h b/beast/Memory.h
index adb3717f2..e84e0e682 100644
--- a/beast/Memory.h
+++ b/beast/Memory.h
@@ -26,8 +26,8 @@
 
 #include <cstring>
     
-#include "Config.h"
-#include "Uncopyable.h"
+#include <beast/Config.h>
+#include <beast/Uncopyable.h>
 
 namespace beast {
 
diff --git a/beast/SmartPtr.h b/beast/SmartPtr.h
index 13aab726a..c1f91ff0c 100644
--- a/beast/SmartPtr.h
+++ b/beast/SmartPtr.h
@@ -20,11 +20,11 @@
 #ifndef BEAST_SMARTPTR_H_INCLUDED
 #define BEAST_SMARTPTR_H_INCLUDED
 
-#include "Config.h"
+#include <beast/Config.h>
 
-#include "smart_ptr/ContainerDeletePolicy.h"
-#include "smart_ptr/SharedObject.h"
-#include "smart_ptr/SharedPtr.h"
-#include "smart_ptr/ScopedPointer.h"
+#include <beast/smart_ptr/ContainerDeletePolicy.h>
+#include <beast/smart_ptr/SharedObject.h>
+#include <beast/smart_ptr/SharedPtr.h>
+#include <beast/smart_ptr/ScopedPointer.h>
 
 #endif
diff --git a/beast/Strings.h b/beast/Strings.h
index 5b7616240..b7fa03311 100644
--- a/beast/Strings.h
+++ b/beast/Strings.h
@@ -20,8 +20,8 @@
 #ifndef BEAST_STRINGS_H_INCLUDED
 #define BEAST_STRINGS_H_INCLUDED
 
-#include "strings/String.h"
-#include "strings/NewLine.h"
+#include <beast/strings/String.h>
+#include <beast/strings/NewLine.h>
 
 #endif
 
diff --git a/beast/Threads.h b/beast/Threads.h
index 756376a2f..9f349151a 100644
--- a/beast/Threads.h
+++ b/beast/Threads.h
@@ -20,19 +20,19 @@
 #ifndef BEAST_THREADS_H_INCLUDED
 #define BEAST_THREADS_H_INCLUDED
 
-#include "threads/UnlockGuard.h"
-#include "threads/TryLockGuard.h"
-#include "threads/SharedLockGuard.h"
-#include "threads/SharedMutexAdapter.h"
-#include "threads/SharedData.h"
-#include "threads/ServiceQueue.h"
-#include "threads/SpinLock.h"
-#include "threads/Stoppable.h"
-#include "threads/Thread.h"
-#include "threads/ThreadLocalValue.h"
-#include "threads/WaitableEvent.h"
-#include "threads/ScopedWrapperContext.h"
+#include <beast/threads/UnlockGuard.h>
+#include <beast/threads/TryLockGuard.h>
+#include <beast/threads/SharedLockGuard.h>
+#include <beast/threads/SharedMutexAdapter.h>
+#include <beast/threads/SharedData.h>
+#include <beast/threads/ServiceQueue.h>
+#include <beast/threads/SpinLock.h>
+#include <beast/threads/Stoppable.h>
+#include <beast/threads/Thread.h>
+#include <beast/threads/ThreadLocalValue.h>
+#include <beast/threads/WaitableEvent.h>
+#include <beast/threads/ScopedWrapperContext.h>
 
-#include "threads/semaphore.h"
+#include <beast/threads/semaphore.h>
 
 #endif
diff --git a/beast/asio/Asio.unity.cpp b/beast/asio/Asio.unity.cpp
index 4f964be9b..dbe4b458d 100644
--- a/beast/asio/Asio.unity.cpp
+++ b/beast/asio/Asio.unity.cpp
@@ -18,15 +18,15 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "impl/IPAddressConversion.cpp"
+#include <beast/asio/impl/IPAddressConversion.cpp>
 
-#include "tests/wrap_handler.test.cpp"
-#include "tests/bind_handler.test.cpp"
-#include "tests/enable_wait_for_async.test.cpp"
-#include "tests/shared_handler.test.cpp"
+#include <beast/asio/tests/wrap_handler.test.cpp>
+#include <beast/asio/tests/bind_handler.test.cpp>
+#include <beast/asio/tests/enable_wait_for_async.test.cpp>
+#include <beast/asio/tests/shared_handler.test.cpp>
 
-#include "abstract_socket.cpp" // TEMPORARY!
+#include <beast/asio/abstract_socket.cpp> // TEMPORARY!
 
diff --git a/beast/asio/IPAddressConversion.h b/beast/asio/IPAddressConversion.h
index 182691c04..13572340b 100644
--- a/beast/asio/IPAddressConversion.h
+++ b/beast/asio/IPAddressConversion.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_ASIO_IPADDRESSCONVERSION_H_INCLUDED
 #define BEAST_ASIO_IPADDRESSCONVERSION_H_INCLUDED
 
-#include "../net/IPEndpoint.h"
+#include <beast/net/IPEndpoint.h>
 
 #include <sstream>
 
diff --git a/beast/asio/abstract_socket.cpp b/beast/asio/abstract_socket.cpp
index ba2e950e3..dfd542db5 100644
--- a/beast/asio/abstract_socket.cpp
+++ b/beast/asio/abstract_socket.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include "abstract_socket.h"
-#include "bind_handler.h"
+#include <beast/asio/abstract_socket.h>
+#include <beast/asio/bind_handler.h>
 
 namespace beast {
 namespace asio {
diff --git a/beast/asio/abstract_socket.h b/beast/asio/abstract_socket.h
index 9900e184d..ec3c5cbcd 100644
--- a/beast/asio/abstract_socket.h
+++ b/beast/asio/abstract_socket.h
@@ -20,8 +20,8 @@
 #ifndef BEAST_ASIO_ABSTRACT_SOCKET_H_INCLUDED
 #define BEAST_ASIO_ABSTRACT_SOCKET_H_INCLUDED
 
-#include "buffer_sequence.h"
-#include "shared_handler.h"
+#include <beast/asio/buffer_sequence.h>
+#include <beast/asio/shared_handler.h>
 
 #include <boost/asio/socket_base.hpp>
 #include <boost/asio/ssl/stream_base.hpp>
diff --git a/beast/asio/bind_handler.h b/beast/asio/bind_handler.h
index d2ce51f1e..778b37230 100644
--- a/beast/asio/bind_handler.h
+++ b/beast/asio/bind_handler.h
@@ -25,8 +25,8 @@
 #include <boost/asio/detail/handler_invoke_helpers.hpp>
 
 #include <functional>
-#include "../cxx14/type_traits.h" // <type_traits>
-#include "../cxx14/utility.h" // <utility>
+#include <beast/cxx14/type_traits.h> // <type_traits>
+#include <beast/cxx14/utility.h> // <utility>
 
 namespace beast {
 namespace asio {
diff --git a/beast/asio/buffer_sequence.h b/beast/asio/buffer_sequence.h
index 19489fbf6..d2259eba6 100644
--- a/beast/asio/buffer_sequence.h
+++ b/beast/asio/buffer_sequence.h
@@ -22,10 +22,10 @@
 
 #include <boost/asio/buffer.hpp>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <algorithm>
 #include <iterator>
-#include "../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 #include <vector>
 
 namespace beast {
diff --git a/beast/asio/enable_wait_for_async.h b/beast/asio/enable_wait_for_async.h
index bdd3f83a3..2ba0a796d 100644
--- a/beast/asio/enable_wait_for_async.h
+++ b/beast/asio/enable_wait_for_async.h
@@ -20,9 +20,9 @@
 #ifndef BEAST_ASIO_ENABLE_WAIT_FOR_ASYNC_H_INCLUDED
 #define BEAST_ASIO_ENABLE_WAIT_FOR_ASYNC_H_INCLUDED
 
-#include "wrap_handler.h"
+#include <beast/asio/wrap_handler.h>
 
-#include "../utility/is_call_possible.h"
+#include <beast/utility/is_call_possible.h>
 
 #include <boost/asio/detail/handler_alloc_helpers.hpp>
 #include <boost/asio/detail/handler_cont_helpers.hpp>
@@ -31,7 +31,7 @@
 #include <atomic>
 #include <condition_variable>
 #include <mutex>
-#include "../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 
 namespace beast {
 namespace asio {
diff --git a/beast/asio/impl/IPAddressConversion.cpp b/beast/asio/impl/IPAddressConversion.cpp
index d97f3811f..70f61c69a 100644
--- a/beast/asio/impl/IPAddressConversion.cpp
+++ b/beast/asio/impl/IPAddressConversion.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include "../IPAddressConversion.h"
+#include <beast/asio/IPAddressConversion.h>
 
 namespace beast {
 namespace IP {
diff --git a/beast/asio/memory_buffer.h b/beast/asio/memory_buffer.h
index 7f43be1bf..f77568783 100644
--- a/beast/asio/memory_buffer.h
+++ b/beast/asio/memory_buffer.h
@@ -20,11 +20,11 @@
 #ifndef BEAST_ASIO_MEMORY_BUFFER_H_INCLUDED
 #define BEAST_ASIO_MEMORY_BUFFER_H_INCLUDED
 
-#include "../utility/empty_base_optimization.h"
+#include <beast/utility/empty_base_optimization.h>
 
 #include <boost/asio/buffer.hpp>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <cstddef>
 #include <memory>
 #include <type_traits>
diff --git a/beast/asio/shared_handler.h b/beast/asio/shared_handler.h
index 58e8e2c46..bc8a149a3 100644
--- a/beast/asio/shared_handler.h
+++ b/beast/asio/shared_handler.h
@@ -20,19 +20,19 @@
 #ifndef BEAST_ASIO_SHARED_HANDLER_H_INCLUDED
 #define BEAST_ASIO_SHARED_HANDLER_H_INCLUDED
 
-#include "../Config.h"
+#include <beast/Config.h>
 
-#include "../utility/is_call_possible.h"
+#include <beast/utility/is_call_possible.h>
 
 #include <boost/utility/base_from_member.hpp>
 #include <boost/asio/detail/handler_alloc_helpers.hpp>
 #include <boost/asio/detail/handler_cont_helpers.hpp>
 #include <boost/asio/detail/handler_invoke_helpers.hpp>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <functional>
 #include <memory>
-#include "../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 
 #ifndef BEAST_ASIO_NO_ALLOCATE_SHARED
 #define BEAST_ASIO_NO_ALLOCATE_SHARED 0
diff --git a/beast/asio/socket_wrapper.h b/beast/asio/socket_wrapper.h
index c5df18f53..2b07c0b43 100644
--- a/beast/asio/socket_wrapper.h
+++ b/beast/asio/socket_wrapper.h
@@ -20,10 +20,10 @@
 #ifndef BEAST_ASIO_SOCKET_WRAPPER_H_INCLUDED
 #define BEAST_ASIO_SOCKET_WRAPPER_H_INCLUDED
 
-#include "abstract_socket.h"
-#include "bind_handler.h"
+#include <beast/asio/abstract_socket.h>
+#include <beast/asio/bind_handler.h>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 
 namespace beast {
 namespace asio {
diff --git a/beast/asio/tests/bind_handler.test.cpp b/beast/asio/tests/bind_handler.test.cpp
index 34c1001af..551d32756 100644
--- a/beast/asio/tests/bind_handler.test.cpp
+++ b/beast/asio/tests/bind_handler.test.cpp
@@ -20,12 +20,12 @@
 // LIBS: boost_system
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
-#include "../bind_handler.h"
+#include <beast/asio/bind_handler.h>
 
 #include <functional>
 
diff --git a/beast/asio/tests/enable_wait_for_async.test.cpp b/beast/asio/tests/enable_wait_for_async.test.cpp
index f09f53e44..fd529fed4 100644
--- a/beast/asio/tests/enable_wait_for_async.test.cpp
+++ b/beast/asio/tests/enable_wait_for_async.test.cpp
@@ -18,13 +18,13 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
-#include "../bind_handler.h"
-#include "../enable_wait_for_async.h"
+#include <beast/asio/bind_handler.h>
+#include <beast/asio/enable_wait_for_async.h>
 
 #include <boost/asio/io_service.hpp>
 
diff --git a/beast/asio/tests/shared_handler.test.cpp b/beast/asio/tests/shared_handler.test.cpp
index 686c0f08a..d32ef1961 100644
--- a/beast/asio/tests/shared_handler.test.cpp
+++ b/beast/asio/tests/shared_handler.test.cpp
@@ -18,12 +18,12 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
-#include "../shared_handler.h"
+#include <beast/asio/shared_handler.h>
 
 // Disables is_constructible tests for std::function
 // Visual Studio std::function fails the is_constructible tests
diff --git a/beast/asio/tests/wrap_handler.test.cpp b/beast/asio/tests/wrap_handler.test.cpp
index be72dbb02..8c3fe0a8b 100644
--- a/beast/asio/tests/wrap_handler.test.cpp
+++ b/beast/asio/tests/wrap_handler.test.cpp
@@ -18,12 +18,12 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
-#include "../wrap_handler.h"
+#include <beast/asio/wrap_handler.h>
 
 #include <boost/version.hpp>
 
diff --git a/beast/asio/wrap_handler.h b/beast/asio/wrap_handler.h
index 02ee7895f..4bda7f4b9 100644
--- a/beast/asio/wrap_handler.h
+++ b/beast/asio/wrap_handler.h
@@ -24,7 +24,7 @@
 #include <boost/asio/detail/handler_cont_helpers.hpp>
 #include <boost/asio/detail/handler_invoke_helpers.hpp>
 
-#include "../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 #include <utility>
 
 namespace beast {
diff --git a/beast/boost/Boost.unity.cpp b/beast/boost/Boost.unity.cpp
index f692682bf..042d7f2e2 100644
--- a/beast/boost/Boost.unity.cpp
+++ b/beast/boost/Boost.unity.cpp
@@ -18,10 +18,10 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "ErrorCode.h"
+#include <beast/boost/ErrorCode.h>
 
 namespace detail {
 
diff --git a/beast/chrono/Chrono.unity.cpp b/beast/chrono/Chrono.unity.cpp
index 4306d7e80..0dcc37d3e 100644
--- a/beast/chrono/Chrono.unity.cpp
+++ b/beast/chrono/Chrono.unity.cpp
@@ -18,13 +18,13 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "../Config.h"
+#include <beast/Config.h>
 
-#include "impl/chrono_io.cpp"
-#include "impl/RelativeTime.cpp"
+#include <beast/chrono/impl/chrono_io.cpp>
+#include <beast/chrono/impl/RelativeTime.cpp>
 
-#include "tests/abstract_clock.test.cpp"
-#include "tests/basic_seconds_clock.test.cpp"
+#include <beast/chrono/tests/abstract_clock.test.cpp>
+#include <beast/chrono/tests/basic_seconds_clock.test.cpp>
diff --git a/beast/chrono/RelativeTime.h b/beast/chrono/RelativeTime.h
index b4e849f0b..f54346db2 100644
--- a/beast/chrono/RelativeTime.h
+++ b/beast/chrono/RelativeTime.h
@@ -24,10 +24,10 @@
 #ifndef BEAST_CHRONO_RELATIVETIME_H_INCLUDED
 #define BEAST_CHRONO_RELATIVETIME_H_INCLUDED
 
-#include "../Config.h"
-#include "../strings/String.h"
+#include <beast/Config.h>
+#include <beast/strings/String.h>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <string>
 #include <sstream>
 
diff --git a/beast/chrono/abstract_clock_io.h b/beast/chrono/abstract_clock_io.h
index bd2ad9931..45f9dd815 100644
--- a/beast/chrono/abstract_clock_io.h
+++ b/beast/chrono/abstract_clock_io.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CHRONO_ABSTRACT_CLOCK_IO_H_INCLUDED
 #define BEAST_CHRONO_ABSTRACT_CLOCK_IO_H_INCLUDED
 
-#include "chrono_io.h"
+#include <beast/chrono/chrono_io.h>
 
 namespace beast {
 
diff --git a/beast/chrono/basic_seconds_clock.h b/beast/chrono/basic_seconds_clock.h
index 42db9ab95..bc8154f44 100644
--- a/beast/chrono/basic_seconds_clock.h
+++ b/beast/chrono/basic_seconds_clock.h
@@ -39,22 +39,22 @@
 #endif
 
 #if BEAST_BASIC_SECONDS_CLOCK_BOOST_WORKAROUND
-# include <boost/version.hpp>
+#include <boost/version.hpp>
 # if BOOST_VERSION >= 105500
-#  include <boost/thread/thread.hpp>
-#  include <boost/thread/mutex.hpp>
-#  include <boost/thread/condition_variable.hpp>
-#  include <boost/chrono.hpp>
+#include <boost/thread/thread.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/condition_variable.hpp>
+#include <boost/chrono.hpp>
 # else
 #  error "Boost version 1.55.0 or later is required"
 # endif
 #else
-# include <condition_variable>
-# include <mutex>
-# include <thread>
+#include <condition_variable>
+#include <mutex>
+#include <thread>
 #endif
 
-#include "../chrono/chrono_util.h"
+#include <beast/chrono/chrono_util.h>
 
 namespace beast {
 
diff --git a/beast/chrono/chrono_io.h b/beast/chrono/chrono_io.h
index 151297f1e..a17cd4aea 100644
--- a/beast/chrono/chrono_io.h
+++ b/beast/chrono/chrono_io.h
@@ -27,9 +27,9 @@
 #ifndef BEAST_CHRONO_CHRONO_IO_H_INCLUDED
 #define BEAST_CHRONO_CHRONO_IO_H_INCLUDED
 
-#include "../Config.h"
+#include <beast/Config.h>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <ctime>
 #include <locale>
 
@@ -156,7 +156,7 @@ template <class charT, class Traits, class Duration>
 */
 
 #include <chrono>
-#include "ratio_io.h"
+#include <beast/chrono/ratio_io.h>
 
 //_LIBCPP_BEGIN_NAMESPACE_STD
 namespace std {
diff --git a/beast/chrono/impl/RelativeTime.cpp b/beast/chrono/impl/RelativeTime.cpp
index 853940bb3..caf8131ba 100644
--- a/beast/chrono/impl/RelativeTime.cpp
+++ b/beast/chrono/impl/RelativeTime.cpp
@@ -21,7 +21,7 @@
 */
 //==============================================================================
 
-#include "../RelativeTime.h"
+#include <beast/chrono/RelativeTime.h>
 
 // VFALCO TODO Migrate the localizable strings interfaces for this file
 
diff --git a/beast/chrono/impl/chrono_io.cpp b/beast/chrono/impl/chrono_io.cpp
index b6004bb6e..6be910470 100644
--- a/beast/chrono/impl/chrono_io.cpp
+++ b/beast/chrono/impl/chrono_io.cpp
@@ -24,7 +24,7 @@
 //  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt).
 
-#include "../chrono_io.h"
+#include <beast/chrono/chrono_io.h>
 
 //_LIBCPP_BEGIN_NAMESPACE_STD
 namespace std {
diff --git a/beast/chrono/manual_clock.h b/beast/chrono/manual_clock.h
index 8342c7d4f..24dd9ddd8 100644
--- a/beast/chrono/manual_clock.h
+++ b/beast/chrono/manual_clock.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED
 #define BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED
 
-#include "abstract_clock.h"
+#include <beast/chrono/abstract_clock.h>
 
 namespace beast {
 
diff --git a/beast/chrono/tests/abstract_clock.test.cpp b/beast/chrono/tests/abstract_clock.test.cpp
index e84925271..5bf4493ab 100644
--- a/beast/chrono/tests/abstract_clock.test.cpp
+++ b/beast/chrono/tests/abstract_clock.test.cpp
@@ -19,11 +19,11 @@
 
 // MODULES: ../impl/chrono_io.cpp
 
-#include "../abstract_clock.h"
-#include "../abstract_clock_io.h"
-#include "../manual_clock.h"
+#include <beast/chrono/abstract_clock.h>
+#include <beast/chrono/abstract_clock_io.h>
+#include <beast/chrono/manual_clock.h>
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 #include <sstream>
 #include <string>
diff --git a/beast/chrono/tests/basic_seconds_clock.test.cpp b/beast/chrono/tests/basic_seconds_clock.test.cpp
index e8e9c58df..6678d638e 100644
--- a/beast/chrono/tests/basic_seconds_clock.test.cpp
+++ b/beast/chrono/tests/basic_seconds_clock.test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
-#include "../basic_seconds_clock.h"
+#include <beast/chrono/basic_seconds_clock.h>
 
 namespace beast {
 
diff --git a/beast/config/CompilerConfig.h b/beast/config/CompilerConfig.h
index 1a279e6fe..7eb0e83db 100644
--- a/beast/config/CompilerConfig.h
+++ b/beast/config/CompilerConfig.h
@@ -25,7 +25,7 @@
 #define BEAST_CONFIG_COMPILERCONFIG_H_INCLUDED
 
 #include <assert.h>
-#include "PlatformConfig.h"
+#include <beast/config/PlatformConfig.h>
 
 // This file defines miscellaneous macros for debugging, assertions, etc.
 
diff --git a/beast/config/StandardConfig.h b/beast/config/StandardConfig.h
index f620563c4..c2cb0cc1b 100644
--- a/beast/config/StandardConfig.h
+++ b/beast/config/StandardConfig.h
@@ -35,28 +35,28 @@
 #endif
 
 #if BEAST_USE_INTRINSICS
-# include <intrin.h>
+#include <intrin.h>
 #endif
 
 #if BEAST_MAC || BEAST_IOS
-# include <libkern/OSAtomic.h>
+#include <libkern/OSAtomic.h>
 #endif
 
 #if BEAST_LINUX
-# include <signal.h>
+#include <signal.h>
 # if __INTEL_COMPILER
 #  if __ia64__
-#   include <ia64intrin.h>
+#include <ia64intrin.h>
 #  else
-#   include <ia32intrin.h>
+#include <ia32intrin.h>
 #  endif
 # endif
 #endif
 
 #if BEAST_MSVC && BEAST_DEBUG
-# include <crtdbg.h>
-# include <stdlib.h>
-# include <malloc.h>
+#include <crtdbg.h>
+#include <stdlib.h>
+#include <malloc.h>
 #endif
 
 #if BEAST_MSVC
diff --git a/beast/config/compiler/VisualC.h b/beast/config/compiler/VisualC.h
index 8f0b308eb..b4e1c05b7 100644
--- a/beast/config/compiler/VisualC.h
+++ b/beast/config/compiler/VisualC.h
@@ -19,4 +19,4 @@
 
 // Microsoft Visual C++ compiler configuration
 
-#include "../../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
diff --git a/beast/container/Container.unity.cpp b/beast/container/Container.unity.cpp
index d8eac03c3..994129dff 100644
--- a/beast/container/Container.unity.cpp
+++ b/beast/container/Container.unity.cpp
@@ -18,12 +18,12 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "impl/spookyv2.cpp"
+#include <beast/container/impl/spookyv2.cpp>
 
-#include "tests/aged_associative_container.test.cpp"
-#include "tests/buffer_view.test.cpp"
-#include "tests/hardened_hash.test.cpp"
-#include "tests/hash_append.test.cpp"
+#include <beast/container/tests/aged_associative_container.test.cpp>
+#include <beast/container/tests/buffer_view.test.cpp>
+#include <beast/container/tests/hardened_hash.test.cpp>
+#include <beast/container/tests/hash_append.test.cpp>
diff --git a/beast/container/aged_container_utility.h b/beast/container/aged_container_utility.h
index 317f833d1..9ba44c614 100644
--- a/beast/container/aged_container_utility.h
+++ b/beast/container/aged_container_utility.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED
 #define BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED
 
-#include "aged_container.h"
+#include <beast/container/aged_container.h>
 
 #include <type_traits>
 
diff --git a/beast/container/aged_map.h b/beast/container/aged_map.h
index 6475e853a..f9d0470fd 100644
--- a/beast/container/aged_map.h
+++ b/beast/container/aged_map.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_MAP_H_INCLUDED
 #define BEAST_CONTAINER_AGED_MAP_H_INCLUDED
 
-#include "detail/aged_ordered_container.h"
+#include <beast/container/detail/aged_ordered_container.h>
 
 #include <chrono>
 #include <functional>
diff --git a/beast/container/aged_multimap.h b/beast/container/aged_multimap.h
index 58a060dce..c66ff227d 100644
--- a/beast/container/aged_multimap.h
+++ b/beast/container/aged_multimap.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED
 #define BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED
 
-#include "detail/aged_ordered_container.h"
+#include <beast/container/detail/aged_ordered_container.h>
 
 #include <chrono>
 #include <functional>
diff --git a/beast/container/aged_multiset.h b/beast/container/aged_multiset.h
index ce420977f..620270d2e 100644
--- a/beast/container/aged_multiset.h
+++ b/beast/container/aged_multiset.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED
 #define BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED
 
-#include "detail/aged_ordered_container.h"
+#include <beast/container/detail/aged_ordered_container.h>
 
 #include <chrono>
 #include <functional>
diff --git a/beast/container/aged_set.h b/beast/container/aged_set.h
index db69158ba..a5ef922d5 100644
--- a/beast/container/aged_set.h
+++ b/beast/container/aged_set.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_SET_H_INCLUDED
 #define BEAST_CONTAINER_AGED_SET_H_INCLUDED
 
-#include "detail/aged_ordered_container.h"
+#include <beast/container/detail/aged_ordered_container.h>
 
 #include <chrono>
 #include <functional>
diff --git a/beast/container/aged_unordered_map.h b/beast/container/aged_unordered_map.h
index 909a1c7f1..b6031bc97 100644
--- a/beast/container/aged_unordered_map.h
+++ b/beast/container/aged_unordered_map.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED
 
-#include "detail/aged_unordered_container.h"
+#include <beast/container/detail/aged_unordered_container.h>
 
 #include <chrono>
 #include <functional>
diff --git a/beast/container/aged_unordered_multimap.h b/beast/container/aged_unordered_multimap.h
index b3270d81a..751239292 100644
--- a/beast/container/aged_unordered_multimap.h
+++ b/beast/container/aged_unordered_multimap.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED
 
-#include "detail/aged_unordered_container.h"
+#include <beast/container/detail/aged_unordered_container.h>
 
 #include <chrono>
 #include <functional>
diff --git a/beast/container/aged_unordered_multiset.h b/beast/container/aged_unordered_multiset.h
index b121ad9bb..c1f3ef353 100644
--- a/beast/container/aged_unordered_multiset.h
+++ b/beast/container/aged_unordered_multiset.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED
 
-#include "detail/aged_unordered_container.h"
+#include <beast/container/detail/aged_unordered_container.h>
 
 #include <chrono>
 #include <functional>
diff --git a/beast/container/aged_unordered_set.h b/beast/container/aged_unordered_set.h
index 8c9090b45..83b37de04 100644
--- a/beast/container/aged_unordered_set.h
+++ b/beast/container/aged_unordered_set.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED
 
-#include "detail/aged_unordered_container.h"
+#include <beast/container/detail/aged_unordered_container.h>
 
 #include <chrono>
 #include <functional>
diff --git a/beast/container/buffer_view.h b/beast/container/buffer_view.h
index 1336b69e3..f6cc9f63b 100644
--- a/beast/container/buffer_view.h
+++ b/beast/container/buffer_view.h
@@ -20,16 +20,16 @@
 #ifndef BEAST_CONTAINER_BUFFER_VIEW_H_INCLUDED
 #define BEAST_CONTAINER_BUFFER_VIEW_H_INCLUDED
 
-#include "../Config.h"
+#include <beast/Config.h>
 
 #include <array>
-#include "../cxx14/algorithm.h" // <algorithm>
+#include <beast/cxx14/algorithm.h> // <algorithm>
 #include <cstddef>
 #include <iterator>
 #include <memory>
 #include <string>
 #include <vector>
-#include "../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 
 namespace beast {
 
diff --git a/beast/container/detail/aged_ordered_container.h b/beast/container/detail/aged_ordered_container.h
index dd77b28e7..c248252cc 100644
--- a/beast/container/detail/aged_ordered_container.h
+++ b/beast/container/detail/aged_ordered_container.h
@@ -20,23 +20,23 @@
 #ifndef BEAST_CONTAINER_AGED_ORDERED_CONTAINER_H_INCLUDED
 #define BEAST_CONTAINER_AGED_ORDERED_CONTAINER_H_INCLUDED
 
-#include "aged_container_iterator.h"
-#include "aged_associative_container.h"
+#include <beast/container/detail/aged_container_iterator.h>
+#include <beast/container/detail/aged_associative_container.h>
 
-#include "../aged_container.h"
+#include <beast/container/aged_container.h>
 
-#include "../../chrono/abstract_clock.h"
-#include "../../utility/empty_base_optimization.h"
+#include <beast/chrono/abstract_clock.h>
+#include <beast/utility/empty_base_optimization.h>
 
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/set.hpp>
 
-#include "../../cxx14/algorithm.h" // <algorithm>
+#include <beast/cxx14/algorithm.h> // <algorithm>
 #include <functional>
 #include <initializer_list>
 #include <iterator>
 #include <memory>
-#include "../../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 #include <utility>
 
 namespace beast {
diff --git a/beast/container/detail/aged_unordered_container.h b/beast/container/detail/aged_unordered_container.h
index 5a1054fec..deaf741b8 100644
--- a/beast/container/detail/aged_unordered_container.h
+++ b/beast/container/detail/aged_unordered_container.h
@@ -20,23 +20,23 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_CONTAINER_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_CONTAINER_H_INCLUDED
 
-#include "aged_container_iterator.h"
-#include "aged_associative_container.h"
+#include <beast/container/detail/aged_container_iterator.h>
+#include <beast/container/detail/aged_associative_container.h>
 
-#include "../aged_container.h"
+#include <beast/container/aged_container.h>
 
-#include "../../chrono/abstract_clock.h"
-#include "../../utility/empty_base_optimization.h"
+#include <beast/chrono/abstract_clock.h>
+#include <beast/utility/empty_base_optimization.h>
 
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/unordered_set.hpp>
 
-#include "../../cxx14/algorithm.h" // <algorithm>
+#include <beast/cxx14/algorithm.h> // <algorithm>
 #include <functional>
 #include <initializer_list>
 #include <iterator>
 #include <memory>
-#include "../../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 #include <utility>
 
 /*
diff --git a/beast/container/hardened_hash.h b/beast/container/hardened_hash.h
index df419aafb..2c632d06a 100644
--- a/beast/container/hardened_hash.h
+++ b/beast/container/hardened_hash.h
@@ -20,17 +20,17 @@
 #ifndef BEAST_CONTAINER_HARDENED_HASH_H_INCLUDED
 #define BEAST_CONTAINER_HARDENED_HASH_H_INCLUDED
 
-#include "hash_append.h"
+#include <beast/container/hash_append.h>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <cstdint>
 #include <functional>
 #include <mutex>
 #include <random>
-#include "../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 #include <unordered_map>
 #include <unordered_set>
-#include "../cxx14/utility.h" // <utility>
+#include <beast/cxx14/utility.h> // <utility>
 
 // When set to 1, makes the seed per-process instead
 // of per default-constructed instance of hardened_hash
diff --git a/beast/container/hash_append.h b/beast/container/hash_append.h
index 1843911cf..6f94c5c3f 100644
--- a/beast/container/hash_append.h
+++ b/beast/container/hash_append.h
@@ -21,23 +21,23 @@
 #ifndef BEAST_CONTAINER_HASH_APPEND_H_INCLUDED
 #define BEAST_CONTAINER_HASH_APPEND_H_INCLUDED
 
-#include "../utility/meta.h"
+#include <beast/utility/meta.h>
 
-#include "impl/spookyv2.h"
+#include <beast/container/impl/spookyv2.h>
 
 #if BEAST_USE_BOOST_FEATURES
 #include <boost/shared_ptr.hpp>
 #endif
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <array>
 #include <cstdint>
 #include <functional>
 #include <memory>
 #include <string>
 #include <tuple>
-#include "../cxx14/type_traits.h" // <type_traits>
-#include "../cxx14/utility.h" // <utility>
+#include <beast/cxx14/type_traits.h> // <type_traits>
+#include <beast/cxx14/utility.h> // <utility>
 #include <vector>
 
 // Set to 1 to disable variadic hash_append for tuple. When set, overloads
diff --git a/beast/container/impl/spookyv2.cpp b/beast/container/impl/spookyv2.cpp
index b6d444888..11e8220ea 100644
--- a/beast/container/impl/spookyv2.cpp
+++ b/beast/container/impl/spookyv2.cpp
@@ -10,7 +10,7 @@
 //   August 5 2012: SpookyV2: d = should be d += in short hash, and remove extra mix from long hash
 
 #include <memory.h>
-#include "spookyv2.h"
+#include <beast/container/impl/spookyv2.h>
 
 #ifdef _MSC_VER
 #pragma warning (push)
diff --git a/beast/container/impl/spookyv2.h b/beast/container/impl/spookyv2.h
index 9e3b56c02..15ae43a64 100644
--- a/beast/container/impl/spookyv2.h
+++ b/beast/container/impl/spookyv2.h
@@ -38,7 +38,7 @@
   typedef  unsigned __int16 uint16;
   typedef  unsigned __int8  uint8;
 #else
-# include <stdint.h>
+#include <stdint.h>
 # define INLINE inline
   typedef  uint64_t  uint64;
   typedef  uint32_t  uint32;
diff --git a/beast/container/tests/aged_associative_container.test.cpp b/beast/container/tests/aged_associative_container.test.cpp
index 7c410fcf8..828baeb0c 100644
--- a/beast/container/tests/aged_associative_container.test.cpp
+++ b/beast/container/tests/aged_associative_container.test.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include "../../chrono/manual_clock.h"
-#include "../../unit_test/suite.h"
+#include <beast/chrono/manual_clock.h>
+#include <beast/unit_test/suite.h>
 
-#include "../aged_set.h"
-#include "../aged_map.h"
-#include "../aged_multiset.h"
-#include "../aged_multimap.h"
-#include "../aged_unordered_set.h"
-#include "../aged_unordered_map.h"
-#include "../aged_unordered_multiset.h"
-#include "../aged_unordered_multimap.h"
+#include <beast/container/aged_set.h>
+#include <beast/container/aged_map.h>
+#include <beast/container/aged_multiset.h>
+#include <beast/container/aged_multimap.h>
+#include <beast/container/aged_unordered_set.h>
+#include <beast/container/aged_unordered_map.h>
+#include <beast/container/aged_unordered_multiset.h>
+#include <beast/container/aged_unordered_multimap.h>
 
 #include <vector>
 #include <list>
diff --git a/beast/container/tests/buffer_view.test.cpp b/beast/container/tests/buffer_view.test.cpp
index 743430cb4..d61f276fb 100644
--- a/beast/container/tests/buffer_view.test.cpp
+++ b/beast/container/tests/buffer_view.test.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
-#include "../buffer_view.h"
+#include <beast/container/buffer_view.h>
 
-#include "../../cxx14/algorithm.h" // <algorithm>
+#include <beast/cxx14/algorithm.h> // <algorithm>
 
 namespace beast {
 
diff --git a/beast/container/tests/hardened_hash.test.cpp b/beast/container/tests/hardened_hash.test.cpp
index a3f2d1a2f..f60f18bed 100644
--- a/beast/container/tests/hardened_hash.test.cpp
+++ b/beast/container/tests/hardened_hash.test.cpp
@@ -20,13 +20,13 @@
 // MODULES: ../../crypto/impl/Sha256.cpp ../../container/impl/spookyv2.cpp
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "../hardened_hash.h"
-#include "../../unit_test/suite.h"
+#include <beast/container/hardened_hash.h>
+#include <beast/unit_test/suite.h>
 
-#include "../../crypto/Sha256.h"
+#include <beast/crypto/Sha256.h>
 #include <boost/functional/hash.hpp>
 
 #include <array>
diff --git a/beast/container/tests/hash_append.test.cpp b/beast/container/tests/hash_append.test.cpp
index c102fcd11..dacff5aa2 100644
--- a/beast/container/tests/hash_append.test.cpp
+++ b/beast/container/tests/hash_append.test.cpp
@@ -20,17 +20,17 @@
 // MODULES: ../impl/spookyv2.cpp
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "hash_metrics.h"
+#include <beast/container/tests/hash_metrics.h>
 
-#include "../hash_append.h"
-#include "../impl/spookyv2.h"
+#include <beast/container/hash_append.h>
+#include <beast/container/impl/spookyv2.h>
 
-#include "../../chrono/chrono_io.h"
-#include "../../unit_test/suite.h"
-#include "../../utility/type_name.h"
+#include <beast/chrono/chrono_io.h>
+#include <beast/unit_test/suite.h>
+#include <beast/utility/type_name.h>
 
 #include <array>
 #include <algorithm>
diff --git a/beast/crypto/Crypto.unity.cpp b/beast/crypto/Crypto.unity.cpp
index 206776e69..7c158fcba 100644
--- a/beast/crypto/Crypto.unity.cpp
+++ b/beast/crypto/Crypto.unity.cpp
@@ -18,13 +18,13 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "impl/MurmurHash.cpp"
-#include "impl/Sha256.cpp"
-#include "impl/UnsignedInteger.cpp"
+#include <beast/crypto/impl/MurmurHash.cpp>
+#include <beast/crypto/impl/Sha256.cpp>
+#include <beast/crypto/impl/UnsignedInteger.cpp>
 
-#include "tests/BinaryEncoding.cpp"
+#include <beast/crypto/tests/BinaryEncoding.cpp>
 
-#include "tests/UnsignedInteger.test.cpp"
+#include <beast/crypto/tests/UnsignedInteger.test.cpp>
diff --git a/beast/crypto/Sha256.h b/beast/crypto/Sha256.h
index c415ac067..538a3a011 100644
--- a/beast/crypto/Sha256.h
+++ b/beast/crypto/Sha256.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CRYPTO_SHA256_H_INCLUDED
 #define BEAST_CRYPTO_SHA256_H_INCLUDED
 
-#include "../Config.h"
+#include <beast/Config.h>
 
 #include <array>
 #include <cstdint>
diff --git a/beast/crypto/UnsignedInteger.h b/beast/crypto/UnsignedInteger.h
index e20badaba..99346be6b 100644
--- a/beast/crypto/UnsignedInteger.h
+++ b/beast/crypto/UnsignedInteger.h
@@ -20,13 +20,13 @@
 #ifndef BEAST_CRYPTO_UNSIGNEDINTEGER_H_INCLUDED
 #define BEAST_CRYPTO_UNSIGNEDINTEGER_H_INCLUDED
 
-#include "UnsignedIntegerCalc.h"
-#include "MurmurHash.h"
+#include <beast/crypto/UnsignedIntegerCalc.h>
+#include <beast/crypto/MurmurHash.h>
 
-#include "../ByteOrder.h"
-#include "../container/hardened_hash.h"
+#include <beast/ByteOrder.h>
+#include <beast/container/hardened_hash.h>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <algorithm>
 #include <cassert>
 #include <cstdint>
diff --git a/beast/crypto/UnsignedIntegerCalc.h b/beast/crypto/UnsignedIntegerCalc.h
index d4e1b8ac5..53c88381b 100644
--- a/beast/crypto/UnsignedIntegerCalc.h
+++ b/beast/crypto/UnsignedIntegerCalc.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CRYPTO_UNSIGNEDINTEGERCALC_H_INCLUDED
 #define BEAST_CRYPTO_UNSIGNEDINTEGERCALC_H_INCLUDED
 
-#include "../ByteOrder.h"
+#include <beast/ByteOrder.h>
 
 #include <algorithm>
 #include <cassert>
diff --git a/beast/crypto/impl/MurmurHash.cpp b/beast/crypto/impl/MurmurHash.cpp
index 4b92e563c..3063b15a7 100644
--- a/beast/crypto/impl/MurmurHash.cpp
+++ b/beast/crypto/impl/MurmurHash.cpp
@@ -19,7 +19,7 @@
 
 // http://code.google.com/p/smhasher/
 
-#include "../MurmurHash.h"
+#include <beast/crypto/MurmurHash.h>
 
 #include <cstdint>
 
diff --git a/beast/crypto/impl/Sha256.cpp b/beast/crypto/impl/Sha256.cpp
index 4fec4b766..0427120c4 100644
--- a/beast/crypto/impl/Sha256.cpp
+++ b/beast/crypto/impl/Sha256.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include "../Sha256.h"
+#include <beast/crypto/Sha256.h>
 
 namespace beast {
 namespace Sha256 {
@@ -39,7 +39,7 @@ namespace Sha256 {
 //#define SHA2_USE_INTTYPES_H
 
 namespace detail {
-#include "sha2/sha2.c"
+#include <beast/crypto/impl/sha2/sha2.c>
 }
 
 Context::Context ()
diff --git a/beast/crypto/impl/UnsignedInteger.cpp b/beast/crypto/impl/UnsignedInteger.cpp
index a35bb2d5f..a2b36da34 100644
--- a/beast/crypto/impl/UnsignedInteger.cpp
+++ b/beast/crypto/impl/UnsignedInteger.cpp
@@ -20,9 +20,9 @@
 */
 //==============================================================================
 
-#include "../UnsignedInteger.h"
+#include <beast/crypto/UnsignedInteger.h>
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 
diff --git a/beast/crypto/tests/BinaryEncoding.cpp b/beast/crypto/tests/BinaryEncoding.cpp
index 69e611e7c..245781424 100644
--- a/beast/crypto/tests/BinaryEncoding.cpp
+++ b/beast/crypto/tests/BinaryEncoding.cpp
@@ -18,11 +18,11 @@
 //==============================================================================
 
 // MODULES: ../../../modules/beast_core/beast_core.beast_core.unity.cpp ../../strings/Strings.cpp ../../chrono/Chrono.cpp ../../threads/Threads.cpp
-#include "../BinaryEncoding.h"
-#include "../UnsignedInteger.h"
+#include <beast/crypto/BinaryEncoding.h>
+#include <beast/crypto/UnsignedInteger.h>
 
-#include "../../unit_test/suite.h"
-#include "../../../modules/beast_core/maths/Random.h"
+#include <beast/unit_test/suite.h>
+#include <modules/beast_core/maths/Random.h>
 
 #include <cstddef>
 #include <string>
diff --git a/beast/crypto/tests/UnsignedInteger.test.cpp b/beast/crypto/tests/UnsignedInteger.test.cpp
index 2263e61e9..173b8892d 100644
--- a/beast/crypto/tests/UnsignedInteger.test.cpp
+++ b/beast/crypto/tests/UnsignedInteger.test.cpp
@@ -20,9 +20,9 @@
 */
 //==============================================================================
 
-#include "../UnsignedInteger.h"
+#include <beast/crypto/UnsignedInteger.h>
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 
diff --git a/beast/cxx14/algorithm.h b/beast/cxx14/algorithm.h
index f10bd7bb9..49e906c44 100644
--- a/beast/cxx14/algorithm.h
+++ b/beast/cxx14/algorithm.h
@@ -20,8 +20,8 @@
 #ifndef BEAST_CXX14_ALGORITHM_H_INCLUDED
 #define BEAST_CXX14_ALGORITHM_H_INCLUDED
 
-#include "config.h"
-#include "functional.h"
+#include <beast/cxx14/config.h>
+#include <beast/cxx14/functional.h>
 
 #include <algorithm>
 
diff --git a/beast/cxx14/cxx14.unity.cpp b/beast/cxx14/cxx14.unity.cpp
index 592b7448d..1fbfe8eb9 100644
--- a/beast/cxx14/cxx14.unity.cpp
+++ b/beast/cxx14/cxx14.unity.cpp
@@ -17,4 +17,4 @@
 */
 //==============================================================================
 
-#include "tests/integer_sequence.test.cpp"
+#include <beast/cxx14/tests/integer_sequence.test.cpp>
diff --git a/beast/cxx14/functional.h b/beast/cxx14/functional.h
index 35946b881..f1e217f04 100644
--- a/beast/cxx14/functional.h
+++ b/beast/cxx14/functional.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CXX14_FUNCTIONAL_H_INCLUDED
 #define BEAST_CXX14_FUNCTIONAL_H_INCLUDED
 
-#include "config.h"
+#include <beast/cxx14/config.h>
 
 #include <functional>
 #include <type_traits>
diff --git a/beast/cxx14/iterator.h b/beast/cxx14/iterator.h
index e242997dd..ee02471cf 100644
--- a/beast/cxx14/iterator.h
+++ b/beast/cxx14/iterator.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CXX14_ITERATOR_H_INCLUDED
 #define BEAST_CXX14_ITERATOR_H_INCLUDED
 
-#include "config.h"
+#include <beast/cxx14/config.h>
 
 #include <iterator>
 
diff --git a/beast/cxx14/memory.h b/beast/cxx14/memory.h
index 38430cd2e..d229000bd 100644
--- a/beast/cxx14/memory.h
+++ b/beast/cxx14/memory.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CXX14_MEMORY_H_INCLUDED
 #define BEAST_CXX14_MEMORY_H_INCLUDED
 
-#include "config.h"
+#include <beast/cxx14/config.h>
 
 #include <memory>
 
diff --git a/beast/cxx14/tests/integer_sequence.test.cpp b/beast/cxx14/tests/integer_sequence.test.cpp
index f7360baa2..77d4eafdd 100644
--- a/beast/cxx14/tests/integer_sequence.test.cpp
+++ b/beast/cxx14/tests/integer_sequence.test.cpp
@@ -18,12 +18,12 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "../utility.h"
+#include <beast/cxx14/utility.h>
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 namespace asio {
diff --git a/beast/cxx14/type_traits.h b/beast/cxx14/type_traits.h
index cc86df938..30f8b6920 100644
--- a/beast/cxx14/type_traits.h
+++ b/beast/cxx14/type_traits.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CXX14_TYPE_TRAITS_H_INCLUDED
 #define BEAST_CXX14_TYPE_TRAITS_H_INCLUDED
 
-#include "config.h"
+#include <beast/cxx14/config.h>
 
 #include <tuple>
 #include <type_traits>
diff --git a/beast/cxx14/utility.h b/beast/cxx14/utility.h
index 80afe8d61..fa882c2aa 100644
--- a/beast/cxx14/utility.h
+++ b/beast/cxx14/utility.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CXX14_UTILITY_H_INCLUDED
 #define BEAST_CXX14_UTILITY_H_INCLUDED
 
-#include "config.h"
+#include <beast/cxx14/config.h>
 
 #include <cstddef>
 #include <type_traits>
diff --git a/beast/http/HTTP.unity.cpp b/beast/http/HTTP.unity.cpp
index e6f397c92..6230dc446 100644
--- a/beast/http/HTTP.unity.cpp
+++ b/beast/http/HTTP.unity.cpp
@@ -18,17 +18,17 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "impl/basic_url.cpp"
-#include "impl/get.cpp"
-#include "impl/joyent_parser.cpp"
-#include "impl/ParsedURL.cpp"
-#include "impl/raw_parser.cpp"
-#include "impl/URL.cpp"
+#include <beast/http/impl/basic_url.cpp>
+#include <beast/http/impl/get.cpp>
+#include <beast/http/impl/joyent_parser.cpp>
+#include <beast/http/impl/ParsedURL.cpp>
+#include <beast/http/impl/raw_parser.cpp>
+#include <beast/http/impl/URL.cpp>
 
-#include "tests/basic_url.test.cpp"
-#include "tests/client_session.test.cpp"
-#include "tests/ParsedURL.cpp"
-#include "tests/urls_large_data.cpp"
+#include <beast/http/tests/basic_url.test.cpp>
+#include <beast/http/tests/client_session.test.cpp>
+#include <beast/http/tests/ParsedURL.cpp>
+#include <beast/http/tests/urls_large_data.cpp>
diff --git a/beast/http/ParsedURL.h b/beast/http/ParsedURL.h
index 69ca4a074..a2ba305e3 100644
--- a/beast/http/ParsedURL.h
+++ b/beast/http/ParsedURL.h
@@ -20,8 +20,8 @@
 #ifndef BEAST_HTTP_PARSEDURL_H_INCLUDED
 #define BEAST_HTTP_PARSEDURL_H_INCLUDED
 
-#include "../Strings.h"
-#include "URL.h"
+#include <beast/Strings.h>
+#include <beast/http/URL.h>
 
 namespace beast {
 
diff --git a/beast/http/URL.h b/beast/http/URL.h
index 1e0e114c9..c8bdfb3d2 100644
--- a/beast/http/URL.h
+++ b/beast/http/URL.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_HTTP_URL_H_INCLUDED
 #define BEAST_HTTP_URL_H_INCLUDED
 
-#include "../strings/String.h"
+#include <beast/strings/String.h>
 
 #include <ios>
 
diff --git a/beast/http/basic_url.h b/beast/http/basic_url.h
index 7dabc8965..f5593feed 100644
--- a/beast/http/basic_url.h
+++ b/beast/http/basic_url.h
@@ -23,7 +23,7 @@
 #include <boost/system/error_code.hpp>
 #include <boost/utility/string_ref.hpp>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <cstdint>
 #include <functional>
 #include <memory>
diff --git a/beast/http/client_session.h b/beast/http/client_session.h
index 709a86f6d..633ea03af 100644
--- a/beast/http/client_session.h
+++ b/beast/http/client_session.h
@@ -20,16 +20,16 @@
 #ifndef BEAST_ASIO_HTTP_BASIC_SESSION_H_INCLUDED
 #define BEAST_ASIO_HTTP_BASIC_SESSION_H_INCLUDED
 
-#include "basic_url.h"
-#include "raw_parser.h"
-#include "detail/header_traits.h"
+#include <beast/http/basic_url.h>
+#include <beast/http/raw_parser.h>
+#include <beast/http/detail/header_traits.h>
 
-#include "../asio/bind_handler.h"
-#include "../asio/enable_wait_for_async.h"
-#include "../asio/placeholders.h"
-#include "../asio/shared_handler.h"
-#include "../utility/is_call_possible.h"
-#include "../utility/ci_char_traits.h"
+#include <beast/asio/bind_handler.h>
+#include <beast/asio/enable_wait_for_async.h>
+#include <beast/asio/placeholders.h>
+#include <beast/asio/shared_handler.h>
+#include <beast/utility/is_call_possible.h>
+#include <beast/utility/ci_char_traits.h>
 
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/deadline_timer.hpp>
@@ -42,8 +42,8 @@
 #include <boost/utility/string_ref.hpp>
 #include <boost/logic/tribool.hpp>
 
-#include "../cxx14/memory.h" // <memory>
-#include "../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/memory.h> // <memory>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 
 #include <sstream> // REMOVE ASAP!
 
diff --git a/beast/http/detail/header_traits.h b/beast/http/detail/header_traits.h
index 4284dca38..c1f09f5d2 100644
--- a/beast/http/detail/header_traits.h
+++ b/beast/http/detail/header_traits.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_HTTP_HEADER_TRAITS_H_INCLUDED
 #define BEAST_HTTP_HEADER_TRAITS_H_INCLUDED
 
-#include "../../utility/ci_char_traits.h"
+#include <beast/utility/ci_char_traits.h>
 
 #include <boost/utility/string_ref.hpp>
 
diff --git a/beast/http/impl/ParsedURL.cpp b/beast/http/impl/ParsedURL.cpp
index f889f3983..1bba01409 100644
--- a/beast/http/impl/ParsedURL.cpp
+++ b/beast/http/impl/ParsedURL.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include "../ParsedURL.h"
-#include "../../strings/String.h"
+#include <beast/http/ParsedURL.h>
+#include <beast/strings/String.h>
 
-#include "joyent_parser.h"
+#include <beast/http/impl/joyent_parser.h>
 
 #include <cstdint>
 
diff --git a/beast/http/impl/URL.cpp b/beast/http/impl/URL.cpp
index 4aa3810e7..d1e772ebc 100644
--- a/beast/http/impl/URL.cpp
+++ b/beast/http/impl/URL.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include "../URL.h"
+#include <beast/http/URL.h>
 
 namespace beast {
 
diff --git a/beast/http/impl/basic_url.cpp b/beast/http/impl/basic_url.cpp
index 0afdb1c6a..a05bfa43b 100644
--- a/beast/http/impl/basic_url.cpp
+++ b/beast/http/impl/basic_url.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include "../basic_url.h"
+#include <beast/http/basic_url.h>
 
-#include "joyent_parser.h"
+#include <beast/http/impl/joyent_parser.h>
 
 namespace beast {
 namespace http {
diff --git a/beast/http/impl/get.cpp b/beast/http/impl/get.cpp
index 4318fbae2..307974219 100644
--- a/beast/http/impl/get.cpp
+++ b/beast/http/impl/get.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include "../get.h"
+#include <beast/http/get.h>
 
-#include "../basic_url.h"
+#include <beast/http/basic_url.h>
 
 namespace beast {
 namespace http {
diff --git a/beast/http/impl/joyent_parser.cpp b/beast/http/impl/joyent_parser.cpp
index 40448b5a1..e58e0f600 100644
--- a/beast/http/impl/joyent_parser.cpp
+++ b/beast/http/impl/joyent_parser.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include "joyent_parser.h"
+#include <beast/http/impl/joyent_parser.h>
 
-#include "../basic_message.h"
+#include <beast/http/basic_message.h>
 
 #include <boost/system/error_code.hpp>
 
@@ -31,7 +31,7 @@ namespace joyent {
 # pragma warning (disable: 4127) // conditional expression is constant
 # pragma warning (disable: 4244) // integer conversion, possible loss of data
 #endif
-#include "http-parser/http_parser.c"
+#include <beast/http/impl/http-parser/http_parser.c>
 #ifdef _MSC_VER
 # pragma warning (pop)
 #endif
diff --git a/beast/http/impl/joyent_parser.h b/beast/http/impl/joyent_parser.h
index e65baeb84..cdd309ca4 100644
--- a/beast/http/impl/joyent_parser.h
+++ b/beast/http/impl/joyent_parser.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_HTTP_JOYENT_PARSER_H_INCLUDED
 #define BEAST_HTTP_JOYENT_PARSER_H_INCLUDED
 
-#include "../basic_message.h"
+#include <beast/http/basic_message.h>
 
 // TODO Use <system_error>
 #include <boost/system/error_code.hpp>
@@ -30,7 +30,7 @@
 namespace beast {
 namespace joyent {
 
-#include "http-parser/http_parser.h"
+#include <beast/http/impl/http-parser/http_parser.h>
 
 http::method::methodc_t
 convert_http_method (joyent::http_method m);
diff --git a/beast/http/impl/raw_parser.cpp b/beast/http/impl/raw_parser.cpp
index cecf1d84b..340a777c9 100644
--- a/beast/http/impl/raw_parser.cpp
+++ b/beast/http/impl/raw_parser.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include "../raw_parser.h"
+#include <beast/http/raw_parser.h>
 
-#include "joyent_parser.h"
+#include <beast/http/impl/joyent_parser.h>
 
 #include <utility>
 
diff --git a/beast/http/raw_parser.h b/beast/http/raw_parser.h
index 69c4dfda6..cc87d07af 100644
--- a/beast/http/raw_parser.h
+++ b/beast/http/raw_parser.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_HTTP_RAW_PARSER_H_INCLUDED
 #define BEAST_HTTP_RAW_PARSER_H_INCLUDED
 
-#include "../utility/empty_base_optimization.h"
+#include <beast/utility/empty_base_optimization.h>
 
 #include <boost/system/error_code.hpp> // change to <system_error> soon
 
diff --git a/beast/http/tests/ParsedURL.cpp b/beast/http/tests/ParsedURL.cpp
index ca236210d..8e2fe02e6 100644
--- a/beast/http/tests/ParsedURL.cpp
+++ b/beast/http/tests/ParsedURL.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include "../ParsedURL.h"
+#include <beast/http/ParsedURL.h>
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
-#include "../impl/joyent_parser.h"
+#include <beast/http/impl/joyent_parser.h>
 
 namespace beast {
 
diff --git a/beast/http/tests/basic_message.test.cpp b/beast/http/tests/basic_message.test.cpp
index 15ecb0281..ebc036128 100644
--- a/beast/http/tests/basic_message.test.cpp
+++ b/beast/http/tests/basic_message.test.cpp
@@ -21,7 +21,7 @@
 #include "../../BeastConfig.h"
 #endif
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 namespace http {
diff --git a/beast/http/tests/basic_url.test.cpp b/beast/http/tests/basic_url.test.cpp
index 24e6c24cd..d077663be 100644
--- a/beast/http/tests/basic_url.test.cpp
+++ b/beast/http/tests/basic_url.test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include "../basic_url.h"
+#include <beast/http/basic_url.h>
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 
diff --git a/beast/http/tests/client_session.test.cpp b/beast/http/tests/client_session.test.cpp
index 044d692d2..85b11020c 100644
--- a/beast/http/tests/client_session.test.cpp
+++ b/beast/http/tests/client_session.test.cpp
@@ -24,14 +24,14 @@
 #include "../../BeastConfig.h"
 #endif
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
-#include "urls_large_data.h"
-#include "../client_session.h"
-#include "../get.h"
-#include "../../asio/bind_handler.h"
-#include "../../asio/memory_buffer.h"
-#include "../../utility/ci_char_traits.h"
+#include <beast/http/tests/urls_large_data.h>
+#include <beast/http/client_session.h>
+#include <beast/http/get.h>
+#include <beast/asio/bind_handler.h>
+#include <beast/asio/memory_buffer.h>
+#include <beast/utility/ci_char_traits.h>
 
 #include <boost/asio.hpp>
 
diff --git a/beast/http/tests/urls_large_data.cpp b/beast/http/tests/urls_large_data.cpp
index 07940651e..2a870a318 100644
--- a/beast/http/tests/urls_large_data.cpp
+++ b/beast/http/tests/urls_large_data.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include "urls_large_data.h"
+#include <beast/http/tests/urls_large_data.h>
     
 namespace beast {
 namespace http {
diff --git a/beast/insight/Collector.h b/beast/insight/Collector.h
index 6325ad37b..3b72174da 100644
--- a/beast/insight/Collector.h
+++ b/beast/insight/Collector.h
@@ -20,11 +20,11 @@
 #ifndef BEAST_INSIGHT_COLLECTOR_H_INCLUDED
 #define BEAST_INSIGHT_COLLECTOR_H_INCLUDED
 
-#include "Counter.h"
-#include "Event.h"
-#include "Gauge.h"
-#include "Hook.h"
-#include "Meter.h"
+#include <beast/insight/Counter.h>
+#include <beast/insight/Event.h>
+#include <beast/insight/Gauge.h>
+#include <beast/insight/Hook.h>
+#include <beast/insight/Meter.h>
 
 #include <string>
 
diff --git a/beast/insight/Counter.h b/beast/insight/Counter.h
index 2da422261..8086bc58b 100644
--- a/beast/insight/Counter.h
+++ b/beast/insight/Counter.h
@@ -20,8 +20,8 @@
 #ifndef BEAST_INSIGHT_COUNTER_H_INCLUDED
 #define BEAST_INSIGHT_COUNTER_H_INCLUDED
 
-#include "Base.h"
-#include "CounterImpl.h"
+#include <beast/insight/Base.h>
+#include <beast/insight/CounterImpl.h>
 
 #include <memory>
 
diff --git a/beast/insight/CounterImpl.h b/beast/insight/CounterImpl.h
index 61f150509..3bc11f961 100644
--- a/beast/insight/CounterImpl.h
+++ b/beast/insight/CounterImpl.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_INSIGHT_COUNTERIMPL_H_INCLUDED
 #define BEAST_INSIGHT_COUNTERIMPL_H_INCLUDED
 
-#include "BaseImpl.h"
+#include <beast/insight/BaseImpl.h>
 
 namespace beast {
 namespace insight {
diff --git a/beast/insight/Event.h b/beast/insight/Event.h
index 52189a505..c3a166f0f 100644
--- a/beast/insight/Event.h
+++ b/beast/insight/Event.h
@@ -20,10 +20,10 @@
 #ifndef BEAST_INSIGHT_EVENT_H_INCLUDED
 #define BEAST_INSIGHT_EVENT_H_INCLUDED
 
-#include "Base.h"
-#include "EventImpl.h"
+#include <beast/insight/Base.h>
+#include <beast/insight/EventImpl.h>
 
-#include "../chrono/chrono_util.h"
+#include <beast/chrono/chrono_util.h>
 
 #include <chrono>
 #include <memory>
diff --git a/beast/insight/EventImpl.h b/beast/insight/EventImpl.h
index 4113d59da..7611b2987 100644
--- a/beast/insight/EventImpl.h
+++ b/beast/insight/EventImpl.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_INSIGHT_EVENTIMPL_H_INCLUDED
 #define BEAST_INSIGHT_EVENTIMPL_H_INCLUDED
 
-#include "BaseImpl.h"
+#include <beast/insight/BaseImpl.h>
 
 namespace beast {
 namespace insight {
diff --git a/beast/insight/Gauge.h b/beast/insight/Gauge.h
index d02a68d34..3c296f09a 100644
--- a/beast/insight/Gauge.h
+++ b/beast/insight/Gauge.h
@@ -20,8 +20,8 @@
 #ifndef BEAST_INSIGHT_GAUGE_H_INCLUDED
 #define BEAST_INSIGHT_GAUGE_H_INCLUDED
 
-#include "Base.h"
-#include "GaugeImpl.h"
+#include <beast/insight/Base.h>
+#include <beast/insight/GaugeImpl.h>
 
 #include <memory>
 
diff --git a/beast/insight/GaugeImpl.h b/beast/insight/GaugeImpl.h
index 081c534b3..9d19a567d 100644
--- a/beast/insight/GaugeImpl.h
+++ b/beast/insight/GaugeImpl.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_INSIGHT_GAUGEIMPL_H_INCLUDED
 #define BEAST_INSIGHT_GAUGEIMPL_H_INCLUDED
 
-#include "BaseImpl.h"
+#include <beast/insight/BaseImpl.h>
 
 namespace beast {
 namespace insight {
diff --git a/beast/insight/Group.h b/beast/insight/Group.h
index f47c72a22..858f8c3b4 100644
--- a/beast/insight/Group.h
+++ b/beast/insight/Group.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_INSIGHT_GROUP_H_INCLUDED
 #define BEAST_INSIGHT_GROUP_H_INCLUDED
 
-#include "Collector.h"
+#include <beast/insight/Collector.h>
 
 #include <memory>
 #include <string>
diff --git a/beast/insight/Groups.h b/beast/insight/Groups.h
index be4f29760..4321869d8 100644
--- a/beast/insight/Groups.h
+++ b/beast/insight/Groups.h
@@ -20,8 +20,8 @@
 #ifndef BEAST_INSIGHT_GROUPS_H_INCLUDED
 #define BEAST_INSIGHT_GROUPS_H_INCLUDED
 
-#include "Collector.h"
-#include "Group.h"
+#include <beast/insight/Collector.h>
+#include <beast/insight/Group.h>
 
 #include <memory>
 #include <string>
diff --git a/beast/insight/Hook.h b/beast/insight/Hook.h
index 696fe6815..1940189f3 100644
--- a/beast/insight/Hook.h
+++ b/beast/insight/Hook.h
@@ -20,8 +20,8 @@
 #ifndef BEAST_INSIGHT_HOOK_H_INCLUDED
 #define BEAST_INSIGHT_HOOK_H_INCLUDED
 
-#include "Base.h"
-#include "HookImpl.h"
+#include <beast/insight/Base.h>
+#include <beast/insight/HookImpl.h>
 
 #include <memory>
 
diff --git a/beast/insight/HookImpl.h b/beast/insight/HookImpl.h
index 78ecb0e4e..4b9ab7204 100644
--- a/beast/insight/HookImpl.h
+++ b/beast/insight/HookImpl.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_INSIGHT_HOOKIMPL_H_INCLUDED
 #define BEAST_INSIGHT_HOOKIMPL_H_INCLUDED
 
-#include "BaseImpl.h"
+#include <beast/insight/BaseImpl.h>
 
 namespace beast {
 namespace insight {
diff --git a/beast/insight/Insight.unity.cpp b/beast/insight/Insight.unity.cpp
index 5ab9a4df6..5439b2f7e 100644
--- a/beast/insight/Insight.unity.cpp
+++ b/beast/insight/Insight.unity.cpp
@@ -18,17 +18,17 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "../Config.h"
+#include <beast/Config.h>
 
-#include "../Insight.h"
+#include <beast/Insight.h>
 
-#include "impl/Collector.cpp"
-#include "impl/Group.cpp"
-#include "impl/Groups.cpp"
-#include "impl/Hook.cpp"
-#include "impl/Metric.cpp"
-#include "impl/NullCollector.cpp"
-#include "impl/StatsDCollector.cpp"
+#include <beast/insight/impl/Collector.cpp>
+#include <beast/insight/impl/Group.cpp>
+#include <beast/insight/impl/Groups.cpp>
+#include <beast/insight/impl/Hook.cpp>
+#include <beast/insight/impl/Metric.cpp>
+#include <beast/insight/impl/NullCollector.cpp>
+#include <beast/insight/impl/StatsDCollector.cpp>
diff --git a/beast/insight/Meter.h b/beast/insight/Meter.h
index 2cf3d38ef..b8cde62a6 100644
--- a/beast/insight/Meter.h
+++ b/beast/insight/Meter.h
@@ -22,8 +22,8 @@
 
 #include <memory>
 
-#include "Base.h"
-#include "MeterImpl.h"
+#include <beast/insight/Base.h>
+#include <beast/insight/MeterImpl.h>
 
 namespace beast {
 namespace insight {
diff --git a/beast/insight/MeterImpl.h b/beast/insight/MeterImpl.h
index 301f86e63..de354722a 100644
--- a/beast/insight/MeterImpl.h
+++ b/beast/insight/MeterImpl.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_INSIGHT_METERIMPL_H_INCLUDED
 #define BEAST_INSIGHT_METERIMPL_H_INCLUDED
 
-#include "BaseImpl.h"
+#include <beast/insight/BaseImpl.h>
 
 namespace beast {
 namespace insight {
diff --git a/beast/insight/NullCollector.h b/beast/insight/NullCollector.h
index d0b117b2e..617b71bf1 100644
--- a/beast/insight/NullCollector.h
+++ b/beast/insight/NullCollector.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_INSIGHT_NULLCOLLECTOR_H_INCLUDED
 #define BEAST_INSIGHT_NULLCOLLECTOR_H_INCLUDED
 
-#include "Collector.h"
+#include <beast/insight/Collector.h>
 
 namespace beast {
 namespace insight {
diff --git a/beast/insight/StatsDCollector.h b/beast/insight/StatsDCollector.h
index ea5bf61ee..c078921ec 100644
--- a/beast/insight/StatsDCollector.h
+++ b/beast/insight/StatsDCollector.h
@@ -20,10 +20,10 @@
 #ifndef BEAST_INSIGHT_STATSDCOLLECTOR_H_INCLUDED
 #define BEAST_INSIGHT_STATSDCOLLECTOR_H_INCLUDED
 
-#include "Collector.h"
+#include <beast/insight/Collector.h>
 
-#include "../utility/Journal.h"
-#include "../net/IPEndpoint.h"
+#include <beast/utility/Journal.h>
+#include <beast/net/IPEndpoint.h>
 
 namespace beast {
 namespace insight {
diff --git a/beast/insight/impl/Groups.cpp b/beast/insight/impl/Groups.cpp
index a20728cc9..430052d95 100644
--- a/beast/insight/impl/Groups.cpp
+++ b/beast/insight/impl/Groups.cpp
@@ -19,7 +19,7 @@
 
 #include <unordered_map>
 
-#include "../../cxx14/memory.h"
+#include <beast/cxx14/memory.h>
 
 namespace beast {
 namespace insight {
diff --git a/beast/insight/impl/StatsDCollector.cpp b/beast/insight/impl/StatsDCollector.cpp
index cc5476933..8d1b1d782 100644
--- a/beast/insight/impl/StatsDCollector.cpp
+++ b/beast/insight/impl/StatsDCollector.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include "../../asio/IPAddressConversion.h"
-#include "../../intrusive/List.h"
-#include "../../threads/SharedData.h"
+#include <beast/asio/IPAddressConversion.h>
+#include <beast/intrusive/List.h>
+#include <beast/threads/SharedData.h>
 
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/bind.hpp>
diff --git a/beast/intrusive/List.h b/beast/intrusive/List.h
index 50702a1a1..3f4e01aa6 100644
--- a/beast/intrusive/List.h
+++ b/beast/intrusive/List.h
@@ -20,8 +20,8 @@
 #ifndef BEAST_INTRUSIVE_LIST_H_INCLUDED
 #define BEAST_INTRUSIVE_LIST_H_INCLUDED
 
-#include "../Config.h"
-#include "../Uncopyable.h"
+#include <beast/Config.h>
+#include <beast/Uncopyable.h>
 
 #include <iterator>
 #include <type_traits>
diff --git a/beast/intrusive/LockFreeStack.h b/beast/intrusive/LockFreeStack.h
index c4452bec0..519ca8030 100644
--- a/beast/intrusive/LockFreeStack.h
+++ b/beast/intrusive/LockFreeStack.h
@@ -20,8 +20,8 @@
 #ifndef BEAST_INTRUSIVE_LOCKFREESTACK_H_INCLUDED
 #define BEAST_INTRUSIVE_LOCKFREESTACK_H_INCLUDED
 
-#include "../Atomic.h"
-#include "../Uncopyable.h"
+#include <beast/Atomic.h>
+#include <beast/Uncopyable.h>
 
 #include <iterator>
 #include <type_traits>
diff --git a/beast/net/IPAddress.h b/beast/net/IPAddress.h
index 2303c62eb..41ce4d1fb 100644
--- a/beast/net/IPAddress.h
+++ b/beast/net/IPAddress.h
@@ -20,9 +20,9 @@
 #ifndef BEAST_NET_IPADDRESS_H_INCLUDED
 #define BEAST_NET_IPADDRESS_H_INCLUDED
 
-#include "IPAddressV4.h"
-#include "IPAddressV6.h"
-#include "../container/hash_append.h"
+#include <beast/net/IPAddressV4.h>
+#include <beast/net/IPAddressV6.h>
+#include <beast/container/hash_append.h>
 
 #include <cstdint>
 #include <ios>
diff --git a/beast/net/IPAddressV4.h b/beast/net/IPAddressV4.h
index 41e405fe4..ebb3a9746 100644
--- a/beast/net/IPAddressV4.h
+++ b/beast/net/IPAddressV4.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_NET_IPADDRESSV4_H_INCLUDED
 #define BEAST_NET_IPADDRESSV4_H_INCLUDED
 
-#include "../container/hash_append.h"
+#include <beast/container/hash_append.h>
 
 #include <cstdint>
 #include <ios>
diff --git a/beast/net/IPEndpoint.h b/beast/net/IPEndpoint.h
index 193881f7a..41a147f54 100644
--- a/beast/net/IPEndpoint.h
+++ b/beast/net/IPEndpoint.h
@@ -20,8 +20,8 @@
 #ifndef BEAST_NET_IPENDPOINT_H_INCLUDED
 #define BEAST_NET_IPENDPOINT_H_INCLUDED
 
-#include "IPAddress.h"
-#include "../container/hash_append.h"
+#include <beast/net/IPAddress.h>
+#include <beast/container/hash_append.h>
 
 #include <cstdint>
 #include <ios>
diff --git a/beast/net/Net.unity.cpp b/beast/net/Net.unity.cpp
index d65e14aa6..eec68a837 100644
--- a/beast/net/Net.unity.cpp
+++ b/beast/net/Net.unity.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include "../Config.h"
+#include <beast/Config.h>
 
-#include "impl/DynamicBuffer.cpp"
-#include "impl/IPAddressV4.cpp"
-#include "impl/IPAddressV6.cpp"
-#include "impl/IPEndpoint.cpp"
+#include <beast/net/impl/DynamicBuffer.cpp>
+#include <beast/net/impl/IPAddressV4.cpp>
+#include <beast/net/impl/IPAddressV6.cpp>
+#include <beast/net/impl/IPEndpoint.cpp>
 
-#include "tests/IPEndpoint.test.cpp"
+#include <beast/net/tests/IPEndpoint.test.cpp>
diff --git a/beast/net/impl/DynamicBuffer.cpp b/beast/net/impl/DynamicBuffer.cpp
index 459c2231d..dc9d26cd3 100644
--- a/beast/net/impl/DynamicBuffer.cpp
+++ b/beast/net/impl/DynamicBuffer.cpp
@@ -21,7 +21,7 @@
 #include "../../BeastConfig.h"
 #endif
 
-#include "../DynamicBuffer.h"
+#include <beast/net/DynamicBuffer.h>
 
 #include <algorithm>
 #include <memory>
diff --git a/beast/net/impl/IPAddressV4.cpp b/beast/net/impl/IPAddressV4.cpp
index da2bf7f61..69f08cce8 100644
--- a/beast/net/impl/IPAddressV4.cpp
+++ b/beast/net/impl/IPAddressV4.cpp
@@ -21,8 +21,8 @@
 #include "../../BeastConfig.h"
 #endif
 
-#include "../IPAddressV4.h"
-#include "../detail/Parse.h"
+#include <beast/net/IPAddressV4.h>
+#include <beast/net/detail/Parse.h>
 
 #include <sstream>
 #include <stdexcept>
diff --git a/beast/net/impl/IPAddressV6.cpp b/beast/net/impl/IPAddressV6.cpp
index f079875de..62f72b9f1 100644
--- a/beast/net/impl/IPAddressV6.cpp
+++ b/beast/net/impl/IPAddressV6.cpp
@@ -21,7 +21,7 @@
 #include "../../BeastConfig.h"
 #endif
 
-#include "../IPAddressV6.h"
+#include <beast/net/IPAddressV6.h>
 
 namespace beast {
 namespace IP {
diff --git a/beast/net/impl/IPEndpoint.cpp b/beast/net/impl/IPEndpoint.cpp
index f401c3159..1f0749239 100644
--- a/beast/net/impl/IPEndpoint.cpp
+++ b/beast/net/impl/IPEndpoint.cpp
@@ -21,8 +21,8 @@
 #include "../../BeastConfig.h"
 #endif
 
-#include "../IPEndpoint.h"
-#include "../detail/Parse.h"
+#include <beast/net/IPEndpoint.h>
+#include <beast/net/detail/Parse.h>
 
 namespace beast {
 namespace IP {
diff --git a/beast/net/tests/IPEndpoint.test.cpp b/beast/net/tests/IPEndpoint.test.cpp
index e32784d2b..748a92cba 100644
--- a/beast/net/tests/IPEndpoint.test.cpp
+++ b/beast/net/tests/IPEndpoint.test.cpp
@@ -23,10 +23,10 @@
 #include "../../BeastConfig.h"
 #endif
 
-#include "../IPEndpoint.h"
-#include "../detail/Parse.h"
+#include <beast/net/IPEndpoint.h>
+#include <beast/net/detail/Parse.h>
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 #include <typeinfo>
 
diff --git a/beast/smart_ptr/ScopedPointer.h b/beast/smart_ptr/ScopedPointer.h
index 3e1cf791b..aa3bd0eda 100644
--- a/beast/smart_ptr/ScopedPointer.h
+++ b/beast/smart_ptr/ScopedPointer.h
@@ -24,11 +24,11 @@
 #ifndef BEAST_SMARTPTR_SCOPEDPOINTER_H_INCLUDED
 #define BEAST_SMARTPTR_SCOPEDPOINTER_H_INCLUDED
 
-#include "../Config.h"
-#include "../Uncopyable.h"
-#include "../StaticAssert.h"
+#include <beast/Config.h>
+#include <beast/Uncopyable.h>
+#include <beast/StaticAssert.h>
 
-#include "ContainerDeletePolicy.h"
+#include <beast/smart_ptr/ContainerDeletePolicy.h>
     
 namespace beast {
 
diff --git a/beast/smart_ptr/SharedObject.h b/beast/smart_ptr/SharedObject.h
index fa0d5ad73..1ceca91dd 100644
--- a/beast/smart_ptr/SharedObject.h
+++ b/beast/smart_ptr/SharedObject.h
@@ -26,8 +26,8 @@
 
 #include <atomic>
 
-#include "../Config.h"
-#include "../Uncopyable.h"
+#include <beast/Config.h>
+#include <beast/Uncopyable.h>
 
 namespace beast {
 
diff --git a/beast/smart_ptr/SharedPtr.h b/beast/smart_ptr/SharedPtr.h
index 36370897f..e1c5f70d2 100644
--- a/beast/smart_ptr/SharedPtr.h
+++ b/beast/smart_ptr/SharedPtr.h
@@ -24,8 +24,8 @@
 #ifndef BEAST_SMARTPTR_SHAREDPTR_H_INCLUDED
 #define BEAST_SMARTPTR_SHAREDPTR_H_INCLUDED
 
-#include "../Config.h"
-#include "SharedObject.h"
+#include <beast/Config.h>
+#include <beast/smart_ptr/SharedObject.h>
 
 namespace beast {
 
diff --git a/beast/streams/abstract_ostream.h b/beast/streams/abstract_ostream.h
index 2063f219e..6ff130737 100644
--- a/beast/streams/abstract_ostream.h
+++ b/beast/streams/abstract_ostream.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_UTILITY_ABSTRACT_OSTREAM_H_INCLUDED
 #define BEAST_UTILITY_ABSTRACT_OSTREAM_H_INCLUDED
 
-#include "basic_abstract_ostream.h"
+#include <beast/streams/basic_abstract_ostream.h>
 
 namespace beast {
 
diff --git a/beast/streams/basic_abstract_ostream.h b/beast/streams/basic_abstract_ostream.h
index a3ff5e3fa..7d1932a5e 100644
--- a/beast/streams/basic_abstract_ostream.h
+++ b/beast/streams/basic_abstract_ostream.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_STREAMS_BASIC_ABSTRACT_OSTREAM_H_INCLUDED
 #define BEAST_STREAMS_BASIC_ABSTRACT_OSTREAM_H_INCLUDED
 
-#include "basic_scoped_ostream.h"
+#include <beast/streams/basic_scoped_ostream.h>
 
 #include <functional>
 #include <memory>
diff --git a/beast/streams/basic_scoped_ostream.h b/beast/streams/basic_scoped_ostream.h
index d1a001ada..861cf0129 100644
--- a/beast/streams/basic_scoped_ostream.h
+++ b/beast/streams/basic_scoped_ostream.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_STREAMS_BASIC_SCOPED_OSTREAM_H_INCLUDED
 #define BEAST_STREAMS_BASIC_SCOPED_OSTREAM_H_INCLUDED
 
-#include "../cxx14/memory.h" // <memory>
+#include <beast/cxx14/memory.h> // <memory>
 
 #include <functional>
 #include <memory>
diff --git a/beast/streams/basic_std_ostream.h b/beast/streams/basic_std_ostream.h
index 677eb39bb..b8933fa10 100644
--- a/beast/streams/basic_std_ostream.h
+++ b/beast/streams/basic_std_ostream.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_UTILITY_STD_OSTREAM_H_INCLUDED
 #define BEAST_UTILITY_STD_OSTREAM_H_INCLUDED
 
-#include "basic_abstract_ostream.h"
+#include <beast/streams/basic_abstract_ostream.h>
 
 #include <ostream>
 
diff --git a/beast/streams/debug_ostream.h b/beast/streams/debug_ostream.h
index d9f12ea18..6e23d22ab 100644
--- a/beast/streams/debug_ostream.h
+++ b/beast/streams/debug_ostream.h
@@ -20,17 +20,17 @@
 #ifndef BEAST_UTILITY_DEBUG_OSTREAM_H_INCLUDED
 #define BEAST_UTILITY_DEBUG_OSTREAM_H_INCLUDED
 
-#include "abstract_ostream.h"
+#include <beast/streams/abstract_ostream.h>
 
 #include <iostream>
 
 #ifdef _MSC_VER
 # ifndef WIN32_LEAN_AND_MEAN // VC_EXTRALEAN
 #  define WIN32_LEAN_AND_MEAN
-#  include <windows.h>
+#include <windows.h>
 #  undef WIN32_LEAN_AND_MEAN
 # else
-#  include <windows.h>
+#include <windows.h>
 # endif
 # ifdef min
 #  undef min
diff --git a/beast/streams/streams.unity.cpp b/beast/streams/streams.unity.cpp
index a95741591..f99789453 100644
--- a/beast/streams/streams.unity.cpp
+++ b/beast/streams/streams.unity.cpp
@@ -17,4 +17,4 @@
 */
 //==============================================================================
 
-#include "tests/basic_abstract_ostream.test.cpp"
+#include <beast/streams/tests/basic_abstract_ostream.test.cpp>
diff --git a/beast/streams/tests/basic_abstract_ostream.test.cpp b/beast/streams/tests/basic_abstract_ostream.test.cpp
index 1ef7687a9..df2ea3c02 100644
--- a/beast/streams/tests/basic_abstract_ostream.test.cpp
+++ b/beast/streams/tests/basic_abstract_ostream.test.cpp
@@ -21,9 +21,9 @@
 #include "../../BeastConfig.h"
 #endif
 
-#include "../basic_abstract_ostream.h"
+#include <beast/streams/basic_abstract_ostream.h>
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 
diff --git a/beast/strings/CharPointer_ASCII.h b/beast/strings/CharPointer_ASCII.h
index 48e96bb46..a61c171ce 100644
--- a/beast/strings/CharPointer_ASCII.h
+++ b/beast/strings/CharPointer_ASCII.h
@@ -24,9 +24,9 @@
 #ifndef BEAST_CHARPOINTER_ASCII_H_INCLUDED
 #define BEAST_CHARPOINTER_ASCII_H_INCLUDED
 
-#include "../Config.h"
+#include <beast/Config.h>
 
-#include "CharacterFunctions.h"
+#include <beast/strings/CharacterFunctions.h>
 
 #include <cstdlib>
 #include <cstring>
diff --git a/beast/strings/CharPointer_UTF16.h b/beast/strings/CharPointer_UTF16.h
index 987989cbd..c0afdfbe7 100644
--- a/beast/strings/CharPointer_UTF16.h
+++ b/beast/strings/CharPointer_UTF16.h
@@ -24,10 +24,10 @@
 #ifndef BEAST_CHARPOINTER_UTF16_H_INCLUDED
 #define BEAST_CHARPOINTER_UTF16_H_INCLUDED
 
-#include "../Config.h"
-#include "../Atomic.h"
+#include <beast/Config.h>
+#include <beast/Atomic.h>
 
-#include "CharacterFunctions.h"
+#include <beast/strings/CharacterFunctions.h>
 
 #include <cstdint>
 
diff --git a/beast/strings/CharPointer_UTF32.h b/beast/strings/CharPointer_UTF32.h
index 37ab304cc..3bf0b440f 100644
--- a/beast/strings/CharPointer_UTF32.h
+++ b/beast/strings/CharPointer_UTF32.h
@@ -24,10 +24,10 @@
 #ifndef BEAST_CHARPOINTER_UTF32_H_INCLUDED
 #define BEAST_CHARPOINTER_UTF32_H_INCLUDED
 
-#include "../Config.h"
-#include "../Atomic.h"
+#include <beast/Config.h>
+#include <beast/Atomic.h>
     
-#include "CharacterFunctions.h"
+#include <beast/strings/CharacterFunctions.h>
 
 #include <cwchar>
 
diff --git a/beast/strings/CharPointer_UTF8.h b/beast/strings/CharPointer_UTF8.h
index ac9f709e9..d5e83fc03 100644
--- a/beast/strings/CharPointer_UTF8.h
+++ b/beast/strings/CharPointer_UTF8.h
@@ -24,10 +24,10 @@
 #ifndef BEAST_CHARPOINTER_UTF8_H_INCLUDED
 #define BEAST_CHARPOINTER_UTF8_H_INCLUDED
 
-#include "../Config.h"
-#include "../Atomic.h"
+#include <beast/Config.h>
+#include <beast/Atomic.h>
     
-#include "CharacterFunctions.h"
+#include <beast/strings/CharacterFunctions.h>
 
 #include <cstdlib>
 #include <cstring>
diff --git a/beast/strings/CharacterFunctions.h b/beast/strings/CharacterFunctions.h
index d05bcdd6d..b3037e24c 100644
--- a/beast/strings/CharacterFunctions.h
+++ b/beast/strings/CharacterFunctions.h
@@ -26,8 +26,8 @@
 
 #include <limits>
 
-#include "../Config.h"
-#include "../Memory.h"
+#include <beast/Config.h>
+#include <beast/Memory.h>
 
 #include <cstdint>
 
diff --git a/beast/strings/NewLine.h b/beast/strings/NewLine.h
index 1566402d0..ba9c0f5d4 100644
--- a/beast/strings/NewLine.h
+++ b/beast/strings/NewLine.h
@@ -24,9 +24,9 @@
 #ifndef BEAST_STRINGS_NEWLINE_H_INCLUDED
 #define BEAST_STRINGS_NEWLINE_H_INCLUDED
 
-#include "../Config.h"
+#include <beast/Config.h>
 
-#include "String.h"
+#include <beast/strings/String.h>
 
 namespace beast {
 
diff --git a/beast/strings/String.h b/beast/strings/String.h
index b49ad06e0..892491087 100644
--- a/beast/strings/String.h
+++ b/beast/strings/String.h
@@ -24,24 +24,24 @@
 #ifndef BEAST_STRINGS_STRING_H_INCLUDED
 #define BEAST_STRINGS_STRING_H_INCLUDED
 
-#include "../Config.h"
-#include "../Memory.h"
+#include <beast/Config.h>
+#include <beast/Memory.h>
 
-#include "CharacterFunctions.h"
+#include <beast/strings/CharacterFunctions.h>
 #if BEAST_MSVC
 # pragma warning (push)
 # pragma warning (disable: 4514 4996)
 #endif
-#include "CharPointer_UTF8.h"
-#include "CharPointer_UTF16.h"
-#include "CharPointer_UTF32.h"
-#include "CharPointer_ASCII.h"
+#include <beast/strings/CharPointer_UTF8.h>
+#include <beast/strings/CharPointer_UTF16.h>
+#include <beast/strings/CharPointer_UTF32.h>
+#include <beast/strings/CharPointer_ASCII.h>
 #if BEAST_MSVC
 # pragma warning (pop)
 #endif
-#include "StringCharPointerType.h"
-#include "StringFromNumber.h"
-#include "String.h"
+#include <beast/strings/StringCharPointerType.h>
+#include <beast/strings/StringFromNumber.h>
+#include <beast/strings/String.h>
 
 #include <cstdint>
 #include <ostream>
diff --git a/beast/strings/StringCharPointerType.h b/beast/strings/StringCharPointerType.h
index ef2de5ec3..ec9f45737 100644
--- a/beast/strings/StringCharPointerType.h
+++ b/beast/strings/StringCharPointerType.h
@@ -24,10 +24,10 @@
 #ifndef BEAST_STRINGS_STRINGCHARPOINTERTYPE_H_INCLUDED
 #define BEAST_STRINGS_STRINGCHARPOINTERTYPE_H_INCLUDED
 
-#include "../Config.h"
-#include "CharPointer_UTF8.h"
-#include "CharPointer_UTF16.h"
-#include "CharPointer_UTF32.h"
+#include <beast/Config.h>
+#include <beast/strings/CharPointer_UTF8.h>
+#include <beast/strings/CharPointer_UTF16.h>
+#include <beast/strings/CharPointer_UTF32.h>
 
 namespace beast {
 
diff --git a/beast/strings/StringFromNumber.h b/beast/strings/StringFromNumber.h
index 21d8438b0..31ccb55a8 100644
--- a/beast/strings/StringFromNumber.h
+++ b/beast/strings/StringFromNumber.h
@@ -24,10 +24,10 @@
 #ifndef BEAST_STRINGS_STRINGFROMNUMBER_H_INCLUDED
 #define BEAST_STRINGS_STRINGFROMNUMBER_H_INCLUDED
 
-#include "../Config.h"
-#include "../Arithmetic.h"
+#include <beast/Config.h>
+#include <beast/Arithmetic.h>
 
-#include "StringCharPointerType.h"
+#include <beast/strings/StringCharPointerType.h>
 
 #include <limits>
 #include <ostream>
diff --git a/beast/strings/Strings.unity.cpp b/beast/strings/Strings.unity.cpp
index 15f2ddad1..9ded492c8 100644
--- a/beast/strings/Strings.unity.cpp
+++ b/beast/strings/Strings.unity.cpp
@@ -17,5 +17,5 @@
 */
 //==============================================================================
 
-#include "impl/CharacterFunctions.cpp"
-#include "impl/String.cpp"
+#include <beast/strings/impl/CharacterFunctions.cpp>
+#include <beast/strings/impl/String.cpp>
diff --git a/beast/strings/impl/CharacterFunctions.cpp b/beast/strings/impl/CharacterFunctions.cpp
index 512105697..313230d5c 100644
--- a/beast/strings/impl/CharacterFunctions.cpp
+++ b/beast/strings/impl/CharacterFunctions.cpp
@@ -25,7 +25,7 @@
 #include "../../BeastConfig.h"
 #endif
 
-#include "../CharacterFunctions.h"
+#include <beast/strings/CharacterFunctions.h>
 
 #include <cctype>
 #include <cwctype>
diff --git a/beast/strings/impl/String.cpp b/beast/strings/impl/String.cpp
index a9e19a44a..451e05ac6 100644
--- a/beast/strings/impl/String.cpp
+++ b/beast/strings/impl/String.cpp
@@ -25,14 +25,14 @@
 #include "../../BeastConfig.h"
 #endif
 
-#include "../String.h"
-#include "../NewLine.h"
+#include <beast/strings/String.h>
+#include <beast/strings/NewLine.h>
 
-#include "../../ByteOrder.h"
-#include "../../Memory.h"
-#include "../../StaticAssert.h"
-#include "../../Arithmetic.h"
-#include "../../HeapBlock.h"
+#include <beast/ByteOrder.h>
+#include <beast/Memory.h>
+#include <beast/StaticAssert.h>
+#include <beast/Arithmetic.h>
+#include <beast/HeapBlock.h>
 
 #include <stdarg.h>
 
diff --git a/beast/threads/RecursiveMutex.h b/beast/threads/RecursiveMutex.h
index 3f7cb59ab..129377cfa 100644
--- a/beast/threads/RecursiveMutex.h
+++ b/beast/threads/RecursiveMutex.h
@@ -24,9 +24,9 @@
 #ifndef BEAST_THREADS_RECURSIVEMUTEX_H_INCLUDED
 #define BEAST_THREADS_RECURSIVEMUTEX_H_INCLUDED
 
-#include "../Config.h"
-#include "UnlockGuard.h"
-#include "TryLockGuard.h"
+#include <beast/Config.h>
+#include <beast/threads/UnlockGuard.h>
+#include <beast/threads/TryLockGuard.h>
 
 #include <mutex>
 
diff --git a/beast/threads/ServiceQueue.h b/beast/threads/ServiceQueue.h
index eac6d6cfb..3d0e60428 100644
--- a/beast/threads/ServiceQueue.h
+++ b/beast/threads/ServiceQueue.h
@@ -20,12 +20,12 @@
 #ifndef BEAST_THREADS_SERVICEQUEUE_H_INCLUDED
 #define BEAST_THREADS_SERVICEQUEUE_H_INCLUDED
 
-#include "../intrusive/List.h"
-#include "SharedData.h"
-#include "ThreadLocalValue.h"
-#include "WaitableEvent.h"
+#include <beast/intrusive/List.h>
+#include <beast/threads/SharedData.h>
+#include <beast/threads/ThreadLocalValue.h>
+#include <beast/threads/WaitableEvent.h>
 
-#include "detail/DispatchedHandler.h"
+#include <beast/threads/detail/DispatchedHandler.h>
 
 namespace beast {
 
diff --git a/beast/threads/SharedData.h b/beast/threads/SharedData.h
index 62e1defe7..707b98de2 100644
--- a/beast/threads/SharedData.h
+++ b/beast/threads/SharedData.h
@@ -20,8 +20,8 @@
 #ifndef BEAST_THREADS_SHAREDDATA_H_INCLUDED
 #define BEAST_THREADS_SHAREDDATA_H_INCLUDED
 
-#include "RecursiveMutex.h"
-#include "SharedMutexAdapter.h"
+#include <beast/threads/RecursiveMutex.h>
+#include <beast/threads/SharedMutexAdapter.h>
 
 namespace beast {
 
diff --git a/beast/threads/SharedLockGuard.h b/beast/threads/SharedLockGuard.h
index 82fdbd081..da9f6b758 100644
--- a/beast/threads/SharedLockGuard.h
+++ b/beast/threads/SharedLockGuard.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_THREADS_SHAREDLOCKGUARD_H_INCLUDED
 #define BEAST_THREADS_SHAREDLOCKGUARD_H_INCLUDED
 
-#include "../Uncopyable.h"
+#include <beast/Uncopyable.h>
 
 namespace beast
 {
diff --git a/beast/threads/SharedMutexAdapter.h b/beast/threads/SharedMutexAdapter.h
index 8147dc3a1..4cf3f03ec 100644
--- a/beast/threads/SharedMutexAdapter.h
+++ b/beast/threads/SharedMutexAdapter.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_THREADS_SHAREDMUTEXADAPTER_H_INCLUDED
 #define BEAST_THREADS_SHAREDMUTEXADAPTER_H_INCLUDED
 
-#include "SharedLockGuard.h"
+#include <beast/threads/SharedLockGuard.h>
 
 #include <mutex>
 
diff --git a/beast/threads/SpinLock.h b/beast/threads/SpinLock.h
index 4750911eb..717ec2ce4 100644
--- a/beast/threads/SpinLock.h
+++ b/beast/threads/SpinLock.h
@@ -24,8 +24,8 @@
 #ifndef BEAST_THREADS_SPINLOCK_H_INCLUDED
 #define BEAST_THREADS_SPINLOCK_H_INCLUDED
 
-#include "../Atomic.h"
-#include "UnlockGuard.h"
+#include <beast/Atomic.h>
+#include <beast/threads/UnlockGuard.h>
 
 #include <mutex>
 
diff --git a/beast/threads/Stoppable.h b/beast/threads/Stoppable.h
index 9ff21dcb5..19ce34431 100644
--- a/beast/threads/Stoppable.h
+++ b/beast/threads/Stoppable.h
@@ -20,11 +20,11 @@
 #ifndef BEAST_THREADS_STOPPABLE_H_INCLUDED
 #define BEAST_THREADS_STOPPABLE_H_INCLUDED
 
-#include "../Atomic.h"
-#include "../intrusive/LockFreeStack.h"
-#include "../utility/Journal.h"
+#include <beast/Atomic.h>
+#include <beast/intrusive/LockFreeStack.h>
+#include <beast/utility/Journal.h>
 
-#include "WaitableEvent.h"
+#include <beast/threads/WaitableEvent.h>
 
 namespace beast {
 
diff --git a/beast/threads/Thread.h b/beast/threads/Thread.h
index aee57d5f0..92443943d 100644
--- a/beast/threads/Thread.h
+++ b/beast/threads/Thread.h
@@ -24,10 +24,10 @@
 #ifndef BEAST_THREADS_THREAD_H_INCLUDED
 #define BEAST_THREADS_THREAD_H_INCLUDED
 
-#include "../strings/String.h"
-#include "../utility/LeakChecked.h"
-#include "RecursiveMutex.h"
-#include "WaitableEvent.h"
+#include <beast/strings/String.h>
+#include <beast/utility/LeakChecked.h>
+#include <beast/threads/RecursiveMutex.h>
+#include <beast/threads/WaitableEvent.h>
 
 namespace beast {
 
diff --git a/beast/threads/ThreadLocalValue.h b/beast/threads/ThreadLocalValue.h
index ac8310cd1..99bb024e4 100644
--- a/beast/threads/ThreadLocalValue.h
+++ b/beast/threads/ThreadLocalValue.h
@@ -24,9 +24,9 @@
 #ifndef BEAST_THREADS_THREADLOCALVALUE_H_INCLUDED
 #define BEAST_THREADS_THREADLOCALVALUE_H_INCLUDED
 
-#include "../Config.h"
-#include "SpinLock.h"
-#include "Thread.h"
+#include <beast/Config.h>
+#include <beast/threads/SpinLock.h>
+#include <beast/threads/Thread.h>
 
 namespace beast {
 
diff --git a/beast/threads/Threads.unity.cpp b/beast/threads/Threads.unity.cpp
index 933526971..104f9ba55 100644
--- a/beast/threads/Threads.unity.cpp
+++ b/beast/threads/Threads.unity.cpp
@@ -18,14 +18,14 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "impl/RecursiveMutex.cpp"
-#include "impl/ServiceQueue.cpp"
-#include "impl/Stoppable.cpp"
-#include "impl/Thread.cpp"
-#include "impl/WaitableEvent.cpp"
+#include <beast/threads/impl/RecursiveMutex.cpp>
+#include <beast/threads/impl/ServiceQueue.cpp>
+#include <beast/threads/impl/Stoppable.cpp>
+#include <beast/threads/impl/Thread.cpp>
+#include <beast/threads/impl/WaitableEvent.cpp>
 
-#include "tests/Atomic.test.cpp"
-#include "tests/ServiceQueue.cpp"
+#include <beast/threads/tests/Atomic.test.cpp>
+#include <beast/threads/tests/ServiceQueue.cpp>
diff --git a/beast/threads/TryLockGuard.h b/beast/threads/TryLockGuard.h
index f61f8bb6e..55afdae3f 100644
--- a/beast/threads/TryLockGuard.h
+++ b/beast/threads/TryLockGuard.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_THREADS_TRYLOCKGUARD_H_INCLUDED
 #define BEAST_THREADS_TRYLOCKGUARD_H_INCLUDED
 
-#include "../Uncopyable.h"
+#include <beast/Uncopyable.h>
 
 namespace beast {
 
diff --git a/beast/threads/UnlockGuard.h b/beast/threads/UnlockGuard.h
index ea412765f..d8f7b590c 100644
--- a/beast/threads/UnlockGuard.h
+++ b/beast/threads/UnlockGuard.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_THREADS_UNLOCKGUARD_H_INCLUDED
 #define BEAST_THREADS_UNLOCKGUARD_H_INCLUDED
 
-#include "../Uncopyable.h"
+#include <beast/Uncopyable.h>
 
 namespace beast {
 
diff --git a/beast/threads/WaitableEvent.h b/beast/threads/WaitableEvent.h
index 1e8b2a2cb..b78289a0b 100644
--- a/beast/threads/WaitableEvent.h
+++ b/beast/threads/WaitableEvent.h
@@ -24,8 +24,8 @@
 #ifndef BEAST_THREADS_WAITABLEEVENT_H_INCLUDED
 #define BEAST_THREADS_WAITABLEEVENT_H_INCLUDED
 
-#include "../Config.h"
-#include "../Uncopyable.h"
+#include <beast/Config.h>
+#include <beast/Uncopyable.h>
 
 #if ! BEAST_WINDOWS
 #include <pthread.h>
diff --git a/beast/threads/detail/DispatchedHandler.h b/beast/threads/detail/DispatchedHandler.h
index 8cd1897e4..b84e46573 100644
--- a/beast/threads/detail/DispatchedHandler.h
+++ b/beast/threads/detail/DispatchedHandler.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_THREADS_DISPATCHEDHANDLER_H_INCLUDED
 #define BEAST_THREADS_DISPATCHEDHANDLER_H_INCLUDED
 
-#include "BindHandler.h"
+#include <beast/threads/detail/BindHandler.h>
 
 namespace beast {
 namespace detail {
diff --git a/beast/threads/impl/RecursiveMutex.cpp b/beast/threads/impl/RecursiveMutex.cpp
index 414f883c9..b5005184b 100644
--- a/beast/threads/impl/RecursiveMutex.cpp
+++ b/beast/threads/impl/RecursiveMutex.cpp
@@ -21,12 +21,10 @@
 */
 //==============================================================================
 
-#include "../RecursiveMutex.h"
+#include <beast/threads/RecursiveMutex.h>
 
 #if BEAST_WINDOWS
 
-#include "../StaticAssert.h"
-
 #include <Windows.h>
 #undef check
 #undef direct
@@ -39,11 +37,7 @@ namespace beast {
 RecursiveMutex::RecursiveMutex()
 {
     // (just to check the MS haven't changed this structure and broken things...)
-#if BEAST_VC7_OR_EARLIER
-    static_bassert (sizeof (CRITICAL_SECTION) <= 24);
-#else
-    static_bassert (sizeof (CRITICAL_SECTION) <= sizeof (section));
-#endif
+    static_assert (sizeof (CRITICAL_SECTION) <= sizeof (section), "");
 
     InitializeCriticalSection ((CRITICAL_SECTION*) section);
 }
diff --git a/beast/threads/impl/ServiceQueue.cpp b/beast/threads/impl/ServiceQueue.cpp
index 0b284e355..44a662daf 100644
--- a/beast/threads/impl/ServiceQueue.cpp
+++ b/beast/threads/impl/ServiceQueue.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include "../ServiceQueue.h"
+#include <beast/threads/ServiceQueue.h>
 
 namespace beast {
 
diff --git a/beast/threads/impl/Stoppable.cpp b/beast/threads/impl/Stoppable.cpp
index 7c8eb891e..f5a9fe8e2 100644
--- a/beast/threads/impl/Stoppable.cpp
+++ b/beast/threads/impl/Stoppable.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include "../Stoppable.h"
+#include <beast/threads/Stoppable.h>
 
 namespace beast {
 
diff --git a/beast/threads/impl/Thread.cpp b/beast/threads/impl/Thread.cpp
index a9f0f8f5f..88863e88d 100644
--- a/beast/threads/impl/Thread.cpp
+++ b/beast/threads/impl/Thread.cpp
@@ -21,10 +21,10 @@
 */
 //==============================================================================
 
-#include "../Thread.h"
-#include "../../smart_ptr/SharedObject.h"
-#include "../../smart_ptr/SharedPtr.h"
-#include "../../../modules/beast_core/time/Time.h"
+#include <beast/threads/Thread.h>
+#include <beast/smart_ptr/SharedObject.h>
+#include <beast/smart_ptr/SharedPtr.h>
+#include <modules/beast_core/time/Time.h>
 
 #include <cassert>
 
@@ -452,11 +452,11 @@ void Thread::yield()
 #include <Foundation/NSString.h>
 #import <objc/message.h>
 namespace beast{
-#include "../../../modules/beast_core/native/osx_ObjCHelpers.h"
+#include <modules/beast_core/native/osx_ObjCHelpers.h>
 }
 
 #else
-# include <sys/prctl.h>
+#include <sys/prctl.h>
 
 #endif
 
diff --git a/beast/threads/impl/WaitableEvent.cpp b/beast/threads/impl/WaitableEvent.cpp
index 9e882c499..05b85507a 100644
--- a/beast/threads/impl/WaitableEvent.cpp
+++ b/beast/threads/impl/WaitableEvent.cpp
@@ -21,7 +21,7 @@
 */
 //==============================================================================
 
-#include "../WaitableEvent.h"
+#include <beast/threads/WaitableEvent.h>
 
 #if BEAST_WINDOWS
 
diff --git a/beast/threads/tests/Atomic.test.cpp b/beast/threads/tests/Atomic.test.cpp
index f6e764067..c1e7cdd64 100644
--- a/beast/threads/tests/Atomic.test.cpp
+++ b/beast/threads/tests/Atomic.test.cpp
@@ -25,11 +25,11 @@
 #include "../../BeastConfig.h"
 #endif
 
-#include "../../Atomic.h"
-#include "../../Arithmetic.h"
-#include "../../ByteOrder.h"
+#include <beast/Atomic.h>
+#include <beast/Arithmetic.h>
+#include <beast/ByteOrder.h>
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 
diff --git a/beast/threads/tests/ServiceQueue.cpp b/beast/threads/tests/ServiceQueue.cpp
index 9893aa44b..cbd12a4b1 100644
--- a/beast/threads/tests/ServiceQueue.cpp
+++ b/beast/threads/tests/ServiceQueue.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include "../ServiceQueue.h"
+#include <beast/threads/ServiceQueue.h>
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
-#include "../../../modules/beast_core/time/Time.h"
-#include "../../../modules/beast_core/maths/Random.h"
+#include <modules/beast_core/time/Time.h>
+#include <modules/beast_core/maths/Random.h>
 
 #include <functional>
 #include <sstream>
diff --git a/beast/unit_test.h b/beast/unit_test.h
index 81764936e..2c99801d0 100644
--- a/beast/unit_test.h
+++ b/beast/unit_test.h
@@ -20,16 +20,16 @@
 #ifndef BEAST_UNIT_TEST_H_INCLUDED
 #define BEAST_UNIT_TEST_H_INCLUDED
 
-#include "./unit_test/amount.h"
-#include "./unit_test/print.h"
-#include "./unit_test/global_suites.h"
-#include "./unit_test/match.h"
-#include "./unit_test/recorder.h"
-#include "./unit_test/reporter.h"
-#include "./unit_test/results.h"
-#include "./unit_test/runner.h"
-#include "./unit_test/suite.h"
-#include "./unit_test/suite_info.h"
-#include "./unit_test/suite_list.h"
+#include <beast/unit_test/amount.h>
+#include <beast/unit_test/print.h>
+#include <beast/unit_test/global_suites.h>
+#include <beast/unit_test/match.h>
+#include <beast/unit_test/recorder.h>
+#include <beast/unit_test/reporter.h>
+#include <beast/unit_test/results.h>
+#include <beast/unit_test/runner.h>
+#include <beast/unit_test/suite.h>
+#include <beast/unit_test/suite_info.h>
+#include <beast/unit_test/suite_list.h>
 
 #endif
diff --git a/beast/unit_test/define_print.cpp b/beast/unit_test/define_print.cpp
index 477701095..00194879f 100644
--- a/beast/unit_test/define_print.cpp
+++ b/beast/unit_test/define_print.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include "amount.h"
-#include "global_suites.h"
-#include "suite.h"
+#include <beast/unit_test/amount.h>
+#include <beast/unit_test/global_suites.h>
+#include <beast/unit_test/suite.h>
 
 // Include this .cpp in your project to gain access to the printing suite
 
diff --git a/beast/unit_test/global_suites.h b/beast/unit_test/global_suites.h
index 8fd39d5df..eb61b9b62 100644
--- a/beast/unit_test/global_suites.h
+++ b/beast/unit_test/global_suites.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_UNIT_TEST_GLOBAL_SUITES_H_INCLUDED
 #define BEAST_UNIT_TEST_GLOBAL_SUITES_H_INCLUDED
 
-#include "suite_list.h"
+#include <beast/unit_test/suite_list.h>
 
 namespace beast {
 namespace unit_test {
diff --git a/beast/unit_test/match.h b/beast/unit_test/match.h
index ad0d1f07c..763c1ac65 100644
--- a/beast/unit_test/match.h
+++ b/beast/unit_test/match.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_UNIT_TEST_MATCH_H_INLCUDED
 #define BEAST_UNIT_TEST_MATCH_H_INLCUDED
 
-#include "suite_info.h"
+#include <beast/unit_test/suite_info.h>
 
 namespace beast {
 namespace unit_test {
diff --git a/beast/unit_test/print.h b/beast/unit_test/print.h
index b4cd355e5..db36c9f45 100644
--- a/beast/unit_test/print.h
+++ b/beast/unit_test/print.h
@@ -20,11 +20,11 @@
 #ifndef BEAST_UNIT_TEST_PRINT_H_INLCUDED
 #define BEAST_UNIT_TEST_PRINT_H_INLCUDED
 
-#include "amount.h"
-#include "results.h"
+#include <beast/unit_test/amount.h>
+#include <beast/unit_test/results.h>
 
-#include "../streams/abstract_ostream.h"
-#include "../streams/basic_std_ostream.h"
+#include <beast/streams/abstract_ostream.h>
+#include <beast/streams/basic_std_ostream.h>
 
 #include <iostream>
 #include <string>
diff --git a/beast/unit_test/recorder.h b/beast/unit_test/recorder.h
index 565167e75..153f8f17f 100644
--- a/beast/unit_test/recorder.h
+++ b/beast/unit_test/recorder.h
@@ -20,8 +20,8 @@
 #ifndef BEAST_UNIT_TEST_RECORDER_H_INLCUDED
 #define BEAST_UNIT_TEST_RECORDER_H_INLCUDED
 
-#include "results.h"
-#include "runner.h"
+#include <beast/unit_test/results.h>
+#include <beast/unit_test/runner.h>
 
 namespace beast {
 namespace unit_test {
diff --git a/beast/unit_test/reporter.h b/beast/unit_test/reporter.h
index ac2937ee2..c206ac47e 100644
--- a/beast/unit_test/reporter.h
+++ b/beast/unit_test/reporter.h
@@ -20,11 +20,11 @@
 #ifndef BEAST_UNIT_TEST_REPORTER_H_INLCUDED
 #define BEAST_UNIT_TEST_REPORTER_H_INLCUDED
 
-#include "amount.h"
-#include "recorder.h"
+#include <beast/unit_test/amount.h>
+#include <beast/unit_test/recorder.h>
 
-#include "../streams/abstract_ostream.h"
-#include "../streams/basic_std_ostream.h"
+#include <beast/streams/abstract_ostream.h>
+#include <beast/streams/basic_std_ostream.h>
 
 #include <boost/optional.hpp>
 #include <boost/ref.hpp>
diff --git a/beast/unit_test/results.h b/beast/unit_test/results.h
index 6dcecd84d..d19687d08 100644
--- a/beast/unit_test/results.h
+++ b/beast/unit_test/results.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_UNIT_TEST_RESULTS_H_INLCUDED
 #define BEAST_UNIT_TEST_RESULTS_H_INLCUDED
 
-#include "../container/const_container.h"
+#include <beast/container/const_container.h>
 
 #include <string>
 #include <vector>
diff --git a/beast/unit_test/runner.h b/beast/unit_test/runner.h
index d2b55e752..d4499f3e1 100644
--- a/beast/unit_test/runner.h
+++ b/beast/unit_test/runner.h
@@ -20,9 +20,9 @@
 #ifndef BEAST_UNIT_TEST_RUNNER_H_INCLUDED
 #define BEAST_UNIT_TEST_RUNNER_H_INCLUDED
 
-#include "suite_info.h"
+#include <beast/unit_test/suite_info.h>
 
-#include "../streams/abstract_ostream.h"
+#include <beast/streams/abstract_ostream.h>
 
 #include <cassert>
 #include <string>
diff --git a/beast/unit_test/suite.h b/beast/unit_test/suite.h
index 1bd157be1..e905fb565 100644
--- a/beast/unit_test/suite.h
+++ b/beast/unit_test/suite.h
@@ -20,9 +20,9 @@
 #ifndef BEAST_UNIT_TEST_SUITE_H_INCLUDED
 #define BEAST_UNIT_TEST_SUITE_H_INCLUDED
 
-#include "runner.h"
+#include <beast/unit_test/runner.h>
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <string>
 
 namespace beast {
@@ -274,7 +274,7 @@ private:
 #define BEAST_DEFINE_TESTSUITE(Class,Module,Library)
 
 #else
-#include "global_suites.h"
+#include <beast/unit_test/global_suites.h>
 #define BEAST_DEFINE_TESTSUITE(Class,Module,Library) \
         BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,false)
 #define BEAST_DEFINE_TESTSUITE_MANUAL(Class,Module,Library) \
diff --git a/beast/unit_test/suite_list.h b/beast/unit_test/suite_list.h
index 3cc534fcd..6194e93fa 100644
--- a/beast/unit_test/suite_list.h
+++ b/beast/unit_test/suite_list.h
@@ -20,9 +20,9 @@
 #ifndef BEAST_UNIT_TEST_SUITE_LIST_H_INCLUDED
 #define BEAST_UNIT_TEST_SUITE_LIST_H_INCLUDED
 
-#include "suite_info.h"
+#include <beast/unit_test/suite_info.h>
 
-#include "../container/const_container.h"
+#include <beast/container/const_container.h>
 
 #include <cassert>
 //#include <list>
diff --git a/beast/unit_test/tests/main.cpp b/beast/unit_test/tests/main.cpp
index 340b44bfc..589012a9b 100644
--- a/beast/unit_test/tests/main.cpp
+++ b/beast/unit_test/tests/main.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include "../../unit_test.h"
-#include "../../streams/debug_ostream.h"
+#include <beast/unit_test.h>
+#include <beast/streams/debug_ostream.h>
 
 #ifdef _MSC_VER
 # ifndef WIN32_LEAN_AND_MEAN // VC_EXTRALEAN
 #  define WIN32_LEAN_AND_MEAN
-#  include <windows.h>
+#include <windows.h>
 #  undef WIN32_LEAN_AND_MEAN
 # else
-#  include <windows.h>
+#include <windows.h>
 # endif
 #endif
 
diff --git a/beast/utility/Debug.h b/beast/utility/Debug.h
index 0a1d5e3e0..c1b0616a0 100644
--- a/beast/utility/Debug.h
+++ b/beast/utility/Debug.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_UTILITY_DEBUG_H_INCLUDED
 #define BEAST_UTILITY_DEBUG_H_INCLUDED
 
-#include "../strings/String.h"
+#include <beast/strings/String.h>
     
 namespace beast {
 
diff --git a/beast/utility/Error.h b/beast/utility/Error.h
index 0c095bfc2..2081eb8ad 100644
--- a/beast/utility/Error.h
+++ b/beast/utility/Error.h
@@ -20,9 +20,9 @@
 #ifndef BEAST_UTILITY_ERROR_H_INCLUDED
 #define BEAST_UTILITY_ERROR_H_INCLUDED
 
-#include "../Config.h"
+#include <beast/Config.h>
 
-#include "../strings/String.h"
+#include <beast/strings/String.h>
 
 #include <stdexcept>
 
diff --git a/beast/utility/LeakChecked.h b/beast/utility/LeakChecked.h
index 296d315ef..caf791c11 100644
--- a/beast/utility/LeakChecked.h
+++ b/beast/utility/LeakChecked.h
@@ -20,10 +20,10 @@
 #ifndef BEAST_UTILITY_LEAKCHECKED_H_INCLUDED
 #define BEAST_UTILITY_LEAKCHECKED_H_INCLUDED
 
-#include "../Config.h"
-#include "../Atomic.h"
-#include "../intrusive/LockFreeStack.h"
-#include "StaticObject.h"
+#include <beast/Config.h>
+#include <beast/Atomic.h>
+#include <beast/intrusive/LockFreeStack.h>
+#include <beast/utility/StaticObject.h>
 
 namespace beast {
 
diff --git a/beast/utility/PropertyStream.h b/beast/utility/PropertyStream.h
index 480b8db4d..f42dcf8e2 100644
--- a/beast/utility/PropertyStream.h
+++ b/beast/utility/PropertyStream.h
@@ -20,9 +20,9 @@
 #ifndef BEAST_UTILITY_PROPERTYSTREAM_H_INCLUDED
 #define BEAST_UTILITY_PROPERTYSTREAM_H_INCLUDED
 
-#include "../Uncopyable.h"
-#include "../intrusive/List.h"
-#include "../threads/SharedData.h"
+#include <beast/Uncopyable.h>
+#include <beast/intrusive/List.h>
+#include <beast/threads/SharedData.h>
 
 #include <cstdint>
 #include <sstream>
diff --git a/beast/utility/Utility.unity.cpp b/beast/utility/Utility.unity.cpp
index a05169f91..0b6cbe796 100644
--- a/beast/utility/Utility.unity.cpp
+++ b/beast/utility/Utility.unity.cpp
@@ -18,18 +18,18 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "impl/Error.cpp"
+#include <beast/utility/impl/Error.cpp>
 
-#include "impl/Debug.cpp"
-#include "impl/Journal.cpp"
-#include "impl/LeakChecked.cpp"
-#include "impl/StaticObject.cpp"
-#include "impl/PropertyStream.cpp"
+#include <beast/utility/impl/Debug.cpp>
+#include <beast/utility/impl/Journal.cpp>
+#include <beast/utility/impl/LeakChecked.cpp>
+#include <beast/utility/impl/StaticObject.cpp>
+#include <beast/utility/impl/PropertyStream.cpp>
 
-#include "tests/bassert.test.cpp"
-#include "tests/empty_base_optimization.test.cpp"
-#include "tests/Zero.test.cpp"
-#include "tests/tagged_integer.test.cpp"
+#include <beast/utility/tests/bassert.test.cpp>
+#include <beast/utility/tests/empty_base_optimization.test.cpp>
+#include <beast/utility/tests/Zero.test.cpp>
+#include <beast/utility/tests/tagged_integer.test.cpp>
diff --git a/beast/utility/Zero.h b/beast/utility/Zero.h
index 0cd1c950b..c09c18321 100644
--- a/beast/utility/Zero.h
+++ b/beast/utility/Zero.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_UTILITY_ZERO_H_INCLUDED
 #define BEAST_UTILITY_ZERO_H_INCLUDED
 
-#include "../config/CompilerConfig.h"
+#include <beast/config/CompilerConfig.h>
 
 // VS2013 SP1 fails with decltype return
 #define BEAST_NO_ZERO_AUTO_RETURN 1
diff --git a/beast/utility/empty_base_optimization.h b/beast/utility/empty_base_optimization.h
index 2989f0987..4ab904b47 100644
--- a/beast/utility/empty_base_optimization.h
+++ b/beast/utility/empty_base_optimization.h
@@ -21,7 +21,7 @@
 #ifndef BEAST_UTILITY_EMPTY_BASE_OPTIMIZATION_H_INCLUDED
 #define BEAST_UTILITY_EMPTY_BASE_OPTIMIZATION_H_INCLUDED
 
-#include "../utility/noexcept.h"
+#include <beast/utility/noexcept.h>
 #include <type_traits>
 #include <utility>
 
diff --git a/beast/utility/impl/Debug.cpp b/beast/utility/impl/Debug.cpp
index 0e27385e3..69e28dfd3 100644
--- a/beast/utility/impl/Debug.cpp
+++ b/beast/utility/impl/Debug.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include "../Debug.h"
-#include "../../unit_test/suite.h"
-#include "../../../modules/beast_core/system/SystemStats.h"
+#include <beast/utility/Debug.h>
+#include <beast/unit_test/suite.h>
+#include <modules/beast_core/system/SystemStats.h>
 
 namespace beast {
 
diff --git a/beast/utility/impl/Error.cpp b/beast/utility/impl/Error.cpp
index 7751c4176..021a4b838 100644
--- a/beast/utility/impl/Error.cpp
+++ b/beast/utility/impl/Error.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include "../Error.h"
-#include "../Debug.h"
+#include <beast/utility/Error.h>
+#include <beast/utility/Debug.h>
 
 #include <ostream>
 
diff --git a/beast/utility/impl/Journal.cpp b/beast/utility/impl/Journal.cpp
index 932ae6b75..7bb261e5e 100644
--- a/beast/utility/impl/Journal.cpp
+++ b/beast/utility/impl/Journal.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include "../Journal.h"
-#include "../../../modules/beast_core/memory/SharedSingleton.h"
+#include <beast/utility/Journal.h>
+#include <modules/beast_core/memory/SharedSingleton.h>
 
 namespace beast {
 
diff --git a/beast/utility/impl/LeakChecked.cpp b/beast/utility/impl/LeakChecked.cpp
index 3ac4e5204..4c9bae192 100644
--- a/beast/utility/impl/LeakChecked.cpp
+++ b/beast/utility/impl/LeakChecked.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include "../LeakChecked.h"
-#include "../../../modules/beast_core/logging/Logger.h"
+#include <beast/utility/LeakChecked.h>
+#include <modules/beast_core/logging/Logger.h>
 
 namespace beast {
 
diff --git a/beast/utility/impl/PropertyStream.cpp b/beast/utility/impl/PropertyStream.cpp
index 7ea88bb38..a0c3ec190 100644
--- a/beast/utility/impl/PropertyStream.cpp
+++ b/beast/utility/impl/PropertyStream.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include "../PropertyStream.h"
-#include "../../unit_test/suite.h"
+#include <beast/utility/PropertyStream.h>
+#include <beast/unit_test/suite.h>
 
 #include <limits>
 #include <iostream>
diff --git a/beast/utility/impl/StaticObject.cpp b/beast/utility/impl/StaticObject.cpp
index 5b44bb0dd..ae7a10c92 100644
--- a/beast/utility/impl/StaticObject.cpp
+++ b/beast/utility/impl/StaticObject.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include "../StaticObject.h"
-#include "../../threads/Thread.h"
+#include <beast/utility/StaticObject.h>
+#include <beast/threads/Thread.h>
 
 namespace beast {
 
diff --git a/beast/utility/is_call_possible.h b/beast/utility/is_call_possible.h
index 099c9fccd..182eb11cb 100644
--- a/beast/utility/is_call_possible.h
+++ b/beast/utility/is_call_possible.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_UTILITY_ISCALLPOSSIBLE_H_INCLUDED
 #define BEAST_UTILITY_ISCALLPOSSIBLE_H_INCLUDED
 
-#include "../cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 
 namespace beast {
 
diff --git a/beast/utility/tagged_integer.h b/beast/utility/tagged_integer.h
index e4c3d8c87..39a43def6 100644
--- a/beast/utility/tagged_integer.h
+++ b/beast/utility/tagged_integer.h
@@ -20,9 +20,9 @@
 #ifndef BEAST_UTILITY_TAGGED_INTEGER_H_INCLUDED
 #define BEAST_UTILITY_TAGGED_INTEGER_H_INCLUDED
 
-#include "../container/hash_append.h"
+#include <beast/container/hash_append.h>
 
-#include "noexcept.h"
+#include <beast/utility/noexcept.h>
 
 #include <functional>
 #include <iostream>
diff --git a/beast/utility/tests/Zero.test.cpp b/beast/utility/tests/Zero.test.cpp
index d40282d7b..64cd0c41f 100644
--- a/beast/utility/tests/Zero.test.cpp
+++ b/beast/utility/tests/Zero.test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include "../Zero.h"
+#include <beast/utility/Zero.h>
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 
diff --git a/beast/utility/tests/bassert.test.cpp b/beast/utility/tests/bassert.test.cpp
index 2da5c702a..ef67667a0 100644
--- a/beast/utility/tests/bassert.test.cpp
+++ b/beast/utility/tests/bassert.test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include "../../Config.h"
+#include <beast/Config.h>
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 
diff --git a/beast/utility/tests/empty_base_optimization.test.cpp b/beast/utility/tests/empty_base_optimization.test.cpp
index 1a72c2aed..10808df5a 100644
--- a/beast/utility/tests/empty_base_optimization.test.cpp
+++ b/beast/utility/tests/empty_base_optimization.test.cpp
@@ -18,12 +18,12 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "../empty_base_optimization.h"
+#include <beast/utility/empty_base_optimization.h>
 
-#include "../../unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 
diff --git a/beast/utility/tests/tagged_integer.test.cpp b/beast/utility/tests/tagged_integer.test.cpp
index 4e0a383f6..a8b7e6119 100644
--- a/beast/utility/tests/tagged_integer.test.cpp
+++ b/beast/utility/tests/tagged_integer.test.cpp
@@ -18,13 +18,13 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
 #include <type_traits>
 
-#include "../tagged_integer.h"
-#include "../../unit_test/suite.h"
+#include <beast/utility/tagged_integer.h>
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 
diff --git a/beast/utility/type_name.h b/beast/utility/type_name.h
index 3e02fdfe8..fadf8d907 100644
--- a/beast/utility/type_name.h
+++ b/beast/utility/type_name.h
@@ -24,7 +24,7 @@
 #include <typeinfo>
 #include <iostream>
 #ifndef _MSC_VER
-# include <cxxabi.h>
+#include <cxxabi.h>
 #endif
 #include <memory>
 #include <string>
diff --git a/modules/beast_asio/basics/FixedInputBuffer.h b/modules/beast_asio/basics/FixedInputBuffer.h
index 44da38a54..c260dc0ed 100644
--- a/modules/beast_asio/basics/FixedInputBuffer.h
+++ b/modules/beast_asio/basics/FixedInputBuffer.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_ASIO_BASICS_FIXEDINPUTBUFFER_H_INCLUDED
 #define BEAST_ASIO_BASICS_FIXEDINPUTBUFFER_H_INCLUDED
 
-#include "../../../beast/asio/buffer_sequence.h"
+#include <beast/asio/buffer_sequence.h>
 #include <array>
 
 namespace beast {
diff --git a/modules/beast_asio/beast_asio.h b/modules/beast_asio/beast_asio.h
index 80429b5dd..3d8e2cd20 100644
--- a/modules/beast_asio/beast_asio.h
+++ b/modules/beast_asio/beast_asio.h
@@ -21,57 +21,57 @@
 #define BEAST_ASIO_MODULE_H_INCLUDED
 
 // Must come before boost includes to fix the bost placeholders.
-#include "../beast_core/beast_core.h"
+#include <modules/beast_core/beast_core.h>
 
 // This module requires boost and possibly OpenSSL
-#include "system/BoostIncludes.h"
+#include <modules/beast_asio/system/BoostIncludes.h>
 
-#include "../../beast/http/URL.h"
-#include "../../beast/http/ParsedURL.h"
+#include <beast/http/URL.h>
+#include <beast/http/ParsedURL.h>
 
-#include "../../beast/asio/IPAddressConversion.h"
+#include <beast/asio/IPAddressConversion.h>
 
 // Order matters
-#include "async/AsyncObject.h"
+#include <modules/beast_asio/async/AsyncObject.h>
 
-#include "basics/FixedInputBuffer.h"
-#include "basics/PeerRole.h"
-#include "basics/SSLContext.h"
-#include "basics/SharedArg.h"
+#include <modules/beast_asio/basics/FixedInputBuffer.h>
+#include <modules/beast_asio/basics/PeerRole.h>
+#include <modules/beast_asio/basics/SSLContext.h>
+#include <modules/beast_asio/basics/SharedArg.h>
 
-#   include "http/HTTPVersion.h"
-#   include "http/HTTPField.h"
-#   include "http/HTTPHeaders.h"
-#  include "http/HTTPMessage.h"
-# include "http/HTTPRequest.h"
-# include "http/HTTPResponse.h"
+#include <modules/beast_asio/http/HTTPVersion.h>
+#include <modules/beast_asio/http/HTTPField.h>
+#include <modules/beast_asio/http/HTTPHeaders.h>
+#include <modules/beast_asio/http/HTTPMessage.h>
+#include <modules/beast_asio/http/HTTPRequest.h>
+#include <modules/beast_asio/http/HTTPResponse.h>
 
-# include "http/HTTPParser.h"
-#include "http/HTTPRequestParser.h"
-#include "http/HTTPResponseParser.h"
+#include <modules/beast_asio/http/HTTPParser.h>
+#include <modules/beast_asio/http/HTTPRequestParser.h>
+#include <modules/beast_asio/http/HTTPResponseParser.h>
 
-#include "http/HTTPClientType.h"
+#include <modules/beast_asio/http/HTTPClientType.h>
 
-#  include "protocol/InputParser.h"
-# include "protocol/HandshakeDetectLogic.h"
-#include "protocol/HandshakeDetectLogicPROXY.h"
-#include "protocol/HandshakeDetectLogicSSL2.h"
-#include "protocol/HandshakeDetectLogicSSL3.h"
-#include "protocol/HandshakeDetector.h"
-#include "protocol/PrefilledReadStream.h"
+#include <modules/beast_asio/protocol/InputParser.h>
+#include <modules/beast_asio/protocol/HandshakeDetectLogic.h>
+#include <modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h>
+#include <modules/beast_asio/protocol/HandshakeDetectLogicSSL2.h>
+#include <modules/beast_asio/protocol/HandshakeDetectLogicSSL3.h>
+#include <modules/beast_asio/protocol/HandshakeDetector.h>
+#include <modules/beast_asio/protocol/PrefilledReadStream.h>
 
-#include "tests/TestPeerBasics.h"
-#include "tests/TestPeer.h"
-#include "tests/TestPeerDetails.h"
-#include "tests/TestPeerLogic.h"
-#include "tests/TestPeerLogicSyncServer.h"
-#include "tests/TestPeerLogicSyncClient.h"
-#include "tests/TestPeerLogicProxyClient.h"
-#include "tests/TestPeerLogicAsyncServer.h"
-#include "tests/TestPeerLogicAsyncClient.h"
-#include "tests/TestPeerType.h"
-#include "tests/TestPeerDetailsTcp.h"
-#include "tests/PeerTest.h"
+#include <modules/beast_asio/tests/TestPeerBasics.h>
+#include <modules/beast_asio/tests/TestPeer.h>
+#include <modules/beast_asio/tests/TestPeerDetails.h>
+#include <modules/beast_asio/tests/TestPeerLogic.h>
+#include <modules/beast_asio/tests/TestPeerLogicSyncServer.h>
+#include <modules/beast_asio/tests/TestPeerLogicSyncClient.h>
+#include <modules/beast_asio/tests/TestPeerLogicProxyClient.h>
+#include <modules/beast_asio/tests/TestPeerLogicAsyncServer.h>
+#include <modules/beast_asio/tests/TestPeerLogicAsyncClient.h>
+#include <modules/beast_asio/tests/TestPeerType.h>
+#include <modules/beast_asio/tests/TestPeerDetailsTcp.h>
+#include <modules/beast_asio/tests/PeerTest.h>
 
 #endif
 
diff --git a/modules/beast_asio/beast_asio.unity.cpp b/modules/beast_asio/beast_asio.unity.cpp
index 6c95da660..aa4fc5562 100644
--- a/modules/beast_asio/beast_asio.unity.cpp
+++ b/modules/beast_asio/beast_asio.unity.cpp
@@ -18,39 +18,39 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "system/OpenSSLIncludes.h"
+#include <modules/beast_asio/system/OpenSSLIncludes.h>
 
-#include "beast_asio.h"
+#include <modules/beast_asio/beast_asio.h>
 
-# include "../../beast/http/impl/joyent_parser.h"
+#include <beast/http/impl/joyent_parser.h>
 
-#include "basics/PeerRole.cpp"
-#include "basics/SSLContext.cpp"
+#include <modules/beast_asio/basics/PeerRole.cpp>
+#include <modules/beast_asio/basics/SSLContext.cpp>
 
-#include "protocol/HandshakeDetectLogicPROXY.cpp"
+#include <modules/beast_asio/protocol/HandshakeDetectLogicPROXY.cpp>
 
-# include "http/HTTPParserImpl.h"
-#include "http/HTTPClientType.cpp"
-#include "http/HTTPField.cpp"
-#include "http/HTTPHeaders.cpp"
-#include "http/HTTPMessage.cpp"
-#include "http/HTTPRequest.cpp"
-#include "http/HTTPResponse.cpp"
-#include "http/HTTPVersion.cpp"
+#include <modules/beast_asio/http/HTTPParserImpl.h>
+#include <modules/beast_asio/http/HTTPClientType.cpp>
+#include <modules/beast_asio/http/HTTPField.cpp>
+#include <modules/beast_asio/http/HTTPHeaders.cpp>
+#include <modules/beast_asio/http/HTTPMessage.cpp>
+#include <modules/beast_asio/http/HTTPRequest.cpp>
+#include <modules/beast_asio/http/HTTPResponse.cpp>
+#include <modules/beast_asio/http/HTTPVersion.cpp>
 
-#include "tests/PeerTest.cpp"
-#include "tests/TestPeerBasics.cpp"
-#include "tests/TestPeerLogic.cpp"
-#include "tests/TestPeerLogicProxyClient.cpp"
-#include "tests/TestPeerLogicSyncServer.cpp"
-#include "tests/TestPeerLogicSyncClient.cpp"
-#include "tests/TestPeerLogicAsyncServer.cpp"
-#include "tests/TestPeerLogicAsyncClient.cpp"
-#include "tests/TestPeerUnitTests.cpp"
+#include <modules/beast_asio/tests/PeerTest.cpp>
+#include <modules/beast_asio/tests/TestPeerBasics.cpp>
+#include <modules/beast_asio/tests/TestPeerLogic.cpp>
+#include <modules/beast_asio/tests/TestPeerLogicProxyClient.cpp>
+#include <modules/beast_asio/tests/TestPeerLogicSyncServer.cpp>
+#include <modules/beast_asio/tests/TestPeerLogicSyncClient.cpp>
+#include <modules/beast_asio/tests/TestPeerLogicAsyncServer.cpp>
+#include <modules/beast_asio/tests/TestPeerLogicAsyncClient.cpp>
+#include <modules/beast_asio/tests/TestPeerUnitTests.cpp>
 
-#include "http/HTTPParser.cpp"
-#include "http/HTTPRequestParser.cpp"
-#include "http/HTTPResponseParser.cpp"
+#include <modules/beast_asio/http/HTTPParser.cpp>
+#include <modules/beast_asio/http/HTTPRequestParser.cpp>
+#include <modules/beast_asio/http/HTTPResponseParser.cpp>
diff --git a/modules/beast_asio/http/HTTPClientType.cpp b/modules/beast_asio/http/HTTPClientType.cpp
index 8dc68feec..2527d372e 100644
--- a/modules/beast_asio/http/HTTPClientType.cpp
+++ b/modules/beast_asio/http/HTTPClientType.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include "../../../beast/asio/wrap_handler.h"
-#include "../../../beast/asio/placeholders.h"
-#include "../../../beast/unit_test/suite.h"
+#include <beast/asio/wrap_handler.h>
+#include <beast/asio/placeholders.h>
+#include <beast/unit_test/suite.h>
 
-#include "../../../beast/cxx14/memory.h" // <memory>
+#include <beast/cxx14/memory.h> // <memory>
 
 namespace beast {
 namespace asio {
diff --git a/modules/beast_asio/http/HTTPClientType.h b/modules/beast_asio/http/HTTPClientType.h
index d256afe38..aac69eff7 100644
--- a/modules/beast_asio/http/HTTPClientType.h
+++ b/modules/beast_asio/http/HTTPClientType.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_ASIO_HTTPCLIENTTYPE_H_INCLUDED
 #define BEAST_ASIO_HTTPCLIENTTYPE_H_INCLUDED
 
-#include "../../../beast/asio/shared_handler.h"
+#include <beast/asio/shared_handler.h>
 
 #include <utility>
 
diff --git a/modules/beast_asio/http/HTTPField.h b/modules/beast_asio/http/HTTPField.h
index 9671de6a4..257b65c7e 100644
--- a/modules/beast_asio/http/HTTPField.h
+++ b/modules/beast_asio/http/HTTPField.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_ASIO_HTTPFIELD_H_INCLUDED
 #define BEAST_ASIO_HTTPFIELD_H_INCLUDED
 
-#include "../../../beast/strings/String.h"
+#include <beast/strings/String.h>
 
 namespace beast {
 
diff --git a/modules/beast_asio/http/HTTPHeaders.h b/modules/beast_asio/http/HTTPHeaders.h
index e3360327b..8b5d74aac 100644
--- a/modules/beast_asio/http/HTTPHeaders.h
+++ b/modules/beast_asio/http/HTTPHeaders.h
@@ -20,9 +20,9 @@
 #ifndef BEAST_ASIO_HTTPHEADERS_H_INCLUDED
 #define BEAST_ASIO_HTTPHEADERS_H_INCLUDED
 
-#include "HTTPField.h"
+#include <modules/beast_asio/http/HTTPField.h>
 
-#include "../../beast_core/text/StringPairArray.h"
+#include <modules/beast_core/text/StringPairArray.h>
 
 namespace beast {
 
diff --git a/modules/beast_asio/http/HTTPMessage.h b/modules/beast_asio/http/HTTPMessage.h
index 588b830ce..bafdb6304 100644
--- a/modules/beast_asio/http/HTTPMessage.h
+++ b/modules/beast_asio/http/HTTPMessage.h
@@ -20,12 +20,12 @@
 #ifndef BEAST_ASIO_HTTPMESSAGE_H_INCLUDED
 #define BEAST_ASIO_HTTPMESSAGE_H_INCLUDED
 
-#include "HTTPHeaders.h"
-#include "HTTPVersion.h"
+#include <modules/beast_asio/http/HTTPHeaders.h>
+#include <modules/beast_asio/http/HTTPVersion.h>
 
-#include "../../../beast/smart_ptr/SharedObject.h"
-#include "../../../beast/net/DynamicBuffer.h"
-#include "../../beast_core/text/StringPairArray.h"
+#include <beast/smart_ptr/SharedObject.h>
+#include <beast/net/DynamicBuffer.h>
+#include <modules/beast_core/text/StringPairArray.h>
 
 namespace beast {
 
diff --git a/modules/beast_asio/http/HTTPParser.h b/modules/beast_asio/http/HTTPParser.h
index 791f981bf..9ef09177e 100644
--- a/modules/beast_asio/http/HTTPParser.h
+++ b/modules/beast_asio/http/HTTPParser.h
@@ -20,8 +20,8 @@
 #ifndef BEAST_ASIO_HTTPPARSER_H_INCLUDED
 #define BEAST_ASIO_HTTPPARSER_H_INCLUDED
 
-#include "HTTPRequest.h"
-#include "HTTPResponse.h"
+#include <modules/beast_asio/http/HTTPRequest.h>
+#include <modules/beast_asio/http/HTTPResponse.h>
 
 namespace beast {
 
diff --git a/modules/beast_asio/http/HTTPRequest.h b/modules/beast_asio/http/HTTPRequest.h
index ee3d9db93..36b4dcc57 100644
--- a/modules/beast_asio/http/HTTPRequest.h
+++ b/modules/beast_asio/http/HTTPRequest.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_ASIO_HTTPREQUEST_H_INCLUDED
 #define BEAST_ASIO_HTTPREQUEST_H_INCLUDED
 
-#include "HTTPMessage.h"
+#include <modules/beast_asio/http/HTTPMessage.h>
 
 namespace beast {
 
diff --git a/modules/beast_asio/http/HTTPRequestParser.h b/modules/beast_asio/http/HTTPRequestParser.h
index 00cda4135..ef370e3d2 100644
--- a/modules/beast_asio/http/HTTPRequestParser.h
+++ b/modules/beast_asio/http/HTTPRequestParser.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_HTTP_REQUESTPARSER_H_INCLUDED
 #define BEAST_HTTP_REQUESTPARSER_H_INCLUDED
 
-#include "HTTPParser.h"
+#include <modules/beast_asio/http/HTTPParser.h>
 
 namespace beast {
 
diff --git a/modules/beast_asio/http/HTTPResponseParser.h b/modules/beast_asio/http/HTTPResponseParser.h
index 422c9f0b2..eee6d1d2b 100644
--- a/modules/beast_asio/http/HTTPResponseParser.h
+++ b/modules/beast_asio/http/HTTPResponseParser.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_HTTP_RESPONSEPARSER_H_INCLUDED
 #define BEAST_HTTP_RESPONSEPARSER_H_INCLUDED
 
-#include "HTTPParser.h"
+#include <modules/beast_asio/http/HTTPParser.h>
 
 namespace beast {
 
diff --git a/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h b/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h
index 329232e88..1593b3286 100644
--- a/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h
+++ b/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h
@@ -20,8 +20,8 @@
 #ifndef BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTLOGICPROXY_H_INCLUDED
 #define BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTLOGICPROXY_H_INCLUDED
 
-#include "HandshakeDetectLogic.h"
-#include "InputParser.h"
+#include <modules/beast_asio/protocol/HandshakeDetectLogic.h>
+#include <modules/beast_asio/protocol/InputParser.h>
 
 namespace beast {
 namespace asio {
diff --git a/modules/beast_asio/protocol/HandshakeDetector.h b/modules/beast_asio/protocol/HandshakeDetector.h
index 7b4be8461..f4281a664 100644
--- a/modules/beast_asio/protocol/HandshakeDetector.h
+++ b/modules/beast_asio/protocol/HandshakeDetector.h
@@ -20,11 +20,11 @@
 #ifndef BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTOR_H_INCLUDED
 #define BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTOR_H_INCLUDED
 
-#include "../../../beast/boost/get_pointer.h"
-#include "../../../beast/asio/bind_handler.h"
-#include "../../../beast/asio/wrap_handler.h"
-#include "../../../beast/asio/placeholders.h"
-#include "../../../beast/asio/shared_handler.h"
+#include <beast/boost/get_pointer.h>
+#include <beast/asio/bind_handler.h>
+#include <beast/asio/wrap_handler.h>
+#include <beast/asio/placeholders.h>
+#include <beast/asio/shared_handler.h>
 
 #include <boost/asio/detail/handler_cont_helpers.hpp>
 
diff --git a/modules/beast_asio/protocol/InputParser.h b/modules/beast_asio/protocol/InputParser.h
index d6bb3e84e..ae048ce38 100644
--- a/modules/beast_asio/protocol/InputParser.h
+++ b/modules/beast_asio/protocol/InputParser.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_ASIO_HANDSHAKE_INPUTPARSER_H_INCLUDED
 #define BEAST_ASIO_HANDSHAKE_INPUTPARSER_H_INCLUDED
 
-#include "../basics/FixedInputBuffer.h"
+#include <modules/beast_asio/basics/FixedInputBuffer.h>
 
 namespace beast {
 namespace asio {
diff --git a/modules/beast_asio/protocol/PrefilledReadStream.h b/modules/beast_asio/protocol/PrefilledReadStream.h
index 4d488f392..6bbb99d57 100644
--- a/modules/beast_asio/protocol/PrefilledReadStream.h
+++ b/modules/beast_asio/protocol/PrefilledReadStream.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_ASIO_HANDSHAKE_PREFILLEDREADSTREAM_H_INCLUDED
 #define BEAST_ASIO_HANDSHAKE_PREFILLEDREADSTREAM_H_INCLUDED
 
-#include "../../../beast/cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 #include <utility>
 
 namespace beast {
diff --git a/modules/beast_asio/system/BoostIncludes.h b/modules/beast_asio/system/BoostIncludes.h
index 609041cb8..728451012 100644
--- a/modules/beast_asio/system/BoostIncludes.h
+++ b/modules/beast_asio/system/BoostIncludes.h
@@ -55,6 +55,6 @@
 #include <boost/asio/detail/handler_cont_helpers.hpp>
 
 // work-around for broken <boost/get_pointer.hpp>
-#include "../../../beast/boost/get_pointer.h"
+#include <beast/boost/get_pointer.h>
 
 #endif
diff --git a/modules/beast_asio/tests/PeerTest.h b/modules/beast_asio/tests/PeerTest.h
index 6020db5d6..48345b14c 100644
--- a/modules/beast_asio/tests/PeerTest.h
+++ b/modules/beast_asio/tests/PeerTest.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_ASIO_TESTS_PEERTEST_H_INCLUDED
 #define BEAST_ASIO_TESTS_PEERTEST_H_INCLUDED
 
-#include "../../../beast/unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 namespace asio {
diff --git a/modules/beast_asio/tests/TestPeerDetails.h b/modules/beast_asio/tests/TestPeerDetails.h
index 18d4bd1ab..7a4a79fe2 100644
--- a/modules/beast_asio/tests/TestPeerDetails.h
+++ b/modules/beast_asio/tests/TestPeerDetails.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_ASIO_TESTS_TESTPEERDETAILS_H_INCLUDED
 #define BEAST_ASIO_TESTS_TESTPEERDETAILS_H_INCLUDED
 
-#include "../../../beast/asio/abstract_socket.h"
+#include <beast/asio/abstract_socket.h>
 
 namespace beast {
 namespace asio {
diff --git a/modules/beast_asio/tests/TestPeerDetailsTcp.h b/modules/beast_asio/tests/TestPeerDetailsTcp.h
index 2c4f576a1..b72b93915 100644
--- a/modules/beast_asio/tests/TestPeerDetailsTcp.h
+++ b/modules/beast_asio/tests/TestPeerDetailsTcp.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_ASIO_TESTS_TESTPEERDETAILSTCP_H_INCLUDED
 #define BEAST_ASIO_TESTS_TESTPEERDETAILSTCP_H_INCLUDED
 
-#include "../../../beast/asio/socket_wrapper.h"
+#include <beast/asio/socket_wrapper.h>
 
 namespace beast {
 namespace asio {
diff --git a/modules/beast_asio/tests/TestPeerUnitTests.cpp b/modules/beast_asio/tests/TestPeerUnitTests.cpp
index 22dfc7727..6c673efb3 100644
--- a/modules/beast_asio/tests/TestPeerUnitTests.cpp
+++ b/modules/beast_asio/tests/TestPeerUnitTests.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include "../../../beast/unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 namespace asio {
diff --git a/modules/beast_core/beast_core.h b/modules/beast_core/beast_core.h
index ea57ea6a6..d2db01f1b 100644
--- a/modules/beast_core/beast_core.h
+++ b/modules/beast_core/beast_core.h
@@ -25,12 +25,12 @@
 #define BEAST_CORE_H_INCLUDED
 
 // TargetPlatform.h should not use anything from BeastConfig.h
-#include "../../beast/Config.h"
-#include "../../beast/config/ContractChecks.h"
+#include <beast/Config.h>
+#include <beast/config/ContractChecks.h>
 
-# include "system/BeforeBoost.h"
-# include "system/BoostIncludes.h"
-#include "system/FunctionalIncludes.h"
+#include <modules/beast_core/system/BeforeBoost.h>
+#include <modules/beast_core/system/BoostIncludes.h>
+#include <modules/beast_core/system/FunctionalIncludes.h>
 
 #if BEAST_MSVC
 # pragma warning (disable: 4251) // (DLL build warning, must be disabled before pushing the warning state)
@@ -44,26 +44,26 @@
 //------------------------------------------------------------------------------
 
 // New header-only library modeled more closely according to boost
-#include "../../beast/SmartPtr.h"
-#include "../../beast/StaticAssert.h"
-#include "../../beast/Uncopyable.h"
-#include "../../beast/Atomic.h"
-#include "../../beast/Arithmetic.h"
-#include "../../beast/ByteOrder.h"
-#include "../../beast/HeapBlock.h"
-#include "../../beast/Memory.h"
-#include "../../beast/Intrusive.h"
-#include "../../beast/Strings.h"
-#include "../../beast/Threads.h"
+#include <beast/SmartPtr.h>
+#include <beast/StaticAssert.h>
+#include <beast/Uncopyable.h>
+#include <beast/Atomic.h>
+#include <beast/Arithmetic.h>
+#include <beast/ByteOrder.h>
+#include <beast/HeapBlock.h>
+#include <beast/Memory.h>
+#include <beast/Intrusive.h>
+#include <beast/Strings.h>
+#include <beast/Threads.h>
 
-#include "../../beast/utility/Debug.h"
-#include "../../beast/utility/Error.h"
-#include "../../beast/utility/Journal.h"
-#include "../../beast/utility/LeakChecked.h"
-#include "../../beast/utility/PropertyStream.h"
-#include "../../beast/utility/StaticObject.h"
+#include <beast/utility/Debug.h>
+#include <beast/utility/Error.h>
+#include <beast/utility/Journal.h>
+#include <beast/utility/LeakChecked.h>
+#include <beast/utility/PropertyStream.h>
+#include <beast/utility/StaticObject.h>
 
-#include "system/StandardIncludes.h"
+#include <modules/beast_core/system/StandardIncludes.h>
 
 namespace beast
 {
@@ -78,13 +78,13 @@ class FileOutputStream;
 // Order matters, since headers don't have their own #include lines.
 // Add new includes to the bottom.
 
-#include "system/Functional.h"
+#include <modules/beast_core/system/Functional.h>
 
-#include "time/AtExitHook.h"
-#include "time/Time.h"
-#include "threads/ScopedLock.h"
-#include "threads/CriticalSection.h"
-#include "containers/ElementComparator.h"
+#include <modules/beast_core/time/AtExitHook.h>
+#include <modules/beast_core/time/Time.h>
+#include <modules/beast_core/threads/ScopedLock.h>
+#include <modules/beast_core/threads/CriticalSection.h>
+#include <modules/beast_core/containers/ElementComparator.h>
 
 // If the MSVC debug heap headers were included, disable
 // the macros during the juce include since they conflict.
@@ -116,7 +116,7 @@ class FileOutputStream;
 #undef _aligned_offset_recalloc
 #undef _aligned_msize
 #endif
-#include "containers/ArrayAllocationBase.h"
+#include <modules/beast_core/containers/ArrayAllocationBase.h>
 #ifdef _CRTDBG_MAP_ALLOC
 #pragma pop_macro("_aligned_msize")
 #pragma pop_macro("_aligned_offset_recalloc")
@@ -133,49 +133,49 @@ class FileOutputStream;
 #pragma pop_macro("calloc")
 #endif
 
-#include "containers/Array.h"
+#include <modules/beast_core/containers/Array.h>
 
-#include "misc/Result.h"
-#include "text/StringArray.h"
-#include "memory/MemoryBlock.h"
-#include "files/File.h"
+#include <modules/beast_core/misc/Result.h>
+#include <modules/beast_core/text/StringArray.h>
+#include <modules/beast_core/memory/MemoryBlock.h>
+#include <modules/beast_core/files/File.h>
 
-#include "thread/MutexTraits.h"
-#include "diagnostic/FatalError.h"
-#include "text/LexicalCast.h"
-#include "maths/Math.h"
-#include "logging/Logger.h"
-#include "containers/LinkedListPointer.h"
-#include "maths/Random.h"
-#include "text/StringPairArray.h"
-#include "containers/ScopedValueSetter.h"
-#include "maths/Range.h"
-#include "files/DirectoryIterator.h"
-#include "streams/InputStream.h"
-#include "files/FileInputStream.h"
-#include "streams/InputSource.h"
-#include "streams/FileInputSource.h"
-#include "streams/OutputStream.h"
-#include "files/FileOutputStream.h"
-#include "files/FileSearchPath.h"
-#include "files/RandomAccessFile.h"
-#include "files/TemporaryFile.h"
-#include "logging/Logger.h"
-#include "memory/SharedSingleton.h"
-#include "misc/WindowsRegistry.h"
-#include "streams/MemoryOutputStream.h"
+#include <modules/beast_core/thread/MutexTraits.h>
+#include <modules/beast_core/diagnostic/FatalError.h>
+#include <modules/beast_core/text/LexicalCast.h>
+#include <modules/beast_core/maths/Math.h>
+#include <modules/beast_core/logging/Logger.h>
+#include <modules/beast_core/containers/LinkedListPointer.h>
+#include <modules/beast_core/maths/Random.h>
+#include <modules/beast_core/text/StringPairArray.h>
+#include <modules/beast_core/containers/ScopedValueSetter.h>
+#include <modules/beast_core/maths/Range.h>
+#include <modules/beast_core/files/DirectoryIterator.h>
+#include <modules/beast_core/streams/InputStream.h>
+#include <modules/beast_core/files/FileInputStream.h>
+#include <modules/beast_core/streams/InputSource.h>
+#include <modules/beast_core/streams/FileInputSource.h>
+#include <modules/beast_core/streams/OutputStream.h>
+#include <modules/beast_core/files/FileOutputStream.h>
+#include <modules/beast_core/files/FileSearchPath.h>
+#include <modules/beast_core/files/RandomAccessFile.h>
+#include <modules/beast_core/files/TemporaryFile.h>
+#include <modules/beast_core/logging/Logger.h>
+#include <modules/beast_core/memory/SharedSingleton.h>
+#include <modules/beast_core/misc/WindowsRegistry.h>
+#include <modules/beast_core/streams/MemoryOutputStream.h>
 
-#include "system/SystemStats.h"
-#include "diagnostic/SemanticVersion.h"
-#include "threads/DynamicLibrary.h"
-#include "threads/Process.h"
-#include "diagnostic/UnitTestUtilities.h"
+#include <modules/beast_core/system/SystemStats.h>
+#include <modules/beast_core/diagnostic/SemanticVersion.h>
+#include <modules/beast_core/threads/DynamicLibrary.h>
+#include <modules/beast_core/threads/Process.h>
+#include <modules/beast_core/diagnostic/UnitTestUtilities.h>
 
-#include "diagnostic/MeasureFunctionCallTime.h"
+#include <modules/beast_core/diagnostic/MeasureFunctionCallTime.h>
 
-#include "thread/DeadlineTimer.h"
+#include <modules/beast_core/thread/DeadlineTimer.h>
 
-#include "thread/Workers.h"
+#include <modules/beast_core/thread/Workers.h>
 
 #if BEAST_MSVC
 #pragma warning (pop)
diff --git a/modules/beast_core/beast_core.unity.cpp b/modules/beast_core/beast_core.unity.cpp
index 6c2c4cb7e..f2741a5ed 100644
--- a/modules/beast_core/beast_core.unity.cpp
+++ b/modules/beast_core/beast_core.unity.cpp
@@ -22,12 +22,12 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
 //==============================================================================
-#include "native/BasicNativeHeaders.h"
-#include "beast_core.h"
+#include <modules/beast_core/native/BasicNativeHeaders.h>
+#include <modules/beast_core/beast_core.h>
 
 #include <locale>
 #include <cctype>
@@ -126,45 +126,45 @@
 #undef _aligned_msize
 #endif
 
-#include "diagnostic/FatalError.cpp"
-#include "diagnostic/SemanticVersion.cpp"
-#include "diagnostic/UnitTestUtilities.cpp"
+#include <modules/beast_core/diagnostic/FatalError.cpp>
+#include <modules/beast_core/diagnostic/SemanticVersion.cpp>
+#include <modules/beast_core/diagnostic/UnitTestUtilities.cpp>
 
-#include "files/DirectoryIterator.cpp"
-#include "files/File.cpp"
-#include "files/FileInputStream.cpp"
-#include "files/FileOutputStream.cpp"
-#include "files/FileSearchPath.cpp"
-#include "files/RandomAccessFile.cpp"
-#include "files/TemporaryFile.cpp"
+#include <modules/beast_core/files/DirectoryIterator.cpp>
+#include <modules/beast_core/files/File.cpp>
+#include <modules/beast_core/files/FileInputStream.cpp>
+#include <modules/beast_core/files/FileOutputStream.cpp>
+#include <modules/beast_core/files/FileSearchPath.cpp>
+#include <modules/beast_core/files/RandomAccessFile.cpp>
+#include <modules/beast_core/files/TemporaryFile.cpp>
 
-#include "logging/Logger.cpp"
+#include <modules/beast_core/logging/Logger.cpp>
 
-#include "maths/Random.cpp"
+#include <modules/beast_core/maths/Random.cpp>
 
-#include "memory/MemoryBlock.cpp"
+#include <modules/beast_core/memory/MemoryBlock.cpp>
 
-#include "misc/Result.cpp"
+#include <modules/beast_core/misc/Result.cpp>
 
-#include "streams/FileInputSource.cpp"
-#include "streams/InputStream.cpp"
-#include "streams/MemoryOutputStream.cpp"
-#include "streams/OutputStream.cpp"
+#include <modules/beast_core/streams/FileInputSource.cpp>
+#include <modules/beast_core/streams/InputStream.cpp>
+#include <modules/beast_core/streams/MemoryOutputStream.cpp>
+#include <modules/beast_core/streams/OutputStream.cpp>
 
-#include "system/SystemStats.cpp"
+#include <modules/beast_core/system/SystemStats.cpp>
 
-#include "text/LexicalCast.cpp"
-#include "text/StringArray.cpp"
-#include "text/StringPairArray.cpp"
+#include <modules/beast_core/text/LexicalCast.cpp>
+#include <modules/beast_core/text/StringArray.cpp>
+#include <modules/beast_core/text/StringPairArray.cpp>
 
-#include "thread/DeadlineTimer.cpp"
-#include "thread/Workers.cpp"
+#include <modules/beast_core/thread/DeadlineTimer.cpp>
+#include <modules/beast_core/thread/Workers.cpp>
 
-#include "time/AtExitHook.cpp"
-#include "time/Time.cpp"
+#include <modules/beast_core/time/AtExitHook.cpp>
+#include <modules/beast_core/time/Time.cpp>
 
 #if BEAST_MAC || BEAST_IOS
-#include "native/osx_ObjCHelpers.h"
+#include <modules/beast_core/native/osx_ObjCHelpers.h>
 #endif
 
 #if BEAST_ANDROID
@@ -172,31 +172,31 @@
 #endif
 
 #if ! BEAST_WINDOWS
-#include "native/posix_SharedCode.h"
+#include <modules/beast_core/native/posix_SharedCode.h>
 #endif
 
 #if BEAST_MAC || BEAST_IOS
-#include "native/mac_Files.mm"
-#include "native/mac_Strings.mm"
-#include "native/mac_SystemStats.mm"
-#include "native/mac_Threads.mm"
+#include <modules/beast_core/native/mac_Files.mm>
+#include <modules/beast_core/native/mac_Strings.mm>
+#include <modules/beast_core/native/mac_SystemStats.mm>
+#include <modules/beast_core/native/mac_Threads.mm>
 
 #elif BEAST_WINDOWS
-#include "native/win32_ComSmartPtr.h"
-#include "native/win32_Files.cpp"
-#include "native/win32_Registry.cpp"
-#include "native/win32_SystemStats.cpp"
-#include "native/win32_Threads.cpp"
+#include <modules/beast_core/native/win32_ComSmartPtr.h>
+#include <modules/beast_core/native/win32_Files.cpp>
+#include <modules/beast_core/native/win32_Registry.cpp>
+#include <modules/beast_core/native/win32_SystemStats.cpp>
+#include <modules/beast_core/native/win32_Threads.cpp>
 
 #elif BEAST_LINUX
-#include "native/linux_Files.cpp"
-#include "native/linux_SystemStats.cpp"
-#include "native/linux_Threads.cpp"
+#include <modules/beast_core/native/linux_Files.cpp>
+#include <modules/beast_core/native/linux_SystemStats.cpp>
+#include <modules/beast_core/native/linux_Threads.cpp>
 
 #elif BEAST_BSD
-#include "native/bsd_Files.cpp"
-#include "native/bsd_SystemStats.cpp"
-#include "native/bsd_Threads.cpp"
+#include <modules/beast_core/native/bsd_Files.cpp>
+#include <modules/beast_core/native/bsd_SystemStats.cpp>
+#include <modules/beast_core/native/bsd_Threads.cpp>
 
 #elif BEAST_ANDROID
 #include "native/android_Files.cpp"
@@ -234,4 +234,4 @@ void beast_reportFatalError (char const* message, char const* fileName, int line
 #endif
 
 // Must be outside the namespace
-#include "system/BoostPlaceholdersFix.cpp"
+#include <modules/beast_core/system/BoostPlaceholdersFix.cpp>
diff --git a/modules/beast_core/containers/Array.h b/modules/beast_core/containers/Array.h
index fb66292f2..b458f5a43 100644
--- a/modules/beast_core/containers/Array.h
+++ b/modules/beast_core/containers/Array.h
@@ -24,9 +24,9 @@
 #ifndef BEAST_ARRAY_H_INCLUDED
 #define BEAST_ARRAY_H_INCLUDED
 
-#include "ArrayAllocationBase.h"
-#include "ElementComparator.h"
-#include "../threads/CriticalSection.h"
+#include <modules/beast_core/containers/ArrayAllocationBase.h>
+#include <modules/beast_core/containers/ElementComparator.h>
+#include <modules/beast_core/threads/CriticalSection.h>
 
 namespace beast {
 
diff --git a/modules/beast_core/containers/ArrayAllocationBase.h b/modules/beast_core/containers/ArrayAllocationBase.h
index 6fd4358ab..874d40402 100644
--- a/modules/beast_core/containers/ArrayAllocationBase.h
+++ b/modules/beast_core/containers/ArrayAllocationBase.h
@@ -24,7 +24,7 @@
 #ifndef BEAST_ARRAYALLOCATIONBASE_H_INCLUDED
 #define BEAST_ARRAYALLOCATIONBASE_H_INCLUDED
 
-#include "../../../beast/HeapBlock.h"
+#include <beast/HeapBlock.h>
 
 namespace beast {
 
diff --git a/modules/beast_core/diagnostic/FatalError.cpp b/modules/beast_core/diagnostic/FatalError.cpp
index 6be4f2ce4..539a45499 100644
--- a/modules/beast_core/diagnostic/FatalError.cpp
+++ b/modules/beast_core/diagnostic/FatalError.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include "../../../beast/unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 
diff --git a/modules/beast_core/diagnostic/SemanticVersion.cpp b/modules/beast_core/diagnostic/SemanticVersion.cpp
index 732b74c78..92651d74f 100644
--- a/modules/beast_core/diagnostic/SemanticVersion.cpp
+++ b/modules/beast_core/diagnostic/SemanticVersion.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include "../../../beast/unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 
diff --git a/modules/beast_core/files/File.cpp b/modules/beast_core/files/File.cpp
index a8312b735..f613ba009 100644
--- a/modules/beast_core/files/File.cpp
+++ b/modules/beast_core/files/File.cpp
@@ -21,7 +21,7 @@
 */
 //==============================================================================
 
-#include "../../../beast/unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 
diff --git a/modules/beast_core/files/File.h b/modules/beast_core/files/File.h
index 01832eb9f..03891714e 100644
--- a/modules/beast_core/files/File.h
+++ b/modules/beast_core/files/File.h
@@ -24,12 +24,12 @@
 #ifndef BEAST_FILE_H_INCLUDED
 #define BEAST_FILE_H_INCLUDED
 
-#include "../containers/Array.h"
-#include "../memory/MemoryBlock.h"
-#include "../misc/Result.h"
-#include "../time/Time.h"
-#include "../text/StringArray.h"
-#include "../threads/CriticalSection.h"
+#include <modules/beast_core/containers/Array.h>
+#include <modules/beast_core/memory/MemoryBlock.h>
+#include <modules/beast_core/misc/Result.h>
+#include <modules/beast_core/time/Time.h>
+#include <modules/beast_core/text/StringArray.h>
+#include <modules/beast_core/threads/CriticalSection.h>
 
 namespace beast {
 
diff --git a/modules/beast_core/files/RandomAccessFile.cpp b/modules/beast_core/files/RandomAccessFile.cpp
index 73a2e3527..4d610ed1c 100644
--- a/modules/beast_core/files/RandomAccessFile.cpp
+++ b/modules/beast_core/files/RandomAccessFile.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include "../../../beast/unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 
diff --git a/modules/beast_core/maths/Random.cpp b/modules/beast_core/maths/Random.cpp
index 496c8fc95..86e23b1eb 100644
--- a/modules/beast_core/maths/Random.cpp
+++ b/modules/beast_core/maths/Random.cpp
@@ -21,7 +21,7 @@
 */
 //==============================================================================
 
-#include "../../../beast/unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 
diff --git a/modules/beast_core/memory/MemoryBlock.h b/modules/beast_core/memory/MemoryBlock.h
index 7e365dfd5..4364e2213 100644
--- a/modules/beast_core/memory/MemoryBlock.h
+++ b/modules/beast_core/memory/MemoryBlock.h
@@ -24,7 +24,7 @@
 #ifndef BEAST_MEMORYBLOCK_H_INCLUDED
 #define BEAST_MEMORYBLOCK_H_INCLUDED
 
-#include "../../../beast/utility/LeakChecked.h"
+#include <beast/utility/LeakChecked.h>
 
 namespace beast {
 
diff --git a/modules/beast_core/memory/SharedSingleton.h b/modules/beast_core/memory/SharedSingleton.h
index fca8841ed..200b9a995 100644
--- a/modules/beast_core/memory/SharedSingleton.h
+++ b/modules/beast_core/memory/SharedSingleton.h
@@ -20,9 +20,9 @@
 #ifndef BEAST_SHAREDSINGLETON_H_INCLUDED
 #define BEAST_SHAREDSINGLETON_H_INCLUDED
 
-#include "../../../beast/threads/SpinLock.h"
-#include "../../../beast/smart_ptr/SharedPtr.h"
-#include "../time/AtExitHook.h"
+#include <beast/threads/SpinLock.h>
+#include <beast/smart_ptr/SharedPtr.h>
+#include <modules/beast_core/time/AtExitHook.h>
 
 namespace beast
 {
diff --git a/modules/beast_core/native/BasicNativeHeaders.h b/modules/beast_core/native/BasicNativeHeaders.h
index e20e4fd0b..b3f42dcba 100644
--- a/modules/beast_core/native/BasicNativeHeaders.h
+++ b/modules/beast_core/native/BasicNativeHeaders.h
@@ -24,7 +24,7 @@
 #ifndef BEAST_BASICNATIVEHEADERS_H_INCLUDED
 #define BEAST_BASICNATIVEHEADERS_H_INCLUDED
 
-#include "../../../beast/Config.h"
+#include <beast/Config.h>
 
 #undef T
 
diff --git a/modules/beast_core/system/BeforeBoost.h b/modules/beast_core/system/BeforeBoost.h
index ce9c2bc5e..fc7a8626b 100644
--- a/modules/beast_core/system/BeforeBoost.h
+++ b/modules/beast_core/system/BeforeBoost.h
@@ -21,12 +21,12 @@
 #define BEAST_CORE_SYSTEM_BEFOREBOOST_H_INCLUDED
 
 // TargetPlatform.h should not use anything from BeastConfig.h
-#include "../../../beast/Config.h"
+#include <beast/Config.h>
 
 // This file should be included before including any boost headers.
 // If you don't include this file, and you include boost headers,
 // Beast will generate a compile error with an explanation of why.
 
-#include "BoostPlaceholdersFix.h"
+#include <modules/beast_core/system/BoostPlaceholdersFix.h>
 
 #endif
diff --git a/modules/beast_core/system/FunctionalIncludes.h b/modules/beast_core/system/FunctionalIncludes.h
index b7d4b370b..bc042832e 100644
--- a/modules/beast_core/system/FunctionalIncludes.h
+++ b/modules/beast_core/system/FunctionalIncludes.h
@@ -28,7 +28,7 @@
 # elif BEAST_MSVC
 #  define BEAST_FUNCTIONAL_USES_STD 1
 # elif BEAST_IOS || BEAST_MAC
-#  include <ciso646>                        // detect version of std::lib
+#include <ciso646>                        // detect version of std::lib
 #  if BEAST_IOS && BEAST_USE_BOOST_FEATURES // Work-around for iOS bugs with bind.
 #   define BEAST_FUNCTIONAL_USES_BOOST 1
 #  elif _LIBCPP_VERSION // libc++
@@ -44,9 +44,9 @@
 #endif
 
 #if BEAST_FUNCTIONAL_USES_STD
-# include <functional>
+#include <functional>
 #elif BEAST_FUNCTIONAL_USES_TR1
-# include <tr1/functional>
+#include <tr1/functional>
 #elif BEAST_FUNCTIONAL_USES_BOOST
 // included in BoostPlaceholdersFix.h
 #endif
diff --git a/modules/beast_core/text/LexicalCast.cpp b/modules/beast_core/text/LexicalCast.cpp
index 09005298f..a72b09617 100644
--- a/modules/beast_core/text/LexicalCast.cpp
+++ b/modules/beast_core/text/LexicalCast.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include "../../../beast/unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 
diff --git a/modules/beast_core/text/LexicalCast.h b/modules/beast_core/text/LexicalCast.h
index 9315816ce..ebaf52275 100644
--- a/modules/beast_core/text/LexicalCast.h
+++ b/modules/beast_core/text/LexicalCast.h
@@ -21,7 +21,7 @@
 #define BEAST_LEXICALCAST_H_INCLUDED
 
 #include <string>
-#include "../../../beast/cxx14/type_traits.h" // <type_traits>
+#include <beast/cxx14/type_traits.h> // <type_traits>
 
 #include <cerrno>
 #include <cstdlib>
diff --git a/modules/beast_core/text/StringArray.h b/modules/beast_core/text/StringArray.h
index 1957fe9b4..526bcdcea 100644
--- a/modules/beast_core/text/StringArray.h
+++ b/modules/beast_core/text/StringArray.h
@@ -24,8 +24,8 @@
 #ifndef BEAST_STRINGARRAY_H_INCLUDED
 #define BEAST_STRINGARRAY_H_INCLUDED
 
-#include "../containers/Array.h"
-#include "../threads/CriticalSection.h"
+#include <modules/beast_core/containers/Array.h>
+#include <modules/beast_core/threads/CriticalSection.h>
 
 namespace beast {
 
diff --git a/modules/beast_core/text/StringPairArray.h b/modules/beast_core/text/StringPairArray.h
index e9edce21e..dd2f4b570 100644
--- a/modules/beast_core/text/StringPairArray.h
+++ b/modules/beast_core/text/StringPairArray.h
@@ -24,8 +24,8 @@
 #ifndef BEAST_STRINGPAIRARRAY_H_INCLUDED
 #define BEAST_STRINGPAIRARRAY_H_INCLUDED
 
-#include "StringArray.h"
-#include "../../../beast/utility/LeakChecked.h"
+#include <modules/beast_core/text/StringArray.h>
+#include <beast/utility/LeakChecked.h>
 
 namespace beast {
 
diff --git a/modules/beast_core/thread/Workers.cpp b/modules/beast_core/thread/Workers.cpp
index 2c72f9bec..b59b36a67 100644
--- a/modules/beast_core/thread/Workers.cpp
+++ b/modules/beast_core/thread/Workers.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include "../../../beast/unit_test/suite.h"
+#include <beast/unit_test/suite.h>
 
 namespace beast {
 
diff --git a/modules/beast_core/thread/Workers.h b/modules/beast_core/thread/Workers.h
index f20bc3582..4e92138c0 100644
--- a/modules/beast_core/thread/Workers.h
+++ b/modules/beast_core/thread/Workers.h
@@ -20,8 +20,8 @@
 #ifndef BEAST_WORKERS_H_INCLUDED
 #define BEAST_WORKERS_H_INCLUDED
 
-#include "../system/SystemStats.h"
-#include "../../../beast/threads/semaphore.h"
+#include <modules/beast_core/system/SystemStats.h>
+#include <beast/threads/semaphore.h>
 
 namespace beast {
 
diff --git a/modules/beast_core/thread/detail/ScopedLock.h b/modules/beast_core/thread/detail/ScopedLock.h
index f4a72d354..49289a27a 100644
--- a/modules/beast_core/thread/detail/ScopedLock.h
+++ b/modules/beast_core/thread/detail/ScopedLock.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CORE_THREAD_DETAIL_SCOPEDLOCK_H_INCLUDED
 #define BEAST_CORE_THREAD_DETAIL_SCOPEDLOCK_H_INCLUDED
 
-#include "../MutexTraits.h"
+#include <modules/beast_core/thread/MutexTraits.h>
 
 namespace beast
 {
diff --git a/modules/beast_core/threads/CriticalSection.h b/modules/beast_core/threads/CriticalSection.h
index 1192764c8..071b8922e 100644
--- a/modules/beast_core/threads/CriticalSection.h
+++ b/modules/beast_core/threads/CriticalSection.h
@@ -24,7 +24,7 @@
 #ifndef BEAST_CRITICALSECTION_H_INCLUDED
 #define BEAST_CRITICALSECTION_H_INCLUDED
 
-#include "ScopedLock.h"
+#include <modules/beast_core/threads/ScopedLock.h>
 
 namespace beast {
 
diff --git a/modules/beast_core/time/AtExitHook.h b/modules/beast_core/time/AtExitHook.h
index 42ddbc55e..91fdf85e8 100644
--- a/modules/beast_core/time/AtExitHook.h
+++ b/modules/beast_core/time/AtExitHook.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CORE_ATEXITHOOK_H_INCLUDED
 #define BEAST_CORE_ATEXITHOOK_H_INCLUDED
 
-#include "../../../beast/intrusive/List.h"
+#include <beast/intrusive/List.h>
 
 namespace beast {
 
diff --git a/modules/beast_core/time/Time.h b/modules/beast_core/time/Time.h
index d3c12b328..f8294a1fd 100644
--- a/modules/beast_core/time/Time.h
+++ b/modules/beast_core/time/Time.h
@@ -24,7 +24,7 @@
 #ifndef BEAST_TIME_H_INCLUDED
 #define BEAST_TIME_H_INCLUDED
 
-#include "../../../beast/chrono/RelativeTime.h"
+#include <beast/chrono/RelativeTime.h>
 
 namespace beast {
 
diff --git a/modules/beast_sqdb/api/session.h b/modules/beast_sqdb/api/session.h
index 56d04978e..17b1dc715 100644
--- a/modules/beast_sqdb/api/session.h
+++ b/modules/beast_sqdb/api/session.h
@@ -60,8 +60,8 @@
 #ifndef BEAST_SQDB_SESSION_H_INCLUDED
 #define BEAST_SQDB_SESSION_H_INCLUDED
 
-#include "../../../beast/smart_ptr/SharedPtr.h"
-#include "../../beast_core/memory/SharedSingleton.h"
+#include <beast/smart_ptr/SharedPtr.h>
+#include <modules/beast_core/memory/SharedSingleton.h>
 
 namespace beast {
 namespace sqdb {
diff --git a/modules/beast_sqdb/api/transaction.h b/modules/beast_sqdb/api/transaction.h
index 4fa050f61..d9f1bed50 100644
--- a/modules/beast_sqdb/api/transaction.h
+++ b/modules/beast_sqdb/api/transaction.h
@@ -60,7 +60,7 @@
 #ifndef BEAST_SQDB_TRANSACTION_H_INCLUDED
 #define BEAST_SQDB_TRANSACTION_H_INCLUDED
 
-#include "../../../beast/utility/Error.h"
+#include <beast/utility/Error.h>
 
 namespace beast {
 namespace sqdb {
diff --git a/modules/beast_sqdb/api/type_conversion_traits.h b/modules/beast_sqdb/api/type_conversion_traits.h
index 9625bd05a..e49e9fabe 100644
--- a/modules/beast_sqdb/api/type_conversion_traits.h
+++ b/modules/beast_sqdb/api/type_conversion_traits.h
@@ -60,7 +60,7 @@
 #ifndef BEAST_SQDB_TYPE_CONVERSION_TRAITS_H_INCLUDED
 #define BEAST_SQDB_TYPE_CONVERSION_TRAITS_H_INCLUDED
 
-#include "../../beast_core/time/Time.h"
+#include <modules/beast_core/time/Time.h>
 
 #include <cassert>
 
diff --git a/modules/beast_sqdb/beast_sqdb.h b/modules/beast_sqdb/beast_sqdb.h
index 7e826fcba..2a547cf7e 100644
--- a/modules/beast_sqdb/beast_sqdb.h
+++ b/modules/beast_sqdb/beast_sqdb.h
@@ -91,32 +91,32 @@ class session;               // statement.h
 #pragma warning (disable: 4355) // 'this' : used in base member initializer list
 #endif
 
-#include "api/backend.h"
-#include "api/transaction.h"
-#include "detail/type_ptr.h"
+#include <modules/beast_sqdb/api/backend.h>
+#include <modules/beast_sqdb/api/transaction.h>
+#include <modules/beast_sqdb/detail/type_ptr.h>
 
-#include "api/blob.h"
-#include "api/type_conversion_traits.h"
+#include <modules/beast_sqdb/api/blob.h>
+#include <modules/beast_sqdb/api/type_conversion_traits.h>
 
-#include "detail/exchange_traits.h"
+#include <modules/beast_sqdb/detail/exchange_traits.h>
 
-#include "detail/into_type.h"
-#include "detail/use_type.h"
+#include <modules/beast_sqdb/detail/into_type.h>
+#include <modules/beast_sqdb/detail/use_type.h>
 
-#include "api/statement.h"
-#include "detail/type_conversion.h"
+#include <modules/beast_sqdb/api/statement.h>
+#include <modules/beast_sqdb/detail/type_conversion.h>
 
-#include "detail/ref_counted_statement.h"
+#include <modules/beast_sqdb/detail/ref_counted_statement.h>
 
-#include "api/into.h"
-#include "api/use.h"
-#include "detail/ref_counted_prepare_info.h"
+#include <modules/beast_sqdb/api/into.h>
+#include <modules/beast_sqdb/api/use.h>
+#include <modules/beast_sqdb/detail/ref_counted_prepare_info.h>
 
-#include "detail/prepare_temp_type.h"
+#include <modules/beast_sqdb/detail/prepare_temp_type.h>
 
-#include "detail/once_temp_type.h"
+#include <modules/beast_sqdb/detail/once_temp_type.h>
 
-#include "api/session.h"
+#include <modules/beast_sqdb/api/session.h>
 
 #if _MSC_VER
 #pragma warning (pop)
diff --git a/modules/beast_sqdb/beast_sqdb.unity.cpp b/modules/beast_sqdb/beast_sqdb.unity.cpp
index fe27792cc..fcb003b69 100644
--- a/modules/beast_sqdb/beast_sqdb.unity.cpp
+++ b/modules/beast_sqdb/beast_sqdb.unity.cpp
@@ -18,12 +18,12 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
-#include "beast_sqdb.h"
+#include <modules/beast_sqdb/beast_sqdb.h>
 
-#include "../beast_sqlite/beast_sqlite.h"
+#include <modules/beast_sqlite/beast_sqlite.h>
 
 #if BEAST_MSVC
 #pragma warning (push)
@@ -32,21 +32,21 @@
 #endif
 
 // implementation headers
-#include "detail/error_codes.h"
-#include "detail/statement_imp.h"
+#include <modules/beast_sqdb/detail/error_codes.h>
+#include <modules/beast_sqdb/detail/statement_imp.h>
 
-#include "source/blob.cpp"
-#include "source/error_codes.cpp"
-#include "source/into_type.cpp"
-#include "source/once_temp_type.cpp"
-#include "source/prepare_temp_type.cpp"
-#include "source/ref_counted_prepare_info.cpp"
-#include "source/ref_counted_statement.cpp"
-#include "source/session.cpp"
-#include "source/statement.cpp"
-#include "source/statement_imp.cpp"
-#include "source/transaction.cpp"
-#include "source/use_type.cpp"
+#include <modules/beast_sqdb/source/blob.cpp>
+#include <modules/beast_sqdb/source/error_codes.cpp>
+#include <modules/beast_sqdb/source/into_type.cpp>
+#include <modules/beast_sqdb/source/once_temp_type.cpp>
+#include <modules/beast_sqdb/source/prepare_temp_type.cpp>
+#include <modules/beast_sqdb/source/ref_counted_prepare_info.cpp>
+#include <modules/beast_sqdb/source/ref_counted_statement.cpp>
+#include <modules/beast_sqdb/source/session.cpp>
+#include <modules/beast_sqdb/source/statement.cpp>
+#include <modules/beast_sqdb/source/statement_imp.cpp>
+#include <modules/beast_sqdb/source/transaction.cpp>
+#include <modules/beast_sqdb/source/use_type.cpp>
 
 #if BEAST_MSVC
 #pragma warning (pop)
diff --git a/modules/beast_sqlite/beast_sqlite.h b/modules/beast_sqlite/beast_sqlite.h
index 0f4d678d2..804910650 100644
--- a/modules/beast_sqlite/beast_sqlite.h
+++ b/modules/beast_sqlite/beast_sqlite.h
@@ -27,7 +27,7 @@
     SQLite is public domain software, visit http://sqlite.org
 */
 
-#include "../../beast/config/PlatformConfig.h"
+#include <beast/config/PlatformConfig.h>
 
 #if BEAST_IOS || BEAST_MAC
 # define BEAST_HAVE_NATIVE_SQLITE 1
@@ -37,9 +37,9 @@
 
 #ifndef BEAST_SQLITE_CPP_INCLUDED
 # if BEAST_USE_NATIVE_SQLITE && BEAST_HAVE_NATIVE_SQLITE
-#  include <sqlite3.h>
+#include <sqlite3.h>
 # else
-#  include "sqlite/sqlite3.h" // Amalgamated
+#include <modules/beast_sqlite/sqlite/sqlite3.h> // Amalgamated
 # endif
 #endif
 
diff --git a/modules/beast_sqlite/beast_sqlite.unity.c b/modules/beast_sqlite/beast_sqlite.unity.c
index 7e08b8f6c..c5bf8b21a 100644
--- a/modules/beast_sqlite/beast_sqlite.unity.c
+++ b/modules/beast_sqlite/beast_sqlite.unity.c
@@ -24,13 +24,13 @@
 */
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
+#include <BeastConfig.h>
 #endif
 
 // Prevents sqlite.h from being included, since it screws up the .c
 #define BEAST_SQLITE_CPP_INCLUDED
 
-#include "beast_sqlite.h"
+#include <modules/beast_sqlite/beast_sqlite.h>
 
 #if ! (BEAST_USE_NATIVE_SQLITE && BEAST_HAVE_NATIVE_SQLITE)
 
@@ -64,7 +64,7 @@
 #define NDEBUG
 #endif
 
-#include "sqlite/sqlite3.c"
+#include <modules/beast_sqlite/sqlite/sqlite3.c>
 
 #if BEAST_MSVC
 #pragma warning (pop)
diff --git a/modules/beast_sqlite/sqlite/sqlite3.c b/modules/beast_sqlite/sqlite/sqlite3.c
index 7c6d3e280..850aba927 100644
--- a/modules/beast_sqlite/sqlite/sqlite3.c
+++ b/modules/beast_sqlite/sqlite/sqlite3.c
@@ -90,9 +90,9 @@
 ** disabled.
 */
 #if defined(_HAVE_MINGW_H)
-# include "mingw.h"
+#include "mingw.h"
 #elif defined(_HAVE__MINGW_H)
-# include "_mingw.h"
+#include "_mingw.h"
 #endif
 
 /*
@@ -8503,7 +8503,7 @@ SQLITE_PRIVATE const int sqlite3one;
 ** Default maximum size of memory used by memory-mapped I/O in the VFS
 */
 #ifdef __APPLE__
-# include <TargetConditionals.h>
+#include <TargetConditionals.h>
 # if TARGET_OS_IPHONE
 #   undef SQLITE_MAX_MMAP_SIZE
 #   define SQLITE_MAX_MMAP_SIZE 0
@@ -9886,7 +9886,7 @@ SQLITE_PRIVATE void sqlite3PCacheSetDefault(void);
 #endif
 
 #if SQLITE_OS_WIN
-# include <windows.h>
+#include <windows.h>
 #endif
 
 /*
@@ -12184,7 +12184,7 @@ SQLITE_PRIVATE int sqlite3CantopenError(int);
 */
 #if !defined(SQLITE_ASCII) || \
     (defined(SQLITE_ENABLE_FTS3) && defined(SQLITE_AMALGAMATION))
-# include <ctype.h>
+#include <ctype.h>
 #endif
 
 /*
@@ -16188,7 +16188,7 @@ static malloc_zone_t* _sqliteZone_;
 ** the macro SQLITE_MALLOCSIZE to the desired function name.
 */
 #if defined(SQLITE_USE_MALLOC_H)
-#  include <malloc.h>
+#include <malloc.h>
 #  if defined(SQLITE_USE_MALLOC_USABLE_SIZE)
 #    if !defined(SQLITE_MALLOCSIZE)
 #      define SQLITE_MALLOCSIZE(x)   malloc_usable_size(x)
@@ -21745,7 +21745,7 @@ SQLITE_PRIVATE void sqlite3UtfSelfTest(void){
 */
 /* #include <stdarg.h> */
 #ifdef SQLITE_HAVE_ISNAN
-# include <math.h>
+#include <math.h>
 #endif
 
 /*
@@ -23580,22 +23580,22 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
 
 
 #if SQLITE_ENABLE_LOCKING_STYLE
-# include <sys/ioctl.h>
+#include <sys/ioctl.h>
 # if OS_VXWORKS
-#  include <semaphore.h>
-#  include <limits.h>
+#include <semaphore.h>
+#include <limits.h>
 # else
-#  include <sys/file.h>
-#  include <sys/param.h>
+#include <sys/file.h>
+#include <sys/param.h>
 # endif
 #endif /* SQLITE_ENABLE_LOCKING_STYLE */
 
 #if defined(__APPLE__) || (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS)
-# include <sys/mount.h>
+#include <sys/mount.h>
 #endif
 
 #ifdef HAVE_UTIME
-# include <utime.h>
+#include <utime.h>
 #endif
 
 /*
@@ -23608,7 +23608,7 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
 ** the SQLITE_UNIX_THREADS macro.
 */
 #if SQLITE_THREADSAFE
-/* # include <pthread.h> */
+/* #include <pthread.h> */
 # define SQLITE_UNIX_THREADS 1
 #endif
 
@@ -31159,8 +31159,8 @@ SQLITE_API int sqlite3_os_end(void){
 #if SQLITE_OS_WIN               /* This file is used for Windows only */
 
 #ifdef __CYGWIN__
-# include <sys/cygwin.h>
-# include <errno.h> /* amalgamator: keep */
+#include <sys/cygwin.h>
+#include <errno.h> /* amalgamator: keep */
 #endif
 
 /*
diff --git a/site_scons/site_tools/VSProject.py b/site_scons/site_tools/VSProject.py
index 5cff70f8a..9e27ed6e6 100644
--- a/site_scons/site_tools/VSProject.py
+++ b/site_scons/site_tools/VSProject.py
@@ -588,12 +588,12 @@ class _ProjectGenerator(object):
                 _walk(target, items)
         self.items = sorted(items.itervalues(), key=lambda x: x.path())
 
-    def makeListTag(self, items, tag, prefix='', inherit=True):
+    def makeListTag(self, items, prefix, tag, attrs, inherit=True):
         '''Builds an XML tag string from a list of items. If items is
         empty, then the returned string is empty.'''
         if not items:
             return ''
-        s = '%(prefix)s<%(tag)s>' % locals()
+        s = '%(prefix)s<%(tag)s%(attrs)s>' % locals()
         s += ';'.join(items)
         if inherit:
             s += ';%%(%(tag)s)' % locals()
@@ -607,6 +607,13 @@ class _ProjectGenerator(object):
                 items.append(winpath(os.path.relpath(path, self.project_dir)))
         return items
 
+    def extraRelPaths(self, paths, base):
+        extras = []
+        for path in paths:
+            if not path in base:
+                extras.append(path)
+        return self.relPaths(extras)
+
     def writeHeader(self):
         global clSwitches
 
@@ -655,7 +662,7 @@ class _ProjectGenerator(object):
                     itemList(config.env['CPPDEFINES'], ';')))
             props = ''
             props += self.makeListTag(self.relPaths(sorted(config.env['CPPPATH'])),
-                'AdditionalIncludeDirectories', '      ', True)
+                '      ', 'AdditionalIncludeDirectories', '', True)
             f.write(props)
             f.write(CLSWITCHES.getXml(sorted(config.env['CCFLAGS']), '      '))
             f.write('    </ClCompile>\r\n')
@@ -663,9 +670,9 @@ class _ProjectGenerator(object):
             f.write('    <Link>\r\n')
             props = ''
             props += self.makeListTag(sorted(config.env['LIBS']),
-                'AdditionalDependencies', '      ', True)
+                '      ', 'AdditionalDependencies', '', True)
             props += self.makeListTag(self.relPaths(sorted(config.env['LIBPATH'])),
-                'AdditionalLibraryDirectories', '      ', True)
+                '      ', 'AdditionalLibraryDirectories', '', True)
             f.write(props)
             f.write(LINKSWITCHES.getXml(sorted(config.env['LINKFLAGS']), '      '))
             f.write('    </Link>\r\n')
@@ -688,8 +695,12 @@ class _ProjectGenerator(object):
                 for config, output in sorted(item.node.iteritems()):
                     name = config.name
                     env = output.get_build_env()
-                    props += self.makeListTag(self.relPaths(sorted(env['CPPPATH'])),
-                        'AdditionalIncludeDirectories', '      ', True)
+                    variant = config.variant
+                    platform = config.platform
+                    props += self.makeListTag(self.extraRelPaths(sorted(env['CPPPATH']), config.env['CPPPATH']),
+                        '      ', 'AdditionalIncludeDirectories',
+                        ''' Condition="'$(Configuration)|$(Platform)'=='%(variant)s|%(platform)s'"''' % locals(),
+                        True)
             elif item.builder() == 'Protoc':
                 for config, output in sorted(item.node.iteritems()):
                     name = config.name