diff --git a/include/boost/url/detail/vformat.hpp b/include/boost/url/detail/vformat.hpp
index 126d321bf..d93aa722d 100644
--- a/include/boost/url/detail/vformat.hpp
+++ b/include/boost/url/detail/vformat.hpp
@@ -11,7 +11,6 @@
 #define BOOST_URL_DETAIL_FORMAT_HPP
 
 #include <boost/url/detail/format_args.hpp>
-#include <boost/url/detail/pattern.hpp>
 #include <boost/core/detail/string_view.hpp>
 #include <boost/url/url.hpp>
 
@@ -19,16 +18,12 @@ namespace boost {
 namespace urls {
 namespace detail {
 
-inline
+BOOST_URL_DECL
 void
 vformat_to(
     url_base& u,
     core::string_view fmt,
-    detail::format_args args)
-{
-    parse_pattern(fmt)
-        .value().apply(u, args);
-}
+    detail::format_args args);
 
 inline
 url
diff --git a/include/boost/url/rfc/detail/path_rules.hpp b/include/boost/url/rfc/detail/path_rules.hpp
index 3f47dfc47..95a49637a 100644
--- a/include/boost/url/rfc/detail/path_rules.hpp
+++ b/include/boost/url/rfc/detail/path_rules.hpp
@@ -10,11 +10,11 @@
 #ifndef BOOST_URL_RFC_DETAIL_PATH_RULES_HPP
 #define BOOST_URL_RFC_DETAIL_PATH_RULES_HPP
 
-#include <boost/url/rfc/pchars.hpp>
-#include <boost/url/rfc/pct_encoded_rule.hpp>
-#include <boost/url/grammar/delim_rule.hpp>
-#include <boost/url/grammar/range_rule.hpp>
-#include <boost/url/grammar/tuple_rule.hpp>
+#include "boost/url/rfc/pchars.hpp"
+#include "boost/url/rfc/pct_encoded_rule.hpp"
+#include "boost/url/grammar/delim_rule.hpp"
+#include "boost/url/grammar/range_rule.hpp"
+#include "boost/url/grammar/tuple_rule.hpp"
 
 namespace boost {
 namespace urls {
diff --git a/src/authority_view.cpp b/src/authority_view.cpp
index d2f151b26..500758b70 100644
--- a/src/authority_view.cpp
+++ b/src/authority_view.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/url/detail/config.hpp>
 #include <boost/url/authority_view.hpp>
-#include <boost/url/detail/normalize.hpp>
+#include "detail/normalize.hpp"
 #include <boost/url/grammar/parse.hpp>
 #include <boost/url/rfc/authority_rule.hpp>
 #include <boost/url/rfc/pct_encoded_rule.hpp>
diff --git a/src/detail/any_params_iter.cpp b/src/detail/any_params_iter.cpp
index d8d46fe70..801d054d9 100644
--- a/src/detail/any_params_iter.cpp
+++ b/src/detail/any_params_iter.cpp
@@ -14,7 +14,7 @@
 #include <boost/url/detail/any_params_iter.hpp>
 #include <boost/url/encode.hpp>
 #include <boost/core/detail/string_view.hpp>
-#include <boost/url/rfc/detail/charsets.hpp>
+#include "../rfc/detail/charsets.hpp"
 
 namespace boost {
 namespace urls {
diff --git a/src/detail/any_segments_iter.cpp b/src/detail/any_segments_iter.cpp
index 9e1956fc7..2ce53ed2e 100644
--- a/src/detail/any_segments_iter.cpp
+++ b/src/detail/any_segments_iter.cpp
@@ -11,7 +11,7 @@
 #define BOOST_URL_DETAIL_IMPL_ANY_SEGMENTS_ITER_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/rfc/detail/charsets.hpp>
+#include "../rfc/detail/charsets.hpp"
 #include <boost/url/detail/any_segments_iter.hpp>
 #include <boost/core/detail/string_view.hpp>
 #include <boost/url/encode.hpp>
diff --git a/src/detail/decode.cpp b/src/detail/decode.cpp
index 9f6fae76f..69627df2b 100644
--- a/src/detail/decode.cpp
+++ b/src/detail/decode.cpp
@@ -11,7 +11,7 @@
 #define BOOST_URL_DETAIL_IMPL_DECODE_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/detail/decode.hpp>
+#include "decode.hpp"
 #include <boost/url/grammar/charset.hpp>
 #include <boost/url/grammar/hexdig_chars.hpp>
 #include <memory>
diff --git a/include/boost/url/detail/decode.hpp b/src/detail/decode.hpp
similarity index 95%
rename from include/boost/url/detail/decode.hpp
rename to src/detail/decode.hpp
index ef08b540f..053dd067f 100644
--- a/include/boost/url/detail/decode.hpp
+++ b/src/detail/decode.hpp
@@ -11,7 +11,7 @@
 #ifndef BOOST_URL_DETAIL_DECODE_HPP
 #define BOOST_URL_DETAIL_DECODE_HPP
 
-#include <boost/url/encoding_opts.hpp>
+#include "boost/url/encoding_opts.hpp"
 #include <boost/core/detail/string_view.hpp>
 #include <cstdlib>
 
diff --git a/src/detail/format_args.cpp b/src/detail/format_args.cpp
index 2b69ce258..2a5365bb3 100644
--- a/src/detail/format_args.cpp
+++ b/src/detail/format_args.cpp
@@ -13,7 +13,7 @@
 #include <boost/url/detail/config.hpp>
 #include <boost/url/encode.hpp>
 #include <boost/url/detail/format_args.hpp>
-#include <boost/url/detail/replacement_field_rule.hpp>
+#include "boost/url/detail/replacement_field_rule.hpp"
 #include <boost/url/grammar/delim_rule.hpp>
 #include <boost/url/grammar/optional_rule.hpp>
 #include <boost/url/grammar/parse.hpp>
diff --git a/include/boost/url/detail/move_chars.hpp b/src/detail/move_chars.hpp
similarity index 100%
rename from include/boost/url/detail/move_chars.hpp
rename to src/detail/move_chars.hpp
diff --git a/src/detail/normalize.cpp b/src/detail/normalize.cpp
index 7d0925987..5c4fdf923 100644
--- a/src/detail/normalize.cpp
+++ b/src/detail/normalize.cpp
@@ -13,13 +13,13 @@
 
 #include <boost/url/detail/config.hpp>
 #include <boost/url/decode_view.hpp>
-#include <boost/url/detail/decode.hpp>
+#include "decode.hpp"
 #include <boost/url/segments_encoded_view.hpp>
-#include <boost/url/detail/normalize.hpp>
 #include <boost/url/grammar/ci_string.hpp>
 #include <boost/assert.hpp>
 #include <boost/core/ignore_unused.hpp>
 #include <cstring>
+#include "normalize.hpp"
 
 namespace boost {
 namespace urls {
diff --git a/include/boost/url/detail/normalize.hpp b/src/detail/normalize.hpp
similarity index 97%
rename from include/boost/url/detail/normalize.hpp
rename to src/detail/normalize.hpp
index d6bbb4333..e03c11571 100644
--- a/include/boost/url/detail/normalize.hpp
+++ b/src/detail/normalize.hpp
@@ -12,8 +12,7 @@
 #define BOOST_URL_DETAIL_NORMALIZED_HPP
 
 #include <boost/core/detail/string_view.hpp>
-#include <boost/url/segments_encoded_view.hpp>
-#include <boost/url/detail/normalize.hpp>
+#include "boost/url/segments_encoded_view.hpp"
 
 namespace boost {
 namespace urls {
diff --git a/include/boost/url/detail/over_allocator.hpp b/src/detail/over_allocator.hpp
similarity index 100%
rename from include/boost/url/detail/over_allocator.hpp
rename to src/detail/over_allocator.hpp
diff --git a/include/boost/url/detail/path.hpp b/src/detail/path.hpp
similarity index 100%
rename from include/boost/url/detail/path.hpp
rename to src/detail/path.hpp
diff --git a/src/detail/pattern.cpp b/src/detail/pattern.cpp
index 06bb802c1..b978fe594 100644
--- a/src/detail/pattern.cpp
+++ b/src/detail/pattern.cpp
@@ -11,17 +11,17 @@
 #define BOOST_URL_DETAIL_IMPL_PATTERN_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/detail/pattern.hpp>
-#include <boost/url/detail/pct_format.hpp>
-#include <boost/url/detail/replacement_field_rule.hpp>
+#include "pattern.hpp"
+#include "pct_format.hpp"
+#include "boost/url/detail/replacement_field_rule.hpp"
 #include <boost/url/grammar/alpha_chars.hpp>
 #include <boost/url/grammar/optional_rule.hpp>
 #include <boost/url/grammar/token_rule.hpp>
-#include <boost/url/rfc/detail/charsets.hpp>
-#include <boost/url/rfc/detail/host_rule.hpp>
-#include <boost/url/rfc/detail/path_rules.hpp>
-#include <boost/url/rfc/detail/port_rule.hpp>
-#include <boost/url/rfc/detail/scheme_rule.hpp>
+#include "../rfc/detail/charsets.hpp"
+#include "../rfc/detail/host_rule.hpp"
+#include "boost/url/rfc/detail/path_rules.hpp"
+#include "../rfc/detail/port_rule.hpp"
+#include "../rfc/detail/scheme_rule.hpp"
 
 namespace boost {
 namespace urls {
diff --git a/include/boost/url/detail/pattern.hpp b/src/detail/pattern.hpp
similarity index 94%
rename from include/boost/url/detail/pattern.hpp
rename to src/detail/pattern.hpp
index 931d2dd2b..96b66c378 100644
--- a/include/boost/url/detail/pattern.hpp
+++ b/src/detail/pattern.hpp
@@ -10,8 +10,8 @@
 #ifndef BOOST_URL_DETAIL_PATTERN_HPP
 #define BOOST_URL_DETAIL_PATTERN_HPP
 
-#include <boost/url/error_types.hpp>
-#include <boost/url/url_base.hpp>
+#include "boost/url/error_types.hpp"
+#include "boost/url/url_base.hpp"
 #include <boost/core/detail/string_view.hpp>
 
 // This file includes functions and classes
diff --git a/src/detail/pct_format.cpp b/src/detail/pct_format.cpp
index f4172e615..4ed5be2d2 100644
--- a/src/detail/pct_format.cpp
+++ b/src/detail/pct_format.cpp
@@ -11,7 +11,7 @@
 #define BOOST_URL_DETAIL_IMPL_PCT_FORMAT_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/detail/pct_format.hpp>
+#include "pct_format.hpp"
 #include <boost/url/grammar/parse.hpp>
 #include <boost/url/grammar/unsigned_rule.hpp>
 
diff --git a/include/boost/url/detail/pct_format.hpp b/src/detail/pct_format.hpp
similarity index 87%
rename from include/boost/url/detail/pct_format.hpp
rename to src/detail/pct_format.hpp
index 0d13b3fcf..373d79219 100644
--- a/include/boost/url/detail/pct_format.hpp
+++ b/src/detail/pct_format.hpp
@@ -11,9 +11,9 @@
 #define BOOST_URL_DETAIL_PCT_FORMAT_HPP
 
 #include <boost/core/detail/string_view.hpp>
-#include <boost/url/url.hpp>
-#include <boost/url/grammar/lut_chars.hpp>
-#include <boost/url/detail/format_args.hpp>
+#include "boost/url/url.hpp"
+#include "boost/url/grammar/lut_chars.hpp"
+#include "boost/url/detail/format_args.hpp"
 
 namespace boost {
 namespace urls {
diff --git a/include/boost/url/detail/print.hpp b/src/detail/print.hpp
similarity index 100%
rename from include/boost/url/detail/print.hpp
rename to src/detail/print.hpp
diff --git a/src/detail/replacement_field_rule.cpp b/src/detail/replacement_field_rule.cpp
index 07ca934ad..6a3a1bb99 100644
--- a/src/detail/replacement_field_rule.cpp
+++ b/src/detail/replacement_field_rule.cpp
@@ -11,7 +11,7 @@
 #define BOOST_URL_DETAIL_IMPL_REPLACEMENT_FIELD_RULE_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/detail/replacement_field_rule.hpp>
+#include "boost/url/detail/replacement_field_rule.hpp"
 #include <boost/url/grammar/alnum_chars.hpp>
 #include <boost/url/grammar/alpha_chars.hpp>
 #include <boost/url/grammar/delim_rule.hpp>
diff --git a/src/detail/segments_iter_impl.cpp b/src/detail/segments_iter_impl.cpp
index 13cbac242..54d91c1b4 100644
--- a/src/detail/segments_iter_impl.cpp
+++ b/src/detail/segments_iter_impl.cpp
@@ -12,9 +12,9 @@
 #define BOOST_URL_DETAIL_IMPL_SEGMENTS_ITER_IMPL_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/detail/path.hpp>
+#include "path.hpp"
 #include <boost/url/detail/segments_iter_impl.hpp>
-#include <boost/url/rfc/detail/path_rules.hpp>
+#include "boost/url/rfc/detail/path_rules.hpp"
 #include <boost/assert.hpp>
 
 namespace boost {
diff --git a/src/detail/url_impl.cpp b/src/detail/url_impl.cpp
index 1e7a3d641..0e96ce69b 100644
--- a/src/detail/url_impl.cpp
+++ b/src/detail/url_impl.cpp
@@ -11,7 +11,7 @@
 #define BOOST_URL_DETAIL_IMPL_URL_IMPL_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/detail/path.hpp>
+#include "path.hpp"
 #include <boost/url/detail/url_impl.hpp>
 #include <boost/url/authority_view.hpp>
 #include <boost/assert.hpp>
diff --git a/src/detail/vformat.cpp b/src/detail/vformat.cpp
new file mode 100644
index 000000000..678f8d2f6
--- /dev/null
+++ b/src/detail/vformat.cpp
@@ -0,0 +1,36 @@
+//
+// Copyright (c) 2022 Alan de Freitas (alandefreitas@gmail.com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/url
+//
+
+#ifndef BOOST_URL_DETAIL_VFORMAT_IPP
+#define BOOST_URL_DETAIL_VFORMAT_IPP
+
+#include <boost/url/detail/config.hpp>
+#include <boost/url/detail/vformat.hpp>
+#include "pattern.hpp"
+
+namespace boost {
+namespace urls {
+namespace detail {
+
+void
+vformat_to(
+    url_base& u,
+    core::string_view fmt,
+    detail::format_args args)
+{
+    parse_pattern(fmt)
+        .value().apply(u, args);
+}
+
+
+} // detail
+} // urls
+} // boost
+
+#endif
diff --git a/src/parse_path.cpp b/src/parse_path.cpp
index 07632859c..7fc975c44 100644
--- a/src/parse_path.cpp
+++ b/src/parse_path.cpp
@@ -14,9 +14,9 @@
 #include <boost/url/detail/config.hpp>
 #include <boost/url/parse_path.hpp>
 #include <boost/url/error.hpp>
-#include <boost/url/detail/path.hpp>
+#include "detail/path.hpp"
 #include <boost/url/grammar/parse.hpp>
-#include <boost/url/rfc/detail/path_rules.hpp>
+#include "boost/url/rfc/detail/path_rules.hpp"
 
 namespace boost {
 namespace urls {
diff --git a/src/pct_string_view.cpp b/src/pct_string_view.cpp
index dd37423c5..cea52ab3e 100644
--- a/src/pct_string_view.cpp
+++ b/src/pct_string_view.cpp
@@ -13,7 +13,7 @@
 #include <boost/url/detail/config.hpp>
 #include <boost/url/error.hpp>
 #include <boost/url/pct_string_view.hpp>
-#include <boost/url/detail/decode.hpp>
+#include "detail/decode.hpp"
 #include <boost/url/grammar/hexdig_chars.hpp>
 #include <boost/url/detail/except.hpp>
 
diff --git a/src/rfc/absolute_uri_rule.cpp b/src/rfc/absolute_uri_rule.cpp
index dc3116472..c5ce2b417 100644
--- a/src/rfc/absolute_uri_rule.cpp
+++ b/src/rfc/absolute_uri_rule.cpp
@@ -16,9 +16,9 @@
 #include <boost/url/grammar/tuple_rule.hpp>
 #include <boost/url/grammar/optional_rule.hpp>
 #include <boost/url/grammar/parse.hpp>
-#include <boost/url/rfc/detail/hier_part_rule.hpp>
-#include <boost/url/rfc/detail/query_part_rule.hpp>
-#include <boost/url/rfc/detail/scheme_rule.hpp>
+#include "detail/hier_part_rule.hpp"
+#include "detail/query_part_rule.hpp"
+#include "detail/scheme_rule.hpp"
 #include <utility>
 
 namespace boost {
diff --git a/src/rfc/authority_rule.cpp b/src/rfc/authority_rule.cpp
index 11ba86424..4252ff3e1 100644
--- a/src/rfc/authority_rule.cpp
+++ b/src/rfc/authority_rule.cpp
@@ -16,9 +16,9 @@
 #include <boost/url/grammar/optional_rule.hpp>
 #include <boost/url/grammar/parse.hpp>
 #include <boost/url/grammar/tuple_rule.hpp>
-#include <boost/url/rfc/detail/host_rule.hpp>
-#include <boost/url/rfc/detail/port_rule.hpp>
-#include <boost/url/rfc/detail/userinfo_rule.hpp>
+#include "detail/host_rule.hpp"
+#include "detail/port_rule.hpp"
+#include "detail/userinfo_rule.hpp"
 
 namespace boost {
 namespace urls {
diff --git a/include/boost/url/rfc/detail/charsets.hpp b/src/rfc/detail/charsets.hpp
similarity index 90%
rename from include/boost/url/rfc/detail/charsets.hpp
rename to src/rfc/detail/charsets.hpp
index 059554495..bbb16e505 100644
--- a/include/boost/url/rfc/detail/charsets.hpp
+++ b/src/rfc/detail/charsets.hpp
@@ -10,9 +10,9 @@
 #ifndef BOOST_URL_RFC_DETAIL_CHARSETS_HPP
 #define BOOST_URL_RFC_DETAIL_CHARSETS_HPP
 
-#include <boost/url/rfc/pchars.hpp>
-#include <boost/url/rfc/sub_delim_chars.hpp>
-#include <boost/url/rfc/unreserved_chars.hpp>
+#include "boost/url/rfc/pchars.hpp"
+#include "boost/url/rfc/sub_delim_chars.hpp"
+#include "boost/url/rfc/unreserved_chars.hpp"
 
 namespace boost {
 namespace urls {
diff --git a/include/boost/url/rfc/detail/fragment_part_rule.hpp b/src/rfc/detail/fragment_part_rule.hpp
similarity index 91%
rename from include/boost/url/rfc/detail/fragment_part_rule.hpp
rename to src/rfc/detail/fragment_part_rule.hpp
index 62a3fe034..97ce886af 100644
--- a/include/boost/url/rfc/detail/fragment_part_rule.hpp
+++ b/src/rfc/detail/fragment_part_rule.hpp
@@ -10,9 +10,9 @@
 #ifndef BOOST_URL_RFC_DETAIL_FRAGMENT_PART_RULE_HPP
 #define BOOST_URL_RFC_DETAIL_FRAGMENT_PART_RULE_HPP
 
-#include <boost/url/rfc/pct_encoded_rule.hpp>
-#include <boost/url/rfc/detail/charsets.hpp>
-#include <boost/url/grammar/parse.hpp>
+#include "boost/url/rfc/pct_encoded_rule.hpp"
+#include "charsets.hpp"
+#include "boost/url/grammar/parse.hpp"
 
 namespace boost {
 namespace urls {
diff --git a/src/rfc/detail/h16_rule.cpp b/src/rfc/detail/h16_rule.cpp
index af2106f4a..c92e75036 100644
--- a/src/rfc/detail/h16_rule.cpp
+++ b/src/rfc/detail/h16_rule.cpp
@@ -11,7 +11,7 @@
 #define BOOST_URL_RFC_DETAIL_IMPL_H16_RULE_HPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/rfc/detail/h16_rule.hpp>
+#include "h16_rule.hpp"
 #include <boost/url/grammar/charset.hpp>
 #include <boost/url/grammar/error.hpp>
 #include <boost/url/grammar/hexdig_chars.hpp>
diff --git a/include/boost/url/rfc/detail/h16_rule.hpp b/src/rfc/detail/h16_rule.hpp
similarity index 93%
rename from include/boost/url/rfc/detail/h16_rule.hpp
rename to src/rfc/detail/h16_rule.hpp
index 58ce519d0..ccf6135c7 100644
--- a/include/boost/url/rfc/detail/h16_rule.hpp
+++ b/src/rfc/detail/h16_rule.hpp
@@ -10,8 +10,8 @@
 #ifndef BOOST_URL_RFC_DETAIL_H16_RULE_HPP
 #define BOOST_URL_RFC_DETAIL_H16_RULE_HPP
 
-#include <boost/url/detail/config.hpp>
-#include <boost/url/error_types.hpp>
+#include "boost/url/detail/config.hpp"
+#include "boost/url/error_types.hpp"
 #include <cstdint>
 
 namespace boost {
diff --git a/src/rfc/detail/hier_part_rule.cpp b/src/rfc/detail/hier_part_rule.cpp
index 6a2447fac..7394cd470 100644
--- a/src/rfc/detail/hier_part_rule.cpp
+++ b/src/rfc/detail/hier_part_rule.cpp
@@ -11,8 +11,8 @@
 #define BOOST_URL_RFC_DETAIL_IMPL_HIER_PART_RULE_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/rfc/detail/hier_part_rule.hpp>
-#include <boost/url/rfc/detail/path_rules.hpp>
+#include "hier_part_rule.hpp"
+#include "boost/url/rfc/detail/path_rules.hpp"
 #include <boost/url/grammar/parse.hpp>
 #include <boost/url/grammar/parse.hpp>
 
diff --git a/include/boost/url/rfc/detail/hier_part_rule.hpp b/src/rfc/detail/hier_part_rule.hpp
similarity index 91%
rename from include/boost/url/rfc/detail/hier_part_rule.hpp
rename to src/rfc/detail/hier_part_rule.hpp
index 80d05c8e6..c7b9658f5 100644
--- a/include/boost/url/rfc/detail/hier_part_rule.hpp
+++ b/src/rfc/detail/hier_part_rule.hpp
@@ -10,9 +10,9 @@
 #ifndef BOOST_URL_RFC_DETAIL_HIER_PART_RULE_HPP
 #define BOOST_URL_RFC_DETAIL_HIER_PART_RULE_HPP
 
-#include <boost/url/detail/config.hpp>
-#include <boost/url/pct_string_view.hpp>
-#include <boost/url/rfc/authority_rule.hpp>
+#include "boost/url/detail/config.hpp"
+#include "boost/url/pct_string_view.hpp"
+#include "boost/url/rfc/authority_rule.hpp"
 #include <cstdlib>
 
 namespace boost {
diff --git a/src/rfc/detail/host_rule.cpp b/src/rfc/detail/host_rule.cpp
index 550212367..f2cccc7ff 100644
--- a/src/rfc/detail/host_rule.cpp
+++ b/src/rfc/detail/host_rule.cpp
@@ -12,9 +12,9 @@
 
 #include <boost/url/detail/config.hpp>
 #include <boost/url/rfc/ipv4_address_rule.hpp>
-#include <boost/url/rfc/detail/host_rule.hpp>
-#include <boost/url/rfc/detail/ip_literal_rule.hpp>
-#include <boost/url/rfc/detail/reg_name_rule.hpp>
+#include "host_rule.hpp"
+#include "ip_literal_rule.hpp"
+#include "reg_name_rule.hpp"
 #include <boost/url/grammar/parse.hpp>
 
 namespace boost {
diff --git a/include/boost/url/rfc/detail/host_rule.hpp b/src/rfc/detail/host_rule.hpp
similarity index 86%
rename from include/boost/url/rfc/detail/host_rule.hpp
rename to src/rfc/detail/host_rule.hpp
index 57b18a0e2..b8744b8e6 100644
--- a/include/boost/url/rfc/detail/host_rule.hpp
+++ b/src/rfc/detail/host_rule.hpp
@@ -10,11 +10,11 @@
 #ifndef BOOST_URL_RFC_DETAIL_HOST_RULE_HPP
 #define BOOST_URL_RFC_DETAIL_HOST_RULE_HPP
 
-#include <boost/url/host_type.hpp>
-#include <boost/url/error_types.hpp>
-#include <boost/url/pct_string_view.hpp>
-#include <boost/url/ipv4_address.hpp>
-#include <boost/url/ipv6_address.hpp>
+#include "boost/url/host_type.hpp"
+#include "boost/url/error_types.hpp"
+#include "boost/url/pct_string_view.hpp"
+#include "boost/url/ipv4_address.hpp"
+#include "boost/url/ipv6_address.hpp"
 
 namespace boost {
 namespace urls {
diff --git a/src/rfc/detail/ip_literal_rule.cpp b/src/rfc/detail/ip_literal_rule.cpp
index 04547d855..903da8ccc 100644
--- a/src/rfc/detail/ip_literal_rule.cpp
+++ b/src/rfc/detail/ip_literal_rule.cpp
@@ -13,12 +13,12 @@
 
 #include <boost/url/detail/config.hpp>
 #include <boost/url/rfc/ipv6_address_rule.hpp>
-#include <boost/url/rfc/detail/ip_literal_rule.hpp>
-#include <boost/url/rfc/detail/ipv6_addrz_rule.hpp>
+#include "ip_literal_rule.hpp"
+#include "ipv6_addrz_rule.hpp"
 #include <boost/url/grammar/delim_rule.hpp>
 #include <boost/url/grammar/parse.hpp>
 #include <boost/url/grammar/tuple_rule.hpp>
-#include <boost/url/rfc/detail/ipvfuture_rule.hpp>
+#include "ipvfuture_rule.hpp"
 
 namespace boost {
 namespace urls {
diff --git a/include/boost/url/rfc/detail/ip_literal_rule.hpp b/src/rfc/detail/ip_literal_rule.hpp
similarity index 91%
rename from include/boost/url/rfc/detail/ip_literal_rule.hpp
rename to src/rfc/detail/ip_literal_rule.hpp
index 33a5929b3..df07985e9 100644
--- a/include/boost/url/rfc/detail/ip_literal_rule.hpp
+++ b/src/rfc/detail/ip_literal_rule.hpp
@@ -11,9 +11,9 @@
 #ifndef BOOST_URL_RFC_DETAIL_IP_LITERAL_RULE_HPP
 #define BOOST_URL_RFC_DETAIL_IP_LITERAL_RULE_HPP
 
-#include <boost/url/detail/config.hpp>
-#include <boost/url/ipv6_address.hpp>
-#include <boost/url/error_types.hpp>
+#include "boost/url/detail/config.hpp"
+#include "boost/url/ipv6_address.hpp"
+#include "boost/url/error_types.hpp"
 #include <boost/core/detail/string_view.hpp>
 
 namespace boost {
diff --git a/src/rfc/detail/ipv6_addrz_rule.cpp b/src/rfc/detail/ipv6_addrz_rule.cpp
index 46020588c..b10677cdc 100644
--- a/src/rfc/detail/ipv6_addrz_rule.cpp
+++ b/src/rfc/detail/ipv6_addrz_rule.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/url/detail/config.hpp>
 #include <boost/url/grammar/parse.hpp>
-#include <boost/url/rfc/detail/ipv6_addrz_rule.hpp>
+#include "ipv6_addrz_rule.hpp"
 #include <boost/url/rfc/ipv6_address_rule.hpp>
 #include <boost/url/rfc/unreserved_chars.hpp>
 #include <boost/url/rfc/pct_encoded_rule.hpp>
diff --git a/include/boost/url/rfc/detail/ipv6_addrz_rule.hpp b/src/rfc/detail/ipv6_addrz_rule.hpp
similarity index 90%
rename from include/boost/url/rfc/detail/ipv6_addrz_rule.hpp
rename to src/rfc/detail/ipv6_addrz_rule.hpp
index a27adfa67..3174fbe5a 100644
--- a/include/boost/url/rfc/detail/ipv6_addrz_rule.hpp
+++ b/src/rfc/detail/ipv6_addrz_rule.hpp
@@ -10,9 +10,9 @@
 #ifndef BOOST_URL_RFC_DETAIL_IPV6ADDRZ_RULE_HPP
 #define BOOST_URL_RFC_DETAIL_IPV6ADDRZ_RULE_HPP
 
-#include <boost/url/error_types.hpp>
-#include <boost/url/ipv6_address.hpp>
-#include <boost/url/pct_string_view.hpp>
+#include "boost/url/error_types.hpp"
+#include "boost/url/ipv6_address.hpp"
+#include "boost/url/pct_string_view.hpp"
 #include <boost/core/detail/string_view.hpp>
 
 namespace boost {
diff --git a/src/rfc/detail/ipvfuture_rule.cpp b/src/rfc/detail/ipvfuture_rule.cpp
index 875ecb93b..5939931ac 100644
--- a/src/rfc/detail/ipvfuture_rule.cpp
+++ b/src/rfc/detail/ipvfuture_rule.cpp
@@ -11,9 +11,9 @@
 #define BOOST_URL_DETAIL_IMPL_IPVFUTURE_RULE_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/rfc/detail/ipvfuture_rule.hpp>
+#include "ipvfuture_rule.hpp"
 #include <boost/url/error.hpp>
-#include <boost/url/rfc/detail/charsets.hpp>
+#include "charsets.hpp"
 #include <boost/url/grammar/charset.hpp>
 #include <boost/url/grammar/delim_rule.hpp>
 #include <boost/url/grammar/hexdig_chars.hpp>
diff --git a/include/boost/url/rfc/detail/ipvfuture_rule.hpp b/src/rfc/detail/ipvfuture_rule.hpp
similarity index 96%
rename from include/boost/url/rfc/detail/ipvfuture_rule.hpp
rename to src/rfc/detail/ipvfuture_rule.hpp
index 6f3a6a47e..fbdb19730 100644
--- a/include/boost/url/rfc/detail/ipvfuture_rule.hpp
+++ b/src/rfc/detail/ipvfuture_rule.hpp
@@ -10,7 +10,7 @@
 #ifndef BOOST_URL_RFC_DETAIL_IPVFUTURE_RULE_HPP
 #define BOOST_URL_RFC_DETAIL_IPVFUTURE_RULE_HPP
 
-#include <boost/url/error_types.hpp>
+#include "boost/url/error_types.hpp"
 #include <boost/core/detail/string_view.hpp>
 
 namespace boost {
diff --git a/src/rfc/detail/port_rule.cpp b/src/rfc/detail/port_rule.cpp
index 552c2eea0..d4b803d18 100644
--- a/src/rfc/detail/port_rule.cpp
+++ b/src/rfc/detail/port_rule.cpp
@@ -11,7 +11,7 @@
 #define BOOST_URL_IMPL_PORT_RULE_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/rfc/detail/port_rule.hpp>
+#include "port_rule.hpp"
 #include <boost/url/grammar/parse.hpp>
 #include <boost/url/grammar/token_rule.hpp>
 #include <boost/url/grammar/unsigned_rule.hpp>
diff --git a/include/boost/url/rfc/detail/port_rule.hpp b/src/rfc/detail/port_rule.hpp
similarity index 95%
rename from include/boost/url/rfc/detail/port_rule.hpp
rename to src/rfc/detail/port_rule.hpp
index 22459aa07..439a4cd3c 100644
--- a/include/boost/url/rfc/detail/port_rule.hpp
+++ b/src/rfc/detail/port_rule.hpp
@@ -10,8 +10,8 @@
 #ifndef BOOST_URL_RFC_DETAIL_PORT_RULE_HPP
 #define BOOST_URL_RFC_DETAIL_PORT_RULE_HPP
 
-#include <boost/url/detail/config.hpp>
-#include <boost/url/error_types.hpp>
+#include "boost/url/detail/config.hpp"
+#include "boost/url/error_types.hpp"
 #include <boost/core/detail/string_view.hpp>
 #include <cstdint>
 
diff --git a/include/boost/url/rfc/detail/query_part_rule.hpp b/src/rfc/detail/query_part_rule.hpp
similarity index 86%
rename from include/boost/url/rfc/detail/query_part_rule.hpp
rename to src/rfc/detail/query_part_rule.hpp
index 04b2c5aef..a6afbf15a 100644
--- a/include/boost/url/rfc/detail/query_part_rule.hpp
+++ b/src/rfc/detail/query_part_rule.hpp
@@ -10,11 +10,11 @@
 #ifndef BOOST_URL_RFC_DETAIL_QUERY_PART_RULE_HPP
 #define BOOST_URL_RFC_DETAIL_QUERY_PART_RULE_HPP
 
-#include <boost/url/detail/config.hpp>
-#include <boost/url/error_types.hpp>
-#include <boost/url/pct_string_view.hpp>
-#include <boost/url/rfc/query_rule.hpp>
-#include <boost/url/grammar/parse.hpp>
+#include "boost/url/detail/config.hpp"
+#include "boost/url/error_types.hpp"
+#include "boost/url/pct_string_view.hpp"
+#include "boost/url/rfc/query_rule.hpp"
+#include "boost/url/grammar/parse.hpp"
 #include <cstdlib>
 
 namespace boost {
diff --git a/include/boost/url/rfc/detail/reg_name_rule.hpp b/src/rfc/detail/reg_name_rule.hpp
similarity index 89%
rename from include/boost/url/rfc/detail/reg_name_rule.hpp
rename to src/rfc/detail/reg_name_rule.hpp
index 2f552b890..afe988c2c 100644
--- a/include/boost/url/rfc/detail/reg_name_rule.hpp
+++ b/src/rfc/detail/reg_name_rule.hpp
@@ -10,10 +10,10 @@
 #ifndef BOOST_URL_RFC_DETAIL_REG_NAME_RULE_HPP
 #define BOOST_URL_RFC_DETAIL_REG_NAME_RULE_HPP
 
-#include <boost/url/detail/config.hpp>
-#include <boost/url/rfc/pct_encoded_rule.hpp>
-#include <boost/url/rfc/sub_delim_chars.hpp>
-#include <boost/url/rfc/unreserved_chars.hpp>
+#include "boost/url/detail/config.hpp"
+#include "boost/url/rfc/pct_encoded_rule.hpp"
+#include "boost/url/rfc/sub_delim_chars.hpp"
+#include "boost/url/rfc/unreserved_chars.hpp"
 
 namespace boost {
 namespace urls {
diff --git a/src/rfc/detail/relative_part_rule.cpp b/src/rfc/detail/relative_part_rule.cpp
index 52313439f..594744c85 100644
--- a/src/rfc/detail/relative_part_rule.cpp
+++ b/src/rfc/detail/relative_part_rule.cpp
@@ -11,8 +11,8 @@
 #define BOOST_URL_RFC_DETAIL_IMPL_RELATIVE_PART_RULE_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/rfc/detail/relative_part_rule.hpp>
-#include <boost/url/rfc/detail/path_rules.hpp>
+#include "relative_part_rule.hpp"
+#include "boost/url/rfc/detail/path_rules.hpp"
 #include <boost/url/grammar/parse.hpp>
 
 namespace boost {
diff --git a/include/boost/url/rfc/detail/relative_part_rule.hpp b/src/rfc/detail/relative_part_rule.hpp
similarity index 90%
rename from include/boost/url/rfc/detail/relative_part_rule.hpp
rename to src/rfc/detail/relative_part_rule.hpp
index 7d37f8fce..e7ca8fbb6 100644
--- a/include/boost/url/rfc/detail/relative_part_rule.hpp
+++ b/src/rfc/detail/relative_part_rule.hpp
@@ -10,10 +10,10 @@
 #ifndef BOOST_URL_RFC_DETAIL_RELATIVE_PART_RULE_HPP
 #define BOOST_URL_RFC_DETAIL_RELATIVE_PART_RULE_HPP
 
-#include <boost/url/detail/config.hpp>
-#include <boost/url/error_types.hpp>
-#include <boost/url/pct_string_view.hpp>
-#include <boost/url/rfc/authority_rule.hpp>
+#include "boost/url/detail/config.hpp"
+#include "boost/url/error_types.hpp"
+#include "boost/url/pct_string_view.hpp"
+#include "boost/url/rfc/authority_rule.hpp"
 #include <cstdlib>
 
 namespace boost {
diff --git a/src/rfc/detail/scheme_rule.cpp b/src/rfc/detail/scheme_rule.cpp
index 5f17c4f59..207305406 100644
--- a/src/rfc/detail/scheme_rule.cpp
+++ b/src/rfc/detail/scheme_rule.cpp
@@ -11,7 +11,7 @@
 #define BOOST_URL_IMPL_SCHEME_RULE_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/rfc/detail/scheme_rule.hpp>
+#include "scheme_rule.hpp"
 #include <boost/url/grammar/alpha_chars.hpp>
 #include <boost/url/grammar/delim_rule.hpp>
 #include <boost/url/grammar/lut_chars.hpp>
diff --git a/include/boost/url/rfc/detail/scheme_rule.hpp b/src/rfc/detail/scheme_rule.hpp
similarity index 90%
rename from include/boost/url/rfc/detail/scheme_rule.hpp
rename to src/rfc/detail/scheme_rule.hpp
index a97557c18..df6ba78e0 100644
--- a/include/boost/url/rfc/detail/scheme_rule.hpp
+++ b/src/rfc/detail/scheme_rule.hpp
@@ -10,9 +10,9 @@
 #ifndef BOOST_URL_RFC_DETAIL_SCHEME_RULE_HPP
 #define BOOST_URL_RFC_DETAIL_SCHEME_RULE_HPP
 
-#include <boost/url/detail/config.hpp>
-#include <boost/url/error_types.hpp>
-#include <boost/url/scheme.hpp>
+#include "boost/url/detail/config.hpp"
+#include "boost/url/error_types.hpp"
+#include "boost/url/scheme.hpp"
 #include <boost/core/detail/string_view.hpp>
 
 namespace boost {
diff --git a/src/rfc/detail/userinfo_rule.cpp b/src/rfc/detail/userinfo_rule.cpp
index c2044697f..3235ef9c9 100644
--- a/src/rfc/detail/userinfo_rule.cpp
+++ b/src/rfc/detail/userinfo_rule.cpp
@@ -11,7 +11,7 @@
 #define BOOST_URL_RFC_DETAIL_IMPL_USERINFO_RULE_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/rfc/detail/userinfo_rule.hpp>
+#include "userinfo_rule.hpp"
 #include <boost/core/detail/string_view.hpp>
 #include <boost/url/rfc/pct_encoded_rule.hpp>
 #include <boost/url/rfc/sub_delim_chars.hpp>
diff --git a/include/boost/url/rfc/detail/userinfo_rule.hpp b/src/rfc/detail/userinfo_rule.hpp
similarity index 91%
rename from include/boost/url/rfc/detail/userinfo_rule.hpp
rename to src/rfc/detail/userinfo_rule.hpp
index bd66ff1bc..c46eddfe6 100644
--- a/include/boost/url/rfc/detail/userinfo_rule.hpp
+++ b/src/rfc/detail/userinfo_rule.hpp
@@ -10,9 +10,9 @@
 #ifndef BOOST_URL_RFC_DETAIL_USERINFO_RULE_HPP
 #define BOOST_URL_RFC_DETAIL_USERINFO_RULE_HPP
 
-#include <boost/url/detail/config.hpp>
-#include <boost/url/error_types.hpp>
-#include <boost/url/pct_string_view.hpp>
+#include "boost/url/detail/config.hpp"
+#include "boost/url/error_types.hpp"
+#include "boost/url/pct_string_view.hpp"
 
 namespace boost {
 namespace urls {
diff --git a/src/rfc/ipv6_address_rule.cpp b/src/rfc/ipv6_address_rule.cpp
index a424655d3..0baf4c771 100644
--- a/src/rfc/ipv6_address_rule.cpp
+++ b/src/rfc/ipv6_address_rule.cpp
@@ -13,7 +13,7 @@
 #include <boost/url/detail/config.hpp>
 #include <boost/url/rfc/ipv6_address_rule.hpp>
 #include <boost/url/rfc/ipv4_address_rule.hpp>
-#include <boost/url/rfc/detail/h16_rule.hpp>
+#include "detail/h16_rule.hpp"
 #include <boost/url/grammar/charset.hpp>
 #include <boost/url/grammar/hexdig_chars.hpp>
 #include <boost/url/grammar/parse.hpp>
diff --git a/src/rfc/origin_form_rule.cpp b/src/rfc/origin_form_rule.cpp
index c8b9a4c71..5221eb8dc 100644
--- a/src/rfc/origin_form_rule.cpp
+++ b/src/rfc/origin_form_rule.cpp
@@ -13,8 +13,8 @@
 #include <boost/url/detail/config.hpp>
 #include <boost/url/rfc/origin_form_rule.hpp>
 #include <boost/url/rfc/query_rule.hpp>
-#include <boost/url/rfc/detail/path_rules.hpp>
-#include <boost/url/rfc/detail/query_part_rule.hpp>
+#include "boost/url/rfc/detail/path_rules.hpp"
+#include "detail/query_part_rule.hpp"
 #include <boost/url/grammar/delim_rule.hpp>
 #include <boost/url/grammar/range_rule.hpp>
 #include <boost/url/grammar/tuple_rule.hpp>
diff --git a/src/rfc/query_rule.cpp b/src/rfc/query_rule.cpp
index 2d46736df..4a3f0bab3 100644
--- a/src/rfc/query_rule.cpp
+++ b/src/rfc/query_rule.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/url/detail/config.hpp>
 #include <boost/url/rfc/query_rule.hpp>
-#include <boost/url/rfc/detail/charsets.hpp>
+#include "detail/charsets.hpp"
 #include <boost/url/error.hpp>
 #include <boost/url/grammar/hexdig_chars.hpp>
 
diff --git a/src/rfc/relative_ref_rule.cpp b/src/rfc/relative_ref_rule.cpp
index 414550eab..4ff15a6ec 100644
--- a/src/rfc/relative_ref_rule.cpp
+++ b/src/rfc/relative_ref_rule.cpp
@@ -13,9 +13,9 @@
 #include <boost/url/detail/config.hpp>
 #include <boost/url/rfc/relative_ref_rule.hpp>
 #include <boost/url/rfc/query_rule.hpp>
-#include <boost/url/rfc/detail/fragment_part_rule.hpp>
-#include <boost/url/rfc/detail/query_part_rule.hpp>
-#include <boost/url/rfc/detail/relative_part_rule.hpp>
+#include "detail/fragment_part_rule.hpp"
+#include "detail/query_part_rule.hpp"
+#include "detail/relative_part_rule.hpp"
 #include <boost/url/grammar/delim_rule.hpp>
 #include <boost/url/grammar/tuple_rule.hpp>
 #include <boost/url/grammar/optional_rule.hpp>
diff --git a/src/rfc/uri_rule.cpp b/src/rfc/uri_rule.cpp
index c348835fa..70fc48f18 100644
--- a/src/rfc/uri_rule.cpp
+++ b/src/rfc/uri_rule.cpp
@@ -13,10 +13,10 @@
 #include <boost/url/detail/config.hpp>
 #include <boost/url/rfc/uri_rule.hpp>
 #include <boost/url/rfc/query_rule.hpp>
-#include <boost/url/rfc/detail/fragment_part_rule.hpp>
-#include <boost/url/rfc/detail/hier_part_rule.hpp>
-#include <boost/url/rfc/detail/query_part_rule.hpp>
-#include <boost/url/rfc/detail/scheme_rule.hpp>
+#include "detail/fragment_part_rule.hpp"
+#include "detail/hier_part_rule.hpp"
+#include "detail/query_part_rule.hpp"
+#include "detail/scheme_rule.hpp"
 #include <boost/url/grammar/delim_rule.hpp>
 #include <boost/url/grammar/tuple_rule.hpp>
 #include <boost/url/grammar/optional_rule.hpp>
diff --git a/src/segments_encoded_ref.cpp b/src/segments_encoded_ref.cpp
index be61fd863..800cbe3b1 100644
--- a/src/segments_encoded_ref.cpp
+++ b/src/segments_encoded_ref.cpp
@@ -14,7 +14,7 @@
 #include <boost/url/detail/config.hpp>
 #include <boost/url/segments_encoded_ref.hpp>
 #include <boost/url/url.hpp>
-#include <boost/url/detail/path.hpp>
+#include "detail/path.hpp"
 
 namespace boost {
 namespace urls {
diff --git a/src/segments_ref.cpp b/src/segments_ref.cpp
index 80a0723a7..ea76a4824 100644
--- a/src/segments_ref.cpp
+++ b/src/segments_ref.cpp
@@ -14,7 +14,7 @@
 #include <boost/url/detail/config.hpp>
 #include <boost/url/segments_ref.hpp>
 #include <boost/url/url.hpp>
-#include <boost/url/detail/path.hpp>
+#include "detail/path.hpp"
 #include <boost/assert.hpp>
 
 namespace boost {
diff --git a/src/url_base.cpp b/src/url_base.cpp
index 0d33d3aca..e63135dbf 100644
--- a/src/url_base.cpp
+++ b/src/url_base.cpp
@@ -20,24 +20,24 @@
 #include <boost/url/url_view.hpp>
 #include <boost/url/detail/any_params_iter.hpp>
 #include <boost/url/detail/any_segments_iter.hpp>
-#include <boost/url/detail/decode.hpp>
+#include "detail/decode.hpp"
 #include <boost/url/detail/encode.hpp>
 #include <boost/url/detail/except.hpp>
-#include <boost/url/detail/move_chars.hpp>
-#include <boost/url/detail/normalize.hpp>
-#include <boost/url/detail/path.hpp>
-#include <boost/url/detail/print.hpp>
+#include "detail/normalize.hpp"
+#include "detail/path.hpp"
+#include "detail/print.hpp"
 #include <boost/url/grammar/ci_string.hpp>
 #include <boost/url/rfc/authority_rule.hpp>
 #include <boost/url/rfc/query_rule.hpp>
-#include <boost/url/rfc/detail/charsets.hpp>
-#include <boost/url/rfc/detail/host_rule.hpp>
-#include <boost/url/rfc/detail/ipvfuture_rule.hpp>
-#include <boost/url/rfc/detail/path_rules.hpp>
-#include <boost/url/rfc/detail/port_rule.hpp>
-#include <boost/url/rfc/detail/scheme_rule.hpp>
-#include <boost/url/rfc/detail/userinfo_rule.hpp>
+#include "rfc/detail/charsets.hpp"
+#include "rfc/detail/host_rule.hpp"
+#include "rfc/detail/ipvfuture_rule.hpp"
+#include "boost/url/rfc/detail/path_rules.hpp"
+#include "rfc/detail/port_rule.hpp"
+#include "rfc/detail/scheme_rule.hpp"
+#include "rfc/detail/userinfo_rule.hpp"
 #include <boost/url/grammar/parse.hpp>
+#include "detail/move_chars.hpp"
 #include <cstring>
 #include <iostream>
 #include <stdexcept>
diff --git a/src/url_view_base.cpp b/src/url_view_base.cpp
index 1a2d3aebc..b4c7dd652 100644
--- a/src/url_view_base.cpp
+++ b/src/url_view_base.cpp
@@ -15,8 +15,8 @@
 #include <boost/url/url_view_base.hpp>
 #include <boost/url/url_view.hpp>
 #include <boost/url/detail/except.hpp>
-#include <boost/url/detail/normalize.hpp>
-#include <boost/url/detail/over_allocator.hpp>
+#include "detail/normalize.hpp"
+#include "detail/over_allocator.hpp"
 
 namespace boost {
 namespace urls {
diff --git a/test/unit/url.cpp b/test/unit/url.cpp
index 03a2e97ab..f92e423f5 100644
--- a/test/unit/url.cpp
+++ b/test/unit/url.cpp
@@ -13,9 +13,6 @@
 
 #include <boost/url/encode.hpp>
 #include <boost/url/parse.hpp>
-#include <boost/url/url_view.hpp>
-#include <boost/url/rfc/detail/charsets.hpp>
-#include <boost/url/detail/normalize.hpp>
 
 #include "test_suite.hpp"
 
@@ -1149,15 +1146,6 @@ struct url_test
                 BOOST_TEST_EQ(u1.compare(u2), 0);
                 BOOST_TEST_EQ(u1, u2);
 
-                // remove_dot_segments
-                std::string str;
-                str.resize(p.size());
-                std::size_t n =
-                    urls::detail::remove_dot_segments(
-                    &str[0], &str[0] + str.size(), p);
-                str.resize(n);
-                BOOST_TEST_EQ(str, e);
-
                 // hash
                 std::hash<url_view> h;
                 BOOST_TEST_EQ(h(u1), h(u2));