Rework as esp-idf component

CMakeLists.txt

@@ -1,3 +1,5 @@
+if(NOT DEFINED IDF_TARGET)
+
 if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
 
 # Generated by `boostdep --cmake beast`
@@ -300,3 +302,36 @@ if (Beast_BUILD_TESTS)
 endif()
 
 endif()
+
+else()
+
+FILE(GLOB_RECURSE headers include/*.h include/*.hpp)
+
+idf_component_register(
+    SRCS
+        ${headers}
+    INCLUDE_DIRS
+        include
+    REQUIRES
+        boost_assert
+        boost_bind
+        boost_config
+        boost_container
+        boost_core
+        boost_endian
+        boost_intrusive
+        boost_logic
+        boost_mp11
+        boost_optional
+        boost_smart_ptr
+        boost_static_assert
+        boost_static_string
+        boost_system
+        boost_throw_exception
+        boost_type_traits
+        boost_utility
+#        boost_winapi
+        asio
+)
+
+endif()

example/websocket/server/chat-multi/net.hpp

@@ -10,9 +10,12 @@
 #ifndef BOOST_BEAST_EXAMPLE_WEBSOCKET_CHAT_MULTI_NET_HPP
 #define BOOST_BEAST_EXAMPLE_WEBSOCKET_CHAT_MULTI_NET_HPP
 
-#include <boost/asio.hpp>
+//#include <boost/asio.hpp>
+#include <asio.hpp>
 
-namespace net = boost::asio;                    // from <boost/asio.hpp>
-using tcp = boost::asio::ip::tcp;               // from <boost/asio/ip/tcp.hpp>
+//namespace net = boost::asio;                    // from <boost/asio.hpp>
+namespace net = asio;                    // from <boost/asio.hpp>
+//using tcp = boost::asio::ip::tcp;               // from <boost/asio/ip/tcp.hpp>
+using tcp = asio::ip::tcp;               // from <boost/asio/ip/tcp.hpp>
 
 #endif

include/boost/beast/_experimental/http/icy_stream.hpp

@@ -12,8 +12,10 @@
 
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/error.hpp>
-#include <boost/asio/async_result.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/async_result.hpp>
+#include <asio/async_result.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/logic/tribool.hpp>
 #include <type_traits>
 

include/boost/beast/_experimental/http/impl/icy_stream.hpp

@@ -15,7 +15,8 @@
 #include <boost/beast/core/error.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/is_invocable.hpp>
-#include <boost/asio/coroutine.hpp>
+//#include <boost/asio/coroutine.hpp>
+#include <asio/coroutine.hpp>
 #include <boost/assert.hpp>
 #include <boost/throw_exception.hpp>
 #include <cstring>

include/boost/beast/_experimental/test/detail/stream_state.hpp

@@ -11,7 +11,8 @@
 #ifndef BOOST_BEAST_TEST_DETAIL_STREAM_STATE_HPP
 #define BOOST_BEAST_TEST_DETAIL_STREAM_STATE_HPP
 
-#include <boost/asio/any_io_executor.hpp>
+//#include <boost/asio/any_io_executor.hpp>
+#include <asio/any_io_executor.hpp>
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/_experimental/test/fail_count.hpp>
 #include <boost/beast/core/detail/service_base.hpp>

include/boost/beast/_experimental/test/handler.hpp

@@ -12,7 +12,8 @@
 
 #include <boost/beast/_experimental/unit_test/suite.hpp>
 #include <boost/beast/core/error.hpp>
-#include <boost/asio/io_context.hpp>
+//#include <boost/asio/io_context.hpp>
+#include <asio/io_context.hpp>
 #include <boost/core/exchange.hpp>
 #include <boost/optional.hpp>
 

include/boost/beast/_experimental/test/impl/stream.hpp

@@ -14,9 +14,12 @@
 #include <boost/beast/core/buffer_traits.hpp>
 #include <boost/beast/core/detail/service_base.hpp>
 #include <boost/beast/core/detail/is_invocable.hpp>
-#include <boost/asio/any_io_executor.hpp>
-#include <boost/asio/dispatch.hpp>
-#include <boost/asio/post.hpp>
+//#include <boost/asio/any_io_executor.hpp>
+#include <asio/any_io_executor.hpp>
+//#include <boost/asio/dispatch.hpp>
+#include <asio/dispatch.hpp>
+//#include <boost/asio/post.hpp>
+#include <asio/post.hpp>
 #include <mutex>
 #include <stdexcept>
 #include <vector>

include/boost/beast/_experimental/test/stream.hpp

@@ -17,13 +17,20 @@
 #include <boost/beast/core/string.hpp>
 #include <boost/beast/_experimental/test/fail_count.hpp>
 #include <boost/beast/_experimental/test/detail/stream_state.hpp>
-#include <boost/asio/async_result.hpp>
-#include <boost/asio/buffer.hpp>
-#include <boost/asio/error.hpp>
-#include <boost/asio/executor_work_guard.hpp>
-#include <boost/asio/any_io_executor.hpp>
-#include <boost/asio/io_context.hpp>
-#include <boost/asio/post.hpp>
+//#include <boost/asio/async_result.hpp>
+#include <asio/async_result.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
+//#include <boost/asio/error.hpp>
+#include <asio/error.hpp>
+//#include <boost/asio/executor_work_guard.hpp>
+#include <asio/executor_work_guard.hpp>
+//#include <boost/asio/any_io_executor.hpp>
+#include <asio/any_io_executor.hpp>
+//#include <boost/asio/io_context.hpp>
+#include <asio/io_context.hpp>
+//#include <boost/asio/post.hpp>
+#include <asio/post.hpp>
 #include <boost/assert.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>

include/boost/beast/_experimental/test/tcp.hpp

@@ -14,7 +14,8 @@
 #include <boost/beast/core/detail/get_io_context.hpp>
 #include <boost/beast/_experimental/unit_test/suite.hpp>
 #include <boost/beast/_experimental/test/handler.hpp>
-#include <boost/asio/ip/tcp.hpp>
+//#include <boost/asio/ip/tcp.hpp>
+#include <asio/ip/tcp.hpp>
 #include <chrono>
 
 namespace boost {

include/boost/beast/core/async_base.hpp

@@ -15,13 +15,20 @@
 #include <boost/beast/core/detail/allocator.hpp>
 #include <boost/beast/core/detail/async_base.hpp>
 #include <boost/beast/core/detail/work_guard.hpp>
-#include <boost/asio/associated_allocator.hpp>
-#include <boost/asio/associated_executor.hpp>
-#include <boost/asio/bind_executor.hpp>
-#include <boost/asio/handler_alloc_hook.hpp>
-#include <boost/asio/handler_continuation_hook.hpp>
-#include <boost/asio/handler_invoke_hook.hpp>
-#include <boost/asio/post.hpp>
+//#include <boost/asio/associated_allocator.hpp>
+#include <asio/associated_allocator.hpp>
+//#include <boost/asio/associated_executor.hpp>
+#include <asio/associated_executor.hpp>
+//#include <boost/asio/bind_executor.hpp>
+#include <asio/bind_executor.hpp>
+//#include <boost/asio/handler_alloc_hook.hpp>
+#include <asio/handler_alloc_hook.hpp>
+//#include <boost/asio/handler_continuation_hook.hpp>
+#include <asio/handler_continuation_hook.hpp>
+//#include <boost/asio/handler_invoke_hook.hpp>
+#include <asio/handler_invoke_hook.hpp>
+//#include <boost/asio/post.hpp>
+#include <asio/post.hpp>
 #include <boost/core/exchange.hpp>
 #include <boost/core/empty_value.hpp>
 #include <utility>

include/boost/beast/core/basic_stream.hpp

@@ -16,15 +16,21 @@
 #include <boost/beast/core/rate_policy.hpp>
 #include <boost/beast/core/role.hpp>
 #include <boost/beast/core/stream_traits.hpp>
-#include <boost/asio/async_result.hpp>
-#include <boost/asio/basic_stream_socket.hpp>
-#include <boost/asio/connect.hpp>
-#include <boost/asio/executor.hpp>
-#include <boost/asio/is_executor.hpp>
+//#include <boost/asio/async_result.hpp>
+#include <asio/async_result.hpp>
+//#include <boost/asio/basic_stream_socket.hpp>
+#include <asio/basic_stream_socket.hpp>
+//#include <boost/asio/connect.hpp>
+#include <asio/connect.hpp>
+//#include <boost/asio/executor.hpp>
+#include <asio/executor.hpp>
+//#include <boost/asio/is_executor.hpp>
+#include <asio/is_executor.hpp>
 #include <boost/core/empty_value.hpp>
 #include <boost/config/workaround.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/shared_ptr.hpp>
+//#include <boost/enable_shared_from_this.hpp>
+//#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <chrono>
 #include <limits>
 #include <memory>

include/boost/beast/core/buffer_traits.hpp

@@ -13,7 +13,8 @@
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/detail/buffer_traits.hpp>
 #include <boost/beast/core/detail/static_const.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/config/workaround.hpp>
 #include <boost/mp11/function.hpp>
 #include <type_traits>

include/boost/beast/core/buffered_read_stream.hpp

@@ -14,9 +14,12 @@
 #include <boost/beast/core/error.hpp>
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/core/stream_traits.hpp>
-#include <boost/asio/async_result.hpp>
-#include <boost/asio/buffer.hpp>
-#include <boost/asio/io_context.hpp>
+//#include <boost/asio/async_result.hpp>
+#include <asio/async_result.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
+//#include <boost/asio/io_context.hpp>
+#include <asio/io_context.hpp>
 #include <cstdint>
 #include <utility>
 

include/boost/beast/core/buffers_generator.hpp

@@ -13,7 +13,8 @@
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/beast/core/error.hpp>
-#include <boost/asio/async_result.hpp>
+//#include <boost/asio/async_result.hpp>
+#include <asio/async_result.hpp>
 #include <type_traits>
 
 namespace boost {

include/boost/beast/core/buffers_prefix.hpp

@@ -12,7 +12,8 @@
 
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/buffer_traits.hpp>
-#include <boost/optional/optional.hpp> // for in_place_init_t
+//#include <boost/optional/optional.hpp> // for in_place_init_t
+#include <optional>
 #include <algorithm>
 #include <cstdint>
 #include <type_traits>

include/boost/beast/core/buffers_to_string.hpp

@@ -13,7 +13,8 @@
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/buffer_traits.hpp>
 #include <boost/beast/core/buffers_range.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <string>
 
 namespace boost {

include/boost/beast/core/detail/bind_continuation.hpp

@@ -12,7 +12,8 @@
 
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/detail/remap_post_to_defer.hpp>
-#include <boost/asio/bind_executor.hpp>
+//#include <boost/asio/bind_executor.hpp>
+#include <asio/bind_executor.hpp>
 #include <boost/core/empty_value.hpp>
 #include <type_traits>
 #include <utility>

include/boost/beast/core/detail/bind_default_executor.hpp

@@ -10,13 +10,20 @@
 #ifndef BOOST_BEAST_CORE_DETAIL_BIND_DEFAULT_EXECUTOR_HPP
 #define BOOST_BEAST_CORE_DETAIL_BIND_DEFAULT_EXECUTOR_HPP
 
-#include <boost/asio/associated_allocator.hpp>
-#include <boost/asio/associated_executor.hpp>
-#include <boost/asio/dispatch.hpp>
-#include <boost/asio/executor.hpp>
-#include <boost/asio/handler_alloc_hook.hpp>
-#include <boost/asio/handler_continuation_hook.hpp>
-#include <boost/asio/handler_invoke_hook.hpp>
+//#include <boost/asio/associated_allocator.hpp>
+#include <asio/associated_allocator.hpp>
+//#include <boost/asio/associated_executor.hpp>
+#include <asio/associated_executor.hpp>
+//#include <boost/asio/dispatch.hpp>
+#include <asio/dispatch.hpp>
+//#include <boost/asio/executor.hpp>
+#include <asio/executor.hpp>
+//#include <boost/asio/handler_alloc_hook.hpp>
+#include <asio/handler_alloc_hook.hpp>
+//#include <boost/asio/handler_continuation_hook.hpp>
+#include <asio/handler_continuation_hook.hpp>
+//#include <boost/asio/handler_invoke_hook.hpp>
+#include <asio/handler_invoke_hook.hpp>
 #include <boost/core/empty_value.hpp>
 #include <utility>
 

include/boost/beast/core/detail/bind_handler.hpp

@@ -12,11 +12,16 @@
 
 #include <boost/beast/core/error.hpp>
 #include <boost/beast/core/detail/tuple.hpp>
-#include <boost/asio/associated_allocator.hpp>
-#include <boost/asio/associated_executor.hpp>
-#include <boost/asio/handler_alloc_hook.hpp>
-#include <boost/asio/handler_continuation_hook.hpp>
-#include <boost/asio/handler_invoke_hook.hpp>
+//#include <boost/asio/associated_allocator.hpp>
+#include <asio/associated_allocator.hpp>
+//#include <boost/asio/associated_executor.hpp>
+#include <asio/associated_executor.hpp>
+//#include <boost/asio/handler_alloc_hook.hpp>
+#include <asio/handler_alloc_hook.hpp>
+//#include <boost/asio/handler_continuation_hook.hpp>
+#include <asio/handler_continuation_hook.hpp>
+//#include <boost/asio/handler_invoke_hook.hpp>
+#include <asio/handler_invoke_hook.hpp>
 #include <boost/core/ignore_unused.hpp>
 #include <boost/mp11/integer_sequence.hpp>
 #include <boost/is_placeholder.hpp>

include/boost/beast/core/detail/buffer.hpp

@@ -11,7 +11,8 @@
 #define BOOST_BEAST_CORE_DETAIL_BUFFER_HPP
 
 #include <boost/beast/core/error.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/optional.hpp>
 #include <stdexcept>
 

include/boost/beast/core/detail/buffer_traits.hpp

@@ -10,7 +10,8 @@
 #ifndef BOOST_BEAST_DETAIL_BUFFER_TRAITS_HPP
 #define BOOST_BEAST_DETAIL_BUFFER_TRAITS_HPP
 
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/config/workaround.hpp>
 #include <boost/type_traits/make_void.hpp>
 #include <cstdint>

include/boost/beast/core/detail/buffers_pair.hpp

@@ -10,7 +10,8 @@
 #ifndef BOOST_BEAST_DETAIL_BUFFERS_PAIR_HPP
 #define BOOST_BEAST_DETAIL_BUFFERS_PAIR_HPP
 
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/assert.hpp>
 #include <boost/config/workaround.hpp>
 #include <type_traits>

include/boost/beast/core/detail/config.hpp

@@ -17,11 +17,12 @@
 #include <boost/static_assert.hpp>
 
 namespace boost {
-namespace asio
-{
-} // asio
+//namespace asio
+//{
+//} // asio
 namespace beast {
-namespace net = boost::asio;
+//namespace net = boost::asio;
+namespace net = asio;
 } // beast
 } // boost
 

include/boost/beast/core/detail/flat_stream.hpp

@@ -11,7 +11,8 @@
 #define BOOST_BEAST_CORE_DETAIL_FLAT_STREAM_HPP
 
 #include <boost/beast/core/buffer_traits.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <cstdlib>
 
 namespace boost {

include/boost/beast/core/detail/get_io_context.hpp

@@ -12,11 +12,15 @@
 
 #include <boost/beast/core/stream_traits.hpp>
 #ifdef BOOST_ASIO_NO_TS_EXECUTORS
-#include <boost/asio/execution.hpp>
+//#include <boost/asio/execution.hpp>
+#include <asio/execution.hpp>
 #endif
-#include <boost/asio/executor.hpp>
-#include <boost/asio/io_context.hpp>
-#include <boost/asio/strand.hpp>
+//#include <boost/asio/executor.hpp>
+#include <asio/executor.hpp>
+//#include <boost/asio/io_context.hpp>
+#include <asio/io_context.hpp>
+//#include <boost/asio/strand.hpp>
+#include <asio/strand.hpp>
 #include <memory>
 #include <type_traits>
 

include/boost/beast/core/detail/impl/read.hpp

@@ -14,8 +14,10 @@
 #include <boost/beast/core/async_base.hpp>
 #include <boost/beast/core/flat_static_buffer.hpp>
 #include <boost/beast/core/read_size.hpp>
-#include <boost/asio/basic_stream_socket.hpp>
-#include <boost/asio/coroutine.hpp>
+//#include <boost/asio/basic_stream_socket.hpp>
+#include <asio/basic_stream_socket.hpp>
+//#include <boost/asio/coroutine.hpp>
+#include <asio/coroutine.hpp>
 #include <boost/throw_exception.hpp>
 
 namespace boost {

include/boost/beast/core/detail/is_invocable.hpp

@@ -10,7 +10,8 @@
 #ifndef BOOST_BEAST_DETAIL_IS_INVOCABLE_HPP
 #define BOOST_BEAST_DETAIL_IS_INVOCABLE_HPP
 
-#include <boost/asio/async_result.hpp>
+//#include <boost/asio/async_result.hpp>
+#include <asio/async_result.hpp>
 #include <boost/type_traits/make_void.hpp>
 #include <type_traits>
 #include <utility>

include/boost/beast/core/detail/ostream.hpp

@@ -13,7 +13,8 @@
 #include <boost/beast/core/buffers_prefix.hpp>
 #include <boost/beast/core/buffers_range.hpp>
 #include <boost/throw_exception.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <memory>
 #include <ostream>
 #include <streambuf>

include/boost/beast/core/detail/read.hpp

@@ -14,7 +14,8 @@
 #include <boost/beast/core/error.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/is_invocable.hpp>
-#include <boost/asio/async_result.hpp>
+//#include <boost/asio/async_result.hpp>
+#include <asio/async_result.hpp>
 #include <cstdlib>
 
 namespace boost {

include/boost/beast/core/detail/remap_post_to_defer.hpp

@@ -10,7 +10,8 @@
 #ifndef BOOST_BEAST_DETAIL_REMAP_POST_TO_DEFER_HPP
 #define BOOST_BEAST_DETAIL_REMAP_POST_TO_DEFER_HPP
 
-#include <boost/asio/is_executor.hpp>
+//#include <boost/asio/is_executor.hpp>
+#include <asio/is_executor.hpp>
 #include <boost/core/empty_value.hpp>
 #include <type_traits>
 #include <utility>

include/boost/beast/core/detail/service_base.hpp

@@ -10,7 +10,8 @@
 #ifndef BOOST_BEAST_DETAIL_SERVICE_BASE_HPP
 #define BOOST_BEAST_DETAIL_SERVICE_BASE_HPP
 
-#include <boost/asio/execution_context.hpp>
+//#include <boost/asio/execution_context.hpp>
+#include <asio/execution_context.hpp>
 
 namespace boost {
 namespace beast {

include/boost/beast/core/detail/stream_base.hpp

@@ -10,7 +10,8 @@
 #ifndef BOOST_BEAST_CORE_DETAIL_STREAM_BASE_HPP
 #define BOOST_BEAST_CORE_DETAIL_STREAM_BASE_HPP
 
-#include <boost/asio/steady_timer.hpp>
+//#include <boost/asio/steady_timer.hpp>
+#include <asio/steady_timer.hpp>
 #include <boost/assert.hpp>
 #include <boost/core/exchange.hpp>
 #include <chrono>

include/boost/beast/core/detail/stream_traits.hpp

@@ -11,7 +11,8 @@
 #define BOOST_BEAST_DETAIL_STREAM_TRAITS_HPP
 
 #include <boost/beast/core/error.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/type_traits/make_void.hpp>
 #include <type_traits>
 

include/boost/beast/core/detail/work_guard.hpp

@@ -1,8 +1,10 @@
 #ifndef BOOST_BEAST_CORE_DETAIL_WORK_GUARD_HPP
 #define BOOST_BEAST_CORE_DETAIL_WORK_GUARD_HPP
 
-#include <boost/asio/executor_work_guard.hpp>
-#include <boost/asio/execution.hpp>
+//#include <boost/asio/executor_work_guard.hpp>
+#include <asio/executor_work_guard.hpp>
+//#include <boost/asio/execution.hpp>
+//#include <asio/execution.hpp>
 #include <boost/optional.hpp>
 
 namespace boost {

include/boost/beast/core/detect_ssl.hpp

@@ -16,8 +16,10 @@
 #include <boost/beast/core/read_size.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/logic/tribool.hpp>
-#include <boost/asio/async_result.hpp>
-#include <boost/asio/coroutine.hpp>
+//#include <boost/asio/async_result.hpp>
+#include <asio/async_result.hpp>
+//#include <boost/asio/coroutine.hpp>
+#include <asio/coroutine.hpp>
 #include <type_traits>
 
 namespace boost {
@@ -546,7 +548,8 @@ namespace detail {
 // This example uses the Asio's stackless "fauxroutines", implemented
 // using a macro-based solution. It makes the code easier to write and
 // easier to read. This include file defines the necessary macros and types.
-#include <boost/asio/yield.hpp>
+//#include <boost/asio/yield.hpp>
+#include <asio/yield.hpp>
 
 // detect_ssl_op is callable with the signature void(error_code, bytes_transferred),
 // allowing `*this` to be used as a ReadHandler
@@ -659,7 +662,8 @@ operator()(error_code ec, std::size_t bytes_transferred, bool cont)
 }
 
 // Including this file undefines the macros used by the stackless fauxroutines.
-#include <boost/asio/unyield.hpp>
+//#include <boost/asio/unyield.hpp>
+#include <asio/unyield.hpp>
 
 } // detail
 

include/boost/beast/core/error.hpp

@@ -11,27 +11,32 @@
 #define BOOST_BEAST_ERROR_HPP
 
 #include <boost/beast/core/detail/config.hpp>
-#include <boost/system/error_code.hpp>
-#include <boost/system/system_error.hpp>
+//#include <boost/system/error_code.hpp>
+//#include <boost/system/system_error.hpp>
+#include <system_error>
 
 namespace boost {
 namespace beast {
 
 /// The type of error code used by the library
-using error_code = boost::system::error_code;
+//using error_code = boost::system::error_code;
+using error_code = std::error_code;
 
 /// The type of system error thrown by the library
-using system_error = boost::system::system_error;
+//using system_error = boost::system::system_error;
+using system_error = std::system_error;
 
 /// The type of error category used by the library
-using error_category = boost::system::error_category;
+//using error_category = boost::system::error_category;
+using error_category = std::error_category;
 
 /// A function to return the generic error category used by the library
 #if BOOST_BEAST_DOXYGEN
 error_category const&
 generic_category();
 #else
-using boost::system::generic_category;
+//using boost::system::generic_category;
+using std::generic_category;
 #endif
 
 /// A function to return the system error category used by the library
@@ -39,17 +44,20 @@ using boost::system::generic_category;
 error_category const&
 system_category();
 #else
-using boost::system::system_category;
+//using boost::system::system_category;
+using std::system_category;
 #endif
 
 /// The type of error condition used by the library
-using error_condition = boost::system::error_condition;
+//using error_condition = boost::system::error_condition;
+using error_condition = std::error_condition;
 
 /// The set of constants used for cross-platform error codes
 #if BOOST_BEAST_DOXYGEN
 enum errc{};
 #else
-namespace errc = boost::system::errc;
+//namespace errc = boost::system::errc;
+using std::errc;
 #endif
 
 //------------------------------------------------------------------------------

include/boost/beast/core/flat_buffer.hpp

@@ -12,7 +12,8 @@
 
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/detail/allocator.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/core/empty_value.hpp>
 #include <limits>
 #include <memory>

include/boost/beast/core/flat_static_buffer.hpp

@@ -11,7 +11,8 @@
 #define BOOST_BEAST_FLAT_STATIC_BUFFER_HPP
 
 #include <boost/beast/core/detail/config.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <algorithm>
 #include <cstddef>
 #include <cstring>
@@ -314,4 +315,4 @@ public:
 #include <boost/beast/core/impl/flat_static_buffer.ipp>
 #endif
 
-#endif
+#endif

include/boost/beast/core/flat_stream.hpp

@@ -15,7 +15,8 @@
 #include <boost/beast/core/flat_buffer.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/flat_stream.hpp>
-#include <boost/asio/async_result.hpp>
+//#include <boost/asio/async_result.hpp>
+#include <asio/async_result.hpp>
 #include <cstdlib>
 #include <utility>
 

include/boost/beast/core/impl/basic_stream.hpp

@@ -14,10 +14,12 @@
 #include <boost/beast/core/buffer_traits.hpp>
 #include <boost/beast/core/buffers_prefix.hpp>
 #include <boost/beast/websocket/teardown.hpp>
-#include <boost/asio/coroutine.hpp>
+//#include <boost/asio/coroutine.hpp>
+#include <asio/coroutine.hpp>
 #include <boost/assert.hpp>
-#include <boost/make_shared.hpp>
+//#include <boost/make_shared.hpp>
 #include <boost/core/exchange.hpp>
+#include <memory>
 #include <cstdlib>
 #include <type_traits>
 #include <utility>

include/boost/beast/core/impl/buffered_read_stream.hpp

@@ -16,7 +16,8 @@
 #include <boost/beast/core/read_size.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/is_invocable.hpp>
-#include <boost/asio/post.hpp>
+//#include <boost/asio/post.hpp>
+#include <asio/post.hpp>
 #include <boost/throw_exception.hpp>
 
 namespace boost {

include/boost/beast/core/impl/buffers_adaptor.hpp

@@ -12,7 +12,8 @@
 
 #include <boost/beast/core/buffer_traits.hpp>
 #include <boost/beast/core/buffers_adaptor.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/config/workaround.hpp>
 #include <boost/throw_exception.hpp>
 #include <algorithm>

include/boost/beast/core/impl/buffers_cat.hpp

@@ -12,7 +12,8 @@
 
 #include <boost/beast/core/detail/tuple.hpp>
 #include <boost/beast/core/detail/variant.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <cstdint>
 #include <iterator>
 #include <new>

include/boost/beast/core/impl/buffers_generator.hpp

@@ -12,10 +12,14 @@
 
 #include <boost/beast/core/buffers_generator.hpp>
 
-#include <boost/asio/write.hpp>
-#include <boost/asio/async_result.hpp>
-#include <boost/asio/compose.hpp>
-#include <boost/asio/coroutine.hpp>
+//#include <boost/asio/write.hpp>
+#include <asio/write.hpp>
+//#include <boost/asio/async_result.hpp>
+#include <asio/async_result.hpp>
+//#include <boost/asio/compose.hpp>
+#include <asio/compose.hpp>
+//#include <boost/asio/coroutine.hpp>
+#include <asio/coroutine.hpp>
 
 #include <boost/beast/core/buffer_traits.hpp>
 #include <boost/beast/core/stream_traits.hpp>

include/boost/beast/core/impl/error.hpp

@@ -12,8 +12,9 @@
 
 #include <type_traits>
 
-namespace boost {
-namespace system {
+//namespace boost {
+//namespace system {
+namespace std {
 template<>
 struct is_error_code_enum<::boost::beast::error>
 {
@@ -24,8 +25,9 @@ struct is_error_condition_enum<::boost::beast::condition>
 {
     static bool const value = true;
 };
-} // system
-} // boost
+} // std
+//} // system
+//} // boost
 
 namespace boost {
 namespace beast {

include/boost/beast/core/impl/flat_stream.hpp

@@ -15,7 +15,8 @@
 #include <boost/beast/core/static_buffer.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/websocket/teardown.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <memory>
 
 namespace boost {

include/boost/beast/core/impl/read_size.hpp

@@ -10,7 +10,8 @@
 #ifndef BOOST_BEAST_IMPL_READ_SIZE_HPP
 #define BOOST_BEAST_IMPL_READ_SIZE_HPP
 
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/assert.hpp>
 #include <stdexcept>
 #include <type_traits>

include/boost/beast/core/impl/saved_handler.hpp

@@ -11,9 +11,12 @@
 #define BOOST_BEAST_CORE_IMPL_SAVED_HANDLER_HPP
 
 #include <boost/beast/core/detail/allocator.hpp>
-#include <boost/asio/associated_allocator.hpp>
-#include <boost/asio/associated_executor.hpp>
-#include <boost/asio/executor_work_guard.hpp>
+//#include <boost/asio/associated_allocator.hpp>
+#include <asio/associated_allocator.hpp>
+//#include <boost/asio/associated_executor.hpp>
+#include <asio/associated_executor.hpp>
+//#include <boost/asio/executor_work_guard.hpp>
+#include <asio/executor_work_guard.hpp>
 #include <boost/assert.hpp>
 #include <boost/core/empty_value.hpp>
 #include <boost/core/exchange.hpp>

include/boost/beast/core/impl/static_buffer.hpp

@@ -10,7 +10,8 @@
 #ifndef BOOST_BEAST_IMPL_STATIC_BUFFER_HPP
 #define BOOST_BEAST_IMPL_STATIC_BUFFER_HPP
 
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <stdexcept>
 
 namespace boost {

include/boost/beast/core/impl/static_buffer.ipp

@@ -11,7 +11,8 @@
 #define BOOST_BEAST_IMPL_STATIC_BUFFER_IPP
 
 #include <boost/beast/core/static_buffer.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 

include/boost/beast/core/make_printable.hpp

@@ -12,7 +12,8 @@
 
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/buffer_traits.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <ostream>
 
 namespace boost {

include/boost/beast/core/multi_buffer.hpp

@@ -12,7 +12,8 @@
 
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/detail/allocator.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/core/empty_value.hpp>
 #include <boost/intrusive/list.hpp>
 #include <boost/type_traits/type_with_alignment.hpp>
@@ -591,4 +592,4 @@ using multi_buffer = basic_multi_buffer<std::allocator<char>>;
 
 #include <boost/beast/core/impl/multi_buffer.hpp>
 
-#endif
+#endif

include/boost/beast/core/static_buffer.hpp

@@ -12,7 +12,8 @@
 
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/detail/buffers_pair.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <cstddef>
 
 namespace boost {

include/boost/beast/core/stream_traits.hpp

@@ -13,7 +13,8 @@
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/detail/static_const.hpp>
 #include <boost/beast/core/detail/stream_traits.hpp>
-#include <boost/asio/basic_socket.hpp>
+//#include <boost/asio/basic_socket.hpp>
+#include <asio/basic_socket.hpp>
 
 namespace boost {
 namespace beast {

include/boost/beast/core/tcp_stream.hpp

@@ -13,8 +13,10 @@
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/basic_stream.hpp>
 #include <boost/beast/core/rate_policy.hpp>
-#include <boost/asio/executor.hpp>
-#include <boost/asio/ip/tcp.hpp>
+//#include <boost/asio/executor.hpp>
+#include <asio/executor.hpp>
+//#include <boost/asio/ip/tcp.hpp>
+#include <asio/ip/tcp.hpp>
 
 namespace boost {
 namespace beast {

include/boost/beast/http/basic_parser.hpp

@@ -16,7 +16,8 @@
 #include <boost/beast/http/field.hpp>
 #include <boost/beast/http/verb.hpp>
 #include <boost/beast/http/detail/basic_parser.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/optional.hpp>
 #include <boost/assert.hpp>
 #include <limits>

include/boost/beast/http/chunk_encode.hpp

@@ -15,7 +15,8 @@
 #include <boost/beast/core/string.hpp>
 #include <boost/beast/http/type_traits.hpp>
 #include <boost/beast/http/detail/chunk_encode.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <memory>
 #include <type_traits>
 

include/boost/beast/http/detail/chunk_encode.hpp

@@ -11,7 +11,8 @@
 #define BOOST_BEAST_HTTP_DETAIL_CHUNK_ENCODE_HPP
 
 #include <boost/beast/http/type_traits.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <algorithm>
 #include <array>
 #include <cstddef>

include/boost/beast/http/fields.hpp

@@ -14,7 +14,8 @@
 #include <boost/beast/core/string.hpp>
 #include <boost/beast/core/detail/allocator.hpp>
 #include <boost/beast/http/field.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/core/empty_value.hpp>
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/set.hpp>

include/boost/beast/http/impl/basic_parser.hpp

@@ -11,7 +11,8 @@
 #define BOOST_BEAST_HTTP_IMPL_BASIC_PARSER_HPP
 
 #include <boost/beast/core/buffer_traits.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/make_unique.hpp>
 
 namespace boost {

include/boost/beast/http/impl/basic_parser.ipp

@@ -17,7 +17,8 @@
 #include <boost/beast/core/detail/clamp.hpp>
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/detail/string.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <algorithm>
 #include <utility>
 

include/boost/beast/http/impl/file_body_win32.hpp

@@ -20,9 +20,12 @@
 #include <boost/beast/http/error.hpp>
 #include <boost/beast/http/write.hpp>
 #include <boost/beast/http/serializer.hpp>
-#include <boost/asio/async_result.hpp>
-#include <boost/asio/basic_stream_socket.hpp>
-#include <boost/asio/windows/overlapped_ptr.hpp>
+//#include <boost/asio/async_result.hpp>
+#include <asio/async_result.hpp>
+//#include <boost/asio/basic_stream_socket.hpp>
+#include <asio/basic_stream_socket.hpp>
+//#include <boost/asio/windows/overlapped_ptr.hpp>
+#include <asio/windows/overlapped_ptr.hpp>
 #include <boost/make_unique.hpp>
 #include <boost/smart_ptr/make_shared_array.hpp>
 #include <boost/winapi/basic_types.hpp>

include/boost/beast/http/impl/read.hpp

@@ -19,9 +19,12 @@
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/buffer.hpp>
 #include <boost/beast/core/detail/read.hpp>
-#include <boost/asio/error.hpp>
-#include <boost/asio/compose.hpp>
-#include <boost/asio/coroutine.hpp>
+//#include <boost/asio/error.hpp>
+#include <asio/error.hpp>
+//#include <boost/asio/compose.hpp>
+#include <asio/compose.hpp>
+//#include <boost/asio/coroutine.hpp>
+#include <asio/coroutine.hpp>
 
 namespace boost {
 namespace beast {

include/boost/beast/http/impl/write.hpp

@@ -17,9 +17,12 @@
 #include <boost/beast/core/make_printable.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/is_invocable.hpp>
-#include <boost/asio/coroutine.hpp>
-#include <boost/asio/post.hpp>
-#include <boost/asio/write.hpp>
+//#include <boost/asio/coroutine.hpp>
+#include <asio/coroutine.hpp>
+//#include <boost/asio/post.hpp>
+#include <asio/post.hpp>
+//#include <boost/asio/write.hpp>
+#include <asio/write.hpp>
 #include <boost/optional.hpp>
 #include <boost/throw_exception.hpp>
 #include <ostream>

include/boost/beast/http/read.hpp

@@ -15,7 +15,8 @@
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/http/basic_parser.hpp>
 #include <boost/beast/http/message.hpp>
-#include <boost/asio/async_result.hpp>
+//#include <boost/asio/async_result.hpp>
+#include <asio/async_result.hpp>
 
 namespace boost {
 namespace beast {

include/boost/beast/http/serializer.hpp

@@ -18,7 +18,8 @@
 #include <boost/beast/core/detail/variant.hpp>
 #include <boost/beast/http/message.hpp>
 #include <boost/beast/http/chunk_encode.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/optional.hpp>
 
 namespace boost {

include/boost/beast/http/string_body.hpp

@@ -16,7 +16,8 @@
 #include <boost/beast/http/message.hpp>
 #include <boost/beast/core/buffers_range.hpp>
 #include <boost/beast/core/detail/clamp.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/optional.hpp>
 #include <cstdint>
 #include <limits>

include/boost/beast/http/type_traits.hpp

@@ -14,7 +14,8 @@
 #include <boost/beast/core/error.hpp>
 #include <boost/beast/core/string.hpp>
 #include <boost/beast/http/detail/type_traits.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/optional.hpp>
 #include <type_traits>
 #include <utility>

include/boost/beast/http/vector_body.hpp

@@ -15,7 +15,8 @@
 #include <boost/beast/http/error.hpp>
 #include <boost/beast/http/message.hpp>
 #include <boost/beast/core/detail/clamp.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/optional.hpp>
 #include <cstdint>
 #include <limits>

include/boost/beast/http/write.hpp

@@ -17,7 +17,8 @@
 #include <boost/beast/http/detail/chunk_encode.hpp>
 #include <boost/beast/core/error.hpp>
 #include <boost/beast/core/stream_traits.hpp>
-#include <boost/asio/async_result.hpp>
+//#include <boost/asio/async_result.hpp>
+#include <asio/async_result.hpp>
 #include <iosfwd>
 #include <limits>
 #include <memory>

include/boost/beast/websocket/detail/frame.hpp

@@ -15,7 +15,8 @@
 #include <boost/beast/websocket/rfc6455.hpp>
 #include <boost/beast/websocket/detail/utf8_checker.hpp>
 #include <boost/beast/core/flat_static_buffer.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <boost/assert.hpp>
 #include <boost/endian/conversion.hpp>
 #include <cstdint>

include/boost/beast/websocket/detail/impl_base.hpp

@@ -23,7 +23,8 @@
 #include <boost/beast/core/buffers_suffix.hpp>
 #include <boost/beast/core/error.hpp>
 #include <boost/beast/core/detail/clamp.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <cstdint>
 #include <memory>
 #include <stdexcept>

include/boost/beast/websocket/detail/mask.hpp

@@ -12,7 +12,8 @@
 
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/buffers_range.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 #include <array>
 #include <climits>
 #include <cstdint>

include/boost/beast/websocket/detail/service.hpp

@@ -11,7 +11,8 @@
 #define BOOST_BEAST_WEBSOCKET_DETAIL_SERVICE_HPP
 
 #include <boost/beast/core/detail/service_base.hpp>
-#include <boost/asio/execution_context.hpp>
+//#include <boost/asio/execution_context.hpp>
+#include <asio/execution_context.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <mutex>
 #include <vector>

include/boost/beast/websocket/detail/utf8_checker.hpp

@@ -11,7 +11,8 @@
 #define BOOST_BEAST_WEBSOCKET_DETAIL_UTF8_CHECKER_HPP
 
 #include <boost/beast/core/buffers_range.hpp>
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
+#include <asio/buffer.hpp>
 
 #include <cstdint>
 

include/boost/beast/websocket/impl/accept.hpp

@@ -22,8 +22,10 @@
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/buffer.hpp>
 #include <boost/beast/version.hpp>
-#include <boost/asio/coroutine.hpp>
-#include <boost/asio/post.hpp>
+//#include <boost/asio/coroutine.hpp>
+#include <asio/coroutine.hpp>
+//#include <boost/asio/post.hpp>
+#include <asio/post.hpp>
 #include <boost/assert.hpp>
 #include <boost/throw_exception.hpp>
 #include <memory>

include/boost/beast/websocket/impl/close.hpp

@@ -17,8 +17,10 @@
 #include <boost/beast/core/flat_static_buffer.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/bind_continuation.hpp>
-#include <boost/asio/coroutine.hpp>
-#include <boost/asio/post.hpp>
+//#include <boost/asio/coroutine.hpp>
+#include <asio/coroutine.hpp>
+//#include <boost/asio/post.hpp>
+#include <asio/post.hpp>
 #include <boost/throw_exception.hpp>
 #include <memory>
 

include/boost/beast/websocket/impl/handshake.hpp

@@ -19,7 +19,8 @@
 #include <boost/beast/core/async_base.hpp>
 #include <boost/beast/core/flat_buffer.hpp>
 #include <boost/beast/core/stream_traits.hpp>
-#include <boost/asio/coroutine.hpp>
+//#include <boost/asio/coroutine.hpp>
+#include <asio/coroutine.hpp>
 #include <boost/assert.hpp>
 #include <boost/throw_exception.hpp>
 #include <memory>

include/boost/beast/websocket/impl/ping.hpp

@@ -16,8 +16,10 @@
 #include <boost/beast/core/detail/bind_continuation.hpp>
 #include <boost/beast/websocket/detail/frame.hpp>
 #include <boost/beast/websocket/impl/stream_impl.hpp>
-#include <boost/asio/coroutine.hpp>
-#include <boost/asio/post.hpp>
+//#include <boost/asio/coroutine.hpp>
+#include <asio/coroutine.hpp>
+//#include <boost/asio/post.hpp>
+#include <asio/post.hpp>
 #include <boost/throw_exception.hpp>
 #include <memory>
 

include/boost/beast/websocket/impl/read.hpp

@@ -25,8 +25,10 @@
 #include <boost/beast/core/detail/buffer.hpp>
 #include <boost/beast/core/detail/clamp.hpp>
 #include <boost/beast/core/detail/config.hpp>
-#include <boost/asio/coroutine.hpp>
-#include <boost/asio/post.hpp>
+//#include <boost/asio/coroutine.hpp>
+#include <asio/coroutine.hpp>
+//#include <boost/asio/post.hpp>
+#include <asio/post.hpp>
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
 #include <boost/optional.hpp>

include/boost/beast/websocket/impl/stream.hpp

@@ -25,7 +25,8 @@
 #include <boost/beast/core/buffers_suffix.hpp>
 #include <boost/beast/core/flat_static_buffer.hpp>
 #include <boost/beast/core/detail/clamp.hpp>
-#include <boost/asio/steady_timer.hpp>
+//#include <boost/asio/steady_timer.hpp>
+#include <asio/steady_timer.hpp>
 #include <boost/assert.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/throw_exception.hpp>

include/boost/beast/websocket/impl/stream_impl.hpp

@@ -30,7 +30,8 @@
 #include <boost/beast/core/static_buffer.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/clamp.hpp>
-#include <boost/asio/steady_timer.hpp>
+//#include <boost/asio/steady_timer.hpp>
+#include <asio/steady_timer.hpp>
 #include <boost/core/empty_value.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>

include/boost/beast/websocket/impl/teardown.hpp

@@ -15,8 +15,10 @@
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/bind_continuation.hpp>
 #include <boost/beast/core/detail/is_invocable.hpp>
-#include <boost/asio/coroutine.hpp>
-#include <boost/asio/post.hpp>
+//#include <boost/asio/coroutine.hpp>
+#include <asio/coroutine.hpp>
+//#include <boost/asio/post.hpp>
+#include <asio/post.hpp>
 #include <memory>
 
 namespace boost {

include/boost/beast/websocket/impl/write.hpp

@@ -25,7 +25,8 @@
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/websocket/detail/frame.hpp>
 #include <boost/beast/websocket/impl/stream_impl.hpp>
-#include <boost/asio/coroutine.hpp>
+//#include <boost/asio/coroutine.hpp>
+#include <asio/coroutine.hpp>
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
 #include <boost/throw_exception.hpp>

include/boost/beast/websocket/stream.hpp

@@ -24,8 +24,10 @@
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/string.hpp>
 #include <boost/beast/http/detail/type_traits.hpp>
-#include <boost/asio/async_result.hpp>
-#include <boost/asio/error.hpp>
+//#include <boost/asio/async_result.hpp>
+#include <asio/async_result.hpp>
+//#include <boost/asio/error.hpp>
+#include <asio/error.hpp>
 #include <boost/shared_ptr.hpp>
 #include <algorithm>
 #include <cstdint>

include/boost/beast/websocket/teardown.hpp

@@ -13,7 +13,8 @@
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/error.hpp>
 #include <boost/beast/core/role.hpp>
-#include <boost/asio/basic_stream_socket.hpp>
+//#include <boost/asio/basic_stream_socket.hpp>
+#include <asio/basic_stream_socket.hpp>
 #include <type_traits>
 
 namespace boost {