diff --git a/doc/Jamfile b/doc/Jamfile
index 699edc0b..17d52c50 100644
--- a/doc/Jamfile
+++ b/doc/Jamfile
@@ -35,9 +35,7 @@ docca.reference reference.qbk
             BOOST_JSON_PUBLIC \\
             BOOST_SYMBOL_VISIBLE \\
             \"BOOST_JSON_INLINE_VARIABLE(v, t)=constexpr t v;\" \\
-            \"BOOST_JSON_NODISCARD=[[nodiscard]]\" \\
-            \"BOOST_JSON_NS_BEGIN=namespace boost { namespace json {\" \\
-            \"BOOST_JSON_NS_END=}}\""
+            \"BOOST_JSON_NODISCARD=[[nodiscard]]\""
         <doxygen:param>ABBREVIATE_BRIEF=
         <doxygen:param>INLINE_INHERITED_MEMB=YES
         <doxygen:param>JAVADOC_AUTOBRIEF=YES
diff --git a/include/boost/json/array.hpp b/include/boost/json/array.hpp
index 50da82aa..41f17667 100644
--- a/include/boost/json/array.hpp
+++ b/include/boost/json/array.hpp
@@ -19,7 +19,8 @@
 #include <initializer_list>
 #include <iterator>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 #ifndef BOOST_JSON_DOCS
 class value;
@@ -1739,7 +1740,8 @@ private:
     equal(array const& other) const noexcept;
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 // std::hash specialization
 #ifndef BOOST_JSON_DOCS
diff --git a/include/boost/json/basic_parser.hpp b/include/boost/json/basic_parser.hpp
index 773ca673..fb5d81df 100644
--- a/include/boost/json/basic_parser.hpp
+++ b/include/boost/json/basic_parser.hpp
@@ -31,7 +31,8 @@
     times down.
 */
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** An incremental SAX parser for serialized JSON.
 
@@ -722,6 +723,7 @@ public:
 /** @} */
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/basic_parser_impl.hpp b/include/boost/json/basic_parser_impl.hpp
index ef7604bd..f082dc58 100644
--- a/include/boost/json/basic_parser_impl.hpp
+++ b/include/boost/json/basic_parser_impl.hpp
@@ -42,7 +42,8 @@
 
 #ifndef BOOST_JSON_DOCS
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 inline
@@ -2791,7 +2792,8 @@ write_some(
 
 #endif
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #ifdef _MSC_VER
 #pragma warning(pop)
diff --git a/include/boost/json/conversion.hpp b/include/boost/json/conversion.hpp
index 197136f8..d0ff5494 100644
--- a/include/boost/json/conversion.hpp
+++ b/include/boost/json/conversion.hpp
@@ -14,7 +14,8 @@
 
 #include <type_traits>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Customization point tag.
 
@@ -322,7 +323,8 @@ struct is_described_class;
 template<class T>
 struct is_described_enum;
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #include <boost/json/impl/conversion.hpp>
 
diff --git a/include/boost/json/detail/align.hpp b/include/boost/json/detail/align.hpp
index dc723f0c..5df5a89b 100644
--- a/include/boost/json/detail/align.hpp
+++ b/include/boost/json/detail/align.hpp
@@ -12,7 +12,8 @@
 
 #include <boost/align/align.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 using boost::alignment::align;
@@ -59,6 +60,7 @@ struct max_align_t
 };
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/array.hpp b/include/boost/json/detail/array.hpp
index c283b9c4..be0c5bd3 100644
--- a/include/boost/json/detail/array.hpp
+++ b/include/boost/json/detail/array.hpp
@@ -14,7 +14,8 @@
 #include <boost/json/storage_ptr.hpp>
 #include <cstddef>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class value;
 
@@ -68,7 +69,8 @@ public:
 
 } // detail
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 // includes are at the bottom of <boost/json/value.hpp>
 
diff --git a/include/boost/json/detail/buffer.hpp b/include/boost/json/detail/buffer.hpp
index bfac7de0..6e7bd883 100644
--- a/include/boost/json/detail/buffer.hpp
+++ b/include/boost/json/detail/buffer.hpp
@@ -14,7 +14,8 @@
 #include <boost/json/string_view.hpp>
 #include <cstring>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 // A simple string-like temporary static buffer
@@ -139,6 +140,7 @@ private:
 };
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/config.hpp b/include/boost/json/detail/config.hpp
index f7bb4a1f..5b6aace3 100644
--- a/include/boost/json/detail/config.hpp
+++ b/include/boost/json/detail/config.hpp
@@ -134,13 +134,6 @@
 #define BOOST_SYMBOL_VISIBLE
 #endif
 
-#if ! defined(BOOST_JSON_DOCS)
-# define BOOST_JSON_NS_BEGIN \
-    namespace boost { \
-    namespace json {
-# define BOOST_JSON_NS_END } }
-#endif
-
 #if defined(BOOST_JSON_DOCS)
 # define BOOST_JSON_DECL
 #else
@@ -269,7 +262,8 @@
 # endif
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 template<class...>
@@ -320,6 +314,7 @@ constexpr T static_const<T>::value;
     } struct _unused_ ## name ## _semicolon_bait_
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/default_resource.hpp b/include/boost/json/detail/default_resource.hpp
index 2233c246..5ece9f94 100644
--- a/include/boost/json/detail/default_resource.hpp
+++ b/include/boost/json/detail/default_resource.hpp
@@ -13,7 +13,8 @@
 #include <boost/json/detail/config.hpp>
 #include <new>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 #ifdef _MSC_VER
@@ -94,6 +95,7 @@ union default_resource::
 };
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/digest.hpp b/include/boost/json/detail/digest.hpp
index 0b28af15..2d9465c0 100644
--- a/include/boost/json/detail/digest.hpp
+++ b/include/boost/json/detail/digest.hpp
@@ -10,7 +10,8 @@
 #ifndef BOOST_JSON_DETAIL_DIGEST_HPP
 #define BOOST_JSON_DETAIL_DIGEST_HPP
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 // Calculate salted digest of string
@@ -35,6 +36,7 @@ digest(
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/except.hpp b/include/boost/json/detail/except.hpp
index 54c13829..9899b2d1 100644
--- a/include/boost/json/detail/except.hpp
+++ b/include/boost/json/detail/except.hpp
@@ -12,7 +12,8 @@
 
 #include <boost/json/error.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 #define BOOST_JSON_FAIL(ec, e) \
@@ -26,6 +27,7 @@ BOOST_JSON_DECL void BOOST_NORETURN throw_out_of_range(source_location const& lo
 BOOST_JSON_DECL void BOOST_NORETURN throw_system_error(error_code const& ec, source_location const& loc);
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/format.hpp b/include/boost/json/detail/format.hpp
index 43958f0a..2be79556 100644
--- a/include/boost/json/detail/format.hpp
+++ b/include/boost/json/detail/format.hpp
@@ -10,7 +10,8 @@
 #ifndef BOOST_JSON_DETAIL_FORMAT_HPP
 #define BOOST_JSON_DETAIL_FORMAT_HPP
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 int constexpr max_number_chars =
@@ -37,6 +38,7 @@ format_double(
     char* dest, double d) noexcept;
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/handler.hpp b/include/boost/json/detail/handler.hpp
index 6880d723..168eec29 100644
--- a/include/boost/json/detail/handler.hpp
+++ b/include/boost/json/detail/handler.hpp
@@ -17,7 +17,8 @@
 #include <boost/json/string.hpp>
 #include <boost/json/value_stack.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 struct handler
@@ -61,6 +62,7 @@ struct handler
 };
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/impl/array.hpp b/include/boost/json/detail/impl/array.hpp
index 1d98ee92..77524fcc 100644
--- a/include/boost/json/detail/impl/array.hpp
+++ b/include/boost/json/detail/impl/array.hpp
@@ -10,7 +10,8 @@
 #ifndef BOOST_JSON_DETAIL_IMPL_ARRAY_HPP
 #define BOOST_JSON_DETAIL_IMPL_ARRAY_HPP
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 unchecked_array::
@@ -36,6 +37,7 @@ relocate(value* dest) noexcept
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/impl/default_resource.ipp b/include/boost/json/detail/impl/default_resource.ipp
index dff0497b..4eee8304 100644
--- a/include/boost/json/detail/impl/default_resource.ipp
+++ b/include/boost/json/detail/impl/default_resource.ipp
@@ -12,7 +12,8 @@
 
 #include <boost/json/detail/default_resource.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 #ifndef BOOST_JSON_WEAK_CONSTINIT
@@ -61,6 +62,7 @@ do_is_equal(
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/impl/except.ipp b/include/boost/json/detail/impl/except.ipp
index 4f3241a6..44ccaaa5 100644
--- a/include/boost/json/detail/impl/except.ipp
+++ b/include/boost/json/detail/impl/except.ipp
@@ -15,7 +15,8 @@
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 namespace detail {
 
@@ -69,6 +70,7 @@ throw_system_error(
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/impl/format.ipp b/include/boost/json/detail/impl/format.ipp
index 0471024f..3ee68f49 100644
--- a/include/boost/json/detail/impl/format.ipp
+++ b/include/boost/json/detail/impl/format.ipp
@@ -14,7 +14,8 @@
 #include <boost/json/detail/ryu/ryu.hpp>
 #include <cstring>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 /*  Reference work:
@@ -118,6 +119,7 @@ format_double(
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/impl/handler.ipp b/include/boost/json/detail/impl/handler.ipp
index 20b40efa..a377d642 100644
--- a/include/boost/json/detail/impl/handler.ipp
+++ b/include/boost/json/detail/impl/handler.ipp
@@ -13,7 +13,8 @@
 #include <boost/json/detail/handler.hpp>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 template<class... Args>
@@ -197,6 +198,7 @@ on_comment(
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/impl/shared_resource.ipp b/include/boost/json/detail/impl/shared_resource.ipp
index 386a247e..d7282c8c 100644
--- a/include/boost/json/detail/impl/shared_resource.ipp
+++ b/include/boost/json/detail/impl/shared_resource.ipp
@@ -12,7 +12,8 @@
 
 #include <boost/json/detail/shared_resource.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 // these are here so that ~memory_resource
@@ -30,6 +31,7 @@ shared_resource::
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/impl/stack.ipp b/include/boost/json/detail/impl/stack.ipp
index bf6d922f..cca46cef 100644
--- a/include/boost/json/detail/impl/stack.ipp
+++ b/include/boost/json/detail/impl/stack.ipp
@@ -12,7 +12,8 @@
 
 #include <boost/json/detail/stack.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 stack::
@@ -42,6 +43,7 @@ reserve(std::size_t n)
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/impl/string_impl.ipp b/include/boost/json/detail/impl/string_impl.ipp
index 1bbc719b..ac483be2 100644
--- a/include/boost/json/detail/impl/string_impl.ipp
+++ b/include/boost/json/detail/impl/string_impl.ipp
@@ -16,7 +16,8 @@
 #include <cstring>
 #include <functional>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 inline
@@ -466,6 +467,7 @@ shrink_to_fit(
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/object.hpp b/include/boost/json/detail/object.hpp
index 73c1956a..b4195c08 100644
--- a/include/boost/json/detail/object.hpp
+++ b/include/boost/json/detail/object.hpp
@@ -14,7 +14,8 @@
 #include <boost/json/string_view.hpp>
 #include <cstdlib>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class object;
 class value;
@@ -89,6 +90,7 @@ find_in_object<string_view>(
     string_view key) noexcept;
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/ryu/detail/common.hpp b/include/boost/json/detail/ryu/detail/common.hpp
index a350664a..9ac0e308 100644
--- a/include/boost/json/detail/ryu/detail/common.hpp
+++ b/include/boost/json/detail/ryu/detail/common.hpp
@@ -25,7 +25,8 @@
 #include <boost/json/detail/config.hpp>
 #include <string.h>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -113,6 +114,7 @@ inline uint64_t double_to_bits(const double d) {
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/ryu/detail/d2s.hpp b/include/boost/json/detail/ryu/detail/d2s.hpp
index 865522e5..28f8587e 100644
--- a/include/boost/json/detail/ryu/detail/d2s.hpp
+++ b/include/boost/json/detail/ryu/detail/d2s.hpp
@@ -35,7 +35,8 @@ typedef __uint128_t uint128_t;
 #include <boost/json/detail/ryu/detail/d2s_intrinsics.hpp>
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -257,6 +258,7 @@ double_computeInvPow5(
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/ryu/detail/d2s_full_table.hpp b/include/boost/json/detail/ryu/detail/d2s_full_table.hpp
index 2fbb72ff..4cbec259 100644
--- a/include/boost/json/detail/ryu/detail/d2s_full_table.hpp
+++ b/include/boost/json/detail/ryu/detail/d2s_full_table.hpp
@@ -24,7 +24,8 @@
 
 #include <boost/json/detail/config.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -358,6 +359,7 @@ std::uint64_t const
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/ryu/detail/d2s_intrinsics.hpp b/include/boost/json/detail/ryu/detail/d2s_intrinsics.hpp
index 68068611..04eb0af8 100644
--- a/include/boost/json/detail/ryu/detail/d2s_intrinsics.hpp
+++ b/include/boost/json/detail/ryu/detail/d2s_intrinsics.hpp
@@ -31,7 +31,8 @@
 #include <intrin.h>
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -224,6 +225,7 @@ inline bool multipleOfPowerOf2(const uint64_t value, const uint32_t p) {
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/ryu/detail/digit_table.hpp b/include/boost/json/detail/ryu/detail/digit_table.hpp
index 8be048fe..f1bb89cc 100644
--- a/include/boost/json/detail/ryu/detail/digit_table.hpp
+++ b/include/boost/json/detail/ryu/detail/digit_table.hpp
@@ -24,7 +24,8 @@
 
 #include <boost/json/detail/config.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -54,6 +55,7 @@ char const
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/ryu/impl/d2s.ipp b/include/boost/json/detail/ryu/impl/d2s.ipp
index cc07377d..9dbc0e7e 100644
--- a/include/boost/json/detail/ryu/impl/d2s.ipp
+++ b/include/boost/json/detail/ryu/impl/d2s.ipp
@@ -55,7 +55,8 @@
 #include <boost/json/detail/ryu/detail/d2s.hpp>
 #include <boost/json/detail/ryu/detail/d2s_intrinsics.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -719,6 +720,7 @@ d2s_buffered_n(
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/ryu/ryu.hpp b/include/boost/json/detail/ryu/ryu.hpp
index a9cfd8e3..c4942193 100644
--- a/include/boost/json/detail/ryu/ryu.hpp
+++ b/include/boost/json/detail/ryu/ryu.hpp
@@ -24,7 +24,8 @@
 
 #include <boost/json/detail/config.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -35,6 +36,7 @@ int d2s_buffered_n(double f, char* result) noexcept;
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/shared_resource.hpp b/include/boost/json/detail/shared_resource.hpp
index c39ff87b..31826f9b 100644
--- a/include/boost/json/detail/shared_resource.hpp
+++ b/include/boost/json/detail/shared_resource.hpp
@@ -14,7 +14,8 @@
 #include <atomic>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 #ifdef _MSC_VER
@@ -80,6 +81,7 @@ public:
 #endif
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/sse2.hpp b/include/boost/json/detail/sse2.hpp
index d0e20f80..d8d88f5c 100644
--- a/include/boost/json/detail/sse2.hpp
+++ b/include/boost/json/detail/sse2.hpp
@@ -24,7 +24,8 @@
 # endif
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 #ifdef BOOST_JSON_USE_SSE2
@@ -542,6 +543,7 @@ inline const char* count_whitespace( char const* p, const char* end ) noexcept
 #endif
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/stack.hpp b/include/boost/json/detail/stack.hpp
index a33054a6..3d64ab94 100644
--- a/include/boost/json/detail/stack.hpp
+++ b/include/boost/json/detail/stack.hpp
@@ -14,7 +14,8 @@
 #include <boost/json/storage_ptr.hpp>
 #include <cstring>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 class stack
@@ -94,6 +95,7 @@ public:
 };
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/stream.hpp b/include/boost/json/detail/stream.hpp
index ee5c12fe..1e24ef23 100644
--- a/include/boost/json/detail/stream.hpp
+++ b/include/boost/json/detail/stream.hpp
@@ -10,7 +10,8 @@
 #ifndef BOOST_JSON_DETAIL_STREAM_HPP
 #define BOOST_JSON_DETAIL_STREAM_HPP
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 class const_stream
@@ -340,6 +341,7 @@ public:
 };
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/string_impl.hpp b/include/boost/json/detail/string_impl.hpp
index 450c6ecf..80efb5a1 100644
--- a/include/boost/json/detail/string_impl.hpp
+++ b/include/boost/json/detail/string_impl.hpp
@@ -18,7 +18,8 @@
 #include <algorithm>
 #include <iterator>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class value;
 class string;
@@ -378,6 +379,7 @@ using string_comp_op_requirement
         bool>::type;
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/utf8.hpp b/include/boost/json/detail/utf8.hpp
index 4018c838..e3ed2cad 100644
--- a/include/boost/json/detail/utf8.hpp
+++ b/include/boost/json/detail/utf8.hpp
@@ -16,7 +16,8 @@
 #include <cstring>
 #include <cstdint>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 template<int N>
@@ -192,6 +193,7 @@ public:
 };
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/value.hpp b/include/boost/json/detail/value.hpp
index 4aaa0704..cc300185 100644
--- a/include/boost/json/detail/value.hpp
+++ b/include/boost/json/detail/value.hpp
@@ -17,7 +17,8 @@
 #include <new>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 struct key_t
@@ -276,6 +277,7 @@ std::size_t
 hash_value_impl( value const& jv ) noexcept;
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/value_from.hpp b/include/boost/json/detail/value_from.hpp
index 4fe74b5f..7dd2e205 100644
--- a/include/boost/json/detail/value_from.hpp
+++ b/include/boost/json/detail/value_from.hpp
@@ -20,7 +20,8 @@
 # include <optional>
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 namespace detail {
 
@@ -296,6 +297,7 @@ tag_invoke(
 }
 #endif // BOOST_NO_CXX17_HDR_VARIANT
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/detail/value_to.hpp b/include/boost/json/detail/value_to.hpp
index ac312d27..d9284c1f 100644
--- a/include/boost/json/detail/value_to.hpp
+++ b/include/boost/json/detail/value_to.hpp
@@ -20,7 +20,8 @@
 # include <optional>
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 template<class T, class U,
     typename std::enable_if<
@@ -761,6 +762,7 @@ tag_invoke(
 }
 #endif // BOOST_NO_CXX17_HDR_VARIANT
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/error.hpp b/include/boost/json/error.hpp
index 6b19ee03..3915dd1e 100644
--- a/include/boost/json/error.hpp
+++ b/include/boost/json/error.hpp
@@ -13,7 +13,8 @@
 #include <boost/json/detail/config.hpp>
 #include <boost/json/system_error.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Error codes returned by JSON operations
 
@@ -156,7 +157,8 @@ enum class condition
     generic_error,
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #include <boost/json/impl/error.hpp>
 
diff --git a/include/boost/json/fwd.hpp b/include/boost/json/fwd.hpp
index 3679506d..b99f322c 100644
--- a/include/boost/json/fwd.hpp
+++ b/include/boost/json/fwd.hpp
@@ -13,7 +13,8 @@
 
 #include <boost/json/detail/config.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 // Forward declarations
 
@@ -75,6 +76,7 @@ result_from_errno( int e, boost::source_location const* loc ) noexcept;
 
 #endif
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/impl/array.hpp b/include/boost/json/impl/array.hpp
index 145a84af..360674be 100644
--- a/include/boost/json/impl/array.hpp
+++ b/include/boost/json/impl/array.hpp
@@ -16,7 +16,8 @@
 #include <stdexcept>
 #include <type_traits>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -583,6 +584,7 @@ insert(
     return r.commit();
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/impl/array.ipp b/include/boost/json/impl/array.ipp
index 4d209c68..eea66b80 100644
--- a/include/boost/json/impl/array.ipp
+++ b/include/boost/json/impl/array.ipp
@@ -19,7 +19,8 @@
 #include <new>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -751,7 +752,8 @@ equal(
     return true;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 //----------------------------------------------------------
 //
diff --git a/include/boost/json/impl/conversion.hpp b/include/boost/json/impl/conversion.hpp
index f31fb094..277c7c2b 100644
--- a/include/boost/json/impl/conversion.hpp
+++ b/include/boost/json/impl/conversion.hpp
@@ -26,7 +26,8 @@
 # include <variant>
 #endif // BOOST_NO_CXX17_HDR_VARIANT
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 #ifdef __cpp_lib_nonmember_container_access
@@ -321,6 +322,7 @@ struct is_described_enum
     : describe::has_describe_enumerators<T>
 { };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif // BOOST_JSON_IMPL_CONVERSION_HPP
diff --git a/include/boost/json/impl/error.hpp b/include/boost/json/impl/error.hpp
index 9ee23310..3c6f153a 100644
--- a/include/boost/json/impl/error.hpp
+++ b/include/boost/json/impl/error.hpp
@@ -40,7 +40,8 @@ struct is_error_condition_enum< ::boost::json::condition >
 };
 } // std
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_JSON_DECL
 error_code
@@ -50,6 +51,7 @@ BOOST_JSON_DECL
 error_condition
 make_error_condition(condition c);
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/impl/error.ipp b/include/boost/json/impl/error.ipp
index 09d57fcf..7a6630b4 100644
--- a/include/boost/json/impl/error.ipp
+++ b/include/boost/json/impl/error.ipp
@@ -12,7 +12,8 @@
 
 #include <boost/json/error.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 error_code
 make_error_code(error e)
@@ -168,6 +169,7 @@ make_error_condition(condition c)
         std::underlying_type<condition>::type>(c), cat};
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/impl/kind.ipp b/include/boost/json/impl/kind.ipp
index 07fd9dea..79ff27cc 100644
--- a/include/boost/json/impl/kind.ipp
+++ b/include/boost/json/impl/kind.ipp
@@ -13,7 +13,8 @@
 #include <boost/json/kind.hpp>
 #include <ostream>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 string_view
 to_string(kind k) noexcept
@@ -39,6 +40,7 @@ operator<<(std::ostream& os, kind k)
     return os;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/impl/monotonic_resource.ipp b/include/boost/json/impl/monotonic_resource.ipp
index d9f2d8a5..b57523ea 100644
--- a/include/boost/json/impl/monotonic_resource.ipp
+++ b/include/boost/json/impl/monotonic_resource.ipp
@@ -17,7 +17,8 @@
 
 #include <memory>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 struct alignas(detail::max_align_t)
     monotonic_resource::block : block_base
@@ -166,6 +167,7 @@ do_is_equal(
     return this == &mr;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/impl/null_resource.ipp b/include/boost/json/impl/null_resource.ipp
index 5043e81f..1526b53f 100644
--- a/include/boost/json/impl/null_resource.ipp
+++ b/include/boost/json/impl/null_resource.ipp
@@ -13,7 +13,8 @@
 #include <boost/json/null_resource.hpp>
 #include <boost/json/detail/except.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 namespace detail {
 
@@ -96,6 +97,7 @@ get_null_resource() noexcept
     return &mr;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/impl/object.hpp b/include/boost/json/impl/object.hpp
index 628f4479..e0ec4c2f 100644
--- a/include/boost/json/impl/object.hpp
+++ b/include/boost/json/impl/object.hpp
@@ -16,7 +16,8 @@
 #include <type_traits>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 namespace detail {
 
@@ -533,6 +534,7 @@ unchecked_object::
 
 } // detail
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/impl/object.ipp b/include/boost/json/impl/object.ipp
index d429b372..2ece4af3 100644
--- a/include/boost/json/impl/object.ipp
+++ b/include/boost/json/impl/object.ipp
@@ -22,7 +22,8 @@
 #include <stdexcept>
 #include <type_traits>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 template<class CharRange>
@@ -889,7 +890,8 @@ reindex_relocate(
         index_t>(dst - begin());
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 //----------------------------------------------------------
 //
diff --git a/include/boost/json/impl/parse.ipp b/include/boost/json/impl/parse.ipp
index 4533f2cf..4891a549 100644
--- a/include/boost/json/impl/parse.ipp
+++ b/include/boost/json/impl/parse.ipp
@@ -17,7 +17,8 @@
 
 #include <istream>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 value
 parse(
@@ -131,6 +132,7 @@ parse(
     return jv;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/impl/parser.ipp b/include/boost/json/impl/parser.ipp
index 6c17bd42..469c9077 100644
--- a/include/boost/json/impl/parser.ipp
+++ b/include/boost/json/impl/parser.ipp
@@ -17,7 +17,8 @@
 #include <stdexcept>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 parser::
 parser(
@@ -161,6 +162,7 @@ release()
     return p_.handler().st.release();
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/impl/pointer.ipp b/include/boost/json/impl/pointer.ipp
index 794f2afa..fcfc944e 100644
--- a/include/boost/json/impl/pointer.ipp
+++ b/include/boost/json/impl/pointer.ipp
@@ -12,7 +12,8 @@
 
 #include <boost/json/value.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 namespace detail {
 
@@ -494,6 +495,7 @@ value::set_at_pointer(
     return *result;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif // BOOST_JSON_IMPL_POINTER_IPP
diff --git a/include/boost/json/impl/serialize.ipp b/include/boost/json/impl/serialize.ipp
index a563053b..f88f6a42 100644
--- a/include/boost/json/impl/serialize.ipp
+++ b/include/boost/json/impl/serialize.ipp
@@ -14,7 +14,8 @@
 #include <boost/json/serializer.hpp>
 #include <ostream>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 static
 void
@@ -191,6 +192,7 @@ operator<<(
     return os;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/impl/serializer.ipp b/include/boost/json/impl/serializer.ipp
index c70a421a..00221989 100644
--- a/include/boost/json/impl/serializer.ipp
+++ b/include/boost/json/impl/serializer.ipp
@@ -20,7 +20,8 @@
 #pragma warning(disable: 4127) // conditional expression is constant
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 enum class serializer::state : char
 {
@@ -813,7 +814,8 @@ read(char* dest, std::size_t size)
     return read_some(dest, size);
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #ifdef _MSC_VER
 #pragma warning(pop)
diff --git a/include/boost/json/impl/static_resource.ipp b/include/boost/json/impl/static_resource.ipp
index a11aef88..e59136cc 100644
--- a/include/boost/json/impl/static_resource.ipp
+++ b/include/boost/json/impl/static_resource.ipp
@@ -15,7 +15,8 @@
 #include <boost/json/detail/except.hpp>
 #include <memory>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 static_resource::
 ~static_resource() noexcept = default;
@@ -73,6 +74,7 @@ do_is_equal(
     return this == &mr;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/impl/stream_parser.ipp b/include/boost/json/impl/stream_parser.ipp
index b5b798ac..448bf72f 100644
--- a/include/boost/json/impl/stream_parser.ipp
+++ b/include/boost/json/impl/stream_parser.ipp
@@ -17,7 +17,8 @@
 #include <stdexcept>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 stream_parser::
 stream_parser(
@@ -178,6 +179,7 @@ release()
     return p_.handler().st.release();
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/impl/string.hpp b/include/boost/json/impl/string.hpp
index 944f67c4..1c4ddbdf 100644
--- a/include/boost/json/impl/string.hpp
+++ b/include/boost/json/impl/string.hpp
@@ -12,7 +12,8 @@
 
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 string::
 string(
@@ -237,6 +238,7 @@ append(
         tmp.data(), tmp.size());
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/impl/string.ipp b/include/boost/json/impl/string.ipp
index 07b97518..4fc3aef2 100644
--- a/include/boost/json/impl/string.ipp
+++ b/include/boost/json/impl/string.ipp
@@ -18,7 +18,8 @@
 #include <string>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 //
@@ -413,7 +414,8 @@ reserve_impl(size_type new_cap)
     }
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 //----------------------------------------------------------
 
diff --git a/include/boost/json/impl/value.hpp b/include/boost/json/impl/value.hpp
index a10d8376..92e14a29 100644
--- a/include/boost/json/impl/value.hpp
+++ b/include/boost/json/impl/value.hpp
@@ -10,7 +10,8 @@
 #ifndef BOOST_JSON_IMPL_VALUE_HPP
 #define BOOST_JSON_IMPL_VALUE_HPP
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 value&
 value::at_pointer(string_view ptr) &
@@ -25,6 +26,7 @@ value::at_pointer(string_view ptr) &&
     return std::move( this->at_pointer(ptr) );
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif // BOOST_JSON_IMPL_VALUE_HPP
diff --git a/include/boost/json/impl/value.ipp b/include/boost/json/impl/value.ipp
index 17cffff4..7460c028 100644
--- a/include/boost/json/impl/value.ipp
+++ b/include/boost/json/impl/value.ipp
@@ -19,7 +19,8 @@
 #include <new>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 namespace
 {
@@ -620,7 +621,8 @@ hash_value_impl( value const& jv ) noexcept
 }
 
 } // namespace detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 //----------------------------------------------------------
 //
diff --git a/include/boost/json/impl/value_ref.hpp b/include/boost/json/impl/value_ref.hpp
index 43a6757d..20634cfd 100644
--- a/include/boost/json/impl/value_ref.hpp
+++ b/include/boost/json/impl/value_ref.hpp
@@ -10,7 +10,8 @@
 #ifndef BOOST_JSON_IMPL_VALUE_REF_HPP
 #define BOOST_JSON_IMPL_VALUE_REF_HPP
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 template<class T>
 value
@@ -51,6 +52,7 @@ from_rvalue(
         std::move(sp));
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/impl/value_ref.ipp b/include/boost/json/impl/value_ref.ipp
index f3e15adb..99e75af0 100644
--- a/include/boost/json/impl/value_ref.ipp
+++ b/include/boost/json/impl/value_ref.ipp
@@ -14,7 +14,8 @@
 #include <boost/json/array.hpp>
 #include <boost/json/value.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 value_ref::
 operator
@@ -182,6 +183,7 @@ write_array(
     u.pos = nullptr;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/impl/value_stack.ipp b/include/boost/json/impl/value_stack.ipp
index 1e23b004..33575da0 100644
--- a/include/boost/json/impl/value_stack.ipp
+++ b/include/boost/json/impl/value_stack.ipp
@@ -15,7 +15,8 @@
 #include <stdexcept>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //--------------------------------------
 
@@ -467,6 +468,7 @@ push_null()
     st_.push(nullptr, sp_);
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/impl/visit.hpp b/include/boost/json/impl/visit.hpp
index 546790aa..f647879b 100644
--- a/include/boost/json/impl/visit.hpp
+++ b/include/boost/json/impl/visit.hpp
@@ -10,7 +10,8 @@
 #ifndef BOOST_JSON_IMPL_VISIT_HPP
 #define BOOST_JSON_IMPL_VISIT_HPP
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 template<class Visitor>
 auto
@@ -54,6 +55,7 @@ visit(
     }
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/kind.hpp b/include/boost/json/kind.hpp
index eac37b0f..dd7ce16c 100644
--- a/include/boost/json/kind.hpp
+++ b/include/boost/json/kind.hpp
@@ -14,7 +14,8 @@
 #include <boost/json/string_view.hpp>
 #include <iosfwd>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Constants for identifying the type of a value
 
@@ -158,6 +159,7 @@ BOOST_JSON_INLINE_VARIABLE(object_kind, object_kind_t);
 */
 BOOST_JSON_INLINE_VARIABLE(string_kind, string_kind_t);
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/memory_resource.hpp b/include/boost/json/memory_resource.hpp
index 4306b83d..a2301ad5 100644
--- a/include/boost/json/memory_resource.hpp
+++ b/include/boost/json/memory_resource.hpp
@@ -15,7 +15,8 @@
 #include <boost/container/pmr/memory_resource.hpp>
 #include <boost/container/pmr/polymorphic_allocator.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 #ifdef BOOST_JSON_DOCS
 
@@ -101,6 +102,7 @@ struct is_deallocate_trivial
     static constexpr bool value = false;
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/monotonic_resource.hpp b/include/boost/json/monotonic_resource.hpp
index 3e88dae9..e13d2302 100644
--- a/include/boost/json/monotonic_resource.hpp
+++ b/include/boost/json/monotonic_resource.hpp
@@ -17,7 +17,8 @@
 #include <cstddef>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 #ifdef _MSC_VER
 #pragma warning(push)
@@ -345,6 +346,7 @@ struct is_deallocate_trivial<
     static constexpr bool value = true;
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/null_resource.hpp b/include/boost/json/null_resource.hpp
index 80c8b305..80efb926 100644
--- a/include/boost/json/null_resource.hpp
+++ b/include/boost/json/null_resource.hpp
@@ -13,7 +13,8 @@
 #include <boost/json/detail/config.hpp>
 #include <boost/json/memory_resource.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Return a pointer to the null resource.
 
@@ -30,6 +31,7 @@ BOOST_JSON_DECL
 memory_resource*
 get_null_resource() noexcept;
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/object.hpp b/include/boost/json/object.hpp
index cd028ea2..08ffe71c 100644
--- a/include/boost/json/object.hpp
+++ b/include/boost/json/object.hpp
@@ -23,7 +23,8 @@
 #include <type_traits>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class value;
 class value_ref;
@@ -1648,7 +1649,8 @@ private:
         key_value_pair* dst) noexcept;
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #ifndef BOOST_JSON_DOCS
 // boost::hash trait
diff --git a/include/boost/json/parse.hpp b/include/boost/json/parse.hpp
index 26f09096..1d4856e6 100644
--- a/include/boost/json/parse.hpp
+++ b/include/boost/json/parse.hpp
@@ -18,7 +18,8 @@
 #include <boost/json/string_view.hpp>
 #include <boost/json/value.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Return parsed JSON as a @ref value.
 
@@ -199,6 +200,7 @@ parse(
     storage_ptr sp = {},
     parse_options const& opt = {});
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/parse_options.hpp b/include/boost/json/parse_options.hpp
index 2b3fee18..c34cd2ab 100644
--- a/include/boost/json/parse_options.hpp
+++ b/include/boost/json/parse_options.hpp
@@ -12,7 +12,8 @@
 
 #include <boost/json/detail/config.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Parser options
 
@@ -78,6 +79,7 @@ struct parse_options
     bool allow_invalid_utf8 = false;
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/parser.hpp b/include/boost/json/parser.hpp
index d6de0703..b5fdf428 100644
--- a/include/boost/json/parser.hpp
+++ b/include/boost/json/parser.hpp
@@ -18,7 +18,8 @@
 #include <type_traits>
 #include <cstddef>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -822,6 +823,7 @@ public:
     release();
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/serialize.hpp b/include/boost/json/serialize.hpp
index e6c8597e..99c6f337 100644
--- a/include/boost/json/serialize.hpp
+++ b/include/boost/json/serialize.hpp
@@ -15,7 +15,8 @@
 #include <iosfwd>
 #include <string>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Return a string representing a serialized element.
 
@@ -55,6 +56,7 @@ std::string
 serialize(string_view t);
 /** @} */
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/serializer.hpp b/include/boost/json/serializer.hpp
index 1c095101..808000c4 100644
--- a/include/boost/json/serializer.hpp
+++ b/include/boost/json/serializer.hpp
@@ -16,7 +16,8 @@
 #include <boost/json/detail/stack.hpp>
 #include <boost/json/detail/stream.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** A serializer for JSON.
 
@@ -285,6 +286,7 @@ public:
 #endif
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/set_pointer_options.hpp b/include/boost/json/set_pointer_options.hpp
index c1fd054e..38c08a08 100644
--- a/include/boost/json/set_pointer_options.hpp
+++ b/include/boost/json/set_pointer_options.hpp
@@ -12,7 +12,8 @@
 
 #include <boost/json/detail/config.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Options for @ref value::set_at_pointer
  *
@@ -59,7 +60,7 @@ struct set_pointer_options
     std::size_t max_created_elements = 1;
 };
 
-
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif // BOOST_JSON_SET_POINTER_OPTIONS_HPP
diff --git a/include/boost/json/static_resource.hpp b/include/boost/json/static_resource.hpp
index 126dd615..8f0face6 100644
--- a/include/boost/json/static_resource.hpp
+++ b/include/boost/json/static_resource.hpp
@@ -14,7 +14,8 @@
 #include <boost/json/memory_resource.hpp>
 #include <cstddef>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 #ifdef _MSC_VER
 #pragma warning(push)
@@ -238,6 +239,7 @@ struct is_deallocate_trivial<
     static constexpr bool value = true;
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/storage_ptr.hpp b/include/boost/json/storage_ptr.hpp
index 36755525..9d93c784 100644
--- a/include/boost/json/storage_ptr.hpp
+++ b/include/boost/json/storage_ptr.hpp
@@ -19,7 +19,8 @@
 #include <type_traits>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** A smart pointer to a @ref memory_resource
 
@@ -533,6 +534,7 @@ operator!=(
     return lhs.get() != rhs.get();
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/stream_parser.hpp b/include/boost/json/stream_parser.hpp
index 669a361b..bc7d33b9 100644
--- a/include/boost/json/stream_parser.hpp
+++ b/include/boost/json/stream_parser.hpp
@@ -19,7 +19,8 @@
 #include <type_traits>
 #include <cstddef>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -1026,6 +1027,7 @@ public:
     release();
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/string.hpp b/include/boost/json/string.hpp
index 6c047b5c..9a3aee4c 100644
--- a/include/boost/json/string.hpp
+++ b/include/boost/json/string.hpp
@@ -29,7 +29,8 @@
 #include <type_traits>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class value;
 
@@ -2902,7 +2903,8 @@ operator>(T const& lhs, U const& rhs) noexcept
     return detail::to_string_view(lhs) > detail::to_string_view(rhs);
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 // std::hash specialization
 #ifndef BOOST_JSON_DOCS
diff --git a/include/boost/json/string_view.hpp b/include/boost/json/string_view.hpp
index 114ab07a..d3d839cf 100644
--- a/include/boost/json/string_view.hpp
+++ b/include/boost/json/string_view.hpp
@@ -17,7 +17,8 @@
 # include <string_view>
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 #ifdef BOOST_JSON_DOCS
 
@@ -46,6 +47,7 @@ using is_string_viewish = typename std::enable_if<
 
 } // detail
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/system_error.hpp b/include/boost/json/system_error.hpp
index 5becc5f5..a08cd7dc 100644
--- a/include/boost/json/system_error.hpp
+++ b/include/boost/json/system_error.hpp
@@ -18,7 +18,8 @@
 #include <boost/system/result.hpp>
 #include <boost/system/system_error.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /// The type of error code used by the library.
 using error_code = boost::system::error_code;
@@ -218,6 +219,7 @@ result_from_errno(int e, boost::source_location const* loc) noexcept
     return {system::in_place_error, ec};
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/value.hpp b/include/boost/json/value.hpp
index 0ad9919b..3ca7e9b0 100644
--- a/include/boost/json/value.hpp
+++ b/include/boost/json/value.hpp
@@ -32,7 +32,8 @@
 #include <type_traits>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -4191,7 +4192,8 @@ get<1>(key_value_pair&& kvp) noexcept
 
 #endif
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #ifdef __clang__
 # pragma clang diagnostic push
diff --git a/include/boost/json/value_from.hpp b/include/boost/json/value_from.hpp
index 4cbec6e7..e3616568 100644
--- a/include/boost/json/value_from.hpp
+++ b/include/boost/json/value_from.hpp
@@ -14,7 +14,8 @@
 
 #include <boost/json/detail/value_from.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Convert an object of type `T` to @ref value.
 
@@ -140,6 +141,7 @@ using has_value_from = detail::can_convert<
     detail::remove_cvref<T>, detail::value_from_conversion>;
 #endif
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/value_ref.hpp b/include/boost/json/value_ref.hpp
index baa2668b..d663c121 100644
--- a/include/boost/json/value_ref.hpp
+++ b/include/boost/json/value_ref.hpp
@@ -17,7 +17,8 @@
 #include <type_traits>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 #ifndef BOOST_JSON_DOCS
 class value;
@@ -464,7 +465,8 @@ private:
         storage_ptr const& sp);
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 // Must be included here for this file to stand alone
 #include <boost/json/value.hpp>
diff --git a/include/boost/json/value_stack.hpp b/include/boost/json/value_stack.hpp
index 885f8d2b..cdf95393 100644
--- a/include/boost/json/value_stack.hpp
+++ b/include/boost/json/value_stack.hpp
@@ -16,7 +16,8 @@
 #include <boost/json/value.hpp>
 #include <stddef.h>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -503,6 +504,7 @@ public:
     push_null();
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/value_to.hpp b/include/boost/json/value_to.hpp
index 1b7d45bd..0dba3a8f 100644
--- a/include/boost/json/value_to.hpp
+++ b/include/boost/json/value_to.hpp
@@ -14,7 +14,8 @@
 
 #include <boost/json/detail/value_to.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Convert a @ref value to an object of type `T`.
 
@@ -168,6 +169,7 @@ using has_value_to = detail::can_convert<
     detail::remove_cvref<T>, detail::value_to_conversion>;
 #endif
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/include/boost/json/visit.hpp b/include/boost/json/visit.hpp
index bbb573aa..5e2e2e8c 100644
--- a/include/boost/json/visit.hpp
+++ b/include/boost/json/visit.hpp
@@ -15,7 +15,8 @@
 #include <type_traits>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Invoke a function object with the contents of a @ref value
 
@@ -41,7 +42,8 @@ visit(
         std::declval<Visitor>()(nullptr));
 /** @} */
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #include <boost/json/impl/visit.hpp>
 
diff --git a/test/array.cpp b/test/array.cpp
index 9c9b554f..8399a89a 100644
--- a/test/array.cpp
+++ b/test/array.cpp
@@ -19,7 +19,8 @@
 #include "test.hpp"
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<array>::value );
 BOOST_STATIC_ASSERT( std::is_nothrow_move_constructible<array>::value );
@@ -1355,4 +1356,5 @@ public:
 
 TEST_SUITE(array_test, "boost.json.array");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/basic_parser.cpp b/test/basic_parser.cpp
index 779fea7d..6b75c0e8 100644
--- a/test/basic_parser.cpp
+++ b/test/basic_parser.cpp
@@ -19,7 +19,8 @@
 #include "test.hpp"
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<basic_parser<int>>::value );
 
@@ -1606,4 +1607,5 @@ public:
 
 TEST_SUITE(basic_parser_test, "boost.json.basic_parser");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/checking_resource.hpp b/test/checking_resource.hpp
index 077f8ba7..2b3f95a0 100644
--- a/test/checking_resource.hpp
+++ b/test/checking_resource.hpp
@@ -15,7 +15,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class checking_resource
     : public memory_resource
@@ -58,6 +59,7 @@ private:
     }
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif // BOOST_JSON_CHECKING_RESOURCE_HPP
diff --git a/test/conversion.cpp b/test/conversion.cpp
index 8e9369fb..1067f9b5 100644
--- a/test/conversion.cpp
+++ b/test/conversion.cpp
@@ -136,7 +136,8 @@ struct tuple_size<pseudo_tuple1> : std::integral_constant<std::size_t, 2>
 
 } // namespace std
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 template <>
 struct is_string_like<pseudo_string2> : std::false_type
@@ -216,4 +217,5 @@ public:
 
 TEST_SUITE(conversion_test, "boost.json.conversion");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/doc_background.cpp b/test/doc_background.cpp
index 45313dbe..b33370c1 100644
--- a/test/doc_background.cpp
+++ b/test/doc_background.cpp
@@ -20,7 +20,8 @@
 #endif
 #define assert BOOST_TEST
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 namespace doc_background {
 
@@ -202,4 +203,5 @@ public:
 
 TEST_SUITE(doc_background_test, "boost.json.doc_background");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/doc_forward_conversion.cpp b/test/doc_forward_conversion.cpp
index 8f4c305e..0f3a967d 100644
--- a/test/doc_forward_conversion.cpp
+++ b/test/doc_forward_conversion.cpp
@@ -91,7 +91,8 @@ tag_invoke(
 #include "test_suite.hpp"
 
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class doc_forward_conversion
 {
@@ -113,4 +114,5 @@ public:
 
 TEST_SUITE(doc_forward_conversion, "boost.json.doc_forward_conversion");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/doc_parsing.cpp b/test/doc_parsing.cpp
index de064d3c..5f3475d7 100644
--- a/test/doc_parsing.cpp
+++ b/test/doc_parsing.cpp
@@ -19,7 +19,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -251,4 +252,5 @@ public:
 
 TEST_SUITE(doc_parsing_test, "boost.json.doc_parsing");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/doc_quick_look.cpp b/test/doc_quick_look.cpp
index 64318c5e..dec4188b 100644
--- a/test/doc_quick_look.cpp
+++ b/test/doc_quick_look.cpp
@@ -13,7 +13,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 static void set1() {
 
@@ -330,4 +331,5 @@ public:
 
 TEST_SUITE(doc_quick_look_test, "boost.json.doc_quick_look");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/doc_serializing.cpp b/test/doc_serializing.cpp
index 8d1dc456..47b43e4d 100644
--- a/test/doc_serializing.cpp
+++ b/test/doc_serializing.cpp
@@ -14,7 +14,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -72,4 +73,5 @@ public:
 
 TEST_SUITE(doc_serializing_test, "boost.json.doc_serializing");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/doc_storage_ptr.cpp b/test/doc_storage_ptr.cpp
index a13c851d..639e33dc 100644
--- a/test/doc_storage_ptr.cpp
+++ b/test/doc_storage_ptr.cpp
@@ -17,7 +17,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -173,4 +174,5 @@ public:
 
 TEST_SUITE(doc_storage_ptr_test, "boost.json.doc_storage_ptr");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/doc_uses_allocator.cpp b/test/doc_uses_allocator.cpp
index 72aa93ef..dfde03d5 100644
--- a/test/doc_uses_allocator.cpp
+++ b/test/doc_uses_allocator.cpp
@@ -14,7 +14,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -74,4 +75,5 @@ public:
 
 TEST_SUITE(doc_uses_allocator_test, "boost.json.doc_uses_allocator");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/doc_using_numbers.cpp b/test/doc_using_numbers.cpp
index c88ffc4d..f8601b9c 100644
--- a/test/doc_using_numbers.cpp
+++ b/test/doc_using_numbers.cpp
@@ -27,7 +27,8 @@
 # pragma GCC diagnostic ignored "-Wunused-variable"
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -183,4 +184,5 @@ public:
 
 TEST_SUITE(doc_using_numbers_test, "boost.json.doc_using_numbers");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/double.cpp b/test/double.cpp
index 4bb77c4b..6453204a 100644
--- a/test/double.cpp
+++ b/test/double.cpp
@@ -20,7 +20,8 @@
 #include "test.hpp"
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 template<std::size_t N, class... Args>
 void
@@ -431,4 +432,5 @@ public:
 
 TEST_SUITE(double_test, "boost.json.double");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/error.cpp b/test/error.cpp
index ad57dc3d..9d5257df 100644
--- a/test/error.cpp
+++ b/test/error.cpp
@@ -14,7 +14,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class error_test
 {
@@ -94,4 +95,5 @@ public:
 
 TEST_SUITE(error_test, "boost.json.error");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/json.cpp b/test/json.cpp
index 8fd9e921..1c4ffdd8 100644
--- a/test/json.cpp
+++ b/test/json.cpp
@@ -12,7 +12,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 struct json_test
 {
@@ -37,4 +38,5 @@ struct json_test
 
 TEST_SUITE(json_test, "boost.json.zsizes");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/kind.cpp b/test/kind.cpp
index c7c644bf..803ce9a7 100644
--- a/test/kind.cpp
+++ b/test/kind.cpp
@@ -16,7 +16,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class kind_test
 {
@@ -50,4 +51,5 @@ public:
 
 TEST_SUITE(kind_test, "boost.json.kind");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/limits.cpp b/test/limits.cpp
index 40f2cb99..f49a1710 100644
--- a/test/limits.cpp
+++ b/test/limits.cpp
@@ -19,7 +19,8 @@
 #include "test_suite.hpp"
 #include "test.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /*
     This translation unit exercises code paths
@@ -397,4 +398,5 @@ public:
 
 TEST_SUITE(limits_test, "boost.json.limits");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/memory_resource.cpp b/test/memory_resource.cpp
index b68cffaf..7cc01112 100644
--- a/test/memory_resource.cpp
+++ b/test/memory_resource.cpp
@@ -16,7 +16,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class memory_resource_test
 {
@@ -106,4 +107,5 @@ public:
 
 TEST_SUITE(memory_resource_test, "boost.json.memory_resource");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/monotonic_resource.cpp b/test/monotonic_resource.cpp
index 6bf39171..8ea91be7 100644
--- a/test/monotonic_resource.cpp
+++ b/test/monotonic_resource.cpp
@@ -19,7 +19,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<monotonic_resource>::value );
 
@@ -308,4 +309,5 @@ R"xx({
 
 TEST_SUITE(monotonic_resource_test, "boost.json.monotonic_resource");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/natvis.cpp b/test/natvis.cpp
index 81fc1c9a..6d7b24d3 100644
--- a/test/natvis.cpp
+++ b/test/natvis.cpp
@@ -14,7 +14,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class natvis_test
 {
@@ -112,4 +113,5 @@ public:
 
 TEST_SUITE(natvis_test, "json.natvis");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/null_resource.cpp b/test/null_resource.cpp
index 8b405644..71cb479c 100644
--- a/test/null_resource.cpp
+++ b/test/null_resource.cpp
@@ -14,7 +14,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class null_resource_test
 {
@@ -42,4 +43,5 @@ public:
 
 TEST_SUITE(null_resource_test, "boost.json.null_resource");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/object.cpp b/test/object.cpp
index 5b3a5410..843392db 100644
--- a/test/object.cpp
+++ b/test/object.cpp
@@ -25,7 +25,8 @@
 #include "test_suite.hpp"
 #include "checking_resource.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<object>::value );
 BOOST_STATIC_ASSERT( std::is_nothrow_move_constructible<object>::value );
@@ -1617,4 +1618,5 @@ public:
 
 TEST_SUITE(object_test, "boost.json.object");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/parse-vectors.hpp b/test/parse-vectors.hpp
index dc120d96..69bb712c 100644
--- a/test/parse-vectors.hpp
+++ b/test/parse-vectors.hpp
@@ -15,7 +15,8 @@
 #include <cstdlib>
 #include <type_traits>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 struct parse_vectors
 {
@@ -1465,6 +1466,7 @@ parse_vectors() noexcept
         decltype(list)>::value - 1];
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/test/parse.cpp b/test/parse.cpp
index 41405f49..b7968711 100644
--- a/test/parse.cpp
+++ b/test/parse.cpp
@@ -18,7 +18,8 @@
 #include "test.hpp"
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class parse_test
 {
@@ -215,4 +216,5 @@ public:
 
 TEST_SUITE(parse_test, "boost.json.parse");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/parser.cpp b/test/parser.cpp
index 9282a4c0..eeee496f 100644
--- a/test/parser.cpp
+++ b/test/parser.cpp
@@ -12,7 +12,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class parser_test
 {
@@ -392,4 +393,5 @@ public:
 
 TEST_SUITE(parser_test, "boost.json.parser");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/pointer.cpp b/test/pointer.cpp
index eb409bd7..15d22933 100644
--- a/test/pointer.cpp
+++ b/test/pointer.cpp
@@ -11,7 +11,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class pointer_test
 {
@@ -363,4 +364,5 @@ public:
 
 TEST_SUITE(pointer_test, "boost.json.pointer");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/ryu/d2s_intrinsics_test.cpp b/test/ryu/d2s_intrinsics_test.cpp
index bb492cc7..fc94b684 100644
--- a/test/ryu/d2s_intrinsics_test.cpp
+++ b/test/ryu/d2s_intrinsics_test.cpp
@@ -23,7 +23,8 @@
 #include "gtest.hpp"
 #include <math.h>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -53,4 +54,5 @@ TEST(D2sIntrinsicsTest, mod1e9) {
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/ryu/d2s_table_test.cpp b/test/ryu/d2s_table_test.cpp
index 226a2fc6..67d669a4 100644
--- a/test/ryu/d2s_table_test.cpp
+++ b/test/ryu/d2s_table_test.cpp
@@ -37,7 +37,8 @@
 #include <cmath>
 #include "gtest.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -103,4 +104,5 @@ TEST(D2sTableTest, compute_offsets_for_double_computeInvPow5) {
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/ryu/d2s_test.cpp b/test/ryu/d2s_test.cpp
index 90c8476e..e6f1c27d 100644
--- a/test/ryu/d2s_test.cpp
+++ b/test/ryu/d2s_test.cpp
@@ -25,7 +25,8 @@
 #include <limits>
 #include "gtest.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -280,4 +281,5 @@ TEST(D2sTest, SmallIntegers) {
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/serialize.cpp b/test/serialize.cpp
index 0bbde703..a9d89aa9 100644
--- a/test/serialize.cpp
+++ b/test/serialize.cpp
@@ -16,7 +16,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class serialize_test
 {
@@ -65,4 +66,5 @@ public:
 
 TEST_SUITE(serialize_test, "boost.json.serialize");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/serializer.cpp b/test/serializer.cpp
index 7a78f0f2..02bc89c5 100644
--- a/test/serializer.cpp
+++ b/test/serializer.cpp
@@ -18,7 +18,8 @@
 #include "test.hpp"
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<serializer>::value );
 
@@ -562,4 +563,5 @@ public:
 
 TEST_SUITE(serializer_test, "boost.json.serializer");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/snippets.cpp b/test/snippets.cpp
index fabe75eb..d4ffb028 100644
--- a/test/snippets.cpp
+++ b/test/snippets.cpp
@@ -111,7 +111,8 @@ tag_invoke( const try_value_to_tag< ip_address >&, value const& jv )
 
 } // namespace user_ns
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 namespace {
 
@@ -871,4 +872,5 @@ public:
 
 TEST_SUITE(snippets_test, "boost.json.snippets");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/static_resource.cpp b/test/static_resource.cpp
index c21fb0b6..1eb8f7e9 100644
--- a/test/static_resource.cpp
+++ b/test/static_resource.cpp
@@ -16,7 +16,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<static_resource>::value );
 
@@ -126,4 +127,5 @@ public:
 
 TEST_SUITE(static_resource_test, "boost.json.static_resource");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/storage_ptr.cpp b/test/storage_ptr.cpp
index 3669c409..055c7f3e 100644
--- a/test/storage_ptr.cpp
+++ b/test/storage_ptr.cpp
@@ -22,7 +22,8 @@
 #pragma warning(disable: 4702) // unreachable code
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT(
     std::is_nothrow_move_constructible<storage_ptr>::value);
@@ -207,7 +208,8 @@ value storage_ptr_test::jv2 = {1, 2, 3};
 
 TEST_SUITE(storage_ptr_test, "boost.json.storage_ptr");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #ifdef _MSC_VER
 #pragma warning(pop)
diff --git a/test/stream_parser.cpp b/test/stream_parser.cpp
index 095f0668..b3fa69ab 100644
--- a/test/stream_parser.cpp
+++ b/test/stream_parser.cpp
@@ -23,7 +23,8 @@
 #include "test.hpp"
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<stream_parser>::value );
 
@@ -1296,4 +1297,5 @@ R"xx({
 
 TEST_SUITE(stream_parser_test, "boost.json.stream_parser");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/string.cpp b/test/string.cpp
index d7b16ff5..22dfab68 100644
--- a/test/string.cpp
+++ b/test/string.cpp
@@ -22,7 +22,8 @@
 #include "test.hpp"
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<string>::value );
 BOOST_STATIC_ASSERT( std::is_nothrow_move_constructible<string>::value );
@@ -2823,4 +2824,5 @@ public:
 
 TEST_SUITE(string_test, "boost.json.string");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/test.hpp b/test/test.hpp
index d27c567a..cd1f58f2 100644
--- a/test/test.hpp
+++ b/test/test.hpp
@@ -24,7 +24,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -1139,6 +1140,7 @@ check_array(
 
 //----------------------------------------------------------
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif
diff --git a/test/unhygenic_macros.cpp b/test/unhygenic_macros.cpp
index d09896dd..7f96c9e9 100644
--- a/test/unhygenic_macros.cpp
+++ b/test/unhygenic_macros.cpp
@@ -22,7 +22,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class unhygenic_macros_test
 {
@@ -35,4 +36,5 @@ public:
 
 TEST_SUITE(unhygenic_macros_test, "boost.json.unhygenic_macros");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/utf8.cpp b/test/utf8.cpp
index 76ffd603..d16943cc 100644
--- a/test/utf8.cpp
+++ b/test/utf8.cpp
@@ -12,7 +12,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class utf8_test
 {
@@ -174,4 +175,5 @@ public:
 
 TEST_SUITE(utf8_test, "boost.json.utf8");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/value.cpp b/test/value.cpp
index 0b8c1c55..4940ef1e 100644
--- a/test/value.cpp
+++ b/test/value.cpp
@@ -19,7 +19,8 @@
 #include "test.hpp"
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<value>::value );
 BOOST_STATIC_ASSERT( std::is_nothrow_move_constructible<value>::value );
@@ -2339,4 +2340,5 @@ public:
 
 TEST_SUITE(value_test, "boost.json.value");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/value_from.cpp b/test/value_from.cpp
index ba91f499..2e90c345 100644
--- a/test/value_from.cpp
+++ b/test/value_from.cpp
@@ -210,7 +210,8 @@ check(
     }
 }
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 template<>
 struct is_null_like<::value_from_test_ns::T7>
@@ -492,4 +493,5 @@ public:
 
 TEST_SUITE(value_from_test, "boost.json.value_from");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/value_ref.cpp b/test/value_ref.cpp
index 86e3a4fc..bb23eed3 100644
--- a/test/value_ref.cpp
+++ b/test/value_ref.cpp
@@ -15,7 +15,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -401,4 +402,5 @@ public:
 
 TEST_SUITE(value_ref_test, "boost.json.value_ref");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/value_stack.cpp b/test/value_stack.cpp
index 56169d38..ad1b4bb4 100644
--- a/test/value_stack.cpp
+++ b/test/value_stack.cpp
@@ -15,7 +15,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<value_stack>::value );
 
@@ -124,4 +125,5 @@ public:
 
 TEST_SUITE(value_stack_test, "boost.json.value_stack");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/value_to.cpp b/test/value_to.cpp
index f2d79891..fe282aa4 100644
--- a/test/value_to.cpp
+++ b/test/value_to.cpp
@@ -144,7 +144,8 @@ struct tuple_size<value_to_test_ns::T4>
 
 } // namespace std
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 template<>
 struct is_null_like<::value_to_test_ns::T1> : std::true_type { };
@@ -617,4 +618,5 @@ public:
 
 TEST_SUITE(value_to_test, "boost.json.value_to");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
diff --git a/test/visit.cpp b/test/visit.cpp
index 3d589031..e4bfd9ad 100644
--- a/test/visit.cpp
+++ b/test/visit.cpp
@@ -12,7 +12,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class visit_test
 {
@@ -89,4 +90,5 @@ public:
 
 TEST_SUITE(visit_test, "boost.json.visit");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost