diff --git a/.clangd b/.clangd
index 328db6981..d90aed0e7 100644
--- a/.clangd
+++ b/.clangd
@@ -1,3 +1,2 @@
-Diagnostics:
-  ClangTidy:
-    Remove: bugprone-unused-return-value
\ No newline at end of file
+Style:
+  AngledHeaders: ["boost/.*"]
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c092cb19..c137dc183 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,11 +8,33 @@
 cmake_minimum_required(VERSION 3.8...3.22)
 
 # Project
-project(boost_mysql VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
+project(mycosql LANGUAGES CXX)
 
 # Library
-add_library(boost_mysql INTERFACE)
-add_library(Boost::mysql ALIAS boost_mysql)
+add_library(boost_mycosql
+    src/character_set.cpp
+    src/column_type.cpp
+    src/connection.cpp
+    src/date.cpp
+    src/datetime.cpp
+    src/error_categories.cpp
+    src/escape_string.cpp
+    src/execution_state_impl.cpp
+    src/field.cpp
+    src/field_kind.cpp
+    src/field_view.cpp
+    src/format_sql.cpp
+    src/is_fatal_error.cpp
+    src/meta_check_context.cpp
+    src/pipeline.cpp
+    src/results_impl.cpp
+    src/resultset.cpp
+    src/row_impl.cpp
+    src/server_error_to_string.cpp
+    src/static_execution_state_impl.cpp
+    src/static_results_impl.cpp
+)
+add_library(Boost::mycosql ALIAS boost_mycosql)
 
 # Dependencies. If non-Boost dependencies are not found, we just bail out
 find_package(Threads)
@@ -29,9 +51,10 @@ endif()
 # This is generated by boostdep.
 # Note that Boost::pfr is not listed because it's a peer dependency
 target_link_libraries(
-    boost_mysql
-    INTERFACE
-    Boost::asio
+    boost_mycosql
+    PUBLIC
+    Boost::corosio
+    Boost::corosio_openssl
     Boost::assert
     Boost::charconv
     Boost::compat
@@ -52,45 +75,50 @@ target_link_libraries(
 )
 
 # Includes & features
-target_include_directories(boost_mysql INTERFACE include)
-target_compile_features(boost_mysql INTERFACE cxx_std_11)
+target_include_directories(boost_mycosql PUBLIC include)
+target_include_directories(boost_mycosql PRIVATE src)
+target_compile_features(boost_mycosql PUBLIC cxx_std_20)
 
-# Don't run integration testing unless explicitly requested, since these require a running MySQL server
-option(BOOST_MYSQL_INTEGRATION_TESTS OFF "Whether to build and run integration tests or not")
-mark_as_advanced(BOOST_MYSQL_INTEGRATION_TESTS)
+# TODO: remove
+add_executable(mycosql_example example/1_tutorial/1_sync.cpp)
+target_link_libraries(mycosql_example PRIVATE Boost::mycosql)
 
-# List of server features that the CI DB server does not support.
-# Disables running some integration tests and examples
-set(BOOST_MYSQL_DISABLED_SERVER_FEATURES "" CACHE STRING
-    "A CMake list of server features not supported by the CI server, for integration tests"
-)
-mark_as_advanced(BOOST_MYSQL_DISABLED_SERVER_FEATURES)
+# # Don't run integration testing unless explicitly requested, since these require a running MySQL server
+# option(BOOST_MYSQL_INTEGRATION_TESTS OFF "Whether to build and run integration tests or not")
+# mark_as_advanced(BOOST_MYSQL_INTEGRATION_TESTS)
+
+# # List of server features that the CI DB server does not support.
+# # Disables running some integration tests and examples
+# set(BOOST_MYSQL_DISABLED_SERVER_FEATURES "" CACHE STRING
+#     "A CMake list of server features not supported by the CI server, for integration tests"
+# )
+# mark_as_advanced(BOOST_MYSQL_DISABLED_SERVER_FEATURES)
 
-# Don't build benchmarks unless explicitly requested, since these require the official
-# MySQL and MariaDB client libraries
-option(BOOST_MYSQL_BENCH OFF "Whether to build the benchmarks")
-mark_as_advanced(BOOST_MYSQL_BENCH)
+# # Don't build benchmarks unless explicitly requested, since these require the official
+# # MySQL and MariaDB client libraries
+# option(BOOST_MYSQL_BENCH OFF "Whether to build the benchmarks")
+# mark_as_advanced(BOOST_MYSQL_BENCH)
 
-# Examples and tests
-if(BUILD_TESTING)
-    # Contains some functions to share code between examples and tests
-    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/utils.cmake)
+# # Examples and tests
+# if(BUILD_TESTING)
+#     # Contains some functions to share code between examples and tests
+#     include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/utils.cmake)
 
-    # Custom target tests; required by the Boost superproject
-    if(NOT TARGET tests)
-        add_custom_target(tests)
-    endif()
+#     # Custom target tests; required by the Boost superproject
+#     if(NOT TARGET tests)
+#         add_custom_target(tests)
+#     endif()
 
-    # Tests
-    add_subdirectory(test)
+#     # Tests
+#     add_subdirectory(test)
     
-    # All examples require a real server to run
-    if (BOOST_MYSQL_INTEGRATION_TESTS)
-        add_subdirectory(example)
-    endif()
-endif()
+#     # All examples require a real server to run
+#     if (BOOST_MYSQL_INTEGRATION_TESTS)
+#         add_subdirectory(example)
+#     endif()
+# endif()
 
-if (BOOST_MYSQL_BENCH)
-    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/utils.cmake)
-    add_subdirectory(bench)
-endif()
+# if (BOOST_MYSQL_BENCH)
+#     include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/utils.cmake)
+#     add_subdirectory(bench)
+# endif()
diff --git a/example/1_tutorial/1_sync.cpp b/example/1_tutorial/1_sync.cpp
index 4af5eb71f..79cf1eb7e 100644
--- a/example/1_tutorial/1_sync.cpp
+++ b/example/1_tutorial/1_sync.cpp
@@ -5,8 +5,6 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-//[example_tutorial_sync
-
 /**
  * Creates a connection, establishes a session and
  * runs a simple "Hello world!" query.
@@ -14,92 +12,71 @@
  * This example uses synchronous functions and handles errors using exceptions.
  */
 
+#include <boost/mysql/any_address.hpp>
 #include <boost/mysql/any_connection.hpp>
 #include <boost/mysql/connect_params.hpp>
-#include <boost/mysql/error_with_diagnostics.hpp>
+#include <boost/mysql/diagnostics.hpp>
 #include <boost/mysql/results.hpp>
 
-#include <boost/asio/io_context.hpp>
+#include <boost/capy/ex/run_async.hpp>
+#include <boost/capy/ex/this_coro.hpp>
+#include <boost/capy/io_task.hpp>
+#include <boost/corosio/io_context.hpp>
 
 #include <iostream>
 
-//[tutorial_sync_namespaces
 namespace mysql = boost::mysql;
-namespace asio = boost::asio;
-//]
+namespace corosio = boost::corosio;
+namespace capy = boost::capy;
 
-void main_impl(int argc, char** argv)
+static void check_err(capy::io_result<mysql::diagnostics> result)
 {
-    if (argc != 4)
+    if (result.ec)
     {
-        std::cerr << "Usage: " << argv[0] << " <username> <password> <server-hostname>\n";
+        std::cerr << "Error connecting: " << result.ec << ": " << result.get<1>().server_message()
+                  << std::endl;
         exit(1);
     }
+}
 
-    const char* hostname = argv[3];
-    const char* username = argv[1];
-    const char* password = argv[2];
-
-    //[tutorial_sync_connection
-    // The execution context, required to run I/O operations.
-    asio::io_context ctx;
+capy::io_task<> main_impl()
+{
+    // if (argc != 4)
+    // {
+    //     std::cerr << "Usage: " << argv[0] << " <username> <password> <server-hostname>\n";
+    //     exit(1);
+    // }
 
-    // Represents a connection to the MySQL server.
-    mysql::any_connection conn(ctx);
-    //]
+    mysql::any_connection conn(co_await capy::this_coro::executor);
 
-    //[tutorial_sync_main
-    //[tutorial_sync_connect
-    // The hostname, username and password to use
-    mysql::connect_params params;
-    params.server_address.emplace_host_and_port(hostname);
-    params.username = username;
-    params.password = password;
+    mysql::connect_params params{
+        .server_address = mysql::host_and_port("localhost"),
+        .username = "root",
+        .password = "",
+    };
 
     // Connect to the server
-    conn.connect(params);
-    //]
+    check_err(co_await conn.connect(params));
 
-    //[tutorial_sync_query
     // Issue the SQL query to the server
     const char* sql = "SELECT 'Hello world!'";
     mysql::results result;
-    conn.execute(sql, result);
-    //]
+    check_err(co_await conn.execute(sql, result));
 
-    //[tutorial_sync_results
     // Print the first field in the first row
     std::cout << result.rows().at(0).at(0) << std::endl;
-    //]
 
-    //[tutorial_sync_close
-    // Close the connection
-    conn.close();
-    //]
-    //]
+    // // Close the connection
+    // conn.close();
+
+    co_return {};
 }
 
 int main(int argc, char** argv)
 {
-    try
-    {
-        main_impl(argc, argv);
-    }
-    catch (const mysql::error_with_diagnostics& err)
-    {
-        // Some errors include additional diagnostics, like server-provided error messages.
-        // Security note: diagnostics::server_message may contain user-supplied values (e.g. the
-        // field value that caused the error) and is encoded using to the connection's character set
-        // (UTF-8 by default). Treat is as untrusted input.
-        std::cerr << "Error: " << err.what() << '\n'
-                  << "Server diagnostics: " << err.get_diagnostics().server_message() << std::endl;
-        return 1;
-    }
-    catch (const std::exception& err)
-    {
-        std::cerr << "Error: " << err.what() << std::endl;
-        return 1;
-    }
+    corosio::io_context ctx;
+    capy::run_async(ctx.get_executor())(main_impl());
+    ctx.run();
 }
 
 //]
diff --git a/include/boost/mysql.hpp b/include/boost/mysql.hpp
index f50e1105c..eaff21458 100644
--- a/include/boost/mysql.hpp
+++ b/include/boost/mysql.hpp
@@ -59,7 +59,6 @@
 #include <boost/mysql/statement.hpp>
 #include <boost/mysql/static_execution_state.hpp>
 #include <boost/mysql/static_results.hpp>
-#include <boost/mysql/string_view.hpp>
 #include <boost/mysql/tcp.hpp>
 #include <boost/mysql/tcp_ssl.hpp>
 #include <boost/mysql/throw_on_error.hpp>
diff --git a/include/boost/mysql/any_address.hpp b/include/boost/mysql/any_address.hpp
index 9ee9c38d9..92d4604cd 100644
--- a/include/boost/mysql/any_address.hpp
+++ b/include/boost/mysql/any_address.hpp
@@ -9,11 +9,13 @@
 #define BOOST_MYSQL_ANY_ADDRESS_HPP
 
 #include <boost/mysql/defaults.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/access.hpp>
 
+#include <boost/assert.hpp>
+
 #include <string>
+#include <string_view>
 
 namespace boost {
 namespace mysql {
@@ -187,7 +189,7 @@ class any_address
      * \par Exception safety
      * No-throw guarantee.
      */
-    string_view hostname() const noexcept
+    std::string_view hostname() const noexcept
     {
         BOOST_ASSERT(type() == address_type::host_and_port);
         return impl_.address;
@@ -219,7 +221,7 @@ class any_address
      * \par Exception safety
      * No-throw guarantee.
      */
-    string_view unix_socket_path() const noexcept
+    std::string_view unix_socket_path() const noexcept
     {
         BOOST_ASSERT(type() == address_type::unix_path);
         return impl_.address;
diff --git a/include/boost/mysql/any_connection.hpp b/include/boost/mysql/any_connection.hpp
index 120575a3e..cac1a8a5b 100644
--- a/include/boost/mysql/any_connection.hpp
+++ b/include/boost/mysql/any_connection.hpp
@@ -8,40 +8,33 @@
 #ifndef BOOST_MYSQL_ANY_CONNECTION_HPP
 #define BOOST_MYSQL_ANY_CONNECTION_HPP
 
-#include <boost/mysql/any_address.hpp>
 #include <boost/mysql/character_set.hpp>
+#include <boost/mysql/client_errc.hpp>
 #include <boost/mysql/connect_params.hpp>
 #include <boost/mysql/defaults.hpp>
 #include <boost/mysql/diagnostics.hpp>
 #include <boost/mysql/error_code.hpp>
-#include <boost/mysql/execution_state.hpp>
-#include <boost/mysql/metadata_mode.hpp>
+#include <boost/mysql/format_sql.hpp>
+#include <boost/mysql/metadata.hpp>
 #include <boost/mysql/rows_view.hpp>
 #include <boost/mysql/statement.hpp>
-#include <boost/mysql/string_view.hpp>
-#include <boost/mysql/with_diagnostics.hpp>
 
 #include <boost/mysql/detail/access.hpp>
-#include <boost/mysql/detail/algo_params.hpp>
-#include <boost/mysql/detail/config.hpp>
-#include <boost/mysql/detail/connect_params_helpers.hpp>
-#include <boost/mysql/detail/connection_impl.hpp>
-#include <boost/mysql/detail/engine.hpp>
+#include <boost/mysql/detail/any_execution_request.hpp>
 #include <boost/mysql/detail/execution_concepts.hpp>
-#include <boost/mysql/detail/ssl_fwd.hpp>
-#include <boost/mysql/detail/throw_on_error_loc.hpp>
+#include <boost/mysql/detail/execution_processor/execution_processor.hpp>
 
-#include <boost/asio/any_io_executor.hpp>
-#include <boost/asio/deferred.hpp>
-#include <boost/assert.hpp>
+#include <boost/capy/concept/executor.hpp>
+#include <boost/capy/ex/execution_context.hpp>
+#include <boost/capy/io_task.hpp>
 #include <boost/optional/optional.hpp>
 #include <boost/system/result.hpp>
 
 #include <cstddef>
 #include <cstdint>
 #include <memory>
-#include <type_traits>
-#include <utility>
+#include <span>
+#include <string_view>
 #include <vector>
 
 namespace boost {
@@ -51,6 +44,7 @@ namespace mysql {
 template <class... StaticRow>
 class static_execution_state;
 
+class execution_state;
 class pipeline_request;
 class stage_response;
 
@@ -59,26 +53,26 @@ class stage_response;
  */
 struct any_connection_params
 {
-    /**
-     * \brief An external SSL context containing options to configure TLS.
-     * \details
-     * Relevant only for SSL connections (those that result on \ref
-     * any_connection::uses_ssl returning `true`).
-     * \n
-     * If the connection is configured to use TLS, an internal `asio::ssl::stream`
-     * object will be created. If this member is set to a non-null value,
-     * this internal object will be initialized using the passed context.
-     * This is the only way to configure TLS options in `any_connection`.
-     * \n
-     * If the connection is configured to use TLS and this member is `nullptr`,
-     * an internal `asio::ssl::context` object with suitable default options
-     * will be created.
-     *
-     * \par Object lifetimes
-     * If set to non-null, the pointee object must be kept alive until
-     * all \ref any_connection objects constructed from `*this` are destroyed.
-     */
-    asio::ssl::context* ssl_context{};
+    // /**
+    //  * \brief An external SSL context containing options to configure TLS.
+    //  * \details
+    //  * Relevant only for SSL connections (those that result on \ref
+    //  * any_connection::uses_ssl returning `true`).
+    //  * \n
+    //  * If the connection is configured to use TLS, an internal `asio::ssl::stream`
+    //  * object will be created. If this member is set to a non-null value,
+    //  * this internal object will be initialized using the passed context.
+    //  * This is the only way to configure TLS options in `any_connection`.
+    //  * \n
+    //  * If the connection is configured to use TLS and this member is `nullptr`,
+    //  * an internal `asio::ssl::context` object with suitable default options
+    //  * will be created.
+    //  *
+    //  * \par Object lifetimes
+    //  * If set to non-null, the pointee object must be kept alive until
+    //  * all \ref any_connection objects constructed from `*this` are destroyed.
+    //  */
+    // asio::ssl::context* ssl_context{};
 
     /**
      * \brief The initial size of the connection's buffer, in bytes.
@@ -150,20 +144,22 @@ struct any_connection_params
  */
 class any_connection
 {
-    detail::connection_impl impl_;
-
-#ifndef BOOST_MYSQL_DOXYGEN
-    friend struct detail::access;
-#endif
-
-    BOOST_MYSQL_DECL
-    static std::unique_ptr<detail::engine> create_engine(asio::any_io_executor ex, asio::ssl::context* ctx);
-
-    // Used by tests
-    any_connection(std::unique_ptr<detail::engine> eng, any_connection_params params)
-        : impl_(params.initial_buffer_size, params.max_buffer_size, std::move(eng))
-    {
-    }
+    struct impl_t;
+    std::unique_ptr<impl_t> impl_;
+
+    // Private helpers for template functions
+    std::vector<field_view>& shared_fields();
+
+    // Non-template I/O impl functions
+    capy::io_task<diagnostics> start_execution_impl(
+        detail::any_execution_request req,
+        detail::execution_processor* proc
+    );
+    capy::io_task<diagnostics, std::size_t> read_some_rows_impl(
+        detail::execution_processor* proc,
+        detail::output_ref output
+    );
+    capy::io_task<diagnostics> read_resultset_head_impl(detail::execution_processor* proc);
 
 public:
     /**
@@ -175,8 +171,8 @@ class any_connection
      * You can configure extra parameters, like the SSL context and buffer sizes, by passing
      * an \ref any_connection_params object to this constructor.
      */
-    any_connection(boost::asio::any_io_executor ex, any_connection_params params = {})
-        : any_connection(create_engine(std::move(ex), params.ssl_context), params)
+    template <capy::Executor Ex>
+    any_connection(const Ex& ex, any_connection_params params = {}) : any_connection(ex.context(), params)
     {
     }
 
@@ -192,29 +188,17 @@ class any_connection
      * This function participates in overload resolution only if `ExecutionContext`
      * satisfies the `ExecutionContext` requirements imposed by Boost.Asio.
      */
-    template <
-        class ExecutionContext
-#ifndef BOOST_MYSQL_DOXYGEN
-        ,
-        class = typename std::enable_if<std::is_convertible<
-            decltype(std::declval<ExecutionContext&>().get_executor()),
-            asio::any_io_executor>::value>::type
-#endif
-        >
-    any_connection(ExecutionContext& ctx, any_connection_params params = {})
-        : any_connection(ctx.get_executor(), params)
-    {
-    }
+    any_connection(capy::execution_context& ctx, any_connection_params params = {});
 
     /**
      * \brief Move constructor.
      */
-    any_connection(any_connection&& other) = default;
+    any_connection(any_connection&& other) noexcept = default;
 
     /**
      * \brief Move assignment.
      */
-    any_connection& operator=(any_connection&& rhs) = default;
+    any_connection& operator=(any_connection&& rhs) noexcept;
 
 #ifndef BOOST_MYSQL_DOXYGEN
     any_connection(const any_connection&) = delete;
@@ -228,17 +212,7 @@ class any_connection
      * If you require a clean close, call \ref close or \ref async_close before the connection
      * is destroyed.
      */
-    ~any_connection() = default;
-
-    /// The executor type associated to this object.
-    using executor_type = asio::any_io_executor;
-
-    /**
-     * \brief Retrieves the executor associated to this object.
-     * \par Exception safety
-     * No-throw guarantee.
-     */
-    executor_type get_executor() noexcept { return impl_.get_engine().get_executor(); }
+    ~any_connection();
 
     /**
      * \brief Returns whether the connection negotiated the use of SSL or not.
@@ -253,7 +227,7 @@ class any_connection
      * \par Exception safety
      * No-throw guarantee.
      */
-    bool uses_ssl() const noexcept { return impl_.ssl_active(); }
+    bool uses_ssl() const noexcept;
 
     /**
      * \brief Returns whether backslashes are being treated as escape sequences.
@@ -278,7 +252,7 @@ class any_connection
      * \par Exception safety
      * No-throw guarantee.
      */
-    bool backslash_escapes() const noexcept { return impl_.backslash_escapes(); }
+    bool backslash_escapes() const noexcept;
 
     /**
      * \brief Returns the character set used by this connection.
@@ -290,11 +264,11 @@ class any_connection
      * \n
      * The following functions can modify the return value of this function: \n
      *   \li Prior to connection, the character set is always unknown.
-     *   \li \ref connect and \ref async_connect may set the current character set
+     *   \li \ref connect may set the current character set
      *       to a known value, depending on the requested collation.
-     *   \li \ref set_character_set always and \ref async_set_character_set always
-     *       set the current character set to the passed value.
-     *   \li \ref reset_connection and \ref async_reset_connection always makes the current character
+     *   \li \ref set_character_set always
+     *       sets the current character set to the passed value.
+     *   \li \ref reset_connection always makes the current character
      *       unknown.
      *
      * \par Avoid changing the character set directly
@@ -308,13 +282,11 @@ class any_connection
      * \par Exception safety
      * No-throw guarantee.
      */
-    system::result<character_set> current_character_set() const noexcept
-    {
-        return impl_.current_character_set();
-    }
+    system::result<character_set> current_character_set() const noexcept;
 
     /**
-     * \brief Returns format options suitable to format SQL according to the current connection configuration.
+     * \brief Returns format options suitable to format SQL according to the current connection
+     * configuration.
      * \details
      * If the current character set is known (as given by \ref current_character_set), returns
      * a value suitable to be passed to SQL formatting functions. Otherwise, returns an error.
@@ -325,13 +297,7 @@ class any_connection
      * \par Exception safety
      * No-throw guarantee.
      */
-    system::result<format_options> format_opts() const noexcept
-    {
-        auto res = current_character_set();
-        if (res.has_error())
-            return res.error();
-        return format_options{res.value(), backslash_escapes()};
-    }
+    system::result<format_options> format_opts() const noexcept;
 
     /**
      * \brief Returns the current metadata mode that this connection is using.
@@ -341,7 +307,7 @@ class any_connection
      *
      * \returns The metadata mode that will be used for queries and statement executions.
      */
-    metadata_mode meta_mode() const noexcept { return impl_.meta_mode(); }
+    metadata_mode meta_mode() const noexcept;
 
     /**
      * \brief Sets the metadata mode.
@@ -356,14 +322,14 @@ class any_connection
      *
      * \param v The new metadata mode.
      */
-    void set_meta_mode(metadata_mode v) noexcept { impl_.set_meta_mode(v); }
+    void set_meta_mode(metadata_mode v) noexcept;
 
     /**
      * \brief Retrieves the connection id associated to the current session.
      * \details
      * If a session has been established, returns its associated connection id.
-     * If no session has been established (i.e. \ref async_connect hasn't been called yet)
-     * or the session has been terminated (i.e. \ref async_close has been called), an empty
+     * If no session has been established (i.e. \ref connect hasn't been called yet)
+     * or the session has been terminated (i.e. \ref close has been called), an empty
      * optional is returned.
      *
      * The connection id is a 4 byte value that uniquely identifies a client session
@@ -385,13 +351,13 @@ class any_connection
      * the official docs suggest (see
      * <a href="https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-5.html">this changelog</a>).
      *
-     * It is safe to call this function while an async operation is outstanding, except for \ref async_connect
-     * and \ref async_close.
+     * It is safe to call this function while an async operation is outstanding, except for \ref
+     * connect and \ref close.
      *
      * \par Exception safety
      * No-throw guarantee.
      */
-    boost::optional<std::uint32_t> connection_id() const noexcept { return impl_.connection_id(); }
+    boost::optional<std::uint32_t> connection_id() const noexcept;
 
     /**
      * \brief Establishes a connection to a MySQL server.
@@ -429,58 +395,7 @@ class any_connection
      * The default collation (`utf8mb4_general_ci`) is the only one guaranteed to be in the set of well-known
      * collations.
      */
-    void connect(const connect_params& params, error_code& ec, diagnostics& diag)
-    {
-        impl_.connect_v2(params, ec, diag);
-    }
-
-    /// \copydoc connect
-    void connect(const connect_params& params)
-    {
-        error_code err;
-        diagnostics diag;
-        connect(params, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /**
-     * \copydoc connect
-     *
-     * \par Object lifetimes
-     * params needs to be kept alive until the operation completes, as no
-     * copies will be made by the library.
-     *
-     * \par Handler signature
-     * The handler signature for this operation is `void(boost::mysql::error_code)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     */
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_connect(const connect_params& params, diagnostics& diag, CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_connect_v2_t<CompletionToken&&>)
-    {
-        return impl_.async_connect_v2(params, diag, std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_connect
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_connect(const connect_params& params, CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_connect_v2_t<CompletionToken&&>)
-    {
-        return async_connect(params, impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
+    capy::io_task<diagnostics> connect(const connect_params& params);
 
     /**
      * \brief Executes a text query or prepared statement.
@@ -498,84 +413,39 @@ class any_connection
      * Metadata in `result` will be populated according to `this->meta_mode()`.
      */
     template <BOOST_MYSQL_EXECUTION_REQUEST ExecutionRequest, BOOST_MYSQL_RESULTS_TYPE ResultsType>
-    void execute(ExecutionRequest&& req, ResultsType& result, error_code& err, diagnostics& diag)
+    capy::io_task<diagnostics> execute(ExecutionRequest&& req, ResultsType& result)
     {
-        impl_.execute(std::forward<ExecutionRequest>(req), result, err, diag);
+        auto req_ref = detail::execution_request_traits<std::decay_t<ExecutionRequest>>::make_request(
+            std::forward<ExecutionRequest>(req),
+            shared_fields()
+        );
+        auto* results_ref = &detail::access::get_impl(result).get_interface();
+        co_return co_await execute_impl(req_ref, results_ref);
     }
 
-    /// \copydoc execute
-    template <BOOST_MYSQL_EXECUTION_REQUEST ExecutionRequest, BOOST_MYSQL_RESULTS_TYPE ResultsType>
-    void execute(ExecutionRequest&& req, ResultsType& result)
-    {
-        error_code err;
-        diagnostics diag;
-        execute(std::forward<ExecutionRequest>(req), result, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
+    capy::io_task<diagnostics> execute_impl(
+        detail::any_execution_request req,
+        detail::execution_processor* proc
+    );
 
     /**
-     * \copydoc execute
-     * \par Object lifetimes
-     * If `CompletionToken` is a deferred completion token (e.g. `use_awaitable`), the caller is
-     * responsible for managing `req`'s validity following these rules:
+     * \brief Prepares a statement server-side.
+     * \details
+     * `stmt` should be encoded using the connection's character set.
      * \n
-     * \li If `req` is `string_view`, the string pointed to by `req`
-     *     must be kept alive by the caller until the operation is initiated.
-     * \li If `req` is a \ref bound_statement_tuple, and any of the parameters is a reference
-     *     type (like `string_view`), the caller must keep the values pointed by these references alive
-     *     until the operation is initiated.
-     * \li If `req` is a \ref bound_statement_iterator_range, the caller must keep objects in
-     *     the iterator range passed to \ref statement::bind alive until the  operation is initiated.
-     *
-     * \par Handler signature
-     * The handler signature for this operation is `void(boost::mysql::error_code)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
+     * The returned statement has `valid() == true`.
      */
-    template <
-        BOOST_MYSQL_EXECUTION_REQUEST ExecutionRequest,
-        BOOST_MYSQL_RESULTS_TYPE ResultsType,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_execute(ExecutionRequest&& req, ResultsType& result, CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_execute_t<ExecutionRequest&&, ResultsType, CompletionToken&&>)
-    {
-        return async_execute(
-            std::forward<ExecutionRequest>(req),
-            result,
-            impl_.shared_diag(),
-            std::forward<CompletionToken>(token)
-        );
-    }
+    capy::io_task<diagnostics, statement> prepare_statement(std::string_view stmt);
 
-    /// \copydoc async_execute
-    template <
-        BOOST_MYSQL_EXECUTION_REQUEST ExecutionRequest,
-        BOOST_MYSQL_RESULTS_TYPE ResultsType,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_execute(
-        ExecutionRequest&& req,
-        ResultsType& result,
-        diagnostics& diag,
-        CompletionToken&& token = {}
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_execute_t<ExecutionRequest&&, ResultsType, CompletionToken&&>)
-    {
-        return impl_.async_execute(
-            std::forward<ExecutionRequest>(req),
-            result,
-            diag,
-            std::forward<CompletionToken>(token)
-        );
-    }
+    /**
+     * \brief Closes a statement, deallocating it from the server.
+     * \details
+     * After this operation succeeds, `stmt` must not be used again for execution.
+     * \n
+     * \par Preconditions
+     *    `stmt.valid() == true`
+     */
+    capy::io_task<diagnostics> close_statement(const statement& stmt);
 
     /**
      * \brief Starts a SQL execution as a multi-function operation.
@@ -600,224 +470,17 @@ class any_connection
      * \n
      * When using the static interface, this function will detect schema mismatches for the first
      * resultset. Further errors may be detected by \ref read_resultset_head and \ref read_some_rows.
-     * \n
      */
     template <
         BOOST_MYSQL_EXECUTION_REQUEST ExecutionRequest,
         BOOST_MYSQL_EXECUTION_STATE_TYPE ExecutionStateType>
-    void start_execution(ExecutionRequest&& req, ExecutionStateType& st, error_code& err, diagnostics& diag)
-    {
-        impl_.start_execution(std::forward<ExecutionRequest>(req), st, err, diag);
-    }
-
-    /// \copydoc start_execution
-    template <
-        BOOST_MYSQL_EXECUTION_REQUEST ExecutionRequest,
-        BOOST_MYSQL_EXECUTION_STATE_TYPE ExecutionStateType>
-    void start_execution(ExecutionRequest&& req, ExecutionStateType& st)
-    {
-        error_code err;
-        diagnostics diag;
-        start_execution(std::forward<ExecutionRequest>(req), st, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /**
-     * \copydoc start_execution
-     * \par Object lifetimes
-     * If `CompletionToken` is a deferred completion token (e.g. `use_awaitable`), the caller is
-     * responsible for managing `req`'s validity following these rules:
-     * \n
-     * \li If `req` is `string_view`, the string pointed to by `req`
-     *     must be kept alive by the caller until the operation is initiated.
-     * \li If `req` is a \ref bound_statement_tuple, and any of the parameters is a reference
-     *     type (like `string_view`), the caller must keep the values pointed by these references alive
-     *     until the operation is initiated.
-     * \li If `req` is a \ref bound_statement_iterator_range, the caller must keep objects in
-     *     the iterator range passed to \ref statement::bind alive until the  operation is initiated.
-     *
-     * \par Handler signature
-     * The handler signature for this operation is `void(boost::mysql::error_code)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     */
-    template <
-        BOOST_MYSQL_EXECUTION_REQUEST ExecutionRequest,
-        BOOST_MYSQL_EXECUTION_STATE_TYPE ExecutionStateType,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_start_execution(ExecutionRequest&& req, ExecutionStateType& st, CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_start_execution_t<
-                                ExecutionRequest&&,
-                                ExecutionStateType,
-                                CompletionToken&&>)
+    capy::io_task<diagnostics> start_execution(ExecutionRequest&& req, ExecutionStateType& st)
     {
-        return async_start_execution(
+        auto req_ref = detail::execution_request_traits<std::decay_t<ExecutionRequest>>::make_request(
             std::forward<ExecutionRequest>(req),
-            st,
-            impl_.shared_diag(),
-            std::forward<CompletionToken>(token)
+            shared_fields()
         );
-    }
-
-    /// \copydoc async_start_execution
-    template <
-        BOOST_MYSQL_EXECUTION_REQUEST ExecutionRequest,
-        BOOST_MYSQL_EXECUTION_STATE_TYPE ExecutionStateType,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_start_execution(
-        ExecutionRequest&& req,
-        ExecutionStateType& st,
-        diagnostics& diag,
-        CompletionToken&& token = {}
-    )
-        BOOST_MYSQL_RETURN_TYPE(detail::async_start_execution_t<
-                                ExecutionRequest&&,
-                                ExecutionStateType,
-                                CompletionToken&&>)
-    {
-        return impl_.async_start_execution(
-            std::forward<ExecutionRequest>(req),
-            st,
-            diag,
-            std::forward<CompletionToken>(token)
-        );
-    }
-
-    /**
-     * \brief Prepares a statement server-side.
-     * \details
-     * `stmt` should be encoded using the connection's character set.
-     * \n
-     * The returned statement has `valid() == true`.
-     */
-    statement prepare_statement(string_view stmt, error_code& err, diagnostics& diag)
-    {
-        return impl_.run(detail::prepare_statement_algo_params{stmt}, err, diag);
-    }
-
-    /// \copydoc prepare_statement
-    statement prepare_statement(string_view stmt)
-    {
-        error_code err;
-        diagnostics diag;
-        statement res = prepare_statement(stmt, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-        return res;
-    }
-
-    /**
-     * \copydoc prepare_statement
-     * \details
-     * \par Object lifetimes
-     * If `CompletionToken` is a deferred completion token (e.g. `use_awaitable`), the string
-     * pointed to by `stmt` must be kept alive by the caller until the operation is
-     * initiated.
-     *
-     * \par Handler signature
-     * The handler signature for this operation is `void(boost::mysql::error_code, boost::mysql::statement)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     */
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code, ::boost::mysql::statement))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_prepare_statement(string_view stmt, CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_prepare_statement_t<CompletionToken&&>)
-    {
-        return async_prepare_statement(stmt, impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_prepare_statement
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code, ::boost::mysql::statement))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_prepare_statement(string_view stmt, diagnostics& diag, CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_prepare_statement_t<CompletionToken&&>)
-    {
-        return impl_.async_run(
-            detail::prepare_statement_algo_params{stmt},
-            diag,
-            std::forward<CompletionToken>(token)
-        );
-    }
-
-    /**
-     * \brief Closes a statement, deallocating it from the server.
-     * \details
-     * After this operation succeeds, `stmt` must not be used again for execution.
-     * \n
-     * \par Preconditions
-     *    `stmt.valid() == true`
-     */
-    void close_statement(const statement& stmt, error_code& err, diagnostics& diag)
-    {
-        impl_.run(impl_.make_params_close_statement(stmt), err, diag);
-    }
-
-    /// \copydoc close_statement
-    void close_statement(const statement& stmt)
-    {
-        error_code err;
-        diagnostics diag;
-        close_statement(stmt, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /**
-     * \copydoc close_statement
-     * \details
-     * \par Object lifetimes
-     * It is not required to keep `stmt` alive, as copies are made by the implementation as required.
-     *
-     * \par Handler signature
-     * The handler signature for this operation is `void(boost::mysql::error_code)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     */
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_close_statement(const statement& stmt, CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_close_statement_t<CompletionToken&&>)
-    {
-        return async_close_statement(stmt, impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_close_statement
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_close_statement(const statement& stmt, diagnostics& diag, CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_close_statement_t<CompletionToken&&>)
-    {
-        return impl_
-            .async_run(impl_.make_params_close_statement(stmt), diag, std::forward<CompletionToken>(token));
+        co_return co_await start_execution_impl(req_ref, &detail::access::get_impl(st).get_interface());
     }
 
     /**
@@ -835,97 +498,7 @@ class any_connection
      * The returned view points into memory owned by `*this`. It will be valid until
      * `*this` performs the next network operation or is destroyed.
      */
-    rows_view read_some_rows(execution_state& st, error_code& err, diagnostics& diag)
-    {
-        return impl_.run(impl_.make_params_read_some_rows(st), err, diag);
-    }
-
-    /// \copydoc read_some_rows(execution_state&,error_code&,diagnostics&)
-    rows_view read_some_rows(execution_state& st)
-    {
-        error_code err;
-        diagnostics diag;
-        rows_view res = read_some_rows(st, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-        return res;
-    }
-
-    /**
-     * \copydoc read_some_rows(execution_state&,error_code&,diagnostics&)
-     * \details
-     * \par Handler signature
-     * The handler signature for this operation is
-     * `void(boost::mysql::error_code, boost::mysql::rows_view)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     */
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code, ::boost::mysql::rows_view))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_read_some_rows(execution_state& st, CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_read_some_rows_dynamic_t<CompletionToken&&>)
-    {
-        return async_read_some_rows(st, impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_read_some_rows(execution_state&,CompletionToken&&)
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code, ::boost::mysql::rows_view))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_read_some_rows(execution_state& st, diagnostics& diag, CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_read_some_rows_dynamic_t<CompletionToken&&>)
-    {
-        return impl_
-            .async_run(impl_.make_params_read_some_rows(st), diag, std::forward<CompletionToken>(token));
-    }
-
-#ifdef BOOST_MYSQL_CXX14
-
-    /**
-     * \brief Reads a batch of rows.
-     * \details
-     * Reads a batch of rows of unspecified size into the storage given by `output`.
-     * At most `output.size()` rows will be read. If the operation represented by `st`
-     * has still rows to read, and `output.size() > 0`, at least one row will be read.
-     * \n
-     * Returns the number of read rows.
-     * \n
-     * If there are no more rows, or `st.should_read_rows() == false`, this function is a no-op and returns
-     * zero.
-     * \n
-     * The number of rows that will be read depends on the connection's buffer size. The bigger the buffer,
-     * the greater the batch size (up to a maximum). You can set the initial buffer size in the
-     * constructor. The buffer may be grown bigger by other read operations, if required.
-     * \n
-     * Rows read by this function are owning objects, and don't hold any reference to
-     * the connection's internal buffers (contrary what happens with the dynamic interface's counterpart).
-     * \n
-     * The type `SpanElementType` must be the underlying row type for one of the types in the
-     * `StaticRow` parameter pack (i.e., one of the types in `underlying_row_t<StaticRow>...`).
-     * The type must match the resultset that is currently being processed by `st`. For instance,
-     * given `static_execution_state<T1, T2>`, when reading rows for the second resultset, `SpanElementType`
-     * must exactly be `underlying_row_t<T2>`. If this is not the case, a runtime error will be issued.
-     * \n
-     * This function can report schema mismatches.
-     */
-    template <class SpanElementType, class... StaticRow>
-    std::size_t read_some_rows(
-        static_execution_state<StaticRow...>& st,
-        span<SpanElementType> output,
-        error_code& err,
-        diagnostics& diag
-    )
-    {
-        return impl_.run(impl_.make_params_read_some_rows_static(st, output), err, diag);
-    }
+    capy::io_task<diagnostics, rows_view> read_some_rows(execution_state& st);
 
     /**
      * \brief Reads a batch of rows.
@@ -946,145 +519,27 @@ class any_connection
      * Rows read by this function are owning objects, and don't hold any reference to
      * the connection's internal buffers (contrary what happens with the dynamic interface's counterpart).
      * \n
+     * \par Extracting rows
      * The type `SpanElementType` must be the underlying row type for one of the types in the
      * `StaticRow` parameter pack (i.e., one of the types in `underlying_row_t<StaticRow>...`).
      * The type must match the resultset that is currently being processed by `st`. For instance,
-     * given `static_execution_state<T1, T2>`, when reading rows for the second resultset, `SpanElementType`
-     * must exactly be `underlying_row_t<T2>`. If this is not the case, a runtime error will be issued.
+     * given `static_execution_state<T1, T2>`, when reading rows for the second resultset,
+     * `SpanElementType` must exactly be `underlying_row_t<T2>`.
+     * If this is not the case, a runtime error will be issued.
      * \n
      * This function can report schema mismatches.
      */
     template <class SpanElementType, class... StaticRow>
-    std::size_t read_some_rows(static_execution_state<StaticRow...>& st, span<SpanElementType> output)
-    {
-        error_code err;
-        diagnostics diag;
-        std::size_t res = read_some_rows(st, output, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-        return res;
-    }
-
-    /**
-     * \brief Reads a batch of rows.
-     * \details
-     * Reads a batch of rows of unspecified size into the storage given by `output`.
-     * At most `output.size()` rows will be read. If the operation represented by `st`
-     * has still rows to read, and `output.size() > 0`, at least one row will be read.
-     * \n
-     * Returns the number of read rows.
-     * \n
-     * If there are no more rows, or `st.should_read_rows() == false`, this function is a no-op and returns
-     * zero.
-     * \n
-     * The number of rows that will be read depends on the connection's buffer size. The bigger the buffer,
-     * the greater the batch size (up to a maximum). You can set the initial buffer size in the
-     * constructor. The buffer may be grown bigger by other read operations, if required.
-     * \n
-     * Rows read by this function are owning objects, and don't hold any reference to
-     * the connection's internal buffers (contrary what happens with the dynamic interface's counterpart).
-     * \n
-     * The type `SpanElementType` must be the underlying row type for one of the types in the
-     * `StaticRow` parameter pack (i.e., one of the types in `underlying_row_t<StaticRow>...`).
-     * The type must match the resultset that is currently being processed by `st`. For instance,
-     * given `static_execution_state<T1, T2>`, when reading rows for the second resultset, `SpanElementType`
-     * must exactly be `underlying_row_t<T2>`. If this is not the case, a runtime error will be issued.
-     * \n
-     * This function can report schema mismatches.
-     *
-     * \par Handler signature
-     * The handler signature for this operation is
-     * `void(boost::mysql::error_code, std::size_t)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     *
-     * \par Object lifetimes
-     * The storage that `output` references must be kept alive until the operation completes.
-     */
-    template <
-        class SpanElementType,
-        class... StaticRow,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code, std::size_t))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_read_some_rows(
+    capy::io_task<diagnostics, std::size_t> read_some_rows(
         static_execution_state<StaticRow...>& st,
-        span<SpanElementType> output,
-        CompletionToken&& token = {}
+        std::span<SpanElementType> output
     )
     {
-        return async_read_some_rows(st, output, impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /**
-     * \brief Reads a batch of rows.
-     * \details
-     * Reads a batch of rows of unspecified size into the storage given by `output`.
-     * At most `output.size()` rows will be read. If the operation represented by `st`
-     * has still rows to read, and `output.size() > 0`, at least one row will be read.
-     * \n
-     * Returns the number of read rows.
-     * \n
-     * If there are no more rows, or `st.should_read_rows() == false`, this function is a no-op and returns
-     * zero.
-     * \n
-     * The number of rows that will be read depends on the connection's buffer size. The bigger the buffer,
-     * the greater the batch size (up to a maximum). You can set the initial buffer size in the
-     * constructor. The buffer may be grown bigger by other read operations, if required.
-     * \n
-     * Rows read by this function are owning objects, and don't hold any reference to
-     * the connection's internal buffers (contrary what happens with the dynamic interface's counterpart).
-     * \n
-     * The type `SpanElementType` must be the underlying row type for one of the types in the
-     * `StaticRow` parameter pack (i.e., one of the types in `underlying_row_t<StaticRow>...`).
-     * The type must match the resultset that is currently being processed by `st`. For instance,
-     * given `static_execution_state<T1, T2>`, when reading rows for the second resultset, `SpanElementType`
-     * must exactly be `underlying_row_t<T2>`. If this is not the case, a runtime error will be issued.
-     * \n
-     * This function can report schema mismatches.
-     *
-     * \par Handler signature
-     * The handler signature for this operation is
-     * `void(boost::mysql::error_code, std::size_t)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     *
-     * \par Object lifetimes
-     * The storage that `output` references must be kept alive until the operation completes.
-     */
-    template <
-        class SpanElementType,
-        class... StaticRow,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code, std::size_t))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_read_some_rows(
-        static_execution_state<StaticRow...>& st,
-        span<SpanElementType> output,
-        diagnostics& diag,
-        CompletionToken&& token = {}
-    )
-    {
-        return impl_.async_run(
-            impl_.make_params_read_some_rows_static(st, output),
-            diag,
-            std::forward<CompletionToken>(token)
+        co_return co_await read_some_rows_impl(
+            &detail::access::get_impl(st).get_interface(),
+            detail::access::get_impl(st).make_output_ref(output)
         );
     }
-#endif
 
     /**
      * \brief Reads metadata for subsequent resultsets in a multi-resultset operation.
@@ -1104,60 +559,11 @@ class any_connection
      * When using the static interface, this function will detect schema mismatches for the resultset
      * currently being read. Further errors may be detected by subsequent invocations of this function
      * and by \ref read_some_rows.
-     * \n
      */
     template <BOOST_MYSQL_EXECUTION_STATE_TYPE ExecutionStateType>
-    void read_resultset_head(ExecutionStateType& st, error_code& err, diagnostics& diag)
+    capy::io_task<diagnostics> read_resultset_head(ExecutionStateType& st)
     {
-        return impl_.run(impl_.make_params_read_resultset_head(st), err, diag);
-    }
-
-    /// \copydoc read_resultset_head
-    template <BOOST_MYSQL_EXECUTION_STATE_TYPE ExecutionStateType>
-    void read_resultset_head(ExecutionStateType& st)
-    {
-        error_code err;
-        diagnostics diag;
-        read_resultset_head(st, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /**
-     * \copydoc read_resultset_head
-     * \par Handler signature
-     * The handler signature for this operation is
-     * `void(boost::mysql::error_code)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     */
-    template <
-        BOOST_MYSQL_EXECUTION_STATE_TYPE ExecutionStateType,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_read_resultset_head(ExecutionStateType& st, CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_read_resultset_head_t<CompletionToken&&>)
-    {
-        return async_read_resultset_head(st, impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_read_resultset_head
-    template <
-        BOOST_MYSQL_EXECUTION_STATE_TYPE ExecutionStateType,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_read_resultset_head(ExecutionStateType& st, diagnostics& diag, CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_read_resultset_head_t<CompletionToken&&>)
-    {
-        return impl_
-            .async_run(impl_.make_params_read_resultset_head(st), diag, std::forward<CompletionToken>(token));
+        co_return co_await read_resultset_head_impl(&detail::access::get_impl(st).get_interface());
     }
 
     /**
@@ -1181,62 +587,7 @@ class any_connection
      * \par Object lifetimes
      * `charset` will be copied as required, and does not need to be kept alive.
      */
-    void set_character_set(const character_set& charset, error_code& err, diagnostics& diag)
-    {
-        impl_.run(detail::set_character_set_algo_params{charset}, err, diag);
-    }
-
-    /// \copydoc set_character_set
-    void set_character_set(const character_set& charset)
-    {
-        error_code err;
-        diagnostics diag;
-        set_character_set(charset, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /**
-     * \copydoc set_character_set
-     * \details
-     * \n
-     * \par Handler signature
-     * The handler signature for this operation is `void(boost::mysql::error_code)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     */
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_set_character_set(const character_set& charset, CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_set_character_set_t<CompletionToken&&>)
-    {
-        return async_set_character_set(charset, impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_set_character_set
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_set_character_set(
-        const character_set& charset,
-        diagnostics& diag,
-        CompletionToken&& token = {}
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_set_character_set_t<CompletionToken&&>)
-    {
-        return impl_.async_run(
-            detail::set_character_set_algo_params{charset},
-            diag,
-            std::forward<CompletionToken>(token)
-        );
-    }
+    capy::io_task<diagnostics> set_character_set(const character_set& charset);
 
     /**
      * \brief Checks whether the server is alive.
@@ -1249,52 +600,7 @@ class any_connection
      * in a long-running query, the ping request won't be answered until the query is
      * finished.
      */
-    void ping(error_code& err, diagnostics& diag) { impl_.run(detail::ping_algo_params{}, err, diag); }
-
-    /// \copydoc ping
-    void ping()
-    {
-        error_code err;
-        diagnostics diag;
-        ping(err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /**
-     * \copydoc ping
-     * \details
-     * \n
-     * \par Handler signature
-     * The handler signature for this operation is `void(boost::mysql::error_code)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     */
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_ping(CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_ping_t<CompletionToken&&>)
-    {
-        return async_ping(impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_ping
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_ping(diagnostics& diag, CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_ping_t<CompletionToken&&>)
-    {
-        return impl_.async_run(detail::ping_algo_params{}, diag, std::forward<CompletionToken>(token));
-    }
+    capy::io_task<diagnostics> ping();
 
     /**
      * \brief Resets server-side session state, like variables and prepared statements.
@@ -1322,65 +628,15 @@ class any_connection
      * This function will restore the connection's character set and collation **to the server's default**,
      * and not to the one specified during connection establishment. Some servers have `latin1` as their
      * default character set, which is not usually what you want. Since there is no way to know this
-     * character set, \ref current_character_set will return `nullptr` after the operation succeeds.
-     * We recommend always using \ref set_character_set or \ref async_set_character_set after calling this
-     * function.
+     * character set, \ref current_character_set will return an error after the operation succeeds.
+     * We recommend always using \ref set_character_set after calling this function.
      * \n
      * You can find the character set that your server will use after the reset by running:
      * \code
      * "SELECT @@global.character_set_client, @@global.character_set_results;"
      * \endcode
      */
-    void reset_connection(error_code& err, diagnostics& diag)
-    {
-        impl_.run(detail::reset_connection_algo_params{}, err, diag);
-    }
-
-    /// \copydoc reset_connection
-    void reset_connection()
-    {
-        error_code err;
-        diagnostics diag;
-        reset_connection(err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /**
-     * \copydoc reset_connection
-     * \details
-     * \n
-     * \par Handler signature
-     * The handler signature for this operation is `void(boost::mysql::error_code)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     */
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_reset_connection(CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_reset_connection_t<CompletionToken&&>)
-    {
-        return async_reset_connection(impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_reset_connection
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_reset_connection(diagnostics& diag, CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_reset_connection_t<CompletionToken&&>)
-    {
-        return impl_
-            .async_run(detail::reset_connection_algo_params{}, diag, std::forward<CompletionToken>(token));
-    }
+    capy::io_task<diagnostics> reset_connection();
 
     /**
      * \brief Cleanly closes the connection to the server.
@@ -1401,55 +657,7 @@ class any_connection
      * perform a transport-layer close. This doesn't cause any resource leaks, but may
      * cause warnings to be written to the server logs.
      */
-    void close(error_code& err, diagnostics& diag)
-    {
-        impl_.run(detail::close_connection_algo_params{}, err, diag);
-    }
-
-    /// \copydoc close
-    void close()
-    {
-        error_code err;
-        diagnostics diag;
-        close(err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /**
-     * \copydoc close
-     * \details
-     * \par Handler signature
-     * The handler signature for this operation is `void(boost::mysql::error_code)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     */
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_close(CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_close_connection_t<CompletionToken&&>)
-    {
-        return async_close(impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_close
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_close(diagnostics& diag, CompletionToken&& token = {})
-        BOOST_MYSQL_RETURN_TYPE(detail::async_close_connection_t<CompletionToken&&>)
-    {
-        return this->impl_
-            .async_run(detail::close_connection_algo_params{}, diag, std::forward<CompletionToken>(token));
-    }
+    capy::io_task<diagnostics> close();
 
     /**
      * \brief Runs a set of pipelined requests.
@@ -1472,78 +680,10 @@ class any_connection
      * Successive stages will be marked as failed with the fatal error. The server may or may
      * not have processed such stages.
      */
-    void run_pipeline(
-        const pipeline_request& req,
-        std::vector<stage_response>& res,
-        error_code& err,
-        diagnostics& diag
-    )
-    {
-        impl_.run(impl_.make_params_pipeline(req, res), err, diag);
-    }
-
-    /// \copydoc run_pipeline
-    void run_pipeline(const pipeline_request& req, std::vector<stage_response>& res)
-    {
-        error_code err;
-        diagnostics diag;
-        run_pipeline(req, res, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /**
-     * \copydoc run_pipeline
-     * \details
-     * \par Handler signature
-     * The handler signature for this operation is `void(boost::mysql::error_code)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     *
-     * \par Object lifetimes
-     * The request and response objects must be kept alive and should not be modified
-     * until the operation completes.
-     */
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_run_pipeline(
-        const pipeline_request& req,
-        std::vector<stage_response>& res,
-        CompletionToken&& token = {}
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_run_pipeline_t<CompletionToken&&>)
-    {
-        return async_run_pipeline(req, res, impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_run_pipeline
-    template <
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code))
-            CompletionToken = with_diagnostics_t<asio::deferred_t>>
-    auto async_run_pipeline(
-        const pipeline_request& req,
-        std::vector<stage_response>& res,
-        diagnostics& diag,
-        CompletionToken&& token = {}
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_run_pipeline_t<CompletionToken&&>)
-    {
-        return this->impl_
-            .async_run(impl_.make_params_pipeline(req, res), diag, std::forward<CompletionToken>(token));
-    }
+    capy::io_task<diagnostics> run_pipeline(const pipeline_request& req, std::vector<stage_response>& res);
 };
 
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/any_connection.ipp>
-#endif
-
 #endif
diff --git a/include/boost/mysql/blob_view.hpp b/include/boost/mysql/blob_view.hpp
index 5a3fb4e23..4ed29715f 100644
--- a/include/boost/mysql/blob_view.hpp
+++ b/include/boost/mysql/blob_view.hpp
@@ -8,13 +8,13 @@
 #ifndef BOOST_MYSQL_BLOB_VIEW_HPP
 #define BOOST_MYSQL_BLOB_VIEW_HPP
 
-#include <boost/core/span.hpp>
+#include <span>
 
 namespace boost {
 namespace mysql {
 
 /// Non-owning type used to represent binary blobs.
-using blob_view = boost::span<const unsigned char>;
+using blob_view = std::span<const unsigned char>;
 
 }  // namespace mysql
 }  // namespace boost
diff --git a/include/boost/mysql/character_set.hpp b/include/boost/mysql/character_set.hpp
index 7aeefed06..12efe220d 100644
--- a/include/boost/mysql/character_set.hpp
+++ b/include/boost/mysql/character_set.hpp
@@ -11,7 +11,7 @@
 #include <boost/mysql/detail/character_set.hpp>
 #include <boost/mysql/detail/config.hpp>
 
-#include <boost/core/span.hpp>
+#include <span>
 
 #include <cstddef>
 
@@ -50,7 +50,7 @@ struct character_set
      * \n
      * This function must not throw exceptions or have side effects.
      */
-    std::size_t (*next_char)(span<const unsigned char>);
+    std::size_t (*next_char)(std::span<const unsigned char>);
 };
 
 /// The utf8mb4 character set (the one you should use by default).
@@ -84,8 +84,5 @@ struct format_options
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/character_set.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/client_errc.hpp b/include/boost/mysql/client_errc.hpp
index 91b59bdbe..1d54e30b4 100644
--- a/include/boost/mysql/client_errc.hpp
+++ b/include/boost/mysql/client_errc.hpp
@@ -201,8 +201,5 @@ struct is_error_code_enum<::boost::mysql::client_errc>
 
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/error_categories.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/column_type.hpp b/include/boost/mysql/column_type.hpp
index a0e776dbc..79217a446 100644
--- a/include/boost/mysql/column_type.hpp
+++ b/include/boost/mysql/column_type.hpp
@@ -63,8 +63,5 @@ std::ostream& operator<<(std::ostream& os, column_type t);
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/column_type.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/common_server_errc.hpp b/include/boost/mysql/common_server_errc.hpp
index cdc9c1484..52ad13e22 100644
--- a/include/boost/mysql/common_server_errc.hpp
+++ b/include/boost/mysql/common_server_errc.hpp
@@ -5125,8 +5125,5 @@ struct is_error_code_enum<::boost::mysql::common_server_errc>
 
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/error_categories.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/connect_params.hpp b/include/boost/mysql/connect_params.hpp
index b21ad2d8d..ce2ce44ce 100644
--- a/include/boost/mysql/connect_params.hpp
+++ b/include/boost/mysql/connect_params.hpp
@@ -10,10 +10,10 @@
 
 #include <boost/mysql/any_address.hpp>
 #include <boost/mysql/ssl_mode.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <cstdint>
 #include <string>
+#include <string_view>
 
 namespace boost {
 namespace mysql {
diff --git a/include/boost/mysql/connection.hpp b/include/boost/mysql/connection.hpp
deleted file mode 100644
index 30d077710..000000000
--- a/include/boost/mysql/connection.hpp
+++ /dev/null
@@ -1,1127 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_CONNECTION_HPP
-#define BOOST_MYSQL_CONNECTION_HPP
-
-#include <boost/mysql/buffer_params.hpp>
-#include <boost/mysql/defaults.hpp>
-#include <boost/mysql/diagnostics.hpp>
-#include <boost/mysql/error_code.hpp>
-#include <boost/mysql/execution_state.hpp>
-#include <boost/mysql/handshake_params.hpp>
-#include <boost/mysql/metadata_mode.hpp>
-#include <boost/mysql/results.hpp>
-#include <boost/mysql/rows_view.hpp>
-#include <boost/mysql/statement.hpp>
-#include <boost/mysql/string_view.hpp>
-
-#include <boost/mysql/detail/access.hpp>
-#include <boost/mysql/detail/algo_params.hpp>
-#include <boost/mysql/detail/connection_impl.hpp>
-#include <boost/mysql/detail/engine_stream_adaptor.hpp>
-#include <boost/mysql/detail/execution_concepts.hpp>
-#include <boost/mysql/detail/rebind_executor.hpp>
-#include <boost/mysql/detail/socket_stream.hpp>
-#include <boost/mysql/detail/throw_on_error_loc.hpp>
-#include <boost/mysql/detail/writable_field_traits.hpp>
-
-#include <boost/assert.hpp>
-
-#include <cstddef>
-#include <type_traits>
-#include <utility>
-
-/// The Boost libraries namespace.
-namespace boost {
-/// Boost.MySQL library namespace.
-namespace mysql {
-
-// Forward declarations
-template <class... StaticRow>
-class static_execution_state;
-
-/**
- * \brief (Legacy) A connection to a MySQL server.
- * \details
- * Represents a templated connection to a MySQL server.
- *
- * `connection` owns a `Stream` object that
- * is accessed by functions involving network operations, as well as session state. You can access
- * the stream using \ref connection::stream, and its executor via \ref connection::get_executor. The
- * executor used by this object is always the same as the underlying stream.
- *
- * \par Single outstanding async operation per connection
- * At any given point in time, only one async operation can be outstanding
- * per connection. If an async operation is initiated while another one is in progress,
- * it will fail with \ref client_errc::operation_in_progress.
- *
- * \par Thread safety
- * Distinct objects: safe. \n
- * Shared objects: unsafe. \n
- * This class is <b>not thread-safe</b>: for a single object, if you
- * call its member functions concurrently from separate threads, you will get a race condition.
- *
- * \par Legacy
- * New code should use \ref any_connection instead of this class, as it's simpler to use
- * and provides the same level of performance.
- */
-template <class Stream>
-class connection
-{
-    detail::connection_impl impl_;
-
-public:
-    /**
-     * \brief Initializing constructor.
-     * \details
-     * As part of the initialization, an internal `Stream` object is created.
-     *
-     * \par Exception safety
-     * Basic guarantee. Throws if the `Stream` constructor throws
-     * or if memory allocation for internal state fails.
-     *
-     * \param args Arguments to be forwarded to the `Stream` constructor.
-     */
-    template <
-        class... Args,
-        class EnableIf = typename std::enable_if<std::is_constructible<Stream, Args...>::value>::type>
-    connection(Args&&... args) : connection(buffer_params(), std::forward<Args>(args)...)
-    {
-    }
-
-    /**
-     * \brief Initializing constructor with buffer params.
-     * \details
-     * As part of the initialization, an internal `Stream` object is created.
-     *
-     * \par Exception safety
-     * Basic guarantee. Throws if the `Stream` constructor throws
-     * or if memory allocation for internal state fails.
-     *
-     * \param buff_params Specifies initial sizes for internal buffers.
-     * \param args Arguments to be forwarded to the `Stream` constructor.
-     */
-    template <
-        class... Args,
-        class EnableIf = typename std::enable_if<std::is_constructible<Stream, Args...>::value>::type>
-    connection(const buffer_params& buff_params, Args&&... args)
-        : impl_(
-              buff_params.initial_read_size(),
-              static_cast<std::size_t>(-1),
-              detail::make_engine<Stream>(std::forward<Args>(args)...)
-          )
-    {
-    }
-
-    /**
-     * \brief Move constructor.
-     */
-    connection(connection&& other) = default;
-
-    /**
-     * \brief Move assignment.
-     */
-    connection& operator=(connection&& rhs) = default;
-
-#ifndef BOOST_MYSQL_DOXYGEN
-    connection(const connection&) = delete;
-    connection& operator=(const connection&) = delete;
-#endif
-
-    /// The executor type associated to this object.
-    using executor_type = typename Stream::executor_type;
-
-    /// Retrieves the executor associated to this object.
-    executor_type get_executor() { return stream().get_executor(); }
-
-    /// The `Stream` type this connection is using.
-    using stream_type = Stream;
-
-    /**
-     * \brief Retrieves the underlying Stream object.
-     * \details
-     *
-     * \par Exception safety
-     * No-throw guarantee.
-     */
-    Stream& stream() noexcept { return detail::stream_from_engine<Stream>(impl_.get_engine()); }
-
-    /**
-     * \brief Retrieves the underlying Stream object.
-     * \details
-     *
-     * \par Exception safety
-     * No-throw guarantee.
-     */
-    const Stream& stream() const noexcept { return detail::stream_from_engine<Stream>(impl_.get_engine()); }
-
-    /**
-     * \brief Returns whether the connection negotiated the use of SSL or not.
-     * \details
-     * This function can be used to determine whether you are using a SSL
-     * connection or not when using SSL negotiation.
-     * \n
-     * This function always returns `false` if the underlying
-     * stream does not support SSL. This function always returns `false`
-     * for connections that haven't been
-     * established yet (handshake not run yet). If the handshake fails,
-     * the return value is undefined.
-     *
-     * \par Exception safety
-     * No-throw guarantee.
-     *
-     * \returns Whether the connection is using SSL.
-     */
-    bool uses_ssl() const noexcept { return impl_.ssl_active(); }
-
-    /// \copydoc any_connection::meta_mode
-    metadata_mode meta_mode() const noexcept { return impl_.meta_mode(); }
-
-    /// \copydoc any_connection::set_meta_mode
-    void set_meta_mode(metadata_mode v) noexcept { impl_.set_meta_mode(v); }
-
-    /**
-     * \brief Establishes a connection to a MySQL server.
-     * \details
-     * This function is only available if `Stream` satisfies the
-     * `SocketStream` concept.
-     * \n
-     * Connects the underlying stream and performs the handshake
-     * with the server. The underlying stream is closed in case of error. Prefer
-     * this function to \ref connection::handshake.
-     * \n
-     * If using a SSL-capable stream, the SSL handshake will be performed by this function.
-     * \n
-     * `endpoint` should be convertible to `Stream::lowest_layer_type::endpoint_type`.
-     */
-    template <typename EndpointType>
-    void connect(
-        const EndpointType& endpoint,
-        const handshake_params& params,
-        error_code& ec,
-        diagnostics& diag
-    )
-    {
-        static_assert(
-            detail::is_socket_stream<Stream>::value,
-            "connect can only be used if Stream satisfies the SocketStream concept"
-        );
-        impl_.connect<typename Stream::lowest_layer_type::endpoint_type>(endpoint, params, ec, diag);
-    }
-
-    /// \copydoc connect
-    template <typename EndpointType>
-    void connect(const EndpointType& endpoint, const handshake_params& params)
-    {
-        static_assert(
-            detail::is_socket_stream<Stream>::value,
-            "connect can only be used if Stream satisfies the SocketStream concept"
-        );
-        error_code err;
-        diagnostics diag;
-        connect(endpoint, params, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /**
-     * \copydoc connect
-     * \par Object lifetimes
-     * The strings pointed to by `params` should be kept alive by the caller
-     * until the operation completes, as no copy is made by the library.
-     * `endpoint` is copied as required and doesn't need to be kept alive.
-     *
-     * \par Handler signature
-     * The handler signature for this operation is `void(boost::mysql::error_code)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     */
-    template <
-        typename EndpointType,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(CompletionToken, void(error_code))
-    async_connect(
-        const EndpointType& endpoint,
-        const handshake_params& params,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    )
-    {
-        static_assert(
-            detail::is_socket_stream<Stream>::value,
-            "async_connect can only be used if Stream satisfies the SocketStream concept"
-        );
-        return async_connect(endpoint, params, impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_connect
-    template <
-        typename EndpointType,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(CompletionToken, void(error_code))
-    async_connect(
-        const EndpointType& endpoint,
-        const handshake_params& params,
-        diagnostics& diag,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    )
-    {
-        static_assert(
-            detail::is_socket_stream<Stream>::value,
-            "async_connect can only be used if Stream satisfies the SocketStream concept"
-        );
-        return impl_.async_connect<typename Stream::lowest_layer_type::endpoint_type>(
-            endpoint,
-            params,
-            diag,
-            std::forward<CompletionToken>(token)
-        );
-    }
-
-    /**
-     * \brief Performs the MySQL-level handshake.
-     * \details
-     * Does not connect the underlying stream.
-     * If the `Stream` template parameter fulfills the `SocketConnection`
-     * requirements, use \ref connection::connect instead of this function.
-     * \n
-     * If using a SSL-capable stream, the SSL handshake will be performed by this function.
-     */
-    void handshake(const handshake_params& params, error_code& ec, diagnostics& diag)
-    {
-        impl_.run(impl_.make_params_handshake(params), ec, diag);
-    }
-
-    /// \copydoc handshake
-    void handshake(const handshake_params& params)
-    {
-        error_code err;
-        diagnostics diag;
-        handshake(params, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /**
-     * \copydoc handshake
-     * \par Object lifetimes
-     * The strings pointed to by `params` should be kept alive by the caller
-     * until the operation completes, as no copy is made by the library.
-     *
-     * \par Handler signature
-     * The handler signature for this operation is `void(boost::mysql::error_code)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     */
-    template <BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-                  CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_handshake(
-        const handshake_params& params,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_handshake_t<CompletionToken&&>)
-    {
-        return async_handshake(params, impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_handshake
-    template <BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-                  CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_handshake(
-        const handshake_params& params,
-        diagnostics& diag,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_handshake_t<CompletionToken&&>)
-    {
-        return impl_
-            .async_run(impl_.make_params_handshake(params), diag, std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc any_connection::execute
-    template <BOOST_MYSQL_EXECUTION_REQUEST ExecutionRequest, BOOST_MYSQL_RESULTS_TYPE ResultsType>
-    void execute(ExecutionRequest&& req, ResultsType& result, error_code& err, diagnostics& diag)
-    {
-        impl_.execute(std::forward<ExecutionRequest>(req), result, err, diag);
-    }
-
-    /// \copydoc execute
-    template <BOOST_MYSQL_EXECUTION_REQUEST ExecutionRequest, BOOST_MYSQL_RESULTS_TYPE ResultsType>
-    void execute(ExecutionRequest&& req, ResultsType& result)
-    {
-        error_code err;
-        diagnostics diag;
-        execute(std::forward<ExecutionRequest>(req), result, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /// \copydoc any_connection::async_execute
-    template <
-        BOOST_MYSQL_EXECUTION_REQUEST ExecutionRequest,
-        BOOST_MYSQL_RESULTS_TYPE ResultsType,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_execute(
-        ExecutionRequest&& req,
-        ResultsType& result,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_execute_t<ExecutionRequest&&, ResultsType, CompletionToken&&>)
-    {
-        return async_execute(
-            std::forward<ExecutionRequest>(req),
-            result,
-            impl_.shared_diag(),
-            std::forward<CompletionToken>(token)
-        );
-    }
-
-    /// \copydoc async_execute
-    template <
-        BOOST_MYSQL_EXECUTION_REQUEST ExecutionRequest,
-        BOOST_MYSQL_RESULTS_TYPE ResultsType,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_execute(
-        ExecutionRequest&& req,
-        ResultsType& result,
-        diagnostics& diag,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_execute_t<ExecutionRequest&&, ResultsType, CompletionToken&&>)
-    {
-        return impl_.async_execute(
-            std::forward<ExecutionRequest>(req),
-            result,
-            diag,
-            std::forward<CompletionToken>(token)
-        );
-    }
-
-    /// \copydoc any_connection::start_execution
-    template <
-        BOOST_MYSQL_EXECUTION_REQUEST ExecutionRequest,
-        BOOST_MYSQL_EXECUTION_STATE_TYPE ExecutionStateType>
-    void start_execution(ExecutionRequest&& req, ExecutionStateType& st, error_code& err, diagnostics& diag)
-    {
-        impl_.start_execution(std::forward<ExecutionRequest>(req), st, err, diag);
-    }
-
-    /// \copydoc start_execution
-    template <
-        BOOST_MYSQL_EXECUTION_REQUEST ExecutionRequest,
-        BOOST_MYSQL_EXECUTION_STATE_TYPE ExecutionStateType>
-    void start_execution(ExecutionRequest&& req, ExecutionStateType& st)
-    {
-        error_code err;
-        diagnostics diag;
-        start_execution(std::forward<ExecutionRequest>(req), st, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /// \copydoc any_connection::async_start_execution
-    template <
-        BOOST_MYSQL_EXECUTION_REQUEST ExecutionRequest,
-        BOOST_MYSQL_EXECUTION_STATE_TYPE ExecutionStateType,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_start_execution(
-        ExecutionRequest&& req,
-        ExecutionStateType& st,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    )
-        BOOST_MYSQL_RETURN_TYPE(detail::async_start_execution_t<
-                                ExecutionRequest&&,
-                                ExecutionStateType,
-                                CompletionToken&&>)
-    {
-        return async_start_execution(
-            std::forward<ExecutionRequest>(req),
-            st,
-            impl_.shared_diag(),
-            std::forward<CompletionToken>(token)
-        );
-    }
-
-    /// \copydoc async_start_execution
-    template <
-        BOOST_MYSQL_EXECUTION_REQUEST ExecutionRequest,
-        BOOST_MYSQL_EXECUTION_STATE_TYPE ExecutionStateType,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_start_execution(
-        ExecutionRequest&& req,
-        ExecutionStateType& st,
-        diagnostics& diag,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    )
-        BOOST_MYSQL_RETURN_TYPE(detail::async_start_execution_t<
-                                ExecutionRequest&&,
-                                ExecutionStateType,
-                                CompletionToken&&>)
-    {
-        return impl_.async_start_execution(
-            std::forward<ExecutionRequest>(req),
-            st,
-            diag,
-            std::forward<CompletionToken>(token)
-        );
-    }
-
-    /// \copydoc any_connection::prepare_statement
-    statement prepare_statement(string_view stmt, error_code& err, diagnostics& diag)
-    {
-        return impl_.run(detail::prepare_statement_algo_params{stmt}, err, diag);
-    }
-
-    /// \copydoc prepare_statement
-    statement prepare_statement(string_view stmt)
-    {
-        error_code err;
-        diagnostics diag;
-        statement res = prepare_statement(stmt, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-        return res;
-    }
-
-    /// \copydoc any_connection::async_prepare_statement
-    template <BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code, ::boost::mysql::statement))
-                  CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_prepare_statement(
-        string_view stmt,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_prepare_statement_t<CompletionToken&&>)
-    {
-        return async_prepare_statement(stmt, impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_prepare_statement
-    template <BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code, ::boost::mysql::statement))
-                  CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_prepare_statement(
-        string_view stmt,
-        diagnostics& diag,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_prepare_statement_t<CompletionToken&&>)
-    {
-        return impl_.async_run(
-            detail::prepare_statement_algo_params{stmt},
-            diag,
-            std::forward<CompletionToken>(token)
-        );
-    }
-
-    /// \copydoc any_connection::close_statement
-    void close_statement(const statement& stmt, error_code& err, diagnostics& diag)
-    {
-        impl_.run(impl_.make_params_close_statement(stmt), err, diag);
-    }
-
-    /// \copydoc close_statement
-    void close_statement(const statement& stmt)
-    {
-        error_code err;
-        diagnostics diag;
-        close_statement(stmt, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /// \copydoc any_connection::async_close_statement
-    template <BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-                  CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_close_statement(
-        const statement& stmt,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_close_statement_t<CompletionToken&&>)
-    {
-        return async_close_statement(stmt, impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_close_statement
-    template <BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-                  CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_close_statement(
-        const statement& stmt,
-        diagnostics& diag,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_close_statement_t<CompletionToken&&>)
-    {
-        return impl_
-            .async_run(impl_.make_params_close_statement(stmt), diag, std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc any_connection::read_some_rows
-    rows_view read_some_rows(execution_state& st, error_code& err, diagnostics& diag)
-    {
-        return impl_.run(impl_.make_params_read_some_rows(st), err, diag);
-    }
-
-    /// \copydoc read_some_rows(execution_state&,error_code&,diagnostics&)
-    rows_view read_some_rows(execution_state& st)
-    {
-        error_code err;
-        diagnostics diag;
-        rows_view res = read_some_rows(st, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-        return res;
-    }
-
-    /// \copydoc any_connection::async_read_some_rows(execution_state&,CompletionToken&&)
-    template <BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code, ::boost::mysql::rows_view))
-                  CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_read_some_rows(
-        execution_state& st,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_read_some_rows_dynamic_t<CompletionToken&&>)
-    {
-        return async_read_some_rows(st, impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_read_some_rows(execution_state&,CompletionToken&&)
-    template <BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code, ::boost::mysql::rows_view))
-                  CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_read_some_rows(
-        execution_state& st,
-        diagnostics& diag,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_read_some_rows_dynamic_t<CompletionToken&&>)
-    {
-        return impl_
-            .async_run(impl_.make_params_read_some_rows(st), diag, std::forward<CompletionToken>(token));
-    }
-
-#ifdef BOOST_MYSQL_CXX14
-
-    /**
-     * \brief Reads a batch of rows.
-     * \details
-     * Reads a batch of rows of unspecified size into the storage given by `output`.
-     * At most `output.size()` rows will be read. If the operation represented by `st`
-     * has still rows to read, and `output.size() > 0`, at least one row will be read.
-     * \n
-     * Returns the number of read rows.
-     * \n
-     * If there are no more rows, or `st.should_read_rows() == false`, this function is a no-op and returns
-     * zero.
-     * \n
-     * The number of rows that will be read depends on the connection's buffer size. The bigger the buffer,
-     * the greater the batch size (up to a maximum). You can set the initial buffer size in `connection`'s
-     * constructor, using \ref buffer_params::initial_read_size. The buffer may be
-     * grown bigger by other read operations, if required.
-     * \n
-     * Rows read by this function are owning objects, and don't hold any reference to
-     * the connection's internal buffers (contrary what happens with the dynamic interface's counterpart).
-     * \n
-     * The type `SpanElementType` must be the underlying row type for one of the types in the
-     * `StaticRow` parameter pack (i.e., one of the types in `underlying_row_t<StaticRow>...`).
-     * The type must match the resultset that is currently being processed by `st`. For instance,
-     * given `static_execution_state<T1, T2>`, when reading rows for the second resultset, `SpanElementType`
-     * must exactly be `underlying_row_t<T2>`. If this is not the case, a runtime error will be issued.
-     * \n
-     * This function can report schema mismatches.
-     */
-    template <class SpanElementType, class... StaticRow>
-    std::size_t read_some_rows(
-        static_execution_state<StaticRow...>& st,
-        span<SpanElementType> output,
-        error_code& err,
-        diagnostics& diag
-    )
-    {
-        return impl_.run(impl_.make_params_read_some_rows_static(st, output), err, diag);
-    }
-
-    /**
-     * \brief Reads a batch of rows.
-     * \details
-     * Reads a batch of rows of unspecified size into the storage given by `output`.
-     * At most `output.size()` rows will be read. If the operation represented by `st`
-     * has still rows to read, and `output.size() > 0`, at least one row will be read.
-     * \n
-     * Returns the number of read rows.
-     * \n
-     * If there are no more rows, or `st.should_read_rows() == false`, this function is a no-op and returns
-     * zero.
-     * \n
-     * The number of rows that will be read depends on the connection's buffer size. The bigger the buffer,
-     * the greater the batch size (up to a maximum). You can set the initial buffer size in `connection`'s
-     * constructor, using \ref buffer_params::initial_read_size. The buffer may be
-     * grown bigger by other read operations, if required.
-     * \n
-     * Rows read by this function are owning objects, and don't hold any reference to
-     * the connection's internal buffers (contrary what happens with the dynamic interface's counterpart).
-     * \n
-     * The type `SpanElementType` must be the underlying row type for one of the types in the
-     * `StaticRow` parameter pack (i.e., one of the types in `underlying_row_t<StaticRow>...`).
-     * The type must match the resultset that is currently being processed by `st`. For instance,
-     * given `static_execution_state<T1, T2>`, when reading rows for the second resultset, `SpanElementType`
-     * must exactly be `underlying_row_t<T2>`. If this is not the case, a runtime error will be issued.
-     * \n
-     * This function can report schema mismatches.
-     */
-    template <class SpanElementType, class... StaticRow>
-    std::size_t read_some_rows(static_execution_state<StaticRow...>& st, span<SpanElementType> output)
-    {
-        error_code err;
-        diagnostics diag;
-        std::size_t res = read_some_rows(st, output, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-        return res;
-    }
-
-    /**
-     * \brief Reads a batch of rows.
-     * \details
-     * Reads a batch of rows of unspecified size into the storage given by `output`.
-     * At most `output.size()` rows will be read. If the operation represented by `st`
-     * has still rows to read, and `output.size() > 0`, at least one row will be read.
-     * \n
-     * Returns the number of read rows.
-     * \n
-     * If there are no more rows, or `st.should_read_rows() == false`, this function is a no-op and returns
-     * zero.
-     * \n
-     * The number of rows that will be read depends on the connection's buffer size. The bigger the buffer,
-     * the greater the batch size (up to a maximum). You can set the initial buffer size in `connection`'s
-     * constructor, using \ref buffer_params::initial_read_size. The buffer may be
-     * grown bigger by other read operations, if required.
-     * \n
-     * Rows read by this function are owning objects, and don't hold any reference to
-     * the connection's internal buffers (contrary what happens with the dynamic interface's counterpart).
-     * \n
-     * The type `SpanElementType` must be the underlying row type for one of the types in the
-     * `StaticRow` parameter pack (i.e., one of the types in `underlying_row_t<StaticRow>...`).
-     * The type must match the resultset that is currently being processed by `st`. For instance,
-     * given `static_execution_state<T1, T2>`, when reading rows for the second resultset, `SpanElementType`
-     * must exactly be `underlying_row_t<T2>`. If this is not the case, a runtime error will be issued.
-     * \n
-     * This function can report schema mismatches.
-     *
-     * \par Handler signature
-     * The handler signature for this operation is
-     * `void(boost::mysql::error_code, std::size_t)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     *
-     * \par Object lifetimes
-     * The storage that `output` references must be kept alive until the operation completes.
-     */
-    template <
-        class SpanElementType,
-        class... StaticRow,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code, std::size_t))
-            CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(CompletionToken, void(error_code, std::size_t))
-    async_read_some_rows(
-        static_execution_state<StaticRow...>& st,
-        span<SpanElementType> output,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    )
-    {
-        return async_read_some_rows(st, output, impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /**
-     * \brief Reads a batch of rows.
-     * \details
-     * Reads a batch of rows of unspecified size into the storage given by `output`.
-     * At most `output.size()` rows will be read. If the operation represented by `st`
-     * has still rows to read, and `output.size() > 0`, at least one row will be read.
-     * \n
-     * Returns the number of read rows.
-     * \n
-     * If there are no more rows, or `st.should_read_rows() == false`, this function is a no-op and returns
-     * zero.
-     * \n
-     * The number of rows that will be read depends on the connection's buffer size. The bigger the buffer,
-     * the greater the batch size (up to a maximum). You can set the initial buffer size in `connection`'s
-     * constructor, using \ref buffer_params::initial_read_size. The buffer may be
-     * grown bigger by other read operations, if required.
-     * \n
-     * Rows read by this function are owning objects, and don't hold any reference to
-     * the connection's internal buffers (contrary what happens with the dynamic interface's counterpart).
-     * \n
-     * The type `SpanElementType` must be the underlying row type for one of the types in the
-     * `StaticRow` parameter pack (i.e., one of the types in `underlying_row_t<StaticRow>...`).
-     * The type must match the resultset that is currently being processed by `st`. For instance,
-     * given `static_execution_state<T1, T2>`, when reading rows for the second resultset, `SpanElementType`
-     * must exactly be `underlying_row_t<T2>`. If this is not the case, a runtime error will be issued.
-     * \n
-     * This function can report schema mismatches.
-     *
-     * \par Handler signature
-     * The handler signature for this operation is
-     * `void(boost::mysql::error_code, std::size_t)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     *
-     * \par Object lifetimes
-     * The storage that `output` references must be kept alive until the operation completes.
-     */
-    template <
-        class SpanElementType,
-        class... StaticRow,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code, std::size_t))
-            CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(CompletionToken, void(error_code, std::size_t))
-    async_read_some_rows(
-        static_execution_state<StaticRow...>& st,
-        span<SpanElementType> output,
-        diagnostics& diag,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    )
-    {
-        return impl_.async_run(
-            impl_.make_params_read_some_rows_static(st, output),
-            diag,
-            std::forward<CompletionToken>(token)
-        );
-    }
-#endif
-
-    /// \copydoc any_connection::read_resultset_head
-    template <BOOST_MYSQL_EXECUTION_STATE_TYPE ExecutionStateType>
-    void read_resultset_head(ExecutionStateType& st, error_code& err, diagnostics& diag)
-    {
-        return impl_.run(impl_.make_params_read_resultset_head(st), err, diag);
-    }
-
-    /// \copydoc read_resultset_head
-    template <BOOST_MYSQL_EXECUTION_STATE_TYPE ExecutionStateType>
-    void read_resultset_head(ExecutionStateType& st)
-    {
-        error_code err;
-        diagnostics diag;
-        read_resultset_head(st, err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /// \copydoc any_connection::async_read_resultset_head
-    template <
-        BOOST_MYSQL_EXECUTION_STATE_TYPE ExecutionStateType,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_read_resultset_head(
-        ExecutionStateType& st,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_read_resultset_head_t<CompletionToken&&>)
-    {
-        return async_read_resultset_head(st, impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_read_resultset_head
-    template <
-        BOOST_MYSQL_EXECUTION_STATE_TYPE ExecutionStateType,
-        BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-            CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_read_resultset_head(
-        ExecutionStateType& st,
-        diagnostics& diag,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_read_resultset_head_t<CompletionToken&&>)
-    {
-        return impl_
-            .async_run(impl_.make_params_read_resultset_head(st), diag, std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc any_connection::ping
-    void ping(error_code& err, diagnostics& diag) { impl_.run(detail::ping_algo_params{}, err, diag); }
-
-    /// \copydoc ping
-    void ping()
-    {
-        error_code err;
-        diagnostics diag;
-        ping(err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /// \copydoc any_connection::async_ping
-    template <BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-                  CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_ping(CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type))
-        BOOST_MYSQL_RETURN_TYPE(detail::async_ping_t<CompletionToken&&>)
-    {
-        return async_ping(impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_ping
-    template <BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-                  CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_ping(
-        diagnostics& diag,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_ping_t<CompletionToken&&>)
-    {
-        return impl_.async_run(detail::ping_algo_params{}, diag, std::forward<CompletionToken>(token));
-    }
-
-    /**
-     * \brief Resets server-side session state, like variables and prepared statements.
-     * \details
-     * Resets all server-side state for the current session:
-     * \n
-     *   \li Rolls back any active transactions and resets autocommit mode.
-     *   \li Releases all table locks.
-     *   \li Drops all temporary tables.
-     *   \li Resets all session system variables to their default values (including the ones set by `SET
-     *       NAMES`) and clears all user-defined variables.
-     *   \li Closes all prepared statements.
-     * \n
-     * A full reference on the affected session state can be found
-     * <a href="https://dev.mysql.com/doc/c-api/8.0/en/mysql-reset-connection.html">here</a>.
-     * \n
-     * This function will not reset the current physical connection and won't cause re-authentication.
-     * It is faster than closing and re-opening a connection.
-     * \n
-     * The connection must be connected and authenticated before calling this function.
-     * This function involves communication with the server, and thus may fail.
-     *
-     * \par Warning on character sets
-     * This function will restore the connection's character set and collation **to the server's default**,
-     * and not to the one specified during connection establishment. Some servers have `latin1` as their
-     * default character set, which is not usually what you want. Use a `SET NAMES` statement after using
-     * this function to be sure.
-     * \n
-     * You can find the character set that your server will use after reset by running:
-     * \code
-     * "SELECT @@global.character_set_client, @@global.character_set_results;"
-     * \endcode
-     */
-    void reset_connection(error_code& err, diagnostics& diag)
-    {
-        impl_.run(detail::reset_connection_algo_params{}, err, diag);
-    }
-
-    /// \copydoc reset_connection
-    void reset_connection()
-    {
-        error_code err;
-        diagnostics diag;
-        reset_connection(err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /**
-     * \copydoc reset_connection
-     * \details
-     * \n
-     * \par Handler signature
-     * The handler signature for this operation is `void(boost::mysql::error_code)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     */
-    template <BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-                  CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_reset_connection(CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type))
-        BOOST_MYSQL_RETURN_TYPE(detail::async_reset_connection_t<CompletionToken&&>)
-    {
-        return async_reset_connection(impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_reset_connection
-    template <BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-                  CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_reset_connection(
-        diagnostics& diag,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_reset_connection_t<CompletionToken&&>)
-    {
-        return impl_
-            .async_run(detail::reset_connection_algo_params{}, diag, std::forward<CompletionToken>(token));
-    }
-
-    /**
-     * \brief Closes the connection to the server.
-     * \details
-     * This function is only available if `Stream` satisfies the `SocketStream` concept.
-     * \n
-     * Sends a quit request, performs the TLS shutdown (if required)
-     * and closes the underlying stream. Prefer this function to \ref connection::quit.
-     * \n
-     */
-    void close(error_code& err, diagnostics& diag)
-    {
-        static_assert(
-            detail::is_socket_stream<Stream>::value,
-            "close can only be used if Stream satisfies the SocketStream concept"
-        );
-        impl_.run(detail::close_connection_algo_params{}, err, diag);
-    }
-
-    /// \copydoc close
-    void close()
-    {
-        static_assert(
-            detail::is_socket_stream<Stream>::value,
-            "close can only be used if Stream satisfies the SocketStream concept"
-        );
-        error_code err;
-        diagnostics diag;
-        close(err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /**
-     * \copydoc close
-     * \details
-     * \par Handler signature
-     * The handler signature for this operation is `void(boost::mysql::error_code)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     */
-    template <BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-                  CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_close(CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type))
-        BOOST_MYSQL_RETURN_TYPE(detail::async_close_connection_t<CompletionToken&&>)
-    {
-        static_assert(
-            detail::is_socket_stream<Stream>::value,
-            "async_close can only be used if Stream satisfies the SocketStream concept"
-        );
-        return async_close(impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_close
-    template <BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-                  CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_close(
-        diagnostics& diag,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_close_connection_t<CompletionToken&&>)
-    {
-        static_assert(
-            detail::is_socket_stream<Stream>::value,
-            "async_close can only be used if Stream satisfies the SocketStream concept"
-        );
-        return impl_
-            .async_run(detail::close_connection_algo_params{}, diag, std::forward<CompletionToken>(token));
-    }
-
-    /**
-     * \brief Notifies the MySQL server that the client wants to end the session and shutdowns SSL.
-     * \details Sends a quit request to the MySQL server. If the connection is using SSL,
-     * this function will also perform the SSL shutdown. You should
-     * close the underlying physical connection after calling this function.
-     * \n
-     * If the `Stream` template parameter fulfills the `SocketConnection`
-     * requirements, use \ref connection::close instead of this function,
-     * as it also takes care of closing the underlying stream.
-     */
-    void quit(error_code& err, diagnostics& diag)
-    {
-        impl_.run(detail::quit_connection_algo_params{}, err, diag);
-    }
-
-    /// \copydoc quit
-    void quit()
-    {
-        error_code err;
-        diagnostics diag;
-        quit(err, diag);
-        detail::throw_on_error_loc(err, diag, BOOST_CURRENT_LOCATION);
-    }
-
-    /**
-     * \copydoc quit
-     * \details
-     * \par Handler signature
-     * The handler signature for this operation is `void(boost::mysql::error_code)`.
-     *
-     * \par Executor
-     * Intermediate completion handlers, as well as the final handler, are executed using
-     * `token`'s associated executor, or `this->get_executor()` if the token doesn't have an associated
-     * executor.
-     *
-     * If the final handler has an associated immediate executor, and the operation
-     * completes immediately, the final handler is dispatched to it.
-     * Otherwise, the final handler is called as if it was submitted using `asio::post`,
-     * and is never be called inline from within this function.
-     */
-    template <BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-                  CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_quit(CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type))
-        BOOST_MYSQL_RETURN_TYPE(detail::async_quit_connection_t<CompletionToken&&>)
-    {
-        return async_quit(impl_.shared_diag(), std::forward<CompletionToken>(token));
-    }
-
-    /// \copydoc async_quit
-    template <BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code))
-                  CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    auto async_quit(
-        diagnostics& diag,
-        CompletionToken&& token BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type)
-    ) BOOST_MYSQL_RETURN_TYPE(detail::async_quit_connection_t<CompletionToken&&>)
-    {
-        return impl_
-            .async_run(detail::quit_connection_algo_params{}, diag, std::forward<CompletionToken>(token));
-    }
-
-    /**
-     * \brief Rebinds the connection type to another executor.
-     * \details
-     * The `Stream` type must either provide a `rebind_executor`
-     * member with the same semantics, or be an instantiation of `boost::asio::ssl::stream` with
-     * a `Stream` type providing a `rebind_executor` member.
-     */
-    template <typename Executor1>
-    struct rebind_executor
-    {
-        /// The connection type when rebound to the specified executor.
-        using other = connection<typename detail::rebind_executor<Stream, Executor1>::type>;
-    };
-};
-
-}  // namespace mysql
-}  // namespace boost
-
-#endif
diff --git a/include/boost/mysql/constant_string_view.hpp b/include/boost/mysql/constant_string_view.hpp
index 5a19f0b85..94164b711 100644
--- a/include/boost/mysql/constant_string_view.hpp
+++ b/include/boost/mysql/constant_string_view.hpp
@@ -8,12 +8,11 @@
 #ifndef BOOST_MYSQL_CONSTANT_STRING_VIEW_HPP
 #define BOOST_MYSQL_CONSTANT_STRING_VIEW_HPP
 
-#include <boost/mysql/string_view.hpp>
-
 #include <boost/mysql/detail/config.hpp>
 
 #include <boost/config.hpp>
 
+#include <string_view>
 #include <type_traits>
 
 namespace boost {
@@ -31,11 +30,11 @@ namespace mysql {
  */
 class constant_string_view
 {
-    string_view impl_;
+    std::string_view impl_;
 
 #ifndef BOOST_MYSQL_DOXYGEN
-    constexpr constant_string_view(string_view value, int) noexcept : impl_(value) {}
-    friend constexpr constant_string_view runtime(string_view) noexcept;
+    constexpr constant_string_view(std::string_view value, int) noexcept : impl_(value) {}
+    friend constexpr constant_string_view runtime(std::string_view) noexcept;
 #endif
 
 public:
@@ -56,14 +55,14 @@ class constant_string_view
      * No-throw guarantee.
      *
      * \par Object lifetimes
-     * Ownership is not transferred to the constructed object. As with `string_view`,
+     * Ownership is not transferred to the constructed object. As with `std::string_view`,
      * the user is responsible for keeping the original character buffer alive.
      */
     template <
         class T
 #ifndef BOOST_MYSQL_DOXYGEN
         ,
-        class = typename std::enable_if<std::is_convertible<const T&, string_view>::value>::type
+        class = typename std::enable_if<std::is_convertible<const T&, std::string_view>::value>::type
 #endif
         >
     BOOST_MYSQL_CONSTEVAL constant_string_view(const T& value) noexcept : impl_(value)
@@ -79,7 +78,7 @@ class constant_string_view
      * \par Object lifetimes
      * The returned view has the same lifetime rules as `*this`.
      */
-    constexpr string_view get() const noexcept { return impl_; }
+    constexpr std::string_view get() const noexcept { return impl_; }
 };
 
 /**
@@ -97,7 +96,10 @@ class constant_string_view
  * \par Object lifetimes
  * The returned value has the same lifetime semantics as the passed view.
  */
-constexpr constant_string_view runtime(string_view value) noexcept { return constant_string_view(value, 0); }
+constexpr constant_string_view runtime(std::string_view value) noexcept
+{
+    return constant_string_view(value, 0);
+}
 
 }  // namespace mysql
 }  // namespace boost
diff --git a/include/boost/mysql/date.hpp b/include/boost/mysql/date.hpp
index b1096f19b..db43f8b71 100644
--- a/include/boost/mysql/date.hpp
+++ b/include/boost/mysql/date.hpp
@@ -302,8 +302,5 @@ BOOST_INLINE_CONSTEXPR date max_date{9999u, 12u, 31u};
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/date.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/datetime.hpp b/include/boost/mysql/datetime.hpp
index bd966d789..39a96f52a 100644
--- a/include/boost/mysql/datetime.hpp
+++ b/include/boost/mysql/datetime.hpp
@@ -403,8 +403,5 @@ BOOST_CXX14_CONSTEXPR boost::mysql::datetime::datetime(time_point tp)
     hour_ = static_cast<std::uint8_t>(num_hours.count());
 }
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/datetime.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/detail/algo_params.hpp b/include/boost/mysql/detail/algo_params.hpp
index 427bd9b37..bce56b200 100644
--- a/include/boost/mysql/detail/algo_params.hpp
+++ b/include/boost/mysql/detail/algo_params.hpp
@@ -8,17 +8,17 @@
 #ifndef BOOST_MYSQL_DETAIL_ALGO_PARAMS_HPP
 #define BOOST_MYSQL_DETAIL_ALGO_PARAMS_HPP
 
+#include <boost/mysql/any_address.hpp>
 #include <boost/mysql/character_set.hpp>
 #include <boost/mysql/handshake_params.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/any_execution_request.hpp>
 #include <boost/mysql/detail/execution_processor/execution_processor.hpp>
 
-#include <boost/core/span.hpp>
-
 #include <cstddef>
 #include <cstdint>
+#include <span>
+#include <string_view>
 #include <vector>
 
 namespace boost {
@@ -36,8 +36,7 @@ struct pipeline_request_stage;
 
 struct connect_algo_params
 {
-    const void* server_address;  // Points to an any_address or an endpoint for the corresponding stream. For
-                                 // the templated connection, only valid until the first yield!
+    const any_address* server_address;
     handshake_params hparams;
     bool secure_channel;  // Are we using UNIX sockets or any other secure channel?
 
@@ -92,7 +91,7 @@ struct read_some_rows_dynamic_algo_params
 
 struct prepare_statement_algo_params
 {
-    string_view stmt_sql;
+    std::string_view stmt_sql;
 
     using result_type = statement;
 };
@@ -133,8 +132,8 @@ struct close_connection_algo_params
 
 struct run_pipeline_algo_params
 {
-    span<const std::uint8_t> request_buffer;
-    span<const pipeline_request_stage> request_stages;
+    std::span<const std::uint8_t> request_buffer;
+    std::span<const pipeline_request_stage> request_stages;
     std::vector<stage_response>* response;
 
     using result_type = void;
diff --git a/include/boost/mysql/detail/any_execution_request.hpp b/include/boost/mysql/detail/any_execution_request.hpp
index ed590b644..4449a8a35 100644
--- a/include/boost/mysql/detail/any_execution_request.hpp
+++ b/include/boost/mysql/detail/any_execution_request.hpp
@@ -9,11 +9,10 @@
 #define BOOST_MYSQL_DETAIL_ANY_EXECUTION_REQUEST_HPP
 
 #include <boost/mysql/constant_string_view.hpp>
-#include <boost/mysql/string_view.hpp>
-
-#include <boost/core/span.hpp>
 
 #include <cstdint>
+#include <span>
+#include <string_view>
 #include <type_traits>
 #include <vector>
 
@@ -36,20 +35,20 @@ struct any_execution_request
 
     union data_t
     {
-        string_view query;
+        std::string_view query;
         struct query_with_params_t
         {
             constant_string_view query;
-            span<const format_arg> args;
+            std::span<const format_arg> args;
         } query_with_params;
         struct stmt_t
         {
             std::uint32_t stmt_id;
             std::uint16_t num_params;
-            span<const field_view> params;
+            std::span<const field_view> params;
         } stmt;
 
-        data_t(string_view q) noexcept : query(q) {}
+        data_t(std::string_view q) noexcept : query(q) {}
         data_t(query_with_params_t v) noexcept : query_with_params(v) {}
         data_t(stmt_t v) noexcept : stmt(v) {}
     };
@@ -57,7 +56,7 @@ struct any_execution_request
     type_t type;
     data_t data;
 
-    any_execution_request(string_view q) noexcept : type(type_t::query), data(q) {}
+    any_execution_request(std::string_view q) noexcept : type(type_t::query), data(q) {}
     any_execution_request(data_t::query_with_params_t v) noexcept : type(type_t::query_with_params), data(v)
     {
     }
@@ -74,9 +73,14 @@ struct execution_request_traits : no_execution_request_traits
 };
 
 template <class T>
-struct execution_request_traits<T, typename std::enable_if<std::is_convertible<T, string_view>::value>::type>
+struct execution_request_traits<
+    T,
+    typename std::enable_if<std::is_convertible<T, std::string_view>::value>::type>
 {
-    static any_execution_request make_request(string_view input, std::vector<field_view>&) { return input; }
+    static any_execution_request make_request(std::string_view input, std::vector<field_view>&)
+    {
+        return input;
+    }
 };
 
 }  // namespace detail
diff --git a/include/boost/mysql/detail/character_set.hpp b/include/boost/mysql/detail/character_set.hpp
index a0f165e08..356cc4158 100644
--- a/include/boost/mysql/detail/character_set.hpp
+++ b/include/boost/mysql/detail/character_set.hpp
@@ -10,7 +10,7 @@
 
 #include <boost/mysql/detail/config.hpp>
 
-#include <boost/core/span.hpp>
+#include <span>
 
 #include <cstddef>
 
@@ -18,8 +18,8 @@ namespace boost {
 namespace mysql {
 namespace detail {
 
-inline std::size_t next_char_ascii(span<const unsigned char> input) { return input[0] <= 0x7f ? 1 : 0; }
-BOOST_MYSQL_DECL std::size_t next_char_utf8mb4(span<const unsigned char> input);
+inline std::size_t next_char_ascii(std::span<const unsigned char> input) { return input[0] <= 0x7f ? 1 : 0; }
+BOOST_MYSQL_DECL std::size_t next_char_utf8mb4(std::span<const unsigned char> input);
 
 }  // namespace detail
 }  // namespace mysql
diff --git a/include/boost/mysql/detail/coldef_view.hpp b/include/boost/mysql/detail/coldef_view.hpp
index b5d2eb80a..b4d0a0890 100644
--- a/include/boost/mysql/detail/coldef_view.hpp
+++ b/include/boost/mysql/detail/coldef_view.hpp
@@ -9,9 +9,9 @@
 #define BOOST_MYSQL_DETAIL_COLDEF_VIEW_HPP
 
 #include <boost/mysql/column_type.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <cstdint>
+#include <string_view>
 
 namespace boost {
 namespace mysql {
@@ -19,11 +19,11 @@ namespace detail {
 
 struct coldef_view
 {
-    string_view database;
-    string_view table;
-    string_view org_table;
-    string_view name;
-    string_view org_name;
+    std::string_view database;
+    std::string_view table;
+    std::string_view org_table;
+    std::string_view name;
+    std::string_view org_name;
     std::uint16_t collation_id;
     std::uint32_t column_length;  // maximum length of the field
     column_type type;
diff --git a/include/boost/mysql/detail/config.hpp b/include/boost/mysql/detail/config.hpp
index 3779d8e3e..c7c0748ce 100644
--- a/include/boost/mysql/detail/config.hpp
+++ b/include/boost/mysql/detail/config.hpp
@@ -29,13 +29,8 @@
     #define BOOST_MYSQL_CONSTEVAL constexpr
 #endif
 
-// Separate build
-#if defined(BOOST_MYSQL_SEPARATE_COMPILATION)
-    #define BOOST_MYSQL_DECL
-#else
-    #define BOOST_MYSQL_HEADER_ONLY
-    #define BOOST_MYSQL_DECL inline
-#endif
+// Separate build (TODO)
+#define BOOST_MYSQL_DECL
 
 // Auto return type. Having this as a macro helps the documentation tool.
 #ifdef BOOST_NO_CXX14_RETURN_TYPE_DEDUCTION
diff --git a/include/boost/mysql/detail/connection_impl.hpp b/include/boost/mysql/detail/connection_impl.hpp
deleted file mode 100644
index e9e405074..000000000
--- a/include/boost/mysql/detail/connection_impl.hpp
+++ /dev/null
@@ -1,670 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_DETAIL_CONNECTION_IMPL_HPP
-#define BOOST_MYSQL_DETAIL_CONNECTION_IMPL_HPP
-
-#include <boost/mysql/any_address.hpp>
-#include <boost/mysql/connect_params.hpp>
-#include <boost/mysql/diagnostics.hpp>
-#include <boost/mysql/error_code.hpp>
-#include <boost/mysql/execution_state.hpp>
-#include <boost/mysql/field_view.hpp>
-#include <boost/mysql/handshake_params.hpp>
-#include <boost/mysql/metadata_mode.hpp>
-#include <boost/mysql/rows_view.hpp>
-#include <boost/mysql/statement.hpp>
-#include <boost/mysql/string_view.hpp>
-
-#include <boost/mysql/detail/access.hpp>
-#include <boost/mysql/detail/algo_params.hpp>
-#include <boost/mysql/detail/config.hpp>
-#include <boost/mysql/detail/connect_params_helpers.hpp>
-#include <boost/mysql/detail/engine.hpp>
-#include <boost/mysql/detail/execution_processor/execution_processor.hpp>
-#include <boost/mysql/detail/initiation_base.hpp>
-#include <boost/mysql/detail/intermediate_handler.hpp>
-
-#include <boost/asio/any_io_executor.hpp>
-#include <boost/optional/optional.hpp>
-#include <boost/system/result.hpp>
-
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <memory>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-namespace boost {
-namespace mysql {
-
-// Forward decl
-template <class... StaticRow>
-class static_execution_state;
-
-struct character_set;
-class pipeline_request;
-
-namespace detail {
-
-//
-// Helpers to interact with connection_state, without including its definition
-//
-class connection_state;
-
-struct connection_state_deleter
-{
-    BOOST_MYSQL_DECL void operator()(connection_state*) const;
-};
-
-BOOST_MYSQL_DECL std::vector<field_view>& get_shared_fields(connection_state&);
-
-template <class AlgoParams>
-any_resumable_ref setup(connection_state&, diagnostics&, const AlgoParams&);
-
-// Note: AlgoParams should have !is_void_result
-template <class AlgoParams>
-typename AlgoParams::result_type get_result(const connection_state&);
-
-//
-// helpers to run algos
-//
-template <class AlgoParams>
-using has_void_result = std::is_same<typename AlgoParams::result_type, void>;
-
-template <class AlgoParams, bool is_void>
-struct completion_signature_impl;
-
-template <class AlgoParams>
-struct completion_signature_impl<AlgoParams, true>
-{
-    // Using typedef to workaround a msvc 14.1 bug
-    typedef void(type)(error_code);
-};
-
-template <class AlgoParams>
-struct completion_signature_impl<AlgoParams, false>
-{
-    // Using typedef to workaround a msvc 14.1 bug
-    typedef void(type)(error_code, typename AlgoParams::result_type);
-};
-
-template <class AlgoParams>
-using completion_signature_t = typename completion_signature_impl<
-    AlgoParams,
-    has_void_result<AlgoParams>::value>::type;
-
-// Intermediate handler
-template <class AlgoParams>
-struct generic_algo_fn
-{
-    static_assert(!has_void_result<AlgoParams>::value, "Internal error: result_type should be non-void");
-
-    using result_t = typename AlgoParams::result_type;
-
-    template <class Handler>
-    void operator()(Handler&& handler, error_code ec)
-    {
-        std::move(handler)(ec, ec ? result_t{} : get_result<AlgoParams>(*st));
-    }
-
-    connection_state* st;
-};
-
-// Note: the 1st async_initiate arg should be a diagnostics*,
-// so completion tokens knowing how Boost.MySQL work can operate
-class connection_impl
-{
-    std::unique_ptr<engine> engine_;
-    std::unique_ptr<connection_state, connection_state_deleter> st_;
-
-    asio::any_io_executor get_executor() const { return engine_->get_executor(); }
-
-    // Helper for execution requests
-    template <class T>
-    static auto make_request(T&& input, connection_state& st)
-        -> decltype(execution_request_traits<typename std::decay<T>::type>::make_request(
-            std::forward<T>(input),
-            get_shared_fields(st)
-        ))
-    {
-        return execution_request_traits<typename std::decay<T>::type>::make_request(
-            std::forward<T>(input),
-            get_shared_fields(st)
-        );
-    }
-
-    // Generic algorithm
-    template <class AlgoParams>
-    typename AlgoParams::result_type run_impl(
-        AlgoParams params,
-        error_code& ec,
-        diagnostics& diag,
-        std::true_type /* has_void_result */
-    )
-    {
-        engine_->run(setup(*st_, diag, params), ec);
-    }
-
-    template <class AlgoParams>
-    typename AlgoParams::result_type run_impl(
-        AlgoParams params,
-        error_code& ec,
-        diagnostics& diag,
-        std::false_type /* has_void_result */
-    )
-    {
-        engine_->run(setup(*st_, diag, params), ec);
-        return get_result<AlgoParams>(*st_);
-    }
-
-    template <class AlgoParams, class Handler>
-    static void async_run_impl(
-        engine& eng,
-        connection_state& st,
-        AlgoParams params,
-        diagnostics& diag,
-        Handler&& handler,
-        std::true_type /* has_void_result */
-    )
-    {
-        eng.async_run(setup(st, diag, params), std::forward<Handler>(handler));
-    }
-
-    template <class AlgoParams, class Handler>
-    static void async_run_impl(
-        engine& eng,
-        connection_state& st,
-        AlgoParams params,
-        diagnostics& diag,
-        Handler&& handler,
-        std::false_type /* has_void_result */
-    )
-    {
-        eng.async_run(
-            setup(st, diag, params),
-            make_intermediate_handler(generic_algo_fn<AlgoParams>{&st}, std::forward<Handler>(handler))
-        );
-    }
-
-    template <class AlgoParams, class Handler>
-    static void async_run_impl(
-        engine& eng,
-        connection_state& st,
-        AlgoParams params,
-        diagnostics& diag,
-        Handler&& handler
-    )
-    {
-        async_run_impl(eng, st, params, diag, std::forward<Handler>(handler), has_void_result<AlgoParams>{});
-    }
-
-    struct run_algo_initiation : initiation_base
-    {
-        using initiation_base::initiation_base;
-
-        template <class Handler, class AlgoParams>
-        void operator()(
-            Handler&& handler,
-            diagnostics* diag,
-            engine* eng,
-            connection_state* st,
-            AlgoParams params
-        )
-        {
-            async_run_impl(*eng, *st, params, *diag, std::forward<Handler>(handler));
-        }
-    };
-
-    // Connect
-    static connect_algo_params make_params_connect(const void* server_address, const handshake_params& params)
-    {
-        return connect_algo_params{server_address, params, false};
-    }
-
-    static connect_algo_params make_params_connect_v2(const connect_params& params)
-    {
-        return connect_algo_params{
-            &params.server_address,
-            make_hparams(params),
-            params.server_address.type() == address_type::unix_path
-        };
-    }
-
-    template <class EndpointType>
-    struct initiate_connect : initiation_base
-    {
-        using initiation_base::initiation_base;
-
-        template <class Handler>
-        void operator()(
-            Handler&& handler,
-            diagnostics* diag,
-            engine* eng,
-            connection_state* st,
-            const EndpointType& endpoint,
-            handshake_params params
-        )
-        {
-            async_run_impl(
-                *eng,
-                *st,
-                make_params_connect(&endpoint, params),
-                *diag,
-                std::forward<Handler>(handler)
-            );
-        }
-    };
-
-    struct initiate_connect_v2 : initiation_base
-    {
-        using initiation_base::initiation_base;
-
-        template <class Handler>
-        void operator()(
-            Handler&& handler,
-            diagnostics* diag,
-            engine* eng,
-            connection_state* st,
-            const connect_params* params
-        )
-        {
-            async_run_impl(*eng, *st, make_params_connect_v2(*params), *diag, std::forward<Handler>(handler));
-        }
-    };
-
-    // execute
-    struct initiate_execute : initiation_base
-    {
-        using initiation_base::initiation_base;
-
-        template <class Handler, class ExecutionRequest>
-        void operator()(
-            Handler&& handler,
-            diagnostics* diag,
-            engine* eng,
-            connection_state* st,
-            ExecutionRequest&& req,
-            execution_processor* proc
-        )
-        {
-            async_run_impl(
-                *eng,
-                *st,
-                execute_algo_params{make_request(std::forward<ExecutionRequest>(req), *st), proc},
-                *diag,
-                std::forward<Handler>(handler)
-            );
-        }
-    };
-
-    // start execution
-    struct initiate_start_execution : initiation_base
-    {
-        using initiation_base::initiation_base;
-
-        template <class Handler, class ExecutionRequest>
-        void operator()(
-            Handler&& handler,
-            diagnostics* diag,
-            engine* eng,
-            connection_state* st,
-            ExecutionRequest&& req,
-            execution_processor* proc
-        )
-        {
-            async_run_impl(
-                *eng,
-                *st,
-                start_execution_algo_params{make_request(std::forward<ExecutionRequest>(req), *st), proc},
-                *diag,
-                std::forward<Handler>(handler)
-            );
-        }
-    };
-
-public:
-    BOOST_MYSQL_DECL connection_impl(
-        std::size_t read_buff_size,
-        std::size_t max_buffer_size,
-        std::unique_ptr<engine> eng
-    );
-
-    BOOST_MYSQL_DECL metadata_mode meta_mode() const;
-    BOOST_MYSQL_DECL void set_meta_mode(metadata_mode m);
-    BOOST_MYSQL_DECL bool ssl_active() const;
-    BOOST_MYSQL_DECL bool backslash_escapes() const;
-    BOOST_MYSQL_DECL system::result<character_set> current_character_set() const;
-    BOOST_MYSQL_DECL boost::optional<std::uint32_t> connection_id() const;
-    BOOST_MYSQL_DECL diagnostics& shared_diag();
-
-    engine& get_engine()
-    {
-        BOOST_ASSERT(engine_);
-        return *engine_;
-    }
-
-    const engine& get_engine() const
-    {
-        BOOST_ASSERT(engine_);
-        return *engine_;
-    }
-
-    // Generic algorithm
-    template <class AlgoParams>
-    typename AlgoParams::result_type run(AlgoParams params, error_code& ec, diagnostics& diag)
-    {
-        return run_impl(params, ec, diag, has_void_result<AlgoParams>{});
-    }
-
-    template <class AlgoParams, class CompletionToken>
-    auto async_run(AlgoParams params, diagnostics& diag, CompletionToken&& token)
-        -> decltype(asio::async_initiate<CompletionToken, completion_signature_t<AlgoParams>>(
-            run_algo_initiation(get_executor()),
-            token,
-            &diag,
-            engine_.get(),
-            st_.get(),
-            params
-        ))
-    {
-        return asio::async_initiate<CompletionToken, completion_signature_t<AlgoParams>>(
-            run_algo_initiation(get_executor()),
-            token,
-            &diag,
-            engine_.get(),
-            st_.get(),
-            params
-        );
-    }
-
-    // Connect
-    template <class EndpointType>
-    void connect(
-        const EndpointType& endpoint,
-        const handshake_params& params,
-        error_code& err,
-        diagnostics& diag
-    )
-    {
-        run(make_params_connect(&endpoint, params), err, diag);
-    }
-
-    void connect_v2(const connect_params& params, error_code& err, diagnostics& diag)
-    {
-        run(make_params_connect_v2(params), err, diag);
-    }
-
-    template <class EndpointType, class CompletionToken>
-    auto async_connect(
-        const EndpointType& endpoint,
-        const handshake_params& params,
-        diagnostics& diag,
-        CompletionToken&& token
-    )
-        -> decltype(asio::async_initiate<CompletionToken, void(error_code)>(
-            initiate_connect<EndpointType>(get_executor()),
-            token,
-            &diag,
-            engine_.get(),
-            st_.get(),
-            endpoint,
-            params
-        ))
-    {
-        return asio::async_initiate<CompletionToken, void(error_code)>(
-            initiate_connect<EndpointType>(get_executor()),
-            token,
-            &diag,
-            engine_.get(),
-            st_.get(),
-            endpoint,
-            params
-        );
-    }
-
-    template <class CompletionToken>
-    auto async_connect_v2(const connect_params& params, diagnostics& diag, CompletionToken&& token)
-        -> decltype(asio::async_initiate<CompletionToken, void(error_code)>(
-            initiate_connect_v2(get_executor()),
-            token,
-            &diag,
-            engine_.get(),
-            st_.get(),
-            &params
-        ))
-    {
-        return asio::async_initiate<CompletionToken, void(error_code)>(
-            initiate_connect_v2(get_executor()),
-            token,
-            &diag,
-            engine_.get(),
-            st_.get(),
-            &params
-        );
-    }
-
-    // Handshake
-    handshake_algo_params make_params_handshake(const handshake_params& params) const
-    {
-        return {params, false};
-    }
-
-    // Execute
-    template <class ExecutionRequest, class ResultsType>
-    void execute(ExecutionRequest&& req, ResultsType& result, error_code& err, diagnostics& diag)
-    {
-        run(
-            execute_algo_params{
-                make_request(std::forward<ExecutionRequest>(req), *st_),
-                &access::get_impl(result).get_interface()
-            },
-            err,
-            diag
-        );
-    }
-
-    template <class ExecutionRequest, class ResultsType, class CompletionToken>
-    auto async_execute(
-        ExecutionRequest&& req,
-        ResultsType& result,
-        diagnostics& diag,
-        CompletionToken&& token
-    )
-        -> decltype(asio::async_initiate<CompletionToken, void(error_code)>(
-            initiate_execute(get_executor()),
-            token,
-            &diag,
-            engine_.get(),
-            st_.get(),
-            std::forward<ExecutionRequest>(req),
-            &access::get_impl(result).get_interface()
-        ))
-    {
-        return asio::async_initiate<CompletionToken, void(error_code)>(
-            initiate_execute(get_executor()),
-            token,
-            &diag,
-            engine_.get(),
-            st_.get(),
-            std::forward<ExecutionRequest>(req),
-            &access::get_impl(result).get_interface()
-        );
-    }
-
-    // Start execution
-    template <class ExecutionRequest, class ExecutionStateType>
-    void start_execution(
-        ExecutionRequest&& req,
-        ExecutionStateType& exec_st,
-        error_code& err,
-        diagnostics& diag
-    )
-    {
-        run(
-            start_execution_algo_params{
-                make_request(std::forward<ExecutionRequest>(req), *st_),
-                &access::get_impl(exec_st).get_interface()
-            },
-            err,
-            diag
-        );
-    }
-
-    template <class ExecutionRequest, class ExecutionStateType, class CompletionToken>
-    auto async_start_execution(
-        ExecutionRequest&& req,
-        ExecutionStateType& exec_st,
-        diagnostics& diag,
-        CompletionToken&& token
-    )
-        -> decltype(asio::async_initiate<CompletionToken, void(error_code)>(
-            initiate_start_execution(get_executor()),
-            token,
-            &diag,
-            engine_.get(),
-            st_.get(),
-            std::forward<ExecutionRequest>(req),
-            &access::get_impl(exec_st).get_interface()
-        ))
-    {
-        return asio::async_initiate<CompletionToken, void(error_code)>(
-            initiate_start_execution(get_executor()),
-            token,
-            &diag,
-            engine_.get(),
-            st_.get(),
-            std::forward<ExecutionRequest>(req),
-            &access::get_impl(exec_st).get_interface()
-        );
-    }
-
-    // Read some rows (dynamic)
-    read_some_rows_dynamic_algo_params make_params_read_some_rows(execution_state& st) const
-    {
-        return {&access::get_impl(st).get_interface()};
-    }
-
-    // Read some rows (static)
-    template <class SpanElementType, class ExecutionState>
-    read_some_rows_algo_params make_params_read_some_rows_static(
-        ExecutionState& exec_st,
-        span<SpanElementType> output
-    ) const
-    {
-        return {
-            &access::get_impl(exec_st).get_interface(),
-            access::get_impl(exec_st).make_output_ref(output)
-        };
-    }
-
-    // Read resultset head
-    template <class ExecutionStateType>
-    read_resultset_head_algo_params make_params_read_resultset_head(ExecutionStateType& st) const
-    {
-        return {&detail::access::get_impl(st).get_interface()};
-    }
-
-    // Close statement
-    close_statement_algo_params make_params_close_statement(statement stmt) const { return {stmt.id()}; }
-
-    // Run pipeline. Separately compiled to avoid including the pipeline header here
-    BOOST_MYSQL_DECL
-    static run_pipeline_algo_params make_params_pipeline(
-        const pipeline_request& req,
-        std::vector<stage_response>& response
-    );
-
-    // Exposed for testing
-    connection_state& get_state() { return *st_; }
-};
-
-// To use some completion tokens, like deferred, in C++11, the old macros
-// BOOST_ASIO_INITFN_AUTO_RESULT_TYPE are no longer enough.
-// Helper typedefs to reduce duplication
-template <class AlgoParams, class CompletionToken>
-using async_run_t = decltype(std::declval<connection_impl&>().async_run(
-    std::declval<AlgoParams>(),
-    std::declval<diagnostics&>(),
-    std::declval<CompletionToken>()
-));
-
-template <class EndpointType, class CompletionToken>
-using async_connect_t = decltype(std::declval<connection_impl&>().async_connect(
-    std::declval<const EndpointType&>(),
-    std::declval<const handshake_params&>(),
-    std::declval<diagnostics&>(),
-    std::declval<CompletionToken>()
-));
-
-template <class CompletionToken>
-using async_connect_v2_t = decltype(std::declval<connection_impl&>().async_connect_v2(
-    std::declval<const connect_params&>(),
-    std::declval<diagnostics&>(),
-    std::declval<CompletionToken>()
-));
-
-template <class ExecutionRequest, class ResultsType, class CompletionToken>
-using async_execute_t = decltype(std::declval<connection_impl&>().async_execute(
-    std::declval<ExecutionRequest>(),
-    std::declval<ResultsType&>(),
-    std::declval<diagnostics&>(),
-    std::declval<CompletionToken>()
-));
-
-template <class ExecutionRequest, class ExecutionStateType, class CompletionToken>
-using async_start_execution_t = decltype(std::declval<connection_impl&>().async_start_execution(
-    std::declval<ExecutionRequest>(),
-    std::declval<ExecutionStateType&>(),
-    std::declval<diagnostics&>(),
-    std::declval<CompletionToken>()
-));
-
-template <class CompletionToken>
-using async_handshake_t = async_run_t<handshake_algo_params, CompletionToken>;
-
-template <class CompletionToken>
-using async_read_resultset_head_t = async_run_t<read_resultset_head_algo_params, CompletionToken>;
-
-template <class CompletionToken>
-using async_read_some_rows_dynamic_t = async_run_t<read_some_rows_dynamic_algo_params, CompletionToken>;
-
-template <class CompletionToken>
-using async_prepare_statement_t = async_run_t<prepare_statement_algo_params, CompletionToken>;
-
-template <class CompletionToken>
-using async_close_statement_t = async_run_t<close_statement_algo_params, CompletionToken>;
-
-template <class CompletionToken>
-using async_set_character_set_t = async_run_t<set_character_set_algo_params, CompletionToken>;
-
-template <class CompletionToken>
-using async_ping_t = async_run_t<ping_algo_params, CompletionToken>;
-
-template <class CompletionToken>
-using async_reset_connection_t = async_run_t<reset_connection_algo_params, CompletionToken>;
-
-template <class CompletionToken>
-using async_quit_connection_t = async_run_t<quit_connection_algo_params, CompletionToken>;
-
-template <class CompletionToken>
-using async_close_connection_t = async_run_t<close_connection_algo_params, CompletionToken>;
-
-template <class CompletionToken>
-using async_run_pipeline_t = async_run_t<run_pipeline_algo_params, CompletionToken>;
-
-}  // namespace detail
-}  // namespace mysql
-}  // namespace boost
-
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/connection_impl.ipp>
-#endif
-
-#endif
diff --git a/include/boost/mysql/detail/engine.hpp b/include/boost/mysql/detail/engine.hpp
index 67c8f76d4..5fb3d0204 100644
--- a/include/boost/mysql/detail/engine.hpp
+++ b/include/boost/mysql/detail/engine.hpp
@@ -8,25 +8,99 @@
 #ifndef BOOST_MYSQL_DETAIL_ENGINE_HPP
 #define BOOST_MYSQL_DETAIL_ENGINE_HPP
 
+#include <boost/mysql/any_address.hpp>
+#include <boost/mysql/error_code.hpp>
+
 #include <boost/mysql/detail/any_resumable_ref.hpp>
 
 #include <boost/asio/any_completion_handler.hpp>
 #include <boost/asio/any_io_executor.hpp>
+#include <boost/capy/buffers.hpp>
+#include <boost/capy/buffers/make_buffer.hpp>
+#include <boost/capy/io/any_stream.hpp>
+#include <boost/capy/io_task.hpp>
+
+#include <cstddef>
+#include <memory>
 
 namespace boost {
 namespace mysql {
 namespace detail {
 
+class mysql_stream : public capy::any_stream
+{
+    bool supports_tls_;
+
+public:
+    explicit mysql_stream(bool supports_tls) : supports_tls_(supports_tls) {}
+    virtual ~mysql_stream() {}
+    virtual capy::io_task<std::size_t> read_some(capy::mutable_buffer) = 0;
+    virtual capy::io_task<std::size_t> write_some(capy::const_buffer) = 0;
+    virtual capy::io_task<> connect(const any_address&) = 0;
+    virtual capy::io_task<> tls_handshake() = 0;
+    virtual capy::io_task<> tls_shutdown() = 0;
+    virtual capy::io_task<> close() = 0;
+
+    bool supports_tls() const { return supports_tls_; }
+};
+
 class engine
 {
+    std::unique_ptr<mysql_stream> stream_;
+
 public:
-    using executor_type = asio::any_io_executor;
+    engine(std::unique_ptr<mysql_stream> stream) noexcept : stream_(std::move(stream)) {}
+    ~engine() {}
+    capy::io_task<> run(any_resumable_ref resumable)
+    {
+        // Start the operation
+        auto act = resumable.resume(error_code(), 0u);
 
-    virtual ~engine() {}
-    virtual executor_type get_executor() = 0;
-    virtual bool supports_ssl() const = 0;
-    virtual void run(any_resumable_ref resumable, error_code& err) = 0;
-    virtual void async_run(any_resumable_ref resumable, asio::any_completion_handler<void(error_code)>) = 0;
+        while (true)
+        {
+            switch (act.type())
+            {
+            case next_action_type::none: co_return {act.error()};
+            case next_action_type::read:
+            {
+                auto [ec, n] = co_await stream_->read_some(capy::make_buffer(act.read_args().buffer));
+                act = resumable.resume(ec, n);
+                break;
+            }
+            case next_action_type::write:
+            {
+                auto [ec, n] = co_await stream_->write_some(capy::make_buffer(act.write_args().buffer));
+                act = resumable.resume(ec, n);
+                break;
+            }
+            case next_action_type::ssl_handshake:
+            {
+                auto [ec] = co_await stream_->tls_handshake();
+                act = resumable.resume(ec, 0u);
+                break;
+            }
+            case next_action_type::ssl_shutdown:
+            {
+                auto [ec] = co_await stream_->tls_shutdown();
+                act = resumable.resume(ec, 0u);
+                break;
+            }
+            case next_action_type::connect:
+            {
+                auto [ec] = co_await stream_->connect(act.connect_endpoint());
+                act = resumable.resume(ec, 0u);
+                break;
+            }
+            case next_action_type::close:
+            {
+                auto [ec] = co_await stream_->close();
+                act = resumable.resume(ec, 0u);
+                break;
+            }
+            default: BOOST_ASSERT(false); co_return {};
+            }
+        }
+    }
 };
 
 }  // namespace detail
diff --git a/include/boost/mysql/detail/engine_impl.hpp b/include/boost/mysql/detail/engine_impl.hpp
deleted file mode 100644
index efe045aec..000000000
--- a/include/boost/mysql/detail/engine_impl.hpp
+++ /dev/null
@@ -1,250 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_DETAIL_ENGINE_IMPL_HPP
-#define BOOST_MYSQL_DETAIL_ENGINE_IMPL_HPP
-
-#include <boost/mysql/error_code.hpp>
-
-#include <boost/mysql/detail/any_resumable_ref.hpp>
-#include <boost/mysql/detail/engine.hpp>
-#include <boost/mysql/detail/next_action.hpp>
-
-#include <boost/mysql/impl/internal/coroutine.hpp>
-
-#include <boost/asio/any_io_executor.hpp>
-#include <boost/asio/buffer.hpp>
-#include <boost/asio/cancellation_type.hpp>
-#include <boost/asio/compose.hpp>
-#include <boost/asio/error.hpp>
-#include <boost/asio/immediate.hpp>
-#include <boost/asio/post.hpp>
-#include <boost/assert.hpp>
-
-#include <cstddef>
-#include <utility>
-
-namespace boost {
-namespace mysql {
-namespace detail {
-
-inline asio::mutable_buffer to_buffer(span<std::uint8_t> buff) noexcept
-{
-    return asio::mutable_buffer(buff.data(), buff.size());
-}
-
-inline bool has_terminal_cancellation(asio::cancellation_type_t cancel_type)
-{
-    return static_cast<bool>(cancel_type & asio::cancellation_type_t::terminal);
-}
-
-template <class EngineStream>
-struct run_algo_op
-{
-    int resume_point_{0};
-    EngineStream& stream_;
-    any_resumable_ref resumable_;
-    bool has_done_io_{false};
-    error_code stored_ec_;
-
-    run_algo_op(EngineStream& stream, any_resumable_ref algo) noexcept : stream_(stream), resumable_(algo) {}
-
-    template <class Self>
-    void operator()(Self& self, error_code io_ec = {}, std::size_t bytes_transferred = 0)
-    {
-        next_action act;
-
-        switch (resume_point_)
-        {
-        case 0:
-
-            while (true)
-            {
-                // If we were cancelled, but the last operation completed successfully,
-                // set a cancelled error code so the algorithm exits. This might happen
-                // if a cancellation signal is emitted after an intermediate operation succeeded
-                // but before the handler was called.
-                if (!io_ec && has_terminal_cancellation(self.cancelled()))
-                    io_ec = asio::error::operation_aborted;
-
-                // Run the op
-                act = resumable_.resume(io_ec, bytes_transferred);
-                if (act.is_done())
-                {
-                    stored_ec_ = act.error();
-                    if (!has_done_io_)
-                    {
-                        BOOST_MYSQL_YIELD(
-                            resume_point_,
-                            1,
-                            asio::async_immediate(stream_.get_executor(), std::move(self))
-                        )
-                    }
-                    self.complete(stored_ec_);
-                    return;
-                }
-                else if (act.type() == next_action_type::read)
-                {
-                    BOOST_MYSQL_YIELD(
-                        resume_point_,
-                        2,
-                        stream_.async_read_some(
-                            to_buffer(act.read_args().buffer),
-                            act.read_args().use_ssl,
-                            std::move(self)
-                        )
-                    )
-                    has_done_io_ = true;
-                }
-                else if (act.type() == next_action_type::write)
-                {
-                    BOOST_MYSQL_YIELD(
-                        resume_point_,
-                        3,
-                        stream_.async_write_some(
-                            asio::buffer(act.write_args().buffer),
-                            act.write_args().use_ssl,
-                            std::move(self)
-                        )
-                    )
-                    has_done_io_ = true;
-                }
-                else if (act.type() == next_action_type::ssl_handshake)
-                {
-                    BOOST_MYSQL_YIELD(resume_point_, 4, stream_.async_ssl_handshake(std::move(self)))
-                    has_done_io_ = true;
-                }
-                else if (act.type() == next_action_type::ssl_shutdown)
-                {
-                    BOOST_MYSQL_YIELD(resume_point_, 5, stream_.async_ssl_shutdown(std::move(self)))
-                    has_done_io_ = true;
-                }
-                else if (act.type() == next_action_type::connect)
-                {
-                    BOOST_MYSQL_YIELD(
-                        resume_point_,
-                        6,
-                        stream_.async_connect(act.connect_endpoint(), std::move(self))
-                    )
-                    has_done_io_ = true;
-                }
-                else
-                {
-                    BOOST_ASSERT(act.type() == next_action_type::close);
-                    stream_.close(io_ec);
-                }
-            }
-        }
-    }
-};
-
-// EngineStream is an "extended" stream concept, with the following operations:
-//    using executor_type = asio::any_io_executor;
-//    executor_type get_executor();
-//    bool supports_ssl() const;
-//    std::size_t read_some(asio::mutable_buffer, bool use_ssl, error_code&);
-//    void async_read_some(asio::mutable_buffer, bool use_ssl, CompletinToken&&);
-//    std::size_t write_some(asio::const_buffer, bool use_ssl, error_code&);
-//    void async_write_some(asio::const_buffer, bool use_ssl, CompletinToken&&);
-//    void ssl_handshake(error_code&);
-//    void async_ssl_handshake(CompletionToken&&);
-//    void ssl_shutdown(error_code&);
-//    void async_ssl_shutdown(CompletionToken&&);
-//    void connect(const void* server_address, error_code&);
-//    void async_connect(const void* server_address, CompletionToken&&);
-//    void close(error_code&);
-// Async operations are only required to support callback types
-// See stream_adaptor for an implementation
-template <class EngineStream>
-class engine_impl final : public engine
-{
-    EngineStream stream_;
-
-public:
-    template <class... Args>
-    engine_impl(Args&&... args) : stream_(std::forward<Args>(args)...)
-    {
-    }
-
-    EngineStream& stream() { return stream_; }
-    const EngineStream& stream() const { return stream_; }
-
-    using executor_type = asio::any_io_executor;
-    executor_type get_executor() override final { return stream_.get_executor(); }
-
-    bool supports_ssl() const override final { return stream_.supports_ssl(); }
-
-    void run(any_resumable_ref resumable, error_code& ec) override final
-    {
-        ec.clear();
-        error_code io_ec;
-        std::size_t bytes_transferred = 0;
-
-        while (true)
-        {
-            // Run the op
-            auto act = resumable.resume(io_ec, bytes_transferred);
-
-            // Apply the next action
-            bytes_transferred = 0;
-            if (act.is_done())
-            {
-                ec = act.error();
-                return;
-            }
-            else if (act.type() == next_action_type::read)
-            {
-                bytes_transferred = stream_.read_some(
-                    to_buffer(act.read_args().buffer),
-                    act.read_args().use_ssl,
-                    io_ec
-                );
-            }
-            else if (act.type() == next_action_type::write)
-            {
-                bytes_transferred = stream_.write_some(
-                    asio::buffer(act.write_args().buffer),
-                    act.write_args().use_ssl,
-                    io_ec
-                );
-            }
-            else if (act.type() == next_action_type::ssl_handshake)
-            {
-                stream_.ssl_handshake(io_ec);
-            }
-            else if (act.type() == next_action_type::ssl_shutdown)
-            {
-                stream_.ssl_shutdown(io_ec);
-            }
-            else if (act.type() == next_action_type::connect)
-            {
-                stream_.connect(act.connect_endpoint(), io_ec);
-            }
-            else
-            {
-                BOOST_ASSERT(act.type() == next_action_type::close);
-                stream_.close(io_ec);
-            }
-        }
-    }
-
-    void async_run(any_resumable_ref resumable, asio::any_completion_handler<void(error_code)> h)
-        override final
-    {
-        return asio::async_compose<asio::any_completion_handler<void(error_code)>, void(error_code)>(
-            run_algo_op<EngineStream>(stream_, resumable),
-            h,
-            stream_
-        );
-    }
-};
-
-}  // namespace detail
-}  // namespace mysql
-}  // namespace boost
-
-#endif
diff --git a/include/boost/mysql/detail/engine_stream_adaptor.hpp b/include/boost/mysql/detail/engine_stream_adaptor.hpp
deleted file mode 100644
index 141324352..000000000
--- a/include/boost/mysql/detail/engine_stream_adaptor.hpp
+++ /dev/null
@@ -1,314 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_DETAIL_ENGINE_STREAM_ADAPTOR_HPP
-#define BOOST_MYSQL_DETAIL_ENGINE_STREAM_ADAPTOR_HPP
-
-#include <boost/mysql/error_code.hpp>
-
-#include <boost/mysql/detail/config.hpp>
-#include <boost/mysql/detail/engine_impl.hpp>
-#include <boost/mysql/detail/socket_stream.hpp>
-#include <boost/mysql/detail/void_t.hpp>
-
-#include <boost/asio/any_io_executor.hpp>
-#include <boost/asio/ip/tcp.hpp>
-#include <boost/asio/ssl/stream.hpp>
-#include <boost/config.hpp>
-#include <boost/core/ignore_unused.hpp>
-
-#include <type_traits>
-
-// Adapts a regular Asio Stream to meet the EngineStream requirements
-// We only use callbacks with the async functions in this file, so no need to support arbitrary return types
-
-namespace boost {
-namespace mysql {
-namespace detail {
-
-// Connect and close helpers
-// LCOV_EXCL_START
-template <class Stream>
-void do_connect_impl(Stream&, const void*, error_code&, std::false_type)
-{
-    BOOST_ASSERT(false);
-}
-// LCOV_EXCL_STOP
-
-template <class Stream>
-void do_connect_impl(Stream& stream, const void* ep, error_code& ec, std::true_type)
-{
-    stream.lowest_layer().connect(
-        *static_cast<const typename Stream::lowest_layer_type::endpoint_type*>(ep),
-        ec
-    );
-}
-
-template <class Stream>
-void do_connect(Stream& stream, const void* ep, error_code& ec)
-{
-    do_connect_impl(stream, ep, ec, is_socket_stream<Stream>{});
-}
-
-// LCOV_EXCL_START
-template <class Stream, class CompletionToken>
-void do_async_connect_impl(Stream&, const void*, CompletionToken&&, std::false_type)
-{
-    BOOST_ASSERT(false);
-}
-// LCOV_EXCL_STOP
-
-template <class Stream, class CompletionToken>
-void do_async_connect_impl(Stream& stream, const void* ep, CompletionToken&& token, std::true_type)
-{
-    stream.lowest_layer().async_connect(
-        *static_cast<const typename Stream::lowest_layer_type::endpoint_type*>(ep),
-        std::forward<CompletionToken>(token)
-    );
-}
-
-template <class Stream, class CompletionToken>
-void do_async_connect(Stream& stream, const void* ep, CompletionToken&& token)
-{
-    do_async_connect_impl(stream, ep, std::forward<CompletionToken>(token), is_socket_stream<Stream>{});
-}
-
-// LCOV_EXCL_START
-template <class Stream>
-void do_close_impl(Stream&, error_code&, std::false_type)
-{
-    BOOST_ASSERT(false);
-}
-// LCOV_EXCL_STOP
-
-template <class Stream>
-void do_close_impl(Stream& stream, error_code& ec, std::true_type)
-{
-    stream.lowest_layer().shutdown(asio::socket_base::shutdown_both, ec);
-    stream.lowest_layer().close(ec);
-}
-
-template <class Stream>
-void do_close(Stream& stream, error_code& ec)
-{
-    do_close_impl(stream, ec, is_socket_stream<Stream>{});
-}
-
-template <class Stream>
-class engine_stream_adaptor
-{
-    Stream stream_;
-
-public:
-    template <class... Args>
-    engine_stream_adaptor(Args&&... args) : stream_(std::forward<Args>(args)...)
-    {
-    }
-
-    Stream& stream() { return stream_; }
-    const Stream& stream() const { return stream_; }
-
-    bool supports_ssl() const { return false; }
-
-    using executor_type = asio::any_io_executor;
-    executor_type get_executor() { return stream_.get_executor(); }
-
-    // SSL
-    // LCOV_EXCL_START
-    void ssl_handshake(error_code&) { BOOST_ASSERT(false); }
-
-    template <class CompletinToken>
-    void async_ssl_handshake(CompletinToken&&)
-    {
-        BOOST_ASSERT(false);
-    }
-
-    void ssl_shutdown(error_code&) { BOOST_ASSERT(false); }
-
-    template <class CompletionToken>
-    void async_ssl_shutdown(CompletionToken&&)
-    {
-        BOOST_ASSERT(false);
-    }
-    // LCOV_EXCL_STOP
-
-    // Reading
-    std::size_t read_some(boost::asio::mutable_buffer buff, bool use_ssl, error_code& ec)
-    {
-        BOOST_ASSERT(!use_ssl);
-        boost::ignore_unused(use_ssl);
-        return stream_.read_some(buff, ec);
-    }
-
-    template <class CompletionToken>
-    void async_read_some(boost::asio::mutable_buffer buff, bool use_ssl, CompletionToken&& token)
-    {
-        BOOST_ASSERT(!use_ssl);
-        boost::ignore_unused(use_ssl);
-        stream_.async_read_some(buff, std::forward<CompletionToken>(token));
-    }
-
-    // Writing
-    std::size_t write_some(boost::asio::const_buffer buff, bool use_ssl, error_code& ec)
-    {
-        BOOST_ASSERT(!use_ssl);
-        boost::ignore_unused(use_ssl);
-        return stream_.write_some(buff, ec);
-    }
-
-    template <class CompletionToken>
-    void async_write_some(boost::asio::const_buffer buff, bool use_ssl, CompletionToken&& token)
-    {
-        BOOST_ASSERT(!use_ssl);
-        boost::ignore_unused(use_ssl);
-        stream_.async_write_some(buff, std::forward<CompletionToken>(token));
-    }
-
-    // Connect and close
-    void connect(const void* endpoint, error_code& ec) { do_connect(stream_, endpoint, ec); }
-
-    template <class CompletionToken>
-    void async_connect(const void* endpoint, CompletionToken&& token)
-    {
-        do_async_connect(stream_, endpoint, std::forward<CompletionToken>(token));
-    }
-
-    void close(error_code& ec) { do_close(stream_, ec); }
-};
-
-template <class Stream>
-class engine_stream_adaptor<asio::ssl::stream<Stream>>
-{
-    asio::ssl::stream<Stream> stream_;
-
-public:
-    template <class... Args>
-    engine_stream_adaptor(Args&&... args) : stream_(std::forward<Args>(args)...)
-    {
-    }
-
-    asio::ssl::stream<Stream>& stream() { return stream_; }
-    const asio::ssl::stream<Stream>& stream() const { return stream_; }
-
-    bool supports_ssl() const { return true; }
-
-    using executor_type = asio::any_io_executor;
-    executor_type get_executor() { return stream_.get_executor(); }
-
-    // SSL
-    void ssl_handshake(error_code& ec) { stream_.handshake(asio::ssl::stream_base::client, ec); }
-
-    template <class CompletionToken>
-    void async_ssl_handshake(CompletionToken&& token)
-    {
-        stream_.async_handshake(asio::ssl::stream_base::client, std::forward<CompletionToken>(token));
-    }
-
-    void ssl_shutdown(error_code& ec) { stream_.shutdown(ec); }
-
-    template <class CompletionToken>
-    void async_ssl_shutdown(CompletionToken&& token)
-    {
-        stream_.async_shutdown(std::forward<CompletionToken>(token));
-    }
-
-    // Reading
-    std::size_t read_some(boost::asio::mutable_buffer buff, bool use_ssl, error_code& ec)
-    {
-        if (use_ssl)
-        {
-            return stream_.read_some(buff, ec);
-        }
-        else
-        {
-            return stream_.next_layer().read_some(buff, ec);
-        }
-    }
-
-    template <class CompletionToken>
-    void async_read_some(boost::asio::mutable_buffer buff, bool use_ssl, CompletionToken&& token)
-    {
-        if (use_ssl)
-        {
-            stream_.async_read_some(buff, std::forward<CompletionToken>(token));
-        }
-        else
-        {
-            stream_.next_layer().async_read_some(buff, std::forward<CompletionToken>(token));
-        }
-    }
-
-    // Writing
-    std::size_t write_some(boost::asio::const_buffer buff, bool use_ssl, error_code& ec)
-    {
-        if (use_ssl)
-        {
-            return stream_.write_some(buff, ec);
-        }
-        else
-        {
-            return stream_.next_layer().write_some(buff, ec);
-        }
-    }
-
-    template <class CompletionToken>
-    void async_write_some(boost::asio::const_buffer buff, bool use_ssl, CompletionToken&& token)
-    {
-        if (use_ssl)
-        {
-            stream_.async_write_some(buff, std::forward<CompletionToken>(token));
-        }
-        else
-        {
-            stream_.next_layer().async_write_some(buff, std::forward<CompletionToken>(token));
-        }
-    }
-
-    // Connect and close
-    void connect(const void* endpoint, error_code& ec) { do_connect(stream_, endpoint, ec); }
-
-    template <class CompletionToken>
-    void async_connect(const void* endpoint, CompletionToken&& token)
-    {
-        do_async_connect(stream_, endpoint, std::forward<CompletionToken>(token));
-    }
-
-    void close(error_code& ec) { do_close(stream_, ec); }
-};
-
-#ifdef BOOST_MYSQL_SEPARATE_COMPILATION
-extern template class engine_impl<engine_stream_adaptor<asio::ssl::stream<asio::ip::tcp::socket>>>;
-extern template class engine_impl<engine_stream_adaptor<asio::ip::tcp::socket>>;
-#endif
-
-template <class Stream, class... Args>
-std::unique_ptr<engine> make_engine(Args&&... args)
-{
-    return std::unique_ptr<engine>(new engine_impl<engine_stream_adaptor<Stream>>(std::forward<Args>(args)...)
-    );
-}
-
-// Use these only for engines created using make_engine
-template <class Stream>
-Stream& stream_from_engine(engine& eng)
-{
-    using derived_t = engine_impl<engine_stream_adaptor<Stream>>;
-    return static_cast<derived_t&>(eng).stream().stream();
-}
-
-template <class Stream>
-const Stream& stream_from_engine(const engine& eng)
-{
-    using derived_t = engine_impl<engine_stream_adaptor<Stream>>;
-    return static_cast<const derived_t&>(eng).stream().stream();
-}
-
-}  // namespace detail
-}  // namespace mysql
-}  // namespace boost
-
-#endif
diff --git a/include/boost/mysql/detail/escape_string.hpp b/include/boost/mysql/detail/escape_string.hpp
index 5d77385d0..fe5946498 100644
--- a/include/boost/mysql/detail/escape_string.hpp
+++ b/include/boost/mysql/detail/escape_string.hpp
@@ -9,13 +9,14 @@
 #define BOOST_MYSQL_DETAIL_ESCAPE_STRING_HPP
 
 #include <boost/mysql/error_code.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/config.hpp>
 #include <boost/mysql/detail/output_string.hpp>
 
 #include <boost/config.hpp>
 
+#include <string_view>
+
 namespace boost {
 namespace mysql {
 
@@ -25,14 +26,11 @@ struct format_options;
 namespace detail {
 
 BOOST_ATTRIBUTE_NODISCARD BOOST_MYSQL_DECL error_code
-escape_string(string_view input, const format_options& opts, char quote_char, output_string_ref output);
+escape_string(std::string_view input, const format_options& opts, char quote_char, output_string_ref output);
 
 }  // namespace detail
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/escape_string.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/detail/execution_concepts.hpp b/include/boost/mysql/detail/execution_concepts.hpp
index 9c859ba94..9ed5e07f6 100644
--- a/include/boost/mysql/detail/execution_concepts.hpp
+++ b/include/boost/mysql/detail/execution_concepts.hpp
@@ -8,11 +8,10 @@
 #ifndef BOOST_MYSQL_DETAIL_EXECUTION_CONCEPTS_HPP
 #define BOOST_MYSQL_DETAIL_EXECUTION_CONCEPTS_HPP
 
-#include <boost/mysql/string_view.hpp>
-
 #include <boost/mysql/detail/any_execution_request.hpp>
 #include <boost/mysql/detail/config.hpp>
 
+#include <string_view>
 #include <type_traits>
 
 #ifdef BOOST_MYSQL_HAS_CONCEPTS
diff --git a/include/boost/mysql/detail/execution_processor/execution_processor.hpp b/include/boost/mysql/detail/execution_processor/execution_processor.hpp
index 2aab43e90..cb79e9b1c 100644
--- a/include/boost/mysql/detail/execution_processor/execution_processor.hpp
+++ b/include/boost/mysql/detail/execution_processor/execution_processor.hpp
@@ -13,7 +13,6 @@
 #include <boost/mysql/field_view.hpp>
 #include <boost/mysql/metadata.hpp>
 #include <boost/mysql/metadata_mode.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/access.hpp>
 #include <boost/mysql/detail/coldef_view.hpp>
@@ -22,11 +21,12 @@
 
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
-#include <boost/core/span.hpp>
 
 #include <cstddef>
 #include <cstdint>
 #include <limits>
+#include <span>
+#include <string_view>
 
 namespace boost {
 namespace mysql {
@@ -51,7 +51,7 @@ class output_ref
     constexpr output_ref() noexcept = default;
 
     template <class T>
-    constexpr output_ref(boost::span<T> span, std::size_t type_index, std::size_t offset = 0) noexcept
+    constexpr output_ref(std::span<T> span, std::size_t type_index, std::size_t offset = 0) noexcept
         : data_(span.data()), max_size_(span.size()), type_index_(type_index), offset_(offset)
     {
     }
@@ -121,7 +121,11 @@ class execution_processor
     void on_row_batch_finish() { on_row_batch_finish_impl(); }
 
     BOOST_ATTRIBUTE_NODISCARD
-    error_code on_row(span<const std::uint8_t> msg, const output_ref& ref, std::vector<field_view>& storage)
+    error_code on_row(
+        std::span<const std::uint8_t> msg,
+        const output_ref& ref,
+        std::vector<field_view>& storage
+    )
     {
         BOOST_ASSERT(is_reading_rows());
         return on_row_impl(msg, ref, storage);
@@ -157,7 +161,7 @@ class execution_processor
     virtual error_code on_meta_impl(const coldef_view& coldef, bool is_last, diagnostics& diag) = 0;
     virtual error_code on_row_ok_packet_impl(const ok_view& pack) = 0;
     virtual error_code on_row_impl(
-        span<const std::uint8_t> msg,
+        std::span<const std::uint8_t> msg,
         const output_ref& ref,
         std::vector<field_view>& storage
     ) = 0;
diff --git a/include/boost/mysql/detail/execution_processor/execution_state_impl.hpp b/include/boost/mysql/detail/execution_processor/execution_state_impl.hpp
index 9e45902d6..7fc410889 100644
--- a/include/boost/mysql/detail/execution_processor/execution_state_impl.hpp
+++ b/include/boost/mysql/detail/execution_processor/execution_state_impl.hpp
@@ -13,13 +13,13 @@
 #include <boost/mysql/field_view.hpp>
 #include <boost/mysql/metadata.hpp>
 #include <boost/mysql/metadata_collection_view.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/config.hpp>
 #include <boost/mysql/detail/execution_processor/execution_processor.hpp>
 
 #include <boost/assert.hpp>
 
+#include <string_view>
 #include <vector>
 
 namespace boost {
@@ -64,8 +64,11 @@ class execution_state_impl final : public execution_processor
     error_code on_meta_impl(const coldef_view&, bool, diagnostics&) override final;
 
     BOOST_MYSQL_DECL
-    error_code on_row_impl(span<const std::uint8_t> msg, const output_ref&, std::vector<field_view>& fields)
-        override final;
+    error_code on_row_impl(
+        std::span<const std::uint8_t> msg,
+        const output_ref&,
+        std::vector<field_view>& fields
+    ) override final;
 
     BOOST_MYSQL_DECL
     error_code on_row_ok_packet_impl(const ok_view& pack) override final;
@@ -97,10 +100,10 @@ class execution_state_impl final : public execution_processor
         return eof_data_.warnings;
     }
 
-    string_view get_info() const noexcept
+    std::string_view get_info() const noexcept
     {
         BOOST_ASSERT(eof_data_.has_value);
-        return string_view(info_.data(), info_.size());
+        return std::string_view(info_.data(), info_.size());
     }
 
     bool get_is_out_params() const noexcept
@@ -116,8 +119,5 @@ class execution_state_impl final : public execution_processor
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/execution_state_impl.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/detail/execution_processor/results_impl.hpp b/include/boost/mysql/detail/execution_processor/results_impl.hpp
index cd98dc08f..1555c3b94 100644
--- a/include/boost/mysql/detail/execution_processor/results_impl.hpp
+++ b/include/boost/mysql/detail/execution_processor/results_impl.hpp
@@ -14,7 +14,6 @@
 #include <boost/mysql/metadata.hpp>
 #include <boost/mysql/metadata_collection_view.hpp>
 #include <boost/mysql/rows_view.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/config.hpp>
 #include <boost/mysql/detail/execution_processor/execution_processor.hpp>
@@ -22,6 +21,8 @@
 
 #include <boost/assert.hpp>
 
+#include <string_view>
+
 namespace boost {
 namespace mysql {
 namespace detail {
@@ -126,10 +127,10 @@ class results_impl final : public execution_processor
 
     unsigned get_warning_count(std::size_t index) const noexcept { return get_resultset(index).warnings; }
 
-    string_view get_info(std::size_t index) const noexcept
+    std::string_view get_info(std::size_t index) const noexcept
     {
         const auto& resultset_data = get_resultset(index);
-        return string_view(info_.data() + resultset_data.info_offset, resultset_data.info_size);
+        return std::string_view(info_.data() + resultset_data.info_offset, resultset_data.info_size);
     }
 
     bool get_is_out_params(std::size_t index) const noexcept { return get_resultset(index).is_out_params; }
@@ -151,8 +152,11 @@ class results_impl final : public execution_processor
     error_code on_meta_impl(const coldef_view&, bool, diagnostics&) override final;
 
     BOOST_MYSQL_DECL
-    error_code on_row_impl(span<const std::uint8_t> msg, const output_ref&, std::vector<field_view>&)
-        override final;
+    error_code on_row_impl(
+        std::span<const std::uint8_t> msg,
+        const output_ref&,
+        std::vector<field_view>&
+    ) override final;
 
     BOOST_MYSQL_DECL
     error_code on_row_ok_packet_impl(const ok_view& pack) override final;
@@ -212,8 +216,5 @@ class results_impl final : public execution_processor
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/results_impl.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/detail/execution_processor/static_execution_state_impl.hpp b/include/boost/mysql/detail/execution_processor/static_execution_state_impl.hpp
index a80243b7d..90c61e510 100644
--- a/include/boost/mysql/detail/execution_processor/static_execution_state_impl.hpp
+++ b/include/boost/mysql/detail/execution_processor/static_execution_state_impl.hpp
@@ -17,7 +17,6 @@
 #include <boost/mysql/field_view.hpp>
 #include <boost/mysql/metadata.hpp>
 #include <boost/mysql/metadata_collection_view.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/execution_processor/execution_processor.hpp>
 #include <boost/mysql/detail/typing/row_traits.hpp>
@@ -26,14 +25,18 @@
 
 #include <array>
 #include <cstddef>
+#include <string_view>
 #include <vector>
 
 namespace boost {
 namespace mysql {
 namespace detail {
 
-using execst_parse_fn_t =
-    error_code (*)(span<const std::size_t> pos_map, span<const field_view> from, const output_ref& ref);
+using execst_parse_fn_t = error_code (*)(
+    std::span<const std::size_t> pos_map,
+    std::span<const field_view> from,
+    const output_ref& ref
+);
 
 struct execst_resultset_descriptor
 {
@@ -52,7 +55,7 @@ class execst_external_data
         std::size_t* pos_map;
     };
 
-    execst_external_data(span<const execst_resultset_descriptor> desc, ptr_data ptr) noexcept
+    execst_external_data(std::span<const execst_resultset_descriptor> desc, ptr_data ptr) noexcept
         : desc_(desc), ptr_(ptr)
     {
     }
@@ -83,15 +86,15 @@ class execst_external_data
         BOOST_ASSERT(idx < num_resultsets());
         return desc_[idx].type_index;
     }
-    span<std::size_t> pos_map(std::size_t idx) const noexcept
+    std::span<std::size_t> pos_map(std::size_t idx) const noexcept
     {
-        return span<std::size_t>(ptr_.pos_map, num_columns(idx));
+        return std::span<std::size_t>(ptr_.pos_map, num_columns(idx));
     }
 
     void set_pointers(ptr_data ptr) noexcept { ptr_ = ptr; }
 
 private:
-    span<const execst_resultset_descriptor> desc_;
+    std::span<const execst_resultset_descriptor> desc_;
     ptr_data ptr_;
 };
 
@@ -122,10 +125,10 @@ class static_execution_state_erased_impl final : public execution_processor
         return ok_data_.warnings;
     }
 
-    string_view get_info() const noexcept
+    std::string_view get_info() const noexcept
     {
         BOOST_ASSERT(ok_data_.has_value);
-        return string_view(info_.data(), info_.size());
+        return std::string_view(info_.data(), info_.size());
     }
 
     bool get_is_out_params() const noexcept
@@ -166,7 +169,7 @@ class static_execution_state_erased_impl final : public execution_processor
 
     BOOST_MYSQL_DECL
     error_code on_row_impl(
-        span<const std::uint8_t> msg,
+        std::span<const std::uint8_t> msg,
         const output_ref& ref,
         std::vector<field_view>& fields
     ) override final;
@@ -180,8 +183,11 @@ class static_execution_state_erased_impl final : public execution_processor
 
     // Auxiliar
     name_table_t current_name_table() const noexcept { return ext_.name_table(resultset_index_ - 1); }
-    span<std::size_t> current_pos_map() noexcept { return ext_.pos_map(resultset_index_ - 1); }
-    span<const std::size_t> current_pos_map() const noexcept { return ext_.pos_map(resultset_index_ - 1); }
+    std::span<std::size_t> current_pos_map() noexcept { return ext_.pos_map(resultset_index_ - 1); }
+    std::span<const std::size_t> current_pos_map() const noexcept
+    {
+        return ext_.pos_map(resultset_index_ - 1);
+    }
 
     error_code meta_check(diagnostics& diag) const
     {
@@ -197,8 +203,8 @@ class static_execution_state_erased_impl final : public execution_processor
 
 template <class StaticRow>
 static error_code execst_parse_fn(
-    span<const std::size_t> pos_map,
-    span<const field_view> from,
+    std::span<const std::size_t> pos_map,
+    std::span<const field_view> from,
     const output_ref& ref
 )
 {
@@ -278,7 +284,7 @@ class static_execution_state_impl
     ~static_execution_state_impl() = default;
 
     template <class SpanElementType>
-    output_ref make_output_ref(span<SpanElementType> output, std::size_t offset = 0) const noexcept
+    output_ref make_output_ref(std::span<SpanElementType> output, std::size_t offset = 0) const noexcept
     {
         constexpr std::size_t index = get_type_index<SpanElementType, StaticRow...>();
         static_assert(
@@ -296,9 +302,6 @@ class static_execution_state_impl
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/static_execution_state_impl.ipp>
-#endif
 
 #endif  // BOOST_MYSQL_CXX14
 
diff --git a/include/boost/mysql/detail/execution_processor/static_results_impl.hpp b/include/boost/mysql/detail/execution_processor/static_results_impl.hpp
index 32af3d46e..58ee2e0fe 100644
--- a/include/boost/mysql/detail/execution_processor/static_results_impl.hpp
+++ b/include/boost/mysql/detail/execution_processor/static_results_impl.hpp
@@ -16,7 +16,6 @@
 #include <boost/mysql/field_view.hpp>
 #include <boost/mysql/metadata.hpp>
 #include <boost/mysql/metadata_collection_view.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/execution_processor/execution_processor.hpp>
 #include <boost/mysql/detail/typing/readable_field_traits.hpp>
@@ -28,6 +27,7 @@
 
 #include <array>
 #include <cstddef>
+#include <string_view>
 
 namespace boost {
 namespace mysql {
@@ -35,7 +35,7 @@ namespace detail {
 
 using results_reset_fn_t = void (*)(void*);
 using results_parse_fn_t =
-    error_code (*)(span<const std::size_t> pos_map, span<const field_view> from, void* to);
+    error_code (*)(std::span<const std::size_t> pos_map, std::span<const field_view> from, void* to);
 
 struct results_resultset_descriptor
 {
@@ -69,7 +69,7 @@ class results_external_data
     };
 
     results_external_data(
-        span<const results_resultset_descriptor> desc,
+        std::span<const results_resultset_descriptor> desc,
         results_reset_fn_t reset,
         ptr_data ptr
     ) noexcept
@@ -102,9 +102,9 @@ class results_external_data
     }
     results_reset_fn_t reset_fn() const noexcept { return reset_; }
     void* rows() const noexcept { return ptr_.rows; }
-    span<std::size_t> pos_map(std::size_t idx) const noexcept
+    std::span<std::size_t> pos_map(std::size_t idx) const noexcept
     {
-        return span<std::size_t>(ptr_.pos_map, num_columns(idx));
+        return std::span<std::size_t>(ptr_.pos_map, num_columns(idx));
     }
     static_per_resultset_data& per_result(std::size_t idx) const noexcept
     {
@@ -113,7 +113,7 @@ class results_external_data
     }
 
 private:
-    span<const results_resultset_descriptor> desc_;
+    std::span<const results_resultset_descriptor> desc_;
     results_reset_fn_t reset_;
     ptr_data ptr_;
 };
@@ -143,10 +143,10 @@ class static_results_erased_impl final : public execution_processor
 
     unsigned get_warning_count(std::size_t index) const noexcept { return ext_.per_result(index).warnings; }
 
-    string_view get_info(std::size_t index) const noexcept
+    std::string_view get_info(std::size_t index) const noexcept
     {
         const auto& resultset_data = ext_.per_result(index);
-        return string_view(info_.data() + resultset_data.info_offset, resultset_data.info_size);
+        return std::string_view(info_.data() + resultset_data.info_offset, resultset_data.info_size);
     }
 
     bool get_is_out_params(std::size_t index) const noexcept { return ext_.per_result(index).is_out_params; }
@@ -166,8 +166,11 @@ class static_results_erased_impl final : public execution_processor
     error_code on_meta_impl(const coldef_view& coldef, bool is_last, diagnostics& diag) override final;
 
     BOOST_MYSQL_DECL
-    error_code on_row_impl(span<const std::uint8_t> msg, const output_ref&, std::vector<field_view>& fields)
-        override final;
+    error_code on_row_impl(
+        std::span<const std::uint8_t> msg,
+        const output_ref&,
+        std::vector<field_view>& fields
+    ) override final;
 
     BOOST_MYSQL_DECL
     error_code on_row_ok_packet_impl(const ok_view& pack) override final;
@@ -182,8 +185,11 @@ class static_results_erased_impl final : public execution_processor
     std::size_t resultset_index_{0};
 
     // Helpers
-    span<std::size_t> current_pos_map() noexcept { return ext_.pos_map(resultset_index_ - 1); }
-    span<const std::size_t> current_pos_map() const noexcept { return ext_.pos_map(resultset_index_ - 1); }
+    std::span<std::size_t> current_pos_map() noexcept { return ext_.pos_map(resultset_index_ - 1); }
+    std::span<const std::size_t> current_pos_map() const noexcept
+    {
+        return ext_.pos_map(resultset_index_ - 1);
+    }
     name_table_t current_name_table() const noexcept { return ext_.name_table(resultset_index_ - 1); }
     static_per_resultset_data& current_resultset() noexcept { return ext_.per_result(resultset_index_ - 1); }
     metadata_collection_view current_resultset_meta() const noexcept
@@ -229,7 +235,11 @@ struct results_fns
     }
 
     template <std::size_t I>
-    static error_code do_parse(span<const std::size_t> pos_map, span<const field_view> from, void* to)
+    static error_code do_parse(
+        std::span<const std::size_t> pos_map,
+        std::span<const field_view> from,
+        void* to
+    )
     {
         using StaticRowT = mp11::mp_at_c<mp11::mp_list<StaticRow...>, I>;
         auto& v = std::get<I>(*static_cast<rows_t*>(to));
@@ -250,8 +260,9 @@ struct results_fns
     }
 
     template <std::size_t... I>
-    static constexpr std::array<results_resultset_descriptor, sizeof...(StaticRow)> create_descriptors(mp11::index_sequence<
-                                                                                                       I...>)
+    static constexpr std::array<results_resultset_descriptor, sizeof...(StaticRow)> create_descriptors(
+        mp11::index_sequence<I...>
+    )
     {
         return {{create_descriptor<I>()...}};
     }
@@ -264,7 +275,7 @@ BOOST_INLINE_CONSTEXPR std::array<results_resultset_descriptor, sizeof...(Static
     );
 
 template <std::size_t I, class... StaticRow>
-using rows_span_t = boost::span<
+using rows_span_t = std::span<
     const typename std::tuple_element<I, std::tuple<underlying_row_t<StaticRow>...>>::type>;
 
 template <BOOST_MYSQL_STATIC_ROW... StaticRow>
@@ -344,9 +355,6 @@ class static_results_impl
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/static_results_impl.ipp>
-#endif
 
 #endif  // BOOST_MYSQL_CXX14
 
diff --git a/include/boost/mysql/detail/format_sql.hpp b/include/boost/mysql/detail/format_sql.hpp
index b9bfa3984..91712230e 100644
--- a/include/boost/mysql/detail/format_sql.hpp
+++ b/include/boost/mysql/detail/format_sql.hpp
@@ -10,11 +10,12 @@
 
 #include <boost/mysql/constant_string_view.hpp>
 #include <boost/mysql/field_view.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/writable_field_traits.hpp>
 
 #include <iterator>
+#include <span>
+#include <string_view>
 #include <type_traits>
 #include <utility>
 
@@ -149,7 +150,11 @@ template <class T>
 formattable_ref_impl make_formattable_ref(T&& v);
 
 BOOST_MYSQL_DECL
-void vformat_sql_to(format_context_base& ctx, constant_string_view format_str, span<const format_arg> args);
+void vformat_sql_to(
+    format_context_base& ctx,
+    constant_string_view format_str,
+    std::span<const format_arg> args
+);
 
 }  // namespace detail
 }  // namespace mysql
diff --git a/include/boost/mysql/detail/next_action.hpp b/include/boost/mysql/detail/next_action.hpp
index fb214111e..6c246c383 100644
--- a/include/boost/mysql/detail/next_action.hpp
+++ b/include/boost/mysql/detail/next_action.hpp
@@ -8,12 +8,14 @@
 #ifndef BOOST_MYSQL_DETAIL_NEXT_ACTION_HPP
 #define BOOST_MYSQL_DETAIL_NEXT_ACTION_HPP
 
+#include <boost/mysql/any_address.hpp>
 #include <boost/mysql/error_code.hpp>
 
 #include <boost/assert.hpp>
-#include <boost/core/span.hpp>
+#include <span>
 
 #include <cstdint>
+#include <span>
 
 namespace boost {
 namespace mysql {
@@ -35,13 +37,13 @@ class next_action
 public:
     struct read_args_t
     {
-        span<std::uint8_t> buffer;
+        std::span<std::uint8_t> buffer;
         bool use_ssl;
     };
 
     struct write_args_t
     {
-        span<const std::uint8_t> buffer;
+        std::span<const std::uint8_t> buffer;
         bool use_ssl;
     };
 
@@ -58,7 +60,7 @@ class next_action
         BOOST_ASSERT(is_done());
         return data_.ec;
     }
-    const void* connect_endpoint() const noexcept { return data_.connect_endpoint; }
+    const any_address& connect_endpoint() const noexcept { return *data_.connect_endpoint; }
     read_args_t read_args() const noexcept
     {
         BOOST_ASSERT(type_ == next_action_type::read);
@@ -70,7 +72,7 @@ class next_action
         return data_.write_args;
     }
 
-    static next_action connect(const void* endpoint) noexcept
+    static next_action connect(const any_address* endpoint) noexcept
     {
         return next_action(next_action_type::connect, endpoint);
     }
@@ -94,12 +96,12 @@ class next_action
     union data_t
     {
         error_code ec;
-        const void* connect_endpoint;
+        const any_address* connect_endpoint;
         read_args_t read_args;
         write_args_t write_args;
 
         data_t() noexcept : ec(error_code()) {}
-        data_t(const void* endpoint) noexcept : connect_endpoint(endpoint) {}
+        data_t(const any_address* endpoint) noexcept : connect_endpoint(endpoint) {}
         data_t(error_code ec) noexcept : ec(ec) {}
         data_t(read_args_t args) noexcept : read_args(args) {}
         data_t(write_args_t args) noexcept : write_args(args) {}
diff --git a/include/boost/mysql/detail/ok_view.hpp b/include/boost/mysql/detail/ok_view.hpp
index b97c1ca23..8b48fe634 100644
--- a/include/boost/mysql/detail/ok_view.hpp
+++ b/include/boost/mysql/detail/ok_view.hpp
@@ -8,11 +8,10 @@
 #ifndef BOOST_MYSQL_DETAIL_OK_VIEW_HPP
 #define BOOST_MYSQL_DETAIL_OK_VIEW_HPP
 
-#include <boost/mysql/string_view.hpp>
-
 #include <boost/mysql/detail/flags.hpp>
 
 #include <cstdint>
+#include <string_view>
 
 namespace boost {
 namespace mysql {
@@ -24,7 +23,7 @@ struct ok_view
     std::uint64_t last_insert_id;
     std::uint16_t status_flags;
     std::uint16_t warnings;
-    string_view info;
+    std::string_view info;
 
     bool more_results() const noexcept { return status_flags & status_flags::more_results; }
     bool backslash_escapes() const noexcept { return !(status_flags & status_flags::no_backslash_escapes); }
diff --git a/include/boost/mysql/detail/output_string.hpp b/include/boost/mysql/detail/output_string.hpp
index b9d675bf0..e15d1adf9 100644
--- a/include/boost/mysql/detail/output_string.hpp
+++ b/include/boost/mysql/detail/output_string.hpp
@@ -8,11 +8,10 @@
 #ifndef BOOST_MYSQL_DETAIL_OUTPUT_STRING_HPP
 #define BOOST_MYSQL_DETAIL_OUTPUT_STRING_HPP
 
-#include <boost/mysql/string_view.hpp>
-
 #include <boost/mysql/detail/config.hpp>
 
 #include <cstddef>
+#include <string_view>
 
 #ifdef BOOST_MYSQL_HAS_CONCEPTS
 #include <concepts>
@@ -63,7 +62,7 @@ class output_string_ref
         return output_string_ref(&do_append<T>, &obj);
     }
 
-    void append(string_view data)
+    void append(std::string_view data)
     {
         if (data.size() > 0u)
             append_fn_(container_, data.data(), data.size());
diff --git a/include/boost/mysql/detail/row_impl.hpp b/include/boost/mysql/detail/row_impl.hpp
index ab1a8eb52..d48ad7a12 100644
--- a/include/boost/mysql/detail/row_impl.hpp
+++ b/include/boost/mysql/detail/row_impl.hpp
@@ -12,7 +12,7 @@
 
 #include <boost/mysql/detail/config.hpp>
 
-#include <boost/core/span.hpp>
+#include <span>
 
 #include <cstddef>
 #include <vector>
@@ -23,11 +23,11 @@ namespace detail {
 
 // Adds num_fields default-constructed fields to the vector, return pointer to the first
 // allocated value. Used to allocate fields before deserialization
-inline span<field_view> add_fields(std::vector<field_view>& storage, std::size_t num_fields)
+inline std::span<field_view> add_fields(std::vector<field_view>& storage, std::size_t num_fields)
 {
     std::size_t old_size = storage.size();
     storage.resize(old_size + num_fields);
-    return span<field_view>(storage.data() + old_size, num_fields);
+    return std::span<field_view>(storage.data() + old_size, num_fields);
 }
 
 // A field_view vector with strings pointing into a
@@ -58,7 +58,7 @@ class row_impl
     void assign(const field_view* fields, std::size_t size);
 
     // Adds new default constructed fields to provide storage to deserialization
-    span<field_view> add_fields(std::size_t num_fields)
+    std::span<field_view> add_fields(std::size_t num_fields)
     {
         return ::boost::mysql::detail::add_fields(fields_, num_fields);
     }
@@ -88,8 +88,5 @@ class row_impl
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/row_impl.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/detail/string_view_offset.hpp b/include/boost/mysql/detail/string_view_offset.hpp
index b84d6b148..f7a81156e 100644
--- a/include/boost/mysql/detail/string_view_offset.hpp
+++ b/include/boost/mysql/detail/string_view_offset.hpp
@@ -14,7 +14,7 @@ namespace boost {
 namespace mysql {
 namespace detail {
 
-// Represents a string_view using offsets into a buffer.
+// Represents a std::string_view using offsets into a buffer.
 // Useful during deserialization, for buffers that may reallocate.
 struct string_view_offset
 {
diff --git a/include/boost/mysql/detail/typing/meta_check_context.hpp b/include/boost/mysql/detail/typing/meta_check_context.hpp
index 880bd9b6c..00e37276b 100644
--- a/include/boost/mysql/detail/typing/meta_check_context.hpp
+++ b/include/boost/mysql/detail/typing/meta_check_context.hpp
@@ -14,7 +14,6 @@
 #include <boost/mysql/error_code.hpp>
 #include <boost/mysql/metadata.hpp>
 #include <boost/mysql/metadata_collection_view.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/access.hpp>
 #include <boost/mysql/detail/config.hpp>
@@ -22,6 +21,7 @@
 
 #include <memory>
 #include <sstream>
+#include <string_view>
 
 namespace boost {
 namespace mysql {
@@ -63,7 +63,7 @@ class meta_check_context
 {
     std::unique_ptr<std::ostringstream> errors_;
     std::size_t current_index_{};
-    span<const std::size_t> pos_map_;
+    std::span<const std::size_t> pos_map_;
     name_table_t name_table_;
     metadata_collection_view meta_{};
     bool nullability_checked_{};
@@ -87,7 +87,7 @@ class meta_check_context
 
 public:
     meta_check_context(
-        span<const std::size_t> pos_map,
+        std::span<const std::size_t> pos_map,
         name_table_t name_table,
         metadata_collection_view meta
     ) noexcept
@@ -128,8 +128,5 @@ class meta_check_context
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/meta_check_context.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/detail/typing/pos_map.hpp b/include/boost/mysql/detail/typing/pos_map.hpp
index 8fcb3702c..ccdaa7e50 100644
--- a/include/boost/mysql/detail/typing/pos_map.hpp
+++ b/include/boost/mysql/detail/typing/pos_map.hpp
@@ -11,13 +11,13 @@
 #include <boost/mysql/field_view.hpp>
 #include <boost/mysql/metadata.hpp>
 #include <boost/mysql/metadata_collection_view.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
-#include <boost/core/span.hpp>
 
 #include <cstddef>
+#include <span>
+#include <string_view>
 
 namespace boost {
 namespace mysql {
@@ -26,21 +26,21 @@ namespace detail {
 // These functions map C++ type positions to positions to positions in the DB query
 
 BOOST_INLINE_CONSTEXPR std::size_t pos_absent = static_cast<std::size_t>(-1);
-using name_table_t = boost::span<const string_view>;
+using name_table_t = std::span<const std::string_view>;
 
 inline bool has_field_names(name_table_t name_table) noexcept { return !name_table.empty(); }
 
-inline void pos_map_reset(span<std::size_t> self) noexcept
+inline void pos_map_reset(std::span<std::size_t> self) noexcept
 {
     for (std::size_t i = 0; i < self.size(); ++i)
         self.data()[i] = pos_absent;
 }
 
 inline void pos_map_add_field(
-    span<std::size_t> self,
+    std::span<std::size_t> self,
     name_table_t name_table,
     std::size_t db_index,
-    string_view field_name
+    std::string_view field_name
 ) noexcept
 {
     if (has_field_names(name_table))
@@ -67,9 +67,9 @@ inline void pos_map_add_field(
 }
 
 inline field_view map_field_view(
-    span<const std::size_t> self,
+    std::span<const std::size_t> self,
     std::size_t cpp_index,
-    span<const field_view> array
+    std::span<const field_view> array
 ) noexcept
 {
     BOOST_ASSERT(cpp_index < self.size());
@@ -77,7 +77,7 @@ inline field_view map_field_view(
 }
 
 inline const metadata& map_metadata(
-    span<const std::size_t> self,
+    std::span<const std::size_t> self,
     std::size_t cpp_index,
     metadata_collection_view meta
 ) noexcept
diff --git a/include/boost/mysql/detail/typing/readable_field_traits.hpp b/include/boost/mysql/detail/typing/readable_field_traits.hpp
index dc2467028..4df6ccb9d 100644
--- a/include/boost/mysql/detail/typing/readable_field_traits.hpp
+++ b/include/boost/mysql/detail/typing/readable_field_traits.hpp
@@ -17,7 +17,6 @@
 #include <boost/mysql/field_view.hpp>
 #include <boost/mysql/metadata.hpp>
 #include <boost/mysql/metadata_collection_view.hpp>
-#include <boost/mysql/string_view.hpp>
 #include <boost/mysql/time.hpp>
 
 #include <boost/mysql/detail/config.hpp>
@@ -31,6 +30,7 @@
 #include <cstdint>
 #include <limits>
 #include <string>
+#include <string_view>
 #include <type_traits>
 
 namespace boost {
diff --git a/include/boost/mysql/detail/typing/row_traits.hpp b/include/boost/mysql/detail/typing/row_traits.hpp
index 232ecd238..6a7cb2d05 100644
--- a/include/boost/mysql/detail/typing/row_traits.hpp
+++ b/include/boost/mysql/detail/typing/row_traits.hpp
@@ -18,7 +18,6 @@
 #include <boost/mysql/field_view.hpp>
 #include <boost/mysql/metadata.hpp>
 #include <boost/mysql/metadata_collection_view.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/config.hpp>
 #include <boost/mysql/detail/typing/meta_check_context.hpp>
@@ -32,6 +31,7 @@
 #include <boost/mp11/utility.hpp>
 
 #include <cstddef>
+#include <string_view>
 #include <tuple>
 #include <type_traits>
 #include <utility>
@@ -75,7 +75,7 @@ struct array_wrapper
 {
     T data_[N];
 
-    constexpr boost::span<const T> span() const noexcept { return boost::span<const T>(data_); }
+    constexpr std::span<const T> span() const noexcept { return std::span<const T>(data_); }
 };
 
 template <class T>
@@ -85,7 +85,7 @@ struct array_wrapper<T, 0>
     {
     } data_;  // allow empty brace initialization
 
-    constexpr boost::span<const T> span() const noexcept { return boost::span<const T>(); }
+    constexpr std::span<const T> span() const noexcept { return std::span<const T>(); }
 };
 
 // Workaround for char_traits::length not being constexpr in C++14
@@ -103,10 +103,11 @@ using row_members = describe::
     describe_members<DescribeStruct, describe::mod_public | describe::mod_inherited>;
 
 template <template <class...> class ListType, class... MemberDescriptor>
-constexpr array_wrapper<string_view, sizeof...(MemberDescriptor)> get_describe_names(ListType<
-                                                                                     MemberDescriptor...>)
+constexpr array_wrapper<std::string_view, sizeof...(MemberDescriptor)> get_describe_names(
+    ListType<MemberDescriptor...>
+)
 {
-    return {{string_view(MemberDescriptor::name, get_length(MemberDescriptor::name))...}};
+    return {{std::string_view(MemberDescriptor::name, get_length(MemberDescriptor::name))...}};
 }
 
 template <class DescribeStruct>
@@ -205,7 +206,7 @@ struct meta_check_field_fn
 template <class ReadableFieldList>
 error_code meta_check_impl(
     name_table_t name_table,
-    span<const std::size_t> pos_map,
+    std::span<const std::size_t> pos_map,
     metadata_collection_view meta,
     diagnostics& diag
 )
@@ -219,13 +220,13 @@ error_code meta_check_impl(
 // Parsing
 class parse_context
 {
-    span<const std::size_t> pos_map_;
-    span<const field_view> fields_;
+    std::span<const std::size_t> pos_map_;
+    std::span<const field_view> fields_;
     std::size_t index_{};
     error_code ec_;
 
 public:
-    parse_context(span<const std::size_t> pos_map, span<const field_view> fields) noexcept
+    parse_context(std::span<const std::size_t> pos_map, std::span<const field_view> fields) noexcept
         : pos_map_(pos_map), fields_(fields)
     {
     }
@@ -294,7 +295,7 @@ constexpr name_table_t get_row_name_table() noexcept
 }
 
 template <BOOST_MYSQL_STATIC_ROW StaticRow>
-error_code meta_check(span<const std::size_t> pos_map, metadata_collection_view meta, diagnostics& diag)
+error_code meta_check(std::span<const std::size_t> pos_map, metadata_collection_view meta, diagnostics& diag)
 {
     using field_types = typename row_traits_with_check<StaticRow>::field_types;
     BOOST_ASSERT(pos_map.size() == get_row_size<StaticRow>());
@@ -303,8 +304,8 @@ error_code meta_check(span<const std::size_t> pos_map, metadata_collection_view
 
 template <BOOST_MYSQL_STATIC_ROW StaticRow>
 error_code parse(
-    span<const std::size_t> pos_map,
-    span<const field_view> from,
+    std::span<const std::size_t> pos_map,
+    std::span<const field_view> from,
     underlying_row_t<StaticRow>& to
 )
 {
@@ -316,7 +317,7 @@ error_code parse(
 }
 
 using meta_check_fn_t =
-    error_code (*)(span<const std::size_t> field_map, metadata_collection_view meta, diagnostics& diag);
+    error_code (*)(std::span<const std::size_t> field_map, metadata_collection_view meta, diagnostics& diag);
 
 // For multi-resultset
 template <class... StaticRow>
diff --git a/include/boost/mysql/diagnostics.hpp b/include/boost/mysql/diagnostics.hpp
index 733d8c469..70318dc5d 100644
--- a/include/boost/mysql/diagnostics.hpp
+++ b/include/boost/mysql/diagnostics.hpp
@@ -8,11 +8,10 @@
 #ifndef BOOST_MYSQL_DIAGNOSTICS_HPP
 #define BOOST_MYSQL_DIAGNOSTICS_HPP
 
-#include <boost/mysql/string_view.hpp>
-
 #include <boost/mysql/detail/access.hpp>
 
 #include <string>
+#include <string_view>
 
 namespace boost {
 namespace mysql {
@@ -48,9 +47,9 @@ class diagnostics
      * The returned view is valid as long as `*this` is alive, hasn't been assigned-to
      * or moved-from, and \ref clear hasn't been called. Moving `*this` invalidates the view.
      */
-    string_view client_message() const noexcept
+    std::string_view client_message() const noexcept
     {
-        return impl_.is_server ? string_view() : string_view(impl_.msg);
+        return impl_.is_server ? std::string_view() : std::string_view(impl_.msg);
     }
 
     /**
@@ -66,9 +65,9 @@ class diagnostics
      * The returned view is valid as long as `*this` is alive, hasn't been assigned-to
      * or moved-from, and \ref clear hasn't been called. Moving `*this` invalidates the view.
      */
-    string_view server_message() const noexcept
+    std::string_view server_message() const noexcept
     {
-        return impl_.is_server ? string_view(impl_.msg) : string_view();
+        return impl_.is_server ? std::string_view(impl_.msg) : std::string_view();
     }
 
     /**
diff --git a/include/boost/mysql/error_categories.hpp b/include/boost/mysql/error_categories.hpp
index d2b859221..380467868 100644
--- a/include/boost/mysql/error_categories.hpp
+++ b/include/boost/mysql/error_categories.hpp
@@ -78,8 +78,5 @@ const boost::system::error_category& get_mariadb_server_category() noexcept;
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/error_categories.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/error_with_diagnostics.hpp b/include/boost/mysql/error_with_diagnostics.hpp
index cc308cb03..fc5bd3720 100644
--- a/include/boost/mysql/error_with_diagnostics.hpp
+++ b/include/boost/mysql/error_with_diagnostics.hpp
@@ -29,7 +29,7 @@ class error_with_diagnostics : public system::system_error
     static system::system_error create_base(const error_code& err, const diagnostics& diag)
     {
         return diag.client_message().empty() ? system::system_error(err)
-                                             : system::system_error(err, diag.client_message());
+                                             : system::system_error(err, std::string(diag.client_message()));
     }
 
 public:
diff --git a/include/boost/mysql/escape_string.hpp b/include/boost/mysql/escape_string.hpp
index 41dee3060..3e3693501 100644
--- a/include/boost/mysql/escape_string.hpp
+++ b/include/boost/mysql/escape_string.hpp
@@ -9,13 +9,14 @@
 #define BOOST_MYSQL_ESCAPE_STRING_HPP
 
 #include <boost/mysql/error_code.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/escape_string.hpp>
 #include <boost/mysql/detail/output_string.hpp>
 
 #include <boost/config.hpp>
 
+#include <string_view>
+
 namespace boost {
 namespace mysql {
 
@@ -89,8 +90,12 @@ enum class quoting_context : char
  *      that is not valid according to `opts.charset`.
  */
 template <BOOST_MYSQL_OUTPUT_STRING OutputString>
-BOOST_ATTRIBUTE_NODISCARD error_code
-escape_string(string_view input, const format_options& opts, quoting_context quot_ctx, OutputString& output)
+BOOST_ATTRIBUTE_NODISCARD error_code escape_string(
+    std::string_view input,
+    const format_options& opts,
+    quoting_context quot_ctx,
+    OutputString& output
+)
 {
     output.clear();
     return detail::escape_string(
diff --git a/include/boost/mysql/execution_state.hpp b/include/boost/mysql/execution_state.hpp
index f5e17f4e4..3501b8fbe 100644
--- a/include/boost/mysql/execution_state.hpp
+++ b/include/boost/mysql/execution_state.hpp
@@ -9,13 +9,13 @@
 #define BOOST_MYSQL_EXECUTION_STATE_HPP
 
 #include <boost/mysql/metadata_collection_view.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/access.hpp>
 #include <boost/mysql/detail/execution_processor/execution_state_impl.hpp>
 
 #include <cstddef>
 #include <cstdint>
+#include <string_view>
 
 namespace boost {
 namespace mysql {
@@ -198,7 +198,7 @@ class execution_state
      * memory owned by `*this`, and will be valid as long as `*this` or an object move-constructed
      * from `*this` are alive.
      */
-    string_view info() const noexcept { return impl_.get_info(); }
+    std::string_view info() const noexcept { return impl_.get_info(); }
 
     /**
      * \brief Returns whether the current resultset represents a procedure OUT params.
diff --git a/include/boost/mysql/field.hpp b/include/boost/mysql/field.hpp
index acad94e24..6b8fd7278 100644
--- a/include/boost/mysql/field.hpp
+++ b/include/boost/mysql/field.hpp
@@ -11,7 +11,6 @@
 #include <boost/mysql/blob.hpp>
 #include <boost/mysql/field_kind.hpp>
 #include <boost/mysql/field_view.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/config.hpp>
 #include <boost/mysql/detail/field_impl.hpp>
@@ -22,6 +21,7 @@
 #include <cstddef>
 #include <iosfwd>
 #include <string>
+#include <string_view>
 #ifndef BOOST_NO_CXX17_HDR_STRING_VIEW
 #include <string_view>
 #endif
@@ -102,7 +102,7 @@ class field
      * \brief Constructs a `field` holding NULL.
      * \details
      * Caution: `field(NULL)` will __NOT__ match this overload. It will try to construct
-     * a `string_view` from a NULL C string, causing undefined behavior.
+     * a `std::string_view` from a NULL C string, causing undefined behavior.
      *
      * \par Exception safety
      * No-throw guarantee.
@@ -167,13 +167,6 @@ class field
     explicit field(char8_t) = delete;
 #endif
 
-    /**
-     * \brief Constructs a `field` holding a string.
-     * \par Exception safety
-     * Strong guarantee. Internal allocations may throw.
-     */
-    explicit field(const std::string& v) : repr_(v) {}
-
     /**
      * \brief Constructs a `field` holding a string.
      * \details v is moved into an internal `std::string` object.
@@ -182,16 +175,8 @@ class field
      */
     explicit field(std::string&& v) noexcept : repr_(std::move(v)) {}
 
-    /// \copydoc field(const std::string&)
-    explicit field(const char* v) : repr_(boost::variant2::in_place_type_t<std::string>(), v) {}
-
-    /// \copydoc field(const std::string&)
-    explicit field(string_view v) : repr_(boost::variant2::in_place_type_t<std::string>(), v) {}
-
-#ifndef BOOST_NO_CXX17_HDR_STRING_VIEW
     /// \copydoc field(const std::string&)
     explicit field(std::string_view v) : repr_(boost::variant2::in_place_type_t<std::string>(), v) {}
-#endif
 
     /**
      * \brief Constructs a `field` holding a `blob`.
@@ -386,41 +371,18 @@ class field
      * Invalidates references obtained by as_xxx and get_xxx functions,
      * but not the ones obtained by \ref field::operator field_view().
      */
-    field& operator=(const std::string& v)
-    {
-        repr_.data.emplace<std::string>(v);
-        return *this;
-    }
-
-    /// \copydoc operator=(const std::string&)
     field& operator=(std::string&& v)
     {
         repr_.data.emplace<std::string>(std::move(v));
         return *this;
     }
 
-    /// \copydoc operator=(const std::string&)
-    field& operator=(const char* v)
-    {
-        repr_.data.emplace<std::string>(v);
-        return *this;
-    }
-
-    /// \copydoc operator=(const std::string&)
-    field& operator=(string_view v)
-    {
-        repr_.data.emplace<std::string>(v);
-        return *this;
-    }
-
-#ifndef BOOST_NO_CXX17_HDR_STRING_VIEW
     /// \copydoc operator=(const std::string&)
     field& operator=(std::string_view v)
     {
         repr_.data.emplace<std::string>(v);
         return *this;
     }
-#endif
 
     /**
      * \brief Replaces `*this` with `v`, changing the kind to `blob` and destroying any
@@ -993,8 +955,5 @@ std::ostream& operator<<(std::ostream& os, const field& v);
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/field.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/field_kind.hpp b/include/boost/mysql/field_kind.hpp
index a97a2608e..4b8cce6f1 100644
--- a/include/boost/mysql/field_kind.hpp
+++ b/include/boost/mysql/field_kind.hpp
@@ -68,8 +68,5 @@ std::ostream& operator<<(std::ostream& os, field_kind v);
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/field_kind.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/field_view.hpp b/include/boost/mysql/field_view.hpp
index 07bb02de0..e12fdd721 100644
--- a/include/boost/mysql/field_view.hpp
+++ b/include/boost/mysql/field_view.hpp
@@ -12,7 +12,6 @@
 #include <boost/mysql/date.hpp>
 #include <boost/mysql/datetime.hpp>
 #include <boost/mysql/field_kind.hpp>
-#include <boost/mysql/string_view.hpp>
 #include <boost/mysql/time.hpp>
 
 #include <boost/mysql/detail/access.hpp>
@@ -25,6 +24,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <iosfwd>
+#include <string_view>
 
 namespace boost {
 namespace mysql {
@@ -53,8 +53,8 @@ namespace mysql {
  *     `field` is.
  * \li If it was created from a scalar (null, integral, floating point, date, datetime or time), the
  *     `field_view` has value semnatics and will always be valid.
- * \li If it was created from a string or blob type, the `field_view` acts as a `string_view` or `blob_view`,
- *     and will be valid as long as the original string/blob is.
+ * \li If it was created from a string or blob type, the `field_view` acts as a `std::string_view` or
+ * `blob_view`, and will be valid as long as the original string/blob is.
  * \n
  * Calling any member function on a `field_view` that has been invalidated results in undefined
  * behavior.
@@ -76,7 +76,7 @@ class field_view
      * \brief Constructs a `field_view` holding NULL.
      * \details
      * Caution: `field_view(NULL)` will <b>not</b> match this overload. It will try to construct
-     * a `string_view` from a NULL C string, causing undefined behavior.
+     * a `std::string_view` from a NULL C string, causing undefined behavior.
      *
      * \par Exception safety
      * No-throw guarantee.
@@ -157,9 +157,9 @@ class field_view
      *
      * \par Object lifetimes
      * Results in a `field_view` with reference semantics. It will
-     * be valid as long as the character buffer the `string_view` points to is valid.
+     * be valid as long as the character buffer the `std::string_view` points to is valid.
      */
-    BOOST_CXX14_CONSTEXPR explicit field_view(string_view v) noexcept : impl_{v} {}
+    BOOST_CXX14_CONSTEXPR explicit field_view(std::string_view v) noexcept : impl_{v} {}
 
     /**
      * \brief Constructs a `field_view` holding a blob.
@@ -323,7 +323,7 @@ class field_view
      * \par Object lifetimes
      * The returned view has the same lifetime rules as `*this` (it's valid as long as `*this` is valid).
      */
-    BOOST_CXX14_CONSTEXPR inline string_view as_string() const;
+    BOOST_CXX14_CONSTEXPR inline std::string_view as_string() const;
 
     /**
      * \brief Retrieves the underlying value as a blob or throws an exception.
@@ -412,9 +412,10 @@ class field_view
      * \par Object lifetimes
      * The returned view has the same lifetime rules as `*this` (it's valid as long as `*this` is valid).
      */
-    BOOST_CXX14_CONSTEXPR inline string_view get_string() const noexcept
+    BOOST_CXX14_CONSTEXPR inline std::string_view get_string() const noexcept
     {
-        return is_field_ptr() ? string_view(impl_.repr.field_ptr->get<std::string>()) : impl_.repr.string;
+        return is_field_ptr() ? std::string_view(impl_.repr.field_ptr->get<std::string>())
+                              : impl_.repr.string;
     }
 
     /**
@@ -547,7 +548,7 @@ class field_view
     {
         std::int64_t int64;
         std::uint64_t uint64;
-        string_view string;
+        std::string_view string;
         blob_view blob;
         float float_;
         double double_;
@@ -560,7 +561,7 @@ class field_view
         BOOST_CXX14_CONSTEXPR repr_t() noexcept : int64{} {}
         BOOST_CXX14_CONSTEXPR repr_t(std::int64_t v) noexcept : int64(v) {}
         BOOST_CXX14_CONSTEXPR repr_t(std::uint64_t v) noexcept : uint64(v) {}
-        BOOST_CXX14_CONSTEXPR repr_t(string_view v) noexcept : string{v} {}
+        BOOST_CXX14_CONSTEXPR repr_t(std::string_view v) noexcept : string{v} {}
         BOOST_CXX14_CONSTEXPR repr_t(blob_view v) noexcept : blob{v} {}
         BOOST_CXX14_CONSTEXPR repr_t(float v) noexcept : float_(v) {}
         BOOST_CXX14_CONSTEXPR repr_t(double v) noexcept : double_(v) {}
@@ -583,7 +584,7 @@ class field_view
         BOOST_CXX14_CONSTEXPR impl_t() = default;
         BOOST_CXX14_CONSTEXPR impl_t(std::int64_t v) noexcept : ikind(internal_kind::int64), repr(v) {}
         BOOST_CXX14_CONSTEXPR impl_t(std::uint64_t v) noexcept : ikind(internal_kind::uint64), repr(v) {}
-        BOOST_CXX14_CONSTEXPR impl_t(string_view v) noexcept : ikind(internal_kind::string), repr{v} {}
+        BOOST_CXX14_CONSTEXPR impl_t(std::string_view v) noexcept : ikind(internal_kind::string), repr{v} {}
         BOOST_CXX14_CONSTEXPR impl_t(blob_view v) noexcept : ikind(internal_kind::blob), repr{v} {}
         BOOST_CXX14_CONSTEXPR impl_t(float v) noexcept : ikind(internal_kind::float_), repr(v) {}
         BOOST_CXX14_CONSTEXPR impl_t(double v) noexcept : ikind(internal_kind::double_), repr(v) {}
@@ -625,8 +626,5 @@ std::ostream& operator<<(std::ostream& os, const field_view& v);
 }  // namespace boost
 
 #include <boost/mysql/impl/field_view.hpp>
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/field_view.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/format_sql.hpp b/include/boost/mysql/format_sql.hpp
index b4cb6f9bd..adf2c2505 100644
--- a/include/boost/mysql/format_sql.hpp
+++ b/include/boost/mysql/format_sql.hpp
@@ -11,7 +11,6 @@
 #include <boost/mysql/character_set.hpp>
 #include <boost/mysql/constant_string_view.hpp>
 #include <boost/mysql/error_code.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/access.hpp>
 #include <boost/mysql/detail/config.hpp>
@@ -19,11 +18,11 @@
 #include <boost/mysql/detail/output_string.hpp>
 
 #include <boost/config.hpp>
-#include <boost/core/span.hpp>
 #include <boost/system/result.hpp>
 
 #include <initializer_list>
 #include <string>
+#include <string_view>
 #include <type_traits>
 #include <utility>
 
@@ -147,7 +146,7 @@ class format_arg
 #ifndef BOOST_MYSQL_DOXYGEN
     struct
     {
-        string_view name;
+        std::string_view name;
         detail::formattable_ref_impl value;
     } impl_;
 
@@ -166,7 +165,7 @@ class format_arg
      * \par Object lifetimes
      * Both `name` and `value` are stored as views.
      */
-    format_arg(string_view name, formattable_ref value) noexcept
+    format_arg(std::string_view name, formattable_ref value) noexcept
         : impl_{name, detail::access::get_impl(value)}
     {
     }
@@ -204,7 +203,7 @@ class format_context_base
     friend class detail::format_state;
 #endif
 
-    BOOST_MYSQL_DECL void format_arg(detail::formattable_ref_impl arg, string_view format_spec);
+    BOOST_MYSQL_DECL void format_arg(detail::formattable_ref_impl arg, std::string_view format_spec);
 
 protected:
     format_context_base(detail::output_string_ref out, format_options opts, error_code ec = {}) noexcept
@@ -270,7 +269,7 @@ class format_context_base
      */
     format_context_base& append_value(
         formattable_ref value,
-        constant_string_view format_specifiers = string_view()
+        constant_string_view format_specifiers = std::string_view()
     )
     {
         format_arg(detail::access::get_impl(value), format_specifiers.get());
@@ -489,7 +488,7 @@ template <BOOST_MYSQL_FORMATTABLE... Formattable>
 void format_sql_to(format_context_base& ctx, constant_string_view format_str, Formattable&&... args)
 {
     std::initializer_list<format_arg> args_il{
-        {string_view(), std::forward<Formattable>(args)}
+        {std::string_view(), std::forward<Formattable>(args)}
         ...
     };
     detail::vformat_sql_to(ctx, format_str, args_il);
@@ -562,8 +561,5 @@ std::string format_sql(
 }  // namespace boost
 
 #include <boost/mysql/impl/format_sql.hpp>
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/format_sql.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/handshake_params.hpp b/include/boost/mysql/handshake_params.hpp
index df7118086..f46d1845b 100644
--- a/include/boost/mysql/handshake_params.hpp
+++ b/include/boost/mysql/handshake_params.hpp
@@ -10,9 +10,9 @@
 
 #include <boost/mysql/buffer_params.hpp>
 #include <boost/mysql/ssl_mode.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <cstdint>
+#include <string_view>
 
 namespace boost {
 namespace mysql {
@@ -31,9 +31,9 @@ namespace mysql {
  */
 class handshake_params
 {
-    string_view username_;
-    string_view password_;
-    string_view database_;
+    std::string_view username_;
+    std::string_view password_;
+    std::string_view database_;
     std::uint16_t connection_collation_;
     ssl_mode ssl_;
     bool multi_queries_;
@@ -59,9 +59,9 @@ class handshake_params
      * queries using \ref connection::execute and \ref connection::start_execution. Disabled by default.
      */
     handshake_params(
-        string_view username,
-        string_view password,
-        string_view db = "",
+        std::string_view username,
+        std::string_view password,
+        std::string_view db = "",
         std::uint16_t connection_col = default_collation,
         ssl_mode mode = ssl_mode::require,
         bool multi_queries = false
@@ -80,42 +80,42 @@ class handshake_params
      * \par Exception safety
      * No-throw guarantee.
      */
-    string_view username() const noexcept { return username_; }
+    std::string_view username() const noexcept { return username_; }
 
     /**
      * \brief Sets the username.
      * \par Exception safety
      * No-throw guarantee.
      */
-    void set_username(string_view value) noexcept { username_ = value; }
+    void set_username(std::string_view value) noexcept { username_ = value; }
 
     /**
      * \brief Retrieves the password.
      * \par Exception safety
      * No-throw guarantee.
      */
-    string_view password() const noexcept { return password_; }
+    std::string_view password() const noexcept { return password_; }
 
     /**
      * \brief Sets the password.
      * \par Exception safety
      * No-throw guarantee.
      */
-    void set_password(string_view value) noexcept { password_ = value; }
+    void set_password(std::string_view value) noexcept { password_ = value; }
 
     /**
      * \brief Retrieves the database name to use when connecting.
      * \par Exception safety
      * No-throw guarantee.
      */
-    string_view database() const noexcept { return database_; }
+    std::string_view database() const noexcept { return database_; }
 
     /**
      * \brief Sets the database name to use when connecting.
      * \par Exception safety
      * No-throw guarantee.
      */
-    void set_database(string_view value) noexcept { database_ = value; }
+    void set_database(std::string_view value) noexcept { database_ = value; }
 
     /**
      * \brief Retrieves the connection collation.
diff --git a/include/boost/mysql/impl/any_connection.ipp b/include/boost/mysql/impl/any_connection.ipp
deleted file mode 100644
index 89c4942d5..000000000
--- a/include/boost/mysql/impl/any_connection.ipp
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_IMPL_ANY_CONNECTION_IPP
-#define BOOST_MYSQL_IMPL_ANY_CONNECTION_IPP
-
-#pragma once
-
-#include <boost/mysql/any_connection.hpp>
-
-#include <boost/mysql/detail/engine.hpp>
-#include <boost/mysql/detail/engine_impl.hpp>
-
-#include <boost/mysql/impl/internal/variant_stream.hpp>
-
-std::unique_ptr<boost::mysql::detail::engine> boost::mysql::any_connection::create_engine(
-    asio::any_io_executor ex,
-    asio::ssl::context* ctx
-)
-{
-    return std::unique_ptr<detail::engine>(new detail::engine_impl<detail::variant_stream>(std::move(ex), ctx)
-    );
-}
-
-#endif
diff --git a/include/boost/mysql/impl/connection_impl.ipp b/include/boost/mysql/impl/connection_impl.ipp
deleted file mode 100644
index 81b362f4c..000000000
--- a/include/boost/mysql/impl/connection_impl.ipp
+++ /dev/null
@@ -1,167 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_IMPL_CONNECTION_IMPL_IPP
-#define BOOST_MYSQL_IMPL_CONNECTION_IMPL_IPP
-
-#pragma once
-
-#include <boost/mysql/character_set.hpp>
-#include <boost/mysql/diagnostics.hpp>
-#include <boost/mysql/pipeline.hpp>
-
-#include <boost/mysql/detail/connection_impl.hpp>
-
-#include <boost/mysql/impl/internal/sansio/connection_state.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-
-#include <boost/throw_exception.hpp>
-
-#include <cstddef>
-#include <stdexcept>
-
-namespace boost {
-namespace mysql {
-namespace detail {
-
-inline connection_state* new_connection_state(
-    std::size_t initial_buffer_size,
-    std::size_t max_buffer_size,
-    bool engine_supports_ssl
-)
-{
-    if (initial_buffer_size > max_buffer_size)
-    {
-        BOOST_THROW_EXCEPTION(std::invalid_argument(
-            "any_connection::any_connection: initial_buffer_size should be <= max_buffer_size"
-        ));
-    }
-    return new connection_state(initial_buffer_size, max_buffer_size, engine_supports_ssl);
-}
-
-}  // namespace detail
-}  // namespace mysql
-}  // namespace boost
-
-void boost::mysql::detail::connection_state_deleter::operator()(connection_state* st) const { delete st; }
-
-std::vector<boost::mysql::field_view>& boost::mysql::detail::get_shared_fields(connection_state& st)
-{
-    return st.data().shared_fields;
-}
-
-boost::mysql::detail::connection_impl::connection_impl(
-    std::size_t read_buff_size,
-    std::size_t max_buffer_size,
-    std::unique_ptr<engine> eng
-)
-    : engine_(std::move(eng)),
-      st_(new_connection_state(read_buff_size, max_buffer_size, engine_->supports_ssl()))
-{
-}
-
-boost::mysql::metadata_mode boost::mysql::detail::connection_impl::meta_mode() const
-{
-    return st_->data().meta_mode;
-}
-
-void boost::mysql::detail::connection_impl::set_meta_mode(metadata_mode v) { st_->data().meta_mode = v; }
-
-bool boost::mysql::detail::connection_impl::ssl_active() const { return st_->data().tls_active; }
-
-bool boost::mysql::detail::connection_impl::backslash_escapes() const
-{
-    return st_->data().backslash_escapes;
-}
-
-boost::mysql::diagnostics& boost::mysql::detail::connection_impl::shared_diag()
-{
-    return st_->data().shared_diag;
-}
-
-boost::system::result<boost::mysql::character_set> boost::mysql::detail::connection_impl::
-    current_character_set() const
-{
-    character_set charset = st_->data().current_charset;
-    if (charset.name == nullptr)
-        return client_errc::unknown_character_set;
-    return charset;
-}
-
-boost::optional<std::uint32_t> boost::mysql::detail::connection_impl::connection_id() const
-{
-    const auto& data = st_->data();
-    if (data.status == connection_status::not_connected)
-        return {};
-    else
-        return data.connection_id;
-}
-
-boost::mysql::detail::run_pipeline_algo_params boost::mysql::detail::connection_impl::make_params_pipeline(
-    const pipeline_request& req,
-    std::vector<stage_response>& response
-)
-{
-    const auto& req_impl = access::get_impl(req);
-    return {req_impl.buffer_, req_impl.stages_, &response};
-}
-
-template <class AlgoParams>
-boost::mysql::detail::any_resumable_ref boost::mysql::detail::setup(
-    connection_state& st,
-    diagnostics& diag,
-    const AlgoParams& params
-)
-{
-    return st.setup(diag, params);
-}
-
-template <class AlgoParams>
-typename AlgoParams::result_type boost::mysql::detail::get_result(const connection_state& st)
-{
-    return st.result<AlgoParams>();
-}
-
-#ifdef BOOST_MYSQL_SEPARATE_COMPILATION
-
-#define BOOST_MYSQL_INSTANTIATE_SETUP(op_params_type) \
-    template any_resumable_ref setup<op_params_type>(connection_state&, diagnostics&, const op_params_type&);
-
-#define BOOST_MYSQL_INSTANTIATE_GET_RESULT(op_params_type) \
-    template op_params_type::result_type get_result<op_params_type>(const connection_state&);
-
-namespace boost {
-namespace mysql {
-namespace detail {
-
-BOOST_MYSQL_INSTANTIATE_SETUP(connect_algo_params)
-BOOST_MYSQL_INSTANTIATE_SETUP(handshake_algo_params)
-BOOST_MYSQL_INSTANTIATE_SETUP(execute_algo_params)
-BOOST_MYSQL_INSTANTIATE_SETUP(start_execution_algo_params)
-BOOST_MYSQL_INSTANTIATE_SETUP(read_resultset_head_algo_params)
-BOOST_MYSQL_INSTANTIATE_SETUP(read_some_rows_algo_params)
-BOOST_MYSQL_INSTANTIATE_SETUP(read_some_rows_dynamic_algo_params)
-BOOST_MYSQL_INSTANTIATE_SETUP(prepare_statement_algo_params)
-BOOST_MYSQL_INSTANTIATE_SETUP(close_statement_algo_params)
-BOOST_MYSQL_INSTANTIATE_SETUP(set_character_set_algo_params)
-BOOST_MYSQL_INSTANTIATE_SETUP(ping_algo_params)
-BOOST_MYSQL_INSTANTIATE_SETUP(reset_connection_algo_params)
-BOOST_MYSQL_INSTANTIATE_SETUP(quit_connection_algo_params)
-BOOST_MYSQL_INSTANTIATE_SETUP(close_connection_algo_params)
-BOOST_MYSQL_INSTANTIATE_SETUP(run_pipeline_algo_params)
-
-BOOST_MYSQL_INSTANTIATE_GET_RESULT(read_some_rows_algo_params)
-BOOST_MYSQL_INSTANTIATE_GET_RESULT(read_some_rows_dynamic_algo_params)
-BOOST_MYSQL_INSTANTIATE_GET_RESULT(prepare_statement_algo_params)
-
-}  // namespace detail
-}  // namespace mysql
-}  // namespace boost
-
-#endif
-
-#endif
diff --git a/include/boost/mysql/impl/engine_impl_instantiations.ipp b/include/boost/mysql/impl/engine_impl_instantiations.ipp
deleted file mode 100644
index 475fbb039..000000000
--- a/include/boost/mysql/impl/engine_impl_instantiations.ipp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_IMPL_ENGINE_IMPL_INSTANTIATIONS_IPP
-#define BOOST_MYSQL_IMPL_ENGINE_IMPL_INSTANTIATIONS_IPP
-
-#pragma once
-
-#include <boost/mysql/detail/engine_stream_adaptor.hpp>
-
-// To be included only in src.hpp
-
-#ifdef BOOST_MYSQL_SEPARATE_COMPILATION
-template class boost::mysql::detail::engine_impl<
-    boost::mysql::detail::engine_stream_adaptor<boost::asio::ssl::stream<boost::asio::ip::tcp::socket>>>;
-template class boost::mysql::detail::engine_impl<
-    boost::mysql::detail::engine_stream_adaptor<boost::asio::ip::tcp::socket>>;
-#endif
-
-#endif
diff --git a/include/boost/mysql/impl/field_view.hpp b/include/boost/mysql/impl/field_view.hpp
index 91a0f4511..72f875cc1 100644
--- a/include/boost/mysql/impl/field_view.hpp
+++ b/include/boost/mysql/impl/field_view.hpp
@@ -70,7 +70,7 @@ BOOST_CXX14_CONSTEXPR std::uint64_t boost::mysql::field_view::as_uint64() const
     return impl_.repr.uint64;
 }
 
-BOOST_CXX14_CONSTEXPR boost::mysql::string_view boost::mysql::field_view::as_string() const
+BOOST_CXX14_CONSTEXPR std::string_view boost::mysql::field_view::as_string() const
 {
     if (is_field_ptr())
         return impl_.repr.field_ptr->as<std::string>();
diff --git a/include/boost/mysql/impl/format_sql.hpp b/include/boost/mysql/impl/format_sql.hpp
index ab9803471..a68ae5b30 100644
--- a/include/boost/mysql/impl/format_sql.hpp
+++ b/include/boost/mysql/impl/format_sql.hpp
@@ -21,7 +21,7 @@ namespace mysql {
 namespace detail {
 
 BOOST_MYSQL_DECL
-std::pair<bool, string_view> parse_range_specifiers(const char* spec_begin, const char* spec_end);
+std::pair<bool, std::string_view> parse_range_specifiers(const char* spec_begin, const char* spec_end);
 
 // To use with arguments with a custom formatter
 template <class T>
@@ -145,7 +145,7 @@ formattable_ref_impl make_formattable_ref_writable(
 {
     // Only string types (and not field_views or optionals) support the string specifiers
     return {
-        std::is_convertible<T, string_view>::value ? formattable_ref_impl::type_t::field_with_specs
+        std::is_convertible<T, std::string_view>::value ? formattable_ref_impl::type_t::field_with_specs
                                                    : formattable_ref_impl::type_t::field,
         to_field(v)
     };
@@ -182,7 +182,7 @@ std::string boost::mysql::format_sql(
 )
 {
     std::initializer_list<format_arg> args_il{
-        {string_view(), std::forward<Formattable>(args)}
+        {std::string_view(), std::forward<Formattable>(args)}
         ...
     };
     return format_sql(opts, format_str, args_il);
diff --git a/include/boost/mysql/impl/internal/variant_stream.hpp b/include/boost/mysql/impl/internal/variant_stream.hpp
deleted file mode 100644
index ea55db9de..000000000
--- a/include/boost/mysql/impl/internal/variant_stream.hpp
+++ /dev/null
@@ -1,386 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_IMPL_INTERNAL_VARIANT_STREAM_HPP
-#define BOOST_MYSQL_IMPL_INTERNAL_VARIANT_STREAM_HPP
-
-#include <boost/mysql/any_address.hpp>
-#include <boost/mysql/error_code.hpp>
-#include <boost/mysql/string_view.hpp>
-
-#include <boost/mysql/detail/access.hpp>
-
-#include <boost/mysql/impl/internal/coroutine.hpp>
-#include <boost/mysql/impl/internal/ssl_context_with_default.hpp>
-
-#include <boost/asio/any_io_executor.hpp>
-#include <boost/asio/associated_immediate_executor.hpp>
-#include <boost/asio/cancellation_type.hpp>
-#include <boost/asio/compose.hpp>
-#include <boost/asio/connect.hpp>
-#include <boost/asio/dispatch.hpp>
-#include <boost/asio/error.hpp>
-#include <boost/asio/generic/stream_protocol.hpp>
-#include <boost/asio/ip/tcp.hpp>
-#include <boost/asio/local/stream_protocol.hpp>
-#include <boost/asio/ssl/context.hpp>
-#include <boost/asio/ssl/stream.hpp>
-#include <boost/core/span.hpp>
-#include <boost/optional/optional.hpp>
-
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-namespace boost {
-namespace mysql {
-namespace detail {
-
-struct variant_stream_state
-{
-    asio::generic::stream_protocol::socket sock;
-    ssl_context_with_default ssl_ctx;
-    boost::optional<asio::ssl::stream<asio::generic::stream_protocol::socket&>> ssl;
-
-    variant_stream_state(asio::any_io_executor ex, asio::ssl::context* ctx) : sock(ex), ssl_ctx(ctx) {}
-
-    asio::ssl::stream<asio::generic::stream_protocol::socket&>& create_ssl_stream()
-    {
-        // The stream object must be re-created even if it already exists, since
-        // once used for a connection (anytime after ssl::stream::handshake is called),
-        // it can't be re-used for any subsequent connections
-        ssl.emplace(sock, ssl_ctx.get());
-        return *ssl;
-    }
-};
-
-enum class vsconnect_action_type
-{
-    none,
-    resolve,
-    connect,
-    immediate,  // we'll be performing an immediate completion
-};
-
-struct vsconnect_action
-{
-    vsconnect_action_type type;
-
-    union data_t
-    {
-        error_code err;
-        struct resolve_t
-        {
-            const std::string* hostname;
-            const std::string* service;
-        } resolve;
-        span<const asio::generic::stream_protocol::endpoint> connect;
-
-        data_t(error_code v) noexcept : err(v) {}
-        data_t(resolve_t v) noexcept : resolve(v) {}
-        data_t(span<const asio::generic::stream_protocol::endpoint> v) noexcept : connect(v) {}
-    } data;
-
-    struct immediate_tag
-    {
-    };
-
-    vsconnect_action(immediate_tag) noexcept : type(vsconnect_action_type::immediate), data(error_code()) {}
-    vsconnect_action(error_code v = {}) noexcept : type(vsconnect_action_type::none), data(v) {}
-    vsconnect_action(data_t::resolve_t v) noexcept : type(vsconnect_action_type::resolve), data(v) {}
-    vsconnect_action(span<const asio::generic::stream_protocol::endpoint> v) noexcept
-        : type(vsconnect_action_type::connect), data(v)
-    {
-    }
-};
-
-class variant_stream_connect_algo
-{
-    variant_stream_state* st_;
-    const any_address* addr_;
-    boost::optional<asio::ip::tcp::resolver> resolv_;
-    std::vector<asio::generic::stream_protocol::endpoint> endpoints_;
-    std::string service_;
-    int resume_point_{0};
-
-    const std::string& address() const { return access::get_impl(*addr_).address; }
-    asio::any_io_executor get_executor() const { return st_->sock.get_executor(); }
-
-public:
-    variant_stream_connect_algo(variant_stream_state& st, const any_address& addr) : st_(&st), addr_(&addr) {}
-
-    asio::ip::tcp::resolver& resolver() { return *resolv_; }
-    asio::generic::stream_protocol::socket& socket() { return st_->sock; }
-
-    vsconnect_action resume(
-        error_code ec,
-        const asio::ip::tcp::resolver::results_type* resolver_results,
-        asio::cancellation_type_t cancel_state
-    )
-    {
-        // All errors are considered fatal
-        if (ec)
-            return ec;
-
-        // If we received a terminal cancellation signal, exit with the appropriate error code.
-        // In composed async operations, if the cancellation arrives after an intermediate operation
-        // has completed, but before the handler is called, the operation finishes successfully,
-        // but the cancellation state is set. This check covers this case.
-        if (!!(cancel_state & asio::cancellation_type_t::terminal))
-            return error_code(asio::error::operation_aborted);
-
-        switch (resume_point_)
-        {
-        case 0:
-
-            // Clean up any previous state
-            st_->sock = asio::generic::stream_protocol::socket(get_executor());
-
-            // Set up the endpoints vector
-            if (addr_->type() == address_type::host_and_port)
-            {
-                // Emplace the resolver
-                resolv_.emplace(get_executor());
-
-                // Resolve the endpoints
-                service_ = std::to_string(addr_->port());
-                BOOST_MYSQL_YIELD(resume_point_, 1, vsconnect_action({&address(), &service_}));
-
-                // Convert them to a vector of type-erased endpoints.
-                // This workarounds https://github.com/chriskohlhoff/asio/issues/1502
-                // and makes connect() uniform for TCP and UNIX
-                endpoints_.reserve(resolver_results->size());
-                for (const auto& entry : *resolver_results)
-                {
-                    endpoints_.push_back(entry.endpoint());
-                }
-            }
-            else
-            {
-                BOOST_ASSERT(addr_->type() == address_type::unix_path);
-#ifdef BOOST_ASIO_HAS_LOCAL_SOCKETS
-                endpoints_.push_back(asio::local::stream_protocol::endpoint(address()));
-#else
-                BOOST_MYSQL_YIELD(resume_point_, 3, vsconnect_action::immediate_tag{});
-                return vsconnect_action(asio::error::operation_not_supported);
-#endif
-            }
-
-            // Actually connect
-            BOOST_MYSQL_YIELD(resume_point_, 2, vsconnect_action{endpoints_});
-
-            // If we're doing TCP, disable Naggle's algorithm
-            if (addr_->type() == address_type::host_and_port)
-            {
-                st_->sock.set_option(asio::ip::tcp::no_delay(true));
-            }
-
-            // Done
-        }
-
-        return {};
-    }
-};
-
-// Implements the EngineStream concept (see stream_adaptor)
-class variant_stream
-{
-public:
-    variant_stream(asio::any_io_executor ex, asio::ssl::context* ctx) : st_(std::move(ex), ctx) {}
-
-    bool supports_ssl() const { return true; }
-
-    // Executor
-    using executor_type = asio::any_io_executor;
-    executor_type get_executor() { return st_.sock.get_executor(); }
-
-    // SSL
-    void ssl_handshake(error_code& ec)
-    {
-        st_.create_ssl_stream().handshake(asio::ssl::stream_base::client, ec);
-    }
-
-    template <class CompletionToken>
-    void async_ssl_handshake(CompletionToken&& token)
-    {
-        st_.create_ssl_stream();
-        st_.ssl->async_handshake(asio::ssl::stream_base::client, std::forward<CompletionToken>(token));
-    }
-
-    void ssl_shutdown(error_code& ec)
-    {
-        BOOST_ASSERT(st_.ssl.has_value());
-        st_.ssl->shutdown(ec);
-    }
-
-    template <class CompletionToken>
-    void async_ssl_shutdown(CompletionToken&& token)
-    {
-        BOOST_ASSERT(st_.ssl.has_value());
-        st_.ssl->async_shutdown(std::forward<CompletionToken>(token));
-    }
-
-    // Reading
-    std::size_t read_some(asio::mutable_buffer buff, bool use_ssl, error_code& ec)
-    {
-        if (use_ssl)
-        {
-            BOOST_ASSERT(st_.ssl.has_value());
-            return st_.ssl->read_some(buff, ec);
-        }
-        else
-        {
-            return st_.sock.read_some(buff, ec);
-        }
-    }
-
-    template <class CompletionToken>
-    void async_read_some(asio::mutable_buffer buff, bool use_ssl, CompletionToken&& token)
-    {
-        if (use_ssl)
-        {
-            BOOST_ASSERT(st_.ssl.has_value());
-            st_.ssl->async_read_some(buff, std::forward<CompletionToken>(token));
-        }
-        else
-        {
-            st_.sock.async_read_some(buff, std::forward<CompletionToken>(token));
-        }
-    }
-
-    // Writing
-    std::size_t write_some(boost::asio::const_buffer buff, bool use_ssl, error_code& ec)
-    {
-        if (use_ssl)
-        {
-            BOOST_ASSERT(st_.ssl.has_value());
-            return st_.ssl->write_some(buff, ec);
-        }
-        else
-        {
-            return st_.sock.write_some(buff, ec);
-        }
-    }
-
-    template <class CompletionToken>
-    void async_write_some(boost::asio::const_buffer buff, bool use_ssl, CompletionToken&& token)
-    {
-        if (use_ssl)
-        {
-            BOOST_ASSERT(st_.ssl.has_value());
-            return st_.ssl->async_write_some(buff, std::forward<CompletionToken>(token));
-        }
-        else
-        {
-            return st_.sock.async_write_some(buff, std::forward<CompletionToken>(token));
-        }
-    }
-
-    // Connect and close
-    void connect(const void* server_address, error_code& output_ec)
-    {
-        // Setup
-        variant_stream_connect_algo algo(st_, *static_cast<const any_address*>(server_address));
-        error_code ec;
-        asio::ip::tcp::resolver::results_type resolver_results;
-
-        // Run until complete
-        while (true)
-        {
-            // The sync algorithm doesn't support cancellation
-            auto act = algo.resume(ec, &resolver_results, asio::cancellation_type_t::none);
-            switch (act.type)
-            {
-            case vsconnect_action_type::connect: asio::connect(st_.sock, act.data.connect, ec); break;
-            case vsconnect_action_type::resolve:
-                resolver_results = algo.resolver()
-                                       .resolve(*act.data.resolve.hostname, *act.data.resolve.service, ec);
-                break;
-            case vsconnect_action_type::immediate: break;  // has effect only for async
-            case vsconnect_action_type::none: output_ec = act.data.err; return;
-            default: BOOST_ASSERT(false);  // LCOV_EXCL_LINE
-            }
-        }
-    }
-
-    template <class CompletionToken>
-    void async_connect(const void* server_address, CompletionToken&& token)
-    {
-        asio::async_compose<CompletionToken, void(error_code)>(
-            connect_op(*this, *static_cast<const any_address*>(server_address)),
-            token,
-            get_executor()
-        );
-    }
-
-    void close(error_code& ec)
-    {
-        st_.sock.shutdown(asio::generic::stream_protocol::socket::shutdown_both, ec);
-        st_.sock.close(ec);
-    }
-
-    // Exposed for testing
-    const asio::generic::stream_protocol::socket& socket() const { return st_.sock; }
-
-private:
-    variant_stream_state st_;
-
-    struct connect_op
-    {
-        std::unique_ptr<variant_stream_connect_algo> algo_;
-
-        connect_op(variant_stream& this_obj, const any_address& server_address)
-            : algo_(new variant_stream_connect_algo(this_obj.st_, server_address))
-        {
-        }
-
-        template <class Self>
-        void operator()(
-            Self& self,
-            error_code ec = {},
-            const asio::ip::tcp::resolver::results_type& resolver_results = {}
-        )
-        {
-            auto act = algo_->resume(ec, &resolver_results, self.cancelled());
-            switch (act.type)
-            {
-            case vsconnect_action_type::connect:
-                asio::async_connect(algo_->socket(), act.data.connect, std::move(self));
-                break;
-            case vsconnect_action_type::resolve:
-                algo_->resolver()
-                    .async_resolve(*act.data.resolve.hostname, *act.data.resolve.service, std::move(self));
-                break;
-            case vsconnect_action_type::immediate:
-                asio::dispatch(
-                    asio::get_associated_immediate_executor(self, self.get_io_executor()),
-                    std::move(self)
-                );
-                break;
-            case vsconnect_action_type::none:
-                algo_.reset();
-                self.complete(act.data.err);
-                break;
-            default: BOOST_ASSERT(false);  // LCOV_EXCL_LINE
-            }
-        }
-
-        // Signature for range connect
-        template <class Self>
-        void operator()(Self& self, error_code ec, asio::generic::stream_protocol::endpoint)
-        {
-            (*this)(self, ec, asio::ip::tcp::resolver::results_type{});
-        }
-    };
-};
-
-}  // namespace detail
-}  // namespace mysql
-}  // namespace boost
-
-#endif
diff --git a/include/boost/mysql/impl/pfr.hpp b/include/boost/mysql/impl/pfr.hpp
index 061086712..07ae6c4c6 100644
--- a/include/boost/mysql/impl/pfr.hpp
+++ b/include/boost/mysql/impl/pfr.hpp
@@ -19,7 +19,6 @@
 #endif
 
 #include <boost/mysql/pfr.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/typing/row_traits.hpp>
 
@@ -27,6 +26,7 @@
 #include <boost/pfr/core_name.hpp>
 #include <boost/pfr/traits.hpp>
 
+#include <string_view>
 #include <type_traits>
 #include <utility>
 
@@ -60,9 +60,11 @@ using pfr_fields_t = decltype(pfr::structure_to_tuple(std::declval<const T&>()))
 
 // PFR field names use std::string_view
 template <std::size_t N>
-constexpr std::array<string_view, N> to_name_table_storage(std::array<std::string_view, N> input) noexcept
+constexpr std::array<std::string_view, N> to_name_table_storage(
+    std::array<std::string_view, N> input
+) noexcept
 {
-    std::array<string_view, N> res{};
+    std::array<std::string_view, N> res{};
     for (std::size_t i = 0; i < N; ++i)
         res[i] = input[i];
     return res;
@@ -72,7 +74,7 @@ template <class T>
 constexpr inline std::size_t pfr_row_size_v = mp11::mp_size<pfr_fields_t<T>>::value;
 
 template <class T>
-constexpr std::array<string_view, pfr_row_size_v<T>> create_pfr_name_table() noexcept
+constexpr std::array<std::string_view, pfr_row_size_v<T>> create_pfr_name_table() noexcept
 {
     // Some MSVC compilers have trouble with pfr::names_as_array<T>() when
     // the row type is empty
diff --git a/include/boost/mysql/impl/with_params.hpp b/include/boost/mysql/impl/with_params.hpp
index 42469befa..f2d8f5a2a 100644
--- a/include/boost/mysql/impl/with_params.hpp
+++ b/include/boost/mysql/impl/with_params.hpp
@@ -18,7 +18,7 @@
 #include <boost/mysql/detail/any_execution_request.hpp>
 
 #include <boost/core/ignore_unused.hpp>
-#include <boost/core/span.hpp>
+#include <span>
 #include <boost/mp11/integer_sequence.hpp>
 
 // Execution request traits
@@ -47,7 +47,7 @@ struct execution_request_traits<with_params_t<T...>>
             input.query,
             {{
                 {
-                    string_view(),
+                    std::string_view(),
                     formattable_ref(std::get<I>(std::forward<WithParamsType>(input).args))
                 }...
             }}
@@ -72,7 +72,7 @@ struct execution_request_traits<with_params_t<>>
 {
     static any_execution_request make_request(with_params_t<> input, std::vector<field_view>&)
     {
-        return any_execution_request({input.query, span<format_arg>{}});
+        return any_execution_request({input.query, std::span<format_arg>{}});
     }
 };
 
diff --git a/include/boost/mysql/is_fatal_error.hpp b/include/boost/mysql/is_fatal_error.hpp
index 0c40d525b..c603642e3 100644
--- a/include/boost/mysql/is_fatal_error.hpp
+++ b/include/boost/mysql/is_fatal_error.hpp
@@ -34,8 +34,5 @@ bool is_fatal_error(error_code ec) noexcept;
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/is_fatal_error.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/metadata.hpp b/include/boost/mysql/metadata.hpp
index 6ec6e2f2b..3b9d339a6 100644
--- a/include/boost/mysql/metadata.hpp
+++ b/include/boost/mysql/metadata.hpp
@@ -9,15 +9,17 @@
 #define BOOST_MYSQL_METADATA_HPP
 
 #include <boost/mysql/column_type.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/access.hpp>
 #include <boost/mysql/detail/coldef_view.hpp>
 #include <boost/mysql/detail/flags.hpp>
 
+#include <boost/assert.hpp>
+
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
+#include <string_view>
 #include <vector>
 
 namespace boost {
@@ -48,7 +50,7 @@ class metadata
      * No-throw guarantee.
      *
      * \par Object lifetimes
-     * `string_view`s obtained by calling accessor functions on `other` are invalidated.
+     * `std::string_view`s obtained by calling accessor functions on `other` are invalidated.
      */
     metadata(metadata&& other) = default;
 
@@ -67,7 +69,7 @@ class metadata
      * No-throw guarantee.
      *
      * \par Object lifetimes
-     * `string_view`s obtained by calling accessor functions on both `*this` and `other`
+     * `std::string_view`s obtained by calling accessor functions on both `*this` and `other`
      * are invalidated.
      */
     metadata& operator=(metadata&& other) = default;
@@ -79,7 +81,7 @@ class metadata
      * Basic guarantee. Internal allocations may throw.
      *
      * \par Object lifetimes
-     * `string_view`s obtained by calling accessor functions on `*this`
+     * `std::string_view`s obtained by calling accessor functions on `*this`
      * are invalidated.
      */
     metadata& operator=(const metadata& other) = default;
@@ -100,7 +102,7 @@ class metadata
      * The returned reference is valid as long as `*this` is alive and hasn't been
      * assigned to or moved from.
      */
-    string_view database() const noexcept { return substring(0, table_offset_); }
+    std::string_view database() const noexcept { return substring(0, table_offset_); }
 
     /**
      * \brief Returns the name of the virtual table the column belongs to.
@@ -117,7 +119,7 @@ class metadata
      * The returned reference is valid as long as `*this` is alive and hasn't been
      * assigned to or moved from.
      */
-    string_view table() const noexcept { return substring(table_offset_, org_table_offset_); }
+    std::string_view table() const noexcept { return substring(table_offset_, org_table_offset_); }
 
     /**
      * \brief Returns the name of the physical table the column belongs to.
@@ -134,7 +136,7 @@ class metadata
      * The returned reference is valid as long as `*this` is alive and hasn't been
      * assigned to or moved from.
      */
-    string_view original_table() const noexcept { return substring(org_table_offset_, name_offset_); }
+    std::string_view original_table() const noexcept { return substring(org_table_offset_, name_offset_); }
 
     /**
      * \brief Returns the actual name of the column.
@@ -152,7 +154,7 @@ class metadata
      * The returned reference is valid as long as `*this` is alive and hasn't been
      * assigned to or moved from.
      */
-    string_view column_name() const noexcept { return substring(name_offset_, org_name_offset_); }
+    std::string_view column_name() const noexcept { return substring(name_offset_, org_name_offset_); }
 
     /**
      * \brief Returns the original (physical) name of the column.
@@ -169,7 +171,10 @@ class metadata
      * The returned reference is valid as long as `*this` is alive and hasn't been
      * assigned to or moved from.
      */
-    string_view original_column_name() const noexcept { return substring(org_name_offset_, strings_.size()); }
+    std::string_view original_column_name() const noexcept
+    {
+        return substring(org_name_offset_, strings_.size());
+    }
 
     /**
      * \brief Returns the ID of the collation that fields belonging to this column use.
@@ -287,7 +292,7 @@ class metadata
                coldef.org_name.size();
     }
 
-    static char* copy_string(string_view from, char* to)
+    static char* copy_string(std::string_view from, char* to)
     {
         if (!from.empty())
             std::memcpy(to, from.data(), from.size());
@@ -324,7 +329,7 @@ class metadata
 
     bool flag_set(std::uint16_t flag) const noexcept { return flags_ & flag; }
 
-    string_view substring(std::size_t first, std::size_t last) const
+    std::string_view substring(std::size_t first, std::size_t last) const
     {
         return {strings_.data() + first, static_cast<std::size_t>(last - first)};
     }
diff --git a/include/boost/mysql/metadata_collection_view.hpp b/include/boost/mysql/metadata_collection_view.hpp
index f3f585d26..25d003545 100644
--- a/include/boost/mysql/metadata_collection_view.hpp
+++ b/include/boost/mysql/metadata_collection_view.hpp
@@ -10,7 +10,7 @@
 
 #include <boost/mysql/metadata.hpp>
 
-#include <boost/core/span.hpp>
+#include <span>
 
 namespace boost {
 namespace mysql {
@@ -22,7 +22,7 @@ namespace mysql {
  * owned by a \ref results or \ref execution_state object. This view is valid as long
  * as the memory allocated for the \ref metadata objects remain valid.
  */
-using metadata_collection_view = boost::span<const metadata>;
+using metadata_collection_view = std::span<const metadata>;
 
 }  // namespace mysql
 }  // namespace boost
diff --git a/include/boost/mysql/pipeline.hpp b/include/boost/mysql/pipeline.hpp
index 645b2f58f..0507d4ca4 100644
--- a/include/boost/mysql/pipeline.hpp
+++ b/include/boost/mysql/pipeline.hpp
@@ -14,7 +14,6 @@
 #include <boost/mysql/field_view.hpp>
 #include <boost/mysql/results.hpp>
 #include <boost/mysql/statement.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/access.hpp>
 #include <boost/mysql/detail/config.hpp>
@@ -23,11 +22,12 @@
 #include <boost/mysql/detail/writable_field_traits.hpp>
 
 #include <boost/assert.hpp>
-#include <boost/core/span.hpp>
 #include <boost/variant2/variant.hpp>
 
 #include <array>
 #include <cstdint>
+#include <span>
+#include <string_view>
 #include <utility>
 #include <vector>
 
@@ -290,7 +290,7 @@ class pipeline_request
      * query is copied into the request and need not be kept alive after this function returns.
      */
     BOOST_MYSQL_DECL
-    pipeline_request& add_execute(string_view query);
+    pipeline_request& add_execute(std::string_view query);
 
     /**
      * \brief Adds a stage that executes a prepared statement.
@@ -348,7 +348,7 @@ class pipeline_request
      * needs not be kept alive after this function returns.
      */
     BOOST_MYSQL_DECL
-    pipeline_request& add_execute_range(statement stmt, span<const field_view> params);
+    pipeline_request& add_execute_range(statement stmt, std::span<const field_view> params);
 
     /**
      * \brief Adds a prepare statement stage.
@@ -363,7 +363,7 @@ class pipeline_request
      * stmt_sql is copied into the request and need not be kept alive after this function returns.
      */
     BOOST_MYSQL_DECL
-    pipeline_request& add_prepare_statement(string_view stmt_sql);
+    pipeline_request& add_prepare_statement(std::string_view stmt_sql);
 
     /**
      * \brief Adds a close statement stage.
@@ -429,8 +429,5 @@ class pipeline_request
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/pipeline.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/results.hpp b/include/boost/mysql/results.hpp
index 6cde86ff7..76255f8e7 100644
--- a/include/boost/mysql/results.hpp
+++ b/include/boost/mysql/results.hpp
@@ -12,7 +12,6 @@
 #include <boost/mysql/resultset.hpp>
 #include <boost/mysql/resultset_view.hpp>
 #include <boost/mysql/rows_view.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/access.hpp>
 #include <boost/mysql/detail/execution_processor/results_impl.hpp>
@@ -22,6 +21,7 @@
 #include <boost/throw_exception.hpp>
 
 #include <stdexcept>
+#include <string_view>
 
 namespace boost {
 namespace mysql {
@@ -280,7 +280,7 @@ class results
      * \par Complexity
      * Constant.
      */
-    string_view info() const noexcept
+    std::string_view info() const noexcept
     {
         BOOST_ASSERT(has_value());
         return impl_.get_info(0);
diff --git a/include/boost/mysql/resultset.hpp b/include/boost/mysql/resultset.hpp
index e79385b75..5a0c57748 100644
--- a/include/boost/mysql/resultset.hpp
+++ b/include/boost/mysql/resultset.hpp
@@ -257,10 +257,10 @@ class resultset
      * \par Complexity
      * Constant.
      */
-    string_view info() const noexcept
+    std::string_view info() const noexcept
     {
         BOOST_ASSERT(has_value_);
-        return string_view(info_.data(), info_.size());
+        return std::string_view(info_.data(), info_.size());
     }
 
     /**
@@ -297,8 +297,5 @@ class resultset
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/resultset.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/resultset_view.hpp b/include/boost/mysql/resultset_view.hpp
index 3ba5cf732..8b68c1d69 100644
--- a/include/boost/mysql/resultset_view.hpp
+++ b/include/boost/mysql/resultset_view.hpp
@@ -163,7 +163,7 @@ class resultset_view
      * \par Complexity
      * Constant.
      */
-    string_view info() const noexcept
+    std::string_view info() const noexcept
     {
         BOOST_ASSERT(has_value());
         return impl_->get_info(index_);
diff --git a/include/boost/mysql/row_view.hpp b/include/boost/mysql/row_view.hpp
index d014f90e4..299a1e251 100644
--- a/include/boost/mysql/row_view.hpp
+++ b/include/boost/mysql/row_view.hpp
@@ -25,7 +25,7 @@ namespace mysql {
 /**
  * \brief A non-owning read-only reference to a sequence of fields.
  * \details
- * A `row_view` points to memory owned by an external entity (like `string_view` does). The validity
+ * A `row_view` points to memory owned by an external entity (like `std::string_view` does). The validity
  * of a `row_view` depends on how it was obtained:
  * \n
  * \li If it was constructed from a \ref row object (by calling \ref row::operator row_view()), the
diff --git a/include/boost/mysql/rows_view.hpp b/include/boost/mysql/rows_view.hpp
index d532b98de..5e2d6ea73 100644
--- a/include/boost/mysql/rows_view.hpp
+++ b/include/boost/mysql/rows_view.hpp
@@ -31,7 +31,7 @@ namespace mysql {
  * \ref rows_view::at or \ref rows_view::operator[]) returns a \ref row_view object, representing a
  * single row. All rows in the collection are the same size (as given by \ref num_columns).
  * \n
- * A `rows_view` object points to memory owned by an external entity (like `string_view` does). The
+ * A `rows_view` object points to memory owned by an external entity (like `std::string_view` does). The
  * validity of a `rows_view` object depends on how it was obtained:
  * \n
  * \li If it was constructed from a \ref rows object (by calling \ref rows::operator rows_view()),
diff --git a/include/boost/mysql/src.hpp b/include/boost/mysql/src.hpp
deleted file mode 100644
index 95b846869..000000000
--- a/include/boost/mysql/src.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_SRC_HPP
-#define BOOST_MYSQL_SRC_HPP
-
-// This file is meant to be included once, in a translation unit of
-// the program, with the macro BOOST_MYSQL_SEPARATE_COMPILATION defined.
-
-#include <boost/mysql/detail/config.hpp>
-
-#ifndef BOOST_MYSQL_SEPARATE_COMPILATION
-#error You need to define BOOST_MYSQL_SEPARATE_COMPILATION in all translation units that use the compiled version of Boost.MySQL, \
-    as well as the one where this file is included.
-#endif
-
-#include <boost/mysql/impl/any_connection.ipp>
-#include <boost/mysql/impl/character_set.ipp>
-#include <boost/mysql/impl/column_type.ipp>
-#include <boost/mysql/impl/connection_impl.ipp>
-#include <boost/mysql/impl/connection_pool.ipp>
-#include <boost/mysql/impl/date.ipp>
-#include <boost/mysql/impl/datetime.ipp>
-#include <boost/mysql/impl/engine_impl_instantiations.ipp>
-#include <boost/mysql/impl/error_categories.ipp>
-#include <boost/mysql/impl/escape_string.ipp>
-#include <boost/mysql/impl/execution_state_impl.ipp>
-#include <boost/mysql/impl/field.ipp>
-#include <boost/mysql/impl/field_kind.ipp>
-#include <boost/mysql/impl/field_view.ipp>
-#include <boost/mysql/impl/format_sql.ipp>
-#include <boost/mysql/impl/internal/error/server_error_to_string.ipp>
-#include <boost/mysql/impl/is_fatal_error.ipp>
-#include <boost/mysql/impl/meta_check_context.ipp>
-#include <boost/mysql/impl/pipeline.ipp>
-#include <boost/mysql/impl/results_impl.ipp>
-#include <boost/mysql/impl/resultset.ipp>
-#include <boost/mysql/impl/row_impl.ipp>
-#include <boost/mysql/impl/static_execution_state_impl.ipp>
-#include <boost/mysql/impl/static_results_impl.ipp>
-
-#endif
diff --git a/include/boost/mysql/static_execution_state.hpp b/include/boost/mysql/static_execution_state.hpp
index 8772ef142..9696fec0a 100644
--- a/include/boost/mysql/static_execution_state.hpp
+++ b/include/boost/mysql/static_execution_state.hpp
@@ -14,11 +14,12 @@
 
 #include <boost/mysql/metadata.hpp>
 #include <boost/mysql/metadata_collection_view.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/access.hpp>
 #include <boost/mysql/detail/execution_processor/static_execution_state_impl.hpp>
 
+#include <string_view>
+
 namespace boost {
 namespace mysql {
 
@@ -210,7 +211,7 @@ class static_execution_state
      * memory owned by `*this`, and will be valid as long as `*this` or an object move-constructed
      * from `*this` are alive.
      */
-    string_view info() const noexcept { return impl_.get_interface().get_info(); }
+    std::string_view info() const noexcept { return impl_.get_interface().get_info(); }
 
     /**
      * \brief Returns whether the current resultset represents a procedure OUT params.
diff --git a/include/boost/mysql/static_results.hpp b/include/boost/mysql/static_results.hpp
index 6448c3388..4f221569e 100644
--- a/include/boost/mysql/static_results.hpp
+++ b/include/boost/mysql/static_results.hpp
@@ -13,7 +13,6 @@
 #ifdef BOOST_MYSQL_CXX14
 
 #include <boost/mysql/metadata_collection_view.hpp>
-#include <boost/mysql/string_view.hpp>
 #include <boost/mysql/underlying_row.hpp>
 
 #include <boost/mysql/detail/access.hpp>
@@ -21,6 +20,8 @@
 
 #include <boost/assert.hpp>
 
+#include <string_view>
+
 namespace boost {
 namespace mysql {
 
@@ -132,7 +133,7 @@ class static_results
      */
     template <std::size_t I = 0>
 #ifdef BOOST_MYSQL_DOXYGEN
-    boost::span<const StaticRow... [I]>
+    std::span<const StaticRow... [I]>
 #else
     detail::rows_span_t<I, StaticRow...>
 #endif
@@ -278,7 +279,7 @@ class static_results
      * Constant.
      */
     template <std::size_t I = 0>
-    string_view info() const noexcept
+    std::string_view info() const noexcept
     {
         static_assert(I < sizeof...(StaticRow), "I index out of range");
         BOOST_ASSERT(has_value());
diff --git a/include/boost/mysql/string_view.hpp b/include/boost/mysql/string_view.hpp
deleted file mode 100644
index 3c7f345b0..000000000
--- a/include/boost/mysql/string_view.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_STRING_VIEW_HPP
-#define BOOST_MYSQL_STRING_VIEW_HPP
-
-#include <boost/core/detail/string_view.hpp>
-
-namespace boost {
-namespace mysql {
-
-/// Type used to represent read-only string references, similar to `std::string_view`.
-using string_view = boost::core::string_view;
-
-}  // namespace mysql
-}  // namespace boost
-
-#endif
diff --git a/include/boost/mysql/impl/character_set.ipp b/src/character_set.cpp
similarity index 94%
rename from include/boost/mysql/impl/character_set.ipp
rename to src/character_set.cpp
index 25dc3058a..11e1b675d 100644
--- a/include/boost/mysql/impl/character_set.ipp
+++ b/src/character_set.cpp
@@ -5,11 +5,6 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_CHARACTER_SET_IPP
-#define BOOST_MYSQL_IMPL_CHARACTER_SET_IPP
-
-#pragma once
-
 #include <boost/mysql/character_set.hpp>
 
 #include <boost/assert.hpp>
@@ -27,7 +22,7 @@ inline bool in_range(unsigned char byte, unsigned char lower, unsigned char uppe
 }  // namespace mysql
 }  // namespace boost
 
-std::size_t boost::mysql::detail::next_char_utf8mb4(span<const unsigned char> input)
+std::size_t boost::mysql::detail::next_char_utf8mb4(std::span<const unsigned char> input)
 {
     // s[0]    s[1]    s[2]    s[3]    comment
     // 00-7F                           ascii
@@ -96,5 +91,3 @@ std::size_t boost::mysql::detail::next_char_utf8mb4(span<const unsigned char> in
         return 0;
     }
 }
-
-#endif
diff --git a/include/boost/mysql/impl/column_type.ipp b/src/column_type.cpp
similarity index 94%
rename from include/boost/mysql/impl/column_type.ipp
rename to src/column_type.cpp
index fc001a4be..d6c4198c1 100644
--- a/include/boost/mysql/impl/column_type.ipp
+++ b/src/column_type.cpp
@@ -5,11 +5,6 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_COLUMN_TYPE_IPP
-#define BOOST_MYSQL_IMPL_COLUMN_TYPE_IPP
-
-#pragma once
-
 #include <boost/mysql/column_type.hpp>
 
 #include <ostream>
@@ -45,5 +40,3 @@ std::ostream& boost::mysql::operator<<(std::ostream& os, column_type t)
     default: return os << "<unknown column type>";
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/connection.cpp b/src/connection.cpp
new file mode 100644
index 000000000..417fe6731
--- /dev/null
+++ b/src/connection.cpp
@@ -0,0 +1,223 @@
+//
+// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/mysql/any_connection.hpp>
+#include <boost/mysql/character_set.hpp>
+#include <boost/mysql/client_errc.hpp>
+#include <boost/mysql/connect_params.hpp>
+#include <boost/mysql/diagnostics.hpp>
+#include <boost/mysql/execution_state.hpp>
+#include <boost/mysql/pipeline.hpp>
+#include <boost/mysql/rows_view.hpp>
+#include <boost/mysql/statement.hpp>
+
+#include <boost/mysql/detail/access.hpp>
+#include <boost/mysql/detail/algo_params.hpp>
+#include <boost/mysql/detail/connect_params_helpers.hpp>
+#include <boost/mysql/detail/engine.hpp>
+
+#include "mycosql_internal/sansio/connection_state.hpp"
+#include "mycosql_internal/variant_stream.hpp"
+
+using namespace boost::mysql;
+namespace capy = boost::capy;
+
+// impl_t definition
+struct any_connection::impl_t
+{
+    detail::connection_state st;
+    detail::engine eng;
+};
+
+// Construction and destruction
+static std::unique_ptr<detail::mysql_stream> create_variant_stream(capy::execution_context& ctx)
+{
+    return std::unique_ptr<detail::mysql_stream>{new detail::variant_stream(ctx)};
+}
+
+any_connection::any_connection(capy::execution_context& ctx, any_connection_params params)
+{
+    auto stream = create_variant_stream(ctx);
+    impl_.reset(new impl_t{
+        {params.initial_buffer_size, params.max_buffer_size, stream->supports_tls()},
+        std::move(stream),
+    });
+}
+
+any_connection& any_connection::operator=(any_connection&& rhs) noexcept = default;
+any_connection::~any_connection() = default;
+
+// Getters
+bool any_connection::uses_ssl() const noexcept { return impl_->st.data().tls_active; }
+
+bool any_connection::backslash_escapes() const noexcept { return impl_->st.data().backslash_escapes; }
+
+boost::system::result<character_set> any_connection::current_character_set() const noexcept
+{
+    auto& data = impl_->st.data();
+    if (data.current_charset.name == nullptr)
+        return error_code(client_errc::unknown_character_set);
+    return data.current_charset;
+}
+
+boost::system::result<format_options> any_connection::format_opts() const noexcept
+{
+    auto res = current_character_set();
+    if (res.has_error())
+        return res.error();
+    return format_options{res.value(), backslash_escapes()};
+}
+
+metadata_mode any_connection::meta_mode() const noexcept { return impl_->st.data().meta_mode; }
+
+void any_connection::set_meta_mode(metadata_mode v) noexcept { impl_->st.data().meta_mode = v; }
+
+boost::optional<std::uint32_t> any_connection::connection_id() const noexcept
+{
+    auto id = impl_->st.data().connection_id;
+    if (id == 0)
+        return {};
+    return id;
+}
+
+// Private helpers
+std::vector<field_view>& any_connection::shared_fields() { return impl_->st.data().shared_fields; }
+
+// I/O operations
+capy::io_task<diagnostics> any_connection::connect(const connect_params& params)
+{
+    detail::connect_algo_params p{
+        &params.server_address,
+        detail::make_hparams(params),
+        params.server_address.type() == address_type::unix_path
+    };
+    diagnostics diag;
+    auto ref = impl_->st.setup(diag, p);
+    auto [ec] = co_await impl_->eng.run(ref);
+    co_return {ec, std::move(diag)};
+}
+
+capy::io_task<diagnostics> any_connection::execute_impl(
+    detail::any_execution_request req,
+    detail::execution_processor* proc
+)
+{
+    detail::execute_algo_params p{req, proc};
+    diagnostics diag;
+    auto ref = impl_->st.setup(diag, p);
+    auto [ec] = co_await impl_->eng.run(ref);
+    co_return {ec, std::move(diag)};
+}
+
+capy::io_task<diagnostics, statement> any_connection::prepare_statement(std::string_view stmt)
+{
+    detail::prepare_statement_algo_params p{stmt};
+    diagnostics diag;
+    auto ref = impl_->st.setup(diag, p);
+    auto [ec] = co_await impl_->eng.run(ref);
+    co_return {ec, std::move(diag), impl_->st.result<detail::prepare_statement_algo_params>()};
+}
+
+capy::io_task<diagnostics> any_connection::close_statement(const statement& stmt)
+{
+    detail::close_statement_algo_params p{stmt.id()};
+    diagnostics diag;
+    auto ref = impl_->st.setup(diag, p);
+    auto [ec] = co_await impl_->eng.run(ref);
+    co_return {ec, std::move(diag)};
+}
+
+capy::io_task<diagnostics> any_connection::start_execution_impl(
+    detail::any_execution_request req,
+    detail::execution_processor* proc
+)
+{
+    detail::start_execution_algo_params p{req, proc};
+    diagnostics diag;
+    auto ref = impl_->st.setup(diag, p);
+    auto [ec] = co_await impl_->eng.run(ref);
+    co_return {ec, std::move(diag)};
+}
+
+capy::io_task<diagnostics, rows_view> any_connection::read_some_rows(execution_state& st)
+{
+    detail::read_some_rows_dynamic_algo_params p{&detail::access::get_impl(st)};
+    diagnostics diag;
+    auto ref = impl_->st.setup(diag, p);
+    auto [ec] = co_await impl_->eng.run(ref);
+    co_return {ec, std::move(diag), impl_->st.result<detail::read_some_rows_dynamic_algo_params>()};
+}
+
+capy::io_task<diagnostics, std::size_t> any_connection::read_some_rows_impl(
+    detail::execution_processor* proc,
+    detail::output_ref output
+)
+{
+    detail::read_some_rows_algo_params p{proc, output};
+    diagnostics diag;
+    auto ref = impl_->st.setup(diag, p);
+    auto [ec] = co_await impl_->eng.run(ref);
+    co_return {ec, std::move(diag), impl_->st.result<detail::read_some_rows_algo_params>()};
+}
+
+capy::io_task<diagnostics> any_connection::read_resultset_head_impl(detail::execution_processor* proc)
+{
+    detail::read_resultset_head_algo_params p{proc};
+    diagnostics diag;
+    auto ref = impl_->st.setup(diag, p);
+    auto [ec] = co_await impl_->eng.run(ref);
+    co_return {ec, std::move(diag)};
+}
+
+capy::io_task<diagnostics> any_connection::set_character_set(const character_set& charset)
+{
+    detail::set_character_set_algo_params p{charset};
+    diagnostics diag;
+    auto ref = impl_->st.setup(diag, p);
+    auto [ec] = co_await impl_->eng.run(ref);
+    co_return {ec, std::move(diag)};
+}
+
+capy::io_task<diagnostics> any_connection::ping()
+{
+    detail::ping_algo_params p{};
+    diagnostics diag;
+    auto ref = impl_->st.setup(diag, p);
+    auto [ec] = co_await impl_->eng.run(ref);
+    co_return {ec, std::move(diag)};
+}
+
+capy::io_task<diagnostics> any_connection::reset_connection()
+{
+    detail::reset_connection_algo_params p{};
+    diagnostics diag;
+    auto ref = impl_->st.setup(diag, p);
+    auto [ec] = co_await impl_->eng.run(ref);
+    co_return {ec, std::move(diag)};
+}
+
+capy::io_task<diagnostics> any_connection::close()
+{
+    detail::close_connection_algo_params p{};
+    diagnostics diag;
+    auto ref = impl_->st.setup(diag, p);
+    auto [ec] = co_await impl_->eng.run(ref);
+    co_return {ec, std::move(diag)};
+}
+
+capy::io_task<diagnostics> any_connection::run_pipeline(
+    const pipeline_request& req,
+    std::vector<stage_response>& res
+)
+{
+    auto& req_impl = detail::access::get_impl(req);
+    detail::run_pipeline_algo_params p{req_impl.buffer_, req_impl.stages_, &res};
+    diagnostics diag;
+    auto ref = impl_->st.setup(diag, p);
+    auto [ec] = co_await impl_->eng.run(ref);
+    co_return {ec, std::move(diag)};
+}
diff --git a/include/boost/mysql/impl/date.ipp b/src/date.cpp
similarity index 69%
rename from include/boost/mysql/impl/date.ipp
rename to src/date.cpp
index cc3dfd360..2aa7a2d20 100644
--- a/include/boost/mysql/impl/date.ipp
+++ b/src/date.cpp
@@ -5,24 +5,17 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_DATE_IPP
-#define BOOST_MYSQL_IMPL_DATE_IPP
-
-#pragma once
-
 #include <boost/mysql/date.hpp>
-#include <boost/mysql/string_view.hpp>
-
-#include <boost/mysql/impl/internal/dt_to_string.hpp>
 
 #include <cstddef>
 #include <ostream>
+#include <string_view>
+
+#include "mycosql_internal/dt_to_string.hpp"
 
 std::ostream& boost::mysql::operator<<(std::ostream& os, const date& value)
 {
     char buffer[32]{};
     std::size_t sz = detail::date_to_string(value.year(), value.month(), value.day(), buffer);
-    return os << string_view(buffer, sz);
+    return os << std::string_view(buffer, sz);
 }
-
-#endif
\ No newline at end of file
diff --git a/include/boost/mysql/impl/datetime.ipp b/src/datetime.cpp
similarity index 75%
rename from include/boost/mysql/impl/datetime.ipp
rename to src/datetime.cpp
index eefe51c63..6bed4cf1c 100644
--- a/include/boost/mysql/impl/datetime.ipp
+++ b/src/datetime.cpp
@@ -5,18 +5,13 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_DATETIME_IPP
-#define BOOST_MYSQL_IMPL_DATETIME_IPP
-
-#pragma once
-
 #include <boost/mysql/datetime.hpp>
-#include <boost/mysql/string_view.hpp>
-
-#include <boost/mysql/impl/internal/dt_to_string.hpp>
 
 #include <cstddef>
 #include <ostream>
+#include <string_view>
+
+#include "mycosql_internal/dt_to_string.hpp"
 
 std::ostream& boost::mysql::operator<<(std::ostream& os, const datetime& value)
 {
@@ -31,8 +26,6 @@ std::ostream& boost::mysql::operator<<(std::ostream& os, const datetime& value)
         value.microsecond(),
         buffer
     );
-    os << string_view(buffer, sz);
+    os << std::string_view(buffer, sz);
     return os;
 }
-
-#endif
\ No newline at end of file
diff --git a/include/boost/mysql/impl/error_categories.ipp b/src/error_categories.cpp
similarity index 97%
rename from include/boost/mysql/impl/error_categories.ipp
rename to src/error_categories.cpp
index 9e5ea884b..fa251e27f 100644
--- a/include/boost/mysql/impl/error_categories.ipp
+++ b/src/error_categories.cpp
@@ -5,18 +5,13 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_ERROR_CATEGORIES_IPP
-#define BOOST_MYSQL_IMPL_ERROR_CATEGORIES_IPP
-
-#pragma once
-
 #include <boost/mysql/client_errc.hpp>
 #include <boost/mysql/common_server_errc.hpp>
 #include <boost/mysql/error_categories.hpp>
 
 #include <boost/mysql/detail/config.hpp>
 
-#include <boost/mysql/impl/internal/error/server_error_to_string.hpp>
+#include "mycosql_internal/error/server_error_to_string.hpp"
 
 namespace boost {
 namespace mysql {
@@ -185,5 +180,3 @@ const boost::system::error_category& boost::mysql::get_mariadb_server_category()
 {
     return detail::all_categories::get().mariadb_server;
 }
-
-#endif
diff --git a/include/boost/mysql/impl/escape_string.ipp b/src/escape_string.cpp
similarity index 89%
rename from include/boost/mysql/impl/escape_string.ipp
rename to src/escape_string.cpp
index 31b8799a5..1ee109297 100644
--- a/include/boost/mysql/impl/escape_string.ipp
+++ b/src/escape_string.cpp
@@ -5,20 +5,16 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_ESCAPE_STRING_IPP
-#define BOOST_MYSQL_IMPL_ESCAPE_STRING_IPP
-
-#pragma once
-
 #include <boost/mysql/character_set.hpp>
 #include <boost/mysql/client_errc.hpp>
 #include <boost/mysql/error_code.hpp>
 #include <boost/mysql/escape_string.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/output_string.hpp>
 
-#include <boost/mysql/impl/internal/call_next_char.hpp>
+#include <string_view>
+
+#include "mycosql_internal/call_next_char.hpp"
 
 namespace boost {
 namespace mysql {
@@ -34,14 +30,14 @@ class escape_sequence
     escape_sequence(char ch1, char ch2) noexcept : data_{ch1, ch2} {}
 
     bool is_escape() const noexcept { return data_[0] != '\0'; }
-    string_view data() const noexcept { return string_view(data_, 2); }
+    std::string_view data() const noexcept { return std::string_view(data_, 2); }
 };
 
 // Escaper is a function object that takes a char and returns a
 // escape_sequence determining whether we should escape the char or not
 template <class Escaper>
 BOOST_ATTRIBUTE_NODISCARD error_code
-escape_impl(string_view input, character_set charset, Escaper escaper, output_string_ref output)
+escape_impl(std::string_view input, character_set charset, Escaper escaper, output_string_ref output)
 {
     const char* it = input.data();
     const char* end = it + input.size();
@@ -118,7 +114,7 @@ struct quote_escaper
 }  // namespace boost
 
 boost::mysql::error_code boost::mysql::detail::escape_string(
-    string_view input,
+    std::string_view input,
     const format_options& opts,
     char escape_char,
     output_string_ref output
@@ -128,5 +124,3 @@ boost::mysql::error_code boost::mysql::detail::escape_string(
                ? detail::escape_impl(input, opts.charset, quote_escaper(escape_char), output)
                : detail::escape_impl(input, opts.charset, backslash_escaper(), output);
 }
-
-#endif
diff --git a/include/boost/mysql/impl/execution_state_impl.ipp b/src/execution_state_impl.cpp
similarity index 78%
rename from include/boost/mysql/impl/execution_state_impl.ipp
rename to src/execution_state_impl.cpp
index d4666bee5..fe4fc82dc 100644
--- a/include/boost/mysql/impl/execution_state_impl.ipp
+++ b/src/execution_state_impl.cpp
@@ -5,15 +5,10 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_EXECUTION_STATE_IMPL_IPP
-#define BOOST_MYSQL_IMPL_EXECUTION_STATE_IMPL_IPP
-
-#pragma once
-
 #include <boost/mysql/detail/execution_processor/execution_state_impl.hpp>
 #include <boost/mysql/detail/row_impl.hpp>
 
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
+#include "mycosql_internal/protocol/deserialization.hpp"
 
 void boost::mysql::detail::execution_state_impl::on_ok_packet_impl(const ok_view& pack)
 {
@@ -32,8 +27,10 @@ void boost::mysql::detail::execution_state_impl::reset_impl() noexcept
     info_.clear();
 }
 
-boost::mysql::error_code boost::mysql::detail::execution_state_impl::
-    on_head_ok_packet_impl(const ok_view& pack, diagnostics&)
+boost::mysql::error_code boost::mysql::detail::execution_state_impl::on_head_ok_packet_impl(
+    const ok_view& pack,
+    diagnostics&
+)
 {
     on_new_resultset();
     on_ok_packet_impl(pack);
@@ -46,32 +43,34 @@ void boost::mysql::detail::execution_state_impl::on_num_meta_impl(std::size_t nu
     meta_.reserve(num_columns);
 }
 
-boost::mysql::error_code boost::mysql::detail::execution_state_impl::
-    on_meta_impl(const coldef_view& coldef, bool, diagnostics&)
+boost::mysql::error_code boost::mysql::detail::execution_state_impl::on_meta_impl(
+    const coldef_view& coldef,
+    bool,
+    diagnostics&
+)
 {
     meta_.push_back(create_meta(coldef));
     return error_code();
 }
 
 boost::mysql::error_code boost::mysql::detail::execution_state_impl::on_row_impl(
-    span<const std::uint8_t> msg,
+    std::span<const std::uint8_t> msg,
     const output_ref&,
     std::vector<field_view>& fields
 )
 
 {
     // add row storage
-    span<field_view> storage = add_fields(fields, meta_.size());
+    std::span<field_view> storage = add_fields(fields, meta_.size());
 
     // deserialize the row
     return deserialize_row(encoding(), msg, meta_, storage);
 }
 
-boost::mysql::error_code boost::mysql::detail::execution_state_impl::on_row_ok_packet_impl(const ok_view& pack
+boost::mysql::error_code boost::mysql::detail::execution_state_impl::on_row_ok_packet_impl(
+    const ok_view& pack
 )
 {
     on_ok_packet_impl(pack);
     return error_code();
 }
-
-#endif
diff --git a/include/boost/mysql/impl/field.ipp b/src/field.cpp
similarity index 94%
rename from include/boost/mysql/impl/field.ipp
rename to src/field.cpp
index b33f99d02..dbe6ca000 100644
--- a/include/boost/mysql/impl/field.ipp
+++ b/src/field.cpp
@@ -5,11 +5,6 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_FIELD_IPP
-#define BOOST_MYSQL_IMPL_FIELD_IPP
-
-#pragma once
-
 #include <boost/mysql/field.hpp>
 
 #include <ostream>
@@ -45,5 +40,3 @@ std::ostream& boost::mysql::operator<<(std::ostream& os, const field& value)
 {
     return os << field_view(value);
 }
-
-#endif
\ No newline at end of file
diff --git a/include/boost/mysql/impl/field_kind.ipp b/src/field_kind.cpp
similarity index 89%
rename from include/boost/mysql/impl/field_kind.ipp
rename to src/field_kind.cpp
index c43eeea54..b2e46c946 100644
--- a/include/boost/mysql/impl/field_kind.ipp
+++ b/src/field_kind.cpp
@@ -5,11 +5,6 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_FIELD_KIND_IPP
-#define BOOST_MYSQL_IMPL_FIELD_KIND_IPP
-
-#pragma once
-
 #include <boost/mysql/field_kind.hpp>
 
 #include <ostream>
@@ -30,5 +25,3 @@ std::ostream& boost::mysql::operator<<(std::ostream& os, boost::mysql::field_kin
     default: return os << "<invalid>";
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/include/boost/mysql/impl/field_view.ipp b/src/field_view.cpp
similarity index 86%
rename from include/boost/mysql/impl/field_view.ipp
rename to src/field_view.cpp
index 91c0f132d..e56ffa232 100644
--- a/include/boost/mysql/impl/field_view.ipp
+++ b/src/field_view.cpp
@@ -5,21 +5,16 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_FIELD_VIEW_IPP
-#define BOOST_MYSQL_IMPL_FIELD_VIEW_IPP
-
-#pragma once
-
 #include <boost/mysql/field_view.hpp>
-#include <boost/mysql/string_view.hpp>
-
-#include <boost/mysql/impl/internal/byte_to_hex.hpp>
-#include <boost/mysql/impl/internal/dt_to_string.hpp>
 
 #include <boost/assert.hpp>
 
 #include <cstddef>
 #include <ostream>
+#include <string_view>
+
+#include "mycosql_internal/byte_to_hex.hpp"
+#include "mycosql_internal/dt_to_string.hpp"
 
 namespace boost {
 namespace mysql {
@@ -43,7 +38,7 @@ inline std::ostream& print_blob(std::ostream& os, blob_view value)
         byte_to_hex(value[i], buffer + 2);
 
         // Insert
-        os << string_view(buffer, 4);
+        os << std::string_view(buffer, 4);
     }
     os << " }";
     return os;
@@ -53,7 +48,7 @@ inline std::ostream& print_time(std::ostream& os, const boost::mysql::time& valu
 {
     char buffer[64]{};
     std::size_t sz = detail::time_to_string(value, buffer);
-    os << string_view(buffer, sz);
+    os << std::string_view(buffer, sz);
     return os;
 }
 
@@ -84,5 +79,3 @@ std::ostream& boost::mysql::operator<<(std::ostream& os, const field_view& value
     default: BOOST_ASSERT(false); return os;  // LCOV_EXCL_LINE
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/include/boost/mysql/impl/format_sql.ipp b/src/format_sql.cpp
similarity index 87%
rename from include/boost/mysql/impl/format_sql.ipp
rename to src/format_sql.cpp
index df0434058..dde0070b6 100644
--- a/include/boost/mysql/impl/format_sql.ipp
+++ b/src/format_sql.cpp
@@ -5,9 +5,6 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_FORMAT_SQL_IPP
-#define BOOST_MYSQL_IMPL_FORMAT_SQL_IPP
-
 #include <boost/mysql/blob_view.hpp>
 #include <boost/mysql/character_set.hpp>
 #include <boost/mysql/client_errc.hpp>
@@ -17,20 +14,14 @@
 #include <boost/mysql/field_kind.hpp>
 #include <boost/mysql/field_view.hpp>
 #include <boost/mysql/format_sql.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/access.hpp>
 #include <boost/mysql/detail/escape_string.hpp>
 #include <boost/mysql/detail/format_sql.hpp>
 #include <boost/mysql/detail/output_string.hpp>
 
-#include <boost/mysql/impl/internal/byte_to_hex.hpp>
-#include <boost/mysql/impl/internal/call_next_char.hpp>
-#include <boost/mysql/impl/internal/dt_to_string.hpp>
-
 #include <boost/charconv/from_chars.hpp>
 #include <boost/charconv/to_chars.hpp>
-#include <boost/core/detail/string_view.hpp>
 #include <boost/system/result.hpp>
 #include <boost/system/system_error.hpp>
 #include <boost/throw_exception.hpp>
@@ -39,13 +30,18 @@
 #include <cstddef>
 #include <limits>
 #include <string>
+#include <string_view>
+
+#include "mycosql_internal/byte_to_hex.hpp"
+#include "mycosql_internal/call_next_char.hpp"
+#include "mycosql_internal/dt_to_string.hpp"
 
 namespace boost {
 namespace mysql {
 namespace detail {
 
 // Helpers to format fundamental types
-inline void append_quoted_identifier(string_view name, format_context_base& ctx)
+inline void append_quoted_identifier(std::string_view name, format_context_base& ctx)
 {
     ctx.append_raw("`");
     auto& impl = access::get_impl(ctx);
@@ -70,7 +66,7 @@ void append_int(T integer, format_context_base& ctx)
     BOOST_ASSERT(res.ec == std::errc());
 
     // Copy
-    access::get_impl(ctx).output.append(string_view(buff, res.ptr - buff));
+    access::get_impl(ctx).output.append(std::string_view(buff, res.ptr - buff));
 }
 
 inline void append_double(double number, format_context_base& ctx)
@@ -97,10 +93,10 @@ inline void append_double(double number, format_context_base& ctx)
     BOOST_ASSERT(res.ec == std::errc());
 
     // Copy
-    access::get_impl(ctx).output.append(string_view(buff, res.ptr - buff));
+    access::get_impl(ctx).output.append(std::string_view(buff, res.ptr - buff));
 }
 
-inline void append_quoted_string(string_view str, format_context_base& ctx)
+inline void append_quoted_string(std::string_view str, format_context_base& ctx)
 {
     auto& impl = access::get_impl(ctx);
     impl.output.append("'");
@@ -110,7 +106,7 @@ inline void append_quoted_string(string_view str, format_context_base& ctx)
     impl.output.append("'");
 }
 
-inline void append_string(string_view str, string_view format_spec, format_context_base& ctx)
+inline void append_string(std::string_view str, std::string_view format_spec, format_context_base& ctx)
 {
     // Parse format spec
     if (format_spec.size() > 1u)
@@ -183,9 +179,10 @@ inline void append_quoted_date(date d, format_context_base& ctx)
 {
     char buffer[34];
     buffer[0] = '\'';
-    std::size_t sz = detail::date_to_string(d.year(), d.month(), d.day(), span<char, 32>(buffer + 1, 32));
+    std::size_t
+        sz = detail::date_to_string(d.year(), d.month(), d.day(), std::span<char, 32>(buffer + 1, 32));
     buffer[sz + 1] = '\'';
-    access::get_impl(ctx).output.append(string_view(buffer, sz + 2));
+    access::get_impl(ctx).output.append(std::string_view(buffer, sz + 2));
 }
 
 inline void append_quoted_datetime(datetime d, format_context_base& ctx)
@@ -200,24 +197,24 @@ inline void append_quoted_datetime(datetime d, format_context_base& ctx)
         d.minute(),
         d.second(),
         d.microsecond(),
-        span<char, 64>(buffer + 1, 64)
+        std::span<char, 64>(buffer + 1, 64)
     );
     buffer[sz + 1] = '\'';
-    access::get_impl(ctx).output.append(string_view(buffer, sz + 2));
+    access::get_impl(ctx).output.append(std::string_view(buffer, sz + 2));
 }
 
 inline void append_quoted_time(time t, format_context_base& ctx)
 {
     char buffer[66];
     buffer[0] = '\'';
-    std::size_t sz = time_to_string(t, span<char, 64>(buffer + 1, 64));
+    std::size_t sz = time_to_string(t, std::span<char, 64>(buffer + 1, 64));
     buffer[sz + 1] = '\'';
-    access::get_impl(ctx).output.append(string_view(buffer, sz + 2));
+    access::get_impl(ctx).output.append(std::string_view(buffer, sz + 2));
 }
 
 inline void append_field_view(
     field_view fv,
-    string_view format_spec,
+    std::string_view format_spec,
     bool allow_specs,
     format_context_base& ctx
 )
@@ -271,7 +268,7 @@ inline bool is_format_spec_char(char c)
 class format_state
 {
     format_context_base& ctx_;
-    span<const format_arg> args_;
+    std::span<const format_arg> args_;
 
     // Borrowed from fmt
     // 0: we haven't used any args yet
@@ -295,13 +292,13 @@ class format_state
     bool uses_auto_ids() const noexcept { return next_arg_id_ > 0; }
     bool uses_explicit_ids() const noexcept { return next_arg_id_ == -1; }
 
-    void do_field(format_arg arg, string_view format_spec)
+    void do_field(format_arg arg, std::string_view format_spec)
     {
         ctx_.format_arg(access::get_impl(arg).value, format_spec);
     }
 
     BOOST_ATTRIBUTE_NODISCARD
-    bool do_indexed_field(int arg_id, string_view format_spec)
+    bool do_indexed_field(int arg_id, std::string_view format_spec)
     {
         BOOST_ASSERT(arg_id >= 0);
         if (static_cast<std::size_t>(arg_id) >= args_.size())
@@ -324,7 +321,7 @@ class format_state
         union data_t
         {
             unsigned short integral;
-            string_view identifier;
+            std::string_view identifier;
 
             data_t() noexcept : integral{} {}
         };
@@ -334,7 +331,7 @@ class format_state
 
         arg_id_t() noexcept : type(type_t::none), data() {}
         arg_id_t(unsigned short v) noexcept : type(type_t::integral) { data.integral = v; }
-        arg_id_t(string_view v) noexcept : type(type_t::identifier) { data.identifier = v; }
+        arg_id_t(std::string_view v) noexcept : type(type_t::identifier) { data.identifier = v; }
     };
 
     BOOST_ATTRIBUTE_NODISCARD
@@ -354,7 +351,7 @@ class format_state
             const char* name_begin = it;
             while (it != format_end && (is_name_start(*it) || is_number(*it)))
                 ++it;
-            string_view field_name(name_begin, it);
+            std::string_view field_name(name_begin, it);
             return field_name;
         }
         else
@@ -364,7 +361,7 @@ class format_state
     }
 
     BOOST_ATTRIBUTE_NODISCARD
-    static string_view parse_format_spec(const char*& it, const char* format_end)
+    static std::string_view parse_format_spec(const char*& it, const char* format_end)
     {
         if (it != format_end && *it == ':')
         {
@@ -376,7 +373,7 @@ class format_state
         }
         else
         {
-            return string_view();
+            return std::string_view();
         }
     }
 
@@ -417,7 +414,7 @@ class format_state
     }
 
     BOOST_ATTRIBUTE_NODISCARD
-    bool append_named_field(string_view field_name, string_view format_spec)
+    bool append_named_field(std::string_view field_name, std::string_view format_spec)
     {
         // Find the argument
         for (const auto& arg : args_)
@@ -435,7 +432,7 @@ class format_state
     }
 
     BOOST_ATTRIBUTE_NODISCARD
-    bool append_indexed_field(int index, string_view format_spec)
+    bool append_indexed_field(int index, std::string_view format_spec)
     {
         if (uses_auto_ids())
         {
@@ -447,7 +444,7 @@ class format_state
     }
 
     BOOST_ATTRIBUTE_NODISCARD
-    bool append_auto_field(string_view format_spec)
+    bool append_auto_field(std::string_view format_spec)
     {
         if (uses_explicit_ids())
         {
@@ -458,9 +455,11 @@ class format_state
     }
 
 public:
-    format_state(format_context_base& ctx, span<const format_arg> args) noexcept : ctx_(ctx), args_(args) {}
+    format_state(format_context_base& ctx, std::span<const format_arg> args) noexcept : ctx_(ctx), args_(args)
+    {
+    }
 
-    void format(string_view format_str)
+    void format(std::string_view format_str)
     {
         // We can use operator++ when we know a character is ASCII. Some charsets
         // allow ASCII continuation bytes, so we need to skip the entire character otherwise
@@ -525,7 +524,10 @@ class format_state
 }  // namespace mysql
 }  // namespace boost
 
-void boost::mysql::format_context_base::format_arg(detail::formattable_ref_impl arg, string_view format_spec)
+void boost::mysql::format_context_base::format_arg(
+    detail::formattable_ref_impl arg,
+    std::string_view format_spec
+)
 {
     switch (arg.type)
     {
@@ -548,7 +550,7 @@ void boost::mysql::format_context_base::format_arg(detail::formattable_ref_impl
 void boost::mysql::detail::vformat_sql_to(
     format_context_base& ctx,
     constant_string_view format_str,
-    span<const format_arg> args
+    std::span<const format_arg> args
 )
 {
     detail::format_state(ctx, args).format(format_str.get());
@@ -565,7 +567,7 @@ std::string boost::mysql::format_sql(
     return std::move(ctx).get().value();
 }
 
-std::pair<bool, boost::mysql::string_view> boost::mysql::detail::parse_range_specifiers(
+std::pair<bool, std::string_view> boost::mysql::detail::parse_range_specifiers(
     const char* spec_begin,
     const char* spec_end
 )
@@ -588,5 +590,3 @@ std::pair<bool, boost::mysql::string_view> boost::mysql::detail::parse_range_spe
         {spec_begin, spec_end}
     };
 }
-
-#endif
diff --git a/include/boost/mysql/impl/is_fatal_error.ipp b/src/is_fatal_error.cpp
similarity index 97%
rename from include/boost/mysql/impl/is_fatal_error.ipp
rename to src/is_fatal_error.cpp
index d384e59ea..57e009503 100644
--- a/include/boost/mysql/impl/is_fatal_error.ipp
+++ b/src/is_fatal_error.cpp
@@ -5,11 +5,6 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_IS_FATAL_ERROR_IPP
-#define BOOST_MYSQL_IMPL_IS_FATAL_ERROR_IPP
-
-#pragma once
-
 #include <boost/mysql/client_errc.hpp>
 #include <boost/mysql/common_server_errc.hpp>
 #include <boost/mysql/error_categories.hpp>
@@ -96,5 +91,3 @@ bool boost::mysql::is_fatal_error(error_code ec) noexcept
         return true;
     }
 }
-
-#endif
diff --git a/include/boost/mysql/impl/meta_check_context.ipp b/src/meta_check_context.cpp
similarity index 93%
rename from include/boost/mysql/impl/meta_check_context.ipp
rename to src/meta_check_context.cpp
index e0923a0df..4975d160c 100644
--- a/include/boost/mysql/impl/meta_check_context.ipp
+++ b/src/meta_check_context.cpp
@@ -5,11 +5,6 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_META_CHECK_CONTEXT_IPP
-#define BOOST_MYSQL_IMPL_META_CHECK_CONTEXT_IPP
-
-#pragma once
-
 #include <boost/mysql/detail/typing/meta_check_context.hpp>
 
 void boost::mysql::detail::meta_check_context::add_field_absent_error()
@@ -54,5 +49,3 @@ boost::mysql::error_code boost::mysql::detail::meta_check_context::check_errors(
     }
     return error_code();
 }
-
-#endif
diff --git a/include/boost/mysql/impl/internal/byte_to_hex.hpp b/src/mycosql_internal/byte_to_hex.hpp
similarity index 100%
rename from include/boost/mysql/impl/internal/byte_to_hex.hpp
rename to src/mycosql_internal/byte_to_hex.hpp
diff --git a/include/boost/mysql/impl/internal/call_next_char.hpp b/src/mycosql_internal/call_next_char.hpp
similarity index 100%
rename from include/boost/mysql/impl/internal/call_next_char.hpp
rename to src/mycosql_internal/call_next_char.hpp
diff --git a/include/boost/mysql/impl/internal/connection_pool/connection_node.hpp b/src/mycosql_internal/connection_pool/connection_node.hpp
similarity index 98%
rename from include/boost/mysql/impl/internal/connection_pool/connection_node.hpp
rename to src/mycosql_internal/connection_pool/connection_node.hpp
index 847684c9f..ff21c0836 100644
--- a/include/boost/mysql/impl/internal/connection_pool/connection_node.hpp
+++ b/src/mycosql_internal/connection_pool/connection_node.hpp
@@ -18,9 +18,6 @@
 #include <boost/mysql/detail/access.hpp>
 #include <boost/mysql/detail/connection_pool_fwd.hpp>
 
-#include <boost/mysql/impl/internal/connection_pool/internal_pool_params.hpp>
-#include <boost/mysql/impl/internal/connection_pool/sansio_connection_node.hpp>
-
 #include <boost/asio/any_io_executor.hpp>
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <boost/asio/cancel_after.hpp>
@@ -34,6 +31,9 @@
 #include <utility>
 #include <vector>
 
+#include "mycosql_internal/connection_pool/internal_pool_params.hpp"
+#include "mycosql_internal/connection_pool/sansio_connection_node.hpp"
+
 namespace boost {
 namespace mysql {
 namespace detail {
diff --git a/include/boost/mysql/impl/internal/connection_pool/connection_pool_impl.hpp b/src/mycosql_internal/connection_pool/connection_pool_impl.hpp
similarity index 98%
rename from include/boost/mysql/impl/internal/connection_pool/connection_pool_impl.hpp
rename to src/mycosql_internal/connection_pool/connection_pool_impl.hpp
index 87a0b4514..0e4522c15 100644
--- a/include/boost/mysql/impl/internal/connection_pool/connection_pool_impl.hpp
+++ b/src/mycosql_internal/connection_pool/connection_pool_impl.hpp
@@ -17,11 +17,6 @@
 
 #include <boost/mysql/detail/config.hpp>
 
-#include <boost/mysql/impl/internal/connection_pool/connection_node.hpp>
-#include <boost/mysql/impl/internal/connection_pool/internal_pool_params.hpp>
-#include <boost/mysql/impl/internal/connection_pool/sansio_connection_node.hpp>
-#include <boost/mysql/impl/internal/coroutine.hpp>
-
 #include <boost/asio/any_completion_handler.hpp>
 #include <boost/asio/any_io_executor.hpp>
 #include <boost/asio/associated_cancellation_slot.hpp>
@@ -44,6 +39,11 @@
 #include <memory>
 #include <utility>
 
+#include "mycosql_internal/connection_pool/connection_node.hpp"
+#include "mycosql_internal/connection_pool/internal_pool_params.hpp"
+#include "mycosql_internal/connection_pool/sansio_connection_node.hpp"
+#include "mycosql_internal/coroutine.hpp"
+
 namespace boost {
 namespace mysql {
 namespace detail {
diff --git a/include/boost/mysql/impl/internal/connection_pool/internal_pool_params.hpp b/src/mycosql_internal/connection_pool/internal_pool_params.hpp
similarity index 100%
rename from include/boost/mysql/impl/internal/connection_pool/internal_pool_params.hpp
rename to src/mycosql_internal/connection_pool/internal_pool_params.hpp
diff --git a/include/boost/mysql/impl/internal/connection_pool/sansio_connection_node.hpp b/src/mycosql_internal/connection_pool/sansio_connection_node.hpp
similarity index 100%
rename from include/boost/mysql/impl/internal/connection_pool/sansio_connection_node.hpp
rename to src/mycosql_internal/connection_pool/sansio_connection_node.hpp
diff --git a/include/boost/mysql/impl/internal/coroutine.hpp b/src/mycosql_internal/coroutine.hpp
similarity index 100%
rename from include/boost/mysql/impl/internal/coroutine.hpp
rename to src/mycosql_internal/coroutine.hpp
diff --git a/include/boost/mysql/impl/internal/dt_to_string.hpp b/src/mycosql_internal/dt_to_string.hpp
similarity index 94%
rename from include/boost/mysql/impl/internal/dt_to_string.hpp
rename to src/mycosql_internal/dt_to_string.hpp
index 9d70b962a..80c075465 100644
--- a/include/boost/mysql/impl/internal/dt_to_string.hpp
+++ b/src/mycosql_internal/dt_to_string.hpp
@@ -12,7 +12,7 @@
 
 #include <boost/assert.hpp>
 #include <boost/charconv/to_chars.hpp>
-#include <boost/core/span.hpp>
+#include <span>
 
 #include <cstddef>
 #include <cstdint>
@@ -72,7 +72,7 @@ inline std::size_t date_to_string(
     std::uint16_t year,
     std::uint8_t month,
     std::uint8_t day,
-    span<char, 32> output
+    std::span<char, 32> output
 ) noexcept
 {
     // Worst-case output is 14 chars, extra space just in case
@@ -104,7 +104,7 @@ inline std::size_t datetime_to_string(
     std::uint8_t minute,
     std::uint8_t second,
     std::uint32_t microsecond,
-    span<char, 64> output
+    std::span<char, 64> output
 ) noexcept
 {
     // Worst-case output is 37 chars, extra space just in case
@@ -114,7 +114,7 @@ inline std::size_t datetime_to_string(
     char* end = it + output.size();
 
     // Date
-    it += date_to_string(year, month, day, span<char, 32>(it, 32));
+    it += date_to_string(year, month, day, std::span<char, 32>(it, 32));
 
     // Hour
     *it++ = ' ';
@@ -136,7 +136,7 @@ inline std::size_t datetime_to_string(
     return it - output.data();
 }
 
-inline std::size_t time_to_string(::boost::mysql::time value, span<char, 64> output) noexcept
+inline std::size_t time_to_string(::boost::mysql::time value, std::span<char, 64> output) noexcept
 {
     // Worst-case output is 34 chars, extra space just in case
 
diff --git a/include/boost/mysql/impl/internal/error/server_error_to_string.hpp b/src/mycosql_internal/error/server_error_to_string.hpp
similarity index 89%
rename from include/boost/mysql/impl/internal/error/server_error_to_string.hpp
rename to src/mycosql_internal/error/server_error_to_string.hpp
index 4032f443e..511ffc755 100644
--- a/include/boost/mysql/impl/internal/error/server_error_to_string.hpp
+++ b/src/mycosql_internal/error/server_error_to_string.hpp
@@ -29,8 +29,5 @@ const char* mariadb_error_to_string(int v);
 }  // namespace mysql
 }  // namespace boost
 
-#ifdef BOOST_MYSQL_HEADER_ONLY
-#include <boost/mysql/impl/internal/error/server_error_to_string.ipp>
-#endif
 
 #endif
diff --git a/include/boost/mysql/impl/internal/next_power_of_two.hpp b/src/mycosql_internal/next_power_of_two.hpp
similarity index 100%
rename from include/boost/mysql/impl/internal/next_power_of_two.hpp
rename to src/mycosql_internal/next_power_of_two.hpp
diff --git a/include/boost/mysql/impl/internal/protocol/capabilities.hpp b/src/mycosql_internal/protocol/capabilities.hpp
similarity index 100%
rename from include/boost/mysql/impl/internal/protocol/capabilities.hpp
rename to src/mycosql_internal/protocol/capabilities.hpp
diff --git a/include/boost/mysql/impl/internal/protocol/db_flavor.hpp b/src/mycosql_internal/protocol/db_flavor.hpp
similarity index 100%
rename from include/boost/mysql/impl/internal/protocol/db_flavor.hpp
rename to src/mycosql_internal/protocol/db_flavor.hpp
diff --git a/include/boost/mysql/impl/internal/protocol/deserialization.hpp b/src/mycosql_internal/protocol/deserialization.hpp
similarity index 87%
rename from include/boost/mysql/impl/internal/protocol/deserialization.hpp
rename to src/mycosql_internal/protocol/deserialization.hpp
index ca55576cd..ff4dd4f3e 100644
--- a/include/boost/mysql/impl/internal/protocol/deserialization.hpp
+++ b/src/mycosql_internal/protocol/deserialization.hpp
@@ -17,50 +17,50 @@
 #include <boost/mysql/field_kind.hpp>
 #include <boost/mysql/field_view.hpp>
 #include <boost/mysql/metadata_collection_view.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/coldef_view.hpp>
 #include <boost/mysql/detail/config.hpp>
 #include <boost/mysql/detail/ok_view.hpp>
 #include <boost/mysql/detail/resultset_encoding.hpp>
 
-#include <boost/mysql/impl/internal/error/server_error_to_string.hpp>
-#include <boost/mysql/impl/internal/protocol/capabilities.hpp>
-#include <boost/mysql/impl/internal/protocol/db_flavor.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/binary_protocol.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/deserialization_context.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/null_bitmap.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/protocol_field_type.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/text_protocol.hpp>
-#include <boost/mysql/impl/internal/protocol/static_buffer.hpp>
-
 #include <boost/config.hpp>
 #include <boost/core/ignore_unused.hpp>
-#include <boost/core/span.hpp>
 
 #include <cstddef>
 #include <cstdint>
+#include <span>
+#include <string_view>
+
+#include "mycosql_internal/error/server_error_to_string.hpp"
+#include "mycosql_internal/protocol/capabilities.hpp"
+#include "mycosql_internal/protocol/db_flavor.hpp"
+#include "mycosql_internal/protocol/impl/binary_protocol.hpp"
+#include "mycosql_internal/protocol/impl/deserialization_context.hpp"
+#include "mycosql_internal/protocol/impl/null_bitmap.hpp"
+#include "mycosql_internal/protocol/impl/protocol_field_type.hpp"
+#include "mycosql_internal/protocol/impl/text_protocol.hpp"
+#include "mycosql_internal/protocol/static_buffer.hpp"
 
 namespace boost {
 namespace mysql {
 namespace detail {
 
 // OK packets (views because strings are non-owning)
-inline error_code deserialize_ok_packet(span<const std::uint8_t> msg, ok_view& output);  // for testing
+inline error_code deserialize_ok_packet(std::span<const std::uint8_t> msg, ok_view& output);  // for testing
 
 // Error packets (exposed for testing)
 struct err_view
 {
     std::uint16_t error_code;
-    string_view error_message;
+    std::string_view error_message;
 };
 BOOST_ATTRIBUTE_NODISCARD inline error_code deserialize_error_packet(
-    span<const std::uint8_t> message,
+    std::span<const std::uint8_t> message,
     err_view& pack,
     bool has_sql_state = true
 );
 BOOST_ATTRIBUTE_NODISCARD inline error_code process_error_packet(
-    span<const std::uint8_t> message,
+    std::span<const std::uint8_t> message,
     db_flavor flavor,
     diagnostics& diag,
     bool has_sql_state = true
@@ -71,7 +71,7 @@ BOOST_ATTRIBUTE_NODISCARD inline error_code process_error_packet(
 // If the response is an OK packet, sets backslash_escapes according to the
 // OK packet's server status flags
 BOOST_ATTRIBUTE_NODISCARD inline error_code deserialize_ok_response(
-    span<const std::uint8_t> message,
+    std::span<const std::uint8_t> message,
     db_flavor flavor,
     diagnostics& diag,
     bool& backslash_escapes
@@ -79,7 +79,7 @@ BOOST_ATTRIBUTE_NODISCARD inline error_code deserialize_ok_response(
 
 // Column definition
 BOOST_ATTRIBUTE_NODISCARD inline error_code deserialize_column_definition(
-    span<const std::uint8_t> input,
+    std::span<const std::uint8_t> input,
     coldef_view& output
 );
 
@@ -91,11 +91,11 @@ struct prepare_stmt_response
     std::uint16_t num_params;
 };
 BOOST_ATTRIBUTE_NODISCARD inline error_code deserialize_prepare_stmt_response_impl(
-    span<const std::uint8_t> message,
+    std::span<const std::uint8_t> message,
     prepare_stmt_response& output
 );  // exposed for testing, doesn't take header into account
 BOOST_ATTRIBUTE_NODISCARD inline error_code deserialize_prepare_stmt_response(
-    span<const std::uint8_t> message,
+    std::span<const std::uint8_t> message,
     db_flavor flavor,
     prepare_stmt_response& output,
     diagnostics& diag
@@ -126,7 +126,7 @@ struct execute_response
     execute_response(error_code v) noexcept : type(type_t::error), data(v) {}
 };
 inline execute_response deserialize_execute_response(
-    span<const std::uint8_t> msg,
+    std::span<const std::uint8_t> msg,
     db_flavor flavor,
     diagnostics& diag
 );
@@ -141,26 +141,30 @@ struct row_message
     } type;
     union data_t
     {
-        span<const std::uint8_t> row;
+        std::span<const std::uint8_t> row;
         ok_view ok_pack;
         error_code err;
 
-        data_t(span<const std::uint8_t> row) noexcept : row(row) {}
+        data_t(std::span<const std::uint8_t> row) noexcept : row(row) {}
         data_t(const ok_view& ok_pack) noexcept : ok_pack(ok_pack) {}
         data_t(error_code err) noexcept : err(err) {}
     } data;
 
-    row_message(span<const std::uint8_t> row) noexcept : type(type_t::row), data(row) {}
+    row_message(std::span<const std::uint8_t> row) noexcept : type(type_t::row), data(row) {}
     row_message(const ok_view& ok_pack) noexcept : type(type_t::ok_packet), data(ok_pack) {}
     row_message(error_code v) noexcept : type(type_t::error), data(v) {}
 };
-inline row_message deserialize_row_message(span<const std::uint8_t> msg, db_flavor flavor, diagnostics& diag);
+inline row_message deserialize_row_message(
+    std::span<const std::uint8_t> msg,
+    db_flavor flavor,
+    diagnostics& diag
+);
 
 inline error_code deserialize_row(
     resultset_encoding encoding,
-    span<const std::uint8_t> message,
+    std::span<const std::uint8_t> message,
     metadata_collection_view meta,
-    span<field_view> output  // Should point to meta.size() field_view objects
+    std::span<field_view> output  // Should point to meta.size() field_view objects
 );
 
 // Server hello
@@ -171,14 +175,14 @@ struct server_hello
     std::uint32_t connection_id{};
     auth_buffer_type auth_plugin_data;
     capabilities server_capabilities{};
-    string_view auth_plugin_name;
+    std::string_view auth_plugin_name;
 };
 BOOST_ATTRIBUTE_NODISCARD inline error_code deserialize_server_hello_impl(
-    span<const std::uint8_t> msg,
+    std::span<const std::uint8_t> msg,
     server_hello& output
 );  // exposed for testing, doesn't take message header into account
 BOOST_ATTRIBUTE_NODISCARD inline error_code deserialize_server_hello(
-    span<const std::uint8_t> msg,
+    std::span<const std::uint8_t> msg,
     server_hello& output,
     diagnostics& diag
 );
@@ -186,11 +190,11 @@ BOOST_ATTRIBUTE_NODISCARD inline error_code deserialize_server_hello(
 // Auth switch
 struct auth_switch
 {
-    string_view plugin_name;
-    span<const std::uint8_t> auth_data;
+    std::string_view plugin_name;
+    std::span<const std::uint8_t> auth_data;
 };
 BOOST_ATTRIBUTE_NODISCARD inline error_code deserialize_auth_switch(
-    span<const std::uint8_t> msg,
+    std::span<const std::uint8_t> msg,
     auth_switch& output
 );  // exposed for testing
 
@@ -210,12 +214,12 @@ struct handshake_server_response
         ok_view ok;
         error_code err;
         auth_switch auth_sw;
-        span<const std::uint8_t> more_data;
+        std::span<const std::uint8_t> more_data;
 
         data_t(const ok_view& ok) noexcept : ok(ok) {}
         data_t(error_code err) noexcept : err(err) {}
         data_t(auth_switch msg) noexcept : auth_sw(msg) {}
-        data_t(span<const std::uint8_t> more_data) noexcept : more_data(more_data) {}
+        data_t(std::span<const std::uint8_t> more_data) noexcept : more_data(more_data) {}
     } data;
 
     handshake_server_response(const ok_view& ok) noexcept : type(type_t::ok), data(ok) {}
@@ -223,13 +227,13 @@ struct handshake_server_response
     handshake_server_response(auth_switch auth_switch) noexcept : type(type_t::auth_switch), data(auth_switch)
     {
     }
-    handshake_server_response(span<const std::uint8_t> more_data) noexcept
+    handshake_server_response(std::span<const std::uint8_t> more_data) noexcept
         : type(type_t::auth_more_data), data(more_data)
     {
     }
 };
 inline handshake_server_response deserialize_handshake_server_response(
-    span<const std::uint8_t> buff,
+    std::span<const std::uint8_t> buff,
     db_flavor flavor,
     diagnostics& diag
 );
@@ -260,7 +264,7 @@ BOOST_INLINE_CONSTEXPR std::uint8_t ok_packet_header = 0x00;
 
 // OK packets
 boost::mysql::error_code boost::mysql::detail::deserialize_ok_packet(
-    span<const std::uint8_t> msg,
+    std::span<const std::uint8_t> msg,
     ok_view& output
 )
 {
@@ -300,7 +304,7 @@ boost::mysql::error_code boost::mysql::detail::deserialize_ok_packet(
 
 // Error packets
 boost::mysql::error_code boost::mysql::detail::deserialize_error_packet(
-    span<const std::uint8_t> msg,
+    std::span<const std::uint8_t> msg,
     err_view& output,
     bool has_sql_state
 )
@@ -336,7 +340,7 @@ boost::mysql::error_code boost::mysql::detail::deserialize_error_packet(
 }
 
 boost::mysql::error_code boost::mysql::detail::process_error_packet(
-    span<const std::uint8_t> msg,
+    std::span<const std::uint8_t> msg,
     db_flavor flavor,
     diagnostics& diag,
     bool has_sql_state
@@ -348,7 +352,7 @@ boost::mysql::error_code boost::mysql::detail::process_error_packet(
         return err;
 
     // Error message
-    access::get_impl(diag).assign_server(error_packet.error_message);
+    access::get_impl(diag).assign_server(std::string(error_packet.error_message));
 
     // Error code
     if (common_error_to_string(error_packet.error_code))
@@ -370,7 +374,7 @@ boost::mysql::error_code boost::mysql::detail::process_error_packet(
 
 // Column definition
 boost::mysql::error_code boost::mysql::detail::deserialize_column_definition(
-    span<const std::uint8_t> input,
+    std::span<const std::uint8_t> input,
     coldef_view& output
 )
 {
@@ -448,7 +452,7 @@ boost::mysql::error_code boost::mysql::detail::deserialize_column_definition(
 }
 
 boost::mysql::error_code boost::mysql::detail::deserialize_ok_response(
-    span<const std::uint8_t> message,
+    std::span<const std::uint8_t> message,
     db_flavor flavor,
     diagnostics& diag,
     bool& backslash_escapes
@@ -484,7 +488,7 @@ boost::mysql::error_code boost::mysql::detail::deserialize_ok_response(
 }
 
 boost::mysql::error_code boost::mysql::detail::deserialize_prepare_stmt_response_impl(
-    span<const std::uint8_t> message,
+    std::span<const std::uint8_t> message,
     prepare_stmt_response& output
 )
 {
@@ -521,7 +525,7 @@ boost::mysql::error_code boost::mysql::detail::deserialize_prepare_stmt_response
 }
 
 boost::mysql::error_code boost::mysql::detail::deserialize_prepare_stmt_response(
-    span<const std::uint8_t> message,
+    std::span<const std::uint8_t> message,
     db_flavor flavor,
     prepare_stmt_response& output,
     diagnostics& diag
@@ -549,7 +553,7 @@ boost::mysql::error_code boost::mysql::detail::deserialize_prepare_stmt_response
 
 // execute response
 boost::mysql::detail::execute_response boost::mysql::detail::deserialize_execute_response(
-    span<const std::uint8_t> msg,
+    std::span<const std::uint8_t> msg,
     db_flavor flavor,
     diagnostics& diag
 )
@@ -602,7 +606,7 @@ boost::mysql::detail::execute_response boost::mysql::detail::deserialize_execute
 }
 
 boost::mysql::detail::row_message boost::mysql::detail::deserialize_row_message(
-    span<const std::uint8_t> msg,
+    std::span<const std::uint8_t> msg,
     db_flavor flavor,
     diagnostics& diag
 )
@@ -636,7 +640,7 @@ boost::mysql::detail::row_message boost::mysql::detail::deserialize_row_message(
     {
         // An actual row
         ctx.rewind(1);  // keep the 'message type' byte, as it is part of the actual message
-        return span<const std::uint8_t>(ctx.first(), ctx.size());
+        return std::span<const std::uint8_t>(ctx.first(), ctx.size());
     }
 }
 
@@ -727,9 +731,9 @@ inline error_code deserialize_binary_row(
 
 boost::mysql::error_code boost::mysql::detail::deserialize_row(
     resultset_encoding encoding,
-    span<const std::uint8_t> buff,
+    std::span<const std::uint8_t> buff,
     metadata_collection_view meta,
-    span<field_view> output
+    std::span<field_view> output
 )
 {
     BOOST_ASSERT(meta.size() == output.size());
@@ -752,9 +756,9 @@ inline capabilities compose_capabilities(string_fixed<2> low, string_fixed<2> hi
     return static_cast<capabilities>(boost::endian::little_to_native(res));
 }
 
-inline db_flavor parse_db_version(string_view version_string)
+inline db_flavor parse_db_version(std::string_view version_string)
 {
-    return version_string.find("MariaDB") != string_view::npos ? db_flavor::mariadb : db_flavor::mysql;
+    return version_string.find("MariaDB") != std::string_view::npos ? db_flavor::mariadb : db_flavor::mysql;
 }
 
 }  // namespace detail
@@ -762,7 +766,7 @@ inline db_flavor parse_db_version(string_view version_string)
 }  // namespace boost
 
 boost::mysql::error_code boost::mysql::detail::deserialize_server_hello_impl(
-    span<const std::uint8_t> msg,
+    std::span<const std::uint8_t> msg,
     server_hello& output
 )
 {
@@ -811,10 +815,11 @@ boost::mysql::error_code boost::mysql::detail::deserialize_server_hello_impl(
         return to_error_code(err);
 
     // Auth plugin data, second part
-    auto auth2_length = static_cast<std::uint8_t>((std::max)(
-        static_cast<std::size_t>(13u),
-        static_cast<std::size_t>(pack.auth_plugin_data_len.value - pack.auth_plugin_data_part_1.value.size())
-    ));
+    auto auth2_length = static_cast<std::uint8_t>((std::max)(static_cast<std::size_t>(13u),
+                                                             static_cast<std::size_t>(
+                                                                 pack.auth_plugin_data_len.value -
+                                                                 pack.auth_plugin_data_part_1.value.size()
+                                                             )));
     const std::uint8_t* auth2_data = ctx.first();
     if (!ctx.enough_size(auth2_length))
         return client_errc::incomplete_message;
@@ -833,19 +838,21 @@ boost::mysql::error_code boost::mysql::detail::deserialize_server_hello_impl(
 
     // Compose auth_plugin_data
     output.auth_plugin_data.clear();
-    output.auth_plugin_data.append(span<const std::uint8_t>(
-        reinterpret_cast<const std::uint8_t*>(pack.auth_plugin_data_part_1.value.data()),
-        pack.auth_plugin_data_part_1.value.size()
-    ));
+    output.auth_plugin_data.append(
+        std::span<const std::uint8_t>(
+            reinterpret_cast<const std::uint8_t*>(pack.auth_plugin_data_part_1.value.data()),
+            pack.auth_plugin_data_part_1.value.size()
+        )
+    );
 
     // discard an extra trailing NULL byte
-    output.auth_plugin_data.append(span<const std::uint8_t>(auth2_data, auth2_length - 1));
+    output.auth_plugin_data.append(std::span<const std::uint8_t>(auth2_data, auth2_length - 1));
 
     return ctx.check_extra_bytes();
 }
 
 boost::mysql::error_code boost::mysql::detail::deserialize_server_hello(
-    span<const std::uint8_t> msg,
+    std::span<const std::uint8_t> msg,
     server_hello& output,
     diagnostics& diag
 )
@@ -884,7 +891,7 @@ boost::mysql::error_code boost::mysql::detail::deserialize_server_hello(
 // auth_switch
 BOOST_ATTRIBUTE_NODISCARD
 boost::mysql::error_code boost::mysql::detail::deserialize_auth_switch(
-    span<const std::uint8_t> msg,
+    std::span<const std::uint8_t> msg,
     auth_switch& output
 )
 {
@@ -901,7 +908,7 @@ boost::mysql::error_code boost::mysql::detail::deserialize_auth_switch(
         return to_error_code(err);
 
     // Discard an additional NULL at the end of auth data
-    string_view auth_data = pack.auth_plugin_data.value;
+    std::string_view auth_data = pack.auth_plugin_data.value;
     if (!auth_data.empty() && auth_data.back() == 0)
     {
         auth_data = auth_data.substr(0, auth_data.size() - 1);
@@ -916,7 +923,7 @@ boost::mysql::error_code boost::mysql::detail::deserialize_auth_switch(
 }
 
 boost::mysql::detail::handshake_server_response boost::mysql::detail::deserialize_handshake_server_response(
-    span<const std::uint8_t> buff,
+    std::span<const std::uint8_t> buff,
     db_flavor flavor,
     diagnostics& diag
 )
diff --git a/include/boost/mysql/impl/internal/protocol/frame_header.hpp b/src/mycosql_internal/protocol/frame_header.hpp
similarity index 81%
rename from include/boost/mysql/impl/internal/protocol/frame_header.hpp
rename to src/mycosql_internal/protocol/frame_header.hpp
index a255cb4e4..2c2792985 100644
--- a/include/boost/mysql/impl/internal/protocol/frame_header.hpp
+++ b/src/mycosql_internal/protocol/frame_header.hpp
@@ -10,7 +10,7 @@
 
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
-#include <boost/core/span.hpp>
+#include <span>
 #include <boost/endian/conversion.hpp>
 
 #include <cstddef>
@@ -28,14 +28,14 @@ struct frame_header
     std::uint8_t sequence_number;
 };
 
-inline void serialize_frame_header(span<std::uint8_t, frame_header_size> to, frame_header header)
+inline void serialize_frame_header(std::span<std::uint8_t, frame_header_size> to, frame_header header)
 {
     BOOST_ASSERT(header.size <= 0xffffff);
     endian::store_little_u24(to.data(), header.size);
     to[3] = header.sequence_number;
 }
 
-inline frame_header deserialize_frame_header(span<const std::uint8_t, frame_header_size> buffer)
+inline frame_header deserialize_frame_header(std::span<const std::uint8_t, frame_header_size> buffer)
 {
     return {endian::load_little_u24(buffer.data()), buffer[3]};
 }
diff --git a/include/boost/mysql/impl/internal/protocol/impl/binary_protocol.hpp b/src/mycosql_internal/protocol/impl/binary_protocol.hpp
similarity index 95%
rename from include/boost/mysql/impl/internal/protocol/impl/binary_protocol.hpp
rename to src/mycosql_internal/protocol/impl/binary_protocol.hpp
index 23e6b6458..e64a39a41 100644
--- a/include/boost/mysql/impl/internal/protocol/impl/binary_protocol.hpp
+++ b/src/mycosql_internal/protocol/impl/binary_protocol.hpp
@@ -15,16 +15,16 @@
 
 #include <boost/mysql/detail/datetime.hpp>
 
-#include <boost/mysql/impl/internal/protocol/impl/bit_deserialization.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/deserialization_context.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/protocol_types.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/serialization_context.hpp>
-
 #include <array>
 #include <chrono>
 #include <cmath>
 #include <cstdint>
 
+#include "mycosql_internal/protocol/impl/bit_deserialization.hpp"
+#include "mycosql_internal/protocol/impl/deserialization_context.hpp"
+#include "mycosql_internal/protocol/impl/protocol_types.hpp"
+#include "mycosql_internal/protocol/impl/serialization_context.hpp"
+
 namespace boost {
 namespace mysql {
 namespace detail {
@@ -305,11 +305,13 @@ inline deserialize_errc deserialize_binary_field_time(deserialization_context& c
     }
 
     // Compose the final time
-    output = field_view(boost::mysql::time(
-        (is_negative.value ? -1 : 1) *
-        (days(num_days.value) + std::chrono::hours(hours.value) + std::chrono::minutes(minutes.value) +
-         std::chrono::seconds(seconds.value) + std::chrono::microseconds(microseconds.value))
-    ));
+    output = field_view(
+        boost::mysql::time(
+            (is_negative.value ? -1 : 1) *
+            (days(num_days.value) + std::chrono::hours(hours.value) + std::chrono::minutes(minutes.value) +
+             std::chrono::seconds(seconds.value) + std::chrono::microseconds(microseconds.value))
+        )
+    );
     return deserialize_errc::ok;
 }
 
diff --git a/include/boost/mysql/impl/internal/protocol/impl/bit_deserialization.hpp b/src/mycosql_internal/protocol/impl/bit_deserialization.hpp
similarity index 88%
rename from include/boost/mysql/impl/internal/protocol/impl/bit_deserialization.hpp
rename to src/mycosql_internal/protocol/impl/bit_deserialization.hpp
index 3bc8ebb2c..5241ae7d6 100644
--- a/include/boost/mysql/impl/internal/protocol/impl/bit_deserialization.hpp
+++ b/src/mycosql_internal/protocol/impl/bit_deserialization.hpp
@@ -9,13 +9,13 @@
 #define BOOST_MYSQL_IMPL_INTERNAL_PROTOCOL_IMPL_BIT_DESERIALIZATION_HPP
 
 #include <boost/mysql/field_view.hpp>
-#include <boost/mysql/string_view.hpp>
-
-#include <boost/mysql/impl/internal/protocol/impl/deserialization_context.hpp>
 
 #include <boost/endian/conversion.hpp>
 
 #include <cstring>
+#include <string_view>
+
+#include "mycosql_internal/protocol/impl/deserialization_context.hpp"
 
 namespace boost {
 namespace mysql {
@@ -26,7 +26,7 @@ namespace detail {
 // string_lenenc layer, this function is in charge of just parsing the binary payload. The length of
 // the BIT value depends on how the type was defined in the table (e.g. BIT(14) will send a 2 byte
 // value; BIT(54) will send a 7 byte one). Values are sent as big-endian.
-inline deserialize_errc deserialize_bit(string_view from, field_view& to)
+inline deserialize_errc deserialize_bit(std::string_view from, field_view& to)
 {
     std::size_t num_bytes = from.size();
     if (num_bytes < 1 || num_bytes > 8)
diff --git a/include/boost/mysql/impl/internal/protocol/impl/deserialization_context.hpp b/src/mycosql_internal/protocol/impl/deserialization_context.hpp
similarity index 87%
rename from include/boost/mysql/impl/internal/protocol/impl/deserialization_context.hpp
rename to src/mycosql_internal/protocol/impl/deserialization_context.hpp
index 4852ccedf..bdeb15896 100644
--- a/include/boost/mysql/impl/internal/protocol/impl/deserialization_context.hpp
+++ b/src/mycosql_internal/protocol/impl/deserialization_context.hpp
@@ -10,13 +10,13 @@
 
 #include <boost/mysql/client_errc.hpp>
 #include <boost/mysql/error_code.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/assert.hpp>
-#include <boost/core/span.hpp>
 
 #include <cstddef>
 #include <cstdint>
+#include <span>
+#include <string_view>
 
 namespace boost {
 namespace mysql {
@@ -50,7 +50,7 @@ class deserialization_context
     const std::uint8_t* last_;
 
 public:
-    explicit deserialization_context(span<const std::uint8_t> data) noexcept
+    explicit deserialization_context(std::span<const std::uint8_t> data) noexcept
         : first_(data.data()), last_(first_ + data.size())
     {
     }
@@ -64,16 +64,16 @@ class deserialization_context
     }
     void rewind(std::size_t sz) { first_ -= sz; }
     bool enough_size(std::size_t required_size) const { return size() >= required_size; }
-    string_view get_string(std::size_t sz) const
+    std::string_view get_string(std::size_t sz) const
     {
-        return string_view(reinterpret_cast<const char*>(first_), sz);
+        return std::string_view(reinterpret_cast<const char*>(first_), sz);
     }
     error_code check_extra_bytes() const
     {
         return last_ == first_ ? error_code() : error_code(client_errc::extra_bytes);
     }
 
-    span<const std::uint8_t> to_span() const { return span<const std::uint8_t>(first_, last_); }
+    std::span<const std::uint8_t> to_span() const { return std::span<const std::uint8_t>(first_, last_); }
 
     deserialize_errc deserialize() { return deserialize_errc::ok; }
 
diff --git a/include/boost/mysql/impl/internal/protocol/impl/null_bitmap.hpp b/src/mycosql_internal/protocol/impl/null_bitmap.hpp
similarity index 93%
rename from include/boost/mysql/impl/internal/protocol/impl/null_bitmap.hpp
rename to src/mycosql_internal/protocol/impl/null_bitmap.hpp
index 00b551bbd..34a65804c 100644
--- a/include/boost/mysql/impl/internal/protocol/impl/null_bitmap.hpp
+++ b/src/mycosql_internal/protocol/impl/null_bitmap.hpp
@@ -12,7 +12,7 @@
 
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
-#include <boost/core/span.hpp>
+#include <span>
 
 #include <algorithm>
 #include <cstddef>
@@ -48,11 +48,11 @@ class null_bitmap_parser
 
 class null_bitmap_generator
 {
-    span<const field_view> fields_;
+    std::span<const field_view> fields_;
     std::size_t current_{0};
 
 public:
-    null_bitmap_generator(span<const field_view> fields) noexcept : fields_(fields) {}
+    null_bitmap_generator(std::span<const field_view> fields) noexcept : fields_(fields) {}
     bool done() const { return current_ == fields_.size(); }
     std::uint8_t next()
     {
diff --git a/include/boost/mysql/impl/internal/protocol/impl/protocol_field_type.hpp b/src/mycosql_internal/protocol/impl/protocol_field_type.hpp
similarity index 100%
rename from include/boost/mysql/impl/internal/protocol/impl/protocol_field_type.hpp
rename to src/mycosql_internal/protocol/impl/protocol_field_type.hpp
diff --git a/include/boost/mysql/impl/internal/protocol/impl/protocol_types.hpp b/src/mycosql_internal/protocol/impl/protocol_types.hpp
similarity index 94%
rename from include/boost/mysql/impl/internal/protocol/impl/protocol_types.hpp
rename to src/mycosql_internal/protocol/impl/protocol_types.hpp
index 1510d15dc..a509aac34 100644
--- a/include/boost/mysql/impl/internal/protocol/impl/protocol_types.hpp
+++ b/src/mycosql_internal/protocol/impl/protocol_types.hpp
@@ -8,18 +8,17 @@
 #ifndef BOOST_MYSQL_IMPL_INTERNAL_PROTOCOL_IMPL_PROTOCOL_TYPES_HPP
 #define BOOST_MYSQL_IMPL_INTERNAL_PROTOCOL_IMPL_PROTOCOL_TYPES_HPP
 
-#include <boost/mysql/string_view.hpp>
-
-#include <boost/mysql/impl/internal/protocol/impl/deserialization_context.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/serialization_context.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/span_string.hpp>
-
 #include <boost/endian/conversion.hpp>
 
 #include <array>
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
+#include <string_view>
+
+#include "mycosql_internal/protocol/impl/deserialization_context.hpp"
+#include "mycosql_internal/protocol/impl/serialization_context.hpp"
+#include "mycosql_internal/protocol/impl/span_string.hpp"
 
 namespace boost {
 namespace mysql {
@@ -149,7 +148,7 @@ struct int_lenenc
 
 struct string_null
 {
-    string_view value;
+    std::string_view value;
 
     void serialize(serialization_context& ctx) const
     {
@@ -173,7 +172,7 @@ struct string_null
 
 struct string_eof
 {
-    string_view value;
+    std::string_view value;
 
     deserialize_errc deserialize(deserialization_context& ctx)
     {
@@ -188,7 +187,7 @@ struct string_eof
 
 struct string_lenenc
 {
-    string_view value;
+    std::string_view value;
 
     deserialize_errc deserialize(deserialization_context& ctx)
     {
diff --git a/include/boost/mysql/impl/internal/protocol/impl/serialization_context.hpp b/src/mycosql_internal/protocol/impl/serialization_context.hpp
similarity index 94%
rename from include/boost/mysql/impl/internal/protocol/impl/serialization_context.hpp
rename to src/mycosql_internal/protocol/impl/serialization_context.hpp
index 1596d4d21..8ac20a569 100644
--- a/include/boost/mysql/impl/internal/protocol/impl/serialization_context.hpp
+++ b/src/mycosql_internal/protocol/impl/serialization_context.hpp
@@ -11,19 +11,19 @@
 #include <boost/mysql/client_errc.hpp>
 #include <boost/mysql/error_code.hpp>
 
-#include <boost/mysql/impl/internal/protocol/frame_header.hpp>
-
 #include <boost/assert.hpp>
 #include <boost/core/ignore_unused.hpp>
-#include <boost/core/span.hpp>
 #include <boost/endian/conversion.hpp>
 
 #include <algorithm>
 #include <array>
 #include <cstddef>
 #include <cstdint>
+#include <span>
 #include <vector>
 
+#include "mycosql_internal/protocol/frame_header.hpp"
+
 namespace boost {
 namespace mysql {
 namespace detail {
@@ -52,7 +52,7 @@ class serialization_context
     // max_frame_size_ == -1 can be used to disable framing. Used for testing
     bool framing_enabled() const { return max_frame_size_ != disable_framing; }
 
-    void append_to_buffer(span<const std::uint8_t> contents)
+    void append_to_buffer(std::span<const std::uint8_t> contents)
     {
         // Check if the buffer has space for the given contents
         if (buffer_.size() + contents.size() > max_buffer_size_)
@@ -65,7 +65,7 @@ class serialization_context
 
     void append_header() { append_to_buffer(std::array<std::uint8_t, frame_header_size>{}); }
 
-    void add_impl(span<const std::uint8_t> content)
+    void add_impl(std::span<const std::uint8_t> content)
     {
         // Add the content in chunks, inserting space for headers where required
         std::size_t content_offset = 0;
@@ -130,7 +130,7 @@ class serialization_context
     void add(std::uint8_t value) { add_impl({&value, 1}); }
 
     // To be called by serialize() functions. Appends bytes to the buffer.
-    void add(span<const std::uint8_t> content) { add_impl(content); }
+    void add(std::span<const std::uint8_t> content) { add_impl(content); }
 
     // Make serialization_context compatible with output_string
     void append(const char* content, std::size_t size)
@@ -166,7 +166,7 @@ class serialization_context
             // Write the frame header
             BOOST_ASSERT(frame_first <= buffer_.size());
             serialize_frame_header(
-                span<std::uint8_t, frame_header_size>(buffer_.data() + offset, frame_header_size),
+                std::span<std::uint8_t, frame_header_size>(buffer_.data() + offset, frame_header_size),
                 frame_header{frame_size, seqnum++}
             );
 
diff --git a/include/boost/mysql/impl/internal/protocol/impl/span_string.hpp b/src/mycosql_internal/protocol/impl/span_string.hpp
similarity index 60%
rename from include/boost/mysql/impl/internal/protocol/impl/span_string.hpp
rename to src/mycosql_internal/protocol/impl/span_string.hpp
index 63ea7ad3c..64a60a74f 100644
--- a/include/boost/mysql/impl/internal/protocol/impl/span_string.hpp
+++ b/src/mycosql_internal/protocol/impl/span_string.hpp
@@ -8,23 +8,21 @@
 #ifndef BOOST_MYSQL_IMPL_INTERNAL_PROTOCOL_IMPL_SPAN_STRING_HPP
 #define BOOST_MYSQL_IMPL_INTERNAL_PROTOCOL_IMPL_SPAN_STRING_HPP
 
-#include <boost/mysql/string_view.hpp>
-
-#include <boost/core/span.hpp>
-
 #include <cstdint>
+#include <span>
+#include <string_view>
 
 namespace boost {
 namespace mysql {
 namespace detail {
 
-inline string_view to_string(span<const std::uint8_t> v)
+inline std::string_view to_string(std::span<const std::uint8_t> v)
 {
-    return string_view(reinterpret_cast<const char*>(v.data()), v.size());
+    return std::string_view(reinterpret_cast<const char*>(v.data()), v.size());
 }
-inline span<const std::uint8_t> to_span(string_view v)
+inline std::span<const std::uint8_t> to_span(std::string_view v)
 {
-    return span<const std::uint8_t>(reinterpret_cast<const std::uint8_t*>(v.data()), v.size());
+    return std::span<const std::uint8_t>(reinterpret_cast<const std::uint8_t*>(v.data()), v.size());
 }
 
 }  // namespace detail
diff --git a/include/boost/mysql/impl/internal/protocol/impl/text_protocol.hpp b/src/mycosql_internal/protocol/impl/text_protocol.hpp
similarity index 90%
rename from include/boost/mysql/impl/internal/protocol/impl/text_protocol.hpp
rename to src/mycosql_internal/protocol/impl/text_protocol.hpp
index 4b28270f7..9a3d8028e 100644
--- a/include/boost/mysql/impl/internal/protocol/impl/text_protocol.hpp
+++ b/src/mycosql_internal/protocol/impl/text_protocol.hpp
@@ -12,15 +12,9 @@
 #include <boost/mysql/datetime.hpp>
 #include <boost/mysql/field_view.hpp>
 #include <boost/mysql/metadata.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/datetime.hpp>
 
-#include <boost/mysql/impl/internal/protocol/impl/bit_deserialization.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/deserialization_context.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/protocol_types.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/span_string.hpp>
-
 #include <boost/assert.hpp>
 #include <boost/charconv/from_chars.hpp>
 
@@ -28,13 +22,23 @@
 #include <cstddef>
 #include <cstdlib>
 #include <cstring>
+#include <string_view>
 #include <system_error>
 
+#include "mycosql_internal/protocol/impl/bit_deserialization.hpp"
+#include "mycosql_internal/protocol/impl/deserialization_context.hpp"
+#include "mycosql_internal/protocol/impl/protocol_types.hpp"
+#include "mycosql_internal/protocol/impl/span_string.hpp"
+
 namespace boost {
 namespace mysql {
 namespace detail {
 
-inline deserialize_errc deserialize_text_field(string_view from, const metadata& meta, field_view& output);
+inline deserialize_errc deserialize_text_field(
+    std::string_view from,
+    const metadata& meta,
+    field_view& output
+);
 
 }
 }  // namespace mysql
@@ -54,7 +58,7 @@ BOOST_INLINE_CONSTEXPR unsigned time_max_hour = 838;
 
 // Integers
 template <class T>
-inline deserialize_errc deserialize_text_value_int_impl(string_view from, field_view& to)
+inline deserialize_errc deserialize_text_value_int_impl(std::string_view from, field_view& to)
 {
     // Iterators
     const char* begin = from.data();
@@ -73,7 +77,11 @@ inline deserialize_errc deserialize_text_value_int_impl(string_view from, field_
     return deserialize_errc::ok;
 }
 
-inline deserialize_errc deserialize_text_value_int(string_view from, field_view& to, const metadata& meta)
+inline deserialize_errc deserialize_text_value_int(
+    std::string_view from,
+    field_view& to,
+    const metadata& meta
+)
 {
     return meta.is_unsigned() ? deserialize_text_value_int_impl<std::uint64_t>(from, to)
                               : deserialize_text_value_int_impl<std::int64_t>(from, to);
@@ -81,7 +89,7 @@ inline deserialize_errc deserialize_text_value_int(string_view from, field_view&
 
 // Floating points
 template <class T>
-inline deserialize_errc deserialize_text_value_float(string_view from, field_view& to)
+inline deserialize_errc deserialize_text_value_float(std::string_view from, field_view& to)
 {
     // Iterators
     const char* begin = from.data();
@@ -101,13 +109,13 @@ inline deserialize_errc deserialize_text_value_float(string_view from, field_vie
 }
 
 // Strings
-inline deserialize_errc deserialize_text_value_string(string_view from, field_view& to)
+inline deserialize_errc deserialize_text_value_string(std::string_view from, field_view& to)
 {
     to = field_view(from);
     return deserialize_errc::ok;
 }
 
-inline deserialize_errc deserialize_text_value_blob(string_view from, field_view& to) noexcept
+inline deserialize_errc deserialize_text_value_blob(std::string_view from, field_view& to) noexcept
 {
     to = field_view(to_span(from));
     return deserialize_errc::ok;
@@ -219,7 +227,7 @@ inline deserialize_errc deserialize_microsecond(
     return deserialize_errc::ok;
 }
 
-inline deserialize_errc deserialize_text_value_date(string_view from, field_view& to)
+inline deserialize_errc deserialize_text_value_date(std::string_view from, field_view& to)
 {
     // Iterators
     const char* it = from.data();
@@ -241,7 +249,7 @@ inline deserialize_errc deserialize_text_value_date(string_view from, field_view
 }
 
 inline deserialize_errc deserialize_text_value_datetime(
-    string_view from,
+    std::string_view from,
     field_view& to,
     const metadata& meta
 )
@@ -310,7 +318,11 @@ inline deserialize_errc deserialize_text_value_datetime(
     return deserialize_errc::ok;
 }
 
-inline deserialize_errc deserialize_text_value_time(string_view from, field_view& to, const metadata& meta)
+inline deserialize_errc deserialize_text_value_time(
+    std::string_view from,
+    field_view& to,
+    const metadata& meta
+)
 {
     // Iterators
     const char* it = from.data();
@@ -387,7 +399,7 @@ inline deserialize_errc deserialize_text_value_time(string_view from, field_view
 }  // namespace boost
 
 boost::mysql::detail::deserialize_errc boost::mysql::detail::deserialize_text_field(
-    string_view from,
+    std::string_view from,
     const metadata& meta,
     field_view& output
 )
diff --git a/include/boost/mysql/impl/internal/protocol/serialization.hpp b/src/mycosql_internal/protocol/serialization.hpp
similarity index 91%
rename from include/boost/mysql/impl/internal/protocol/serialization.hpp
rename to src/mycosql_internal/protocol/serialization.hpp
index 41a6f7581..ec2f5cb1e 100644
--- a/include/boost/mysql/impl/internal/protocol/serialization.hpp
+++ b/src/mycosql_internal/protocol/serialization.hpp
@@ -10,20 +10,20 @@
 
 #include <boost/mysql/error_code.hpp>
 #include <boost/mysql/field_view.hpp>
-#include <boost/mysql/string_view.hpp>
-
-#include <boost/mysql/impl/internal/protocol/capabilities.hpp>
-#include <boost/mysql/impl/internal/protocol/frame_header.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/binary_protocol.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/null_bitmap.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/protocol_field_type.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/protocol_types.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/serialization_context.hpp>
 
 #include <boost/assert.hpp>
 
 #include <cstddef>
 #include <cstdint>
+#include <string_view>
+
+#include "mycosql_internal/protocol/capabilities.hpp"
+#include "mycosql_internal/protocol/frame_header.hpp"
+#include "mycosql_internal/protocol/impl/binary_protocol.hpp"
+#include "mycosql_internal/protocol/impl/null_bitmap.hpp"
+#include "mycosql_internal/protocol/impl/protocol_field_type.hpp"
+#include "mycosql_internal/protocol/impl/protocol_types.hpp"
+#include "mycosql_internal/protocol/impl/serialization_context.hpp"
 
 namespace boost {
 namespace mysql {
@@ -50,7 +50,7 @@ struct reset_connection_command
 // query
 struct query_command
 {
-    string_view query;
+    std::string_view query;
 
     void serialize(serialization_context& ctx) const
     {
@@ -62,7 +62,7 @@ struct query_command
 // prepare_statement
 struct prepare_stmt_command
 {
-    string_view stmt;
+    std::string_view stmt;
 
     void serialize(serialization_context& ctx) const
     {
@@ -75,7 +75,7 @@ struct prepare_stmt_command
 struct execute_stmt_command
 {
     std::uint32_t statement_id;
-    span<const field_view> params;
+    std::span<const field_view> params;
 
     inline void serialize(serialization_context& ctx) const;
 };
@@ -93,10 +93,10 @@ struct login_request
     capabilities negotiated_capabilities;  // capabilities
     std::uint32_t max_packet_size;
     std::uint32_t collation_id;
-    string_view username;
-    span<const std::uint8_t> auth_response;
-    string_view database;
-    string_view auth_plugin_name;
+    std::string_view username;
+    std::span<const std::uint8_t> auth_response;
+    std::string_view database;
+    std::string_view auth_plugin_name;
 
     inline void serialize(serialization_context& ctx) const;
 };
@@ -114,7 +114,7 @@ struct ssl_request
 // Auth switch response
 struct auth_switch_response
 {
-    span<const std::uint8_t> auth_plugin_data;
+    std::span<const std::uint8_t> auth_plugin_data;
 
     void serialize(serialization_context& ctx) const { ctx.add(auth_plugin_data); }
 };
diff --git a/include/boost/mysql/impl/internal/protocol/static_buffer.hpp b/src/mycosql_internal/protocol/static_buffer.hpp
similarity index 77%
rename from include/boost/mysql/impl/internal/protocol/static_buffer.hpp
rename to src/mycosql_internal/protocol/static_buffer.hpp
index 0f8396adb..265b6802b 100644
--- a/include/boost/mysql/impl/internal/protocol/static_buffer.hpp
+++ b/src/mycosql_internal/protocol/static_buffer.hpp
@@ -11,12 +11,12 @@
 // A very simplified variable-length buffer with fixed max-size
 
 #include <boost/assert.hpp>
-#include <boost/core/span.hpp>
 
 #include <array>
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
+#include <span>
 
 namespace boost {
 namespace mysql {
@@ -36,13 +36,22 @@ class static_buffer
     static_buffer() = default;
     static_buffer(std::size_t sz) noexcept : size_(sz) { BOOST_ASSERT(sz <= size_); }
 
+    // Iterators
+    using iterator = std::uint8_t*;
+    using const_iterator = const std::uint8_t*;
+
+    iterator begin() noexcept { return buffer_.data(); }
+    iterator end() noexcept { return buffer_.data() + size_; }
+    const_iterator begin() const noexcept { return buffer_.data(); }
+    const_iterator end() const noexcept { return buffer_.data() + size_; }
+
     // Size and data
     std::size_t size() const noexcept { return size_; }
     const std::uint8_t* data() const noexcept { return buffer_.data(); }
     std::uint8_t* data() noexcept { return buffer_.data(); }
 
     // Modifiers
-    void append(span<const std::uint8_t> data) noexcept
+    void append(std::span<const std::uint8_t> data) noexcept
     {
         if (!data.empty())
         {
diff --git a/include/boost/mysql/impl/internal/sansio/auth_plugin_common.hpp b/src/mycosql_internal/sansio/auth_plugin_common.hpp
similarity index 100%
rename from include/boost/mysql/impl/internal/sansio/auth_plugin_common.hpp
rename to src/mycosql_internal/sansio/auth_plugin_common.hpp
diff --git a/include/boost/mysql/impl/internal/sansio/caching_sha2_password.hpp b/src/mycosql_internal/sansio/caching_sha2_password.hpp
similarity index 80%
rename from include/boost/mysql/impl/internal/sansio/caching_sha2_password.hpp
rename to src/mycosql_internal/sansio/caching_sha2_password.hpp
index 8d9a55539..4ec4637e9 100644
--- a/include/boost/mysql/impl/internal/sansio/caching_sha2_password.hpp
+++ b/src/mycosql_internal/sansio/caching_sha2_password.hpp
@@ -10,21 +10,11 @@
 
 #include <boost/mysql/client_errc.hpp>
 #include <boost/mysql/error_code.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/next_action.hpp>
 
-#include <boost/mysql/impl/internal/coroutine.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/protocol_types.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/serialization_context.hpp>
-#include <boost/mysql/impl/internal/protocol/static_buffer.hpp>
-#include <boost/mysql/impl/internal/sansio/auth_plugin_common.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-#include <boost/mysql/impl/internal/sansio/csha2p_encrypt_password.hpp>
-
 #include <boost/asio/ssl/error.hpp>
 #include <boost/container/small_vector.hpp>
-#include <boost/core/span.hpp>
 #include <boost/system/result.hpp>
 #include <boost/system/system_category.hpp>
 
@@ -32,6 +22,16 @@
 #include <cstddef>
 #include <cstdint>
 #include <openssl/sha.h>
+#include <span>
+#include <string_view>
+
+#include "mycosql_internal/coroutine.hpp"
+#include "mycosql_internal/protocol/impl/protocol_types.hpp"
+#include "mycosql_internal/protocol/impl/serialization_context.hpp"
+#include "mycosql_internal/protocol/static_buffer.hpp"
+#include "mycosql_internal/sansio/auth_plugin_common.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+#include "mycosql_internal/sansio/csha2p_encrypt_password.hpp"
 
 // Reference:
 // https://dev.mysql.com/doc/dev/mysql-server/latest/page_caching_sha2_authentication_exchanges.html
@@ -47,9 +47,9 @@ static_assert(csha2p_hash_size <= max_hash_size, "");
 static_assert(csha2p_hash_size == SHA256_DIGEST_LENGTH, "Buffer size mismatch");
 
 inline void csha2p_hash_password_impl(
-    string_view password,
-    span<const std::uint8_t, scramble_size> scramble,
-    span<std::uint8_t, csha2p_hash_size> output
+    std::string_view password,
+    std::span<const std::uint8_t, scramble_size> scramble,
+    std::span<std::uint8_t, csha2p_hash_size> output
 )
 {
     // SHA(SHA(password_sha) concat scramble) XOR password_sha
@@ -74,8 +74,8 @@ inline void csha2p_hash_password_impl(
 }
 
 inline static_buffer<max_hash_size> csha2p_hash_password(
-    string_view password,
-    span<const std::uint8_t, scramble_size> scramble
+    std::string_view password,
+    std::span<const std::uint8_t, scramble_size> scramble
 )
 {
     // Empty passwords are not hashed
@@ -87,7 +87,7 @@ inline static_buffer<max_hash_size> csha2p_hash_password(
     csha2p_hash_password_impl(
         password,
         scramble,
-        span<std::uint8_t, csha2p_hash_size>(res.data(), csha2p_hash_size)
+        std::span<std::uint8_t, csha2p_hash_size>(res.data(), csha2p_hash_size)
     );
     return res;
 }
@@ -96,12 +96,12 @@ class csha2p_algo
 {
     int resume_point_{0};
 
-    static bool is_perform_full_auth(span<const std::uint8_t> server_data)
+    static bool is_perform_full_auth(std::span<const std::uint8_t> server_data)
     {
         return server_data.size() == 1u && server_data[0] == 4;
     }
 
-    static bool is_fast_auth_ok(span<const std::uint8_t> server_data)
+    static bool is_fast_auth_ok(std::span<const std::uint8_t> server_data)
     {
         return server_data.size() == 1u && server_data[0] == 3;
     }
@@ -109,9 +109,9 @@ class csha2p_algo
     static next_action encrypt_password(
         connection_state_data& st,
         std::uint8_t& seqnum,
-        string_view password,
-        span<const std::uint8_t, scramble_size> scramble,
-        span<const std::uint8_t> server_key
+        std::string_view password,
+        std::span<const std::uint8_t, scramble_size> scramble,
+        std::span<const std::uint8_t> server_key
     )
     {
         container::small_vector<std::uint8_t, 512> buff;
@@ -119,7 +119,7 @@ class csha2p_algo
         if (ec)
             return ec;
         return st.write(
-            string_eof{string_view(reinterpret_cast<const char*>(buff.data()), buff.size())},
+            string_eof{std::string_view(reinterpret_cast<const char*>(buff.data()), buff.size())},
             seqnum
         );
     }
@@ -129,9 +129,9 @@ class csha2p_algo
 
     next_action resume(
         connection_state_data& st,
-        span<const std::uint8_t> server_data,
-        string_view password,
-        span<const std::uint8_t, scramble_size> scramble,
+        std::span<const std::uint8_t> server_data,
+        std::string_view password,
+        std::span<const std::uint8_t, scramble_size> scramble,
         bool secure_channel,
         std::uint8_t& seqnum
     )
diff --git a/include/boost/mysql/impl/internal/sansio/close_connection.hpp b/src/mycosql_internal/sansio/close_connection.hpp
similarity index 90%
rename from include/boost/mysql/impl/internal/sansio/close_connection.hpp
rename to src/mycosql_internal/sansio/close_connection.hpp
index d93653232..825f3a1bd 100644
--- a/include/boost/mysql/impl/internal/sansio/close_connection.hpp
+++ b/src/mycosql_internal/sansio/close_connection.hpp
@@ -13,9 +13,9 @@
 #include <boost/mysql/detail/algo_params.hpp>
 #include <boost/mysql/detail/next_action.hpp>
 
-#include <boost/mysql/impl/internal/coroutine.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-#include <boost/mysql/impl/internal/sansio/quit_connection.hpp>
+#include "mycosql_internal/coroutine.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+#include "mycosql_internal/sansio/quit_connection.hpp"
 
 namespace boost {
 namespace mysql {
diff --git a/include/boost/mysql/impl/internal/sansio/close_statement.hpp b/src/mycosql_internal/sansio/close_statement.hpp
similarity index 91%
rename from include/boost/mysql/impl/internal/sansio/close_statement.hpp
rename to src/mycosql_internal/sansio/close_statement.hpp
index 9d6bd4972..66afb1b6f 100644
--- a/include/boost/mysql/impl/internal/sansio/close_statement.hpp
+++ b/src/mycosql_internal/sansio/close_statement.hpp
@@ -11,8 +11,8 @@
 #include <boost/mysql/detail/algo_params.hpp>
 #include <boost/mysql/detail/pipeline.hpp>
 
-#include <boost/mysql/impl/internal/protocol/serialization.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
+#include "mycosql_internal/protocol/serialization.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
 
 namespace boost {
 namespace mysql {
diff --git a/include/boost/mysql/impl/internal/sansio/connect.hpp b/src/mycosql_internal/sansio/connect.hpp
similarity index 89%
rename from include/boost/mysql/impl/internal/sansio/connect.hpp
rename to src/mycosql_internal/sansio/connect.hpp
index 860719f9f..d8f62421f 100644
--- a/include/boost/mysql/impl/internal/sansio/connect.hpp
+++ b/src/mycosql_internal/sansio/connect.hpp
@@ -8,15 +8,16 @@
 #ifndef BOOST_MYSQL_IMPL_INTERNAL_SANSIO_CONNECT_HPP
 #define BOOST_MYSQL_IMPL_INTERNAL_SANSIO_CONNECT_HPP
 
+#include <boost/mysql/any_address.hpp>
 #include <boost/mysql/diagnostics.hpp>
 #include <boost/mysql/error_code.hpp>
 
 #include <boost/mysql/detail/algo_params.hpp>
 #include <boost/mysql/detail/next_action.hpp>
 
-#include <boost/mysql/impl/internal/coroutine.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-#include <boost/mysql/impl/internal/sansio/handshake.hpp>
+#include "mycosql_internal/coroutine.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+#include "mycosql_internal/sansio/handshake.hpp"
 
 namespace boost {
 namespace mysql {
@@ -25,7 +26,7 @@ namespace detail {
 class connect_algo
 {
     int resume_point_{0};
-    const void* server_address_;
+    const any_address* server_address_;
     handshake_algo handshake_;
     error_code stored_ec_;
 
diff --git a/include/boost/mysql/impl/internal/sansio/connection_state.hpp b/src/mycosql_internal/sansio/connection_state.hpp
similarity index 79%
rename from include/boost/mysql/impl/internal/sansio/connection_state.hpp
rename to src/mycosql_internal/sansio/connection_state.hpp
index a43b9fe82..1e877f0cb 100644
--- a/include/boost/mysql/impl/internal/sansio/connection_state.hpp
+++ b/src/mycosql_internal/sansio/connection_state.hpp
@@ -18,28 +18,28 @@
 #include <boost/mysql/detail/any_resumable_ref.hpp>
 #include <boost/mysql/detail/next_action.hpp>
 
-#include <boost/mysql/impl/internal/sansio/close_connection.hpp>
-#include <boost/mysql/impl/internal/sansio/close_statement.hpp>
-#include <boost/mysql/impl/internal/sansio/connect.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-#include <boost/mysql/impl/internal/sansio/execute.hpp>
-#include <boost/mysql/impl/internal/sansio/handshake.hpp>
-#include <boost/mysql/impl/internal/sansio/ping.hpp>
-#include <boost/mysql/impl/internal/sansio/prepare_statement.hpp>
-#include <boost/mysql/impl/internal/sansio/quit_connection.hpp>
-#include <boost/mysql/impl/internal/sansio/read_resultset_head.hpp>
-#include <boost/mysql/impl/internal/sansio/read_some_rows.hpp>
-#include <boost/mysql/impl/internal/sansio/read_some_rows_dynamic.hpp>
-#include <boost/mysql/impl/internal/sansio/reset_connection.hpp>
-#include <boost/mysql/impl/internal/sansio/run_pipeline.hpp>
-#include <boost/mysql/impl/internal/sansio/set_character_set.hpp>
-#include <boost/mysql/impl/internal/sansio/start_execution.hpp>
-#include <boost/mysql/impl/internal/sansio/top_level_algo.hpp>
-
 #include <boost/variant2/variant.hpp>
 
 #include <cstddef>
 
+#include "mycosql_internal/sansio/close_connection.hpp"
+#include "mycosql_internal/sansio/close_statement.hpp"
+#include "mycosql_internal/sansio/connect.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+#include "mycosql_internal/sansio/execute.hpp"
+#include "mycosql_internal/sansio/handshake.hpp"
+#include "mycosql_internal/sansio/ping.hpp"
+#include "mycosql_internal/sansio/prepare_statement.hpp"
+#include "mycosql_internal/sansio/quit_connection.hpp"
+#include "mycosql_internal/sansio/read_resultset_head.hpp"
+#include "mycosql_internal/sansio/read_some_rows.hpp"
+#include "mycosql_internal/sansio/read_some_rows_dynamic.hpp"
+#include "mycosql_internal/sansio/reset_connection.hpp"
+#include "mycosql_internal/sansio/run_pipeline.hpp"
+#include "mycosql_internal/sansio/set_character_set.hpp"
+#include "mycosql_internal/sansio/start_execution.hpp"
+#include "mycosql_internal/sansio/top_level_algo.hpp"
+
 namespace boost {
 namespace mysql {
 namespace detail {
@@ -98,11 +98,13 @@ class connection_state
     // the need for a special null algo
     connection_state(std::size_t read_buffer_size, std::size_t max_buffer_size, bool transport_supports_ssl)
         : st_data_(read_buffer_size, max_buffer_size, transport_supports_ssl),
-          algo_(top_level_algo<quit_connection_algo>(
-              st_data_,
-              st_data_.shared_diag,
-              quit_connection_algo_params{}
-          ))
+          algo_(
+              top_level_algo<quit_connection_algo>(
+                  st_data_,
+                  st_data_.shared_diag,
+                  quit_connection_algo_params{}
+              )
+          )
     {
     }
 
diff --git a/include/boost/mysql/impl/internal/sansio/connection_state_data.hpp b/src/mycosql_internal/sansio/connection_state_data.hpp
similarity index 95%
rename from include/boost/mysql/impl/internal/sansio/connection_state_data.hpp
rename to src/mycosql_internal/sansio/connection_state_data.hpp
index 21d7786fb..aecd18eef 100644
--- a/include/boost/mysql/impl/internal/sansio/connection_state_data.hpp
+++ b/src/mycosql_internal/sansio/connection_state_data.hpp
@@ -18,11 +18,6 @@
 #include <boost/mysql/detail/next_action.hpp>
 #include <boost/mysql/detail/pipeline.hpp>
 
-#include <boost/mysql/impl/internal/protocol/capabilities.hpp>
-#include <boost/mysql/impl/internal/protocol/db_flavor.hpp>
-#include <boost/mysql/impl/internal/protocol/serialization.hpp>
-#include <boost/mysql/impl/internal/sansio/message_reader.hpp>
-
 #include <boost/assert.hpp>
 
 #include <array>
@@ -30,6 +25,11 @@
 #include <cstdint>
 #include <vector>
 
+#include "mycosql_internal/protocol/capabilities.hpp"
+#include "mycosql_internal/protocol/db_flavor.hpp"
+#include "mycosql_internal/protocol/serialization.hpp"
+#include "mycosql_internal/sansio/message_reader.hpp"
+
 namespace boost {
 namespace mysql {
 namespace detail {
diff --git a/include/boost/mysql/impl/internal/sansio/csha2p_encrypt_password.hpp b/src/mycosql_internal/sansio/csha2p_encrypt_password.hpp
similarity index 95%
rename from include/boost/mysql/impl/internal/sansio/csha2p_encrypt_password.hpp
rename to src/mycosql_internal/sansio/csha2p_encrypt_password.hpp
index 2a96859ec..08a2f2202 100644
--- a/include/boost/mysql/impl/internal/sansio/csha2p_encrypt_password.hpp
+++ b/src/mycosql_internal/sansio/csha2p_encrypt_password.hpp
@@ -12,13 +12,9 @@
 
 #include <boost/mysql/client_errc.hpp>
 #include <boost/mysql/error_code.hpp>
-#include <boost/mysql/string_view.hpp>
-
-#include <boost/mysql/impl/internal/sansio/auth_plugin_common.hpp>
 
 #include <boost/assert/source_location.hpp>
 #include <boost/container/small_vector.hpp>
-#include <boost/core/span.hpp>
 #include <boost/system/error_category.hpp>
 #include <boost/system/system_category.hpp>
 
@@ -29,6 +25,10 @@
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
+#include <span>
+#include <string_view>
+
+#include "mycosql_internal/sansio/auth_plugin_common.hpp"
 
 namespace boost {
 namespace mysql {
@@ -67,8 +67,8 @@ inline error_code translate_openssl_error(
 }
 
 inline container::small_vector<std::uint8_t, 512> csha2p_salt_password(
-    string_view password,
-    span<const std::uint8_t, scramble_size> scramble
+    std::string_view password,
+    std::span<const std::uint8_t, scramble_size> scramble
 )
 {
     // Salt the password, as a NULL-terminated string
@@ -84,9 +84,9 @@ inline container::small_vector<std::uint8_t, 512> csha2p_salt_password(
 }
 
 inline error_code csha2p_encrypt_password(
-    string_view password,
-    span<const std::uint8_t, scramble_size> scramble,
-    span<const std::uint8_t> server_key,
+    std::string_view password,
+    std::span<const std::uint8_t, scramble_size> scramble,
+    std::span<const std::uint8_t> server_key,
     container::small_vector<std::uint8_t, 512>& output,
     const system::error_category& openssl_category
 )
diff --git a/include/boost/mysql/impl/internal/sansio/execute.hpp b/src/mycosql_internal/sansio/execute.hpp
similarity index 91%
rename from include/boost/mysql/impl/internal/sansio/execute.hpp
rename to src/mycosql_internal/sansio/execute.hpp
index 754ac8644..b475e73a0 100644
--- a/include/boost/mysql/impl/internal/sansio/execute.hpp
+++ b/src/mycosql_internal/sansio/execute.hpp
@@ -15,11 +15,11 @@
 #include <boost/mysql/detail/any_execution_request.hpp>
 #include <boost/mysql/detail/execution_processor/execution_processor.hpp>
 
-#include <boost/mysql/impl/internal/coroutine.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-#include <boost/mysql/impl/internal/sansio/read_resultset_head.hpp>
-#include <boost/mysql/impl/internal/sansio/read_some_rows.hpp>
-#include <boost/mysql/impl/internal/sansio/start_execution.hpp>
+#include "mycosql_internal/coroutine.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+#include "mycosql_internal/sansio/read_resultset_head.hpp"
+#include "mycosql_internal/sansio/read_some_rows.hpp"
+#include "mycosql_internal/sansio/start_execution.hpp"
 
 namespace boost {
 namespace mysql {
diff --git a/include/boost/mysql/impl/internal/sansio/handshake.hpp b/src/mycosql_internal/sansio/handshake.hpp
similarity index 92%
rename from include/boost/mysql/impl/internal/sansio/handshake.hpp
rename to src/mycosql_internal/sansio/handshake.hpp
index a51347196..7211fe5b0 100644
--- a/include/boost/mysql/impl/internal/sansio/handshake.hpp
+++ b/src/mycosql_internal/sansio/handshake.hpp
@@ -14,30 +14,30 @@
 #include <boost/mysql/error_code.hpp>
 #include <boost/mysql/handshake_params.hpp>
 #include <boost/mysql/mysql_collations.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/algo_params.hpp>
 #include <boost/mysql/detail/next_action.hpp>
 #include <boost/mysql/detail/ok_view.hpp>
 
-#include <boost/mysql/impl/internal/coroutine.hpp>
-#include <boost/mysql/impl/internal/protocol/capabilities.hpp>
-#include <boost/mysql/impl/internal/protocol/db_flavor.hpp>
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
-#include <boost/mysql/impl/internal/protocol/serialization.hpp>
-#include <boost/mysql/impl/internal/protocol/static_buffer.hpp>
-#include <boost/mysql/impl/internal/sansio/auth_plugin_common.hpp>
-#include <boost/mysql/impl/internal/sansio/caching_sha2_password.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-#include <boost/mysql/impl/internal/sansio/mysql_native_password.hpp>
-
-#include <boost/core/span.hpp>
 #include <boost/system/result.hpp>
 #include <boost/variant2/variant.hpp>
 
 #include <array>
 #include <cstdint>
 #include <cstring>
+#include <span>
+#include <string_view>
+
+#include "mycosql_internal/coroutine.hpp"
+#include "mycosql_internal/protocol/capabilities.hpp"
+#include "mycosql_internal/protocol/db_flavor.hpp"
+#include "mycosql_internal/protocol/deserialization.hpp"
+#include "mycosql_internal/protocol/serialization.hpp"
+#include "mycosql_internal/protocol/static_buffer.hpp"
+#include "mycosql_internal/sansio/auth_plugin_common.hpp"
+#include "mycosql_internal/sansio/caching_sha2_password.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+#include "mycosql_internal/sansio/mysql_native_password.hpp"
 
 namespace boost {
 namespace mysql {
@@ -63,7 +63,7 @@ class any_authentication_plugin
     any_authentication_plugin() = default;
 
     // Emplaces a plugin of the type given by plugin_name. Errors on unknown plugin
-    error_code emplace_by_name(string_view plugin_name)
+    error_code emplace_by_name(std::string_view plugin_name)
     {
         if (plugin_name == mnp_plugin_name)
         {
@@ -84,8 +84,8 @@ class any_authentication_plugin
 
     // Hashes the password with the selected plugin
     static_buffer<max_hash_size> hash_password(
-        string_view password,
-        span<const std::uint8_t, scramble_size> scramble
+        std::string_view password,
+        std::span<const std::uint8_t, scramble_size> scramble
     ) const
     {
         switch (type_)
@@ -99,9 +99,9 @@ class any_authentication_plugin
     // Invokes the plugin action. Use when a more_data packet is received.
     next_action resume(
         connection_state_data& st,
-        span<const std::uint8_t> server_data,
-        string_view password,
-        span<const std::uint8_t, scramble_size> scramble,
+        std::span<const std::uint8_t> server_data,
+        std::string_view password,
+        std::span<const std::uint8_t, scramble_size> scramble,
         bool secure_channel,
         std::uint8_t& seqnum
     )
@@ -119,7 +119,7 @@ class any_authentication_plugin
         }
     }
 
-    string_view name() const
+    std::string_view name() const
     {
         switch (type_)
         {
@@ -216,7 +216,7 @@ class handshake_algo
     }
 
     // Saves the scramble, checking that it has the right size
-    error_code save_scramble(span<const std::uint8_t> value)
+    error_code save_scramble(std::span<const std::uint8_t> value)
     {
         // All scrambles must have exactly this size. Otherwise, it's a protocol violation error
         if (value.size() != scramble_size)
@@ -229,7 +229,11 @@ class handshake_algo
         return error_code();
     }
 
-    error_code process_hello(connection_state_data& st, diagnostics& diag, span<const std::uint8_t> buffer)
+    error_code process_hello(
+        connection_state_data& st,
+        diagnostics& diag,
+        std::span<const std::uint8_t> buffer
+    )
     {
         // Deserialize server hello
         server_hello hello{};
diff --git a/include/boost/mysql/impl/internal/sansio/message_reader.hpp b/src/mycosql_internal/sansio/message_reader.hpp
similarity index 90%
rename from include/boost/mysql/impl/internal/sansio/message_reader.hpp
rename to src/mycosql_internal/sansio/message_reader.hpp
index 5fde41d1d..e3261d63b 100644
--- a/include/boost/mysql/impl/internal/sansio/message_reader.hpp
+++ b/src/mycosql_internal/sansio/message_reader.hpp
@@ -11,17 +11,17 @@
 #include <boost/mysql/client_errc.hpp>
 #include <boost/mysql/error_code.hpp>
 
-#include <boost/mysql/impl/internal/coroutine.hpp>
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
-#include <boost/mysql/impl/internal/protocol/frame_header.hpp>
-#include <boost/mysql/impl/internal/sansio/read_buffer.hpp>
-
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
 
 #include <cstddef>
 #include <cstdint>
 
+#include "mycosql_internal/coroutine.hpp"
+#include "mycosql_internal/protocol/deserialization.hpp"
+#include "mycosql_internal/protocol/frame_header.hpp"
+#include "mycosql_internal/sansio/read_buffer.hpp"
+
 namespace boost {
 namespace mysql {
 namespace detail {
@@ -78,7 +78,7 @@ class message_reader
 
     // Returns the last parsed message. Valid until prepare_buffer()
     // is next called. Requires done() && !error()
-    span<const std::uint8_t> message() const
+    std::span<const std::uint8_t> message() const
     {
         BOOST_ASSERT(done());
         BOOST_ASSERT(!error());
@@ -86,7 +86,7 @@ class message_reader
     }
 
     // Returns buffer space suitable to read bytes to
-    span<std::uint8_t> buffer() { return buffer_.free_area(); }
+    std::span<std::uint8_t> buffer() { return buffer_.free_area(); }
 
     // Removes old messages stored in the buffer, and resizes it, if required, to accommodate
     // the message currently being parsed.
@@ -99,8 +99,7 @@ class message_reader
         // 1. The cost of memmove is low: active data (current_message + pending)
         // is small enough to make the copy cheap.
         // 2. Compaction could prevent a reallocation.
-        if (occupied_space <= small_move_threshold ||
-            (state_.required_size > buffer_.free_size()))
+        if (occupied_space <= small_move_threshold || (state_.required_size > buffer_.free_size()))
         {
             buffer_.remove_reserved();
         }
@@ -136,10 +135,12 @@ class message_reader
                 buffer_.move_to_current_message(frame_header_size);
 
                 // Deserialize the header
-                header = deserialize_frame_header(span<const std::uint8_t, frame_header_size>(
-                    buffer_.pending_first() - frame_header_size,
-                    frame_header_size
-                ));
+                header = deserialize_frame_header(
+                    std::span<const std::uint8_t, frame_header_size>(
+                        buffer_.pending_first() - frame_header_size,
+                        frame_header_size
+                    )
+                );
 
                 // Process the sequence number
                 if (*state_.sequence_number != header.sequence_number)
diff --git a/include/boost/mysql/impl/internal/sansio/mysql_native_password.hpp b/src/mycosql_internal/sansio/mysql_native_password.hpp
similarity index 81%
rename from include/boost/mysql/impl/internal/sansio/mysql_native_password.hpp
rename to src/mycosql_internal/sansio/mysql_native_password.hpp
index 0b2b13a42..36acc98ef 100644
--- a/include/boost/mysql/impl/internal/sansio/mysql_native_password.hpp
+++ b/src/mycosql_internal/sansio/mysql_native_password.hpp
@@ -9,19 +9,19 @@
 #define BOOST_MYSQL_IMPL_INTERNAL_SANSIO_MYSQL_NATIVE_PASSWORD_HPP
 
 #include <boost/mysql/client_errc.hpp>
-#include <boost/mysql/string_view.hpp>
-
-#include <boost/mysql/impl/internal/protocol/static_buffer.hpp>
-#include <boost/mysql/impl/internal/sansio/auth_plugin_common.hpp>
 
 #include <boost/config.hpp>
-#include <boost/core/span.hpp>
 #include <boost/system/result.hpp>
 
 #include <array>
 #include <cstddef>
 #include <cstdint>
 #include <openssl/sha.h>
+#include <span>
+#include <string_view>
+
+#include "mycosql_internal/protocol/static_buffer.hpp"
+#include "mycosql_internal/sansio/auth_plugin_common.hpp"
 
 // Reference:
 // https://dev.mysql.com/doc/dev/mysql-server/8.4.4/page_protocol_connection_phase_authentication_methods_native_password_authentication.html
@@ -38,9 +38,9 @@ static_assert(mnp_hash_size == SHA_DIGEST_LENGTH, "Buffer size mismatch");
 
 // SHA1( password ) XOR SHA1( "20-bytes random data from server" <concat> SHA1( SHA1( password ) ) )
 inline void mnp_hash_password_impl(
-    string_view password,
-    span<const std::uint8_t, scramble_size> scramble,
-    span<std::uint8_t, mnp_hash_size> output
+    std::string_view password,
+    std::span<const std::uint8_t, scramble_size> scramble,
+    std::span<std::uint8_t, mnp_hash_size> output
 )
 {
     // SHA1 (password)
@@ -63,8 +63,8 @@ inline void mnp_hash_password_impl(
 
 // The static buffer size is chosen so that every plugin uses the same size
 inline static_buffer<max_hash_size> mnp_hash_password(
-    string_view password,
-    span<const std::uint8_t, scramble_size> scramble
+    std::string_view password,
+    std::span<const std::uint8_t, scramble_size> scramble
 )
 {
     // Empty passwords are not hashed
@@ -73,7 +73,11 @@ inline static_buffer<max_hash_size> mnp_hash_password(
 
     // Run the algorithm
     static_buffer<max_hash_size> res(mnp_hash_size);
-    mnp_hash_password_impl(password, scramble, span<std::uint8_t, mnp_hash_size>(res.data(), mnp_hash_size));
+    mnp_hash_password_impl(
+        password,
+        scramble,
+        std::span<std::uint8_t, mnp_hash_size>(res.data(), mnp_hash_size)
+    );
     return res;
 }
 
diff --git a/include/boost/mysql/impl/internal/sansio/ping.hpp b/src/mycosql_internal/sansio/ping.hpp
similarity index 89%
rename from include/boost/mysql/impl/internal/sansio/ping.hpp
rename to src/mycosql_internal/sansio/ping.hpp
index f26912b99..36ecf3284 100644
--- a/include/boost/mysql/impl/internal/sansio/ping.hpp
+++ b/src/mycosql_internal/sansio/ping.hpp
@@ -12,9 +12,9 @@
 
 #include <boost/mysql/detail/algo_params.hpp>
 
-#include <boost/mysql/impl/internal/coroutine.hpp>
-#include <boost/mysql/impl/internal/protocol/serialization.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
+#include "mycosql_internal/coroutine.hpp"
+#include "mycosql_internal/protocol/serialization.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
 
 namespace boost {
 namespace mysql {
diff --git a/include/boost/mysql/impl/internal/sansio/prepare_statement.hpp b/src/mycosql_internal/sansio/prepare_statement.hpp
similarity index 94%
rename from include/boost/mysql/impl/internal/sansio/prepare_statement.hpp
rename to src/mycosql_internal/sansio/prepare_statement.hpp
index ea19ec2c8..15d71f7f0 100644
--- a/include/boost/mysql/impl/internal/sansio/prepare_statement.hpp
+++ b/src/mycosql_internal/sansio/prepare_statement.hpp
@@ -15,9 +15,9 @@
 #include <boost/mysql/detail/algo_params.hpp>
 #include <boost/mysql/detail/next_action.hpp>
 
-#include <boost/mysql/impl/internal/coroutine.hpp>
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
+#include "mycosql_internal/coroutine.hpp"
+#include "mycosql_internal/protocol/deserialization.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
 
 namespace boost {
 namespace mysql {
@@ -79,7 +79,7 @@ class prepare_statement_algo
 {
     int resume_point_{0};
     read_prepare_statement_response_algo read_response_st_;
-    string_view stmt_sql_;
+    std::string_view stmt_sql_;
 
 public:
     prepare_statement_algo(prepare_statement_algo_params params) noexcept
diff --git a/include/boost/mysql/impl/internal/sansio/quit_connection.hpp b/src/mycosql_internal/sansio/quit_connection.hpp
similarity index 91%
rename from include/boost/mysql/impl/internal/sansio/quit_connection.hpp
rename to src/mycosql_internal/sansio/quit_connection.hpp
index 5c0c027c4..058771cfc 100644
--- a/include/boost/mysql/impl/internal/sansio/quit_connection.hpp
+++ b/src/mycosql_internal/sansio/quit_connection.hpp
@@ -14,9 +14,9 @@
 #include <boost/mysql/detail/algo_params.hpp>
 #include <boost/mysql/detail/next_action.hpp>
 
-#include <boost/mysql/impl/internal/coroutine.hpp>
-#include <boost/mysql/impl/internal/protocol/serialization.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
+#include "mycosql_internal/coroutine.hpp"
+#include "mycosql_internal/protocol/serialization.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
 
 namespace boost {
 namespace mysql {
diff --git a/include/boost/mysql/impl/internal/sansio/read_buffer.hpp b/src/mycosql_internal/sansio/read_buffer.hpp
similarity index 92%
rename from include/boost/mysql/impl/internal/sansio/read_buffer.hpp
rename to src/mycosql_internal/sansio/read_buffer.hpp
index 9197bbafe..5edac2d29 100644
--- a/include/boost/mysql/impl/internal/sansio/read_buffer.hpp
+++ b/src/mycosql_internal/sansio/read_buffer.hpp
@@ -11,17 +11,17 @@
 #include <boost/mysql/client_errc.hpp>
 #include <boost/mysql/error_code.hpp>
 
-#include <boost/mysql/impl/internal/next_power_of_two.hpp>
-
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
-#include <boost/core/span.hpp>
 
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
+#include <span>
 #include <vector>
 
+#include "mycosql_internal/next_power_of_two.hpp"
+
 namespace boost {
 namespace mysql {
 namespace detail {
@@ -78,13 +78,16 @@ class read_buffer
     std::size_t pending_size() const noexcept { return free_offset_ - pending_offset_; }
     std::size_t free_size() const noexcept { return buffer_.size() - free_offset_; }
 
-    span<const std::uint8_t> reserved_area() const noexcept { return {reserved_first(), reserved_size()}; }
-    span<const std::uint8_t> current_message() const noexcept
+    std::span<const std::uint8_t> reserved_area() const noexcept
+    {
+        return {reserved_first(), reserved_size()};
+    }
+    std::span<const std::uint8_t> current_message() const noexcept
     {
         return {current_message_first(), current_message_size()};
     }
-    span<const std::uint8_t> pending_area() const noexcept { return {pending_first(), pending_size()}; }
-    span<std::uint8_t> free_area() noexcept { return {free_first(), free_size()}; }
+    std::span<const std::uint8_t> pending_area() const noexcept { return {pending_first(), pending_size()}; }
+    std::span<std::uint8_t> free_area() noexcept { return {free_first(), free_size()}; }
 
     // Moves n bytes from the free to the processing area (e.g. they've been read)
     void move_to_pending(std::size_t length) noexcept
diff --git a/include/boost/mysql/impl/internal/sansio/read_resultset_head.hpp b/src/mycosql_internal/sansio/read_resultset_head.hpp
similarity index 96%
rename from include/boost/mysql/impl/internal/sansio/read_resultset_head.hpp
rename to src/mycosql_internal/sansio/read_resultset_head.hpp
index 8e52d7f20..fbc8c4b39 100644
--- a/include/boost/mysql/impl/internal/sansio/read_resultset_head.hpp
+++ b/src/mycosql_internal/sansio/read_resultset_head.hpp
@@ -15,8 +15,8 @@
 #include <boost/mysql/detail/execution_processor/execution_processor.hpp>
 #include <boost/mysql/detail/next_action.hpp>
 
-#include <boost/mysql/impl/internal/coroutine.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
+#include "mycosql_internal/coroutine.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
 
 namespace boost {
 namespace mysql {
@@ -25,7 +25,7 @@ namespace detail {
 inline error_code process_execution_response(
     connection_state_data& st,
     execution_processor& proc,
-    span<const std::uint8_t> msg,
+    std::span<const std::uint8_t> msg,
     diagnostics& diag
 )
 {
@@ -45,7 +45,7 @@ inline error_code process_execution_response(
 
 inline error_code process_field_definition(
     execution_processor& proc,
-    span<const std::uint8_t> msg,
+    std::span<const std::uint8_t> msg,
     diagnostics& diag
 )
 {
diff --git a/include/boost/mysql/impl/internal/sansio/read_some_rows.hpp b/src/mycosql_internal/sansio/read_some_rows.hpp
similarity index 96%
rename from include/boost/mysql/impl/internal/sansio/read_some_rows.hpp
rename to src/mycosql_internal/sansio/read_some_rows.hpp
index 5392781c6..50eab3813 100644
--- a/include/boost/mysql/impl/internal/sansio/read_some_rows.hpp
+++ b/src/mycosql_internal/sansio/read_some_rows.hpp
@@ -16,12 +16,12 @@
 #include <boost/mysql/detail/execution_processor/execution_processor.hpp>
 #include <boost/mysql/detail/next_action.hpp>
 
-#include <boost/mysql/impl/internal/coroutine.hpp>
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-
 #include <cstddef>
 
+#include "mycosql_internal/coroutine.hpp"
+#include "mycosql_internal/protocol/deserialization.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+
 namespace boost {
 namespace mysql {
 namespace detail {
diff --git a/include/boost/mysql/impl/internal/sansio/read_some_rows_dynamic.hpp b/src/mycosql_internal/sansio/read_some_rows_dynamic.hpp
similarity index 91%
rename from include/boost/mysql/impl/internal/sansio/read_some_rows_dynamic.hpp
rename to src/mycosql_internal/sansio/read_some_rows_dynamic.hpp
index b28895f9d..3f21ccbba 100644
--- a/include/boost/mysql/impl/internal/sansio/read_some_rows_dynamic.hpp
+++ b/src/mycosql_internal/sansio/read_some_rows_dynamic.hpp
@@ -16,11 +16,11 @@
 #include <boost/mysql/detail/execution_processor/execution_processor.hpp>
 #include <boost/mysql/detail/execution_processor/execution_state_impl.hpp>
 
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-#include <boost/mysql/impl/internal/sansio/read_some_rows.hpp>
-
 #include <cstddef>
 
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+#include "mycosql_internal/sansio/read_some_rows.hpp"
+
 namespace boost {
 namespace mysql {
 namespace detail {
diff --git a/include/boost/mysql/impl/internal/sansio/reset_connection.hpp b/src/mycosql_internal/sansio/reset_connection.hpp
similarity index 89%
rename from include/boost/mysql/impl/internal/sansio/reset_connection.hpp
rename to src/mycosql_internal/sansio/reset_connection.hpp
index a70afc0aa..1ead7ee02 100644
--- a/include/boost/mysql/impl/internal/sansio/reset_connection.hpp
+++ b/src/mycosql_internal/sansio/reset_connection.hpp
@@ -13,10 +13,10 @@
 
 #include <boost/mysql/detail/algo_params.hpp>
 
-#include <boost/mysql/impl/internal/coroutine.hpp>
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
-#include <boost/mysql/impl/internal/protocol/serialization.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
+#include "mycosql_internal/coroutine.hpp"
+#include "mycosql_internal/protocol/deserialization.hpp"
+#include "mycosql_internal/protocol/serialization.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
 
 namespace boost {
 namespace mysql {
diff --git a/include/boost/mysql/impl/internal/sansio/run_pipeline.hpp b/src/mycosql_internal/sansio/run_pipeline.hpp
similarity index 94%
rename from include/boost/mysql/impl/internal/sansio/run_pipeline.hpp
rename to src/mycosql_internal/sansio/run_pipeline.hpp
index 554374844..7be542b8e 100644
--- a/include/boost/mysql/impl/internal/sansio/run_pipeline.hpp
+++ b/src/mycosql_internal/sansio/run_pipeline.hpp
@@ -19,19 +19,19 @@
 #include <boost/mysql/detail/next_action.hpp>
 #include <boost/mysql/detail/pipeline.hpp>
 
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-#include <boost/mysql/impl/internal/sansio/execute.hpp>
-#include <boost/mysql/impl/internal/sansio/ping.hpp>
-#include <boost/mysql/impl/internal/sansio/prepare_statement.hpp>
-#include <boost/mysql/impl/internal/sansio/reset_connection.hpp>
-#include <boost/mysql/impl/internal/sansio/set_character_set.hpp>
-
 #include <boost/assert.hpp>
-#include <boost/core/span.hpp>
 
 #include <cstddef>
+#include <span>
 #include <vector>
 
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+#include "mycosql_internal/sansio/execute.hpp"
+#include "mycosql_internal/sansio/ping.hpp"
+#include "mycosql_internal/sansio/prepare_statement.hpp"
+#include "mycosql_internal/sansio/reset_connection.hpp"
+#include "mycosql_internal/sansio/set_character_set.hpp"
+
 namespace boost {
 namespace mysql {
 namespace detail {
@@ -50,8 +50,8 @@ class run_pipeline_algo
         any_read_algo() noexcept : nothing{} {}
     };
 
-    span<const std::uint8_t> request_buffer_;
-    span<const pipeline_request_stage> stages_;
+    std::span<const std::uint8_t> request_buffer_;
+    std::span<const pipeline_request_stage> stages_;
     std::vector<stage_response>* response_;
 
     int resume_point_{0};
diff --git a/include/boost/mysql/impl/internal/sansio/set_character_set.hpp b/src/mycosql_internal/sansio/set_character_set.hpp
similarity index 93%
rename from include/boost/mysql/impl/internal/sansio/set_character_set.hpp
rename to src/mycosql_internal/sansio/set_character_set.hpp
index fc1b20cad..d27e0aeab 100644
--- a/include/boost/mysql/impl/internal/sansio/set_character_set.hpp
+++ b/src/mycosql_internal/sansio/set_character_set.hpp
@@ -16,15 +16,15 @@
 #include <boost/mysql/detail/algo_params.hpp>
 #include <boost/mysql/detail/next_action.hpp>
 
-#include <boost/mysql/impl/internal/coroutine.hpp>
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
-#include <boost/mysql/impl/internal/protocol/serialization.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-
 #include <boost/system/result.hpp>
 
 #include <cstdint>
 
+#include "mycosql_internal/coroutine.hpp"
+#include "mycosql_internal/protocol/deserialization.hpp"
+#include "mycosql_internal/protocol/serialization.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+
 namespace boost {
 namespace mysql {
 namespace detail {
diff --git a/include/boost/mysql/impl/internal/sansio/start_execution.hpp b/src/mycosql_internal/sansio/start_execution.hpp
similarity index 93%
rename from include/boost/mysql/impl/internal/sansio/start_execution.hpp
rename to src/mycosql_internal/sansio/start_execution.hpp
index 694913505..3707be810 100644
--- a/include/boost/mysql/impl/internal/sansio/start_execution.hpp
+++ b/src/mycosql_internal/sansio/start_execution.hpp
@@ -22,13 +22,13 @@
 #include <boost/mysql/detail/output_string.hpp>
 #include <boost/mysql/detail/resultset_encoding.hpp>
 
-#include <boost/mysql/impl/internal/coroutine.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/serialization_context.hpp>
-#include <boost/mysql/impl/internal/protocol/serialization.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-#include <boost/mysql/impl/internal/sansio/read_resultset_head.hpp>
+#include <span>
 
-#include <boost/core/span.hpp>
+#include "mycosql_internal/coroutine.hpp"
+#include "mycosql_internal/protocol/impl/serialization_context.hpp"
+#include "mycosql_internal/protocol/serialization.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+#include "mycosql_internal/sansio/read_resultset_head.hpp"
 
 namespace boost {
 namespace mysql {
@@ -38,7 +38,7 @@ namespace detail {
 struct query_with_params
 {
     constant_string_view query;
-    span<const format_arg> args;
+    std::span<const format_arg> args;
     format_options opts;
 
     void serialize(serialization_context& ctx) const
diff --git a/include/boost/mysql/impl/internal/sansio/top_level_algo.hpp b/src/mycosql_internal/sansio/top_level_algo.hpp
similarity index 94%
rename from include/boost/mysql/impl/internal/sansio/top_level_algo.hpp
rename to src/mycosql_internal/sansio/top_level_algo.hpp
index 0fa0ae6bd..a531642b4 100644
--- a/include/boost/mysql/impl/internal/sansio/top_level_algo.hpp
+++ b/src/mycosql_internal/sansio/top_level_algo.hpp
@@ -14,14 +14,13 @@
 
 #include <boost/mysql/detail/next_action.hpp>
 
-#include <boost/mysql/impl/internal/coroutine.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-#include <boost/mysql/impl/internal/sansio/run_pipeline.hpp>
-
-#include <boost/core/span.hpp>
-
 #include <cstddef>
 #include <cstdint>
+#include <span>
+
+#include "mycosql_internal/coroutine.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+#include "mycosql_internal/sansio/run_pipeline.hpp"
 
 #ifdef BOOST_USE_VALGRIND
 #include <valgrind/memcheck.h>
@@ -52,7 +51,7 @@ class top_level_algo
     connection_state_data* st_;
     diagnostics* diag_;
     InnerAlgo algo_;
-    span<const std::uint8_t> bytes_to_write_;
+    std::span<const std::uint8_t> bytes_to_write_;
 
 public:
     template <class... Args>
diff --git a/include/boost/mysql/impl/internal/ssl_context_with_default.hpp b/src/mycosql_internal/ssl_context_with_default.hpp
similarity index 100%
rename from include/boost/mysql/impl/internal/ssl_context_with_default.hpp
rename to src/mycosql_internal/ssl_context_with_default.hpp
diff --git a/src/mycosql_internal/variant_stream.hpp b/src/mycosql_internal/variant_stream.hpp
new file mode 100644
index 000000000..975a98c04
--- /dev/null
+++ b/src/mycosql_internal/variant_stream.hpp
@@ -0,0 +1,344 @@
+//
+// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_MYSQL_IMPL_INTERNAL_VARIANT_STREAM_HPP
+#define BOOST_MYSQL_IMPL_INTERNAL_VARIANT_STREAM_HPP
+
+#include <boost/mysql/any_address.hpp>
+#include <boost/mysql/error_code.hpp>
+
+#include <boost/mysql/detail/access.hpp>
+#include <boost/mysql/detail/engine.hpp>
+
+#include <boost/assert.hpp>
+#include <boost/capy/ex/execution_context.hpp>
+#include <boost/capy/io/any_stream.hpp>
+#include <boost/capy/io_task.hpp>
+#include <boost/corosio/native/native_socket_option.hpp>
+#include <boost/corosio/openssl_stream.hpp>
+#include <boost/corosio/resolver.hpp>
+#include <boost/corosio/resolver_results.hpp>
+#include <boost/corosio/tcp_socket.hpp>
+#include <boost/corosio/tls_context.hpp>
+#include <boost/corosio/tls_stream.hpp>
+
+#include <optional>
+#include <string>
+
+#include "mycosql_internal/coroutine.hpp"
+#include "mycosql_internal/ssl_context_with_default.hpp"
+
+namespace boost {
+namespace mysql {
+namespace detail {
+
+// TODO: this should be in corosio
+inline capy::io_task<> range_connect(corosio::tcp_socket& sock, const corosio::resolver_results& endpoints)
+{
+    error_code ec;
+    for (auto const& ep : endpoints)
+    {
+        ec = (co_await sock.connect(ep)).ec;
+        if (!ec)
+        {
+            co_return {};
+        }
+        sock.close();  // TODO: check this, check socket opening
+    }
+    co_return {ec};
+}
+
+// Implements the EngineStream concept (see stream_adaptor)
+class variant_stream final : public mysql_stream
+{
+    corosio::resolver resolv_;
+    corosio::tcp_socket sock_;
+    std::optional<corosio::openssl_stream> ssl_stream_;
+    bool tls_enabled_{false};
+    // TODO: UNIX
+
+public:
+    variant_stream(capy::execution_context& ctx) : mysql_stream(true), resolv_(ctx), sock_(ctx) {}
+
+    capy::io_task<std::size_t> read_some(capy::mutable_buffer buff) override
+    {
+        if (ssl_stream_.has_value())
+            co_return co_await ssl_stream_->read_some(buff);
+        else
+            co_return co_await sock_.read_some(buff);
+    }
+
+    capy::io_task<std::size_t> write_some(capy::const_buffer buff) override
+    {
+        if (ssl_stream_.has_value())
+            co_return co_await ssl_stream_->write_some(buff);
+        else
+            co_return co_await sock_.write_some(buff);
+    }
+
+    capy::io_task<> connect(const any_address& addr) override
+    {
+        // Clean up any previous state
+        tls_enabled_ = false;
+        sock_.close();
+
+        // Set up the endpoints vector
+        if (addr.type() == address_type::host_and_port)
+        {
+            // TODO: lazy construct the resolver?
+
+            // Resolve the endpoints
+            auto [ec1, eps] = co_await resolv_.resolve(addr.hostname(), std::to_string(addr.port()));
+            if (ec1)
+                co_return {ec1};
+
+            // Connect
+            auto [ec2] = co_await range_connect(sock_, eps);
+            if (ec2)
+                co_return {ec2};
+
+            // Disable Naggle's algorithm
+            sock_.set_option(corosio::native_socket_option::no_delay(true));
+        }
+        else
+        {
+            // TODO
+            //             BOOST_ASSERT(addr_->type() == address_type::unix_path);
+            // #ifdef BOOST_ASIO_HAS_LOCAL_SOCKETS
+            //             endpoints_.push_back(asio::local::stream_protocol::endpoint(address()));
+            // #else
+            //             BOOST_MYSQL_YIELD(resume_point_, 3, vsconnect_action::immediate_tag{});
+            //             return vsconnect_action(asio::error::operation_not_supported);
+            // #endif
+        }
+
+        co_return {};
+    }
+
+    capy::io_task<> tls_handshake() override
+    {
+        BOOST_ASSERT(!tls_enabled_);
+
+        // TODO: accept the TLS context
+        // Create the stream if required
+        if (ssl_stream_)
+            ssl_stream_->reset();
+        else
+            ssl_stream_.emplace(capy::any_stream(&sock_), corosio::tls_context());
+
+        // Actually perform the handshake
+        auto [ec] = co_await ssl_stream_->handshake(corosio::tls_stream::client);
+        if (ec)
+            co_return {ec};
+
+        // Record that we should be using TLS from now on
+        tls_enabled_ = true;
+
+        co_return {};
+    }
+
+    capy::io_task<> tls_shutdown() override
+    {
+        BOOST_ASSERT(tls_enabled_);
+        BOOST_ASSERT(ssl_stream_.has_value());
+        auto [ec] = co_await ssl_stream_->shutdown();
+        tls_enabled_ = false;
+        co_return {ec};
+    }
+
+    capy::io_task<> close() override
+    {
+        sock_.shutdown(corosio::tcp_socket::shutdown_both);
+        sock_.close();
+        co_return {};
+    }
+
+    // // SSL
+    // void ssl_handshake(error_code& ec)
+    // {
+    //     st_.create_ssl_stream().handshake(asio::ssl::stream_base::client, ec);
+    // }
+
+    // template <class CompletionToken>
+    // void async_ssl_handshake(CompletionToken&& token)
+    // {
+    //     st_.create_ssl_stream();
+    //     st_.ssl->async_handshake(asio::ssl::stream_base::client, std::forward<CompletionToken>(token));
+    // }
+
+    // void ssl_shutdown(error_code& ec)
+    // {
+    //     BOOST_ASSERT(st_.ssl.has_value());
+    //     st_.ssl->shutdown(ec);
+    // }
+
+    // template <class CompletionToken>
+    // void async_ssl_shutdown(CompletionToken&& token)
+    // {
+    //     BOOST_ASSERT(st_.ssl.has_value());
+    //     st_.ssl->async_shutdown(std::forward<CompletionToken>(token));
+    // }
+
+    // // Reading
+    // std::size_t read_some(asio::mutable_buffer buff, bool use_ssl, error_code& ec)
+    // {
+    //     if (use_ssl)
+    //     {
+    //         BOOST_ASSERT(st_.ssl.has_value());
+    //         return st_.ssl->read_some(buff, ec);
+    //     }
+    //     else
+    //     {
+    //         return st_.sock.read_some(buff, ec);
+    //     }
+    // }
+
+    // template <class CompletionToken>
+    // void async_read_some(asio::mutable_buffer buff, bool use_ssl, CompletionToken&& token)
+    // {
+    //     if (use_ssl)
+    //     {
+    //         BOOST_ASSERT(st_.ssl.has_value());
+    //         st_.ssl->async_read_some(buff, std::forward<CompletionToken>(token));
+    //     }
+    //     else
+    //     {
+    //         st_.sock.async_read_some(buff, std::forward<CompletionToken>(token));
+    //     }
+    // }
+
+    // // Writing
+    // std::size_t write_some(boost::asio::const_buffer buff, bool use_ssl, error_code& ec)
+    // {
+    //     if (use_ssl)
+    //     {
+    //         BOOST_ASSERT(st_.ssl.has_value());
+    //         return st_.ssl->write_some(buff, ec);
+    //     }
+    //     else
+    //     {
+    //         return st_.sock.write_some(buff, ec);
+    //     }
+    // }
+
+    // template <class CompletionToken>
+    // void async_write_some(boost::asio::const_buffer buff, bool use_ssl, CompletionToken&& token)
+    // {
+    //     if (use_ssl)
+    //     {
+    //         BOOST_ASSERT(st_.ssl.has_value());
+    //         return st_.ssl->async_write_some(buff, std::forward<CompletionToken>(token));
+    //     }
+    //     else
+    //     {
+    //         return st_.sock.async_write_some(buff, std::forward<CompletionToken>(token));
+    //     }
+    // }
+
+    // // Connect and close
+    // void connect(const void* server_address, error_code& output_ec)
+    // {
+    //     // Setup
+    //     variant_stream_connect_algo algo(st_, *static_cast<const any_address*>(server_address));
+    //     error_code ec;
+    //     asio::ip::tcp::resolver::results_type resolver_results;
+
+    //     // Run until complete
+    //     while (true)
+    //     {
+    //         // The sync algorithm doesn't support cancellation
+    //         auto act = algo.resume(ec, &resolver_results, asio::cancellation_type_t::none);
+    //         switch (act.type)
+    //         {
+    //         case vsconnect_action_type::connect: asio::connect(st_.sock, act.data.connect, ec); break;
+    //         case vsconnect_action_type::resolve:
+    //             resolver_results = algo.resolver()
+    //                                    .resolve(*act.data.resolve.hostname, *act.data.resolve.service, ec);
+    //             break;
+    //         case vsconnect_action_type::immediate: break;  // has effect only for async
+    //         case vsconnect_action_type::none: output_ec = act.data.err; return;
+    //         default: BOOST_ASSERT(false);  // LCOV_EXCL_LINE
+    //         }
+    //     }
+    // }
+
+    // template <class CompletionToken>
+    // void async_connect(const void* server_address, CompletionToken&& token)
+    // {
+    //     asio::async_compose<CompletionToken, void(error_code)>(
+    //         connect_op(*this, *static_cast<const any_address*>(server_address)),
+    //         token,
+    //         get_executor()
+    //     );
+    // }
+
+    // void close(error_code& ec)
+    // {
+    //     st_.sock.shutdown(asio::generic::stream_protocol::socket::shutdown_both, ec);
+    //     st_.sock.close(ec);
+    // }
+
+    // // Exposed for testing
+    // const asio::generic::stream_protocol::socket& socket() const { return st_.sock; }
+
+private:
+    // variant_stream_state st_;
+
+    // struct connect_op
+    // {
+    //     std::unique_ptr<variant_stream_connect_algo> algo_;
+
+    //     connect_op(variant_stream& this_obj, const any_address& server_address)
+    //         : algo_(new variant_stream_connect_algo(this_obj.st_, server_address))
+    //     {
+    //     }
+
+    //     template <class Self>
+    //     void operator()(
+    //         Self& self,
+    //         error_code ec = {},
+    //         const asio::ip::tcp::resolver::results_type& resolver_results = {}
+    //     )
+    //     {
+    //         auto act = algo_->resume(ec, &resolver_results, self.cancelled());
+    //         switch (act.type)
+    //         {
+    //         case vsconnect_action_type::connect:
+    //             asio::async_connect(algo_->socket(), act.data.connect, std::move(self));
+    //             break;
+    //         case vsconnect_action_type::resolve:
+    //             algo_->resolver()
+    //                 .async_resolve(*act.data.resolve.hostname, *act.data.resolve.service, std::move(self));
+    //             break;
+    //         case vsconnect_action_type::immediate:
+    //             asio::dispatch(
+    //                 asio::get_associated_immediate_executor(self, self.get_io_executor()),
+    //                 std::move(self)
+    //             );
+    //             break;
+    //         case vsconnect_action_type::none:
+    //             algo_.reset();
+    //             self.complete(act.data.err);
+    //             break;
+    //         default: BOOST_ASSERT(false);  // LCOV_EXCL_LINE
+    //         }
+    //     }
+
+    //     // Signature for range connect
+    //     template <class Self>
+    //     void operator()(Self& self, error_code ec, asio::generic::stream_protocol::endpoint)
+    //     {
+    //         (*this)(self, ec, asio::ip::tcp::resolver::results_type{});
+    //     }
+    // };
+};
+
+}  // namespace detail
+}  // namespace mysql
+}  // namespace boost
+
+#endif
diff --git a/include/boost/mysql/impl/pipeline.ipp b/src/pipeline.cpp
similarity index 91%
rename from include/boost/mysql/impl/pipeline.ipp
rename to src/pipeline.cpp
index 7f86f2095..ecfeca016 100644
--- a/include/boost/mysql/impl/pipeline.ipp
+++ b/src/pipeline.cpp
@@ -5,11 +5,6 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_PIPELINE_IPP
-#define BOOST_MYSQL_IMPL_PIPELINE_IPP
-
-#pragma once
-
 #include <boost/mysql/error_code.hpp>
 #include <boost/mysql/field_view.hpp>
 #include <boost/mysql/pipeline.hpp>
@@ -18,15 +13,15 @@
 #include <boost/mysql/detail/pipeline.hpp>
 #include <boost/mysql/detail/resultset_encoding.hpp>
 
-#include <boost/mysql/impl/internal/protocol/serialization.hpp>
-#include <boost/mysql/impl/internal/sansio/set_character_set.hpp>
-
-#include <boost/core/span.hpp>
 #include <boost/throw_exception.hpp>
 
+#include <span>
 #include <stdexcept>
 
-boost::mysql::pipeline_request& boost::mysql::pipeline_request::add_execute(string_view query)
+#include "mycosql_internal/protocol/serialization.hpp"
+#include "mycosql_internal/sansio/set_character_set.hpp"
+
+boost::mysql::pipeline_request& boost::mysql::pipeline_request::add_execute(std::string_view query)
 {
     impl_.stages_.reserve(impl_.stages_.size() + 1);  // strong guarantee
     impl_.stages_.push_back({
@@ -39,7 +34,7 @@ boost::mysql::pipeline_request& boost::mysql::pipeline_request::add_execute(stri
 
 boost::mysql::pipeline_request& boost::mysql::pipeline_request::add_execute_range(
     statement stmt,
-    span<const field_view> params
+    std::span<const field_view> params
 )
 {
     if (params.size() != stmt.num_params())
@@ -57,7 +52,9 @@ boost::mysql::pipeline_request& boost::mysql::pipeline_request::add_execute_rang
     return *this;
 }
 
-boost::mysql::pipeline_request& boost::mysql::pipeline_request::add_prepare_statement(string_view stmt_sql)
+boost::mysql::pipeline_request& boost::mysql::pipeline_request::add_prepare_statement(
+    std::string_view stmt_sql
+)
 {
     impl_.stages_.reserve(impl_.stages_.size() + 1);  // strong guarantee
     impl_.stages_.push_back({
@@ -126,5 +123,3 @@ boost::mysql::statement boost::mysql::stage_response::as_statement() const
     }
     return variant2::unsafe_get<1>(impl_.value);
 }
-
-#endif
diff --git a/include/boost/mysql/impl/results_impl.ipp b/src/results_impl.cpp
similarity index 85%
rename from include/boost/mysql/impl/results_impl.ipp
rename to src/results_impl.cpp
index 42552b8c7..52100cad6 100644
--- a/include/boost/mysql/impl/results_impl.ipp
+++ b/src/results_impl.cpp
@@ -5,14 +5,9 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_RESULTS_IMPL_IPP
-#define BOOST_MYSQL_IMPL_RESULTS_IMPL_IPP
-
-#pragma once
-
 #include <boost/mysql/detail/execution_processor/results_impl.hpp>
 
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
+#include "mycosql_internal/protocol/deserialization.hpp"
 
 boost::mysql::detail::per_resultset_data& boost::mysql::detail::resultset_container::emplace_back()
 {
@@ -59,29 +54,37 @@ void boost::mysql::detail::results_impl::on_num_meta_impl(std::size_t num_column
     resultset_data.num_columns = num_columns;
 }
 
-boost::mysql::error_code boost::mysql::detail::results_impl::
-    on_head_ok_packet_impl(const ok_view& pack, diagnostics&)
+boost::mysql::error_code boost::mysql::detail::results_impl::on_head_ok_packet_impl(
+    const ok_view& pack,
+    diagnostics&
+)
 {
     add_resultset();
     on_ok_packet_impl(pack);
     return error_code();
 }
 
-boost::mysql::error_code boost::mysql::detail::results_impl::
-    on_meta_impl(const coldef_view& coldef, bool, diagnostics&)
+boost::mysql::error_code boost::mysql::detail::results_impl::on_meta_impl(
+    const coldef_view& coldef,
+    bool,
+    diagnostics&
+)
 {
     meta_.push_back(create_meta(coldef));
     return error_code();
 }
 
-boost::mysql::error_code boost::mysql::detail::results_impl::
-    on_row_impl(span<const std::uint8_t> msg, const output_ref&, std::vector<field_view>&)
+boost::mysql::error_code boost::mysql::detail::results_impl::on_row_impl(
+    std::span<const std::uint8_t> msg,
+    const output_ref&,
+    std::vector<field_view>&
+)
 {
     BOOST_ASSERT(has_active_batch());
 
     // add row storage
     std::size_t num_fields = current_resultset().num_columns;
-    span<field_view> storage = rows_.add_fields(num_fields);
+    std::span<field_view> storage = rows_.add_fields(num_fields);
     ++current_resultset().num_rows;
 
     // deserialize the row
@@ -144,5 +147,3 @@ void boost::mysql::detail::results_impl::on_ok_packet_impl(const ok_view& pack)
         rows_.offsets_to_string_views();
     }
 }
-
-#endif
diff --git a/include/boost/mysql/impl/resultset.ipp b/src/resultset.cpp
similarity index 90%
rename from include/boost/mysql/impl/resultset.ipp
rename to src/resultset.cpp
index ba4a04b4d..9b1d95940 100644
--- a/include/boost/mysql/impl/resultset.ipp
+++ b/src/resultset.cpp
@@ -5,11 +5,6 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_RESULTSET_IPP
-#define BOOST_MYSQL_IMPL_RESULTSET_IPP
-
-#pragma once
-
 #include <boost/mysql/resultset.hpp>
 
 void boost::mysql::resultset::assign(resultset_view v)
@@ -36,5 +31,3 @@ void boost::mysql::resultset::assign(resultset_view v)
         is_out_params_ = false;
     }
 }
-
-#endif
diff --git a/include/boost/mysql/impl/row_impl.ipp b/src/row_impl.cpp
similarity index 93%
rename from include/boost/mysql/impl/row_impl.ipp
rename to src/row_impl.cpp
index 68541e3dc..769c3a041 100644
--- a/include/boost/mysql/impl/row_impl.ipp
+++ b/src/row_impl.cpp
@@ -5,11 +5,6 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_ROW_IMPL_IPP
-#define BOOST_MYSQL_IMPL_ROW_IMPL_IPP
-
-#pragma once
-
 #include <boost/mysql/detail/row_impl.hpp>
 
 namespace boost {
@@ -32,7 +27,7 @@ inline unsigned char* copy_string(unsigned char* buffer_it, field_view& f)
     if (!str.empty())
     {
         std::memcpy(buffer_it, str.data(), str.size());
-        f = field_view(string_view(reinterpret_cast<const char*>(buffer_it), str.size()));
+        f = field_view(std::string_view(reinterpret_cast<const char*>(buffer_it), str.size()));
         buffer_it += str.size();
     }
     return buffer_it;
@@ -105,10 +100,12 @@ inline field_view offset_to_string_view(field_view fv, const std::uint8_t* buffe
     auto& impl = detail::access::get_impl(fv);
     if (impl.is_string_offset())
     {
-        return field_view(string_view(
-            reinterpret_cast<const char*>(buffer_first) + impl.repr.sv_offset_.offset,
-            impl.repr.sv_offset_.size
-        ));
+        return field_view(
+            std::string_view(
+                reinterpret_cast<const char*>(buffer_first) + impl.repr.sv_offset_.offset,
+                impl.repr.sv_offset_.size
+            )
+        );
     }
     else if (impl.is_blob_offset())
     {
@@ -194,5 +191,3 @@ void boost::mysql::detail::row_impl::offsets_to_string_views()
     for (auto& f : fields_)
         f = offset_to_string_view(f, string_buffer_.data());
 }
-
-#endif
diff --git a/include/boost/mysql/impl/internal/error/server_error_to_string.ipp b/src/server_error_to_string.cpp
similarity index 99%
rename from include/boost/mysql/impl/internal/error/server_error_to_string.ipp
rename to src/server_error_to_string.cpp
index 38e1d39ce..5ab38774b 100644
--- a/include/boost/mysql/impl/internal/error/server_error_to_string.ipp
+++ b/src/server_error_to_string.cpp
@@ -5,18 +5,17 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_INTERNAL_ERROR_SERVER_ERROR_TO_STRING_IPP
-#define BOOST_MYSQL_IMPL_INTERNAL_ERROR_SERVER_ERROR_TO_STRING_IPP
-
 // This file was generated by server_errors.py - do not edit directly.
 
 #include <boost/config.hpp>
-#include <boost/mysql/impl/internal/error/server_error_to_string.hpp>
+
+#include "mycosql_internal/error/server_error_to_string.hpp"
 
 namespace boost {
 namespace mysql {
 namespace detail {
 
+// TODO
 BOOST_INLINE_CONSTEXPR const char* common_error_messages[] = {
     "er_hashchk",
     "er_nisamchk",
@@ -901,9 +900,9 @@ BOOST_INLINE_CONSTEXPR const char* common_error_messages[] = {
 
 };
 
-} // namespace detail
-} // namespace mysql
-} // namespace boost
+}  // namespace detail
+}  // namespace mysql
+}  // namespace boost
 
 const char* boost::mysql::detail::common_error_to_string(int v)
 {
@@ -2210,6 +2209,3 @@ const char* boost::mysql::detail::mariadb_error_to_string(int v)
     default: return "<unknown MariaDB-specific server error>";
     }
 }
-
-#endif
-
diff --git a/include/boost/mysql/impl/static_execution_state_impl.ipp b/src/static_execution_state_impl.cpp
similarity index 90%
rename from include/boost/mysql/impl/static_execution_state_impl.ipp
rename to src/static_execution_state_impl.cpp
index 78540c1b6..3490f66f0 100644
--- a/include/boost/mysql/impl/static_execution_state_impl.ipp
+++ b/src/static_execution_state_impl.cpp
@@ -5,17 +5,11 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_STATIC_EXECUTION_STATE_IMPL_IPP
-#define BOOST_MYSQL_IMPL_STATIC_EXECUTION_STATE_IMPL_IPP
-
-#pragma once
-
 #include <boost/mysql/detail/execution_processor/static_execution_state_impl.hpp>
 #include <boost/mysql/detail/row_impl.hpp>
 
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
+#include "mycosql_internal/protocol/deserialization.hpp"
 
-#ifdef BOOST_MYSQL_CXX14
 void boost::mysql::detail::static_execution_state_erased_impl::reset_impl() noexcept
 {
     resultset_index_ = 0;
@@ -61,7 +55,7 @@ boost::mysql::error_code boost::mysql::detail::static_execution_state_erased_imp
 }
 
 boost::mysql::error_code boost::mysql::detail::static_execution_state_erased_impl::on_row_impl(
-    span<const std::uint8_t> msg,
+    std::span<const std::uint8_t> msg,
     const output_ref& ref,
     std::vector<field_view>& fields
 )
@@ -73,7 +67,7 @@ boost::mysql::error_code boost::mysql::detail::static_execution_state_erased_imp
 
     // Allocate temporary space
     fields.clear();
-    span<field_view> storage = add_fields(fields, meta_.size());
+    std::span<field_view> storage = add_fields(fields, meta_.size());
 
     // deserialize the row
     auto err = deserialize_row(encoding(), msg, meta_, storage);
@@ -118,6 +112,3 @@ boost::mysql::error_code boost::mysql::detail::static_execution_state_erased_imp
     bool is_last = !pack.more_results();
     return should_be_last == is_last ? error_code() : client_errc::num_resultsets_mismatch;
 }
-#endif
-
-#endif
diff --git a/include/boost/mysql/impl/static_results_impl.ipp b/src/static_results_impl.cpp
similarity index 91%
rename from include/boost/mysql/impl/static_results_impl.ipp
rename to src/static_results_impl.cpp
index 4767919ed..a7fd12aaf 100644
--- a/include/boost/mysql/impl/static_results_impl.ipp
+++ b/src/static_results_impl.cpp
@@ -5,18 +5,12 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_MYSQL_IMPL_STATIC_RESULTS_IMPL_IPP
-#define BOOST_MYSQL_IMPL_STATIC_RESULTS_IMPL_IPP
-
-#pragma once
-
 #include <boost/mysql/detail/config.hpp>
 #include <boost/mysql/detail/execution_processor/static_results_impl.hpp>
 #include <boost/mysql/detail/row_impl.hpp>
 
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
+#include "mycosql_internal/protocol/deserialization.hpp"
 
-#ifdef BOOST_MYSQL_CXX14
 void boost::mysql::detail::static_results_erased_impl::reset_impl() noexcept
 {
     ext_.reset_fn()(ext_.rows());
@@ -63,7 +57,7 @@ boost::mysql::error_code boost::mysql::detail::static_results_erased_impl::on_me
 }
 
 boost::mysql::error_code boost::mysql::detail::static_results_erased_impl::on_row_impl(
-    span<const std::uint8_t> msg,
+    std::span<const std::uint8_t> msg,
     const output_ref&,
     std::vector<field_view>& fields
 )
@@ -73,7 +67,7 @@ boost::mysql::error_code boost::mysql::detail::static_results_erased_impl::on_ro
 
     // Allocate temporary storage
     fields.clear();
-    span<field_view> storage = add_fields(fields, meta.size());
+    std::span<field_view> storage = add_fields(fields, meta.size());
 
     // deserialize the row
     auto err = deserialize_row(encoding(), msg, meta, storage);
@@ -119,6 +113,3 @@ boost::mysql::error_code boost::mysql::detail::static_results_erased_impl::on_ok
     bool is_last = !pack.more_results();
     return should_be_last == is_last ? error_code() : client_errc::num_resultsets_mismatch;
 }
-#endif
-
-#endif
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 024410ba6..c8f705fb0 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,46 +5,19 @@
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 #
 
-# Separately compiled Boost.MySQL and Boost.Asio
-add_library(
-    boost_mysql_compiled
-    STATIC
-    common/src/boost_asio.cpp
-    common/src/boost_mysql.cpp
-)
-target_compile_definitions(
-    boost_mysql_compiled
-    PUBLIC
-    BOOST_ASIO_SEPARATE_COMPILATION
-    BOOST_MYSQL_SEPARATE_COMPILATION
-)
-target_link_libraries(boost_mysql_compiled PUBLIC boost_mysql)
-boost_mysql_test_target_settings(boost_mysql_compiled)
-
 # boost_mysql_testing contains common definitions, includes and settings.
-# Note: old versions of cmake require the sources passed to target_sources to be absolute
-add_library(boost_mysql_testing INTERFACE)
-target_sources(
-    boost_mysql_testing
-    INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}/common/src/entry_point.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/common/src/utils.cpp
+add_library(boost_mysql_testing STATIC
+    common/src/utils.cpp
 )
-target_link_libraries(
-    boost_mysql_testing
-    INTERFACE
-    boost_mysql_compiled
-    Boost::unit_test_framework
+target_link_libraries(boost_mysql_testing PUBLIC
+    Boost::mycosql
+    Boost::core
     Boost::pfr
 )
-target_include_directories(
-    boost_mysql_testing
-    INTERFACE
-    common/include
-)
+target_include_directories(boost_mysql_testing PUBLIC common/include)
 
-# Unit testing
-add_subdirectory(unit)
+# # Unit testing
+# add_subdirectory(unit)
 
 # Integration testing
 if(BOOST_MYSQL_INTEGRATION_TESTS)
diff --git a/test/common/include/test_common/assert_buffer_equals.hpp b/test/common/include/test_common/assert_buffer_equals.hpp
index 3f9728191..bc3fa4f42 100644
--- a/test/common/include/test_common/assert_buffer_equals.hpp
+++ b/test/common/include/test_common/assert_buffer_equals.hpp
@@ -8,32 +8,30 @@
 #ifndef BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_ASSERT_BUFFER_EQUALS_HPP
 #define BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_ASSERT_BUFFER_EQUALS_HPP
 
-#include <boost/core/span.hpp>
-#include <boost/test/unit_test.hpp>
+#include <boost/core/lightweight_test.hpp>
+
+#include <span>
 
 namespace boost {
 namespace mysql {
 namespace test {
 
+bool buffer_equals(std::span<const std::uint8_t> b1, std::span<const std::uint8_t> b2);
+
 struct buffer_printer
 {
-    span<const std::uint8_t> buff;
+    std::span<const std::uint8_t> buff;
 
-    constexpr buffer_printer(span<const std::uint8_t> b) noexcept : buff(b) {}
+    constexpr buffer_printer(std::span<const std::uint8_t> b) noexcept : buff(b) {}
 };
 
 std::ostream& operator<<(std::ostream& os, buffer_printer buff);
-bool buffer_equals(span<const std::uint8_t> b1, span<const std::uint8_t> b2);
+inline bool operator==(buffer_printer b1, buffer_printer b2) { return buffer_equals(b1.buff, b2.buff); }
 
 }  // namespace test
 }  // namespace mysql
 }  // namespace boost
 
-#define BOOST_MYSQL_ASSERT_BUFFER_EQUALS(b1, b2)                                            \
-    BOOST_TEST(                                                                             \
-        ::boost::mysql::test::buffer_equals(b1, b2),                                        \
-        #b1 " != " #b2 ": \nlhs: " << ::boost::mysql::test::buffer_printer(b1)              \
-                                   << "\nrhs: " << ::boost::mysql::test::buffer_printer(b2) \
-    )
+#define BOOST_MYSQL_ASSERT_BUFFER_EQUALS(b1, b2) BOOST_TEST_EQ(buffer_printer{b1}, buffer_printer{b2})
 
 #endif
diff --git a/test/common/include/test_common/buffer_concat.hpp b/test/common/include/test_common/buffer_concat.hpp
index b60c6c63c..88a8633d6 100644
--- a/test/common/include/test_common/buffer_concat.hpp
+++ b/test/common/include/test_common/buffer_concat.hpp
@@ -8,9 +8,8 @@
 #ifndef BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_BUFFER_CONCAT_HPP
 #define BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_BUFFER_CONCAT_HPP
 
-#include <boost/core/span.hpp>
-
 #include <cstdint>
+#include <span>
 #include <vector>
 
 namespace boost {
@@ -29,14 +28,14 @@ class buffer_builder
 
 public:
     buffer_builder() = default;
-    buffer_builder& add(span<const std::uint8_t> value)
+    buffer_builder& add(std::span<const std::uint8_t> value)
     {
         buff_.insert(buff_.end(), value.begin(), value.end());
         return *this;
     }
     buffer_builder& add(const std::vector<std::uint8_t>& value)
     {
-        return add(span<const std::uint8_t>(value));
+        return add(std::span<const std::uint8_t>(value));
     }
     std::vector<std::uint8_t> build() { return std::move(buff_); }
 };
diff --git a/test/common/include/test_common/check_meta.hpp b/test/common/include/test_common/check_meta.hpp
index 6a74d5a7a..581b33497 100644
--- a/test/common/include/test_common/check_meta.hpp
+++ b/test/common/include/test_common/check_meta.hpp
@@ -12,37 +12,20 @@
 
 #include <boost/mysql/column_type.hpp>
 #include <boost/mysql/metadata_collection_view.hpp>
-#include <boost/mysql/string_view.hpp>
 
-#include <boost/test/unit_test.hpp>
-
-#include <initializer_list>
+#include <string_view>
+#include <vector>
 
 namespace boost {
 namespace mysql {
 namespace test {
 
-inline void check_meta(metadata_collection_view meta, const std::vector<column_type>& expected_types)
-{
-    BOOST_TEST_REQUIRE(meta.size() == expected_types.size());
-    for (std::size_t i = 0; i < meta.size(); ++i)
-    {
-        BOOST_TEST(meta[i].type() == expected_types[i]);
-    }
-}
+void check_meta(metadata_collection_view meta, const std::vector<column_type>& expected_types);
 
-inline void check_meta(
+void check_meta(
     metadata_collection_view meta,
-    const std::vector<std::pair<column_type, string_view>>& expected
-)
-{
-    BOOST_TEST_REQUIRE(meta.size() == expected.size());
-    for (std::size_t i = 0; i < meta.size(); ++i)
-    {
-        BOOST_TEST(meta[i].type() == expected[i].first);
-        BOOST_TEST(meta[i].type() == expected[i].first);
-    }
-}
+    const std::vector<std::pair<column_type, std::string_view>>& expected
+);
 
 }  // namespace test
 }  // namespace mysql
diff --git a/test/common/include/test_common/create_basic.hpp b/test/common/include/test_common/create_basic.hpp
index 2882222eb..ca6e476f2 100644
--- a/test/common/include/test_common/create_basic.hpp
+++ b/test/common/include/test_common/create_basic.hpp
@@ -17,8 +17,6 @@
 
 #include <boost/mysql/detail/access.hpp>
 
-#include <boost/test/unit_test.hpp>
-
 #include <cstddef>
 #include <vector>
 
@@ -27,7 +25,7 @@ namespace mysql {
 namespace test {
 
 template <class... Types>
-BOOST_CXX14_CONSTEXPR std::array<field_view, sizeof...(Types)> make_fv_arr(Types&&... args)
+constexpr std::array<field_view, sizeof...(Types)> make_fv_arr(Types&&... args)
 {
     return std::array<field_view, sizeof...(Types)>{{field_view(std::forward<Types>(args))...}};
 }
@@ -69,21 +67,21 @@ constexpr time maket(int hours, int mins, int secs, int micros = 0)
 }
 
 template <std::size_t N>
-constexpr string_view makesv(const char (&value)[N])
+constexpr std::string_view makesv(const char (&value)[N])
 {
     static_assert(N >= 1, "Expected a C-array literal");
     return string_view(value, N - 1);  // discard null terminator
 }
 
 template <std::size_t N>
-inline string_view makesv(const std::uint8_t (&value)[N])
+inline std::string_view makesv(const std::uint8_t (&value)[N])
 {
-    return string_view(reinterpret_cast<const char*>(value), N);
+    return std::string_view(reinterpret_cast<const char*>(value), N);
 }
 
-inline string_view makesv(const std::uint8_t* value, std::size_t size)
+inline std::string_view makesv(const std::uint8_t* value, std::size_t size)
 {
-    return string_view(reinterpret_cast<const char*>(value), size);
+    return std::string_view(reinterpret_cast<const char*>(value), size);
 }
 
 template <std::size_t N>
diff --git a/test/common/include/test_common/create_diagnostics.hpp b/test/common/include/test_common/create_diagnostics.hpp
index 8220ffb12..0ec069de8 100644
--- a/test/common/include/test_common/create_diagnostics.hpp
+++ b/test/common/include/test_common/create_diagnostics.hpp
@@ -9,25 +9,26 @@
 #define BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_CREATE_DIAGNOSTICS_HPP
 
 #include <boost/mysql/diagnostics.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/access.hpp>
 
+#include <string_view>
+
 namespace boost {
 namespace mysql {
 namespace test {
 
-inline diagnostics create_server_diag(string_view s)
+inline diagnostics create_server_diag(std::string_view s)
 {
     diagnostics res;
-    detail::access::get_impl(res).assign_server(s);
+    detail::access::get_impl(res).assign_server(std::string(s));
     return res;
 }
 
-inline diagnostics create_client_diag(string_view s)
+inline diagnostics create_client_diag(std::string_view s)
 {
     diagnostics res;
-    detail::access::get_impl(res).assign_client(s);
+    detail::access::get_impl(res).assign_client(std::string(s));
     return res;
 }
 
diff --git a/test/common/include/test_common/io_context_fixture.hpp b/test/common/include/test_common/io_context_fixture.hpp
deleted file mode 100644
index 47d586dde..000000000
--- a/test/common/include/test_common/io_context_fixture.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_IO_CONTEXT_FIXTURE_HPP
-#define BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_IO_CONTEXT_FIXTURE_HPP
-
-#include <boost/asio/io_context.hpp>
-
-namespace boost {
-namespace mysql {
-namespace test {
-
-struct io_context_fixture
-{
-    asio::io_context ctx;
-
-    // Checks that we effectively run out of work
-    ~io_context_fixture();
-};
-
-}  // namespace test
-}  // namespace mysql
-}  // namespace boost
-
-#endif
diff --git a/test/common/include/test_common/netfun_maker.hpp b/test/common/include/test_common/netfun_maker.hpp
deleted file mode 100644
index 9f2cdecc2..000000000
--- a/test/common/include/test_common/netfun_maker.hpp
+++ /dev/null
@@ -1,152 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_NETFUN_MAKER_HPP
-#define BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_NETFUN_MAKER_HPP
-
-#include <boost/mysql/common_server_errc.hpp>
-#include <boost/mysql/diagnostics.hpp>
-#include <boost/mysql/error_code.hpp>
-#include <boost/mysql/error_with_diagnostics.hpp>
-
-#include <boost/system/system_error.hpp>
-
-#include <type_traits>
-
-#include "test_common/create_diagnostics.hpp"
-#include "test_common/network_result.hpp"
-
-namespace boost {
-namespace mysql {
-namespace test {
-
-template <class Fn, class... Args>
-auto invoke_polyfill(Fn fn, Args&&... args) ->
-    typename std::enable_if<
-        std::is_function<typename std::remove_pointer<Fn>::type>::value,
-        decltype(fn(std::forward<Args>(args)...))>::type
-{
-    return fn(std::forward<Args>(args)...);
-}
-
-template <class Pmem, class Obj, class... Args>
-auto invoke_polyfill(Pmem fn, Obj& obj, Args&&... args) ->
-    typename std::enable_if<
-        std::is_member_function_pointer<Pmem>::value,
-        decltype((obj.*fn)(std::forward<Args>(args)...))>::type
-{
-    return (obj.*fn)(std::forward<Args>(args)...);
-}
-
-template <class T, class... InvokeArgs>
-void invoke_and_assign(network_result<T>& output, InvokeArgs&&... args)
-{
-    output.value = invoke_polyfill(std::forward<InvokeArgs>(args)...);
-}
-
-template <class... InvokeArgs>
-void invoke_and_assign(network_result<void>&, InvokeArgs&&... args)
-{
-    invoke_polyfill(std::forward<InvokeArgs>(args)...);
-}
-
-template <class R, class IOObject, class... Args>
-struct netfun_maker_impl
-{
-    using signature = std::function<network_result<R>(IOObject&, Args...)>;
-
-    template <class Pfn>
-    static signature sync_errc(Pfn fn)
-    {
-        return [fn](IOObject& obj, Args... args) {
-            network_result<R> res{
-                common_server_errc::er_no,
-                create_server_diag("diagnostics not cleared properly")
-            };
-            invoke_and_assign(res, fn, obj, std::forward<Args>(args)..., res.err, res.diag);
-            return res;
-        };
-    }
-
-    template <class Pfn>
-    static signature sync_errc_nodiag(Pfn fn)
-    {
-        return [fn](IOObject& obj, Args... args) {
-            network_result<R> res{common_server_errc::er_no, create_server_diag("<diagnostics unavailable>")};
-            invoke_and_assign(res, fn, obj, std::forward<Args>(args)..., res.err);
-            return res;
-        };
-    }
-
-    template <class Pfn>
-    static signature sync_exc(Pfn fn)
-    {
-        return [fn](IOObject& obj, Args... args) {
-            network_result<R> res;
-            try
-            {
-                invoke_and_assign(res, fn, obj, std::forward<Args>(args)...);
-            }
-            catch (const boost::mysql::error_with_diagnostics& err)
-            {
-                res.err = err.code();
-                res.diag = err.get_diagnostics();
-            }
-            catch (const boost::system::system_error& err)
-            {
-                res.err = err.code();
-            }
-            return res;
-        };
-    }
-
-    template <class Pfn>
-    static signature async_diag(Pfn fn)
-    {
-        return [fn](IOObject& obj, Args... args) {
-            diagnostics diag;  // checks for clearing diag are performed by as_netresult
-            return invoke_polyfill(fn, obj, std::forward<Args>(args)..., diag, as_netresult).run();
-        };
-    }
-
-    template <class Pfn>
-    static signature async_nodiag(Pfn fn)
-    {
-        return [fn](IOObject& obj, Args... args) {
-            return invoke_polyfill(fn, obj, std::forward<Args>(args)..., as_netresult).run();
-        };
-    }
-};
-
-template <class R, class Obj, class... Args>
-class netfun_maker
-{
-    using impl = netfun_maker_impl<R, Obj&, Args...>;
-
-public:
-    using signature = std::function<network_result<R>(Obj&, Args...)>;
-    using sig_sync_errc = R (Obj::*)(Args..., error_code&, diagnostics&);
-    using sig_sync_errc_nodiag = R (Obj::*)(Args..., error_code&);
-    using sig_sync_errc_nodiag_old =
-        error_code (Obj::*)(Args..., error_code&);  // support old Asio signatures
-    using sig_sync_exc = R (Obj::*)(Args...);
-    using sig_async_diag = runnable_network_result<R> (Obj::*)(Args..., diagnostics&, const as_netresult_t&);
-    using sig_async_nodiag = runnable_network_result<R> (Obj::*)(Args..., const as_netresult_t&);
-
-    static signature sync_errc(sig_sync_errc pfn) { return impl::sync_errc(pfn); }
-    static signature sync_errc_nodiag(sig_sync_errc_nodiag pfn) { return impl::sync_errc_nodiag(pfn); }
-    static signature sync_errc_nodiag(sig_sync_errc_nodiag_old pfn) { return impl::sync_errc_nodiag(pfn); }
-    static signature sync_exc(sig_sync_exc pfn) { return impl::sync_exc(pfn); }
-    static signature async_diag(sig_async_diag pfn) { return impl::async_diag(pfn); }
-    static signature async_nodiag(sig_async_nodiag pfn) { return impl::async_nodiag(pfn); }
-};
-
-}  // namespace test
-}  // namespace mysql
-}  // namespace boost
-
-#endif
diff --git a/test/common/include/test_common/network_result.hpp b/test/common/include/test_common/network_result.hpp
deleted file mode 100644
index 396abc9ff..000000000
--- a/test/common/include/test_common/network_result.hpp
+++ /dev/null
@@ -1,437 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_NETWORK_RESULT_HPP
-#define BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_NETWORK_RESULT_HPP
-
-#include <boost/mysql/client_errc.hpp>
-#include <boost/mysql/common_server_errc.hpp>
-#include <boost/mysql/diagnostics.hpp>
-#include <boost/mysql/error_code.hpp>
-#include <boost/mysql/string_view.hpp>
-
-#include <boost/asio/any_io_executor.hpp>
-#include <boost/asio/associated_cancellation_slot.hpp>
-#include <boost/asio/associated_executor.hpp>
-#include <boost/asio/async_result.hpp>
-#include <boost/asio/cancellation_signal.hpp>
-#include <boost/asio/io_context.hpp>
-#include <boost/core/span.hpp>
-#include <boost/mp11/algorithm.hpp>
-#include <boost/mp11/integral.hpp>
-#include <boost/mp11/list.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include <memory>
-#include <string>
-#include <tuple>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-#include "test_common/create_diagnostics.hpp"
-#include "test_common/poll_until.hpp"
-#include "test_common/printing.hpp"
-#include "test_common/source_location.hpp"
-#include "test_common/tracker_executor.hpp"
-
-namespace boost {
-namespace mysql {
-namespace test {
-
-struct no_result
-{
-};
-
-// network_result: system::result-like type with helper functions
-// for tests
-struct BOOST_ATTRIBUTE_NODISCARD network_result_base
-{
-    error_code err;
-    diagnostics diag;
-    bool was_immediate{};
-
-    network_result_base(error_code ec = {}, diagnostics d = {}) noexcept : err(ec), diag(std::move(d)) {}
-
-    void validate_immediate(bool expect_immediate, source_location loc = BOOST_MYSQL_CURRENT_LOCATION) const;
-
-    void validate_no_error(source_location loc = BOOST_MYSQL_CURRENT_LOCATION) const;
-
-    // Use for functions without a diagnostics& parameter
-    void validate_no_error_nodiag(source_location loc = BOOST_MYSQL_CURRENT_LOCATION) const;
-
-    void validate_error(
-        error_code expected_err,
-        const diagnostics& expected_diag = {},
-        source_location loc = BOOST_MYSQL_CURRENT_LOCATION
-    ) const;
-
-    void validate_error(
-        common_server_errc expected_err,
-        string_view expected_msg = {},
-        source_location loc = BOOST_MYSQL_CURRENT_LOCATION
-    );
-
-    void validate_error(
-        client_errc expected_err,
-        string_view expected_msg = {},
-        source_location loc = BOOST_MYSQL_CURRENT_LOCATION
-    );
-
-    // Use when the exact message isn't known, but some of its contents are
-    void validate_error_contains(
-        error_code expected_err,
-        const std::vector<std::string>& pieces,
-        source_location loc = BOOST_MYSQL_CURRENT_LOCATION
-    );
-
-    // Use when you don't care or can't determine the kind of error
-    void validate_any_error(source_location loc = BOOST_MYSQL_CURRENT_LOCATION) const;
-};
-
-template <class R>
-struct BOOST_ATTRIBUTE_NODISCARD network_result : network_result_base
-{
-    using value_type = typename std::conditional<std::is_same<R, void>::value, no_result, R>::type;
-    value_type value;
-
-    network_result() = default;
-    network_result(error_code ec, diagnostics diag, value_type value = {})
-        : network_result_base{ec, std::move(diag)}, value(std::move(value))
-    {
-    }
-
-    // Allow chaining
-    network_result<R>& validate_immediate(
-        bool expect_immediate,
-        source_location loc = BOOST_MYSQL_CURRENT_LOCATION
-    )
-    {
-        network_result_base::validate_immediate(expect_immediate, loc);
-        return *this;
-    }
-
-    BOOST_ATTRIBUTE_NODISCARD
-    value_type get(source_location loc = BOOST_MYSQL_CURRENT_LOCATION) &&
-    {
-        validate_no_error(loc);
-        return std::move(value);
-    }
-
-    BOOST_ATTRIBUTE_NODISCARD
-    value_type get_nodiag(source_location loc = BOOST_MYSQL_CURRENT_LOCATION) &&
-    {
-        validate_no_error_nodiag(loc);
-        return std::move(value);
-    }
-};
-
-// Wraps a network_result and an executor. The result of as_netresult_t.
-template <class R>
-struct BOOST_ATTRIBUTE_NODISCARD runnable_network_result
-{
-    struct impl_t
-    {
-        asio::io_context& ctx;
-        network_result<R> netres{
-            common_server_errc::er_no,
-            create_server_diag("network_result_v2 - diagnostics not cleared")
-        };
-        bool done{false};
-        bool was_immediate{false};
-
-        impl_t(asio::io_context& ctx) : ctx(ctx) {}
-    };
-
-    std::unique_ptr<impl_t> impl;
-
-    runnable_network_result(asio::io_context& ctx) : impl(new impl_t(ctx)) {}
-
-    asio::io_context& context() { return impl->ctx; }
-
-    network_result<R> run(source_location loc = BOOST_MYSQL_CURRENT_LOCATION) &&
-    {
-        poll_until(context(), &impl->done, loc);
-        return std::move(impl->netres);
-    }
-
-    void validate_no_error(source_location loc = BOOST_MYSQL_CURRENT_LOCATION) &&
-    {
-        std::move(*this).run(loc).validate_no_error(loc);
-    }
-
-    void validate_no_error_nodiag(source_location loc = BOOST_MYSQL_CURRENT_LOCATION) &&
-    {
-        std::move(*this).run(loc).validate_no_error_nodiag(loc);
-    }
-
-    void validate_error(
-        error_code expected_err,
-        const diagnostics& expected_diag = {},
-        source_location loc = BOOST_MYSQL_CURRENT_LOCATION
-    ) &&
-    {
-        std::move(*this).run(loc).validate_error(expected_err, expected_diag, loc);
-    }
-
-    void validate_error(
-        common_server_errc expected_err,
-        string_view expected_msg = {},
-        source_location loc = BOOST_MYSQL_CURRENT_LOCATION
-    ) &&
-    {
-        std::move(*this).run(loc).validate_error(expected_err, expected_msg, loc);
-    }
-
-    void validate_error(
-        client_errc expected_err,
-        string_view expected_msg = {},
-        source_location loc = BOOST_MYSQL_CURRENT_LOCATION
-    ) &&
-    {
-        std::move(*this).run(loc).validate_error(expected_err, expected_msg, loc);
-    }
-
-    // Use when the exact message isn't known, but some of its contents are
-    void validate_error_contains(
-        error_code expected_err,
-        const std::vector<std::string>& pieces,
-        source_location loc = BOOST_MYSQL_CURRENT_LOCATION
-    ) &&
-    {
-        std::move(*this).run(loc).validate_error_contains(expected_err, pieces, loc);
-    }
-
-    // Use when you don't care or can't determine the kind of error
-    void validate_any_error(source_location loc = BOOST_MYSQL_CURRENT_LOCATION) &&
-    {
-        std::move(*this).run(loc).validate_any_error(loc);
-    }
-
-    BOOST_ATTRIBUTE_NODISCARD
-    typename network_result<R>::value_type get(source_location loc = BOOST_MYSQL_CURRENT_LOCATION) &&
-    {
-        return std::move(*this).run(loc).get(loc);
-    }
-
-    BOOST_ATTRIBUTE_NODISCARD
-    typename network_result<R>::value_type get_nodiag(source_location loc = BOOST_MYSQL_CURRENT_LOCATION) &&
-    {
-        return std::move(*this).run(loc).get_nodiag(loc);
-    }
-};
-
-struct as_netresult_t
-{
-};
-
-constexpr as_netresult_t as_netresult{};
-
-namespace test_detail {
-
-template <class Signature>
-struct as_netres_sig_to_rtype;
-
-template <>
-struct as_netres_sig_to_rtype<void(error_code)>
-{
-    using type = void;
-};
-
-template <class T>
-struct as_netres_sig_to_rtype<void(error_code, T)>
-{
-    using type = T;
-};
-
-class as_netres_handler_base
-{
-    tracker_executor_result ex_;
-    tracker_executor_result immediate_ex_;
-    asio::cancellation_slot slot_;
-    const diagnostics* diag_ptr;
-
-protected:
-    as_netres_handler_base(
-        asio::io_context& ctx,
-        asio::cancellation_slot slot,
-        const diagnostics* output_diag
-    );
-    void complete_base(error_code ec, network_result_base& netres) const;
-
-public:
-    // Executor
-    using executor_type = asio::any_io_executor;
-    asio::any_io_executor get_executor() const { return ex_.ex; }
-
-    // Immediate executor
-    using immediate_executor_type = asio::any_io_executor;
-    asio::any_io_executor get_immediate_executor() const { return immediate_ex_.ex; }
-
-    // Cancellation slot
-    using cancellation_slot_type = asio::cancellation_slot;
-    asio::cancellation_slot get_cancellation_slot() const noexcept { return slot_; }
-};
-
-template <class R>
-class as_netres_handler : public as_netres_handler_base
-{
-    typename runnable_network_result<R>::impl_t* target_;
-
-    void complete(error_code ec) const
-    {
-        this->complete_base(ec, target_->netres);
-        target_->done = true;
-    }
-
-public:
-    as_netres_handler(
-        runnable_network_result<R>& netresult,
-        const diagnostics* output_diag,
-        asio::cancellation_slot slot
-    )
-        : as_netres_handler_base(netresult.context(), slot, output_diag), target_(netresult.impl.get())
-    {
-    }
-
-    void operator()(error_code ec) const { complete(ec); }
-
-    template <class Arg>
-    void operator()(error_code ec, Arg&& arg) const
-    {
-        target_->netres.value = std::forward<Arg>(arg);
-        complete(ec);
-    }
-};
-
-}  // namespace test_detail
-}  // namespace test
-}  // namespace mysql
-}  // namespace boost
-
-namespace boost {
-namespace asio {
-
-template <typename Signature>
-class async_result<mysql::test::as_netresult_t, Signature>
-{
-public:
-    using R = typename mysql::test::test_detail::as_netres_sig_to_rtype<Signature>::type;
-    using return_type = mysql::test::runnable_network_result<R>;
-
-    template <typename Initiation, typename... Args>
-    static return_type initiate(Initiation&& initiation, mysql::test::as_netresult_t token, Args&&... args)
-    {
-        // Try to find a diagnostics* within the argument list
-        using diag_pos = mp11::mp_find<mp11::mp_list<Args...>, mysql::diagnostics*>;
-        constexpr bool diag_found = diag_pos::value < sizeof...(Args);
-
-        // Dispatch
-        return do_initiate(
-            std::integral_constant<bool, diag_found>{},
-            diag_pos{},
-            std::forward<Initiation>(initiation),
-            token,
-            std::forward<Args>(args)...
-        );
-    }
-
-    // Common case optimization: diagnostics* is first
-    template <typename Initiation, typename... Args>
-    static return_type initiate(
-        Initiation&& initiation,
-        mysql::test::as_netresult_t token,
-        mysql::diagnostics* diag,
-        Args&&... args
-    )
-    {
-        return do_initiate_impl(
-            std::forward<Initiation>(initiation),
-            token,
-            diag,
-            diag,
-            std::forward<Args>(args)...
-        );
-    }
-
-private:
-    // A diagnostics* was found
-    template <std::size_t N, typename Initiation, typename... Args>
-    static return_type do_initiate(
-        std::true_type /* diag_found */,
-        mp11::mp_size_t<N> /* diag_pos */,
-        Initiation&& initiation,
-        mysql::test::as_netresult_t token,
-        Args&&... args
-    )
-    {
-        return do_initiate_impl(
-            std::forward<Initiation>(initiation),
-            token,
-            std::get<N>(std::tuple<Args&...>{args...}),
-            std::forward<Args>(args)...
-        );
-    }
-
-    // A diagnostics* was not found
-    template <std::size_t N, typename Initiation, typename... Args>
-    static return_type do_initiate(
-        std::false_type /* diag_found */,
-        mp11::mp_size_t<N> /* diag_pos */,
-        Initiation&& initiation,
-        mysql::test::as_netresult_t token,
-        Args&&... args
-    )
-    {
-        return do_initiate_impl(
-            std::forward<Initiation>(initiation),
-            token,
-            nullptr,
-            std::forward<Args>(args)...
-        );
-    }
-
-    template <typename Initiation, typename... Args>
-    static return_type do_initiate_impl(
-        Initiation&& initiation,
-        mysql::test::as_netresult_t token,
-        mysql::diagnostics* diag,
-        Args&&... args
-    )
-    {
-        // Retrieve the context associated to this operation.
-        // All our initiations have bound executors, to be compliant with asio::cancel_after
-        auto& ctx = static_cast<asio::io_context&>(asio::get_associated_executor(initiation).context());
-
-        // Verify that we correctly set diagnostics in all cases
-        if (diag)
-            *diag = mysql::test::create_server_diag("Diagnostics not cleared properly");
-
-        // Create the return type
-        mysql::test::runnable_network_result<R> netres(ctx);
-
-        // Record that we're initiating
-        mysql::test::initiation_guard guard;
-
-        // Actually call the initiation function
-        std::forward<Initiation>(initiation)(
-            mysql::test::test_detail::as_netres_handler<R>(
-                netres,
-                diag,
-                asio::get_associated_cancellation_slot(token)
-            ),
-            std::forward<Args>(args)...
-        );
-
-        return netres;
-    }
-};
-
-}  // namespace asio
-}  // namespace boost
-
-#endif
diff --git a/test/common/include/test_common/poll_until.hpp b/test/common/include/test_common/poll_until.hpp
deleted file mode 100644
index 14c07ccb8..000000000
--- a/test/common/include/test_common/poll_until.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_POLL_UNTIL_HPP
-#define BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_POLL_UNTIL_HPP
-
-#include <boost/asio/io_context.hpp>
-
-#include <functional>
-
-#include "test_common/source_location.hpp"
-
-namespace boost {
-namespace mysql {
-namespace test {
-
-// poll until *done == true
-void poll_until(asio::io_context& ctx, const bool* done, source_location loc = BOOST_MYSQL_CURRENT_LOCATION);
-
-// poll until done() == true
-void poll_until(
-    asio::io_context& ctx,
-    const std::function<bool()>& done,
-    source_location loc = BOOST_MYSQL_CURRENT_LOCATION
-);
-
-// run fn() in ctx, then poll until it completes
-void run_in_context(
-    asio::io_context& ctx,
-    const std::function<void()>& fn,
-    source_location loc = BOOST_MYSQL_CURRENT_LOCATION
-);
-
-}  // namespace test
-}  // namespace mysql
-}  // namespace boost
-
-#endif
diff --git a/test/common/include/test_common/printing.hpp b/test/common/include/test_common/printing.hpp
index 8463f4963..941c7afc7 100644
--- a/test/common/include/test_common/printing.hpp
+++ b/test/common/include/test_common/printing.hpp
@@ -28,6 +28,9 @@ std::ostream& operator<<(std::ostream& os, const row_view& v);
 class row;
 std::ostream& operator<<(std::ostream& os, const row& v);
 
+class metadata;
+std::ostream& operator<<(std::ostream& os, const metadata& v);
+
 enum class metadata_mode;
 std::ostream& operator<<(std::ostream& os, metadata_mode v);
 
diff --git a/test/integration/include/test_integration/run_coro.hpp b/test/common/include/test_common/run_coro.hpp
similarity index 60%
rename from test/integration/include/test_integration/run_coro.hpp
rename to test/common/include/test_common/run_coro.hpp
index 9856cfe06..b31debc73 100644
--- a/test/integration/include/test_integration/run_coro.hpp
+++ b/test/common/include/test_common/run_coro.hpp
@@ -8,24 +8,14 @@
 #ifndef BOOST_MYSQL_TEST_INTEGRATION_INCLUDE_TEST_INTEGRATION_RUN_CORO_HPP
 #define BOOST_MYSQL_TEST_INTEGRATION_INCLUDE_TEST_INTEGRATION_RUN_CORO_HPP
 
-#include <boost/asio/awaitable.hpp>
-#include <boost/asio/io_context.hpp>
-
-#include <functional>
-
-#include "test_common/source_location.hpp"
+#include <boost/assert/source_location.hpp>
+#include <boost/capy/task.hpp>
 
 namespace boost {
 namespace mysql {
 namespace test {
 
-#ifdef BOOST_ASIO_HAS_CO_AWAIT
-void run_coro(
-    asio::io_context& ctx,
-    std::function<boost::asio::awaitable<void>(void)> fn,
-    source_location loc = BOOST_MYSQL_CURRENT_LOCATION
-);
-#endif
+void run_coro(capy::task<void> fn, boost::source_location loc = BOOST_CURRENT_LOCATION);
 
 }  // namespace test
 }  // namespace mysql
diff --git a/test/common/include/test_common/source_location.hpp b/test/common/include/test_common/source_location.hpp
deleted file mode 100644
index 0a8f87db5..000000000
--- a/test/common/include/test_common/source_location.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_SOURCE_LOCATION_HPP
-#define BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_SOURCE_LOCATION_HPP
-
-#include <boost/assert/source_location.hpp>
-
-// boost::source_location triggers a bug on gcc < 8 when using PCHs
-// BOOST_CURRENT_LOCATION complains about a redefinition of __PRETTY_FUNCTION__
-// when used as default argument
-#if defined(BOOST_GCC) && BOOST_GCC < 80000
-#define BOOST_MYSQL_CURRENT_LOCATION ::boost::source_location(__FILE__, __LINE__, "")
-#else
-#define BOOST_MYSQL_CURRENT_LOCATION BOOST_CURRENT_LOCATION
-#endif
-
-#endif
diff --git a/test/common/include/test_common/tracker_executor.hpp b/test/common/include/test_common/tracker_executor.hpp
deleted file mode 100644
index c26178265..000000000
--- a/test/common/include/test_common/tracker_executor.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_TRACKER_EXECUTOR_HPP
-#define BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_TRACKER_EXECUTOR_HPP
-
-#include <boost/asio/any_io_executor.hpp>
-#include <boost/core/span.hpp>
-
-namespace boost {
-namespace mysql {
-namespace test {
-
-// A tracker executor wraps an any_io_executor and tracks execute calls.
-// Every executor has a distinct ID. When an executor starts executing
-// a function, its ID is pushed to a thread-local call stack, and popped
-// when the function returns.
-// This allows us to reliable check whether "we're running in the context of executor X"
-struct tracker_executor_result
-{
-    int executor_id;
-    asio::any_io_executor ex;
-};
-
-// Create
-tracker_executor_result create_tracker_executor(asio::any_io_executor inner);
-
-// Get the executor call stack, as a span of IDs. Most recent call last.
-boost::span<const int> executor_stack();
-
-// Get the ID of a tracker executor, or -1 if it's not a tracker executor
-int get_executor_id(asio::any_io_executor);
-
-// We maintain a thread-local state variable that tracks whether we're running
-// in the context of an initiation function or not.
-// Use this guard when invoking initiation functions to set/clear the flag,
-// and the function below to check it.
-struct initiation_guard
-{
-    initiation_guard();
-    initiation_guard(const initiation_guard&) = delete;
-    initiation_guard(initiation_guard&&) = delete;
-    initiation_guard& operator=(const initiation_guard&) = delete;
-    initiation_guard& operator=(initiation_guard&&) = delete;
-    ~initiation_guard();
-};
-bool is_initiation_function();
-
-}  // namespace test
-}  // namespace mysql
-}  // namespace boost
-
-#endif
diff --git a/test/common/include/test_common/validate_string_contains.hpp b/test/common/include/test_common/validate_string_contains.hpp
index bae74a447..452d68cdc 100644
--- a/test/common/include/test_common/validate_string_contains.hpp
+++ b/test/common/include/test_common/validate_string_contains.hpp
@@ -8,9 +8,8 @@
 #ifndef BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_VALIDATE_STRING_CONTAINS_HPP
 #define BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_VALIDATE_STRING_CONTAINS_HPP
 
-#include <boost/test/unit_test.hpp>
+#include <boost/assert/source_location.hpp>
 
-#include <algorithm>
 #include <string>
 #include <vector>
 
@@ -18,19 +17,11 @@ namespace boost {
 namespace mysql {
 namespace test {
 
-inline void validate_string_contains(std::string value, const std::vector<std::string>& to_check)
-{
-    std::transform(value.begin(), value.end(), value.begin(), [](char c) {
-        return static_cast<char>(tolower(c));
-    });
-    for (const auto& elm : to_check)
-    {
-        BOOST_TEST(
-            value.find(elm) != std::string::npos,
-            "Substring '" << elm << "' not found in '" << value << "'"
-        );
-    }
-}
+void validate_string_contains(
+    std::string value,
+    const std::vector<std::string>& to_check,
+    boost::source_location loc = BOOST_CURRENT_LOCATION
+);
 
 }  // namespace test
 }  // namespace mysql
diff --git a/test/common/src/utils.cpp b/test/common/src/utils.cpp
index f574c778b..0d7ac1e7b 100644
--- a/test/common/src/utils.cpp
+++ b/test/common/src/utils.cpp
@@ -7,11 +7,14 @@
 
 #include <boost/mysql/character_set.hpp>
 #include <boost/mysql/client_errc.hpp>
+#include <boost/mysql/column_type.hpp>
 #include <boost/mysql/common_server_errc.hpp>
 #include <boost/mysql/diagnostics.hpp>
 #include <boost/mysql/error_code.hpp>
 #include <boost/mysql/error_with_diagnostics.hpp>
 #include <boost/mysql/field_view.hpp>
+#include <boost/mysql/metadata.hpp>
+#include <boost/mysql/metadata_collection_view.hpp>
 #include <boost/mysql/metadata_mode.hpp>
 #include <boost/mysql/pipeline.hpp>
 #include <boost/mysql/row.hpp>
@@ -21,54 +24,53 @@
 
 #include <boost/mysql/detail/access.hpp>
 
-#include <boost/asio/any_io_executor.hpp>
-#include <boost/asio/bind_executor.hpp>
-#include <boost/asio/dispatch.hpp>
-#include <boost/asio/execution/blocking.hpp>
-#include <boost/asio/execution/relationship.hpp>
-#include <boost/asio/execution_context.hpp>
-#include <boost/asio/io_context.hpp>
-#include <boost/asio/require.hpp>
 #include <boost/assert/source_location.hpp>
-#include <boost/test/unit_test.hpp>
+#include <boost/capy/ex/run_async.hpp>
+#include <boost/capy/task.hpp>
+#include <boost/corosio/io_context.hpp>
 
 #include <algorithm>
-#include <atomic>
-#include <chrono>
 #include <cstring>
-#include <functional>
 #include <iomanip>
+#include <iostream>
 #include <ostream>
-#include <thread>
-#include <type_traits>
-#include <utility>
+#include <ranges>
+#include <sstream>
+#include <string>
+#include <string_view>
 #include <vector>
 
 #include "test_common/assert_buffer_equals.hpp"
-#include "test_common/io_context_fixture.hpp"
-#include "test_common/network_result.hpp"
-#include "test_common/poll_until.hpp"
+#include "test_common/check_meta.hpp"
 #include "test_common/printing.hpp"
-#include "test_common/tracker_executor.hpp"
+#include "test_common/run_coro.hpp"
 #include "test_common/validate_string_contains.hpp"
 
 using namespace boost::mysql;
 using namespace boost::mysql::test;
+using namespace std::chrono_literals;
 
 //
 // assert_buffer_equals.hpp
 //
-std::ostream& boost::mysql::test::operator<<(std::ostream& os, buffer_printer buff)
+static std::string format_buffer(std::span<const std::uint8_t> buff)
 {
+    std::ostringstream os;
     os << std::setfill('0') << std::hex << "{ ";
-    for (std::size_t i = 0; i < buff.buff.size(); ++i)
+    for (std::size_t i = 0; i < buff.size(); ++i)
     {
-        os << "0x" << std::setw(2) << static_cast<int>(buff.buff.data()[i]) << ", ";
+        os << "0x" << std::setw(2) << static_cast<int>(buff.data()[i]) << ", ";
     }
-    return os << "}";
+    os << "}";
+    return os.str();
+}
+
+std::ostream& boost::mysql::test::operator<<(std::ostream& os, buffer_printer buff)
+{
+    return os << format_buffer(buff.buff);
 }
 
-bool boost::mysql::test::buffer_equals(span<const std::uint8_t> b1, span<const std::uint8_t> b2)
+bool boost::mysql::test::buffer_equals(std::span<const std::uint8_t> b1, std::span<const std::uint8_t> b2)
 {
     // If any of the buffers are empty (data() == nullptr), prevent
     // calling memcmp (UB)
@@ -96,6 +98,32 @@ std::ostream& boost::mysql::operator<<(std::ostream& os, const diagnostics& diag
               << impl.msg << "\" }";
 }
 
+std::ostream& boost::mysql::operator<<(std::ostream& os, const metadata& value)
+{
+    // clang-format off
+    return os << "metadata{ "
+              << ".database = \"" << value.database()
+              << "\", .table = \"" << value.table()
+              << "\", .original_table = \"" << value.original_table()
+              << "\", .column_name = \"" << value.column_name()
+              << "\", .original_column_name = \"" << value.original_column_name()
+              << "\", .type = " << value.type()
+              << ", .decimals = " << value.decimals()
+              << ", .column_collation = " << value.column_collation()
+              << ", .column_length = " << value.column_length()
+              << ", .is_not_null = " << value.is_not_null()
+              << ", .is_primary_key = " << value.is_primary_key()
+              << ", .is_unique_key = " << value.is_unique_key()
+              << ", .is_multiple_key = " << value.is_multiple_key()
+              << ", .is_unsigned = " << value.is_unsigned()
+              << ", .is_zerofill = " << value.is_zerofill()
+              << ", .is_auto_increment = " << value.is_auto_increment()
+              << ", .has_no_default_value = " << value.has_no_default_value()
+              << ", .is_set_to_now_on_update = " << value.is_set_to_now_on_update()
+              << " }";
+    // clang-format on
+}
+
 std::ostream& boost::mysql::operator<<(std::ostream& os, const row_view& value)
 {
     os << '{';
@@ -155,407 +183,72 @@ std::ostream& boost::mysql::operator<<(std::ostream& os, const character_set& v)
 }
 
 //
-// tracker_executor.hpp
+// check_meta.hpp
 //
-
-namespace {
-
-// Are we in the call stack of an initiating function?
-thread_local bool g_is_running_initiation = false;
-
-// Produce unique executor IDs (start in 1)
-std::atomic_int next_executor_id{1};
-
-// The executor call stack
-thread_local std::vector<int> g_executor_call_stack;
-
-// Guard to remove an entry from the stack
-struct executor_call_stack_guard
-{
-    executor_call_stack_guard(int executor_id) { g_executor_call_stack.push_back(executor_id); }
-    executor_call_stack_guard(const executor_call_stack_guard&) = delete;
-    executor_call_stack_guard(executor_call_stack_guard&&) = delete;
-    executor_call_stack_guard& operator=(const executor_call_stack_guard&) = delete;
-    executor_call_stack_guard& operator=(executor_call_stack_guard&&) = delete;
-    ~executor_call_stack_guard() { g_executor_call_stack.pop_back(); }
-};
-
-// Wraps a function object to insert tracking of the caller executor
-template <class Function>
-struct tracker_executor_function
-{
-    int executor_id;
-    Function fn;
-
-    void operator()()
-    {
-        executor_call_stack_guard guard(executor_id);
-        std::move(fn)();
-    }
-};
-
-template <class Function>
-tracker_executor_function<typename std::decay<Function>::type> create_tracker_executor_function(
-    int executor_id,
-    Function&& fn
+void boost::mysql::test::check_meta(
+    metadata_collection_view meta,
+    const std::vector<column_type>& expected_types
 )
 {
-    return {executor_id, std::forward<Function>(fn)};
+    auto types = meta | std::ranges::views::transform([](const metadata& m) { return m.type(); });
+    BOOST_TEST_ALL_EQ(types.begin(), types.end(), expected_types.begin(), expected_types.end());
 }
 
-}  // namespace
-
-namespace boost {
-namespace mysql {
-namespace test {
-
-class tracker_executor
-{
-public:
-    tracker_executor(int id, boost::asio::any_io_executor ex) noexcept : id_(id), ex_(std::move(ex)) {}
-
-    bool operator==(const tracker_executor& rhs) const noexcept { return id_ == rhs.id_ && ex_ == rhs.ex_; }
-    bool operator!=(const tracker_executor& rhs) const noexcept { return !(*this == rhs); }
-    int id() const { return id_; }
-
-#ifdef BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT
-
-    // TS-executor interface
-    asio::execution_context& context() const noexcept { return ex_.context(); }
-    void on_work_started() const noexcept { ex_.on_work_started(); }
-    void on_work_finished() const noexcept { ex_.on_work_finished(); }
-
-    template <typename Function, typename Allocator>
-    void dispatch(Function&& f, const Allocator& a) const
-    {
-        ex_.dispatch(create_tracker_executor_function(id_, std::forward<Function>(f)), a);
-    }
-
-    template <typename Function, typename Allocator>
-    void post(Function&& f, const Allocator& a) const
-    {
-        ex_.post(create_tracker_executor_function(id_, std::forward<Function>(f)), a);
-    }
-
-    template <typename Function, typename Allocator>
-    void defer(Function&& f, const Allocator& a) const
-    {
-        ex_.defer(create_tracker_executor_function(id_, std::forward<Function>(f)), a);
-    }
-
-#else
-
-    // Standard executors interface
-    template <class Property>
-    tracker_executor require(
-        const Property& p,
-        typename std::enable_if<asio::can_require<asio::any_io_executor, Property>::value>::type* = nullptr
-    ) const
-    {
-        return tracker_executor(id_, asio::require(ex_, p));
-    }
-
-    template <class Property>
-    tracker_executor prefer(
-        const Property& p,
-        typename std::enable_if<asio::can_prefer<asio::any_io_executor, Property>::value>::type* = nullptr
-    ) const
-    {
-        return tracker_executor(id_, asio::prefer(ex_, p));
-    }
-
-    template <class Property>
-    auto query(
-        const Property& p,
-        typename std::enable_if<asio::can_query<asio::any_io_executor, Property>::value>::type* = nullptr
-    ) const -> decltype(asio::query(std::declval<boost::asio::any_io_executor>(), p))
-    {
-        return boost::asio::query(ex_, p);
-    }
-
-    template <typename Function>
-    void execute(Function&& f) const
-    {
-        ex_.execute(create_tracker_executor_function(id_, std::forward<Function>(f)));
-    }
-#endif
-
-private:
-    int id_;
-    boost::asio::any_io_executor ex_;
-};
-
-}  // namespace test
-}  // namespace mysql
-}  // namespace boost
-
-// Asio fails to detect that a type is equaility comparable under MSVC, so we need to do this
-namespace boost {
-namespace asio {
-namespace traits {
-
-template <>
-struct equality_comparable<tracker_executor>
-{
-    static constexpr bool is_valid = true;
-    static constexpr bool is_noexcept = true;
-};
-
-template <typename Function>
-struct execute_member<tracker_executor, Function>
-{
-    static constexpr bool is_valid = true;
-    static constexpr bool is_noexcept = false;
-    using result_type = void;
-};
-
-template <class Property>
-struct require_member<
-    tracker_executor,
-    Property,
-    typename std::enable_if<asio::can_require<asio::any_io_executor, Property>::value>::type>
-{
-    static constexpr bool is_valid = true;
-    static constexpr bool is_noexcept = false;
-    using result_type = tracker_executor;
-};
-
-template <typename Property>
-struct prefer_member<
-    tracker_executor,
-    Property,
-    typename std::enable_if<asio::can_prefer<asio::any_io_executor, Property>::value>::type>
-{
-    static constexpr bool is_valid = true;
-    static constexpr bool is_noexcept = false;
-    using result_type = tracker_executor;
-};
-
-template <typename Property>
-struct query_member<
-    tracker_executor,
-    Property,
-    typename std::enable_if<asio::can_query<asio::any_io_executor, Property>::value>::type>
-{
-    static constexpr bool is_valid = true;
-    static constexpr bool is_noexcept = false;
-    using result_type = decltype(boost::asio::query(
-        std::declval<const any_io_executor&>(),
-        std::declval<const Property&>()
-    ));
-};
-
-}  // namespace traits
-}  // namespace asio
-}  // namespace boost
-
-boost::mysql::test::tracker_executor_result boost::mysql::test::create_tracker_executor(
-    asio::any_io_executor inner
+void boost::mysql::test::check_meta(
+    metadata_collection_view meta,
+    const std::vector<std::pair<column_type, std::string_view>>& expected
 )
 {
-    int id = ++next_executor_id;
-    return {id, tracker_executor(id, std::move(inner))};
-}
-
-boost::span<const int> boost::mysql::test::executor_stack() { return g_executor_call_stack; }
-
-int boost::mysql::test::get_executor_id(asio::any_io_executor ex)
-{
-    auto* typed_ex = ex.target<tracker_executor>();
-    return typed_ex ? typed_ex->id() : -1;
-}
-boost::mysql::test::initiation_guard::initiation_guard()
-{
-    BOOST_ASSERT(!g_is_running_initiation);
-    g_is_running_initiation = true;
-}
+    auto types = meta | std::ranges::views::transform([](const metadata& m) { return m.type(); });
+    auto expected_types = expected |
+                          std::ranges::views::transform(
+                              [](const std::pair<column_type, std::string_view>& p) { return p.first; }
+                          );
+    BOOST_TEST_ALL_EQ(types.begin(), types.end(), expected_types.begin(), expected_types.end());
 
-boost::mysql::test::initiation_guard::~initiation_guard()
-{
-    BOOST_ASSERT(g_is_running_initiation);
-    g_is_running_initiation = false;
+    auto names = meta | std::ranges::views::transform([](const metadata& m) { return m.column_name(); });
+    auto expected_names = expected |
+                          std::ranges::views::transform(
+                              [](const std::pair<column_type, std::string_view>& p) { return p.second; }
+                          );
+    BOOST_TEST_ALL_EQ(names.begin(), names.end(), expected_names.begin(), expected_names.end());
 }
 
-bool boost::mysql::test::is_initiation_function() { return g_is_running_initiation; }
-
 //
-// poll_until.hpp
+// validate_string_contains.hpp
 //
-
-void boost::mysql::test::poll_until(asio::io_context& ctx, const bool* done, source_location loc)
-{
-    poll_until(ctx, [done]() { return *done; }, loc);
-}
-
-void boost::mysql::test::poll_until(
-    asio::io_context& ctx,
-    const std::function<bool()>& done,
-    source_location loc
+void boost::mysql::test::validate_string_contains(
+    std::string value,
+    const std::vector<std::string>& to_check,
+    boost::source_location loc
 )
 {
-    BOOST_TEST_CONTEXT("Called from " << loc)
+    std::transform(value.begin(), value.end(), value.begin(), [](char c) {
+        return static_cast<char>(tolower(c));
+    });
+    for (const auto& elm : to_check)
     {
-        using std::chrono::steady_clock;
-
-        // Restart the context, in case it was stopped
-        ctx.restart();
-
-        // Poll until this time point
-        constexpr std::chrono::seconds timeout(15);
-        auto timeout_tp = steady_clock::now() + timeout;
-
-        // Perform the polling
-        while (!done() && steady_clock::now() < timeout_tp)
+        if (!BOOST_TEST(value.find(elm) != std::string::npos))
         {
-            ctx.poll();
-            std::this_thread::yield();
+            std::cerr << "   Substring '" << elm << "' not found in '" << value << "'\n"
+                      << "   Called from " << loc << "\n";
         }
-
-        // Check for timeout
-        BOOST_TEST_REQUIRE(done());
     }
 }
 
-void boost::mysql::test::run_in_context(
-    asio::io_context& ctx,
-    const std::function<void()>& fn,
-    source_location loc
-)
-{
-    bool finished = false;
-    asio::dispatch(asio::bind_executor(ctx.get_executor(), [fn, &finished]() {
-        fn();
-        finished = true;
-    }));
-    poll_until(ctx, &finished, loc);
-}
-
-//
-// io_context_fixture.hpp
-//
-boost::mysql::test::io_context_fixture::~io_context_fixture()
-{
-    // Verify that our tests don't leave unfinished work
-    ctx.poll();
-    BOOST_TEST(ctx.stopped());
-}
-
 //
-// network_result.hpp
+// run_coro.hpp
 //
+static constexpr auto test_timeout = 10s;
 
-void boost::mysql::test::network_result_base::validate_immediate(bool expect_immediate, source_location loc)
-    const
-{
-    BOOST_TEST_CONTEXT("Called from " << loc) { BOOST_TEST(was_immediate == expect_immediate); }
-}
-
-void boost::mysql::test::network_result_base::validate_no_error(source_location loc) const
-{
-    validate_error(error_code(), diagnostics(), loc);
-}
-
-void boost::mysql::test::network_result_base::validate_no_error_nodiag(source_location loc) const
-{
-    validate_error(error_code(), create_server_diag("<diagnostics unavailable>"), loc);
-}
-
-void boost::mysql::test::network_result_base::validate_error(
-    error_code expected_err,
-    const diagnostics& expected_diag,
-    source_location loc
-) const
-{
-    BOOST_TEST_CONTEXT("Called from " << loc)
-    {
-        BOOST_TEST(diag == expected_diag);
-        BOOST_TEST_REQUIRE(err == expected_err);
-    }
-}
-
-void boost::mysql::test::network_result_base::validate_error(
-    common_server_errc expected_err,
-    string_view expected_msg,
-    source_location loc
-)
-{
-    validate_error(expected_err, create_server_diag(expected_msg), loc);
-}
-
-void boost::mysql::test::network_result_base::validate_error(
-    client_errc expected_err,
-    string_view expected_msg,
-    source_location loc
-)
-{
-    validate_error(expected_err, create_client_diag(expected_msg), loc);
-}
-
-void boost::mysql::test::network_result_base::validate_error_contains(
-    error_code expected_err,
-    const std::vector<std::string>& pieces,
-    source_location loc
-)
-{
-    BOOST_TEST_CONTEXT("Called from " << loc)
-    {
-        validate_string_contains(diag.server_message(), pieces);
-        BOOST_TEST_REQUIRE(err == expected_err);
-    }
-}
-
-void boost::mysql::test::network_result_base::validate_any_error(source_location loc) const
+void boost::mysql::test::run_coro(capy::task<void> task, source_location loc)
 {
-    BOOST_TEST_CONTEXT("Called from " << loc) { BOOST_TEST_REQUIRE(err != error_code()); }
-}
+    // Run the task with a timeout
+    corosio::io_context ctx;
+    capy::run_async(ctx.get_executor())(std::move(task));
+    ctx.run_for(test_timeout);
 
-boost::mysql::test::test_detail::as_netres_handler_base::as_netres_handler_base(
-    asio::io_context& ctx,
-    asio::cancellation_slot slot,
-    const diagnostics* diag
-)
-    : ex_(create_tracker_executor(ctx.get_executor())),
-      immediate_ex_(create_tracker_executor(ctx.get_executor())),
-      slot_(slot),
-      diag_ptr(diag)
-{
+    // Check that we finished the job (as opposed to timeout)
+    if (!BOOST_TEST(ctx.stopped()))
+        std::cerr << "  Called from " << loc << std::endl;
 }
-
-void boost::mysql::test::test_detail::as_netres_handler_base::complete_base(
-    error_code ec,
-    network_result_base& netres
-) const
-{
-    // Are we in an immediate completion?
-    bool is_immediate = is_initiation_function();
-
-    // Check executor. The passed executor must be the top one in all cases.
-    // Immediate completions must be dispatched through the immediate executor, too.
-    // In all cases, we may encounter a bigger stack because of previous immediate completions.
-    const std::array<int, 1> stack_data_regular{{ex_.executor_id}};
-    const std::array<int, 2> stack_data_immediate{
-        {immediate_ex_.executor_id, ex_.executor_id}
-    };
-
-    // Expected top of the executor stack
-    boost::span<const int> expected_stack_top = is_immediate ? boost::span<const int>(stack_data_immediate)
-                                                             : boost::span<const int>(stack_data_regular);
-
-    // Actual top of the executor stack
-    auto actual_stack_top = executor_stack().last(
-        (std::min)(executor_stack().size(), expected_stack_top.size())
-    );
-
-    // Compare
-    BOOST_TEST(actual_stack_top == expected_stack_top, boost::test_tools::per_element());
-
-    // Assign error code and diagnostics
-    netres.err = ec;
-    if (diag_ptr)
-        netres.diag = *diag_ptr;
-    else
-        netres.diag = create_server_diag("<diagnostics unavailable>");
-
-    // Record immediate-ness
-    netres.was_immediate = is_immediate;
-}
\ No newline at end of file
diff --git a/test/fuzzing/fuzz_auth_switch.cpp b/test/fuzzing/fuzz_auth_switch.cpp
index 6a58cddd8..23fc705c8 100644
--- a/test/fuzzing/fuzz_auth_switch.cpp
+++ b/test/fuzzing/fuzz_auth_switch.cpp
@@ -7,7 +7,7 @@
 
 #include <boost/mysql/diagnostics.hpp>
 
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
+#include "mycosql_internal/protocol/deserialization.hpp"
 
 using namespace boost::mysql::detail;
 
diff --git a/test/fuzzing/fuzz_column_definition.cpp b/test/fuzzing/fuzz_column_definition.cpp
index e551bbb77..6beb428d6 100644
--- a/test/fuzzing/fuzz_column_definition.cpp
+++ b/test/fuzzing/fuzz_column_definition.cpp
@@ -7,7 +7,7 @@
 
 #include <boost/mysql/detail/coldef_view.hpp>
 
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
+#include "mycosql_internal/protocol/deserialization.hpp"
 
 using namespace boost::mysql::detail;
 
diff --git a/test/fuzzing/fuzz_err_packet.cpp b/test/fuzzing/fuzz_err_packet.cpp
index 9ee7b7846..e7307bc89 100644
--- a/test/fuzzing/fuzz_err_packet.cpp
+++ b/test/fuzzing/fuzz_err_packet.cpp
@@ -5,7 +5,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
+#include "mycosql_internal/protocol/deserialization.hpp"
 
 using namespace boost::mysql::detail;
 
diff --git a/test/fuzzing/fuzz_execute_response.cpp b/test/fuzzing/fuzz_execute_response.cpp
index 7aa485d5c..1c5ec5a66 100644
--- a/test/fuzzing/fuzz_execute_response.cpp
+++ b/test/fuzzing/fuzz_execute_response.cpp
@@ -7,8 +7,8 @@
 
 #include <boost/mysql/diagnostics.hpp>
 
-#include <boost/mysql/impl/internal/protocol/db_flavor.hpp>
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
+#include "mycosql_internal/protocol/db_flavor.hpp"
+#include "mycosql_internal/protocol/deserialization.hpp"
 
 using namespace boost::mysql::detail;
 
diff --git a/test/fuzzing/fuzz_handshake_server_response.cpp b/test/fuzzing/fuzz_handshake_server_response.cpp
index 1f36a8e69..08769d4f2 100644
--- a/test/fuzzing/fuzz_handshake_server_response.cpp
+++ b/test/fuzzing/fuzz_handshake_server_response.cpp
@@ -7,8 +7,8 @@
 
 #include <boost/mysql/diagnostics.hpp>
 
-#include <boost/mysql/impl/internal/protocol/db_flavor.hpp>
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
+#include "mycosql_internal/protocol/db_flavor.hpp"
+#include "mycosql_internal/protocol/deserialization.hpp"
 
 using namespace boost::mysql::detail;
 
diff --git a/test/fuzzing/fuzz_ok_packet.cpp b/test/fuzzing/fuzz_ok_packet.cpp
index 0ddb493d3..534473504 100644
--- a/test/fuzzing/fuzz_ok_packet.cpp
+++ b/test/fuzzing/fuzz_ok_packet.cpp
@@ -7,7 +7,7 @@
 
 #include <boost/mysql/detail/ok_view.hpp>
 
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
+#include "mycosql_internal/protocol/deserialization.hpp"
 
 using namespace boost::mysql::detail;
 
diff --git a/test/fuzzing/fuzz_ok_response.cpp b/test/fuzzing/fuzz_ok_response.cpp
index bbb5f349c..eb4ce66b1 100644
--- a/test/fuzzing/fuzz_ok_response.cpp
+++ b/test/fuzzing/fuzz_ok_response.cpp
@@ -7,8 +7,8 @@
 
 #include <boost/mysql/diagnostics.hpp>
 
-#include <boost/mysql/impl/internal/protocol/db_flavor.hpp>
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
+#include "mycosql_internal/protocol/db_flavor.hpp"
+#include "mycosql_internal/protocol/deserialization.hpp"
 
 using namespace boost::mysql::detail;
 
diff --git a/test/fuzzing/fuzz_prepare_stmt_response.cpp b/test/fuzzing/fuzz_prepare_stmt_response.cpp
index 4c5a6e965..f0807657b 100644
--- a/test/fuzzing/fuzz_prepare_stmt_response.cpp
+++ b/test/fuzzing/fuzz_prepare_stmt_response.cpp
@@ -7,8 +7,8 @@
 
 #include <boost/mysql/diagnostics.hpp>
 
-#include <boost/mysql/impl/internal/protocol/db_flavor.hpp>
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
+#include "mycosql_internal/protocol/db_flavor.hpp"
+#include "mycosql_internal/protocol/deserialization.hpp"
 
 using namespace boost::mysql::detail;
 
diff --git a/test/fuzzing/fuzz_row.cpp b/test/fuzzing/fuzz_row.cpp
index 92c453377..86a13d157 100644
--- a/test/fuzzing/fuzz_row.cpp
+++ b/test/fuzzing/fuzz_row.cpp
@@ -13,8 +13,6 @@
 #include <boost/mysql/detail/flags.hpp>
 #include <boost/mysql/detail/resultset_encoding.hpp>
 
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
-
 #include <boost/core/span.hpp>
 #include <boost/endian/conversion.hpp>
 
@@ -22,6 +20,8 @@
 #include <cstdint>
 #include <memory>
 
+#include "mycosql_internal/protocol/deserialization.hpp"
+
 using namespace boost::mysql::detail;
 using boost::span;
 using boost::mysql::column_type;
diff --git a/test/fuzzing/fuzz_row_message.cpp b/test/fuzzing/fuzz_row_message.cpp
index d8ed9ad24..a12a1f905 100644
--- a/test/fuzzing/fuzz_row_message.cpp
+++ b/test/fuzzing/fuzz_row_message.cpp
@@ -7,8 +7,8 @@
 
 #include <boost/mysql/diagnostics.hpp>
 
-#include <boost/mysql/impl/internal/protocol/db_flavor.hpp>
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
+#include "mycosql_internal/protocol/db_flavor.hpp"
+#include "mycosql_internal/protocol/deserialization.hpp"
 
 using namespace boost::mysql::detail;
 
diff --git a/test/fuzzing/fuzz_server_hello.cpp b/test/fuzzing/fuzz_server_hello.cpp
index d36ddae82..f75f08a02 100644
--- a/test/fuzzing/fuzz_server_hello.cpp
+++ b/test/fuzzing/fuzz_server_hello.cpp
@@ -7,8 +7,8 @@
 
 #include <boost/mysql/diagnostics.hpp>
 
-#include <boost/mysql/impl/internal/protocol/db_flavor.hpp>
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
+#include "mycosql_internal/protocol/db_flavor.hpp"
+#include "mycosql_internal/protocol/deserialization.hpp"
 
 using namespace boost::mysql::detail;
 
diff --git a/test/fuzzing/fuzz_text_field.cpp b/test/fuzzing/fuzz_text_field.cpp
index 7affff543..e7a83f943 100644
--- a/test/fuzzing/fuzz_text_field.cpp
+++ b/test/fuzzing/fuzz_text_field.cpp
@@ -13,13 +13,13 @@
 #include <boost/mysql/detail/coldef_view.hpp>
 #include <boost/mysql/detail/flags.hpp>
 
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
-
 #include <boost/endian/conversion.hpp>
 
 #include <cstddef>
 #include <cstdint>
 
+#include "mycosql_internal/protocol/deserialization.hpp"
+
 using namespace boost::mysql::detail;
 using boost::mysql::column_type;
 using boost::mysql::field_view;
diff --git a/test/fuzzing/fuzz_utf8mb4.cpp b/test/fuzzing/fuzz_utf8mb4.cpp
index d2c10802d..29ea84bf0 100644
--- a/test/fuzzing/fuzz_utf8mb4.cpp
+++ b/test/fuzzing/fuzz_utf8mb4.cpp
@@ -7,11 +7,11 @@
 
 #include <boost/mysql/character_set.hpp>
 
-#include <boost/mysql/impl/internal/call_next_char.hpp>
-
 #include <cstddef>
 #include <stdint.h>
 
+#include "mycosql_internal/call_next_char.hpp"
+
 using namespace boost::mysql;
 
 static bool iterate_utf8mb4_string(const uint8_t* data, size_t size) noexcept
diff --git a/test/integration/include/test_integration/connect_params_builder.hpp b/test/integration/include/test_integration/connect_params_builder.hpp
index 6f3f42ce4..a29966b0f 100644
--- a/test/integration/include/test_integration/connect_params_builder.hpp
+++ b/test/integration/include/test_integration/connect_params_builder.hpp
@@ -13,10 +13,10 @@
 #include <boost/mysql/handshake_params.hpp>
 #include <boost/mysql/metadata_collection_view.hpp>
 #include <boost/mysql/ssl_mode.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <cstdint>
 #include <string>
+#include <string_view>
 
 #include "test_common/ci_server.hpp"
 
@@ -44,14 +44,14 @@ class connect_params_builder
         return *this;
     }
 
-    connect_params_builder& credentials(string_view username, string_view passwd)
+    connect_params_builder& credentials(std::string_view username, std::string_view passwd)
     {
         res_.set_username(username);
         res_.set_password(passwd);
         return *this;
     }
 
-    connect_params_builder& database(string_view db)
+    connect_params_builder& database(std::string_view db)
     {
         res_.set_database(db);
         return *this;
diff --git a/test/integration/include/test_integration/metadata_validator.hpp b/test/integration/include/test_integration/metadata_validator.hpp
index 5dc4f4065..a3696af41 100644
--- a/test/integration/include/test_integration/metadata_validator.hpp
+++ b/test/integration/include/test_integration/metadata_validator.hpp
@@ -74,7 +74,7 @@ class meta_validator
 };
 
 void validate_meta(const metadata_collection_view& actual, const std::vector<meta_validator>& expected);
-void validate_2fields_meta(metadata_collection_view fields, string_view table);
+void validate_2fields_meta(metadata_collection_view fields, std::string_view table);
 
 }  // namespace test
 }  // namespace mysql
diff --git a/test/integration/include/test_integration/server_ca.hpp b/test/integration/include/test_integration/server_ca.hpp
index 7ced5d3e7..7efc337d7 100644
--- a/test/integration/include/test_integration/server_ca.hpp
+++ b/test/integration/include/test_integration/server_ca.hpp
@@ -13,7 +13,7 @@ namespace mysql {
 namespace test {
 
 // The CA file that signed the server's certificate
-constexpr const char CA_PEM[] = R"%(-----BEGIN CERTIFICATE-----
+inline constexpr const char CA_PEM[] = R"%(-----BEGIN CERTIFICATE-----
 MIIDZzCCAk+gAwIBAgIUWznm2UoxXw3j7HCcp9PpiayTvFQwDQYJKoZIhvcNAQEL
 BQAwQjELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxDjAMBgNVBAoM
 BW15c3FsMQ4wDAYDVQQDDAVteXNxbDAgFw0yMDA0MDQxNDMwMjNaGA8zMDE5MDgw
diff --git a/test/integration/include/test_integration/server_features.hpp b/test/integration/include/test_integration/server_features.hpp
index 8d25219fc..f81dee31b 100644
--- a/test/integration/include/test_integration/server_features.hpp
+++ b/test/integration/include/test_integration/server_features.hpp
@@ -8,8 +8,6 @@
 #ifndef BOOST_MYSQL_TEST_INTEGRATION_INCLUDE_TEST_INTEGRATION_SERVER_FEATURES_HPP
 #define BOOST_MYSQL_TEST_INTEGRATION_INCLUDE_TEST_INTEGRATION_SERVER_FEATURES_HPP
 
-#include <boost/test/tree/decorator.hpp>
-
 namespace boost {
 namespace mysql {
 namespace test {
@@ -42,11 +40,6 @@ using server_feature_t = bool server_features::*;
 
 server_features get_server_features();
 
-// Decorators to skip tests if the given features are not enabled.
-// This is lazy because get_server_features requires access to getenv, not legal from global initializers.
-unit_test::precondition run_if(server_feature_t feature);
-unit_test::precondition run_if(server_feature_t feature1, server_feature_t feature2);
-
 }  // namespace test
 }  // namespace mysql
 }  // namespace boost
diff --git a/test/integration/include/test_integration/spotchecks_helpers.hpp b/test/integration/include/test_integration/spotchecks_helpers.hpp
deleted file mode 100644
index 8ce944d28..000000000
--- a/test/integration/include/test_integration/spotchecks_helpers.hpp
+++ /dev/null
@@ -1,189 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_TEST_INTEGRATION_INCLUDE_TEST_INTEGRATION_SPOTCHECKS_HELPERS_HPP
-#define BOOST_MYSQL_TEST_INTEGRATION_INCLUDE_TEST_INTEGRATION_SPOTCHECKS_HELPERS_HPP
-
-#include <boost/mysql/any_connection.hpp>
-#include <boost/mysql/character_set.hpp>
-#include <boost/mysql/execution_state.hpp>
-#include <boost/mysql/pipeline.hpp>
-#include <boost/mysql/results.hpp>
-#include <boost/mysql/statement.hpp>
-#include <boost/mysql/static_execution_state.hpp>
-#include <boost/mysql/static_results.hpp>
-#include <boost/mysql/tcp.hpp>
-
-#include <boost/asio/ip/tcp.hpp>
-#include <boost/core/span.hpp>
-
-#include <iosfwd>
-
-#include "test_common/io_context_fixture.hpp"
-#include "test_common/netfun_maker.hpp"
-#include "test_integration/connect_params_builder.hpp"
-#include "test_integration/static_rows.hpp"
-#include "test_integration/tcp_connection_fixture.hpp"
-
-namespace boost {
-namespace mysql {
-namespace test {
-
-#ifdef BOOST_MYSQL_CXX14
-using static_state_t = static_execution_state<row_multifield>;
-#endif
-
-// Netmakers
-template <class Conn>
-struct netmakers_common
-{
-    using prepare_statement = netfun_maker<statement, Conn, string_view>;
-    using execute_query = netfun_maker<void, Conn, const string_view&, results&>;
-    using execute_statement = netfun_maker<
-        void,
-        Conn,
-        const bound_statement_tuple<std::tuple<int, int>>&,
-        results&>;
-    using start_execution = netfun_maker<void, Conn, const string_view&, execution_state&>;
-    using close_statement = netfun_maker<void, Conn, const statement&>;
-    using read_resultset_head = netfun_maker<void, Conn, execution_state&>;
-    using read_some_rows = netfun_maker<rows_view, Conn, execution_state&>;
-    using ping = netfun_maker<void, Conn>;
-    using reset_connection = netfun_maker<void, Conn>;
-    using close = netfun_maker<void, Conn>;
-
-#ifdef BOOST_MYSQL_CXX14
-    using start_execution_static = netfun_maker<void, Conn, const string_view&, static_state_t&>;
-    using read_some_rows_static = netfun_maker<
-        std::size_t,
-        Conn,
-        static_state_t&,
-        boost::span<row_multifield>>;
-#endif
-};
-
-struct netmakers_connection : netmakers_common<tcp_connection>
-{
-    using connect_stream = netfun_maker<void, asio::ip::tcp::socket, const asio::ip::tcp::endpoint&>;
-    using handshake = netfun_maker<void, tcp_connection, const handshake_params&>;
-    using connect = netfun_maker<
-        void,
-        tcp_connection,
-        const asio::ip::tcp::endpoint&,
-        const handshake_params&>;
-    using quit = netfun_maker<void, tcp_connection>;
-};
-
-struct netmakers_any : netmakers_common<any_connection>
-{
-    using connect = netfun_maker<void, any_connection, const connect_params&>;
-    using set_character_set = netfun_maker<void, any_connection, const character_set&>;
-    using run_pipeline = netfun_maker<
-        void,
-        any_connection,
-        const pipeline_request&,
-        std::vector<stage_response>&>;
-};
-
-struct network_functions_connection
-{
-    using netmakers = netmakers_connection;
-
-    string_view name;
-    netmakers::prepare_statement::signature prepare_statement;
-    netmakers::execute_query::signature execute_query;
-    netmakers::execute_statement::signature execute_statement;
-    netmakers::start_execution::signature start_execution;
-    netmakers::close_statement::signature close_statement;
-    netmakers::read_resultset_head::signature read_resultset_head;
-    netmakers::read_some_rows::signature read_some_rows;
-    netmakers::ping::signature ping;
-    netmakers::reset_connection::signature reset_connection;
-    netmakers::close::signature close;
-#ifdef BOOST_MYSQL_CXX14
-    netmakers::start_execution_static::signature start_execution_static;
-    netmakers::read_some_rows_static::signature read_some_rows_static;
-#endif
-    netmakers::connect_stream::signature connect_stream;
-    netmakers::handshake::signature handshake;
-    netmakers::connect::signature connect;
-    netmakers::quit::signature quit;
-
-    static std::vector<network_functions_connection> all();
-    static std::vector<network_functions_connection> sync_and_async();
-};
-std::ostream& operator<<(std::ostream& os, const network_functions_connection& v);
-
-struct network_functions_any
-{
-    using netmakers = netmakers_any;
-
-    string_view name;
-    netmakers::prepare_statement::signature prepare_statement;
-    netmakers::execute_query::signature execute_query;
-    netmakers::execute_statement::signature execute_statement;
-    netmakers::start_execution::signature start_execution;
-    netmakers::close_statement::signature close_statement;
-    netmakers::read_resultset_head::signature read_resultset_head;
-    netmakers::read_some_rows::signature read_some_rows;
-    netmakers::ping::signature ping;
-    netmakers::reset_connection::signature reset_connection;
-    netmakers::close::signature close;
-#ifdef BOOST_MYSQL_CXX14
-    netmakers::start_execution_static::signature start_execution_static;
-    netmakers::read_some_rows_static::signature read_some_rows_static;
-#endif
-    netmakers::connect::signature connect;
-    netmakers::set_character_set::signature set_character_set;
-    netmakers::run_pipeline::signature run_pipeline;
-
-    static std::vector<network_functions_any> all();
-    static std::vector<network_functions_any> sync_and_async();
-};
-std::ostream& operator<<(std::ostream& os, const network_functions_any& v);
-
-// Fixtures. Like tcp_connection_fixture and any_connection_fixture,
-// but using a network_functions value
-struct netfn_fixture_connection : io_context_fixture
-{
-    tcp_connection conn{ctx};
-    network_functions_connection net;
-
-    netfn_fixture_connection(network_functions_connection n) : net(std::move(n))
-    {
-        conn.set_meta_mode(metadata_mode::full);
-    }
-    ~netfn_fixture_connection() { net.close(conn).validate_no_error(); }
-
-    void connect(connect_params_builder conn_params = {})
-    {
-        net.connect(conn, get_tcp_endpoint(), conn_params.build_hparams()).validate_no_error();
-    }
-};
-
-struct netfn_fixture_any : io_context_fixture
-{
-    any_connection conn{ctx};
-    network_functions_any net;
-
-    netfn_fixture_any(network_functions_any n) : net(std::move(n))
-    {
-        conn.set_meta_mode(metadata_mode::full);
-    }
-    ~netfn_fixture_any() { net.close(conn).validate_no_error(); }
-
-    void connect(connect_params_builder conn_params = {})
-    {
-        net.connect(conn, conn_params.build()).validate_no_error();
-    }
-};
-
-}  // namespace test
-}  // namespace mysql
-}  // namespace boost
-
-#endif
diff --git a/test/integration/include/test_integration/static_rows.hpp b/test/integration/include/test_integration/static_rows.hpp
index 645f3a235..117617387 100644
--- a/test/integration/include/test_integration/static_rows.hpp
+++ b/test/integration/include/test_integration/static_rows.hpp
@@ -45,10 +45,8 @@ BOOST_DESCRIBE_STRUCT(row_2fields, (), (id, field_varchar))
 
 using empty = std::tuple<>;
 
-#ifdef BOOST_DESCRIBE_CXX14
 using boost::describe::operators::operator==;
 using boost::describe::operators::operator<<;
-#endif
 
 }  // namespace test
 }  // namespace mysql
diff --git a/test/integration/include/test_integration/tcp_connection_fixture.hpp b/test/integration/include/test_integration/tcp_connection_fixture.hpp
deleted file mode 100644
index 889cf38f3..000000000
--- a/test/integration/include/test_integration/tcp_connection_fixture.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_MYSQL_TEST_INTEGRATION_INCLUDE_TEST_INTEGRATION_TCP_CONNECTION_FIXTURE_HPP
-#define BOOST_MYSQL_TEST_INTEGRATION_INCLUDE_TEST_INTEGRATION_TCP_CONNECTION_FIXTURE_HPP
-
-#include <boost/mysql/handshake_params.hpp>
-#include <boost/mysql/tcp.hpp>
-
-#include <boost/assert/source_location.hpp>
-
-#include "test_common/io_context_fixture.hpp"
-#include "test_common/source_location.hpp"
-
-namespace boost {
-namespace mysql {
-namespace test {
-
-struct tcp_connection_fixture : io_context_fixture
-{
-    tcp_connection conn;
-
-    tcp_connection_fixture();
-    ~tcp_connection_fixture();
-
-    void connect(source_location loc = BOOST_MYSQL_CURRENT_LOCATION);
-    void connect(const handshake_params&, source_location loc = BOOST_MYSQL_CURRENT_LOCATION);
-};
-
-asio::ip::tcp::endpoint get_tcp_endpoint();
-
-}  // namespace test
-}  // namespace mysql
-}  // namespace boost
-
-#endif
\ No newline at end of file
diff --git a/test/integration/src/metadata_validator.cpp b/test/integration/src/metadata_validator.cpp
index 2cd09d147..e011da659 100644
--- a/test/integration/src/metadata_validator.cpp
+++ b/test/integration/src/metadata_validator.cpp
@@ -8,16 +8,13 @@
 #include <boost/mysql/metadata.hpp>
 #include <boost/mysql/metadata_collection_view.hpp>
 
-#include <boost/test/unit_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #include "test_integration/metadata_validator.hpp"
 
 using namespace boost::mysql::test;
 
-#define MYSQL_TEST_FLAG_GETTER_NAME_ENTRY(getter) \
-    {                                             \
-        #getter, &boost::mysql::metadata::getter  \
-    }
+#define MYSQL_TEST_FLAG_GETTER_NAME_ENTRY(getter) {#getter, &boost::mysql::metadata::getter}
 
 static struct flag_entry
 {
@@ -35,8 +32,6 @@ static struct flag_entry
     MYSQL_TEST_FLAG_GETTER_NAME_ENTRY(is_set_to_now_on_update)
 };
 
-BOOST_TEST_DONT_PRINT_LOG_VALUE(std::vector<flag_entry>::iterator)
-
 static bool contains(
     meta_validator::flag_getter flag,
     const std::vector<meta_validator::flag_getter>& flagvec
@@ -48,14 +43,14 @@ static bool contains(
 void meta_validator::validate(const boost::mysql::metadata& value) const
 {
     // Fixed fields
-    BOOST_TEST(value.database() == "boost_mysql_integtests");
-    BOOST_TEST(value.table() == table_);
-    BOOST_TEST(value.original_table() == org_table_);
-    BOOST_TEST(value.column_name() == field_);
-    BOOST_TEST(value.original_column_name() == org_field_);
-    BOOST_TEST(value.column_length() > 0u);
-    BOOST_TEST(value.type() == type_);
-    BOOST_TEST(value.decimals() == decimals_);
+    BOOST_TEST_EQ(value.database(), "boost_mysql_integtests");
+    BOOST_TEST_EQ(value.table(), table_);
+    BOOST_TEST_EQ(value.original_table(), org_table_);
+    BOOST_TEST_EQ(value.column_name(), field_);
+    BOOST_TEST_EQ(value.original_column_name(), org_field_);
+    BOOST_TEST_EQ(value.column_length(), 0u);
+    BOOST_TEST_EQ(value.type(), type_);
+    BOOST_TEST_EQ(value.decimals(), decimals_);
 
     // Flags
     std::vector<flag_entry> all_flags(std::begin(flag_names), std::end(flag_names));
@@ -65,9 +60,10 @@ void meta_validator::validate(const boost::mysql::metadata& value) const
         auto it = std::find_if(all_flags.begin(), all_flags.end(), [true_flag](const flag_entry& entry) {
             return entry.getter == true_flag;
         });
-        BOOST_TEST_REQUIRE(it != all_flags.end());                // no repeated flag
-        BOOST_TEST_REQUIRE(!contains(true_flag, ignore_flags_));  // ignore flags cannot be set to true
-        BOOST_TEST((value.*true_flag)(), it->name);
+        BOOST_TEST(it != all_flags.end());                   // no repeated flag
+        BOOST_TEST_NOT(contains(true_flag, ignore_flags_));  // ignore flags cannot be set to true
+        if (!BOOST_TEST((value.*true_flag)()))
+            std::cerr << "  Offending flag is " << it->name << std::endl;
         all_flags.erase(it);
     }
 
@@ -75,7 +71,8 @@ void meta_validator::validate(const boost::mysql::metadata& value) const
     {
         if (!contains(entry.getter, ignore_flags_))
         {
-            BOOST_TEST(!(value.*entry.getter)(), entry.name);
+            if (!BOOST_TEST_NOT((value.*entry.getter)()))
+                std::cerr << "  Offending flag is " << entry.name << std::endl;
         }
     }
 }
@@ -85,18 +82,23 @@ void boost::mysql::test::validate_meta(
     const std::vector<meta_validator>& expected
 )
 {
-    BOOST_TEST_REQUIRE(actual.size() == expected.size());
-    for (std::size_t i = 0; i < actual.size(); ++i)
-    {
-        expected[i].validate(actual[i]);
-    }
+    BOOST_TEST_ALL_WITH(
+        actual.begin(),
+        actual.end(),
+        expected.begin(),
+        expected.end(),
+        [](const metadata& m, const meta_validator& v) {
+            v.validate(m);
+            return true;
+        }
+    );
 }
 
-void boost::mysql::test::validate_2fields_meta(metadata_collection_view fields, string_view table)
+void boost::mysql::test::validate_2fields_meta(metadata_collection_view fields, std::string_view table)
 {
     validate_meta(
         fields,
-        {meta_validator(table, "id", column_type::int_),
-         meta_validator(table, "field_varchar", column_type::varchar)}
+        {meta_validator(std::string(table), "id", column_type::int_),
+         meta_validator(std::string(table), "field_varchar", column_type::varchar)}
     );
 }
diff --git a/test/integration/src/server_features.cpp b/test/integration/src/server_features.cpp
index e3ac2e8b9..da879f768 100644
--- a/test/integration/src/server_features.cpp
+++ b/test/integration/src/server_features.cpp
@@ -5,11 +5,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/mysql/string_view.hpp>
-
 #include <boost/core/span.hpp>
-#include <boost/test/framework.hpp>
-#include <boost/test/tools/assertion_result.hpp>
 
 #include <algorithm>
 #include <iostream>
@@ -21,13 +17,13 @@
 
 using namespace boost::mysql;
 
-static std::vector<string_view> split_list(string_view s)
+static std::vector<std::string_view> split_list(std::string_view s)
 {
-    std::vector<string_view> res;
+    std::vector<std::string_view> res;
     std::size_t pos = 0;
     if (!s.empty())
     {
-        while ((pos = s.find(' ')) != string_view::npos)
+        while ((pos = s.find(' ')) != std::string_view::npos)
         {
             res.push_back(s.substr(0, pos));
             s = s.substr(pos + 1);
@@ -48,7 +44,7 @@ static test::server_features do_get_server_features()
     // The list of possible features
     const struct possible_feature_t
     {
-        string_view name;
+        std::string_view name;
         test::server_feature_t ptr;
     } possible_features[]{
         {"unix-sockets",          &test::server_features::unix_sockets         },
@@ -93,21 +89,3 @@ boost::mysql::test::server_features boost::mysql::test::get_server_features()
     static server_features res = do_get_server_features();
     return res;
 }
-
-boost::unit_test::precondition boost::mysql::test::run_if(server_feature_t feature)
-{
-    return unit_test::precondition([feature](unit_test::test_unit_id) {
-        return get_server_features().*feature;
-    });
-}
-
-boost::unit_test::precondition boost::mysql::test::run_if(
-    server_feature_t feature1,
-    server_feature_t feature2
-)
-{
-    return unit_test::precondition([=](unit_test::test_unit_id) {
-        const auto supported = get_server_features();
-        return supported.*feature1 && supported.*feature2;
-    });
-}
diff --git a/test/integration/src/spotchecks_helpers.cpp b/test/integration/src/spotchecks_helpers.cpp
deleted file mode 100644
index 1b39a1828..000000000
--- a/test/integration/src/spotchecks_helpers.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Copyright (c) 2019-2025 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#include <boost/asio/ip/tcp.hpp>
-
-#include <ostream>
-#include <utility>
-
-#include "test_integration/spotchecks_helpers.hpp"
-
-using namespace boost::mysql::test;
-
-// Network functions
-#define BOOST_MYSQL_MAKE_NETFN(conn, netm, fn, i)              \
-    (i == 0   ? netmakers::netm::sync_errc(&conn::fn)          \
-     : i == 1 ? netmakers::netm::sync_exc(&conn::fn)           \
-     : i == 2 ? netmakers::netm::async_diag(&conn::async_##fn) \
-              : netmakers::netm::async_nodiag(&conn::async_##fn))
-
-static constexpr const char* fn_names[] = {"sync_errc", "sync_exc", "async_diag", "async_nodiag"};
-
-std::vector<network_functions_connection> boost::mysql::test::network_functions_connection::all()
-{
-    std::vector<network_functions_connection> res;
-
-    for (std::size_t i = 0; i < 4; ++i)
-    {
-        // connect_stream doesn't involve diagnostics
-        auto fn_connect_stream = (i == 0 || i == 1) ? netmakers::connect_stream::sync_errc_nodiag(
-                                                          &asio::ip::tcp::socket::connect
-                                                      )
-                                                    : netmakers::connect_stream::async_nodiag(
-                                                          &asio::ip::tcp::socket::async_connect
-                                                      );
-
-        res.push_back({
-            fn_names[i],
-            BOOST_MYSQL_MAKE_NETFN(tcp_connection, prepare_statement, prepare_statement, i),
-            BOOST_MYSQL_MAKE_NETFN(tcp_connection, execute_query, execute, i),
-            BOOST_MYSQL_MAKE_NETFN(tcp_connection, execute_statement, execute, i),
-            BOOST_MYSQL_MAKE_NETFN(tcp_connection, start_execution, start_execution, i),
-            BOOST_MYSQL_MAKE_NETFN(tcp_connection, close_statement, close_statement, i),
-            BOOST_MYSQL_MAKE_NETFN(tcp_connection, read_resultset_head, read_resultset_head, i),
-            BOOST_MYSQL_MAKE_NETFN(tcp_connection, read_some_rows, read_some_rows, i),
-            BOOST_MYSQL_MAKE_NETFN(tcp_connection, ping, ping, i),
-            BOOST_MYSQL_MAKE_NETFN(tcp_connection, reset_connection, reset_connection, i),
-            BOOST_MYSQL_MAKE_NETFN(tcp_connection, close, close, i),
-#ifdef BOOST_MYSQL_CXX14
-            BOOST_MYSQL_MAKE_NETFN(tcp_connection, start_execution_static, start_execution, i),
-            BOOST_MYSQL_MAKE_NETFN(tcp_connection, read_some_rows_static, read_some_rows, i),
-#endif
-            std::move(fn_connect_stream),
-            BOOST_MYSQL_MAKE_NETFN(tcp_connection, handshake, handshake, i),
-            BOOST_MYSQL_MAKE_NETFN(tcp_connection, connect, connect, i),
-            BOOST_MYSQL_MAKE_NETFN(tcp_connection, quit, quit, i),
-        });
-    }
-
-    return res;
-}
-
-std::vector<network_functions_connection> boost::mysql::test::network_functions_connection::sync_and_async()
-{
-    auto all_fns = all();
-    return {std::move(all_fns[0]), std::move(all_fns[2])};
-}
-
-std::ostream& boost::mysql::test::operator<<(std::ostream& os, const network_functions_connection& v)
-{
-    return os << v.name;
-}
-
-std::vector<network_functions_any> boost::mysql::test::network_functions_any::all()
-{
-    std::vector<network_functions_any> res;
-
-    for (std::size_t i = 0; i < 4; ++i)
-    {
-        res.push_back({
-            fn_names[i],
-            BOOST_MYSQL_MAKE_NETFN(any_connection, prepare_statement, prepare_statement, i),
-            BOOST_MYSQL_MAKE_NETFN(any_connection, execute_query, execute, i),
-            BOOST_MYSQL_MAKE_NETFN(any_connection, execute_statement, execute, i),
-            BOOST_MYSQL_MAKE_NETFN(any_connection, start_execution, start_execution, i),
-            BOOST_MYSQL_MAKE_NETFN(any_connection, close_statement, close_statement, i),
-            BOOST_MYSQL_MAKE_NETFN(any_connection, read_resultset_head, read_resultset_head, i),
-            BOOST_MYSQL_MAKE_NETFN(any_connection, read_some_rows, read_some_rows, i),
-            BOOST_MYSQL_MAKE_NETFN(any_connection, ping, ping, i),
-            BOOST_MYSQL_MAKE_NETFN(any_connection, reset_connection, reset_connection, i),
-            BOOST_MYSQL_MAKE_NETFN(any_connection, close, close, i),
-#ifdef BOOST_MYSQL_CXX14
-            BOOST_MYSQL_MAKE_NETFN(any_connection, start_execution_static, start_execution, i),
-            BOOST_MYSQL_MAKE_NETFN(any_connection, read_some_rows_static, read_some_rows, i),
-#endif
-            BOOST_MYSQL_MAKE_NETFN(any_connection, connect, connect, i),
-            BOOST_MYSQL_MAKE_NETFN(any_connection, set_character_set, set_character_set, i),
-            BOOST_MYSQL_MAKE_NETFN(any_connection, run_pipeline, run_pipeline, i),
-        });
-    }
-
-    return res;
-}
-
-std::vector<network_functions_any> boost::mysql::test::network_functions_any::sync_and_async()
-{
-    auto all_fns = all();
-    return {std::move(all_fns[0]), std::move(all_fns[2])};
-}
-
-std::ostream& boost::mysql::test::operator<<(std::ostream& os, const network_functions_any& v)
-{
-    return os << v.name;
-}
\ No newline at end of file
diff --git a/test/integration/src/utils.cpp b/test/integration/src/utils.cpp
index d82298fd7..043163631 100644
--- a/test/integration/src/utils.cpp
+++ b/test/integration/src/utils.cpp
@@ -15,85 +15,49 @@
 #include <exception>
 
 #include "test_common/ci_server.hpp"
-#include "test_common/network_result.hpp"
-#include "test_common/poll_until.hpp"
-#include "test_integration/any_connection_fixture.hpp"
+// #include "test_integration/any_connection_fixture.hpp"
 #include "test_integration/connect_params_builder.hpp"
-#include "test_integration/run_coro.hpp"
-#include "test_integration/tcp_connection_fixture.hpp"
 
 using namespace boost::mysql;
 using namespace boost::mysql::test;
-namespace asio = boost::asio;
 
-//
-// any_connection_fixture.hpp
-//
-static any_connection_params make_params(asio::ssl::context& ssl_ctx)
-{
-    any_connection_params res;
-    res.ssl_context = &ssl_ctx;
-    return res;
-}
-
-any_connection_fixture::any_connection_fixture(any_connection_params params) : conn(ctx, params)
-{
-    conn.set_meta_mode(metadata_mode::full);
-}
-
-any_connection_fixture::any_connection_fixture(asio::ssl::context& ssl_ctx)
-    : any_connection_fixture(make_params(ssl_ctx))
-{
-}
-
-any_connection_fixture::~any_connection_fixture() { conn.async_close(as_netresult).validate_no_error(); }
-
-void any_connection_fixture::connect(const connect_params& params, boost::source_location loc)
-{
-    conn.async_connect(params, as_netresult).validate_no_error(loc);
-}
-
-void any_connection_fixture::connect(boost::source_location loc)
-{
-    connect(connect_params_builder().ssl(ssl_mode::disable).build(), loc);
-}
-
-void any_connection_fixture::start_transaction(boost::source_location loc)
-{
-    results r;
-    conn.async_execute("START TRANSACTION", r, as_netresult).validate_no_error(loc);
-}
-
-//
-// tcp_connection_fixture.hpp
-//
-static asio::ip::tcp::endpoint resolve_server_endpoint()
-{
-    asio::io_context ctx;
-    asio::ip::tcp::resolver resolver(ctx);
-    auto results = resolver.resolve(get_hostname(), default_port_string);
-    return *results.begin();
-}
-
-tcp_connection_fixture::tcp_connection_fixture() : conn(ctx) { conn.set_meta_mode(metadata_mode::full); }
-
-tcp_connection_fixture::~tcp_connection_fixture() { conn.async_close(as_netresult).validate_no_error(); }
-
-void tcp_connection_fixture::connect(boost::source_location loc)
-{
-    connect(connect_params_builder().build_hparams(), loc);
-}
-
-void tcp_connection_fixture::connect(const handshake_params& params, boost::source_location loc)
-{
-    conn.async_connect(get_tcp_endpoint(), params, as_netresult).validate_no_error(loc);
-}
-
-asio::ip::tcp::endpoint boost::mysql::test::get_tcp_endpoint()
-{
-    static auto res = resolve_server_endpoint();
-    return res;
-}
+// //
+// // any_connection_fixture.hpp
+// //
+// static any_connection_params make_params(asio::ssl::context& ssl_ctx)
+// {
+//     any_connection_params res;
+//     res.ssl_context = &ssl_ctx;
+//     return res;
+// }
+
+// any_connection_fixture::any_connection_fixture(any_connection_params params) : conn(ctx, params)
+// {
+//     conn.set_meta_mode(metadata_mode::full);
+// }
+
+// any_connection_fixture::any_connection_fixture(asio::ssl::context& ssl_ctx)
+//     : any_connection_fixture(make_params(ssl_ctx))
+// {
+// }
+
+// any_connection_fixture::~any_connection_fixture() { conn.async_close(as_netresult).validate_no_error(); }
+
+// void any_connection_fixture::connect(const connect_params& params, boost::source_location loc)
+// {
+//     conn.async_connect(params, as_netresult).validate_no_error(loc);
+// }
+
+// void any_connection_fixture::connect(boost::source_location loc)
+// {
+//     connect(connect_params_builder().ssl(ssl_mode::disable).build(), loc);
+// }
+
+// void any_connection_fixture::start_transaction(boost::source_location loc)
+// {
+//     results r;
+//     conn.async_execute("START TRANSACTION", r, as_netresult).validate_no_error(loc);
+// }
 
 //
 // connect_params_builder.hpp
@@ -110,25 +74,3 @@ connect_params connect_params_builder::build()
     res.connection_collation = res_.connection_collation();
     return res;
 }
-
-//
-// run_coro.hpp
-//
-#ifdef BOOST_ASIO_HAS_CO_AWAIT
-void boost::mysql::test::run_coro(
-    asio::io_context& ctx,
-    std::function<boost::asio::awaitable<void>(void)> fn,
-    source_location loc
-)
-{
-    bool done = false;
-    boost::asio::co_spawn(ctx, fn, [&](std::exception_ptr ptr) {
-        done = true;
-        if (ptr)
-        {
-            std::rethrow_exception(ptr);
-        }
-    });
-    poll_until(ctx, &done, loc);
-}
-#endif
\ No newline at end of file
diff --git a/test/integration/test/any_connection.cpp b/test/integration/test/any_connection.cpp
index 3669fef7b..98024f7a8 100644
--- a/test/integration/test/any_connection.cpp
+++ b/test/integration/test/any_connection.cpp
@@ -22,8 +22,6 @@
 #include <boost/mysql/detail/access.hpp>
 #include <boost/mysql/detail/engine_impl.hpp>
 
-#include <boost/mysql/impl/internal/variant_stream.hpp>
-
 #include <boost/asio/as_tuple.hpp>
 #include <boost/asio/awaitable.hpp>
 #include <boost/asio/cancel_after.hpp>
@@ -36,6 +34,7 @@
 #include <chrono>
 #include <string>
 
+#include "mycosql_internal/variant_stream.hpp"
 #include "test_common/create_basic.hpp"
 #include "test_common/create_diagnostics.hpp"
 #include "test_common/network_result.hpp"
diff --git a/test/unit/include/test_unit/algo_test.hpp b/test/unit/include/test_unit/algo_test.hpp
index 7952cd091..ee73b177f 100644
--- a/test/unit/include/test_unit/algo_test.hpp
+++ b/test/unit/include/test_unit/algo_test.hpp
@@ -14,10 +14,6 @@
 
 #include <boost/mysql/detail/next_action.hpp>
 
-#include <boost/mysql/impl/internal/protocol/capabilities.hpp>
-#include <boost/mysql/impl/internal/protocol/db_flavor.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-
 #include <boost/config.hpp>
 #include <boost/core/span.hpp>
 #include <boost/optional/optional.hpp>
@@ -26,6 +22,9 @@
 #include <cstdint>
 #include <vector>
 
+#include "mycosql_internal/protocol/capabilities.hpp"
+#include "mycosql_internal/protocol/db_flavor.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
 #include "test_common/source_location.hpp"
 
 namespace boost {
diff --git a/test/unit/include/test_unit/create_err.hpp b/test/unit/include/test_unit/create_err.hpp
index 0e0cfbe12..0218c022b 100644
--- a/test/unit/include/test_unit/create_err.hpp
+++ b/test/unit/include/test_unit/create_err.hpp
@@ -9,10 +9,10 @@
 #define BOOST_MYSQL_TEST_UNIT_INCLUDE_TEST_UNIT_CREATE_ERR_HPP
 
 #include <boost/mysql/common_server_errc.hpp>
-#include <boost/mysql/string_view.hpp>
 
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
+#include <string_view>
 
+#include "mycosql_internal/protocol/deserialization.hpp"
 #include "test_unit/create_frame.hpp"
 
 namespace boost {
diff --git a/test/unit/include/test_unit/create_execution_processor.hpp b/test/unit/include/test_unit/create_execution_processor.hpp
index 6ba17a9b0..29e1e22e4 100644
--- a/test/unit/include/test_unit/create_execution_processor.hpp
+++ b/test/unit/include/test_unit/create_execution_processor.hpp
@@ -11,7 +11,6 @@
 #include <boost/mysql/column_type.hpp>
 #include <boost/mysql/diagnostics.hpp>
 #include <boost/mysql/field_view.hpp>
-#include <boost/mysql/string_view.hpp>
 #include <boost/mysql/throw_on_error.hpp>
 
 #include <boost/mysql/detail/access.hpp>
@@ -19,6 +18,7 @@
 #include <boost/mysql/detail/resultset_encoding.hpp>
 
 #include <cstddef>
+#include <string_view>
 
 #include "test_unit/create_meta.hpp"
 #include "test_unit/create_row_message.hpp"
diff --git a/test/unit/include/test_unit/create_meta.hpp b/test/unit/include/test_unit/create_meta.hpp
index 7df7b8398..5b6612e7f 100644
--- a/test/unit/include/test_unit/create_meta.hpp
+++ b/test/unit/include/test_unit/create_meta.hpp
@@ -10,13 +10,13 @@
 
 #include <boost/mysql/column_type.hpp>
 #include <boost/mysql/metadata.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/access.hpp>
 #include <boost/mysql/detail/flags.hpp>
 
 #include <cstddef>
 #include <cstdint>
+#include <string_view>
 #include <vector>
 
 namespace boost {
diff --git a/test/unit/include/test_unit/create_ok.hpp b/test/unit/include/test_unit/create_ok.hpp
index 0933121d0..8230fb5cf 100644
--- a/test/unit/include/test_unit/create_ok.hpp
+++ b/test/unit/include/test_unit/create_ok.hpp
@@ -8,11 +8,11 @@
 #ifndef BOOST_MYSQL_TEST_UNIT_INCLUDE_TEST_UNIT_CREATE_OK_HPP
 #define BOOST_MYSQL_TEST_UNIT_INCLUDE_TEST_UNIT_CREATE_OK_HPP
 
-#include <boost/mysql/string_view.hpp>
-
 #include <boost/mysql/detail/flags.hpp>
 #include <boost/mysql/detail/ok_view.hpp>
 
+#include <string_view>
+
 namespace boost {
 namespace mysql {
 namespace test {
diff --git a/test/unit/include/test_unit/create_query_frame.hpp b/test/unit/include/test_unit/create_query_frame.hpp
index 099f4e069..8138138a1 100644
--- a/test/unit/include/test_unit/create_query_frame.hpp
+++ b/test/unit/include/test_unit/create_query_frame.hpp
@@ -8,9 +8,8 @@
 #ifndef BOOST_MYSQL_TEST_UNIT_INCLUDE_TEST_UNIT_CREATE_QUERY_FRAME_HPP
 #define BOOST_MYSQL_TEST_UNIT_INCLUDE_TEST_UNIT_CREATE_QUERY_FRAME_HPP
 
-#include <boost/mysql/string_view.hpp>
-
 #include <cstdint>
+#include <string_view>
 #include <vector>
 
 #include "test_unit/create_frame.hpp"
diff --git a/test/unit/include/test_unit/mock_execution_processor.hpp b/test/unit/include/test_unit/mock_execution_processor.hpp
index 23e7bb8e9..5ad02751b 100644
--- a/test/unit/include/test_unit/mock_execution_processor.hpp
+++ b/test/unit/include/test_unit/mock_execution_processor.hpp
@@ -12,7 +12,6 @@
 #include <boost/mysql/error_code.hpp>
 #include <boost/mysql/field_view.hpp>
 #include <boost/mysql/metadata.hpp>
-#include <boost/mysql/string_view.hpp>
 
 #include <boost/mysql/detail/access.hpp>
 #include <boost/mysql/detail/execution_processor/execution_processor.hpp>
@@ -21,6 +20,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include <cstddef>
+#include <string_view>
 
 #include "test_unit/fail_count.hpp"
 
@@ -192,8 +192,11 @@ class mock_execution_processor : public detail::execution_processor
     }
     void on_row_batch_start_impl() override { ++num_calls_.on_row_batch_start; }
     void on_row_batch_finish_impl() override { ++num_calls_.on_row_batch_finish; }
-    error_code on_row_impl(span<const std::uint8_t>, const detail::output_ref& ref, std::vector<field_view>&)
-        override
+    error_code on_row_impl(
+        span<const std::uint8_t>,
+        const detail::output_ref& ref,
+        std::vector<field_view>&
+    ) override
     {
         ++num_calls_.on_row;
         refs_.push_back(ref);
diff --git a/test/unit/include/test_unit/mock_message.hpp b/test/unit/include/test_unit/mock_message.hpp
index a4042112d..b38831a48 100644
--- a/test/unit/include/test_unit/mock_message.hpp
+++ b/test/unit/include/test_unit/mock_message.hpp
@@ -8,12 +8,12 @@
 #ifndef BOOST_MYSQL_TEST_UNIT_INCLUDE_TEST_UNIT_MOCK_MESSAGE_HPP
 #define BOOST_MYSQL_TEST_UNIT_INCLUDE_TEST_UNIT_MOCK_MESSAGE_HPP
 
-#include <boost/mysql/impl/internal/protocol/impl/serialization_context.hpp>
-
 #include <boost/core/span.hpp>
 
 #include <cstdint>
 
+#include "mycosql_internal/protocol/impl/serialization_context.hpp"
+
 namespace boost {
 namespace mysql {
 namespace test {
diff --git a/test/unit/include/test_unit/serialize_to_vector.hpp b/test/unit/include/test_unit/serialize_to_vector.hpp
index 956c3da10..d65f6f60b 100644
--- a/test/unit/include/test_unit/serialize_to_vector.hpp
+++ b/test/unit/include/test_unit/serialize_to_vector.hpp
@@ -10,14 +10,14 @@
 
 #include <boost/mysql/error_code.hpp>
 
-#include <boost/mysql/impl/internal/protocol/impl/serialization_context.hpp>
-#include <boost/mysql/impl/internal/protocol/serialization.hpp>
-
 #include <boost/test/unit_test.hpp>
 
 #include <cstdint>
 #include <vector>
 
+#include "mycosql_internal/protocol/impl/serialization_context.hpp"
+#include "mycosql_internal/protocol/serialization.hpp"
+
 namespace boost {
 namespace mysql {
 namespace test {
diff --git a/test/unit/include/test_unit/test_any_connection.hpp b/test/unit/include/test_unit/test_any_connection.hpp
index 517fd8cc2..45af06c44 100644
--- a/test/unit/include/test_unit/test_any_connection.hpp
+++ b/test/unit/include/test_unit/test_any_connection.hpp
@@ -10,10 +10,9 @@
 
 #include <boost/mysql/any_connection.hpp>
 
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-
 #include <boost/asio/io_context.hpp>
 
+#include "mycosql_internal/sansio/connection_state_data.hpp"
 #include "test_unit/test_stream.hpp"
 
 namespace boost {
diff --git a/test/unit/src/utils.cpp b/test/unit/src/utils.cpp
index 5bb25ae97..eb36cd6d4 100644
--- a/test/unit/src/utils.cpp
+++ b/test/unit/src/utils.cpp
@@ -23,17 +23,6 @@
 #include <boost/mysql/detail/results_iterator.hpp>
 #include <boost/mysql/detail/resultset_encoding.hpp>
 
-#include <boost/mysql/impl/internal/connection_pool/sansio_connection_node.hpp>
-#include <boost/mysql/impl/internal/protocol/capabilities.hpp>
-#include <boost/mysql/impl/internal/protocol/db_flavor.hpp>
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
-#include <boost/mysql/impl/internal/protocol/frame_header.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/protocol_field_type.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/protocol_types.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/serialization_context.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/compose.hpp>
 #include <boost/asio/error.hpp>
@@ -48,6 +37,16 @@
 #include <ostream>
 #include <utility>
 
+#include "mycosql_internal/connection_pool/sansio_connection_node.hpp"
+#include "mycosql_internal/protocol/capabilities.hpp"
+#include "mycosql_internal/protocol/db_flavor.hpp"
+#include "mycosql_internal/protocol/deserialization.hpp"
+#include "mycosql_internal/protocol/frame_header.hpp"
+#include "mycosql_internal/protocol/impl/protocol_field_type.hpp"
+#include "mycosql_internal/protocol/impl/protocol_types.hpp"
+#include "mycosql_internal/protocol/impl/serialization_context.hpp"
+#include "mycosql_internal/sansio/connection_state.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
 #include "test_common/assert_buffer_equals.hpp"
 #include "test_common/printing.hpp"
 #include "test_unit/algo_test.hpp"
@@ -808,12 +807,14 @@ boost::mysql::any_connection boost::mysql::test::create_test_any_connection(
     detail::connection_status initial_status
 )
 {
-    auto res = any_connection(detail::access::construct<any_connection>(
-        std::unique_ptr<detail::engine>(
-            new detail::engine_impl<detail::engine_stream_adaptor<test_stream>>(ctx.get_executor())
-        ),
-        params
-    ));
+    auto res = any_connection(
+        detail::access::construct<any_connection>(
+            std::unique_ptr<detail::engine>(
+                new detail::engine_impl<detail::engine_stream_adaptor<test_stream>>(ctx.get_executor())
+            ),
+            params
+        )
+    );
     detail::access::get_impl(res).get_state().data().status = initial_status;
     return res;
 }
diff --git a/test/unit/test/character_set.cpp b/test/unit/test/character_set.cpp
index def96e43c..474bffb10 100644
--- a/test/unit/test/character_set.cpp
+++ b/test/unit/test/character_set.cpp
@@ -8,14 +8,13 @@
 #include <boost/mysql/character_set.hpp>
 #include <boost/mysql/string_view.hpp>
 
-#include <boost/mysql/impl/internal/call_next_char.hpp>
-
 #include <boost/test/tools/context.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include <cstddef>
 #include <string>
 
+#include "mycosql_internal/call_next_char.hpp"
 #include "test_common/create_basic.hpp"
 
 using namespace boost::mysql;
@@ -57,7 +56,7 @@ BOOST_AUTO_TEST_CASE(utf8mb4_multibyte_valid)
         string_view input;
         std::size_t expected;
     } test_cases[] = {
-  // 2 byte characters. We perform some extra tests for c2 and c3
+        // 2 byte characters. We perform some extra tests for c2 and c3
         {"c2 min (U+0080)",          "\xc2\x80",         2u},
         {"c2 reg (U+0095)",          "\xc2\x95",         2u},
         {"c2 max (U+00BF)",          "\xc2\xbf",         2u},
@@ -65,7 +64,7 @@ BOOST_AUTO_TEST_CASE(utf8mb4_multibyte_valid)
         {"c3 reg (U+00E7)",          "\xc3\xa7",         2u},
         {"c3 max (U+00FF)",          "\xc3\xbf",         2u},
 
- // c4-df behave the same as c2-c3, so only min and max
+        // c4-df behave the same as c2-c3, so only min and max
         {"c4 min (U+0100)",          "\xc4\x80",         2u},
         {"c4 max (U+013F)",          "\xc4\xbf",         2u},
         {"c5 min (U+0140)",          "\xc5\x80",         2u},
@@ -123,7 +122,7 @@ BOOST_AUTO_TEST_CASE(utf8mb4_multibyte_valid)
         {"df min (U+07C0)",          "\xdf\x80",         2u},
         {"df max (U+07FF)",          "\xdf\xbf",         2u},
 
- // 3 byte characters. We perform some extra tests for e0 and e1
+        // 3 byte characters. We perform some extra tests for e0 and e1
         {"e0 min min (U+0800)",      "\xe0\xa0\x80",     3u},
         {"e0 min reg (U+0835)",      "\xe0\xa0\xb5",     3u},
         {"e0 min max (U+083F)",      "\xe0\xa0\xbf",     3u},
@@ -139,7 +138,7 @@ BOOST_AUTO_TEST_CASE(utf8mb4_multibyte_valid)
         {"e1 max min (U+1FC0)",      "\xe1\xbf\x80",     3u},
         {"e1 max max (U+1FFF)",      "\xe1\xbf\xbf",     3u},
 
- // e2-ec behave like e1
+        // e2-ec behave like e1
         {"e2 min (U+2000)",          "\xe2\x80\x80",     3u},
         {"e2 max (U+2FFF)",          "\xe2\xbf\xbf",     3u},
         {"e3 min (U+3000)",          "\xe3\x80\x80",     3u},
@@ -163,18 +162,18 @@ BOOST_AUTO_TEST_CASE(utf8mb4_multibyte_valid)
         {"ec min (U+C000)",          "\xec\x80\x80",     3u},
         {"ec max (U+CFFF)",          "\xec\xbf\xbf",     3u},
 
- // ed is different because of surrogates (code points U+D800 to U+DFFF)
+        // ed is different because of surrogates (code points U+D800 to U+DFFF)
         {"ed min (U+D000)",          "\xed\x80\x80",     3u},
         {"ed reg (U+D631)",          "\xed\x98\xb1",     3u},
         {"ed max (U+D7FF)",          "\xed\x9f\xbf",     3u},
 
- // ee-ef behave like e1
+        // ee-ef behave like e1
         {"ee min (U+E000)",          "\xee\x80\x80",     3u},
         {"ee max (U+EFFF)",          "\xee\xbf\xbf",     3u},
         {"ef min (U+F000)",          "\xef\x80\x80",     3u},
         {"ef max (U+FFFF)",          "\xef\xbf\xbf",     3u},
 
- // 4 byte characters - we perform some extra testing for f0
+        // 4 byte characters - we perform some extra testing for f0
         {"f0 min min min (U+10000)", "\xf0\x90\x80\x80", 4u},
         {"f0 min min max (U+1003F)", "\xf0\x90\x80\xbf", 4u},
         {"f0 min max min (U+10FC0)", "\xf0\x90\xbf\x80", 4u},
@@ -191,7 +190,7 @@ BOOST_AUTO_TEST_CASE(utf8mb4_multibyte_valid)
         {"f3 min (U+C0000)",         "\xf3\x80\x80\x80", 4u},
         {"f3 max (U+FFFFF)",         "\xf3\xbf\xbf\xbf", 4u},
 
- // The last allowable code point is U+10FFFF
+        // The last allowable code point is U+10FFFF
         {"f4 min (U+100000)",        "\xf4\x80\x80\x80", 4u},
         {"f4 max (U+10FFFF)",        "\xf4\x8f\xbf\xbf", 4u},
     };
@@ -245,7 +244,7 @@ BOOST_AUTO_TEST_CASE(utf8mb4_invalid_continuation)
         string_view name;
         string_view input;
     } test_cases[] = {
-  // 2 byte characters
+        // 2 byte characters
         {"c2 zero",             makesv("\xc2\x00")        },
         {"c2 ltmin",            "\xc2\x7f"                },
         {"c2 gtmax",            "\xc2\xc0"                },
@@ -309,7 +308,7 @@ BOOST_AUTO_TEST_CASE(utf8mb4_invalid_continuation)
         {"df ltmin",            "\xdf\x7f"                },
         {"df gtmax",            "\xdf\xc0"                },
 
- // 3 byte chars (e0 is special)
+        // 3 byte chars (e0 is special)
         {"e0 ltmin ok",         "\xe0\x9f\x91"            },
         {"e0 gtmax ok",         "\xe0\xc0\x91"            },
         {"e0 ok ltmin",         "\xe0\xa0\x7F"            },
@@ -375,7 +374,7 @@ BOOST_AUTO_TEST_CASE(utf8mb4_invalid_continuation)
         {"ec ok ltmin",         "\xec\xa0\x7F"            },
         {"ec ok gtmax",         "\xec\xa0\xc0"            },
 
- // ed is special because it includes surrogates
+        // ed is special because it includes surrogates
         {"ed ltmin ok",         "\xed\x7f\x91"            },
         {"ed gtmax ok",         "\xed\xc0\x91"            },
         {"ed ok ltmin",         "\xed\xa0\x7F"            },
@@ -384,7 +383,7 @@ BOOST_AUTO_TEST_CASE(utf8mb4_invalid_continuation)
         {"ed surrogate reg",    "\xed\xa1\x92"            },
         {"ed surrogate max",    "\xed\xbf\xbf"            },
 
- // ee and ef behave like e1
+        // ee and ef behave like e1
         {"ee ltmin ok",         "\xee\x7f\x91"            },
         {"ee gtmax ok",         "\xee\xc0\x91"            },
         {"ee ok ltmin",         "\xee\xa0\x7F"            },
@@ -395,7 +394,7 @@ BOOST_AUTO_TEST_CASE(utf8mb4_invalid_continuation)
         {"ef ok ltmin",         "\xef\xa0\x7F"            },
         {"ef ok gtmax",         "\xef\xa0\xc0"            },
 
- // 4 byte characters. f0 is special
+        // 4 byte characters. f0 is special
         {"f0 ltmin ok ok",      "\xf0\x8f\x80\x80"        },
         {"f0 gtmax ok ok",      "\xf0\xc0\x80\x80"        },
         {"f0 ok ltmin ok",      "\xf0\xa1\x7f\xa3"        },
@@ -424,7 +423,7 @@ BOOST_AUTO_TEST_CASE(utf8mb4_invalid_continuation)
         {"f3 ok ok ltmin",      "\xf3\xa1\xa2\x7f"        },
         {"f3 ok ok gtmax",      "\xf3\xa1\xa2\xc0"        },
 
- // f4 is also special because it's the end of the unicode range
+        // f4 is also special because it's the end of the unicode range
         {"f4 ltmin ok ok",      "\xf4\x7f\x80\x80"        },
         {"f4 gtmax ok ok",      "\xf4\x90\x80\x80"        },
         {"f4 ok ltmin ok",      "\xf4\xa1\x7f\xa3"        },
@@ -432,7 +431,7 @@ BOOST_AUTO_TEST_CASE(utf8mb4_invalid_continuation)
         {"f4 ok ok ltmin",      "\xf4\xa1\xa2\x7f"        },
         {"f4 ok ok gtmax",      "\xf4\xa1\xa2\xc0"        },
 
- // overlong characters
+        // overlong characters
         {"overlong / 2byte",    "\xc0\xaf"                },
         {"overlong / 3byte",    "\xe0\x80\xaf"            },
         {"overlong / 4byte",    "\xf0\x80\x80\xaf"        },
diff --git a/test/unit/test/connection_pool.cpp b/test/unit/test/connection_pool.cpp
index 305461ba4..329b60522 100644
--- a/test/unit/test/connection_pool.cpp
+++ b/test/unit/test/connection_pool.cpp
@@ -12,10 +12,6 @@
 #include <boost/mysql/detail/access.hpp>
 #include <boost/mysql/detail/connection_pool_fwd.hpp>
 
-#include <boost/mysql/impl/internal/connection_pool/connection_node.hpp>
-#include <boost/mysql/impl/internal/connection_pool/connection_pool_impl.hpp>
-#include <boost/mysql/impl/internal/connection_pool/sansio_connection_node.hpp>
-
 #include <boost/asio/awaitable.hpp>
 #include <boost/asio/cancel_after.hpp>
 #include <boost/asio/io_context.hpp>
@@ -25,6 +21,9 @@
 
 #include <memory>
 
+#include "mycosql_internal/connection_pool/connection_node.hpp"
+#include "mycosql_internal/connection_pool/connection_pool_impl.hpp"
+#include "mycosql_internal/connection_pool/sansio_connection_node.hpp"
 #include "test_common/printing.hpp"
 #include "test_common/tracker_executor.hpp"
 #include "test_unit/printing.hpp"
diff --git a/test/unit/test/connection_pool/connection_pool_impl.cpp b/test/unit/test/connection_pool/connection_pool_impl.cpp
index 58788d11b..33459ef0e 100644
--- a/test/unit/test/connection_pool/connection_pool_impl.cpp
+++ b/test/unit/test/connection_pool/connection_pool_impl.cpp
@@ -21,11 +21,6 @@
 #include <boost/mysql/detail/access.hpp>
 #include <boost/mysql/detail/pipeline.hpp>
 
-#include <boost/mysql/impl/internal/connection_pool/connection_node.hpp>
-#include <boost/mysql/impl/internal/connection_pool/connection_pool_impl.hpp>
-#include <boost/mysql/impl/internal/connection_pool/internal_pool_params.hpp>
-#include <boost/mysql/impl/internal/connection_pool/sansio_connection_node.hpp>
-
 #include <boost/asio/any_completion_handler.hpp>
 #include <boost/asio/any_io_executor.hpp>
 #include <boost/asio/async_result.hpp>
@@ -56,6 +51,10 @@
 #include <ostream>
 #include <utility>
 
+#include "mycosql_internal/connection_pool/connection_node.hpp"
+#include "mycosql_internal/connection_pool/connection_pool_impl.hpp"
+#include "mycosql_internal/connection_pool/internal_pool_params.hpp"
+#include "mycosql_internal/connection_pool/sansio_connection_node.hpp"
 #include "test_common/create_diagnostics.hpp"
 #include "test_common/io_context_fixture.hpp"
 #include "test_common/network_result.hpp"
diff --git a/test/unit/test/connection_pool/sansio_connection_node.cpp b/test/unit/test/connection_pool/sansio_connection_node.cpp
index 81e2acf2c..00c78c7b4 100644
--- a/test/unit/test/connection_pool/sansio_connection_node.cpp
+++ b/test/unit/test/connection_pool/sansio_connection_node.cpp
@@ -12,14 +12,13 @@
 #include <boost/mysql/error_code.hpp>
 #include <boost/mysql/mysql_server_errc.hpp>
 
-#include <boost/mysql/impl/internal/connection_pool/sansio_connection_node.hpp>
-
 #include <boost/asio/error.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include <cstddef>
 #include <string>
 
+#include "mycosql_internal/connection_pool/sansio_connection_node.hpp"
 #include "test_common/create_diagnostics.hpp"
 #include "test_common/printing.hpp"
 #include "test_unit/printing.hpp"
@@ -344,37 +343,46 @@ BOOST_AUTO_TEST_CASE(create_connect_diagnostics_)
         {"server_error_diag",
          common_server_errc::er_no_such_table,
          create_server_diag("Table 'abc' does not exist"),
-         create_server_diag("Last connection attempt failed with: er_no_such_table "
-                            "[mysql.common-server:1146]: Table 'abc' does not exist")},
+         create_server_diag(
+             "Last connection attempt failed with: er_no_such_table "
+             "[mysql.common-server:1146]: Table 'abc' does not exist"
+         )},
 
         // Common server, without diagnostics. Results in a client message, because it contains no server
         // output
         {"server_error_nodiag",
          common_server_errc::er_no_such_table,
          create_server_diag(""),
-         create_client_diag("Last connection attempt failed with: er_no_such_table [mysql.common-server:1146]"
+         create_client_diag(
+             "Last connection attempt failed with: er_no_such_table [mysql.common-server:1146]"
          )},
 
         // MySQL/MariaDB specific errors
         {"specific_server_error",
          error_code(mysql_server_errc::er_binlog_fatal_error, get_mysql_server_category()),
          create_server_diag("something failed"),
-         create_server_diag("Last connection attempt failed with: er_binlog_fatal_error "
-                            "[mysql.mysql-server:1593]: something failed")},
+         create_server_diag(
+             "Last connection attempt failed with: er_binlog_fatal_error "
+             "[mysql.mysql-server:1593]: something failed"
+         )},
 
         // A client error with diagnostics
         {"client_error_diag",
          client_errc::auth_plugin_requires_ssl,
          create_client_diag("Something client-side failed"),
-         create_client_diag("Last connection attempt failed with: The authentication plugin requires the "
-                            "connection to use SSL [mysql.client:7]: Something client-side failed")},
+         create_client_diag(
+             "Last connection attempt failed with: The authentication plugin requires the "
+             "connection to use SSL [mysql.client:7]: Something client-side failed"
+         )},
 
         // A client error, no diagnostics
         {"client_error_nodiag",
          client_errc::auth_plugin_requires_ssl,
          diagnostics(),
-         create_client_diag("Last connection attempt failed with: The authentication plugin requires the "
-                            "connection to use SSL [mysql.client:7]")},
+         create_client_diag(
+             "Last connection attempt failed with: The authentication plugin requires the "
+             "connection to use SSL [mysql.client:7]"
+         )},
     };
 
     for (const auto& tc : test_cases)
diff --git a/test/unit/test/impl/dt_to_string.cpp b/test/unit/test/impl/dt_to_string.cpp
index cc9efa5b0..ac55b20b7 100644
--- a/test/unit/test/impl/dt_to_string.cpp
+++ b/test/unit/test/impl/dt_to_string.cpp
@@ -8,8 +8,6 @@
 #include <boost/mysql/string_view.hpp>
 #include <boost/mysql/time.hpp>
 
-#include <boost/mysql/impl/internal/dt_to_string.hpp>
-
 #include <boost/core/span.hpp>
 #include <boost/test/unit_test.hpp>
 
@@ -17,6 +15,7 @@
 #include <cstdint>
 #include <random>
 
+#include "mycosql_internal/dt_to_string.hpp"
 #include "test_common/create_basic.hpp"
 #include "test_common/stringize.hpp"
 
diff --git a/test/unit/test/impl/next_power_of_two.cpp b/test/unit/test/impl/next_power_of_two.cpp
index 06cea8b90..b6230b4e5 100644
--- a/test/unit/test/impl/next_power_of_two.cpp
+++ b/test/unit/test/impl/next_power_of_two.cpp
@@ -5,12 +5,12 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/mysql/impl/internal/next_power_of_two.hpp>
-
 #include <boost/test/unit_test.hpp>
 
 #include <cstdint>
 
+#include "mycosql_internal/next_power_of_two.hpp"
+
 using namespace boost::mysql::detail;
 
 BOOST_AUTO_TEST_SUITE(test_next_power_of_two)
@@ -19,7 +19,7 @@ BOOST_AUTO_TEST_CASE(basic)
 {
     // n = 0 (special case)
     BOOST_TEST(next_power_of_two<std::size_t>(0u) == 1u);
-    
+
     // n is already power of two
     BOOST_TEST(next_power_of_two<std::size_t>(1u) == 1u);
     BOOST_TEST(next_power_of_two<std::size_t>(2u) == 2u);
@@ -29,7 +29,7 @@ BOOST_AUTO_TEST_CASE(basic)
     BOOST_TEST(next_power_of_two<std::size_t>(32u) == 32u);
     BOOST_TEST(next_power_of_two<std::size_t>(64u) == 64u);
     BOOST_TEST(next_power_of_two<std::size_t>(128u) == 128u);
-    
+
     // n just below power of two
     BOOST_TEST(next_power_of_two<std::size_t>(3u) == 4u);
     BOOST_TEST(next_power_of_two<std::size_t>(7u) == 8u);
@@ -37,7 +37,7 @@ BOOST_AUTO_TEST_CASE(basic)
     BOOST_TEST(next_power_of_two<std::size_t>(31u) == 32u);
     BOOST_TEST(next_power_of_two<std::size_t>(63u) == 64u);
     BOOST_TEST(next_power_of_two<std::size_t>(127u) == 128u);
-    
+
     // n just above power of two
     BOOST_TEST(next_power_of_two<std::size_t>(5u) == 8u);
     BOOST_TEST(next_power_of_two<std::size_t>(9u) == 16u);
@@ -66,19 +66,19 @@ BOOST_AUTO_TEST_CASE(different_types)
     BOOST_TEST(next_power_of_two<std::uint8_t>(62u) == 64u);
     BOOST_TEST(next_power_of_two<std::uint8_t>(100u) == 128u);
     BOOST_TEST(next_power_of_two<std::uint8_t>(128u) == 128u);
-    
+
     // uint16_t
     BOOST_TEST(next_power_of_two<std::uint16_t>(0u) == 1u);
     BOOST_TEST(next_power_of_two<std::uint16_t>(1000u) == 1024u);
     BOOST_TEST(next_power_of_two<std::uint16_t>(16383u) == 16384u);
     BOOST_TEST(next_power_of_two<std::uint16_t>(32768u) == 32768u);
-    
+
     // uint32_t
     BOOST_TEST(next_power_of_two<std::uint32_t>(0u) == 1u);
     BOOST_TEST(next_power_of_two<std::uint32_t>(100000u) == 131072u);
     BOOST_TEST(next_power_of_two<std::uint32_t>(1u << 30) == 1u << 30);
     BOOST_TEST(next_power_of_two<std::uint32_t>((1u << 30) + 1) == 1u << 31);
-    
+
     // uint64_t
     BOOST_TEST(next_power_of_two<std::uint64_t>(0u) == 1u);
     BOOST_TEST(next_power_of_two<std::uint64_t>(1ull << 40) == 1ull << 40);
diff --git a/test/unit/test/impl/ssl_context_with_default.cpp b/test/unit/test/impl/ssl_context_with_default.cpp
index 59ea390cc..d0db28e86 100644
--- a/test/unit/test/impl/ssl_context_with_default.cpp
+++ b/test/unit/test/impl/ssl_context_with_default.cpp
@@ -5,11 +5,11 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/mysql/impl/internal/ssl_context_with_default.hpp>
-
 #include <boost/asio/ssl/context.hpp>
 #include <boost/test/unit_test.hpp>
 
+#include "mycosql_internal/ssl_context_with_default.hpp"
+
 using namespace boost::mysql::detail;
 
 BOOST_AUTO_TEST_SUITE(test_ssl_context_with_default)
diff --git a/test/unit/test/impl/variant_stream.cpp b/test/unit/test/impl/variant_stream.cpp
index d40f50cf9..b62c27017 100644
--- a/test/unit/test/impl/variant_stream.cpp
+++ b/test/unit/test/impl/variant_stream.cpp
@@ -8,8 +8,6 @@
 #include <boost/mysql/any_address.hpp>
 #include <boost/mysql/error_code.hpp>
 
-#include <boost/mysql/impl/internal/variant_stream.hpp>
-
 #include <boost/asio/cancellation_type.hpp>
 #include <boost/asio/error.hpp>
 #include <boost/asio/generic/stream_protocol.hpp>
@@ -24,6 +22,7 @@
 #include <array>
 #include <ostream>
 
+#include "mycosql_internal/variant_stream.hpp"
 #include "test_common/io_context_fixture.hpp"
 #include "test_common/printing.hpp"
 
diff --git a/test/unit/test/pool_params.cpp b/test/unit/test/pool_params.cpp
index 0dfa06051..5ffc34dab 100644
--- a/test/unit/test/pool_params.cpp
+++ b/test/unit/test/pool_params.cpp
@@ -8,8 +8,6 @@
 #include <boost/mysql/pool_params.hpp>
 #include <boost/mysql/string_view.hpp>
 
-#include <boost/mysql/impl/internal/connection_pool/internal_pool_params.hpp>
-
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/strand.hpp>
 #include <boost/test/unit_test.hpp>
@@ -17,6 +15,8 @@
 #include <chrono>
 #include <stdexcept>
 
+#include "mycosql_internal/connection_pool/internal_pool_params.hpp"
+
 using namespace boost::mysql;
 namespace asio = boost::asio;
 
diff --git a/test/unit/test/protocol/binary_protocol.cpp b/test/unit/test/protocol/binary_protocol.cpp
index 5dac6ec15..86f7c4734 100644
--- a/test/unit/test/protocol/binary_protocol.cpp
+++ b/test/unit/test/protocol/binary_protocol.cpp
@@ -12,13 +12,12 @@
 #include <boost/mysql/field_view.hpp>
 #include <boost/mysql/metadata.hpp>
 
-#include <boost/mysql/impl/internal/protocol/impl/binary_protocol.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/serialization_context.hpp>
-
 #include <boost/test/unit_test.hpp>
 
 #include <cstddef>
 
+#include "mycosql_internal/protocol/impl/binary_protocol.hpp"
+#include "mycosql_internal/protocol/impl/serialization_context.hpp"
 #include "operators.hpp"
 #include "serialization_test.hpp"
 #include "test_common/create_basic.hpp"
@@ -274,7 +273,8 @@ void add_bit_types(std::vector<success_sample>& output)
     output.push_back(success_sample("bit_8", {0x01, 0x12}, std::uint64_t(0x12), meta));
     output.push_back(success_sample("bit_16", {0x02, 0x12, 0x34}, std::uint64_t(0x1234), meta));
     output.push_back(success_sample("bit_24", {0x03, 0x12, 0x34, 0x56}, std::uint64_t(0x123456), meta));
-    output.push_back(success_sample("bit_32", {0x04, 0x12, 0x34, 0x56, 0x78}, std::uint64_t(0x12345678), meta)
+    output.push_back(
+        success_sample("bit_32", {0x04, 0x12, 0x34, 0x56, 0x78}, std::uint64_t(0x12345678), meta)
     );
     output.push_back(
         success_sample("bit_40", {0x05, 0x12, 0x34, 0x56, 0x78, 0x9a}, std::uint64_t(0x123456789a), meta)
@@ -735,7 +735,8 @@ void add_date_samples(std::vector<error_sample>& output)
     auto meta = create_meta(column_type::date);
 
     output.push_back(error_sample("empty", {}, meta, deserialize_errc::incomplete_message));
-    output.push_back(error_sample("incomplete_year", {0x04, 0xda}, meta, deserialize_errc::incomplete_message)
+    output.push_back(
+        error_sample("incomplete_year", {0x04, 0xda}, meta, deserialize_errc::incomplete_message)
     );
     output.push_back(
         error_sample("no_month_day", {0x04, 0xda, 0x07}, meta, deserialize_errc::incomplete_message)
@@ -791,7 +792,8 @@ void add_datetime_samples(column_type type, std::vector<error_sample>& output)
         deserialize_errc::incomplete_message
     ));
     output.push_back(error_sample("invalid_year_d", {0x04, 0x10, 0x27, 0x01, 0x01}, meta));  // year 10000
-    output.push_back(error_sample("invalid_year_hms", {0x07, 0x10, 0x27, 0x01, 0x01, 0x17, 0x01, 0x3b}, meta)
+    output.push_back(
+        error_sample("invalid_year_hms", {0x07, 0x10, 0x27, 0x01, 0x01, 0x17, 0x01, 0x3b}, meta)
     );
     output.push_back(error_sample(
         "invalid_year_hmsu",
@@ -919,8 +921,8 @@ void add_time_samples(std::vector<error_sample>& output)
         {"invalid_secs",       {0x08, 0x01, 0x22, 0x00, 0x00, 0x00, 0x16, 0x3b, 60}                          },
         {"invalid_secs_max",   {0x08, 0x01, 0x22, 0x00, 0x00, 0x00, 0x16, 0x3b, 0xff}                        },
         {"invalid_micros",     {0x0c, 0x01, 0x22, 0x00, 0x00, 0x00, 0x16, 0x3b, 0x3a, 0x40, 0x42, 0xf4, 0x00}},
-        {"invalid_micros_max", {0x0c, 0x01, 0x22, 0x00, 0x00, 0x00, 0x16, 0x3b, 0x3a, 0xff, 0xff, 0xff, 0xff}
-        },
+        {"invalid_micros_max",
+         {0x0c, 0x01, 0x22, 0x00, 0x00, 0x00, 0x16, 0x3b, 0x3a, 0xff, 0xff, 0xff, 0xff}                      },
     };
 
     for (auto& c : out_of_range_cases)
diff --git a/test/unit/test/protocol/capabilities.cpp b/test/unit/test/protocol/capabilities.cpp
index 62e0ee87c..62ae5d411 100644
--- a/test/unit/test/protocol/capabilities.cpp
+++ b/test/unit/test/protocol/capabilities.cpp
@@ -5,10 +5,9 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/mysql/impl/internal/protocol/capabilities.hpp>
-
 #include <boost/test/unit_test.hpp>
 
+#include "mycosql_internal/protocol/capabilities.hpp"
 #include "test_unit/printing.hpp"
 
 using namespace boost::mysql;
diff --git a/test/unit/test/protocol/deserialization.cpp b/test/unit/test/protocol/deserialization.cpp
index f94d67f5d..9aade8617 100644
--- a/test/unit/test/protocol/deserialization.cpp
+++ b/test/unit/test/protocol/deserialization.cpp
@@ -18,13 +18,12 @@
 #include <boost/mysql/mysql_collations.hpp>
 #include <boost/mysql/string_view.hpp>
 
-#include <boost/mysql/impl/internal/protocol/capabilities.hpp>
-#include <boost/mysql/impl/internal/protocol/deserialization.hpp>
-
 #include <boost/test/unit_test.hpp>
 
 #include <memory>
 
+#include "mycosql_internal/protocol/capabilities.hpp"
+#include "mycosql_internal/protocol/deserialization.hpp"
 #include "operators.hpp"
 #include "serialization_test.hpp"
 #include "test_common/assert_buffer_equals.hpp"
diff --git a/test/unit/test/protocol/deserialization_context.cpp b/test/unit/test/protocol/deserialization_context.cpp
index d748dd791..2ffc26a22 100644
--- a/test/unit/test/protocol/deserialization_context.cpp
+++ b/test/unit/test/protocol/deserialization_context.cpp
@@ -8,14 +8,13 @@
 #include <boost/mysql/client_errc.hpp>
 #include <boost/mysql/error_code.hpp>
 
-#include <boost/mysql/impl/internal/protocol/impl/deserialization_context.hpp>
-
 #include <boost/test/unit_test.hpp>
 
 #include <array>
 #include <cstdint>
 #include <limits>
 
+#include "mycosql_internal/protocol/impl/deserialization_context.hpp"
 #include "operators.hpp"
 
 using namespace boost::mysql::detail;
diff --git a/test/unit/test/protocol/frame_header.cpp b/test/unit/test/protocol/frame_header.cpp
index 0a156714d..b624d38b9 100644
--- a/test/unit/test/protocol/frame_header.cpp
+++ b/test/unit/test/protocol/frame_header.cpp
@@ -5,14 +5,13 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/mysql/impl/internal/protocol/frame_header.hpp>
-
 #include <boost/core/span.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include <cstdint>
 #include <memory>
 
+#include "mycosql_internal/protocol/frame_header.hpp"
 #include "serialization_test.hpp"
 #include "test_common/assert_buffer_equals.hpp"
 
diff --git a/test/unit/test/protocol/null_bitmap.cpp b/test/unit/test/protocol/null_bitmap.cpp
index 1d877b365..a6f40bd96 100644
--- a/test/unit/test/protocol/null_bitmap.cpp
+++ b/test/unit/test/protocol/null_bitmap.cpp
@@ -7,14 +7,13 @@
 
 #include <boost/mysql/field_view.hpp>
 
-#include <boost/mysql/impl/internal/protocol/impl/null_bitmap.hpp>
-
 #include <boost/core/span.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include <array>
 #include <cstdint>
 
+#include "mycosql_internal/protocol/impl/null_bitmap.hpp"
 #include "test_common/assert_buffer_equals.hpp"
 #include "test_common/create_basic.hpp"
 
diff --git a/test/unit/test/protocol/operators.hpp b/test/unit/test/protocol/operators.hpp
index 9efc3780e..05934ee1a 100644
--- a/test/unit/test/protocol/operators.hpp
+++ b/test/unit/test/protocol/operators.hpp
@@ -8,12 +8,12 @@
 #ifndef BOOST_MYSQL_TEST_UNIT_TEST_PROTOCOL_OPERATORS_HPP
 #define BOOST_MYSQL_TEST_UNIT_TEST_PROTOCOL_OPERATORS_HPP
 
-#include <boost/mysql/impl/internal/protocol/impl/deserialization_context.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/protocol_types.hpp>
-
 #include <cstring>
 #include <ostream>
 
+#include "mycosql_internal/protocol/impl/deserialization_context.hpp"
+#include "mycosql_internal/protocol/impl/protocol_types.hpp"
+
 namespace boost {
 namespace mysql {
 namespace detail {
diff --git a/test/unit/test/protocol/protocol_field_type.cpp b/test/unit/test/protocol/protocol_field_type.cpp
index f983f09f9..0c65f5ec9 100644
--- a/test/unit/test/protocol/protocol_field_type.cpp
+++ b/test/unit/test/protocol/protocol_field_type.cpp
@@ -8,10 +8,10 @@
 #include <boost/mysql/column_type.hpp>
 #include <boost/mysql/mysql_collations.hpp>
 
-#include <boost/mysql/impl/internal/protocol/impl/protocol_field_type.hpp>
-
 #include <boost/test/unit_test.hpp>
 
+#include "mycosql_internal/protocol/impl/protocol_field_type.hpp"
+
 using namespace boost::mysql::detail;
 namespace collations = boost::mysql::mysql_collations;
 using boost::mysql::column_type;
@@ -77,8 +77,10 @@ BOOST_AUTO_TEST_CASE(compute_column_type_legacy_types)
     } test_cases[] = {
         {"tiny_text",      protocol_field_type::tiny_blob,   0, collations::utf8mb4_general_ci, column_type::text     },
         {"tiny_blob",      protocol_field_type::tiny_blob,   0, collations::binary,             column_type::blob     },
-        {"medium_text",    protocol_field_type::medium_blob, 0, collations::utf8mb4_general_ci, column_type::text
-        },
+        {"medium_text",
+         protocol_field_type::medium_blob,
+         0,                                                     collations::utf8mb4_general_ci,
+         column_type::text                                                                                            },
         {"medium_blob",    protocol_field_type::medium_blob, 0, collations::binary,             column_type::blob     },
         {"long_text",      protocol_field_type::long_blob,   0, collations::utf8mb4_general_ci, column_type::text     },
         {"long_blob",      protocol_field_type::long_blob,   0, collations::binary,             column_type::blob     },
diff --git a/test/unit/test/protocol/protocol_types.cpp b/test/unit/test/protocol/protocol_types.cpp
index b1f9fbc45..b46e928a4 100644
--- a/test/unit/test/protocol/protocol_types.cpp
+++ b/test/unit/test/protocol/protocol_types.cpp
@@ -9,13 +9,12 @@
 #include <boost/mysql/error_code.hpp>
 #include <boost/mysql/string_view.hpp>
 
-#include <boost/mysql/impl/internal/protocol/impl/protocol_types.hpp>
-
 #include <boost/test/unit_test.hpp>
 
 #include <cstdint>
 #include <memory>
 
+#include "mycosql_internal/protocol/impl/protocol_types.hpp"
 #include "operators.hpp"
 #include "serialization_test.hpp"
 #include "test_common/buffer_concat.hpp"
diff --git a/test/unit/test/protocol/serialization.cpp b/test/unit/test/protocol/serialization.cpp
index 49dbc9b1e..bb1b85a04 100644
--- a/test/unit/test/protocol/serialization.cpp
+++ b/test/unit/test/protocol/serialization.cpp
@@ -12,9 +12,6 @@
 #include <boost/mysql/mysql_collations.hpp>
 #include <boost/mysql/string_view.hpp>
 
-#include <boost/mysql/impl/internal/protocol/capabilities.hpp>
-#include <boost/mysql/impl/internal/protocol/serialization.hpp>
-
 #include <boost/core/span.hpp>
 #include <boost/test/unit_test.hpp>
 
@@ -22,6 +19,8 @@
 #include <cstdint>
 #include <vector>
 
+#include "mycosql_internal/protocol/capabilities.hpp"
+#include "mycosql_internal/protocol/serialization.hpp"
 #include "serialization_test.hpp"
 #include "test_common/assert_buffer_equals.hpp"
 #include "test_common/create_basic.hpp"
diff --git a/test/unit/test/protocol/serialization_context.cpp b/test/unit/test/protocol/serialization_context.cpp
index 49ec5100f..bdd4026a3 100644
--- a/test/unit/test/protocol/serialization_context.cpp
+++ b/test/unit/test/protocol/serialization_context.cpp
@@ -9,8 +9,6 @@
 #include <boost/mysql/error_code.hpp>
 #include <boost/mysql/string_view.hpp>
 
-#include <boost/mysql/impl/internal/protocol/impl/serialization_context.hpp>
-
 #include <boost/test/unit_test.hpp>
 
 #include <array>
@@ -18,6 +16,7 @@
 #include <cstdint>
 #include <vector>
 
+#include "mycosql_internal/protocol/impl/serialization_context.hpp"
 #include "test_common/assert_buffer_equals.hpp"
 #include "test_common/buffer_concat.hpp"
 #include "test_common/printing.hpp"
diff --git a/test/unit/test/protocol/serialization_test.hpp b/test/unit/test/protocol/serialization_test.hpp
index 2b68a96f3..ef620a39a 100644
--- a/test/unit/test/protocol/serialization_test.hpp
+++ b/test/unit/test/protocol/serialization_test.hpp
@@ -8,9 +8,6 @@
 #ifndef BOOST_MYSQL_TEST_UNIT_TEST_PROTOCOL_SERIALIZATION_TEST_HPP
 #define BOOST_MYSQL_TEST_UNIT_TEST_PROTOCOL_SERIALIZATION_TEST_HPP
 
-#include <boost/mysql/impl/internal/protocol/impl/deserialization_context.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/serialization_context.hpp>
-
 #include <boost/asio/buffer.hpp>
 #include <boost/core/span.hpp>
 #include <boost/test/unit_test.hpp>
@@ -19,6 +16,8 @@
 #include <cstring>
 #include <initializer_list>
 
+#include "mycosql_internal/protocol/impl/deserialization_context.hpp"
+#include "mycosql_internal/protocol/impl/serialization_context.hpp"
 #include "test_common/assert_buffer_equals.hpp"
 #include "test_unit/serialize_to_vector.hpp"
 
diff --git a/test/unit/test/protocol/static_buffer.cpp b/test/unit/test/protocol/static_buffer.cpp
index 298766e03..799dca8f1 100644
--- a/test/unit/test/protocol/static_buffer.cpp
+++ b/test/unit/test/protocol/static_buffer.cpp
@@ -5,13 +5,12 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/mysql/impl/internal/protocol/static_buffer.hpp>
-
 #include <boost/test/unit_test.hpp>
 
 #include <array>
 #include <vector>
 
+#include "mycosql_internal/protocol/static_buffer.hpp"
 #include "test_common/assert_buffer_equals.hpp"
 
 using namespace boost::mysql::test;
@@ -65,9 +64,11 @@ BOOST_AUTO_TEST_CASE(clear_empty)
 BOOST_AUTO_TEST_CASE(clear_not_empty)
 {
     static_buffer<32> v;
-    v.append(std::array<std::uint8_t, 5>{
-        {0, 1, 2, 3, 4}
-    });
+    v.append(
+        std::array<std::uint8_t, 5>{
+            {0, 1, 2, 3, 4}
+    }
+    );
     BOOST_TEST(v.size() == 5u);
     v.clear();
     BOOST_MYSQL_ASSERT_BUFFER_EQUALS(v, std::vector<std::uint8_t>());
diff --git a/test/unit/test/protocol/text_protocol.cpp b/test/unit/test/protocol/text_protocol.cpp
index 00664b28e..598859d57 100644
--- a/test/unit/test/protocol/text_protocol.cpp
+++ b/test/unit/test/protocol/text_protocol.cpp
@@ -12,12 +12,11 @@
 #include <boost/mysql/field_view.hpp>
 #include <boost/mysql/metadata.hpp>
 
-#include <boost/mysql/impl/internal/protocol/impl/text_protocol.hpp>
-
 #include <boost/test/data/monomorphic/collection.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
+#include "mycosql_internal/protocol/impl/text_protocol.hpp"
 #include "operators.hpp"
 #include "test_common/create_basic.hpp"
 #include "test_unit/create_meta.hpp"
diff --git a/test/unit/test/sansio/close_connection.cpp b/test/unit/test/sansio/close_connection.cpp
index c26a4a0eb..fbad1d28b 100644
--- a/test/unit/test/sansio/close_connection.cpp
+++ b/test/unit/test/sansio/close_connection.cpp
@@ -5,14 +5,13 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/mysql/impl/internal/sansio/close_connection.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-
 #include <boost/asio/error.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include <vector>
 
+#include "mycosql_internal/sansio/close_connection.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
 #include "test_unit/algo_test.hpp"
 #include "test_unit/create_frame.hpp"
 
diff --git a/test/unit/test/sansio/close_statement.cpp b/test/unit/test/sansio/close_statement.cpp
index bf9080b69..a725619b6 100644
--- a/test/unit/test/sansio/close_statement.cpp
+++ b/test/unit/test/sansio/close_statement.cpp
@@ -10,13 +10,12 @@
 #include <boost/mysql/error_code.hpp>
 #include <boost/mysql/statement.hpp>
 
-#include <boost/mysql/impl/internal/sansio/close_statement.hpp>
-#include <boost/mysql/impl/internal/sansio/run_pipeline.hpp>
-
 #include <boost/test/unit_test.hpp>
 
 #include <cstdint>
 
+#include "mycosql_internal/sansio/close_statement.hpp"
+#include "mycosql_internal/sansio/run_pipeline.hpp"
 #include "test_common/buffer_concat.hpp"
 #include "test_common/create_diagnostics.hpp"
 #include "test_unit/algo_test.hpp"
@@ -64,7 +63,8 @@ BOOST_AUTO_TEST_CASE(success_no_backslash_escapes)
     // Run the algo
     algo_test()
         .expect_write(expected_request())  // requests
-        .expect_read(create_ok_frame(1, ok_builder().no_backslash_escapes(true).build())
+        .expect_read(
+            create_ok_frame(1, ok_builder().no_backslash_escapes(true).build())
         )  // response to the ping request
         .will_set_backslash_escapes(false)
         .check(fix);
@@ -86,11 +86,13 @@ BOOST_AUTO_TEST_CASE(error_response)
     // Run the test
     algo_test()
         .expect_write(expected_request())  // Ping request
-        .expect_read(err_builder()
-                         .seqnum(1)
-                         .code(common_server_errc::er_bad_db_error)
-                         .message("my_message")
-                         .build_frame())  // Error response
+        .expect_read(
+            err_builder()
+                .seqnum(1)
+                .code(common_server_errc::er_bad_db_error)
+                .message("my_message")
+                .build_frame()
+        )  // Error response
         .check(fix, common_server_errc::er_bad_db_error, create_server_diag("my_message"));
 }
 
diff --git a/test/unit/test/sansio/execute.cpp b/test/unit/test/sansio/execute.cpp
index f686f14e2..4744769a8 100644
--- a/test/unit/test/sansio/execute.cpp
+++ b/test/unit/test/sansio/execute.cpp
@@ -12,10 +12,9 @@
 #include <boost/mysql/detail/execution_processor/execution_processor.hpp>
 #include <boost/mysql/detail/resultset_encoding.hpp>
 
-#include <boost/mysql/impl/internal/sansio/execute.hpp>
-
 #include <boost/test/unit_test.hpp>
 
+#include "mycosql_internal/sansio/execute.hpp"
 #include "test_common/buffer_concat.hpp"
 #include "test_common/check_meta.hpp"
 #include "test_unit/algo_test.hpp"
@@ -72,11 +71,13 @@ BOOST_AUTO_TEST_CASE(read_response_single_row_batch)
     algo_test()
         .expect_read(create_frame(42, {0x01}))  // OK, 1 column
         .expect_read(create_coldef_frame(43, meta_builder().type(column_type::bigint).build_coldef()))
-        .expect_read(buffer_builder()
-                         .add(create_text_row_message(44, 42))
-                         .add(create_text_row_message(45, 43))
-                         .add(create_eof_frame(46, ok_builder().affected_rows(10u).info("1st").build()))
-                         .build())
+        .expect_read(
+            buffer_builder()
+                .add(create_text_row_message(44, 42))
+                .add(create_text_row_message(45, 43))
+                .add(create_eof_frame(46, ok_builder().affected_rows(10u).info("1st").build()))
+                .build()
+        )
         .check(fix);
 
     // Verify
@@ -210,11 +211,13 @@ BOOST_AUTO_TEST_CASE(execute_success_rows)
         .expect_write(create_frame(0, serialized_select_1))
         .expect_read(create_frame(1, {0x01}))  // OK, 1 column
         .expect_read(create_coldef_frame(2, meta_builder().type(column_type::bigint).build_coldef()))
-        .expect_read(buffer_builder()
-                         .add(create_text_row_message(3, 42))
-                         .add(create_text_row_message(4, 43))
-                         .add(create_eof_frame(5, ok_builder().affected_rows(10u).info("1st").build()))
-                         .build())
+        .expect_read(
+            buffer_builder()
+                .add(create_text_row_message(3, 42))
+                .add(create_text_row_message(4, 43))
+                .add(create_eof_frame(5, ok_builder().affected_rows(10u).info("1st").build()))
+                .build()
+        )
         .check(fix);
 
     // Verify
diff --git a/test/unit/test/sansio/handshake/handshake_common.hpp b/test/unit/test/sansio/handshake/handshake_common.hpp
index 9fcdb95f5..8d2763860 100644
--- a/test/unit/test/sansio/handshake/handshake_common.hpp
+++ b/test/unit/test/sansio/handshake/handshake_common.hpp
@@ -10,12 +10,11 @@
 
 #include <boost/mysql/string_view.hpp>
 
-#include <boost/mysql/impl/internal/protocol/capabilities.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/protocol_types.hpp>
-#include <boost/mysql/impl/internal/sansio/handshake.hpp>
-
 #include <algorithm>
 
+#include "mycosql_internal/protocol/capabilities.hpp"
+#include "mycosql_internal/protocol/impl/protocol_types.hpp"
+#include "mycosql_internal/sansio/handshake.hpp"
 #include "test_unit/algo_test.hpp"
 #include "test_unit/create_frame.hpp"
 #include "test_unit/serialize_to_vector.hpp"
@@ -104,7 +103,8 @@ class server_hello_builder
                     int1{25},  // character set
                     int2{0},   // status flags
                     caps_high,
-                    int1{static_cast<std::uint8_t>(auth_plugin_data_.size() + 1u)
+                    int1{
+                        static_cast<std::uint8_t>(auth_plugin_data_.size() + 1u)
                     },                  // auth plugin data length
                     string_fixed<10>{}  // reserved
                 );
@@ -174,15 +174,17 @@ class login_request_builder
     std::vector<std::uint8_t> build() const
     {
         auto body = serialize_to_vector([this](detail::serialization_context& ctx) {
-            ctx.serialize(detail::login_request{
-                caps_,
-                detail::max_packet_size,
-                collation_id_,
-                username_,
-                auth_response_,
-                database_,
-                auth_plugin_name_
-            });
+            ctx.serialize(
+                detail::login_request{
+                    caps_,
+                    detail::max_packet_size,
+                    collation_id_,
+                    username_,
+                    auth_response_,
+                    database_,
+                    auth_plugin_name_
+                }
+            );
         });
         return create_frame(seqnum_, body);
     }
diff --git a/test/unit/test/sansio/handshake/handshake_csha2p_encrypt_password.cpp b/test/unit/test/sansio/handshake/handshake_csha2p_encrypt_password.cpp
index cafcf2c6e..8e77f91dd 100644
--- a/test/unit/test/sansio/handshake/handshake_csha2p_encrypt_password.cpp
+++ b/test/unit/test/sansio/handshake/handshake_csha2p_encrypt_password.cpp
@@ -9,8 +9,6 @@
 #include <boost/mysql/error_code.hpp>
 #include <boost/mysql/string_view.hpp>
 
-#include <boost/mysql/impl/internal/sansio/csha2p_encrypt_password.hpp>
-
 #include <boost/asio/ssl/error.hpp>
 #include <boost/core/span.hpp>
 #include <boost/test/unit_test.hpp>
@@ -23,6 +21,7 @@
 #include <vector>
 
 #include "handshake_csha2p_keys.hpp"
+#include "mycosql_internal/sansio/csha2p_encrypt_password.hpp"
 #include "test_common/assert_buffer_equals.hpp"
 #include "test_common/printing.hpp"
 
diff --git a/test/unit/test/sansio/handshake/handshake_csha2p_hash_password.cpp b/test/unit/test/sansio/handshake/handshake_csha2p_hash_password.cpp
index 2fbcaefa9..453db7b90 100644
--- a/test/unit/test/sansio/handshake/handshake_csha2p_hash_password.cpp
+++ b/test/unit/test/sansio/handshake/handshake_csha2p_hash_password.cpp
@@ -5,10 +5,9 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/mysql/impl/internal/sansio/caching_sha2_password.hpp>
-
 #include <boost/test/unit_test.hpp>
 
+#include "mycosql_internal/sansio/caching_sha2_password.hpp"
 #include "test_common/assert_buffer_equals.hpp"
 
 using namespace boost::mysql;
diff --git a/test/unit/test/sansio/handshake/handshake_mnp_hash_password.cpp b/test/unit/test/sansio/handshake/handshake_mnp_hash_password.cpp
index 214813846..26a549bb5 100644
--- a/test/unit/test/sansio/handshake/handshake_mnp_hash_password.cpp
+++ b/test/unit/test/sansio/handshake/handshake_mnp_hash_password.cpp
@@ -7,8 +7,7 @@
 
 #include <boost/mysql/client_errc.hpp>
 
-#include <boost/mysql/impl/internal/sansio/mysql_native_password.hpp>
-
+#include "mycosql_internal/sansio/mysql_native_password.hpp"
 #include "test_common/assert_buffer_equals.hpp"
 
 using namespace boost::mysql;
diff --git a/test/unit/test/sansio/message_reader.cpp b/test/unit/test/sansio/message_reader.cpp
index 2658f0a7c..2e4347691 100644
--- a/test/unit/test/sansio/message_reader.cpp
+++ b/test/unit/test/sansio/message_reader.cpp
@@ -8,9 +8,6 @@
 #include <boost/mysql/client_errc.hpp>
 #include <boost/mysql/error_code.hpp>
 
-#include <boost/mysql/impl/internal/sansio/message_reader.hpp>
-#include <boost/mysql/impl/internal/sansio/read_buffer.hpp>
-
 #include <boost/test/unit_test.hpp>
 
 #include <algorithm>
@@ -19,6 +16,8 @@
 #include <cstring>
 #include <vector>
 
+#include "mycosql_internal/sansio/message_reader.hpp"
+#include "mycosql_internal/sansio/read_buffer.hpp"
 #include "test_common/assert_buffer_equals.hpp"
 #include "test_common/buffer_concat.hpp"
 #include "test_common/printing.hpp"
@@ -44,7 +43,7 @@ class reader_fixture
         std::vector<std::uint8_t> contents,
         std::size_t buffsize = 512,
         std::size_t max_size = static_cast<std::size_t>(-1),
-        std::size_t max_frame_size = 64 // max frame size is 64
+        std::size_t max_frame_size = 64  // max frame size is 64
     )
         : reader(buffsize, max_size, max_frame_size),
           contents_(std::move(contents)),
@@ -509,16 +508,9 @@ BOOST_AUTO_TEST_CASE(buffer_resizing_size_power_of_two)
     fix.reader.prepare_read(fix.seqnum);
     fix.read_until_completion();
     BOOST_TEST(fix.buffsize() == 4u);
-    
-    std::size_t test_sizes[] = {
-        5, 7, 8,
-        9, 15, 16,
-        17, 31, 32,
-        33, 63, 64,
-        65, 127, 128,
-        129, 255, 256,
-        257, 511, 512, 513
-    };
+
+    std::size_t test_sizes[] = {5,  7,  8,   9,   15,  16,  17,  31,  32,  33,  63,
+                                64, 65, 127, 128, 129, 255, 256, 257, 511, 512, 513};
 
     // Test that buffer capacity grows to powers of two for various payload sizes
     for (auto new_size : test_sizes)
diff --git a/test/unit/test/sansio/ping.cpp b/test/unit/test/sansio/ping.cpp
index bc311f9ff..e8b37e66c 100644
--- a/test/unit/test/sansio/ping.cpp
+++ b/test/unit/test/sansio/ping.cpp
@@ -9,12 +9,11 @@
 #include <boost/mysql/diagnostics.hpp>
 #include <boost/mysql/error_code.hpp>
 
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-#include <boost/mysql/impl/internal/sansio/ping.hpp>
-#include <boost/mysql/impl/internal/sansio/run_pipeline.hpp>
-
 #include <boost/test/unit_test.hpp>
 
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+#include "mycosql_internal/sansio/ping.hpp"
+#include "mycosql_internal/sansio/run_pipeline.hpp"
 #include "test_common/create_diagnostics.hpp"
 #include "test_common/printing.hpp"
 #include "test_unit/algo_test.hpp"
@@ -73,11 +72,13 @@ BOOST_AUTO_TEST_CASE(read_response_error_packet)
 
     // Run the test
     algo_test()
-        .expect_read(err_builder()
-                         .seqnum(57)
-                         .code(common_server_errc::er_bad_db_error)
-                         .message("my_message")
-                         .build_frame())  // Error response
+        .expect_read(
+            err_builder()
+                .seqnum(57)
+                .code(common_server_errc::er_bad_db_error)
+                .message("my_message")
+                .build_frame()
+        )  // Error response
         .check(fix, common_server_errc::er_bad_db_error, create_server_diag("my_message"));
 }
 
@@ -120,11 +121,13 @@ BOOST_AUTO_TEST_CASE(ping_error_response)
     // Run the test
     algo_test()
         .expect_write({0x01, 0x00, 0x00, 0x00, 0x0e})  // Ping request
-        .expect_read(err_builder()
-                         .seqnum(1)
-                         .code(common_server_errc::er_bad_db_error)
-                         .message("my_message")
-                         .build_frame())  // Error response
+        .expect_read(
+            err_builder()
+                .seqnum(1)
+                .code(common_server_errc::er_bad_db_error)
+                .message("my_message")
+                .build_frame()
+        )  // Error response
         .check(fix, common_server_errc::er_bad_db_error, create_server_diag("my_message"));
 }
 
diff --git a/test/unit/test/sansio/prepare_statement.cpp b/test/unit/test/sansio/prepare_statement.cpp
index 35d342909..0b6cf4dbb 100644
--- a/test/unit/test/sansio/prepare_statement.cpp
+++ b/test/unit/test/sansio/prepare_statement.cpp
@@ -7,12 +7,11 @@
 
 #include <boost/mysql/statement.hpp>
 
-#include <boost/mysql/impl/internal/protocol/impl/protocol_types.hpp>
-#include <boost/mysql/impl/internal/protocol/impl/serialization_context.hpp>
-#include <boost/mysql/impl/internal/sansio/prepare_statement.hpp>
-
 #include <boost/test/unit_test.hpp>
 
+#include "mycosql_internal/protocol/impl/protocol_types.hpp"
+#include "mycosql_internal/protocol/impl/serialization_context.hpp"
+#include "mycosql_internal/sansio/prepare_statement.hpp"
 #include "test_common/create_diagnostics.hpp"
 #include "test_unit/algo_test.hpp"
 #include "test_unit/create_coldef_frame.hpp"
@@ -142,11 +141,13 @@ BOOST_AUTO_TEST_CASE(read_response_error_packet)
 
     // Run the algo
     algo_test()
-        .expect_read(err_builder()
-                         .seqnum(19)
-                         .code(common_server_errc::er_bad_db_error)
-                         .message("my_message")
-                         .build_frame())
+        .expect_read(
+            err_builder()
+                .seqnum(19)
+                .code(common_server_errc::er_bad_db_error)
+                .message("my_message")
+                .build_frame()
+        )
         .check(fix, common_server_errc::er_bad_db_error, create_server_diag("my_message"));
 }
 
@@ -191,11 +192,13 @@ BOOST_AUTO_TEST_CASE(prepare_error_packet)
     // Run the algo
     algo_test()
         .expect_write(create_prepare_statement_frame(0, "SELECT 1"))
-        .expect_read(err_builder()
-                         .seqnum(1)
-                         .code(common_server_errc::er_bad_db_error)
-                         .message("my_message")
-                         .build_frame())
+        .expect_read(
+            err_builder()
+                .seqnum(1)
+                .code(common_server_errc::er_bad_db_error)
+                .message("my_message")
+                .build_frame()
+        )
         .check(fix, common_server_errc::er_bad_db_error, create_server_diag("my_message"));
 }
 
diff --git a/test/unit/test/sansio/quit_connection.cpp b/test/unit/test/sansio/quit_connection.cpp
index 9eee5672e..998e2e4ff 100644
--- a/test/unit/test/sansio/quit_connection.cpp
+++ b/test/unit/test/sansio/quit_connection.cpp
@@ -5,14 +5,13 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-#include <boost/mysql/impl/internal/sansio/quit_connection.hpp>
-
 #include <boost/asio/error.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include <vector>
 
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+#include "mycosql_internal/sansio/quit_connection.hpp"
 #include "test_unit/algo_test.hpp"
 #include "test_unit/create_frame.hpp"
 #include "test_unit/printing.hpp"
diff --git a/test/unit/test/sansio/read_buffer.cpp b/test/unit/test/sansio/read_buffer.cpp
index 00ca1097a..02ea395a1 100644
--- a/test/unit/test/sansio/read_buffer.cpp
+++ b/test/unit/test/sansio/read_buffer.cpp
@@ -8,8 +8,6 @@
 #include <boost/mysql/client_errc.hpp>
 #include <boost/mysql/error_code.hpp>
 
-#include <boost/mysql/impl/internal/sansio/read_buffer.hpp>
-
 #include <boost/test/unit_test.hpp>
 
 #include <algorithm>
@@ -18,6 +16,7 @@
 #include <cstring>
 #include <vector>
 
+#include "mycosql_internal/sansio/read_buffer.hpp"
 #include "test_common/assert_buffer_equals.hpp"
 #include "test_common/printing.hpp"
 
@@ -588,15 +587,8 @@ BOOST_AUTO_TEST_CASE(is_power_of_two)
 {
     read_buffer buff(8);
 
-    std::size_t test_sizes[] = {
-        5, 7, 8,
-        9, 15, 16,
-        17, 31, 32,
-        33, 63, 64,
-        65, 127, 128,
-        129, 255, 256,
-        257, 511, 512, 513
-    };
+    std::size_t test_sizes[] = {5,  7,  8,   9,   15,  16,  17,  31,  32,  33,  63,
+                                64, 65, 127, 128, 129, 255, 256, 257, 511, 512, 513};
 
     // Test that buffer capacity grows to powers of two
     for (auto new_size : test_sizes)
diff --git a/test/unit/test/sansio/read_resultset_head.cpp b/test/unit/test/sansio/read_resultset_head.cpp
index 4f65ade52..204b632fd 100644
--- a/test/unit/test/sansio/read_resultset_head.cpp
+++ b/test/unit/test/sansio/read_resultset_head.cpp
@@ -12,11 +12,10 @@
 #include <boost/mysql/field_view.hpp>
 #include <boost/mysql/string_view.hpp>
 
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-#include <boost/mysql/impl/internal/sansio/read_resultset_head.hpp>
-
 #include <boost/test/unit_test.hpp>
 
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+#include "mycosql_internal/sansio/read_resultset_head.hpp"
 #include "test_common/buffer_concat.hpp"
 #include "test_common/check_meta.hpp"
 #include "test_common/create_diagnostics.hpp"
@@ -147,13 +146,15 @@ BOOST_AUTO_TEST_CASE(success_rows_available)
     // Run the algo. The multi-function operation is still in-progress
     algo_test()
         .expect_read(create_frame(1, {0x01}))  // 1 metadata follows
-        .expect_read(buffer_builder()
-                         .add(create_coldef_frame(
-                             2,
-                             meta_builder().type(column_type::varchar).name("f1").build_coldef()
-                         ))
-                         .add(create_text_row_message(3, "abc"))
-                         .build())
+        .expect_read(
+            buffer_builder()
+                .add(create_coldef_frame(
+                    2,
+                    meta_builder().type(column_type::varchar).name("f1").build_coldef()
+                ))
+                .add(create_text_row_message(3, "abc"))
+                .build()
+        )
         .check(fix);
 
     // We've read the response but not the rows
@@ -174,10 +175,12 @@ BOOST_AUTO_TEST_CASE(success_ok_packet_next_resultset)
 
             // Run the algo. The multi-function operation is still in progress
             algo_test()
-                .expect_read(buffer_builder()
-                                 .add(create_ok_frame(1, ok_builder().info("1st").more_results(true).build()))
-                                 .add(create_ok_frame(2, ok_builder().info("2nd").build()))
-                                 .build())
+                .expect_read(
+                    buffer_builder()
+                        .add(create_ok_frame(1, ok_builder().info("1st").more_results(true).build()))
+                        .add(create_ok_frame(2, ok_builder().info("2nd").build()))
+                        .build()
+                )
                 .check(fix);
 
             // Verify
@@ -291,11 +294,13 @@ BOOST_AUTO_TEST_CASE(error_deserialize_execution_response)
 
             // Run the algo
             algo_test()
-                .expect_read(err_builder()
-                                 .seqnum(1)
-                                 .code(common_server_errc::er_bad_db_error)
-                                 .message("no_db")
-                                 .build_frame())
+                .expect_read(
+                    err_builder()
+                        .seqnum(1)
+                        .code(common_server_errc::er_bad_db_error)
+                        .message("no_db")
+                        .build_frame()
+                )
                 .will_set_status(
                     // errors end multi-function operations. Transition performed only if is_top_level=true
                     tc.is_top_level ? connection_status::ready : fix.st.status
diff --git a/test/unit/test/sansio/read_some_rows.cpp b/test/unit/test/sansio/read_some_rows.cpp
index a04375201..19906ba4a 100644
--- a/test/unit/test/sansio/read_some_rows.cpp
+++ b/test/unit/test/sansio/read_some_rows.cpp
@@ -9,15 +9,14 @@
 #include <boost/mysql/common_server_errc.hpp>
 #include <boost/mysql/diagnostics.hpp>
 
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-#include <boost/mysql/impl/internal/sansio/read_some_rows.hpp>
-
 #include <boost/asio/error.hpp>
 #include <boost/core/span.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include <cstddef>
 
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+#include "mycosql_internal/sansio/read_some_rows.hpp"
 #include "test_common/buffer_concat.hpp"
 #include "test_common/create_diagnostics.hpp"
 #include "test_unit/algo_test.hpp"
@@ -163,10 +162,12 @@ BOOST_AUTO_TEST_CASE(batch_with_rows)
 
             // Run the algo. Single, long read that yields two rows
             algo_test()
-                .expect_read(buffer_builder()
-                                 .add(create_text_row_message(42, "abc"))
-                                 .add(create_text_row_message(43, "von"))
-                                 .build())
+                .expect_read(
+                    buffer_builder()
+                        .add(create_text_row_message(42, "abc"))
+                        .add(create_text_row_message(43, "von"))
+                        .build()
+                )
                 .check(fix);
 
             // Validate
@@ -195,14 +196,16 @@ BOOST_AUTO_TEST_CASE(batch_with_rows_eof)
 
             // Run the algo. Single, long read that yields rows and eof
             algo_test()
-                .expect_read(buffer_builder()
-                                 .add(create_text_row_message(42, "abc"))
-                                 .add(create_text_row_message(43, "von"))
-                                 .add(create_eof_frame(
-                                     44,
-                                     ok_builder().affected_rows(1).info("1st").more_results(true).build()
-                                 ))
-                                 .build())
+                .expect_read(
+                    buffer_builder()
+                        .add(create_text_row_message(42, "abc"))
+                        .add(create_text_row_message(43, "von"))
+                        .add(create_eof_frame(
+                            44,
+                            ok_builder().affected_rows(1).info("1st").more_results(true).build()
+                        ))
+                        .build()
+                )
                 .check(fix);
 
             // Validate
@@ -266,12 +269,14 @@ BOOST_AUTO_TEST_CASE(batch_with_rows_out_of_span_space)
     // Run the algo. Single, long read that yields 4 rows.
     // We have only space for 3
     algo_test()
-        .expect_read(buffer_builder()
-                         .add(create_text_row_message(42, "aaa"))
-                         .add(create_text_row_message(43, "bbb"))
-                         .add(create_text_row_message(44, "ccc"))
-                         .add(create_text_row_message(45, "ddd"))
-                         .build())
+        .expect_read(
+            buffer_builder()
+                .add(create_text_row_message(42, "aaa"))
+                .add(create_text_row_message(43, "bbb"))
+                .add(create_text_row_message(44, "ccc"))
+                .add(create_text_row_message(45, "ddd"))
+                .build()
+        )
         .check(fix);
 
     // Validate
@@ -295,11 +300,13 @@ BOOST_AUTO_TEST_CASE(successive_calls_keep_parsing_state)
     // Run the algo
     auto eof = create_eof_frame(44, ok_builder().affected_rows(1).info("1st").build());
     algo_test()
-        .expect_read(buffer_builder()
-                         .add(create_text_row_message(42, "aaa"))
-                         .add(create_text_row_message(43, "bbb"))
-                         .add(boost::span<const std::uint8_t>(eof).subspan(0, 6))  // OK partially received
-                         .build())
+        .expect_read(
+            buffer_builder()
+                .add(create_text_row_message(42, "aaa"))
+                .add(create_text_row_message(43, "bbb"))
+                .add(boost::span<const std::uint8_t>(eof).subspan(0, 6))  // OK partially received
+                .build()
+        )
         .check(fix);
 
     // Validate
@@ -399,10 +406,12 @@ BOOST_AUTO_TEST_CASE(error_seqnum_mismatch_successive_messages)
 
             // Run the algo
             algo_test()
-                .expect_read(buffer_builder()
-                                 .add(create_text_row_message(42, "abc"))
-                                 .add(create_text_row_message(45, "von"))  // seqnum mismatch here
-                                 .build())
+                .expect_read(
+                    buffer_builder()
+                        .add(create_text_row_message(42, "abc"))
+                        .add(create_text_row_message(45, "von"))  // seqnum mismatch here
+                        .build()
+                )
                 .will_set_status(
                     // Errors finish multi-function ops. Transition only performed if is_top_level = true
                     tc.is_top_level ? connection_status::ready : fix.st.status
@@ -461,8 +470,12 @@ BOOST_AUTO_TEST_CASE(error_on_row_ok_packet)
                 .check(fix, client_errc::num_resultsets_mismatch);
 
             // Validate
-            fix.proc.num_calls().on_num_meta(1).on_meta(1).on_row_ok_packet(1).on_row_batch_start(1).validate(
-            );
+            fix.proc.num_calls()
+                .on_num_meta(1)
+                .on_meta(1)
+                .on_row_ok_packet(1)
+                .on_row_batch_start(1)
+                .validate();
         }
     }
 }
@@ -479,11 +492,13 @@ BOOST_AUTO_TEST_CASE(error_deserialize_row_message)
 
             // Run the algo
             algo_test()
-                .expect_read(err_builder()
-                                 .seqnum(42)
-                                 .code(common_server_errc::er_alter_info)
-                                 .message("abc")
-                                 .build_frame())
+                .expect_read(
+                    err_builder()
+                        .seqnum(42)
+                        .code(common_server_errc::er_alter_info)
+                        .message("abc")
+                        .build_frame()
+                )
                 .will_set_status(
                     // Errors finish multi-function ops. Transition only performed if is_top_level = true
                     tc.is_top_level ? connection_status::ready : fix.st.status
diff --git a/test/unit/test/sansio/read_some_rows_dynamic.cpp b/test/unit/test/sansio/read_some_rows_dynamic.cpp
index 3087f3c68..c397d078c 100644
--- a/test/unit/test/sansio/read_some_rows_dynamic.cpp
+++ b/test/unit/test/sansio/read_some_rows_dynamic.cpp
@@ -11,11 +11,10 @@
 
 #include <boost/mysql/detail/execution_processor/execution_state_impl.hpp>
 
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-#include <boost/mysql/impl/internal/sansio/read_some_rows_dynamic.hpp>
-
 #include <boost/test/unit_test.hpp>
 
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+#include "mycosql_internal/sansio/read_some_rows_dynamic.hpp"
 #include "test_common/buffer_concat.hpp"
 #include "test_unit/algo_test.hpp"
 #include "test_unit/create_execution_processor.hpp"
@@ -75,10 +74,12 @@ BOOST_AUTO_TEST_CASE(batch_with_rows)
 
     // Run the algo
     algo_test()
-        .expect_read(buffer_builder()
-                         .add(create_text_row_message(42, "abc"))
-                         .add(create_text_row_message(43, "von"))
-                         .build())
+        .expect_read(
+            buffer_builder()
+                .add(create_text_row_message(42, "abc"))
+                .add(create_text_row_message(43, "von"))
+                .build()
+        )
         .check(fix);
 
     // Check
@@ -93,11 +94,13 @@ BOOST_AUTO_TEST_CASE(batch_with_rows_eof)
 
     // Run the algo
     algo_test()
-        .expect_read(buffer_builder()
-                         .add(create_text_row_message(42, "abc"))
-                         .add(create_text_row_message(43, "von"))
-                         .add(create_eof_frame(44, ok_builder().affected_rows(1).info("1st").build()))
-                         .build())
+        .expect_read(
+            buffer_builder()
+                .add(create_text_row_message(42, "abc"))
+                .add(create_text_row_message(43, "von"))
+                .add(create_eof_frame(44, ok_builder().affected_rows(1).info("1st").build()))
+                .build()
+        )
         .will_set_status(detail::connection_status::ready)
         .check(fix);
 
diff --git a/test/unit/test/sansio/reset_connection.cpp b/test/unit/test/sansio/reset_connection.cpp
index 837fe7a0e..30378ff77 100644
--- a/test/unit/test/sansio/reset_connection.cpp
+++ b/test/unit/test/sansio/reset_connection.cpp
@@ -11,11 +11,10 @@
 #include <boost/mysql/diagnostics.hpp>
 #include <boost/mysql/error_code.hpp>
 
-#include <boost/mysql/impl/internal/sansio/reset_connection.hpp>
-#include <boost/mysql/impl/internal/sansio/run_pipeline.hpp>
-
 #include <boost/test/unit_test.hpp>
 
+#include "mycosql_internal/sansio/reset_connection.hpp"
+#include "mycosql_internal/sansio/run_pipeline.hpp"
 #include "test_common/create_diagnostics.hpp"
 #include "test_common/printing.hpp"
 #include "test_unit/algo_test.hpp"
@@ -79,11 +78,13 @@ BOOST_AUTO_TEST_CASE(read_response_error_packet)
 
     // Run the algo. The character set is not updated.
     algo_test()
-        .expect_read(err_builder()
-                         .seqnum(11)
-                         .code(common_server_errc::er_bad_db_error)
-                         .message("my_message")
-                         .build_frame())
+        .expect_read(
+            err_builder()
+                .seqnum(11)
+                .code(common_server_errc::er_bad_db_error)
+                .message("my_message")
+                .build_frame()
+        )
         .check(fix, common_server_errc::er_bad_db_error, create_server_diag("my_message"));
 }
 
@@ -128,11 +129,13 @@ BOOST_AUTO_TEST_CASE(reset_conn_error_response)
     // Run the algo. The current charset was not updated
     algo_test()
         .expect_write(create_frame(0, {0x1f}))
-        .expect_read(err_builder()
-                         .seqnum(1)
-                         .code(common_server_errc::er_bad_db_error)
-                         .message("my_message")
-                         .build_frame())
+        .expect_read(
+            err_builder()
+                .seqnum(1)
+                .code(common_server_errc::er_bad_db_error)
+                .message("my_message")
+                .build_frame()
+        )
         .check(fix, common_server_errc::er_bad_db_error, create_server_diag("my_message"));
 }
 
diff --git a/test/unit/test/sansio/run_pipeline.cpp b/test/unit/test/sansio/run_pipeline.cpp
index bb7af2491..79a026861 100644
--- a/test/unit/test/sansio/run_pipeline.cpp
+++ b/test/unit/test/sansio/run_pipeline.cpp
@@ -18,8 +18,6 @@
 #include <boost/mysql/detail/pipeline.hpp>
 #include <boost/mysql/detail/resultset_encoding.hpp>
 
-#include <boost/mysql/impl/internal/sansio/run_pipeline.hpp>
-
 #include <boost/asio/error.hpp>
 #include <boost/core/span.hpp>
 #include <boost/test/tools/detail/per_element_manip.hpp>
@@ -30,6 +28,7 @@
 #include <cstdint>
 #include <vector>
 
+#include "mycosql_internal/sansio/run_pipeline.hpp"
 #include "test_common/buffer_concat.hpp"
 #include "test_common/create_basic.hpp"
 #include "test_common/create_diagnostics.hpp"
@@ -118,11 +117,13 @@ BOOST_AUTO_TEST_CASE(execute_success)
         .expect_read(create_ok_frame(42, ok_builder().info("1st").build()))  // 1st op ok
         .expect_read(create_frame(11, {0x01}))                               // 2nd op OK, 1 column
         .expect_read(create_coldef_frame(12, meta_builder().type(column_type::tinyint).build_coldef()))
-        .expect_read(buffer_builder()
-                         .add(create_text_row_message(13, 42))
-                         .add(create_text_row_message(14, 43))
-                         .add(create_eof_frame(15, ok_builder().info("2nd").build()))
-                         .build())
+        .expect_read(
+            buffer_builder()
+                .add(create_text_row_message(13, 42))
+                .add(create_text_row_message(14, 43))
+                .add(create_eof_frame(15, ok_builder().info("2nd").build()))
+                .build()
+        )
         .check(fix);
 
     // All stages succeeded
@@ -351,17 +352,21 @@ BOOST_AUTO_TEST_CASE(nonfatal_errors)
     // The first error is the operation's result
     algo_test()
         .expect_write(mock_request)
-        .expect_read(err_builder()
-                         .seqnum(32)
-                         .code(common_server_errc::er_bad_db_error)
-                         .message("my_message")
-                         .build_frame())
+        .expect_read(
+            err_builder()
+                .seqnum(32)
+                .code(common_server_errc::er_bad_db_error)
+                .message("my_message")
+                .build_frame()
+        )
         .expect_read(prepare_stmt_response_builder().seqnum(16).id(3).num_columns(0).num_params(0).build())
-        .expect_read(err_builder()
-                         .seqnum(10)
-                         .code(common_server_errc::er_bad_field_error)
-                         .message("other_msg")
-                         .build_frame())
+        .expect_read(
+            err_builder()
+                .seqnum(10)
+                .code(common_server_errc::er_bad_field_error)
+                .message("other_msg")
+                .build_frame()
+        )
         .check(fix, common_server_errc::er_bad_db_error, create_server_diag("my_message"));
 
     // Stage errors
@@ -391,11 +396,13 @@ BOOST_AUTO_TEST_CASE(nonfatal_errors_middle)
     algo_test()
         .expect_write(mock_request)
         .expect_read(prepare_stmt_response_builder().seqnum(32).id(3).num_columns(0).num_params(0).build())
-        .expect_read(err_builder()
-                         .seqnum(16)
-                         .code(common_server_errc::er_bad_db_error)
-                         .message("my_message")
-                         .build_frame())
+        .expect_read(
+            err_builder()
+                .seqnum(16)
+                .code(common_server_errc::er_bad_db_error)
+                .message("my_message")
+                .build_frame()
+        )
         .expect_read(create_ok_frame(10, ok_builder().no_backslash_escapes(true).build()))
         .will_set_backslash_escapes(false)  // we processed the OK packet correctly
         .check(fix, common_server_errc::er_bad_db_error, create_server_diag("my_message"));
@@ -474,11 +481,13 @@ BOOST_AUTO_TEST_CASE(nonfatal_then_fatal_error)
     // Run the test
     algo_test()
         .expect_write(mock_request)
-        .expect_read(err_builder()
-                         .seqnum(32)
-                         .code(common_server_errc::er_bad_db_error)
-                         .message("my_message")
-                         .build_frame())
+        .expect_read(
+            err_builder()
+                .seqnum(32)
+                .code(common_server_errc::er_bad_db_error)
+                .message("my_message")
+                .build_frame()
+        )
         .expect_read(asio::error::already_connected)
         .check(fix, asio::error::already_connected);
 
@@ -508,11 +517,13 @@ BOOST_AUTO_TEST_CASE(fatal_error_with_diag)
         .expect_read(
             err_builder().seqnum(32).code(common_server_errc::er_bad_db_error).message("bad db").build_frame()
         )
-        .expect_read(err_builder()
-                         .seqnum(16)
-                         .code(common_server_errc::er_aborting_connection)
-                         .message("aborting connection")
-                         .build_frame())
+        .expect_read(
+            err_builder()
+                .seqnum(16)
+                .code(common_server_errc::er_aborting_connection)
+                .message("aborting connection")
+                .build_frame()
+        )
         .check(fix, common_server_errc::er_aborting_connection, create_server_diag("aborting connection"));
 
     // Stage results
@@ -574,17 +585,21 @@ BOOST_AUTO_TEST_CASE(no_response_error_1)
     // Run the test
     algo_test()
         .expect_write(mock_request)
-        .expect_read(err_builder()
-                         .seqnum(32)
-                         .code(common_server_errc::er_bad_db_error)
-                         .message("my_message")
-                         .build_frame())
+        .expect_read(
+            err_builder()
+                .seqnum(32)
+                .code(common_server_errc::er_bad_db_error)
+                .message("my_message")
+                .build_frame()
+        )
         .expect_read(create_ok_frame(16, ok_builder().build()))
-        .expect_read(err_builder()
-                         .seqnum(0)
-                         .code(common_server_errc::er_bad_table_error)
-                         .message("other_msg")
-                         .build_frame())
+        .expect_read(
+            err_builder()
+                .seqnum(0)
+                .code(common_server_errc::er_bad_table_error)
+                .message("other_msg")
+                .build_frame()
+        )
         .will_set_backslash_escapes(true)           // OK packet processed
         .will_set_current_charset(utf8mb4_charset)  // set character set succeeded
         .check(fix, common_server_errc::er_bad_db_error, create_server_diag("my_message"));
@@ -608,11 +623,13 @@ BOOST_AUTO_TEST_CASE(no_response_error_2)
     algo_test()
         .expect_write(mock_request)
         .expect_read(create_ok_frame(32, ok_builder().build()))
-        .expect_read(err_builder()
-                         .seqnum(16)
-                         .code(common_server_errc::er_unknown_character_set)
-                         .message("bad_charset")
-                         .build_frame())
+        .expect_read(
+            err_builder()
+                .seqnum(16)
+                .code(common_server_errc::er_unknown_character_set)
+                .message("bad_charset")
+                .build_frame()
+        )
         .expect_read(create_ok_frame(0, ok_builder().build()))
         .will_set_backslash_escapes(true)           // OK packet processed
         .will_set_current_charset(character_set{})  // reset connection succeeded
diff --git a/test/unit/test/sansio/set_character_set.cpp b/test/unit/test/sansio/set_character_set.cpp
index 554d7bd1f..9bcf1b675 100644
--- a/test/unit/test/sansio/set_character_set.cpp
+++ b/test/unit/test/sansio/set_character_set.cpp
@@ -12,11 +12,10 @@
 #include <boost/mysql/error_code.hpp>
 #include <boost/mysql/string_view.hpp>
 
-#include <boost/mysql/impl/internal/sansio/set_character_set.hpp>
-
 #include <boost/core/span.hpp>
 #include <boost/test/unit_test.hpp>
 
+#include "mycosql_internal/sansio/set_character_set.hpp"
 #include "test_common/create_diagnostics.hpp"
 #include "test_common/printing.hpp"
 #include "test_unit/algo_test.hpp"
@@ -118,11 +117,13 @@ BOOST_AUTO_TEST_CASE(read_response_error_packet)
 
     // Run the algo. The current charset was not updated
     algo_test()
-        .expect_read(err_builder()
-                         .seqnum(29)
-                         .code(common_server_errc::er_unknown_character_set)
-                         .message("Unknown charset")
-                         .build_frame())
+        .expect_read(
+            err_builder()
+                .seqnum(29)
+                .code(common_server_errc::er_unknown_character_set)
+                .message("Unknown charset")
+                .build_frame()
+        )
         .check(fix, common_server_errc::er_unknown_character_set, create_server_diag("Unknown charset"));
 }
 
diff --git a/test/unit/test/sansio/start_execution.cpp b/test/unit/test/sansio/start_execution.cpp
index 1034beb56..ba29258c5 100644
--- a/test/unit/test/sansio/start_execution.cpp
+++ b/test/unit/test/sansio/start_execution.cpp
@@ -16,15 +16,14 @@
 #include <boost/mysql/detail/any_execution_request.hpp>
 #include <boost/mysql/detail/resultset_encoding.hpp>
 
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-#include <boost/mysql/impl/internal/sansio/start_execution.hpp>
-
 #include <boost/asio/error.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include <array>
 #include <string>
 
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+#include "mycosql_internal/sansio/start_execution.hpp"
 #include "test_common/check_meta.hpp"
 #include "test_common/create_basic.hpp"
 #include "test_common/create_diagnostics.hpp"
@@ -164,11 +163,13 @@ BOOST_AUTO_TEST_CASE(error_read_resultset_head)
             // Otherwise, the operation is started and finished straight away
             algo_test()
                 .expect_write(create_query_frame(0, "SELECT 1"))
-                .expect_read(err_builder()
-                                 .seqnum(1)
-                                 .code(common_server_errc::er_syntax_error)
-                                 .message("Some error")
-                                 .build_frame())
+                .expect_read(
+                    err_builder()
+                        .seqnum(1)
+                        .code(common_server_errc::er_syntax_error)
+                        .message("Some error")
+                        .build_frame()
+                )
                 .check(fix, common_server_errc::er_syntax_error, create_server_diag("Some error"));
         }
     }
diff --git a/test/unit/test/sansio/top_level_algo.cpp b/test/unit/test/sansio/top_level_algo.cpp
index ea1c3cc9a..d39cf81cc 100644
--- a/test/unit/test/sansio/top_level_algo.cpp
+++ b/test/unit/test/sansio/top_level_algo.cpp
@@ -11,11 +11,6 @@
 
 #include <boost/mysql/detail/next_action.hpp>
 
-#include <boost/mysql/impl/internal/protocol/frame_header.hpp>
-#include <boost/mysql/impl/internal/sansio/connection_state_data.hpp>
-#include <boost/mysql/impl/internal/sansio/message_reader.hpp>
-#include <boost/mysql/impl/internal/sansio/top_level_algo.hpp>
-
 #include <boost/asio/coroutine.hpp>
 #include <boost/core/span.hpp>
 #include <boost/test/unit_test.hpp>
@@ -24,6 +19,10 @@
 #include <cstdint>
 #include <cstring>
 
+#include "mycosql_internal/protocol/frame_header.hpp"
+#include "mycosql_internal/sansio/connection_state_data.hpp"
+#include "mycosql_internal/sansio/message_reader.hpp"
+#include "mycosql_internal/sansio/top_level_algo.hpp"
 #include "test_common/assert_buffer_equals.hpp"
 #include "test_common/buffer_concat.hpp"
 #include "test_common/create_diagnostics.hpp"
diff --git a/test/unit/test_csha2p_encrypt_password_errors.cpp b/test/unit/test_csha2p_encrypt_password_errors.cpp
index cf4425267..6cc978926 100644
--- a/test/unit/test_csha2p_encrypt_password_errors.cpp
+++ b/test/unit/test_csha2p_encrypt_password_errors.cpp
@@ -7,8 +7,6 @@
 
 #define BOOST_TEST_MODULE test_csha2p_encrypt_password_errors
 
-#include <boost/mysql/impl/internal/sansio/csha2p_encrypt_password.hpp>
-
 #include <boost/container/small_vector.hpp>
 #include <boost/system/error_category.hpp>
 #include <boost/test/unit_test.hpp>
@@ -17,6 +15,8 @@
 #include <cstdint>
 #include <string>
 
+#include "mycosql_internal/sansio/csha2p_encrypt_password.hpp"
+
 using namespace boost::mysql;
 using detail::csha2p_encrypt_password;
 
diff --git a/tools/scripts/server_errors.py b/tools/scripts/server_errors.py
index d36618142..7d8633a04 100755
--- a/tools/scripts/server_errors.py
+++ b/tools/scripts/server_errors.py
@@ -166,7 +166,7 @@ def render_server_specific_errc(flavor: Literal['mysql', 'mariadb'], df_db: pd.D
 // This file was generated by server_errors.py - do not edit directly.
 
 #include <boost/config.hpp>
-#include <boost/mysql/impl/internal/error/server_error_to_string.hpp>
+#include "mycosql_internal/(.*)"
 
 namespace boost {{
 namespace mysql {{