diff --git a/src/bsoncxx/include/bsoncxx/v1/decimal128.hpp b/src/bsoncxx/include/bsoncxx/v1/decimal128.hpp
index ebbc164edf..62d44cb1f1 100644
--- a/src/bsoncxx/include/bsoncxx/v1/decimal128.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/decimal128.hpp
@@ -25,6 +25,7 @@
 
 #include <cstdint>
 #include <system_error>
+#include <type_traits>
 
 namespace bsoncxx {
 namespace v1 {
@@ -128,12 +129,8 @@ class decimal128 {
 } // namespace v1
 } // namespace bsoncxx
 
-namespace std {
-
 template <>
-struct is_error_code_enum<bsoncxx::v1::decimal128::errc> : true_type {};
-
-} // namespace std
+struct std::is_error_code_enum<bsoncxx::v1::decimal128::errc> : true_type {};
 
 #include <bsoncxx/v1/detail/postlude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v1/document/view.hpp b/src/bsoncxx/include/bsoncxx/v1/document/view.hpp
index ee8b3cda1e..64e595fdd8 100644
--- a/src/bsoncxx/include/bsoncxx/v1/document/view.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/document/view.hpp
@@ -30,6 +30,7 @@
 #include <cstring>
 #include <iterator>
 #include <system_error>
+#include <type_traits>
 
 namespace bsoncxx {
 namespace v1 {
@@ -389,12 +390,8 @@ inline v1::element::view view::operator[](v1::stdx::string_view key) const {
 } // namespace v1
 } // namespace bsoncxx
 
-namespace std {
-
 template <>
-struct is_error_code_enum<bsoncxx::v1::document::view::errc> : true_type {};
-
-} // namespace std
+struct std::is_error_code_enum<bsoncxx::v1::document::view::errc> : true_type {};
 
 #include <bsoncxx/v1/detail/postlude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v1/element/view.hpp b/src/bsoncxx/include/bsoncxx/v1/element/view.hpp
index d5b9f4e649..294a7bffae 100644
--- a/src/bsoncxx/include/bsoncxx/v1/element/view.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/element/view.hpp
@@ -31,7 +31,6 @@
 #include <array>
 #include <cstddef>
 #include <cstdint>
-#include <memory>
 #include <system_error>
 #include <type_traits>
 
@@ -265,12 +264,8 @@ class view {
 } // namespace v1
 } // namespace bsoncxx
 
-namespace std {
-
 template <>
-struct is_error_code_enum<bsoncxx::v1::element::view::errc> : true_type {};
-
-} // namespace std
+struct std::is_error_code_enum<bsoncxx::v1::element::view::errc> : true_type {};
 
 #include <bsoncxx/v1/detail/postlude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v1/exception.hpp b/src/bsoncxx/include/bsoncxx/v1/exception.hpp
index 70ba0df54b..4d56bc68dc 100644
--- a/src/bsoncxx/include/bsoncxx/v1/exception.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/exception.hpp
@@ -112,15 +112,11 @@ BSONCXX_PRIVATE_WARNINGS_POP();
 } // namespace v1
 } // namespace bsoncxx
 
-namespace std {
-
 template <>
-struct is_error_condition_enum<bsoncxx::v1::source_errc> : true_type {};
+struct std::is_error_condition_enum<bsoncxx::v1::source_errc> : true_type {};
 
 template <>
-struct is_error_condition_enum<bsoncxx::v1::type_errc> : true_type {};
-
-} // namespace std
+struct std::is_error_condition_enum<bsoncxx::v1::type_errc> : true_type {};
 
 #include <bsoncxx/v1/detail/postlude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v1/oid.hpp b/src/bsoncxx/include/bsoncxx/v1/oid.hpp
index d1844386a4..6140cda11a 100644
--- a/src/bsoncxx/include/bsoncxx/v1/oid.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/oid.hpp
@@ -30,6 +30,8 @@
 #include <ctime>
 #include <string>
 #include <system_error>
+#include <type_traits>
+
 namespace bsoncxx {
 namespace v1 {
 
@@ -203,12 +205,8 @@ BSONCXX_PRIVATE_INLINE_CXX17 constexpr std::size_t oid::k_oid_length;
 } // namespace v1
 } // namespace bsoncxx
 
-namespace std {
-
 template <>
-struct is_error_code_enum<bsoncxx::v1::oid::errc> : true_type {};
-
-} // namespace std
+struct std::is_error_code_enum<bsoncxx::v1::oid::errc> : true_type {};
 
 #include <bsoncxx/v1/detail/postlude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v1/types/value.hpp b/src/bsoncxx/include/bsoncxx/v1/types/value.hpp
index d11d079b4e..1fe346e196 100644
--- a/src/bsoncxx/include/bsoncxx/v1/types/value.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/types/value.hpp
@@ -37,6 +37,7 @@
 #include <cstdint>
 #include <string>
 #include <system_error>
+#include <type_traits>
 #include <vector>
 
 namespace bsoncxx {
@@ -325,12 +326,8 @@ class value {
 } // namespace v1
 } // namespace bsoncxx
 
-namespace std {
-
 template <>
-struct is_error_code_enum<bsoncxx::v1::types::value::errc> : true_type {};
-
-} // namespace std
+struct std::is_error_code_enum<bsoncxx::v1::types::value::errc> : true_type {};
 
 #include <bsoncxx/v1/detail/postlude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v1/types/view.hpp b/src/bsoncxx/include/bsoncxx/v1/types/view.hpp
index b9d5b7f8a3..459f216319 100644
--- a/src/bsoncxx/include/bsoncxx/v1/types/view.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/types/view.hpp
@@ -33,6 +33,8 @@
 #include <chrono>
 #include <cstdint>
 #include <cstring>
+#include <system_error>
+#include <type_traits>
 
 namespace bsoncxx {
 namespace v1 {
@@ -1216,12 +1218,8 @@ class view {
 } // namespace v1
 } // namespace bsoncxx
 
-namespace std {
-
 template <>
-struct is_error_code_enum<bsoncxx::v1::types::view::errc> : true_type {};
-
-} // namespace std
+struct std::is_error_code_enum<bsoncxx::v1::types::view::errc> : true_type {};
 
 #include <bsoncxx/v1/detail/postlude.hpp>