diff --git a/src/bsoncxx/include/bsoncxx/v1/array/value.hpp b/src/bsoncxx/include/bsoncxx/v1/array/value.hpp
index db5bf909ad..2bfa700dc2 100644
--- a/src/bsoncxx/include/bsoncxx/v1/array/value.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/array/value.hpp
@@ -14,16 +14,18 @@
 
 #pragma once
 
-#include <bsoncxx/v1/array/value-fwd.hpp>
+#include <bsoncxx/v1/array/value-fwd.hpp> // IWYU pragma: export
 
 //
 
 #include <bsoncxx/v1/detail/prelude.hpp>
 
-#include <bsoncxx/v1/array/view.hpp>
+#include <bsoncxx/v1/array/view.hpp> // IWYU pragma: export
 #include <bsoncxx/v1/config/export.hpp>
-#include <bsoncxx/v1/document/value.hpp>
+#include <bsoncxx/v1/detail/type_traits.hpp>
+#include <bsoncxx/v1/document/value.hpp> // IWYU pragma: export
 
+#include <cstddef>
 #include <cstdint>
 #include <type_traits>
 #include <utility>
diff --git a/src/bsoncxx/include/bsoncxx/v1/array/view.hpp b/src/bsoncxx/include/bsoncxx/v1/array/view.hpp
index 1dd6271e83..2a3eeffa97 100644
--- a/src/bsoncxx/include/bsoncxx/v1/array/view.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/array/view.hpp
@@ -14,15 +14,15 @@
 
 #pragma once
 
-#include <bsoncxx/v1/array/view-fwd.hpp>
+#include <bsoncxx/v1/array/view-fwd.hpp> // IWYU pragma: export
 
 //
 
 #include <bsoncxx/v1/detail/prelude.hpp>
 
 #include <bsoncxx/v1/config/export.hpp>
-#include <bsoncxx/v1/document/view.hpp>
-#include <bsoncxx/v1/element/view.hpp>
+#include <bsoncxx/v1/document/view.hpp> // IWYU pragma: export
+#include <bsoncxx/v1/element/view.hpp>  // IWYU pragma: export
 
 #include <cstddef>
 #include <cstdint>
diff --git a/src/bsoncxx/include/bsoncxx/v1/decimal128.hpp b/src/bsoncxx/include/bsoncxx/v1/decimal128.hpp
index 62d44cb1f1..d47cc7955a 100644
--- a/src/bsoncxx/include/bsoncxx/v1/decimal128.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/decimal128.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/decimal128-fwd.hpp>
+#include <bsoncxx/v1/decimal128-fwd.hpp> // IWYU pragma: export
 
 //
 
@@ -24,6 +24,7 @@
 #include <bsoncxx/v1/stdx/string_view.hpp>
 
 #include <cstdint>
+#include <string>
 #include <system_error>
 #include <type_traits>
 
diff --git a/src/bsoncxx/include/bsoncxx/v1/detail/bit.hpp b/src/bsoncxx/include/bsoncxx/v1/detail/bit.hpp
index 7a29faa06c..7e18c52ab3 100644
--- a/src/bsoncxx/include/bsoncxx/v1/detail/bit.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/detail/bit.hpp
@@ -20,8 +20,10 @@
 
 #if defined(__has_include)
 #if __has_include(<bit>) && (!defined(_MSVC_LANG) || _MSVC_LANG >= 202002L)
+
 // Prioritize using std::endian from C++20.
-#include <bit>
+#include <bit> // IWYU pragma: export
+
 #endif // __has_include(<bit>) && (!defined(_MSVC_LANG) || _MSVC_LANG >= 202002L)
 #elif defined(_WIN32)
 // Forward-compatibility with STL: https://github.com/microsoft/STL/blob/vs-2019-16.5/stl/inc/bit#L26
diff --git a/src/bsoncxx/include/bsoncxx/v1/detail/compare.hpp b/src/bsoncxx/include/bsoncxx/v1/detail/compare.hpp
index 8f7cd86408..e63e065756 100644
--- a/src/bsoncxx/include/bsoncxx/v1/detail/compare.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/detail/compare.hpp
@@ -22,6 +22,7 @@
 #include <cstddef>
 #include <functional>
 #include <type_traits>
+#include <utility>
 
 namespace bsoncxx {
 namespace detail {
diff --git a/src/bsoncxx/include/bsoncxx/v1/detail/type_traits.hpp b/src/bsoncxx/include/bsoncxx/v1/detail/type_traits.hpp
index 43bad869bb..75e17ac54d 100644
--- a/src/bsoncxx/include/bsoncxx/v1/detail/type_traits.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/detail/type_traits.hpp
@@ -18,7 +18,7 @@
 
 #include <bsoncxx/v1/detail/macros.hpp>
 
-#include <type_traits>
+#include <type_traits> // IWYU pragma: export
 #include <utility>
 
 namespace bsoncxx {
diff --git a/src/bsoncxx/include/bsoncxx/v1/document/value.hpp b/src/bsoncxx/include/bsoncxx/v1/document/value.hpp
index fd086fc1d1..c64eb655f5 100644
--- a/src/bsoncxx/include/bsoncxx/v1/document/value.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/document/value.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/document/value-fwd.hpp>
+#include <bsoncxx/v1/document/value-fwd.hpp> // IWYU pragma: export
 
 //
 
@@ -22,10 +22,12 @@
 
 #include <bsoncxx/v1/config/export.hpp>
 #include <bsoncxx/v1/detail/type_traits.hpp>
-#include <bsoncxx/v1/document/view.hpp>
-#include <bsoncxx/v1/element/view.hpp>
+#include <bsoncxx/v1/document/view.hpp> // IWYU pragma: export
+#include <bsoncxx/v1/element/view.hpp>  // IWYU pragma: export
+#include <bsoncxx/v1/stdx/string_view.hpp>
 
 #include <cstddef>
+#include <cstdint>
 #include <cstring>
 #include <functional>
 #include <memory>
diff --git a/src/bsoncxx/include/bsoncxx/v1/document/view.hpp b/src/bsoncxx/include/bsoncxx/v1/document/view.hpp
index 64e595fdd8..473a2b43dd 100644
--- a/src/bsoncxx/include/bsoncxx/v1/document/view.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/document/view.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/document/view-fwd.hpp>
+#include <bsoncxx/v1/document/view-fwd.hpp> // IWYU pragma: export
 
 //
 
@@ -22,7 +22,7 @@
 
 #include <bsoncxx/v1/config/export.hpp>
 #include <bsoncxx/v1/detail/bit.hpp>
-#include <bsoncxx/v1/element/view.hpp>
+#include <bsoncxx/v1/element/view.hpp> // IWYU pragma: export
 #include <bsoncxx/v1/stdx/string_view.hpp>
 
 #include <cstddef>
diff --git a/src/bsoncxx/include/bsoncxx/v1/element/view.hpp b/src/bsoncxx/include/bsoncxx/v1/element/view.hpp
index 294a7bffae..29195d95b5 100644
--- a/src/bsoncxx/include/bsoncxx/v1/element/view.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/element/view.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/element/view-fwd.hpp>
+#include <bsoncxx/v1/element/view-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/bsoncxx/include/bsoncxx/v1/exception.hpp b/src/bsoncxx/include/bsoncxx/v1/exception.hpp
index 97fe7b7b1a..125f993c0e 100644
--- a/src/bsoncxx/include/bsoncxx/v1/exception.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/exception.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/exception-fwd.hpp>
+#include <bsoncxx/v1/exception-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/bsoncxx/include/bsoncxx/v1/oid.hpp b/src/bsoncxx/include/bsoncxx/v1/oid.hpp
index 6140cda11a..17b571e956 100644
--- a/src/bsoncxx/include/bsoncxx/v1/oid.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/oid.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/oid-fwd.hpp>
+#include <bsoncxx/v1/oid-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/bsoncxx/include/bsoncxx/v1/stdx/optional.hpp b/src/bsoncxx/include/bsoncxx/v1/stdx/optional.hpp
index 98a09cbb03..d52097e1d3 100644
--- a/src/bsoncxx/include/bsoncxx/v1/stdx/optional.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/stdx/optional.hpp
@@ -46,6 +46,7 @@ using std::optional;
 #include <cstddef>
 #include <cstdio>
 #include <exception>
+#include <functional>
 #include <initializer_list>
 #include <memory>
 #include <new>
diff --git a/src/bsoncxx/include/bsoncxx/v1/stdx/string_view.hpp b/src/bsoncxx/include/bsoncxx/v1/stdx/string_view.hpp
index b5a92454d2..02f960b62a 100644
--- a/src/bsoncxx/include/bsoncxx/v1/stdx/string_view.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/stdx/string_view.hpp
@@ -41,8 +41,11 @@ using std::string_view;
 
 #include <algorithm>
 #include <cstddef>
+#include <functional>
 #include <ios>
+#include <iterator>
 #include <limits>
+#include <ostream>
 #include <stdexcept>
 #include <string>
 #include <utility>
diff --git a/src/bsoncxx/include/bsoncxx/v1/types/id.hpp b/src/bsoncxx/include/bsoncxx/v1/types/id.hpp
index a12a863675..08aa02a93a 100644
--- a/src/bsoncxx/include/bsoncxx/v1/types/id.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/types/id.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/types/id-fwd.hpp>
+#include <bsoncxx/v1/types/id-fwd.hpp> // IWYU pragma: export
 
 //
 
@@ -22,6 +22,7 @@
 
 #include <bsoncxx/v1/config/export.hpp>
 
+#include <cstdint>
 #include <string>
 
 namespace bsoncxx {
diff --git a/src/bsoncxx/include/bsoncxx/v1/types/value.hpp b/src/bsoncxx/include/bsoncxx/v1/types/value.hpp
index 1fe346e196..18049ae577 100644
--- a/src/bsoncxx/include/bsoncxx/v1/types/value.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/types/value.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/types/value-fwd.hpp>
+#include <bsoncxx/v1/types/value-fwd.hpp> // IWYU pragma: export
 
 //
 
@@ -29,7 +29,7 @@
 #include <bsoncxx/v1/config/export.hpp>
 #include <bsoncxx/v1/detail/macros.hpp>
 #include <bsoncxx/v1/stdx/string_view.hpp>
-#include <bsoncxx/v1/types/view.hpp>
+#include <bsoncxx/v1/types/view.hpp> // IWYU pragma: export
 
 #include <array>
 #include <chrono>
diff --git a/src/bsoncxx/include/bsoncxx/v1/types/view.hpp b/src/bsoncxx/include/bsoncxx/v1/types/view.hpp
index 459f216319..bff57e6e88 100644
--- a/src/bsoncxx/include/bsoncxx/v1/types/view.hpp
+++ b/src/bsoncxx/include/bsoncxx/v1/types/view.hpp
@@ -14,21 +14,21 @@
 
 #pragma once
 
-#include <bsoncxx/v1/types/view-fwd.hpp>
+#include <bsoncxx/v1/types/view-fwd.hpp> // IWYU pragma: export
 
 //
 
 #include <bsoncxx/v1/detail/prelude.hpp>
 
-#include <bsoncxx/v1/array/view.hpp>
+#include <bsoncxx/v1/array/view.hpp> // IWYU pragma: export
 #include <bsoncxx/v1/config/export.hpp>
-#include <bsoncxx/v1/decimal128.hpp>
+#include <bsoncxx/v1/decimal128.hpp> // IWYU pragma: export
 #include <bsoncxx/v1/detail/macros.hpp>
 #include <bsoncxx/v1/detail/type_traits.hpp>
-#include <bsoncxx/v1/document/view.hpp>
-#include <bsoncxx/v1/oid.hpp>
+#include <bsoncxx/v1/document/view.hpp> // IWYU pragma: export
+#include <bsoncxx/v1/oid.hpp>           // IWYU pragma: export
 #include <bsoncxx/v1/stdx/string_view.hpp>
-#include <bsoncxx/v1/types/id.hpp>
+#include <bsoncxx/v1/types/id.hpp> // IWYU pragma: export
 
 #include <chrono>
 #include <cstdint>
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/element-fwd.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/element-fwd.hpp
index 54984beb89..93e2522154 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/element-fwd.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/element-fwd.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/element/view-fwd.hpp>
+#include <bsoncxx/v1/element/view-fwd.hpp> // IWYU pragma: export
 
 #include <bsoncxx/config/prelude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/element.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/element.hpp
index 035cd49851..3209573279 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/element.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/element.hpp
@@ -18,7 +18,7 @@
 
 //
 
-#include <bsoncxx/v1/element/view.hpp>
+#include <bsoncxx/v1/element/view.hpp> // IWYU pragma: export
 
 #include <cstddef>
 #include <cstdint>
@@ -26,7 +26,7 @@
 #include <bsoncxx/array/view-fwd.hpp>
 #include <bsoncxx/types/bson_value/view-fwd.hpp>
 
-#include <bsoncxx/document/element.hpp>
+#include <bsoncxx/document/element.hpp> // IWYU pragma: export
 
 #include <bsoncxx/config/prelude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/value-fwd.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/value-fwd.hpp
index d3a2addea8..5cc4cd1380 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/value-fwd.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/value-fwd.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/array/value-fwd.hpp>
+#include <bsoncxx/v1/array/value-fwd.hpp> // IWYU pragma: export
 
 #include <bsoncxx/config/prelude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view-fwd.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view-fwd.hpp
index 7854e695b9..717a4e5987 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view-fwd.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view-fwd.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/array/view-fwd.hpp>
+#include <bsoncxx/v1/array/view-fwd.hpp> // IWYU pragma: export
 
 #include <bsoncxx/config/prelude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view.hpp
index 599b2804d7..af9128e909 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view.hpp
@@ -18,7 +18,7 @@
 
 //
 
-#include <bsoncxx/v1/array/view.hpp>
+#include <bsoncxx/v1/array/view.hpp> // IWYU pragma: export
 
 #include <cstddef>
 #include <cstdint>
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/config.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/config.hpp
index 895ac5aaee..f74f04b0eb 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/config.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/config.hpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // For backward compatibility.
-#include <bsoncxx/v1/config/config.hpp>
+#include <bsoncxx/v1/config/config.hpp> // IWYU pragma: export
 
 ///
 /// @file
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/export.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/export.hpp
index c16d2abdb5..6ebb398731 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/export.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/export.hpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // For backward compatibility.
-#include <bsoncxx/v1/config/export.hpp>
+#include <bsoncxx/v1/config/export.hpp> // IWYU pragma: export
 
 ///
 /// @file
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 1c4ad7f567..96039a98ff 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <bsoncxx/v1/detail/postlude.hpp>
+#include <bsoncxx/v1/detail/postlude.hpp> // IWYU pragma: export
 
 ///
 /// @file
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 80a018cb74..fbb59bd4c5 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <bsoncxx/v1/detail/prelude.hpp>
+#include <bsoncxx/v1/detail/prelude.hpp> // IWYU pragma: export
 
-#include <bsoncxx/config/compiler.hpp>
-#include <bsoncxx/config/config.hpp>
-#include <bsoncxx/config/export.hpp>
-#include <bsoncxx/config/util.hpp>
-#include <bsoncxx/config/version.hpp>
+#include <bsoncxx/config/compiler.hpp> // IWYU pragma: export
+#include <bsoncxx/config/config.hpp>   // IWYU pragma: export
+#include <bsoncxx/config/export.hpp>   // IWYU pragma: export
+#include <bsoncxx/config/util.hpp>     // IWYU pragma: export
+#include <bsoncxx/config/version.hpp>  // IWYU pragma: export
 
 ///
 /// @file
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/version.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/version.hpp
index f2322be6cc..8b240c92bb 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/version.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/version.hpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // For backward compatibility.
-#include <bsoncxx/v1/config/version.hpp>
+#include <bsoncxx/v1/config/version.hpp> // IWYU pragma: export
 
 ///
 /// @file
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/decimal128-fwd.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/decimal128-fwd.hpp
index 65046258b9..73e0a166df 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/decimal128-fwd.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/decimal128-fwd.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/decimal128-fwd.hpp>
+#include <bsoncxx/v1/decimal128-fwd.hpp> // IWYU pragma: export
 
 #include <bsoncxx/config/prelude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/decimal128.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/decimal128.hpp
index 8563b73716..93591ddaa2 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/decimal128.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/decimal128.hpp
@@ -18,7 +18,7 @@
 
 //
 
-#include <bsoncxx/v1/decimal128.hpp>
+#include <bsoncxx/v1/decimal128.hpp> // IWYU pragma: export
 #include <bsoncxx/v1/detail/type_traits.hpp>
 
 #include <cstdint>
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/element-fwd.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/element-fwd.hpp
index 6fa4b0bbf6..34c46af183 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/element-fwd.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/element-fwd.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/element/view-fwd.hpp>
+#include <bsoncxx/v1/element/view-fwd.hpp> // IWYU pragma: export
 
 #include <bsoncxx/config/prelude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/element.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/element.hpp
index c89c23dd0b..5e825a8d6b 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/element.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/element.hpp
@@ -18,7 +18,7 @@
 
 //
 
-#include <bsoncxx/v1/element/view.hpp>
+#include <bsoncxx/v1/element/view.hpp> // IWYU pragma: export
 
 #include <cstddef>
 #include <cstdint>
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/value-fwd.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/value-fwd.hpp
index b4cc48c81d..d108c54266 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/value-fwd.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/value-fwd.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/document/value-fwd.hpp>
+#include <bsoncxx/v1/document/value-fwd.hpp> // IWYU pragma: export
 
 #include <bsoncxx/config/prelude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/value.hpp
index fcbfd557c3..e2c853e77f 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/value.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/value.hpp
@@ -18,7 +18,7 @@
 
 //
 
-#include <bsoncxx/v1/document/value.hpp>
+#include <bsoncxx/v1/document/value.hpp> // IWYU pragma: export
 
 #include <cstdlib>
 #include <memory>
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view-fwd.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view-fwd.hpp
index d38cf60456..25f4bc84a1 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view-fwd.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view-fwd.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/document/view-fwd.hpp>
+#include <bsoncxx/v1/document/view-fwd.hpp> // IWYU pragma: export
 
 #include <bsoncxx/config/prelude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view.hpp
index 4923d02381..ddb3188a62 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view.hpp
@@ -18,7 +18,7 @@
 
 //
 
-#include <bsoncxx/v1/document/view.hpp>
+#include <bsoncxx/v1/document/view.hpp> // IWYU pragma: export
 
 #include <cstddef>
 #include <cstdint>
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/error_code-fwd.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/error_code-fwd.hpp
index e014b172a6..97326397a4 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/error_code-fwd.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/error_code-fwd.hpp
@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include <bsoncxx/v1/exception-fwd.hpp> // IWYU pragma: export
+
 #include <cstdint>
 #include <system_error>
 
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp
index cea41789af..d6df598ff7 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp
@@ -18,7 +18,7 @@
 
 //
 
-#include <bsoncxx/v1/exception.hpp>
+#include <bsoncxx/v1/exception.hpp> // IWYU pragma: export
 
 #include <cstdint>
 #include <system_error>
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/exception-fwd.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/exception-fwd.hpp
index 1dee228313..058df12025 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/exception-fwd.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/exception-fwd.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/exception-fwd.hpp>
+#include <bsoncxx/v1/exception-fwd.hpp> // IWYU pragma: export
 
 #include <bsoncxx/config/prelude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp
index 180f71895f..2841718785 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp
@@ -18,7 +18,7 @@
 
 //
 
-#include <bsoncxx/v1/exception.hpp>
+#include <bsoncxx/v1/exception.hpp> // IWYU pragma: export
 
 #include <system_error>
 
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/oid-fwd.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/oid-fwd.hpp
index bfaadf7514..7e488dd9e3 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/oid-fwd.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/oid-fwd.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/oid-fwd.hpp>
+#include <bsoncxx/v1/oid-fwd.hpp> // IWYU pragma: export
 
 #include <bsoncxx/config/prelude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/oid.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/oid.hpp
index c79c732d36..455f94fd4b 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/oid.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/oid.hpp
@@ -19,7 +19,7 @@
 //
 
 #include <bsoncxx/v1/detail/type_traits.hpp>
-#include <bsoncxx/v1/oid.hpp>
+#include <bsoncxx/v1/oid.hpp> // IWYU pragma: export
 
 #include <array>
 #include <ctime>
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp
index 720170e58b..55faa9aaeb 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/stdx/optional.hpp>
+#include <bsoncxx/v1/stdx/optional.hpp> // IWYU pragma: export
 
 namespace bsoncxx {
 namespace v_noabi {
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp
index f36690e3d5..3c86ac7347 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/stdx/string_view.hpp>
+#include <bsoncxx/v1/stdx/string_view.hpp> // IWYU pragma: export
 
 namespace bsoncxx {
 namespace v_noabi {
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types-fwd.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types-fwd.hpp
index 326bff00f3..8294c66cf8 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types-fwd.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types-fwd.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/types/view-fwd.hpp>
+#include <bsoncxx/v1/types/view-fwd.hpp> // IWYU pragma: export
 
 #include <cstdint>
 
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types.hpp
index 81888def43..ba03117b17 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types.hpp
@@ -20,7 +20,7 @@
 
 #include <bsoncxx/v1/detail/type_traits.hpp>
 #include <bsoncxx/v1/types/id.hpp>
-#include <bsoncxx/v1/types/view.hpp>
+#include <bsoncxx/v1/types/view.hpp> // IWYU pragma: export
 
 #include <chrono>
 #include <cstring>
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value-fwd.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value-fwd.hpp
index 8de3efd0b9..918baf0f2b 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value-fwd.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value-fwd.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/types/value-fwd.hpp>
+#include <bsoncxx/v1/types/value-fwd.hpp> // IWYU pragma: export
 
 #include <bsoncxx/config/prelude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp
index 75f2bfda0b..2c4fca42dd 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp
@@ -19,7 +19,7 @@
 //
 
 #include <bsoncxx/v1/detail/type_traits.hpp>
-#include <bsoncxx/v1/types/value.hpp>
+#include <bsoncxx/v1/types/value.hpp> // IWYU pragma: export
 
 #include <iostream>
 #include <memory>
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view-fwd.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view-fwd.hpp
index b4a202430b..13019b8199 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view-fwd.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view-fwd.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/types/view-fwd.hpp>
+#include <bsoncxx/v1/types/view-fwd.hpp> // IWYU pragma: export
 
 #include <bsoncxx/config/prelude.hpp>
 
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp
index 55000cf148..a91f4ade44 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp
@@ -18,7 +18,7 @@
 
 //
 
-#include <bsoncxx/v1/types/view.hpp>
+#include <bsoncxx/v1/types/view.hpp> // IWYU pragma: export
 
 #include <cstddef>
 #include <cstdint>
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/value-fwd.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/value-fwd.hpp
index 9e43125f92..3ef1596cb2 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/value-fwd.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/value-fwd.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/types/bson_value/value-fwd.hpp>
+#include <bsoncxx/types/bson_value/value-fwd.hpp> // IWYU pragma: export
 
 ///
 /// @file
diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/view-fwd.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/view-fwd.hpp
index dec950d3cc..6f1d1381ef 100644
--- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/view-fwd.hpp
+++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/view-fwd.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/types/bson_value/view-fwd.hpp>
+#include <bsoncxx/types/bson_value/view-fwd.hpp> // IWYU pragma: export
 
 ///
 /// @file
diff --git a/src/bsoncxx/lib/bsoncxx/private/bson.hh b/src/bsoncxx/lib/bsoncxx/private/bson.hh
index 8bda5471a4..50fb7b0d41 100644
--- a/src/bsoncxx/lib/bsoncxx/private/bson.hh
+++ b/src/bsoncxx/lib/bsoncxx/private/bson.hh
@@ -21,6 +21,6 @@ BSONCXX_PRIVATE_WARNINGS_PUSH();
 BSONCXX_PRIVATE_WARNINGS_DISABLE(GNU("-Wconversion"));
 BSONCXX_PRIVATE_IF_MSVC(BSONCXX_PRIVATE_PRAGMA(warning(push, 1));)
 
-#include <bson/bson.h>
+#include <bson/bson.h> // IWYU pragma: export
 
 BSONCXX_PRIVATE_WARNINGS_POP();
diff --git a/src/bsoncxx/lib/bsoncxx/private/export.hh b/src/bsoncxx/lib/bsoncxx/private/export.hh
index 26c729ee78..7ea0348e75 100644
--- a/src/bsoncxx/lib/bsoncxx/private/export.hh
+++ b/src/bsoncxx/lib/bsoncxx/private/export.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/config/export.hpp>
+#include <bsoncxx/v1/config/export.hpp> // IWYU pragma: export
 
 // The BSONCXX_TESTING macro is intended to be used for exporting symbols for testing which are not
 // normally exported as part of the bsoncxx library.  We currently use this workaround in lieu of
diff --git a/src/bsoncxx/lib/bsoncxx/private/make_unique.hh b/src/bsoncxx/lib/bsoncxx/private/make_unique.hh
index c9f66ecbf3..e56e3ff252 100644
--- a/src/bsoncxx/lib/bsoncxx/private/make_unique.hh
+++ b/src/bsoncxx/lib/bsoncxx/private/make_unique.hh
@@ -16,7 +16,7 @@
 
 #include <bsoncxx/v1/config/export.hpp>
 
-#include <memory>
+#include <memory> // IWYU pragma: export
 
 #pragma push_macro("BSONCXX_DETAIL_USE_STD_MAKE_UNIQUE")
 #undef BSONCXX_DETAIL_USE_STD_MAKE_UNIQUE
diff --git a/src/bsoncxx/lib/bsoncxx/private/type_traits.hh b/src/bsoncxx/lib/bsoncxx/private/type_traits.hh
index 4e70531926..beec5cdef3 100644
--- a/src/bsoncxx/lib/bsoncxx/private/type_traits.hh
+++ b/src/bsoncxx/lib/bsoncxx/private/type_traits.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/detail/type_traits.hpp>
+#include <bsoncxx/v1/detail/type_traits.hpp> // IWYU pragma: export
 
 namespace bsoncxx {
 
diff --git a/src/bsoncxx/lib/bsoncxx/v1/decimal128.cpp b/src/bsoncxx/lib/bsoncxx/v1/decimal128.cpp
index f46f76f780..61ecdbc48a 100644
--- a/src/bsoncxx/lib/bsoncxx/v1/decimal128.cpp
+++ b/src/bsoncxx/lib/bsoncxx/v1/decimal128.cpp
@@ -17,6 +17,7 @@
 //
 
 #include <bsoncxx/v1/exception.hpp>
+#include <bsoncxx/v1/stdx/string_view.hpp>
 
 #include <climits>
 #include <cstddef>
diff --git a/src/bsoncxx/lib/bsoncxx/v1/document/value.cpp b/src/bsoncxx/lib/bsoncxx/v1/document/value.cpp
index f44f5b0e05..01421fc404 100644
--- a/src/bsoncxx/lib/bsoncxx/v1/document/value.cpp
+++ b/src/bsoncxx/lib/bsoncxx/v1/document/value.cpp
@@ -16,6 +16,8 @@
 
 //
 
+#include <cstdint>
+
 #include <bsoncxx/private/type_traits.hh>
 
 namespace bsoncxx {
diff --git a/src/bsoncxx/lib/bsoncxx/v1/document/view.cpp b/src/bsoncxx/lib/bsoncxx/v1/document/view.cpp
index c2e128d3f0..254786ffd0 100644
--- a/src/bsoncxx/lib/bsoncxx/v1/document/view.cpp
+++ b/src/bsoncxx/lib/bsoncxx/v1/document/view.cpp
@@ -17,10 +17,13 @@
 //
 
 #include <bsoncxx/v1/exception.hpp>
+#include <bsoncxx/v1/stdx/string_view.hpp>
 
 #include <bsoncxx/v1/element/view.hh>
 
 #include <array>
+#include <climits>
+#include <cstddef>
 #include <cstdint>
 #include <string>
 #include <system_error>
diff --git a/src/bsoncxx/lib/bsoncxx/v1/document/view.hh b/src/bsoncxx/lib/bsoncxx/v1/document/view.hh
index 55554536ae..6574bb1c92 100644
--- a/src/bsoncxx/lib/bsoncxx/v1/document/view.hh
+++ b/src/bsoncxx/lib/bsoncxx/v1/document/view.hh
@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <bsoncxx/v1/document/view.hpp>
+#include <bsoncxx/v1/document/view.hpp> // IWYU pragma: export
 
 //
 
+#include <cstddef>
 #include <cstdint>
 
 namespace bsoncxx {
diff --git a/src/bsoncxx/lib/bsoncxx/v1/element/view.cpp b/src/bsoncxx/lib/bsoncxx/v1/element/view.cpp
index 8c571df4ff..b561001b29 100644
--- a/src/bsoncxx/lib/bsoncxx/v1/element/view.cpp
+++ b/src/bsoncxx/lib/bsoncxx/v1/element/view.cpp
@@ -16,13 +16,20 @@
 
 //
 
+#include <bsoncxx/v1/detail/macros.hpp>
 #include <bsoncxx/v1/document/view.hpp>
 #include <bsoncxx/v1/exception.hpp>
+#include <bsoncxx/v1/stdx/optional.hpp>
+#include <bsoncxx/v1/stdx/string_view.hpp>
 
 #include <bsoncxx/v1/types/value.hh>
 #include <bsoncxx/v1/types/view.hh>
 
+#include <array>
+#include <cstddef>
+#include <cstdint>
 #include <string>
+#include <system_error>
 
 #include <bsoncxx/private/bson.hh>
 #include <bsoncxx/private/immortal.hh>
diff --git a/src/bsoncxx/lib/bsoncxx/v1/element/view.hh b/src/bsoncxx/lib/bsoncxx/v1/element/view.hh
index ca04c86ffc..9aa474d949 100644
--- a/src/bsoncxx/lib/bsoncxx/v1/element/view.hh
+++ b/src/bsoncxx/lib/bsoncxx/v1/element/view.hh
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <bsoncxx/v1/element/view.hpp>
+#include <bsoncxx/v1/element/view.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/bsoncxx/lib/bsoncxx/v1/oid.cpp b/src/bsoncxx/lib/bsoncxx/v1/oid.cpp
index 48abed9834..20fcf67ce5 100644
--- a/src/bsoncxx/lib/bsoncxx/v1/oid.cpp
+++ b/src/bsoncxx/lib/bsoncxx/v1/oid.cpp
@@ -17,9 +17,13 @@
 //
 
 #include <bsoncxx/v1/exception.hpp>
+#include <bsoncxx/v1/stdx/string_view.hpp>
 
+#include <cstdint>
 #include <cstring>
+#include <ctime>
 #include <string>
+#include <system_error>
 
 #include <bsoncxx/private/bson.hh> // <winsock.h> via <bson/bson-compat.h>
 #include <bsoncxx/private/immortal.hh>
diff --git a/src/bsoncxx/lib/bsoncxx/v1/oid.hh b/src/bsoncxx/lib/bsoncxx/v1/oid.hh
index 3800374a59..7de18d6871 100644
--- a/src/bsoncxx/lib/bsoncxx/v1/oid.hh
+++ b/src/bsoncxx/lib/bsoncxx/v1/oid.hh
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <bsoncxx/v1/oid.hpp>
+#include <bsoncxx/v1/oid.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/bsoncxx/lib/bsoncxx/v1/types/value.cpp b/src/bsoncxx/lib/bsoncxx/v1/types/value.cpp
index 12fe51fa62..020b15fa85 100644
--- a/src/bsoncxx/lib/bsoncxx/v1/types/value.cpp
+++ b/src/bsoncxx/lib/bsoncxx/v1/types/value.cpp
@@ -18,10 +18,12 @@
 
 #include <bsoncxx/v1/array/view.hpp>
 #include <bsoncxx/v1/decimal128.hpp>
+#include <bsoncxx/v1/detail/macros.hpp>
 #include <bsoncxx/v1/document/view.hpp>
 #include <bsoncxx/v1/exception.hpp>
 #include <bsoncxx/v1/oid.hpp>
 #include <bsoncxx/v1/stdx/optional.hpp>
+#include <bsoncxx/v1/stdx/string_view.hpp>
 #include <bsoncxx/v1/types/id.hpp>
 
 #include <bsoncxx/v1/types/view.hh>
@@ -29,7 +31,10 @@
 #include <chrono>
 #include <cstddef>
 #include <cstdint>
+#include <cstring>
 #include <string>
+#include <system_error>
+#include <utility>
 
 #include <bsoncxx/private/bson.hh>
 #include <bsoncxx/private/immortal.hh>
diff --git a/src/bsoncxx/lib/bsoncxx/v1/types/value.hh b/src/bsoncxx/lib/bsoncxx/v1/types/value.hh
index 507a179c62..1771a19d73 100644
--- a/src/bsoncxx/lib/bsoncxx/v1/types/value.hh
+++ b/src/bsoncxx/lib/bsoncxx/v1/types/value.hh
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <bsoncxx/v1/types/value.hpp>
+#include <bsoncxx/v1/types/value.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/bsoncxx/lib/bsoncxx/v1/types/view.cpp b/src/bsoncxx/lib/bsoncxx/v1/types/view.cpp
index 7d42bc954e..6a8df8b362 100644
--- a/src/bsoncxx/lib/bsoncxx/v1/types/view.cpp
+++ b/src/bsoncxx/lib/bsoncxx/v1/types/view.cpp
@@ -29,7 +29,9 @@
 #include <chrono>
 #include <cstddef>
 #include <cstdint>
+#include <cstring>
 #include <string>
+#include <system_error>
 
 #include <bsoncxx/private/bson.hh>
 #include <bsoncxx/private/immortal.hh>
diff --git a/src/bsoncxx/lib/bsoncxx/v1/types/view.hh b/src/bsoncxx/lib/bsoncxx/v1/types/view.hh
index aaecd116a2..592eda5c54 100644
--- a/src/bsoncxx/lib/bsoncxx/v1/types/view.hh
+++ b/src/bsoncxx/lib/bsoncxx/v1/types/view.hh
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <bsoncxx/v1/types/view.hpp>
+#include <bsoncxx/v1/types/view.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/bsoncxx/test/catch.hh b/src/bsoncxx/test/catch.hh
index a64227614e..5fb67d493f 100644
--- a/src/bsoncxx/test/catch.hh
+++ b/src/bsoncxx/test/catch.hh
@@ -26,11 +26,11 @@
 #include <bsoncxx/stdx/operators.hpp>
 #include <bsoncxx/stdx/optional.hpp>
 
-#include <bsoncxx/test/stringify.hh>
-#include <bsoncxx/test/system_error.hh>
+#include <bsoncxx/test/stringify.hh>    // IWYU pragma: export
+#include <bsoncxx/test/system_error.hh> // IWYU pragma: export
 
-#include <catch2/catch_test_macros.hpp> // TEST_CASE, SECTION, CHECK, etc.
-#include <catch2/catch_tostring.hpp>    // Catch::StringMaker
+#include <catch2/catch_test_macros.hpp> // IWYU pragma: export // TEST_CASE, SECTION, CHECK, etc.
+#include <catch2/catch_tostring.hpp>    // IWYU pragma: export // Catch::StringMaker
 
 namespace Catch {
 
diff --git a/src/bsoncxx/test/exception_guard.cpp b/src/bsoncxx/test/exception_guard.cpp
index 02a6693954..76f934e16a 100644
--- a/src/bsoncxx/test/exception_guard.cpp
+++ b/src/bsoncxx/test/exception_guard.cpp
@@ -16,6 +16,8 @@
 
 //
 
+#include <bsoncxx/test/v1/stdx/string_view.hh>
+
 #include <atomic>
 #include <chrono>
 #include <stdexcept>
@@ -23,8 +25,7 @@
 #include <thread>
 #include <vector>
 
-#include <bsoncxx/test/catch.hh>
-
+#include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers_string.hpp>
 
 namespace {
@@ -36,9 +37,9 @@ TEST_CASE("bsoncxx::test::exception_guard", "[test]") {
 
     SECTION("init") {
         CHECK(eguard.ptr == nullptr);
-        CHECK(eguard.file == bsoncxx::stdx::string_view(""));
+        CHECK(eguard.file == bsoncxx::v1::stdx::string_view(""));
         CHECK(eguard.line == 0u);
-        CHECK(eguard.func == bsoncxx::stdx::string_view(""));
+        CHECK(eguard.func == bsoncxx::v1::stdx::string_view(""));
     }
 
     SECTION("reset") {
@@ -47,9 +48,9 @@ TEST_CASE("bsoncxx::test::exception_guard", "[test]") {
         // clang-format on
 
         CHECK(eguard.ptr == nullptr);
-        CHECK(eguard.file == bsoncxx::stdx::string_view(__FILE__));
+        CHECK(eguard.file == bsoncxx::v1::stdx::string_view(__FILE__));
         CHECK(eguard.line == line);
-        CHECK(eguard.func == bsoncxx::stdx::string_view(__func__));
+        CHECK(eguard.func == bsoncxx::v1::stdx::string_view(__func__));
     }
 
     SECTION("simple") {
@@ -58,9 +59,9 @@ TEST_CASE("bsoncxx::test::exception_guard", "[test]") {
             BSONCXX_TEST_EXCEPTION_GUARD_END(eguard);
 
             CHECK(eguard.ptr == nullptr);
-            CHECK(eguard.file == bsoncxx::stdx::string_view(""));
+            CHECK(eguard.file == bsoncxx::v1::stdx::string_view(""));
             CHECK(eguard.line == 0u);
-            CHECK(eguard.func == bsoncxx::stdx::string_view(""));
+            CHECK(eguard.func == bsoncxx::v1::stdx::string_view(""));
 
             BSONCXX_TEST_EXCEPTION_GUARD_CHECK(eguard);
             SUCCEED("no exception was thrown by the check");
@@ -121,7 +122,7 @@ TEST_CASE("bsoncxx::test::exception_guard", "[test]") {
             REQUIRE(eguard.ignored.size() == 1u);
             {
                 auto const& log = eguard.ignored[0];
-                auto const log_view = bsoncxx::stdx::string_view(log);
+                auto const log_view = bsoncxx::v1::stdx::string_view(log);
 
                 CAPTURE(log);
                 CAPTURE(expected.file);
@@ -143,7 +144,7 @@ TEST_CASE("bsoncxx::test::exception_guard", "[test]") {
             REQUIRE(eguard.ignored.size() == 2u);
             {
                 auto const& log = eguard.ignored[1];
-                auto const log_view = bsoncxx::stdx::string_view(log);
+                auto const log_view = bsoncxx::v1::stdx::string_view(log);
 
                 CAPTURE(log);
                 CAPTURE(expected.file);
diff --git a/src/bsoncxx/test/exception_guard.hh b/src/bsoncxx/test/exception_guard.hh
index b090572419..84ecbbb54c 100644
--- a/src/bsoncxx/test/exception_guard.hh
+++ b/src/bsoncxx/test/exception_guard.hh
@@ -14,16 +14,16 @@
 
 #pragma once
 
+#include <bsoncxx/test/v1/stdx/string_view.hh>
+
 #include <cstddef>
 #include <exception>
 #include <mutex>
-#include <sstream>
+#include <sstream> // IWYU pragma: keep
 #include <string>
 #include <vector>
 
-#include <bsoncxx/stdx/string_view.hpp>
-
-#include <bsoncxx/test/catch.hh>
+#include <catch2/catch_test_macros.hpp>
 
 namespace bsoncxx {
 namespace test {
@@ -31,9 +31,9 @@ namespace test {
 struct exception_guard_state {
     std::mutex m = {};
     std::exception_ptr ptr = {};
-    stdx::string_view file = {};
+    v1::stdx::string_view file = {};
     std::size_t line = {};
-    stdx::string_view func = {};
+    v1::stdx::string_view func = {};
     std::vector<std::string> ignored; // Cannot use INFO() in guarded regions.
 };
 
diff --git a/src/bsoncxx/test/stringify.hh b/src/bsoncxx/test/stringify.hh
index 1c348447a1..fe0e9e43a0 100644
--- a/src/bsoncxx/test/stringify.hh
+++ b/src/bsoncxx/test/stringify.hh
@@ -17,7 +17,7 @@
 #include <string>
 #include <type_traits>
 
-#include <catch2/catch_tostring.hpp>
+#include <catch2/catch_tostring.hpp> // IWYU pragma: export
 
 namespace bsoncxx {
 namespace test {
diff --git a/src/bsoncxx/test/system_error.hh b/src/bsoncxx/test/system_error.hh
index 2dc847a724..03cc05fbab 100644
--- a/src/bsoncxx/test/system_error.hh
+++ b/src/bsoncxx/test/system_error.hh
@@ -16,11 +16,12 @@
 
 #include <bsoncxx/v1/detail/macros.hpp>
 
+#include <string>
 #include <system_error>
 
 #include <bsoncxx/test/stringify.hh>
 
-#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp> // IWYU pragma: export
 #include <catch2/catch_tostring.hpp>
 
 #define THROWS_WITH_CODE_IMPL(_assertion, _expr, _code)                               \
diff --git a/src/bsoncxx/test/v1/array/value.cpp b/src/bsoncxx/test/v1/array/value.cpp
index 84fa94025f..77b48755da 100644
--- a/src/bsoncxx/test/v1/array/value.cpp
+++ b/src/bsoncxx/test/v1/array/value.cpp
@@ -16,12 +16,20 @@
 
 //
 
+#include <bsoncxx/test/v1/stdx/optional.hh>
 #include <bsoncxx/test/v1/types/view.hh>
 
+#include <cstddef>
 #include <cstdint>
+#include <cstring>
+#include <functional>
+#include <memory>
+#include <utility>
 
-#include <bsoncxx/test/catch.hh>
 #include <bsoncxx/test/stringify.hh>
+#include <bsoncxx/test/system_error.hh>
+
+#include <catch2/catch_test_macros.hpp>
 
 namespace {
 
diff --git a/src/bsoncxx/test/v1/array/value.hh b/src/bsoncxx/test/v1/array/value.hh
index c2161be241..30fc42ebbd 100644
--- a/src/bsoncxx/test/v1/array/value.hh
+++ b/src/bsoncxx/test/v1/array/value.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/array/value.hpp>
+#include <bsoncxx/v1/array/value.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/bsoncxx/test/v1/array/view.cpp b/src/bsoncxx/test/v1/array/view.cpp
index 09674fee8b..72394ffef7 100644
--- a/src/bsoncxx/test/v1/array/view.cpp
+++ b/src/bsoncxx/test/v1/array/view.cpp
@@ -17,10 +17,14 @@
 //
 
 #include <bsoncxx/test/v1/exception.hh>
+#include <bsoncxx/test/v1/stdx/string_view.hh>
 #include <bsoncxx/test/v1/types/value.hh>
 #include <bsoncxx/test/v1/types/view.hh>
 
+#include <cstddef>
 #include <cstdint>
+#include <cstring>
+#include <string>
 #include <system_error>
 
 #include <bsoncxx/test/stringify.hh>
diff --git a/src/bsoncxx/test/v1/array/view.hh b/src/bsoncxx/test/v1/array/view.hh
index 6bfc60d6da..2fb688a29d 100644
--- a/src/bsoncxx/test/v1/array/view.hh
+++ b/src/bsoncxx/test/v1/array/view.hh
@@ -14,12 +14,14 @@
 
 #pragma once
 
-#include <bsoncxx/v1/array/view.hpp>
+#include <bsoncxx/v1/array/view.hpp> // IWYU pragma: export
 
 //
 
 #include <bsoncxx/test/v1/element/view.hh> // StringMaker<bsoncxx::v1::element::view>
 
+#include <string>
+
 #include <bsoncxx/private/export.hh>
 
 #include <bsoncxx/test/stringify.hh>
diff --git a/src/bsoncxx/test/v1/decimal128.cpp b/src/bsoncxx/test/v1/decimal128.cpp
index 563f5647fb..77e0d5d57c 100644
--- a/src/bsoncxx/test/v1/decimal128.cpp
+++ b/src/bsoncxx/test/v1/decimal128.cpp
@@ -17,9 +17,12 @@
 //
 
 #include <bsoncxx/test/v1/exception.hh>
+#include <bsoncxx/test/v1/stdx/string_view.hh>
 
 #include <climits>
+#include <cstddef>
 #include <memory>
+#include <new>
 #include <string>
 #include <system_error>
 
diff --git a/src/bsoncxx/test/v1/decimal128.hh b/src/bsoncxx/test/v1/decimal128.hh
index cd1d72f5bb..990164de14 100644
--- a/src/bsoncxx/test/v1/decimal128.hh
+++ b/src/bsoncxx/test/v1/decimal128.hh
@@ -14,10 +14,12 @@
 
 #pragma once
 
-#include <bsoncxx/v1/decimal128.hpp>
+#include <bsoncxx/v1/decimal128.hpp> // IWYU pragma: export
 
 //
 
+#include <string>
+
 #include <catch2/catch_tostring.hpp>
 
 CATCH_REGISTER_ENUM(
diff --git a/src/bsoncxx/test/v1/detail/bit.hh b/src/bsoncxx/test/v1/detail/bit.hh
index a69234c7e2..dc3eda0554 100644
--- a/src/bsoncxx/test/v1/detail/bit.hh
+++ b/src/bsoncxx/test/v1/detail/bit.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/detail/bit.hpp>
+#include <bsoncxx/v1/detail/bit.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/bsoncxx/test/v1/document/value.cpp b/src/bsoncxx/test/v1/document/value.cpp
index fcd61ea71f..2ec70a50b9 100644
--- a/src/bsoncxx/test/v1/document/value.cpp
+++ b/src/bsoncxx/test/v1/document/value.cpp
@@ -16,21 +16,29 @@
 
 //
 
+#include <bsoncxx/v1/detail/macros.hpp>
+
 #include <bsoncxx/test/v1/document/view.hh>
+#include <bsoncxx/test/v1/stdx/optional.hh>
+#include <bsoncxx/test/v1/stdx/string_view.hh>
 #include <bsoncxx/test/v1/types/view.hh>
 
 #include <cstdint>
 #include <cstring>
 #include <functional>
+#include <memory>
+#include <ostream>
 #include <sstream>
+#include <stdexcept>
+#include <type_traits>
 #include <utility>
 
 #include <bsoncxx/private/type_traits.hh>
 
-#include <bsoncxx/test/catch.hh>
 #include <bsoncxx/test/stringify.hh>
 #include <bsoncxx/test/system_error.hh>
 
+#include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers_string.hpp>
 
 namespace {
diff --git a/src/bsoncxx/test/v1/document/value.hh b/src/bsoncxx/test/v1/document/value.hh
index 8d974007d0..bb81c4ad29 100644
--- a/src/bsoncxx/test/v1/document/value.hh
+++ b/src/bsoncxx/test/v1/document/value.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/document/value.hpp>
+#include <bsoncxx/v1/document/value.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/bsoncxx/test/v1/document/view.cpp b/src/bsoncxx/test/v1/document/view.cpp
index 860f3c2428..bec52c9e59 100644
--- a/src/bsoncxx/test/v1/document/view.cpp
+++ b/src/bsoncxx/test/v1/document/view.cpp
@@ -18,12 +18,17 @@
 
 #include <bsoncxx/test/v1/element/view.hh>
 #include <bsoncxx/test/v1/exception.hh>
+#include <bsoncxx/test/v1/stdx/string_view.hh>
 #include <bsoncxx/test/v1/types/id.hh>
 #include <bsoncxx/test/v1/types/value.hh>
 #include <bsoncxx/test/v1/types/view.hh>
 
 #include <climits>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
 #include <memory>
+#include <new>
 #include <string>
 #include <system_error>
 
diff --git a/src/bsoncxx/test/v1/document/view.hh b/src/bsoncxx/test/v1/document/view.hh
index 3a714bcf4c..c1231874ea 100644
--- a/src/bsoncxx/test/v1/document/view.hh
+++ b/src/bsoncxx/test/v1/document/view.hh
@@ -14,12 +14,14 @@
 
 #pragma once
 
-#include <bsoncxx/v1/document/view.hpp>
+#include <bsoncxx/v1/document/view.hpp> // IWYU pragma: export
 
 //
 
 #include <bsoncxx/test/v1/element/view.hh> // StringMaker<bsoncxx::v1::element::view>
 
+#include <string>
+
 #include <bsoncxx/private/export.hh>
 
 #include <bsoncxx/test/stringify.hh>
diff --git a/src/bsoncxx/test/v1/element/view.cpp b/src/bsoncxx/test/v1/element/view.cpp
index b4b6dd04e5..77a32688e4 100644
--- a/src/bsoncxx/test/v1/element/view.cpp
+++ b/src/bsoncxx/test/v1/element/view.cpp
@@ -21,6 +21,8 @@
 #include <bsoncxx/test/v1/types/value.hh>
 #include <bsoncxx/test/v1/types/view.hh>
 
+#include <cstdint>
+#include <cstring>
 #include <string>
 #include <system_error>
 
diff --git a/src/bsoncxx/test/v1/element/view.hh b/src/bsoncxx/test/v1/element/view.hh
index 3eee8e7355..be43e84ceb 100644
--- a/src/bsoncxx/test/v1/element/view.hh
+++ b/src/bsoncxx/test/v1/element/view.hh
@@ -14,10 +14,12 @@
 
 #pragma once
 
-#include <bsoncxx/v1/element/view.hpp>
+#include <bsoncxx/v1/element/view.hpp> // IWYU pragma: export
 
 //
 
+#include <string>
+
 #include <bsoncxx/private/export.hh>
 
 #include <catch2/catch_tostring.hpp>
diff --git a/src/bsoncxx/test/v1/exception.hh b/src/bsoncxx/test/v1/exception.hh
index 6b5d05e281..7e8fef1ddd 100644
--- a/src/bsoncxx/test/v1/exception.hh
+++ b/src/bsoncxx/test/v1/exception.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/exception.hpp>
+#include <bsoncxx/v1/exception.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/bsoncxx/test/v1/oid.cpp b/src/bsoncxx/test/v1/oid.cpp
index d3435c8ce9..ee8976b402 100644
--- a/src/bsoncxx/test/v1/oid.cpp
+++ b/src/bsoncxx/test/v1/oid.cpp
@@ -18,7 +18,9 @@
 
 #include <bsoncxx/test/v1/exception.hh>
 
+#include <cstdint>
 #include <ctime>
+#include <string>
 #include <system_error>
 #include <vector>
 
diff --git a/src/bsoncxx/test/v1/oid.hh b/src/bsoncxx/test/v1/oid.hh
index 45c167e806..6e66026313 100644
--- a/src/bsoncxx/test/v1/oid.hh
+++ b/src/bsoncxx/test/v1/oid.hh
@@ -14,10 +14,12 @@
 
 #pragma once
 
-#include <bsoncxx/v1/oid.hpp>
+#include <bsoncxx/v1/oid.hpp> // IWYU pragma: export
 
 //
 
+#include <string>
+
 #include <catch2/catch_tostring.hpp>
 
 CATCH_REGISTER_ENUM(
diff --git a/src/bsoncxx/test/v1/stdx/optional.hh b/src/bsoncxx/test/v1/stdx/optional.hh
index a68f2eb830..1ce6c909a7 100644
--- a/src/bsoncxx/test/v1/stdx/optional.hh
+++ b/src/bsoncxx/test/v1/stdx/optional.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/stdx/optional.hpp>
+#include <bsoncxx/v1/stdx/optional.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/bsoncxx/test/v1/stdx/string_view.hh b/src/bsoncxx/test/v1/stdx/string_view.hh
index 5a41cac651..a7f8e44885 100644
--- a/src/bsoncxx/test/v1/stdx/string_view.hh
+++ b/src/bsoncxx/test/v1/stdx/string_view.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/stdx/string_view.hpp>
+#include <bsoncxx/v1/stdx/string_view.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/bsoncxx/test/v1/stdx/string_view.test.cpp b/src/bsoncxx/test/v1/stdx/string_view.test.cpp
index 1bd235b85b..9b82cd8618 100644
--- a/src/bsoncxx/test/v1/stdx/string_view.test.cpp
+++ b/src/bsoncxx/test/v1/stdx/string_view.test.cpp
@@ -16,11 +16,10 @@
 
 //
 
-#include <initializer_list>
-#include <list>
 #include <stdexcept>
 #include <string>
 #include <type_traits>
+#include <vector>
 
 #ifdef __has_include
 #if __has_include(<version>)
diff --git a/src/bsoncxx/test/v1/stdx/type_traits.test.cpp b/src/bsoncxx/test/v1/stdx/type_traits.test.cpp
index d6de86f106..1f3f842b72 100644
--- a/src/bsoncxx/test/v1/stdx/type_traits.test.cpp
+++ b/src/bsoncxx/test/v1/stdx/type_traits.test.cpp
@@ -16,6 +16,8 @@
 
 //
 
+#include <bsoncxx/v1/detail/macros.hpp>
+
 #include <string>
 #include <type_traits>
 
diff --git a/src/bsoncxx/test/v1/types/id.cpp b/src/bsoncxx/test/v1/types/id.cpp
index a166d0326d..fee0edb225 100644
--- a/src/bsoncxx/test/v1/types/id.cpp
+++ b/src/bsoncxx/test/v1/types/id.cpp
@@ -18,6 +18,8 @@
 
 #include <bsoncxx/test/v1/stdx/string_view.hh>
 
+#include <cstdint>
+
 #include <bsoncxx/test/stringify.hh>
 
 #include <catch2/catch_test_macros.hpp>
diff --git a/src/bsoncxx/test/v1/types/id.hh b/src/bsoncxx/test/v1/types/id.hh
index 3ea83465ab..a238683b87 100644
--- a/src/bsoncxx/test/v1/types/id.hh
+++ b/src/bsoncxx/test/v1/types/id.hh
@@ -14,10 +14,12 @@
 
 #pragma once
 
-#include <bsoncxx/v1/types/id.hpp>
+#include <bsoncxx/v1/types/id.hpp> // IWYU pragma: export
 
 //
 
+#include <string>
+
 #include <bsoncxx/test/stringify.hh>
 
 template <>
diff --git a/src/bsoncxx/test/v1/types/value.cpp b/src/bsoncxx/test/v1/types/value.cpp
index 0914d2b5fb..fb2bc74c04 100644
--- a/src/bsoncxx/test/v1/types/value.cpp
+++ b/src/bsoncxx/test/v1/types/value.cpp
@@ -16,6 +16,7 @@
 
 //
 
+#include <bsoncxx/v1/detail/macros.hpp>
 #include <bsoncxx/v1/detail/type_traits.hpp>
 
 #include <bsoncxx/v1/types/value.hh>
@@ -24,16 +25,22 @@
 #include <bsoncxx/test/v1/detail/bit.hh>
 #include <bsoncxx/test/v1/document/view.hh>
 #include <bsoncxx/test/v1/exception.hh>
+#include <bsoncxx/test/v1/stdx/string_view.hh>
 #include <bsoncxx/test/v1/types/id.hh>
 #include <bsoncxx/test/v1/types/value.hh>
 #include <bsoncxx/test/v1/types/view.hh>
 
+#include <chrono>
+#include <cstddef>
 #include <cstdint>
+#include <new>
 #include <string>
 #include <system_error>
 #include <type_traits>
 #include <utility>
+#include <vector>
 
+#include <bsoncxx/private/bson.hh>
 #include <bsoncxx/private/make_unique.hh>
 
 #include <bsoncxx/test/stringify.hh>
diff --git a/src/bsoncxx/test/v1/types/value.hh b/src/bsoncxx/test/v1/types/value.hh
index 807a061c9a..4a526c0637 100644
--- a/src/bsoncxx/test/v1/types/value.hh
+++ b/src/bsoncxx/test/v1/types/value.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/types/value.hpp>
+#include <bsoncxx/v1/types/value.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/bsoncxx/test/v1/types/view.cpp b/src/bsoncxx/test/v1/types/view.cpp
index 5c3e7f9cfe..b83f79cfcc 100644
--- a/src/bsoncxx/test/v1/types/view.cpp
+++ b/src/bsoncxx/test/v1/types/view.cpp
@@ -16,12 +16,17 @@
 
 //
 
+#include <bsoncxx/v1/detail/macros.hpp>
+
 #include <bsoncxx/test/v1/document/view.hh>
 #include <bsoncxx/test/v1/exception.hh>
+#include <bsoncxx/test/v1/stdx/string_view.hh>
 #include <bsoncxx/test/v1/types/id.hh>
 #include <bsoncxx/test/v1/types/value.hh>
 #include <bsoncxx/test/v1/types/view.hh>
 
+#include <chrono>
+#include <cstdint>
 #include <string>
 #include <system_error>
 
diff --git a/src/bsoncxx/test/v1/types/view.hh b/src/bsoncxx/test/v1/types/view.hh
index a09af35922..041b91e685 100644
--- a/src/bsoncxx/test/v1/types/view.hh
+++ b/src/bsoncxx/test/v1/types/view.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <bsoncxx/v1/types/view.hpp>
+#include <bsoncxx/v1/types/view.hpp> // IWYU pragma: export
 
 //
 
@@ -24,8 +24,12 @@
 #include <bsoncxx/test/v1/oid.hh>              // StringMaker<bsoncxx::v1::oid>
 #include <bsoncxx/test/v1/stdx/string_view.hh> // StringMaker<bsoncxx::v1::stdx::string_view>
 
+#include <chrono>
+#include <cstdint>
 #include <iomanip>
+#include <ios>
 #include <sstream>
+#include <string>
 #include <utility>
 
 #include <bsoncxx/test/stringify.hh>
diff --git a/src/mongocxx/include/mongocxx/v1/aggregate_options.hpp b/src/mongocxx/include/mongocxx/v1/aggregate_options.hpp
index 8e3b5f5cf3..b23e62c726 100644
--- a/src/mongocxx/include/mongocxx/v1/aggregate_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/aggregate_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/aggregate_options-fwd.hpp>
+#include <mongocxx/v1/aggregate_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/apm.hpp b/src/mongocxx/include/mongocxx/v1/apm.hpp
index f8cb6da874..aa6b6402d7 100644
--- a/src/mongocxx/include/mongocxx/v1/apm.hpp
+++ b/src/mongocxx/include/mongocxx/v1/apm.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/apm-fwd.hpp>
+#include <mongocxx/v1/apm-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/auto_encryption_options.hpp b/src/mongocxx/include/mongocxx/v1/auto_encryption_options.hpp
index 2e9d84d536..922ca7d01a 100644
--- a/src/mongocxx/include/mongocxx/v1/auto_encryption_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/auto_encryption_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/auto_encryption_options-fwd.hpp>
+#include <mongocxx/v1/auto_encryption_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/change_stream.hpp b/src/mongocxx/include/mongocxx/v1/change_stream.hpp
index 87ae2c7b0d..5c49a9d7d7 100644
--- a/src/mongocxx/include/mongocxx/v1/change_stream.hpp
+++ b/src/mongocxx/include/mongocxx/v1/change_stream.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/change_stream-fwd.hpp>
+#include <mongocxx/v1/change_stream-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/client.hpp b/src/mongocxx/include/mongocxx/v1/client.hpp
index 964eca92fe..98a35e4fa8 100644
--- a/src/mongocxx/include/mongocxx/v1/client.hpp
+++ b/src/mongocxx/include/mongocxx/v1/client.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/client-fwd.hpp>
+#include <mongocxx/v1/client-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/client_encryption.hpp b/src/mongocxx/include/mongocxx/v1/client_encryption.hpp
index f071fb854f..77a4cf5f27 100644
--- a/src/mongocxx/include/mongocxx/v1/client_encryption.hpp
+++ b/src/mongocxx/include/mongocxx/v1/client_encryption.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/client_encryption-fwd.hpp>
+#include <mongocxx/v1/client_encryption-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/client_session.hpp b/src/mongocxx/include/mongocxx/v1/client_session.hpp
index 6ce2a1439f..d90c57731a 100644
--- a/src/mongocxx/include/mongocxx/v1/client_session.hpp
+++ b/src/mongocxx/include/mongocxx/v1/client_session.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/client_session-fwd.hpp>
+#include <mongocxx/v1/client_session-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/collection.hpp b/src/mongocxx/include/mongocxx/v1/collection.hpp
index 82acec22d3..76136a5876 100644
--- a/src/mongocxx/include/mongocxx/v1/collection.hpp
+++ b/src/mongocxx/include/mongocxx/v1/collection.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/collection-fwd.hpp>
+#include <mongocxx/v1/collection-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/count_options.hpp b/src/mongocxx/include/mongocxx/v1/count_options.hpp
index 4bda3df162..c9fc8ffd2c 100644
--- a/src/mongocxx/include/mongocxx/v1/count_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/count_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/count_options-fwd.hpp>
+#include <mongocxx/v1/count_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/cursor.hpp b/src/mongocxx/include/mongocxx/v1/cursor.hpp
index 80bde5ac66..81ad62d9ae 100644
--- a/src/mongocxx/include/mongocxx/v1/cursor.hpp
+++ b/src/mongocxx/include/mongocxx/v1/cursor.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/cursor-fwd.hpp>
+#include <mongocxx/v1/cursor-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/data_key_options.hpp b/src/mongocxx/include/mongocxx/v1/data_key_options.hpp
index 2db89d5fb4..57c87052c4 100644
--- a/src/mongocxx/include/mongocxx/v1/data_key_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/data_key_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/data_key_options-fwd.hpp>
+#include <mongocxx/v1/data_key_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/database.hpp b/src/mongocxx/include/mongocxx/v1/database.hpp
index 1d16cdfd50..a91293fce4 100644
--- a/src/mongocxx/include/mongocxx/v1/database.hpp
+++ b/src/mongocxx/include/mongocxx/v1/database.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/database-fwd.hpp>
+#include <mongocxx/v1/database-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/delete_many_options.hpp b/src/mongocxx/include/mongocxx/v1/delete_many_options.hpp
index 486ab411c8..07c48b59ee 100644
--- a/src/mongocxx/include/mongocxx/v1/delete_many_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/delete_many_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/delete_many_options-fwd.hpp>
+#include <mongocxx/v1/delete_many_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/delete_many_result.hpp b/src/mongocxx/include/mongocxx/v1/delete_many_result.hpp
index b46434a78b..acf01a0ec7 100644
--- a/src/mongocxx/include/mongocxx/v1/delete_many_result.hpp
+++ b/src/mongocxx/include/mongocxx/v1/delete_many_result.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/delete_many_result-fwd.hpp>
+#include <mongocxx/v1/delete_many_result-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/delete_one_options.hpp b/src/mongocxx/include/mongocxx/v1/delete_one_options.hpp
index 022c67ce39..f8bc627a53 100644
--- a/src/mongocxx/include/mongocxx/v1/delete_one_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/delete_one_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/delete_one_options-fwd.hpp>
+#include <mongocxx/v1/delete_one_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/delete_one_result.hpp b/src/mongocxx/include/mongocxx/v1/delete_one_result.hpp
index 94d0f70837..e7e5a5aa8c 100644
--- a/src/mongocxx/include/mongocxx/v1/delete_one_result.hpp
+++ b/src/mongocxx/include/mongocxx/v1/delete_one_result.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/delete_one_result-fwd.hpp>
+#include <mongocxx/v1/delete_one_result-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/distinct_options.hpp b/src/mongocxx/include/mongocxx/v1/distinct_options.hpp
index ea9da71e30..9af25c374b 100644
--- a/src/mongocxx/include/mongocxx/v1/distinct_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/distinct_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/distinct_options-fwd.hpp>
+#include <mongocxx/v1/distinct_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/encrypt_options.hpp b/src/mongocxx/include/mongocxx/v1/encrypt_options.hpp
index e61266c133..413bee7bce 100644
--- a/src/mongocxx/include/mongocxx/v1/encrypt_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/encrypt_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/encrypt_options-fwd.hpp>
+#include <mongocxx/v1/encrypt_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/estimated_document_count_options.hpp b/src/mongocxx/include/mongocxx/v1/estimated_document_count_options.hpp
index a5006e761a..358e461413 100644
--- a/src/mongocxx/include/mongocxx/v1/estimated_document_count_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/estimated_document_count_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/estimated_document_count_options-fwd.hpp>
+#include <mongocxx/v1/estimated_document_count_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/events/command_failed.hpp b/src/mongocxx/include/mongocxx/v1/events/command_failed.hpp
index c0ec2f898d..63f2182adb 100644
--- a/src/mongocxx/include/mongocxx/v1/events/command_failed.hpp
+++ b/src/mongocxx/include/mongocxx/v1/events/command_failed.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/events/command_failed-fwd.hpp>
+#include <mongocxx/v1/events/command_failed-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/events/command_started.hpp b/src/mongocxx/include/mongocxx/v1/events/command_started.hpp
index a5f9c41d37..2d6acd3b9b 100644
--- a/src/mongocxx/include/mongocxx/v1/events/command_started.hpp
+++ b/src/mongocxx/include/mongocxx/v1/events/command_started.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/events/command_started-fwd.hpp>
+#include <mongocxx/v1/events/command_started-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/events/command_succeeded.hpp b/src/mongocxx/include/mongocxx/v1/events/command_succeeded.hpp
index 534e3763c0..8416b00abf 100644
--- a/src/mongocxx/include/mongocxx/v1/events/command_succeeded.hpp
+++ b/src/mongocxx/include/mongocxx/v1/events/command_succeeded.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/events/command_succeeded-fwd.hpp>
+#include <mongocxx/v1/events/command_succeeded-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/events/server_closed.hpp b/src/mongocxx/include/mongocxx/v1/events/server_closed.hpp
index c3a04e4411..a9464916b6 100644
--- a/src/mongocxx/include/mongocxx/v1/events/server_closed.hpp
+++ b/src/mongocxx/include/mongocxx/v1/events/server_closed.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/events/server_closed-fwd.hpp>
+#include <mongocxx/v1/events/server_closed-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/events/server_description.hpp b/src/mongocxx/include/mongocxx/v1/events/server_description.hpp
index 389427057e..cb0d38ab72 100644
--- a/src/mongocxx/include/mongocxx/v1/events/server_description.hpp
+++ b/src/mongocxx/include/mongocxx/v1/events/server_description.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/events/server_description-fwd.hpp>
+#include <mongocxx/v1/events/server_description-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/events/server_description_changed.hpp b/src/mongocxx/include/mongocxx/v1/events/server_description_changed.hpp
index 9421a55efe..97e2b9201f 100644
--- a/src/mongocxx/include/mongocxx/v1/events/server_description_changed.hpp
+++ b/src/mongocxx/include/mongocxx/v1/events/server_description_changed.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/events/server_description_changed-fwd.hpp>
+#include <mongocxx/v1/events/server_description_changed-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/events/server_heartbeat_failed.hpp b/src/mongocxx/include/mongocxx/v1/events/server_heartbeat_failed.hpp
index ae27b4b430..e41b4e7d51 100644
--- a/src/mongocxx/include/mongocxx/v1/events/server_heartbeat_failed.hpp
+++ b/src/mongocxx/include/mongocxx/v1/events/server_heartbeat_failed.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/events/server_heartbeat_failed-fwd.hpp>
+#include <mongocxx/v1/events/server_heartbeat_failed-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/events/server_heartbeat_started.hpp b/src/mongocxx/include/mongocxx/v1/events/server_heartbeat_started.hpp
index b3193a114f..31b27ba3e5 100644
--- a/src/mongocxx/include/mongocxx/v1/events/server_heartbeat_started.hpp
+++ b/src/mongocxx/include/mongocxx/v1/events/server_heartbeat_started.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/events/server_heartbeat_started-fwd.hpp>
+#include <mongocxx/v1/events/server_heartbeat_started-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/events/server_heartbeat_succeeded.hpp b/src/mongocxx/include/mongocxx/v1/events/server_heartbeat_succeeded.hpp
index 4fc3aaf5dc..94b99c5025 100644
--- a/src/mongocxx/include/mongocxx/v1/events/server_heartbeat_succeeded.hpp
+++ b/src/mongocxx/include/mongocxx/v1/events/server_heartbeat_succeeded.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/events/server_heartbeat_succeeded-fwd.hpp>
+#include <mongocxx/v1/events/server_heartbeat_succeeded-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/events/server_opening.hpp b/src/mongocxx/include/mongocxx/v1/events/server_opening.hpp
index 7e5d4b2c63..ee4f2f55d5 100644
--- a/src/mongocxx/include/mongocxx/v1/events/server_opening.hpp
+++ b/src/mongocxx/include/mongocxx/v1/events/server_opening.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/events/server_opening-fwd.hpp>
+#include <mongocxx/v1/events/server_opening-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/events/topology_closed.hpp b/src/mongocxx/include/mongocxx/v1/events/topology_closed.hpp
index 7317f7f669..1a72b92f59 100644
--- a/src/mongocxx/include/mongocxx/v1/events/topology_closed.hpp
+++ b/src/mongocxx/include/mongocxx/v1/events/topology_closed.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/events/topology_closed-fwd.hpp>
+#include <mongocxx/v1/events/topology_closed-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/events/topology_description.hpp b/src/mongocxx/include/mongocxx/v1/events/topology_description.hpp
index 0d092d213b..effd814937 100644
--- a/src/mongocxx/include/mongocxx/v1/events/topology_description.hpp
+++ b/src/mongocxx/include/mongocxx/v1/events/topology_description.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/events/topology_description-fwd.hpp>
+#include <mongocxx/v1/events/topology_description-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/events/topology_description_changed.hpp b/src/mongocxx/include/mongocxx/v1/events/topology_description_changed.hpp
index b95a8974b0..9101fa3643 100644
--- a/src/mongocxx/include/mongocxx/v1/events/topology_description_changed.hpp
+++ b/src/mongocxx/include/mongocxx/v1/events/topology_description_changed.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/events/topology_description_changed-fwd.hpp>
+#include <mongocxx/v1/events/topology_description_changed-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/events/topology_opening.hpp b/src/mongocxx/include/mongocxx/v1/events/topology_opening.hpp
index 6eb2fee32f..6276cb6acd 100644
--- a/src/mongocxx/include/mongocxx/v1/events/topology_opening.hpp
+++ b/src/mongocxx/include/mongocxx/v1/events/topology_opening.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/events/topology_opening-fwd.hpp>
+#include <mongocxx/v1/events/topology_opening-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/exception.hpp b/src/mongocxx/include/mongocxx/v1/exception.hpp
index 5a2e8845f7..66e5a3ec25 100644
--- a/src/mongocxx/include/mongocxx/v1/exception.hpp
+++ b/src/mongocxx/include/mongocxx/v1/exception.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/exception-fwd.hpp>
+#include <mongocxx/v1/exception-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/find_one_and_delete_options.hpp b/src/mongocxx/include/mongocxx/v1/find_one_and_delete_options.hpp
index cb2c8a27e7..97135c1309 100644
--- a/src/mongocxx/include/mongocxx/v1/find_one_and_delete_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/find_one_and_delete_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/find_one_and_delete_options-fwd.hpp>
+#include <mongocxx/v1/find_one_and_delete_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/find_one_and_replace_options.hpp b/src/mongocxx/include/mongocxx/v1/find_one_and_replace_options.hpp
index 3d089d3424..e83668646a 100644
--- a/src/mongocxx/include/mongocxx/v1/find_one_and_replace_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/find_one_and_replace_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/find_one_and_replace_options-fwd.hpp>
+#include <mongocxx/v1/find_one_and_replace_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/find_one_and_update_options.hpp b/src/mongocxx/include/mongocxx/v1/find_one_and_update_options.hpp
index f5bef75d2b..bb6ef30c20 100644
--- a/src/mongocxx/include/mongocxx/v1/find_one_and_update_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/find_one_and_update_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/find_one_and_update_options-fwd.hpp>
+#include <mongocxx/v1/find_one_and_update_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/find_options.hpp b/src/mongocxx/include/mongocxx/v1/find_options.hpp
index 4178ecea66..31651292a0 100644
--- a/src/mongocxx/include/mongocxx/v1/find_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/find_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/find_options-fwd.hpp>
+#include <mongocxx/v1/find_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/gridfs/bucket.hpp b/src/mongocxx/include/mongocxx/v1/gridfs/bucket.hpp
index 4cb5c55141..dda260b9a8 100644
--- a/src/mongocxx/include/mongocxx/v1/gridfs/bucket.hpp
+++ b/src/mongocxx/include/mongocxx/v1/gridfs/bucket.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/gridfs/bucket-fwd.hpp>
+#include <mongocxx/v1/gridfs/bucket-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/gridfs/downloader.hpp b/src/mongocxx/include/mongocxx/v1/gridfs/downloader.hpp
index 8c468c9796..7612a5dcb6 100644
--- a/src/mongocxx/include/mongocxx/v1/gridfs/downloader.hpp
+++ b/src/mongocxx/include/mongocxx/v1/gridfs/downloader.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/gridfs/downloader-fwd.hpp>
+#include <mongocxx/v1/gridfs/downloader-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/gridfs/upload_options.hpp b/src/mongocxx/include/mongocxx/v1/gridfs/upload_options.hpp
index 25bd8e9fc9..da666890cd 100644
--- a/src/mongocxx/include/mongocxx/v1/gridfs/upload_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/gridfs/upload_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/gridfs/upload_options-fwd.hpp>
+#include <mongocxx/v1/gridfs/upload_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/gridfs/upload_result.hpp b/src/mongocxx/include/mongocxx/v1/gridfs/upload_result.hpp
index a62b35ba2b..f6242f04da 100644
--- a/src/mongocxx/include/mongocxx/v1/gridfs/upload_result.hpp
+++ b/src/mongocxx/include/mongocxx/v1/gridfs/upload_result.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/gridfs/upload_result-fwd.hpp>
+#include <mongocxx/v1/gridfs/upload_result-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/gridfs/uploader.hpp b/src/mongocxx/include/mongocxx/v1/gridfs/uploader.hpp
index 34574053b4..66fd4b9d8e 100644
--- a/src/mongocxx/include/mongocxx/v1/gridfs/uploader.hpp
+++ b/src/mongocxx/include/mongocxx/v1/gridfs/uploader.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/gridfs/uploader-fwd.hpp>
+#include <mongocxx/v1/gridfs/uploader-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/hint.hpp b/src/mongocxx/include/mongocxx/v1/hint.hpp
index 6aafa91205..5291c2b465 100644
--- a/src/mongocxx/include/mongocxx/v1/hint.hpp
+++ b/src/mongocxx/include/mongocxx/v1/hint.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/hint-fwd.hpp>
+#include <mongocxx/v1/hint-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/indexes.hpp b/src/mongocxx/include/mongocxx/v1/indexes.hpp
index 5a82652dac..a78543e149 100644
--- a/src/mongocxx/include/mongocxx/v1/indexes.hpp
+++ b/src/mongocxx/include/mongocxx/v1/indexes.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/indexes-fwd.hpp>
+#include <mongocxx/v1/indexes-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/insert_many_options.hpp b/src/mongocxx/include/mongocxx/v1/insert_many_options.hpp
index ba97e03dac..3b943ebc24 100644
--- a/src/mongocxx/include/mongocxx/v1/insert_many_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/insert_many_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/insert_many_options-fwd.hpp>
+#include <mongocxx/v1/insert_many_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/insert_many_result.hpp b/src/mongocxx/include/mongocxx/v1/insert_many_result.hpp
index bebb6ad5ec..0b0f8a7df2 100644
--- a/src/mongocxx/include/mongocxx/v1/insert_many_result.hpp
+++ b/src/mongocxx/include/mongocxx/v1/insert_many_result.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/insert_many_result-fwd.hpp>
+#include <mongocxx/v1/insert_many_result-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/insert_one_options.hpp b/src/mongocxx/include/mongocxx/v1/insert_one_options.hpp
index 64982fe0ca..1428e160d0 100644
--- a/src/mongocxx/include/mongocxx/v1/insert_one_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/insert_one_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/insert_one_options-fwd.hpp>
+#include <mongocxx/v1/insert_one_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/insert_one_result.hpp b/src/mongocxx/include/mongocxx/v1/insert_one_result.hpp
index 4c00ce09b4..d260b250e7 100644
--- a/src/mongocxx/include/mongocxx/v1/insert_one_result.hpp
+++ b/src/mongocxx/include/mongocxx/v1/insert_one_result.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/insert_one_result-fwd.hpp>
+#include <mongocxx/v1/insert_one_result-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/instance.hpp b/src/mongocxx/include/mongocxx/v1/instance.hpp
index cfd2236b25..fef0f6787c 100644
--- a/src/mongocxx/include/mongocxx/v1/instance.hpp
+++ b/src/mongocxx/include/mongocxx/v1/instance.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/instance-fwd.hpp>
+#include <mongocxx/v1/instance-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/logger-fwd.hpp b/src/mongocxx/include/mongocxx/v1/logger-fwd.hpp
index 2b57d2b06a..cfb4ace0b4 100644
--- a/src/mongocxx/include/mongocxx/v1/logger-fwd.hpp
+++ b/src/mongocxx/include/mongocxx/v1/logger-fwd.hpp
@@ -16,8 +16,6 @@
 
 #include <mongocxx/v1/detail/prelude.hpp>
 
-//
-
 #include <mongocxx/v1/config/export.hpp>
 
 namespace mongocxx {
diff --git a/src/mongocxx/include/mongocxx/v1/logger.hpp b/src/mongocxx/include/mongocxx/v1/logger.hpp
index 5aba2e9316..576c9f1053 100644
--- a/src/mongocxx/include/mongocxx/v1/logger.hpp
+++ b/src/mongocxx/include/mongocxx/v1/logger.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/logger-fwd.hpp>
+#include <mongocxx/v1/logger-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/pipeline.hpp b/src/mongocxx/include/mongocxx/v1/pipeline.hpp
index 1169b5d608..8a3b6e81b9 100644
--- a/src/mongocxx/include/mongocxx/v1/pipeline.hpp
+++ b/src/mongocxx/include/mongocxx/v1/pipeline.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/pipeline-fwd.hpp>
+#include <mongocxx/v1/pipeline-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/pool.hpp b/src/mongocxx/include/mongocxx/v1/pool.hpp
index 7962f8eabb..e787a0f33e 100644
--- a/src/mongocxx/include/mongocxx/v1/pool.hpp
+++ b/src/mongocxx/include/mongocxx/v1/pool.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/pool-fwd.hpp>
+#include <mongocxx/v1/pool-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/range_options.hpp b/src/mongocxx/include/mongocxx/v1/range_options.hpp
index a3ac2ce760..27cf1f683a 100644
--- a/src/mongocxx/include/mongocxx/v1/range_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/range_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/range_options-fwd.hpp>
+#include <mongocxx/v1/range_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/read_concern.hpp b/src/mongocxx/include/mongocxx/v1/read_concern.hpp
index 2cb5de4de3..97bc428a43 100644
--- a/src/mongocxx/include/mongocxx/v1/read_concern.hpp
+++ b/src/mongocxx/include/mongocxx/v1/read_concern.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/read_concern-fwd.hpp>
+#include <mongocxx/v1/read_concern-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/read_preference.hpp b/src/mongocxx/include/mongocxx/v1/read_preference.hpp
index 89cfd4c190..19612acf78 100644
--- a/src/mongocxx/include/mongocxx/v1/read_preference.hpp
+++ b/src/mongocxx/include/mongocxx/v1/read_preference.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/read_preference-fwd.hpp>
+#include <mongocxx/v1/read_preference-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/replace_one_options.hpp b/src/mongocxx/include/mongocxx/v1/replace_one_options.hpp
index 9fae0560bd..d6ffc6182d 100644
--- a/src/mongocxx/include/mongocxx/v1/replace_one_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/replace_one_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/replace_one_options-fwd.hpp>
+#include <mongocxx/v1/replace_one_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/replace_one_result.hpp b/src/mongocxx/include/mongocxx/v1/replace_one_result.hpp
index 843e47ffb4..d06bfdc5bb 100644
--- a/src/mongocxx/include/mongocxx/v1/replace_one_result.hpp
+++ b/src/mongocxx/include/mongocxx/v1/replace_one_result.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/replace_one_result-fwd.hpp>
+#include <mongocxx/v1/replace_one_result-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/return_document.hpp b/src/mongocxx/include/mongocxx/v1/return_document.hpp
index 08ffec753b..2afabaf417 100644
--- a/src/mongocxx/include/mongocxx/v1/return_document.hpp
+++ b/src/mongocxx/include/mongocxx/v1/return_document.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/return_document-fwd.hpp>
+#include <mongocxx/v1/return_document-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/rewrap_many_datakey_options.hpp b/src/mongocxx/include/mongocxx/v1/rewrap_many_datakey_options.hpp
index d67d3e30c6..e299ec6971 100644
--- a/src/mongocxx/include/mongocxx/v1/rewrap_many_datakey_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/rewrap_many_datakey_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/rewrap_many_datakey_options-fwd.hpp>
+#include <mongocxx/v1/rewrap_many_datakey_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/rewrap_many_datakey_result.hpp b/src/mongocxx/include/mongocxx/v1/rewrap_many_datakey_result.hpp
index cf94b863e1..5c957ee390 100644
--- a/src/mongocxx/include/mongocxx/v1/rewrap_many_datakey_result.hpp
+++ b/src/mongocxx/include/mongocxx/v1/rewrap_many_datakey_result.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/rewrap_many_datakey_result-fwd.hpp>
+#include <mongocxx/v1/rewrap_many_datakey_result-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/search_indexes.hpp b/src/mongocxx/include/mongocxx/v1/search_indexes.hpp
index f6835c3108..177700d972 100644
--- a/src/mongocxx/include/mongocxx/v1/search_indexes.hpp
+++ b/src/mongocxx/include/mongocxx/v1/search_indexes.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/search_indexes-fwd.hpp>
+#include <mongocxx/v1/search_indexes-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/server_api.hpp b/src/mongocxx/include/mongocxx/v1/server_api.hpp
index 91b19027fd..1875dd71ba 100644
--- a/src/mongocxx/include/mongocxx/v1/server_api.hpp
+++ b/src/mongocxx/include/mongocxx/v1/server_api.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/server_api-fwd.hpp>
+#include <mongocxx/v1/server_api-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/server_error.hpp b/src/mongocxx/include/mongocxx/v1/server_error.hpp
index 7ca8863492..e37308c9b2 100644
--- a/src/mongocxx/include/mongocxx/v1/server_error.hpp
+++ b/src/mongocxx/include/mongocxx/v1/server_error.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/server_error-fwd.hpp>
+#include <mongocxx/v1/server_error-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/tls.hpp b/src/mongocxx/include/mongocxx/v1/tls.hpp
index 1162f9a266..f509f35669 100644
--- a/src/mongocxx/include/mongocxx/v1/tls.hpp
+++ b/src/mongocxx/include/mongocxx/v1/tls.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/tls-fwd.hpp>
+#include <mongocxx/v1/tls-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/transaction.hpp b/src/mongocxx/include/mongocxx/v1/transaction.hpp
index 7bcb163159..7279d201c8 100644
--- a/src/mongocxx/include/mongocxx/v1/transaction.hpp
+++ b/src/mongocxx/include/mongocxx/v1/transaction.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/transaction-fwd.hpp>
+#include <mongocxx/v1/transaction-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/update_many_options.hpp b/src/mongocxx/include/mongocxx/v1/update_many_options.hpp
index 6d20a3ebbd..5a38712ec8 100644
--- a/src/mongocxx/include/mongocxx/v1/update_many_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/update_many_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/update_many_options-fwd.hpp>
+#include <mongocxx/v1/update_many_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/update_many_result.hpp b/src/mongocxx/include/mongocxx/v1/update_many_result.hpp
index d05c3959af..53d7491273 100644
--- a/src/mongocxx/include/mongocxx/v1/update_many_result.hpp
+++ b/src/mongocxx/include/mongocxx/v1/update_many_result.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/update_many_result-fwd.hpp>
+#include <mongocxx/v1/update_many_result-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/update_one_options.hpp b/src/mongocxx/include/mongocxx/v1/update_one_options.hpp
index ea4d4ab621..5ef27a8306 100644
--- a/src/mongocxx/include/mongocxx/v1/update_one_options.hpp
+++ b/src/mongocxx/include/mongocxx/v1/update_one_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/update_one_options-fwd.hpp>
+#include <mongocxx/v1/update_one_options-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/update_one_result.hpp b/src/mongocxx/include/mongocxx/v1/update_one_result.hpp
index ebf3df6aa3..db70886d54 100644
--- a/src/mongocxx/include/mongocxx/v1/update_one_result.hpp
+++ b/src/mongocxx/include/mongocxx/v1/update_one_result.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/update_one_result-fwd.hpp>
+#include <mongocxx/v1/update_one_result-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/uri.hpp b/src/mongocxx/include/mongocxx/v1/uri.hpp
index d23a8a4e80..a35046188c 100644
--- a/src/mongocxx/include/mongocxx/v1/uri.hpp
+++ b/src/mongocxx/include/mongocxx/v1/uri.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/uri-fwd.hpp>
+#include <mongocxx/v1/uri-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v1/write_concern.hpp b/src/mongocxx/include/mongocxx/v1/write_concern.hpp
index aa07b17b3e..451d547c4b 100644
--- a/src/mongocxx/include/mongocxx/v1/write_concern.hpp
+++ b/src/mongocxx/include/mongocxx/v1/write_concern.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/write_concern-fwd.hpp>
+#include <mongocxx/v1/write_concern-fwd.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/config.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/config.hpp
index 1dc5b27aa6..d4f9806b88 100644
--- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/config.hpp
+++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/config.hpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // For backward compatibility.
-#include <mongocxx/v1/config/config.hpp>
+#include <mongocxx/v1/config/config.hpp> // IWYU pragma: export
 
 ///
 /// @file
diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/export.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/export.hpp
index 75bbe94bee..29e6c566fa 100644
--- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/export.hpp
+++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/export.hpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // For backward compatibility.
-#include <mongocxx/v1/config/export.hpp>
+#include <mongocxx/v1/config/export.hpp> // IWYU pragma: export
 
 ///
 /// @file
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 744182ff8c..02d5f84841 100644
--- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp
+++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <mongocxx/v1/detail/postlude.hpp>
+#include <mongocxx/v1/detail/postlude.hpp> // IWYU pragma: export
 
 ///
 /// @file
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 1223052f33..4197453748 100644
--- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp
+++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <mongocxx/v1/detail/prelude.hpp>
+#include <mongocxx/v1/detail/prelude.hpp> // IWYU pragma: export
 
-#include <mongocxx/config/compiler.hpp>
-#include <mongocxx/config/config.hpp>
-#include <mongocxx/config/export.hpp>
-#include <mongocxx/config/version.hpp>
+#include <mongocxx/config/compiler.hpp> // IWYU pragma: export
+#include <mongocxx/config/config.hpp>   // IWYU pragma: export
+#include <mongocxx/config/export.hpp>   // IWYU pragma: export
+#include <mongocxx/config/version.hpp>  // IWYU pragma: export
 
 ///
 /// @file
diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/version.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/version.hpp
index 32fcc675de..d368a380dc 100644
--- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/version.hpp
+++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/version.hpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // For backward compatibility.
-#include <mongocxx/v1/config/version.hpp>
+#include <mongocxx/v1/config/version.hpp> // IWYU pragma: export
 
 ///
 /// @file
diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/instance.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/instance.hpp
index e52ecd6c4f..c24e8aa759 100644
--- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/instance.hpp
+++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/instance.hpp
@@ -18,7 +18,7 @@
 
 //
 
-#include <mongocxx/v1/instance.hpp>
+#include <mongocxx/v1/instance.hpp> // IWYU pragma: export
 
 #include <memory>
 
diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/logger-fwd.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/logger-fwd.hpp
index 32c31affe9..2a4bf2837e 100644
--- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/logger-fwd.hpp
+++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/logger-fwd.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/logger-fwd.hpp>
+#include <mongocxx/v1/logger-fwd.hpp> // IWYU pragma: export
 
 #include <mongocxx/config/prelude.hpp>
 
diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/logger.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/logger.hpp
index d341bd0d8a..d610c27385 100644
--- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/logger.hpp
+++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/logger.hpp
@@ -18,7 +18,7 @@
 
 //
 
-#include <mongocxx/v1/logger.hpp>
+#include <mongocxx/v1/logger.hpp> // IWYU pragma: export
 
 #include <mongocxx/config/prelude.hpp>
 
diff --git a/src/mongocxx/lib/mongocxx/private/export.hh b/src/mongocxx/lib/mongocxx/private/export.hh
index 8d5e52a997..4d207a8524 100644
--- a/src/mongocxx/lib/mongocxx/private/export.hh
+++ b/src/mongocxx/lib/mongocxx/private/export.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/config/export.hpp>
+#include <mongocxx/v1/config/export.hpp> // IWYU pragma: export
 
 // See bsoncxx/private/export.hh.
 
diff --git a/src/mongocxx/lib/mongocxx/private/mongoc.hh b/src/mongocxx/lib/mongocxx/private/mongoc.hh
index 69264e13cd..aa5b3ec401 100644
--- a/src/mongocxx/lib/mongocxx/private/mongoc.hh
+++ b/src/mongocxx/lib/mongocxx/private/mongoc.hh
@@ -24,7 +24,7 @@
 BSONCXX_PRIVATE_WARNINGS_PUSH();
 BSONCXX_PRIVATE_WARNINGS_DISABLE(GNU("-Wconversion"));
 BSONCXX_PRIVATE_IF_MSVC(BSONCXX_PRIVATE_PRAGMA(warning(push, 1));)
-#include <mongoc/mongoc.h>
+#include <mongoc/mongoc.h> // IWYU pragma: export
 BSONCXX_PRIVATE_WARNINGS_POP();
 
 // See https://jira.mongodb.com/browse/CXX-1453 and
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/append_aggregate_options.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/append_aggregate_options.hh
index a8320e3d1a..15d9459870 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/append_aggregate_options.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/append_aggregate_options.hh
@@ -2,7 +2,7 @@
 
 #include <bsoncxx/builder/basic/document.hpp>
 
-#include <mongocxx/options/aggregate.hpp>
+#include <mongocxx/options/aggregate.hpp> // IWYU pragma: export
 
 namespace mongocxx {
 namespace v_noabi {
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.hh
index 3054300ed3..dee84af4a8 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/bulk_write.hpp>
+#include <mongocxx/bulk_write.hpp> // IWYU pragma: export
 
 #include <mongocxx/private/mongoc.hh>
 
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.hh
index e30706440f..c9141b98d1 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.hh
@@ -17,7 +17,7 @@
 #include <bsoncxx/document/view.hpp>
 #include <bsoncxx/stdx/optional.hpp>
 
-#include <mongocxx/change_stream.hpp>
+#include <mongocxx/change_stream.hpp> // IWYU pragma: export
 #include <mongocxx/exception/query_exception.hpp>
 
 #include <mongocxx/scoped_bson.hh>
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.hh
index dfc9a7ace9..9945157d01 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.hh
@@ -16,7 +16,7 @@
 
 #include <list>
 
-#include <mongocxx/client.hpp>
+#include <mongocxx/client.hpp> // IWYU pragma: export
 
 #include <mongocxx/private/mongoc.hh>
 #include <mongocxx/write_concern.hh>
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.hh
index 39491ff114..32bedd3e51 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.hh
@@ -22,7 +22,7 @@
 #include <mongocxx/client.hpp>
 #include <mongocxx/client_encryption.hpp>
 #include <mongocxx/exception/operation_exception.hpp>
-#include <mongocxx/options/client_encryption.hpp>
+#include <mongocxx/options/client_encryption.hpp> // IWYU pragma: export
 #include <mongocxx/result/bulk_write.hpp>
 
 #include <mongocxx/scoped_bson.hh>
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.hh
index 30c8c97411..260fb9f519 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.hh
@@ -18,7 +18,7 @@
 
 #include <exception>
 
-#include <mongocxx/client_session.hpp>
+#include <mongocxx/client_session.hpp> // IWYU pragma: export
 #include <mongocxx/exception/error_code.hpp>
 #include <mongocxx/exception/logic_error.hpp>
 #include <mongocxx/exception/operation_exception.hpp>
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.hh
index 0161c01904..abfe0b3e1f 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.hh
@@ -17,7 +17,7 @@
 #include <bsoncxx/document/value.hpp>
 #include <bsoncxx/stdx/string_view.hpp>
 
-#include <mongocxx/collection.hpp>
+#include <mongocxx/collection.hpp> // IWYU pragma: export
 #include <mongocxx/database.hpp>
 
 #include <bsoncxx/private/helpers.hh>
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.hh
index 939e2e28ba..35061c1087 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.hh
@@ -17,7 +17,7 @@
 #include <bsoncxx/document/view.hpp>
 #include <bsoncxx/stdx/optional.hpp>
 
-#include <mongocxx/cursor.hpp>
+#include <mongocxx/cursor.hpp> // IWYU pragma: export
 
 #include <mongocxx/private/mongoc.hh>
 
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.hh
index f1f9f9a006..386825609a 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.hh
@@ -15,7 +15,7 @@
 #pragma once
 
 #include <mongocxx/client.hpp>
-#include <mongocxx/database.hpp>
+#include <mongocxx/database.hpp> // IWYU pragma: export
 
 #include <mongocxx/client.hh>
 #include <mongocxx/private/mongoc.hh>
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.hh
index a7ce56b1f2..04a02aa72c 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/gridfs/bucket.hh>
+#include <mongocxx/gridfs/bucket.hh> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.hh
index 9b9bf2e2d9..f5a283aeda 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/gridfs/downloader.hpp>
+#include <mongocxx/gridfs/downloader.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.hh
index 248cdbbfa9..cc538ca8eb 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/gridfs/uploader.hpp>
+#include <mongocxx/gridfs/uploader.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.hh
index a486935930..0b713d135e 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.hh
@@ -26,7 +26,7 @@
 #include <mongocxx/exception/logic_error.hpp>
 #include <mongocxx/exception/operation_exception.hpp>
 #include <mongocxx/exception/write_exception.hpp>
-#include <mongocxx/index_view.hpp>
+#include <mongocxx/index_view.hpp> // IWYU pragma: export
 #include <mongocxx/options/index_view.hpp>
 
 #include <mongocxx/scoped_bson.hh>
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.hh
index eb8f853b29..ab1599325d 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/options/apm.hpp>
+#include <mongocxx/options/apm.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.hh
index 91b55e7f31..457706882e 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/options/server_api.hpp>
+#include <mongocxx/options/server_api.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.hh
index 7872d8fe87..96ecd6d1f7 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/options/tls.hpp>
+#include <mongocxx/options/tls.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.hh
index f3c7e23951..9ff2a0e567 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/options/transaction.hh>
+#include <mongocxx/options/transaction.hh> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.hh
index 38cfe19659..a3cc8ae199 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.hh
@@ -16,7 +16,7 @@
 
 #include <bsoncxx/builder/basic/array.hpp>
 
-#include <mongocxx/pipeline.hpp>
+#include <mongocxx/pipeline.hpp> // IWYU pragma: export
 
 namespace mongocxx {
 namespace v_noabi {
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.hh
index b474ba2d74..e68ce06d2e 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.hh
@@ -17,7 +17,7 @@
 #include <list>
 #include <utility>
 
-#include <mongocxx/pool.hpp>
+#include <mongocxx/pool.hpp> // IWYU pragma: export
 
 #include <mongocxx/private/mongoc.hh>
 
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.hh
index 3d646fadbf..a7199b6564 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/read_concern.hpp>
+#include <mongocxx/read_concern.hpp> // IWYU pragma: export
 
 #include <mongocxx/private/mongoc.hh>
 
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.hh
index a976e165c4..f2d0945214 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/read_preference.hpp>
+#include <mongocxx/read_preference.hpp> // IWYU pragma: export
 
 #include <mongocxx/private/mongoc.hh>
 
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/scoped_bson.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/scoped_bson.hh
index 07e3eb6d42..ffbf623a8a 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/scoped_bson.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/scoped_bson.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/private/scoped_bson.hh>
+#include <mongocxx/private/scoped_bson.hh> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.hh
index 331ffd2f11..86f00fbdaa 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.hh
@@ -2,7 +2,7 @@
 
 #include <bsoncxx/document/view_or_value.hpp>
 
-#include <mongocxx/search_index_model.hpp>
+#include <mongocxx/search_index_model.hpp> // IWYU pragma: export
 
 namespace mongocxx {
 namespace v_noabi {
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.hh
index cf220a90b1..63b37075b4 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.hh
@@ -7,7 +7,7 @@
 #include <bsoncxx/document/view_or_value.hpp>
 #include <bsoncxx/string/to_string.hpp>
 
-#include <mongocxx/search_index_view.hpp>
+#include <mongocxx/search_index_view.hpp> // IWYU pragma: export
 
 #include <mongocxx/scoped_bson.hh>
 
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.hh
index 0bf3e439ad..39b4d3d8ec 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/uri.hpp>
+#include <mongocxx/uri.hpp> // IWYU pragma: export
 
 #include <mongocxx/private/mongoc.hh>
 
diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.hh
index d2d7740a3e..f30fc1cc03 100644
--- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.hh
+++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/write_concern.hpp>
+#include <mongocxx/write_concern.hpp> // IWYU pragma: export
 
 #include <mongocxx/private/mongoc.hh>
 
diff --git a/src/mongocxx/test/v1/exception.hh b/src/mongocxx/test/v1/exception.hh
index 4d1accb903..42431ffbdf 100644
--- a/src/mongocxx/test/v1/exception.hh
+++ b/src/mongocxx/test/v1/exception.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/exception.hpp>
+#include <mongocxx/v1/exception.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/test/v1/instance.hh b/src/mongocxx/test/v1/instance.hh
index 2faac1a5f9..98b587eb28 100644
--- a/src/mongocxx/test/v1/instance.hh
+++ b/src/mongocxx/test/v1/instance.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/instance.hpp>
+#include <mongocxx/v1/instance.hpp> // IWYU pragma: export
 
 //
 
diff --git a/src/mongocxx/test/v1/logger.hh b/src/mongocxx/test/v1/logger.hh
index 3c8249d60e..6cd3358894 100644
--- a/src/mongocxx/test/v1/logger.hh
+++ b/src/mongocxx/test/v1/logger.hh
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/logger.hpp>
+#include <mongocxx/v1/logger.hpp> // IWYU pragma: export
 
 //