diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6d54aac8c..63e5153c1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu
 - Redeclarations of `bsoncxx::stdx` interfaces in the `mongocxx::stdx` namespace.
   - Use `bsoncxx::stdx::optional<T>` instead of `mongocxx::stdx::optional<T>`.
   - Use `bsoncxx::stdx::string_view` instead of `mongocxx::stdx::string_view`.
+- Inline namespace macros for bsoncxx and mongocxx namespace: `*_INLINE_NAMESPACE_*`.
 - The `<bsoncxx/util/functor.hpp>` header.
 
 ## 3.11.0
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp
index a748c6d596..368c470d85 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp
@@ -19,10 +19,6 @@
 #pragma pop_macro("BSONCXX_CALL")
 
 // config.hpp (generated by CMake)
-#undef BSONCXX_INLINE_NAMESPACE_BEGIN
-#pragma pop_macro("BSONCXX_INLINE_NAMESPACE_BEGIN")
-#undef BSONCXX_INLINE_NAMESPACE_END
-#pragma pop_macro("BSONCXX_INLINE_NAMESPACE_END")
 #undef BSONCXX_POLY_USE_MNMLSTC
 #pragma pop_macro("BSONCXX_POLY_USE_MNMLSTC")
 #undef BSONCXX_POLY_USE_SYSTEM_MNMLSTC
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp
index 30141ef005..0b64ad1027 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp
@@ -63,10 +63,6 @@
 #undef BSONCXX_IF_GNU_LIKE
 
 // config.hpp (generated by CMake)
-#pragma push_macro("BSONCXX_INLINE_NAMESPACE_BEGIN")
-#undef BSONCXX_INLINE_NAMESPACE_BEGIN
-#pragma push_macro("BSONCXX_INLINE_NAMESPACE_END")
-#undef BSONCXX_INLINE_NAMESPACE_END
 #pragma push_macro("BSONCXX_POLY_USE_MNMLSTC")
 #undef BSONCXX_POLY_USE_MNMLSTC
 #pragma push_macro("BSONCXX_POLY_USE_SYSTEM_MNMLSTC")
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/fwd.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/fwd.hpp
index 8da595c025..6cfb4c9691 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/fwd.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/fwd.hpp
@@ -157,24 +157,6 @@
 ///
 #define BSONCXX_POLY_USE_STD
 
-///
-/// @ingroup bsoncxx-v_noabi-bsoncxx-config-config-hpp
-/// For internal use only!
-///
-/// @deprecated To be removed in an upcoming major release.
-/// <!-- Explicitly documented due to long-standing availability. -->
-///
-#define BSONCXX_INLINE_NAMESPACE_BEGIN
-
-///
-/// @ingroup bsoncxx-v_noabi-bsoncxx-config-config-hpp
-/// For internal use only!
-///
-/// @deprecated To be removed in an upcoming major release.
-/// <!-- Explicitly documented due to long-standing availability. -->
-///
-#define BSONCXX_INLINE_NAMESPACE_END
-
 ///
 /// @} <!-- bsoncxx/v_noabi/bsoncxx/config/config.hpp -->
 ///
diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/config.hpp.in b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/config.hpp.in
index e2c1bfe1ae..1b8a51168b 100644
--- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/config.hpp.in
+++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/config.hpp.in
@@ -17,6 +17,3 @@
 #cmakedefine BSONCXX_POLY_USE_BOOST
 #cmakedefine BSONCXX_POLY_USE_IMPLS
 #cmakedefine BSONCXX_POLY_USE_STD
-
-#define BSONCXX_INLINE_NAMESPACE_BEGIN inline namespace v_noabi {
-#define BSONCXX_INLINE_NAMESPACE_END }  // namespace v_noabi
diff --git a/src/bsoncxx/test/CMakeLists.txt b/src/bsoncxx/test/CMakeLists.txt
index 51e2d7d18f..5003db1bbd 100644
--- a/src/bsoncxx/test/CMakeLists.txt
+++ b/src/bsoncxx/test/CMakeLists.txt
@@ -90,8 +90,6 @@ if(ENABLE_MACRO_GUARD_TESTS)
             BSONCXX_CALL
 
             # config.hpp (generated by CMake)
-            BSONCXX_INLINE_NAMESPACE_BEGIN
-            BSONCXX_INLINE_NAMESPACE_END
             BSONCXX_POLY_USE_MNMLSTC
             BSONCXX_POLY_USE_SYSTEM_MNMLSTC
             BSONCXX_POLY_USE_BOOST
diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp
index 630967c411..62348f9110 100644
--- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp
+++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp
@@ -18,12 +18,6 @@
 #undef MONGOCXX_CALL
 #pragma pop_macro("MONGOCXX_CALL")
 
-// config.hpp (generated by CMake)
-#undef MONGOCXX_INLINE_NAMESPACE_BEGIN
-#pragma pop_macro("MONGOCXX_INLINE_NAMESPACE_BEGIN")
-#undef MONGOCXX_INLINE_NAMESPACE_END
-#pragma pop_macro("MONGOCXX_INLINE_NAMESPACE_END")
-
 // version.hpp (generated by CMake)
 #undef MONGOCXX_VERSION_STRING
 #pragma pop_macro("MONGOCXX_VERSION_STRING")
diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp
index 9854d02a9c..481d50926e 100644
--- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp
+++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp
@@ -18,12 +18,6 @@
 #pragma push_macro("MONGOCXX_CALL")
 #undef MONGOCXX_CALL
 
-// config.hpp (generated by CMake)
-#pragma push_macro("MONGOCXX_INLINE_NAMESPACE_BEGIN")
-#undef MONGOCXX_INLINE_NAMESPACE_BEGIN
-#pragma push_macro("MONGOCXX_INLINE_NAMESPACE_END")
-#undef MONGOCXX_INLINE_NAMESPACE_END
-
 // version.hpp (generated by CMake)
 #pragma push_macro("MONGOCXX_VERSION_STRING")
 #undef MONGOCXX_VERSION_STRING
diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/fwd.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/fwd.hpp
index 8302cfde72..a963783090 100644
--- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/fwd.hpp
+++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/fwd.hpp
@@ -154,24 +154,6 @@
 /// @{
 ///
 
-///
-/// @ingroup mongocxx-v_noabi-mongocxx-config-config-hpp
-/// For internal use only!
-///
-/// @deprecated To be removed in an upcoming major release.
-/// <!-- Explicitly documented due to long-standing availability. -->
-///
-#define MONGOCXX_INLINE_NAMESPACE_BEGIN
-
-///
-/// @ingroup mongocxx-v_noabi-mongocxx-config-config-hpp
-/// For internal use only!
-///
-/// @deprecated To be removed in an upcoming major release.
-/// <!-- Explicitly documented due to long-standing availability. -->
-///
-#define MONGOCXX_INLINE_NAMESPACE_END
-
 ///
 /// @} <!-- mongocxx/v_noabi/mongocxx/config/config.hpp -->
 ///
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/config.hpp.in b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/config.hpp.in
index faf37212aa..98cfd9fb6e 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/config.hpp.in
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/config.hpp.in
@@ -11,6 +11,3 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-
-#define MONGOCXX_INLINE_NAMESPACE_BEGIN inline namespace v_noabi {
-#define MONGOCXX_INLINE_NAMESPACE_END }  // namespace v_noabi
diff --git a/src/mongocxx/test/CMakeLists.txt b/src/mongocxx/test/CMakeLists.txt
index 8cc14d1328..08c6bf754d 100644
--- a/src/mongocxx/test/CMakeLists.txt
+++ b/src/mongocxx/test/CMakeLists.txt
@@ -297,10 +297,6 @@ if(ENABLE_MACRO_GUARD_TESTS)
             MONGOCXX_INLINE
             MONGOCXX_CALL
 
-            # config.hpp (generated by CMake)
-            MONGOCXX_INLINE_NAMESPACE_BEGIN
-            MONGOCXX_INLINE_NAMESPACE_END
-
             # version.hpp (generated by CMake)
             MONGOCXX_VERSION_STRING
             MONGOCXX_VERSION_EXTRA