diff --git a/src/common/src/mlib/platform.h b/src/common/src/mlib/platform.h
index bdc8bb38329..88095756c98 100644
--- a/src/common/src/mlib/platform.h
+++ b/src/common/src/mlib/platform.h
@@ -37,15 +37,15 @@
         #define _WIN32_WINNT 0x601
     #endif
     // Winsock must be included before windows.h
-    #include <winsock2.h>
-    #include <windows.h>
+    #include <winsock2.h> // IWYU pragma: export
+    #include <windows.h>  // IWYU pragma: export
 #endif
 
 // POSIX headers
 #if defined(__unix__) || defined(__unix) || defined(__APPLE__)
-    #include <unistd.h>
-    #include <fcntl.h>
-    #include <sys/types.h>
+    #include <unistd.h>    // IWYU pragma: export
+    #include <fcntl.h>     // IWYU pragma: export
+    #include <sys/types.h> // IWYU pragma: export
 #endif
 
 // clang-format on
diff --git a/src/libbson/src/bson/bson-context-private.h b/src/libbson/src/bson/bson-context-private.h
index c2fd3a50f78..8097df498eb 100644
--- a/src/libbson/src/bson/bson-context-private.h
+++ b/src/libbson/src/bson/bson-context-private.h
@@ -20,10 +20,11 @@
 #ifndef BSON_CONTEXT_PRIVATE_H
 #define BSON_CONTEXT_PRIVATE_H
 
+#include <bson/bson-context.h> // IWYU pragma: export
 
-#include <common-thread-private.h>
+//
 
-#include <bson/bson-context.h>
+#include <common-thread-private.h>
 
 
 BSON_BEGIN_DECLS
diff --git a/src/libbson/src/bson/bson-error-private.h b/src/libbson/src/bson/bson-error-private.h
index 602e6be27aa..32f4f6b885b 100644
--- a/src/libbson/src/bson/bson-error-private.h
+++ b/src/libbson/src/bson/bson-error-private.h
@@ -19,7 +19,10 @@
 #ifndef BSON_ERROR_PRIVATE_H
 #define BSON_ERROR_PRIVATE_H
 
-#include <bson/error.h>
+#include <bson/error.h> // IWYU pragma: export
+
+//
+
 #include <bson/macros.h>
 
 
diff --git a/src/libbson/src/bson/bson-json-private.h b/src/libbson/src/bson/bson-json-private.h
index 7537d6fc453..4e9dc730c04 100644
--- a/src/libbson/src/bson/bson-json-private.h
+++ b/src/libbson/src/bson/bson-json-private.h
@@ -19,6 +19,7 @@
 #ifndef BSON_JSON_PRIVATE_H
 #define BSON_JSON_PRIVATE_H
 
+#include <bson/bson-json.h> // IWYU pragma: export
 
 struct _bson_json_opts_t {
    bson_json_mode_t mode;
diff --git a/src/libbson/src/bson/bson-private.h b/src/libbson/src/bson/bson-private.h
index 2a91f327611..8ffb491f308 100644
--- a/src/libbson/src/bson/bson-private.h
+++ b/src/libbson/src/bson/bson-private.h
@@ -20,6 +20,9 @@
 #ifndef BSON_PRIVATE_H
 #define BSON_PRIVATE_H
 
+#include <bson/bson.h> // IWYU pragma: export
+
+//
 
 #include <bson/bson-types.h>
 #include <bson/macros.h>
diff --git a/src/libbson/src/bson/bson-vector-private.h b/src/libbson/src/bson/bson-vector-private.h
index 6749d71db92..100da3e79c2 100644
--- a/src/libbson/src/bson/bson-vector-private.h
+++ b/src/libbson/src/bson/bson-vector-private.h
@@ -19,6 +19,10 @@
 #ifndef BSON_VECTOR_PRIVATE_H
 #define BSON_VECTOR_PRIVATE_H
 
+#include <bson/bson-vector.h> // IWYU pragma: export
+
+//
+
 #include <bson/compat.h>
 #include <bson/macros.h>
 
diff --git a/src/libbson/src/bson/bson-vector.h b/src/libbson/src/bson/bson-vector.h
index a4b9ea33e3e..f58c982da9b 100644
--- a/src/libbson/src/bson/bson-vector.h
+++ b/src/libbson/src/bson/bson-vector.h
@@ -20,6 +20,8 @@
 #define BSON_VECTOR_H
 
 #include <bson/bson-endian.h>
+#include <bson/bson-types.h>
+#include <bson/bson_t.h>
 #include <bson/compat.h>
 #include <bson/macros.h>
 
diff --git a/src/libbson/src/bson/bson.h b/src/libbson/src/bson/bson.h
index d8f0d3ac0dc..6fd96fef792 100644
--- a/src/libbson/src/bson/bson.h
+++ b/src/libbson/src/bson/bson.h
@@ -20,27 +20,29 @@
 
 #define BSON_INSIDE
 
-#include <bson/bson-bcon.h>
-#include <bson/bson-clock.h>
-#include <bson/bson-context.h>
-#include <bson/bson-decimal128.h>
-#include <bson/bson-iter.h>
-#include <bson/bson-json.h>
-#include <bson/bson-keys.h>
-#include <bson/bson-oid.h>
-#include <bson/bson-reader.h>
-#include <bson/bson-string.h>
-#include <bson/bson-types.h>
-#include <bson/bson-utf8.h>
-#include <bson/bson-value.h>
-#include <bson/bson-vector.h>
-#include <bson/bson-version-functions.h>
-#include <bson/bson-writer.h>
-#include <bson/compat.h>
-#include <bson/config.h>
-#include <bson/macros.h>
-#include <bson/memory.h>
-#include <bson/version.h>
+#include <bson/bson-bcon.h>              // IWYU pragma: export
+#include <bson/bson-clock.h>             // IWYU pragma: export
+#include <bson/bson-context.h>           // IWYU pragma: export
+#include <bson/bson-decimal128.h>        // IWYU pragma: export
+#include <bson/bson-iter.h>              // IWYU pragma: export
+#include <bson/bson-json.h>              // IWYU pragma: export
+#include <bson/bson-keys.h>              // IWYU pragma: export
+#include <bson/bson-oid.h>               // IWYU pragma: export
+#include <bson/bson-reader.h>            // IWYU pragma: export
+#include <bson/bson-string.h>            // IWYU pragma: export
+#include <bson/bson-types.h>             // IWYU pragma: export
+#include <bson/bson-utf8.h>              // IWYU pragma: export
+#include <bson/bson-value.h>             // IWYU pragma: export
+#include <bson/bson-vector.h>            // IWYU pragma: export
+#include <bson/bson-version-functions.h> // IWYU pragma: export
+#include <bson/bson-writer.h>            // IWYU pragma: export
+#include <bson/bson_t.h>                 // IWYU pragma: export
+#include <bson/compat.h>                 // IWYU pragma: export
+#include <bson/config.h>                 // IWYU pragma: export
+#include <bson/error.h>                  // IWYU pragma: export
+#include <bson/macros.h>                 // IWYU pragma: export
+#include <bson/memory.h>                 // IWYU pragma: export
+#include <bson/version.h>                // IWYU pragma: export
 
 #include <string.h>
 #include <time.h>
diff --git a/src/libbson/src/bson/compat.h b/src/libbson/src/bson/compat.h
index 08407147967..b1750470e40 100644
--- a/src/libbson/src/bson/compat.h
+++ b/src/libbson/src/bson/compat.h
@@ -28,8 +28,8 @@
 #endif
 #endif
 
-#include <bson/config.h>
-#include <bson/macros.h>
+#include <bson/config.h> // IWYU pragma: export
+#include <bson/macros.h> // IWYU pragma: export
 
 
 #ifdef BSON_OS_WIN32
@@ -42,36 +42,37 @@
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
-#include <winsock2.h>
+#include <winsock2.h> // IWYU pragma: export
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#include <windows.h> // IWYU pragma: export
 #undef WIN32_LEAN_AND_MEAN
 #else
-#include <windows.h>
+#include <windows.h> // IWYU pragma: export
 #endif
-#include <direct.h>
-#include <io.h>
+#include <direct.h> // IWYU pragma: export
+#include <io.h>     // IWYU pragma: export
 #endif
 
 
 #ifdef BSON_OS_UNIX
-#include <sys/time.h>
-#include <unistd.h>
+#include <sys/time.h>  // IWYU pragma: export
+#include <sys/types.h> // IWYU pragma: export
+#include <unistd.h>    // IWYU pragma: export
 #endif
 
 
 #include <bson/macros.h>
 
-#include <fcntl.h>
-#include <sys/stat.h>
+#include <fcntl.h>    // IWYU pragma: export
+#include <sys/stat.h> // IWYU pragma: export
 
 #include <ctype.h>
 #include <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
+#include <limits.h>  // IWYU pragma: export
+#include <stdarg.h>  // IWYU pragma: export
+#include <stdbool.h> // IWYU pragma: export
+#include <stdint.h>  // IWYU pragma: export
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -81,7 +82,7 @@
 BSON_BEGIN_DECLS
 
 #if !defined(_MSC_VER) || (_MSC_VER >= 1800)
-#include <inttypes.h>
+#include <inttypes.h> // IWYU pragma: export
 #endif
 #ifdef _MSC_VER
 #ifndef __cplusplus
diff --git a/src/libbson/src/bson/macros.h b/src/libbson/src/bson/macros.h
index 38b73644bb6..b9c84802bb2 100644
--- a/src/libbson/src/bson/macros.h
+++ b/src/libbson/src/bson/macros.h
@@ -17,7 +17,7 @@
 #ifndef BSON_MACROS_H
 #define BSON_MACROS_H
 
-#include <bson/config.h>
+#include <bson/config.h> // IWYU pragma: export
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-apm-private.h b/src/libmongoc/src/mongoc/mongoc-apm-private.h
index 3eac99aefbd..1b3cbadb240 100644
--- a/src/libmongoc/src/mongoc/mongoc-apm-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-apm-private.h
@@ -19,7 +19,9 @@
 #ifndef MONGOC_APM_PRIVATE_H
 #define MONGOC_APM_PRIVATE_H
 
-#include <mongoc/mongoc-apm.h>
+#include <mongoc/mongoc-apm.h> // IWYU pragma: export
+
+//
 
 #include <bson/bson.h>
 
diff --git a/src/libmongoc/src/mongoc/mongoc-bulk-operation-private.h b/src/libmongoc/src/mongoc/mongoc-bulk-operation-private.h
index 7b35a02ffea..65abded46c1 100644
--- a/src/libmongoc/src/mongoc/mongoc-bulk-operation-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-bulk-operation-private.h
@@ -19,6 +19,10 @@
 #ifndef MONGOC_BULK_OPERATION_PRIVATE_H
 #define MONGOC_BULK_OPERATION_PRIVATE_H
 
+#include <mongoc/mongoc-bulk-operation.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-array-private.h>
 #include <mongoc/mongoc-write-command-private.h>
 
diff --git a/src/libmongoc/src/mongoc/mongoc-change-stream-private.h b/src/libmongoc/src/mongoc/mongoc-change-stream-private.h
index 9fbc5084c3d..c26d9116df8 100644
--- a/src/libmongoc/src/mongoc/mongoc-change-stream-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-change-stream-private.h
@@ -19,10 +19,13 @@
 #ifndef MONGOC_CHANGE_STREAM_PRIVATE_H
 #define MONGOC_CHANGE_STREAM_PRIVATE_H
 
+#include <mongoc/mongoc-change-stream.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-opts-helpers-private.h>
 #include <mongoc/mongoc-opts-private.h>
 
-#include <mongoc/mongoc-change-stream.h>
 #include <mongoc/mongoc-client-session.h>
 #include <mongoc/mongoc-collection.h>
 #include <mongoc/mongoc-cursor.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-client-pool-private.h b/src/libmongoc/src/mongoc/mongoc-client-pool-private.h
index ffd2735be01..675cd61f71b 100644
--- a/src/libmongoc/src/mongoc/mongoc-client-pool-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-client-pool-private.h
@@ -19,9 +19,12 @@
 #ifndef MONGOC_CLIENT_POOL_PRIVATE_H
 #define MONGOC_CLIENT_POOL_PRIVATE_H
 
+#include <mongoc/mongoc-client-pool.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-topology-private.h>
 
-#include <mongoc/mongoc-client-pool.h>
 #include <mongoc/mongoc-topology-description.h>
 
 #include <bson/bson.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-client-private.h b/src/libmongoc/src/mongoc/mongoc-client-private.h
index 61d485baf1f..5257e21bc96 100644
--- a/src/libmongoc/src/mongoc/mongoc-client-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-client-private.h
@@ -19,12 +19,15 @@
 #ifndef MONGOC_CLIENT_PRIVATE_H
 #define MONGOC_CLIENT_PRIVATE_H
 
+#include <mongoc/mongoc-client.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-apm-private.h>
 #include <mongoc/mongoc-buffer-private.h>
 #include <mongoc/mongoc-cluster-private.h>
 #include <mongoc/mongoc-rpc-private.h>
 
-#include <mongoc/mongoc-client.h>
 #include <mongoc/mongoc-config.h>
 #include <mongoc/mongoc-host-list.h>
 #include <mongoc/mongoc-opcode.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-client-session-private.h b/src/libmongoc/src/mongoc/mongoc-client-session-private.h
index 89142084893..ad890fbb25c 100644
--- a/src/libmongoc/src/mongoc/mongoc-client-session-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-client-session-private.h
@@ -19,7 +19,9 @@
 #ifndef MONGOC_CLIENT_SESSION_PRIVATE_H
 #define MONGOC_CLIENT_SESSION_PRIVATE_H
 
-#include <mongoc/mongoc-client-session.h>
+#include <mongoc/mongoc-client-session.h> // IWYU pragma: export
+
+//
 
 #include <bson/bson.h>
 
diff --git a/src/libmongoc/src/mongoc/mongoc-client-side-encryption-private.h b/src/libmongoc/src/mongoc/mongoc-client-side-encryption-private.h
index 0edbdd5da2f..7f015326810 100644
--- a/src/libmongoc/src/mongoc/mongoc-client-side-encryption-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-client-side-encryption-private.h
@@ -19,11 +19,14 @@
 #ifndef MONGOC_CLIENT_SIDE_ENCRYPTION_PRIVATE_H
 #define MONGOC_CLIENT_SIDE_ENCRYPTION_PRIVATE_H
 
+#include <mongoc/mongoc-client-side-encryption.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-cmd-private.h>
 #include <mongoc/mongoc-topology-private.h>
 
 #include <mongoc/mongoc-client-pool.h>
-#include <mongoc/mongoc-client-side-encryption.h>
 #include <mongoc/mongoc-client.h>
 
 #include <bson/bson.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-collection-private.h b/src/libmongoc/src/mongoc/mongoc-collection-private.h
index 2b65e7049cd..04b01115110 100644
--- a/src/libmongoc/src/mongoc/mongoc-collection-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-collection-private.h
@@ -19,6 +19,10 @@
 #ifndef MONGOC_COLLECTION_PRIVATE_H
 #define MONGOC_COLLECTION_PRIVATE_H
 
+#include <mongoc/mongoc-collection.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-client.h>
 
 #include <bson/bson.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-crypto-cng-private.h b/src/libmongoc/src/mongoc/mongoc-crypto-cng-private.h
index a84c55c1adf..22859cae241 100644
--- a/src/libmongoc/src/mongoc/mongoc-crypto-cng-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-crypto-cng-private.h
@@ -16,7 +16,7 @@
 
 #include <mongoc/mongoc-prelude.h>
 
-#include <mongoc/mongoc-crypto-private.h>
+#include <mongoc/mongoc-crypto-private.h> // IWYU pragma: export
 
 #include <bson/bson.h>
 
diff --git a/src/libmongoc/src/mongoc/mongoc-crypto-common-crypto-private.h b/src/libmongoc/src/mongoc/mongoc-crypto-common-crypto-private.h
index e8efc7f5c8c..8f5f7b1abf4 100644
--- a/src/libmongoc/src/mongoc/mongoc-crypto-common-crypto-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-crypto-common-crypto-private.h
@@ -21,6 +21,9 @@
 #ifndef MONGOC_CRYPTO_COMMON_CRYPTO_PRIVATE_H
 #define MONGOC_CRYPTO_COMMON_CRYPTO_PRIVATE_H
 
+#include <mongoc/mongoc-crypt-private.h> // IWYU pragma: export
+
+//
 
 #include <mongoc/mongoc-config.h>
 
diff --git a/src/libmongoc/src/mongoc/mongoc-crypto-openssl-private.h b/src/libmongoc/src/mongoc/mongoc-crypto-openssl-private.h
index b4750991613..7955efe0294 100644
--- a/src/libmongoc/src/mongoc/mongoc-crypto-openssl-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-crypto-openssl-private.h
@@ -25,7 +25,7 @@
 #ifndef MONGOC_CRYPTO_OPENSSL_PRIVATE_H
 #define MONGOC_CRYPTO_OPENSSL_PRIVATE_H
 
-#include <mongoc/mongoc-crypto-private.h>
+#include <mongoc/mongoc-crypto-private.h> // IWYU pragma: export
 
 BSON_BEGIN_DECLS
 
diff --git a/src/libmongoc/src/mongoc/mongoc-cursor-private.h b/src/libmongoc/src/mongoc/mongoc-cursor-private.h
index 5d9ea2fd8b7..522746505d6 100644
--- a/src/libmongoc/src/mongoc/mongoc-cursor-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-cursor-private.h
@@ -19,6 +19,10 @@
 #ifndef MONGOC_CURSOR_PRIVATE_H
 #define MONGOC_CURSOR_PRIVATE_H
 
+#include <mongoc/mongoc-cursor.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-buffer-private.h>
 #include <mongoc/mongoc-cluster-private.h>
 #include <mongoc/mongoc-rpc-private.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-database-private.h b/src/libmongoc/src/mongoc/mongoc-database-private.h
index 2c104c48b32..1b64bf80e1e 100644
--- a/src/libmongoc/src/mongoc/mongoc-database-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-database-private.h
@@ -19,6 +19,10 @@
 #ifndef MONGOC_DATABASE_PRIVATE_H
 #define MONGOC_DATABASE_PRIVATE_H
 
+#include <mongoc/mongoc-database.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-client.h>
 #include <mongoc/mongoc-read-concern.h>
 #include <mongoc/mongoc-read-prefs.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-errno-private.h b/src/libmongoc/src/mongoc/mongoc-errno-private.h
index d84767ab74e..e694abc28ee 100644
--- a/src/libmongoc/src/mongoc/mongoc-errno-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-errno-private.h
@@ -21,7 +21,8 @@
 
 #include <bson/bson.h>
 
-#include <errno.h>
+#include <errno.h> // IWYU pragma: export
+
 #ifdef _WIN32
 #include <winerror.h>
 #include <winsock2.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-error-private.h b/src/libmongoc/src/mongoc/mongoc-error-private.h
index b841ae526ee..e89423572f6 100644
--- a/src/libmongoc/src/mongoc/mongoc-error-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-error-private.h
@@ -19,7 +19,10 @@
 #ifndef MONGOC_ERROR_PRIVATE_H
 #define MONGOC_ERROR_PRIVATE_H
 
-#include <mongoc/mongoc-error.h>
+#include <mongoc/mongoc-error.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-server-description.h>
 
 #include <bson/bson.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-find-and-modify-private.h b/src/libmongoc/src/mongoc/mongoc-find-and-modify-private.h
index 1965492a39b..657a60b5893 100644
--- a/src/libmongoc/src/mongoc/mongoc-find-and-modify-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-find-and-modify-private.h
@@ -19,6 +19,10 @@
 #ifndef MONGOC_FIND_AND_MODIFY_PRIVATE_H
 #define MONGOC_FIND_AND_MODIFY_PRIVATE_H
 
+#include <mongoc/mongoc-find-and-modify.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-write-command-private.h>
 
 #include <bson/bson.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-flags-private.h b/src/libmongoc/src/mongoc/mongoc-flags-private.h
index b5c89d6131f..9748be4f643 100644
--- a/src/libmongoc/src/mongoc/mongoc-flags-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-flags-private.h
@@ -19,6 +19,10 @@
 #ifndef MONGOC_FLAGS_PRIVATE_H
 #define MONGOC_FLAGS_PRIVATE_H
 
+#include <mongoc/mongoc-flags.h> // IWYU pragma: export
+
+//
+
 #include <bson/bson.h>
 
 BSON_BEGIN_DECLS
diff --git a/src/libmongoc/src/mongoc/mongoc-gridfs-bucket-private.h b/src/libmongoc/src/mongoc/mongoc-gridfs-bucket-private.h
index 4703207a497..a71645665ee 100644
--- a/src/libmongoc/src/mongoc/mongoc-gridfs-bucket-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-gridfs-bucket-private.h
@@ -18,6 +18,10 @@
 #ifndef MONGOC_GRIDFS_BUCKET_PRIVATE_H
 #define MONGOC_GRIDFS_BUCKET_PRIVATE_H
 
+#include <mongoc/mongoc-gridfs-bucket.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-collection.h>
 
 BSON_BEGIN_DECLS
diff --git a/src/libmongoc/src/mongoc/mongoc-gridfs-file-list-private.h b/src/libmongoc/src/mongoc/mongoc-gridfs-file-list-private.h
index 5ecd93cc4db..4dafe7d5b7f 100644
--- a/src/libmongoc/src/mongoc/mongoc-gridfs-file-list-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-gridfs-file-list-private.h
@@ -19,6 +19,10 @@
 #ifndef MONGOC_GRIDFS_FILE_LIST_PRIVATE_H
 #define MONGOC_GRIDFS_FILE_LIST_PRIVATE_H
 
+#include <mongoc/mongoc-gridfs-file-list.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-cursor.h>
 #include <mongoc/mongoc-gridfs-file.h>
 #include <mongoc/mongoc-gridfs.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-gridfs-file-page-private.h b/src/libmongoc/src/mongoc/mongoc-gridfs-file-page-private.h
index c2c5e0f3046..c19d799048a 100644
--- a/src/libmongoc/src/mongoc/mongoc-gridfs-file-page-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-gridfs-file-page-private.h
@@ -19,7 +19,10 @@
 #ifndef MONGOC_GRIDFS_FILE_PAGE_PRIVATE_H
 #define MONGOC_GRIDFS_FILE_PAGE_PRIVATE_H
 
-#include <mongoc/mongoc-gridfs-file-page.h>
+#include <mongoc/mongoc-gridfs-file-page.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-gridfs-file.h>
 
 #include <bson/bson.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-gridfs-file-private.h b/src/libmongoc/src/mongoc/mongoc-gridfs-file-private.h
index 4cb6ffef264..4777dabadac 100644
--- a/src/libmongoc/src/mongoc/mongoc-gridfs-file-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-gridfs-file-private.h
@@ -19,9 +19,12 @@
 #ifndef MONGOC_GRIDFS_FILE_PRIVATE_H
 #define MONGOC_GRIDFS_FILE_PRIVATE_H
 
+#include <mongoc/mongoc-gridfs-file.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-cursor.h>
 #include <mongoc/mongoc-gridfs-file-page.h>
-#include <mongoc/mongoc-gridfs-file.h>
 #include <mongoc/mongoc-gridfs.h>
 
 #include <bson/bson.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-gridfs-private.h b/src/libmongoc/src/mongoc/mongoc-gridfs-private.h
index fa59923dacc..a50e63ee452 100644
--- a/src/libmongoc/src/mongoc/mongoc-gridfs-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-gridfs-private.h
@@ -19,6 +19,10 @@
 #ifndef MONGOC_GRIDFS_PRIVATE_H
 #define MONGOC_GRIDFS_PRIVATE_H
 
+#include <mongoc/mongoc-gridfs.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-client.h>
 #include <mongoc/mongoc-read-prefs.h>
 #include <mongoc/mongoc-write-concern.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-handshake-private.h b/src/libmongoc/src/mongoc/mongoc-handshake-private.h
index 5e5d89814b7..bcb4059cd14 100644
--- a/src/libmongoc/src/mongoc/mongoc-handshake-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-handshake-private.h
@@ -20,6 +20,10 @@
 #ifndef MONGOC_HANDSHAKE_PRIVATE_H
 #define MONGOC_HANDSHAKE_PRIVATE_H
 
+#include <mongoc/mongoc-handshake.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc.h>
 
 BSON_BEGIN_DECLS
diff --git a/src/libmongoc/src/mongoc/mongoc-host-list-private.h b/src/libmongoc/src/mongoc/mongoc-host-list-private.h
index 4c2b43abe17..d7ba1cccab4 100644
--- a/src/libmongoc/src/mongoc/mongoc-host-list-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-host-list-private.h
@@ -19,7 +19,9 @@
 #ifndef MONGOC_HOST_LIST_PRIVATE_H
 #define MONGOC_HOST_LIST_PRIVATE_H
 
-#include <mongoc/mongoc-host-list.h>
+#include <mongoc/mongoc-host-list.h> // IWYU pragma: export
+
+//
 
 #include <mlib/str.h>
 
diff --git a/src/libmongoc/src/mongoc/mongoc-log-private.h b/src/libmongoc/src/mongoc/mongoc-log-private.h
index a8161d9e425..acf500c120b 100644
--- a/src/libmongoc/src/mongoc/mongoc-log-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-log-private.h
@@ -19,8 +19,11 @@
 #ifndef MONGOC_LOG_PRIVATE_H
 #define MONGOC_LOG_PRIVATE_H
 
+#include <mongoc/mongoc-log.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-iovec.h>
-#include <mongoc/mongoc-log.h>
 
 /* just for testing */
 void
diff --git a/src/libmongoc/src/mongoc/mongoc-rand-private.h b/src/libmongoc/src/mongoc/mongoc-rand-private.h
index df12327ea1f..3f6ad68bb46 100644
--- a/src/libmongoc/src/mongoc/mongoc-rand-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-rand-private.h
@@ -21,6 +21,10 @@
 #define MONGOC_RAND_PRIVATE_H
 
 
+#include <mongoc/mongoc-rand.h> // IWYU pragma: export
+
+//
+
 #include <bson/bson.h>
 
 
diff --git a/src/libmongoc/src/mongoc/mongoc-read-concern-private.h b/src/libmongoc/src/mongoc/mongoc-read-concern-private.h
index efaf41aafea..0c794714160 100644
--- a/src/libmongoc/src/mongoc/mongoc-read-concern-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-read-concern-private.h
@@ -19,7 +19,9 @@
 #ifndef MONGOC_READ_CONCERN_PRIVATE_H
 #define MONGOC_READ_CONCERN_PRIVATE_H
 
-#include <mongoc/mongoc-read-concern.h>
+#include <mongoc/mongoc-read-concern.h> // IWYU pragma: export
+
+//
 
 #include <bson/bson.h>
 
diff --git a/src/libmongoc/src/mongoc/mongoc-read-prefs-private.h b/src/libmongoc/src/mongoc/mongoc-read-prefs-private.h
index 130680fb3cc..2163e3f4bd1 100644
--- a/src/libmongoc/src/mongoc/mongoc-read-prefs-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-read-prefs-private.h
@@ -19,9 +19,12 @@
 #ifndef MONGOC_READ_PREFS_PRIVATE_H
 #define MONGOC_READ_PREFS_PRIVATE_H
 
-#include <mongoc/mongoc-cluster-private.h>
+#include <mongoc/mongoc-read-prefs.h> // IWYU pragma: export
+
+//
 
-#include <mongoc/mongoc-read-prefs.h>
+
+#include <mongoc/mongoc-cluster-private.h>
 
 #include <bson/bson.h>
 
diff --git a/src/libmongoc/src/mongoc/mongoc-server-api-private.h b/src/libmongoc/src/mongoc/mongoc-server-api-private.h
index 9d8cae8a4db..8dfc4b03ef3 100644
--- a/src/libmongoc/src/mongoc/mongoc-server-api-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-server-api-private.h
@@ -19,7 +19,7 @@
 #ifndef MONGOC_SERVER_API_PRIVATE_H
 #define MONGOC_SERVER_API_PRIVATE_H
 
-#include <mongoc/mongoc-server-api.h>
+#include <mongoc/mongoc-server-api.h> // IWYU pragma: export
 
 struct _mongoc_server_api_t {
    mongoc_server_api_version_t version;
diff --git a/src/libmongoc/src/mongoc/mongoc-server-description-private.h b/src/libmongoc/src/mongoc/mongoc-server-description-private.h
index 542dd3e8d45..23eb6fc312d 100644
--- a/src/libmongoc/src/mongoc/mongoc-server-description-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-server-description-private.h
@@ -19,11 +19,13 @@
 #ifndef MONGOC_SERVER_DESCRIPTION_PRIVATE_H
 #define MONGOC_SERVER_DESCRIPTION_PRIVATE_H
 
+#include <mongoc/mongoc-server-description.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-generation-map-private.h>
 #include <mongoc/mongoc-log-and-monitor-private.h>
 
-#include <mongoc/mongoc-server-description.h>
-
 
 #define MONGOC_DEFAULT_WIRE_VERSION 0
 #define MONGOC_DEFAULT_WRITE_BATCH_SIZE 1000
diff --git a/src/libmongoc/src/mongoc/mongoc-socket-private.h b/src/libmongoc/src/mongoc/mongoc-socket-private.h
index d302519383f..6f695031664 100644
--- a/src/libmongoc/src/mongoc/mongoc-socket-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-socket-private.h
@@ -19,7 +19,7 @@
 #ifndef MONGOC_SOCKET_PRIVATE_H
 #define MONGOC_SOCKET_PRIVATE_H
 
-#include <mongoc/mongoc-socket.h>
+#include <mongoc/mongoc-socket.h> // IWYU pragma: export
 
 BSON_BEGIN_DECLS
 
diff --git a/src/libmongoc/src/mongoc/mongoc-ssl-private.h b/src/libmongoc/src/mongoc/mongoc-ssl-private.h
index ccd5e1df1f5..b3df6472787 100644
--- a/src/libmongoc/src/mongoc/mongoc-ssl-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-ssl-private.h
@@ -19,11 +19,13 @@
 #ifndef MONGOC_SSL_PRIVATE_H
 #define MONGOC_SSL_PRIVATE_H
 
+#include <mongoc/mongoc-ssl.h> // IWYU pragma: export
+
+//
+
 #include <common-string-private.h>
 #include <mongoc/mongoc-uri-private.h>
 
-#include <mongoc/mongoc-ssl.h>
-
 #include <bson/bson.h>
 
 
diff --git a/src/libmongoc/src/mongoc/mongoc-stream-private.h b/src/libmongoc/src/mongoc/mongoc-stream-private.h
index 537b68a9029..66a50e75627 100644
--- a/src/libmongoc/src/mongoc/mongoc-stream-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-stream-private.h
@@ -19,8 +19,11 @@
 #ifndef MONGOC_STREAM_PRIVATE_H
 #define MONGOC_STREAM_PRIVATE_H
 
+#include <mongoc/mongoc-stream.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-iovec.h>
-#include <mongoc/mongoc-stream.h>
 
 #include <mlib/timer.h>
 
diff --git a/src/libmongoc/src/mongoc/mongoc-stream-tls-private.h b/src/libmongoc/src/mongoc/mongoc-stream-tls-private.h
index cdaf154ca64..c17e992ff28 100644
--- a/src/libmongoc/src/mongoc/mongoc-stream-tls-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-stream-tls-private.h
@@ -19,6 +19,10 @@
 #ifndef MONGOC_STREAM_TLS_PRIVATE_H
 #define MONGOC_STREAM_TLS_PRIVATE_H
 
+#include <mongoc/mongoc-stream-tls.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-ssl.h>
 #include <mongoc/mongoc-stream.h>
 
diff --git a/src/libmongoc/src/mongoc/mongoc-stream-tls-secure-channel-private.h b/src/libmongoc/src/mongoc/mongoc-stream-tls-secure-channel-private.h
index 5d0ebd167d8..0ac78cbca31 100644
--- a/src/libmongoc/src/mongoc/mongoc-stream-tls-secure-channel-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-stream-tls-secure-channel-private.h
@@ -20,6 +20,11 @@
 #define MONGOC_STREAM_TLS_SECURE_CHANNEL_PRIVATE_H
 
 #ifdef MONGOC_ENABLE_SSL_SECURE_CHANNEL
+
+#include <mongoc/mongoc-stream-tls-secure-channel.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-shared-private.h>
 
 #include <mongoc/mongoc-stream-tls.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-stream-tls-secure-channel.h b/src/libmongoc/src/mongoc/mongoc-stream-tls-secure-channel.h
index 84ab73cb82a..af91dd33641 100644
--- a/src/libmongoc/src/mongoc/mongoc-stream-tls-secure-channel.h
+++ b/src/libmongoc/src/mongoc/mongoc-stream-tls-secure-channel.h
@@ -20,7 +20,10 @@
 #define MONGOC_STREAM_TLS_SECURE_CHANNEL_H
 
 #ifdef MONGOC_ENABLE_SSL_SECURE_CHANNEL
+
 #include <mongoc/mongoc-macros.h>
+#include <mongoc/mongoc-ssl.h>
+#include <mongoc/mongoc-stream.h>
 
 #include <bson/bson.h>
 
diff --git a/src/libmongoc/src/mongoc/mongoc-stream-tls-secure-transport-private.h b/src/libmongoc/src/mongoc/mongoc-stream-tls-secure-transport-private.h
index 743daabfd1b..e0d82acec62 100644
--- a/src/libmongoc/src/mongoc/mongoc-stream-tls-secure-transport-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-stream-tls-secure-transport-private.h
@@ -20,6 +20,11 @@
 #define MONGOC_STREAM_TLS_SECURE_TRANSPORT_PRIVATE_H
 
 #ifdef MONGOC_ENABLE_SSL_SECURE_TRANSPORT
+
+#include <mongoc/mongoc-stream-tls-secure-transport.h> // IWYU pragma: export
+
+//
+
 #include <common-macros-private.h>
 
 #include <bson/bson.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-stream-tls-secure-transport.h b/src/libmongoc/src/mongoc/mongoc-stream-tls-secure-transport.h
index 8dd3474f2a9..cb83f40a618 100644
--- a/src/libmongoc/src/mongoc/mongoc-stream-tls-secure-transport.h
+++ b/src/libmongoc/src/mongoc/mongoc-stream-tls-secure-transport.h
@@ -20,7 +20,10 @@
 #define MONGOC_STREAM_TLS_SECURE_TRANSPORT_H
 
 #ifdef MONGOC_ENABLE_SSL_SECURE_TRANSPORT
+
 #include <mongoc/mongoc-macros.h>
+#include <mongoc/mongoc-ssl.h>
+#include <mongoc/mongoc-stream.h>
 
 #include <bson/bson.h>
 
diff --git a/src/libmongoc/src/mongoc/mongoc-structured-log-private.h b/src/libmongoc/src/mongoc/mongoc-structured-log-private.h
index 3477e1a8f79..217eec60023 100644
--- a/src/libmongoc/src/mongoc/mongoc-structured-log-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-structured-log-private.h
@@ -19,14 +19,16 @@
 #ifndef MONGOC_STRUCTURED_LOG_PRIVATE_H
 #define MONGOC_STRUCTURED_LOG_PRIVATE_H
 
+#include <mongoc/mongoc-structured-log.h> // IWYU pragma: export
+
+//
+
 #include <common-bson-dsl-private.h>
 #include <mongoc/mongoc-cmd-private.h>
 #include <mongoc/mongoc-error-private.h>
 #include <mongoc/mongoc-read-prefs-private.h>
 #include <mongoc/mongoc-server-description-private.h>
 
-#include <mongoc/mongoc-structured-log.h>
-
 #include <bson/bson.h>
 
 BSON_BEGIN_DECLS
diff --git a/src/libmongoc/src/mongoc/mongoc-topology-description-private.h b/src/libmongoc/src/mongoc/mongoc-topology-description-private.h
index 695f7e41ce1..d80d0abae2d 100644
--- a/src/libmongoc/src/mongoc/mongoc-topology-description-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-topology-description-private.h
@@ -19,6 +19,10 @@
 #ifndef MONGOC_TOPOLOGY_DESCRIPTION_PRIVATE_H
 #define MONGOC_TOPOLOGY_DESCRIPTION_PRIVATE_H
 
+#include <mongoc/mongoc-topology-description.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-apm-private.h>
 #include <mongoc/mongoc-array-private.h>
 #include <mongoc/mongoc-deprioritized-servers-private.h>
@@ -27,7 +31,6 @@
 #include <mongoc/mongoc-set-private.h>
 
 #include <mongoc/mongoc-server-description.h>
-#include <mongoc/mongoc-topology-description.h>
 
 
 typedef enum {
diff --git a/src/libmongoc/src/mongoc/mongoc-topology-description.h b/src/libmongoc/src/mongoc/mongoc-topology-description.h
index 168de9b71cf..6dc076b57fa 100644
--- a/src/libmongoc/src/mongoc/mongoc-topology-description.h
+++ b/src/libmongoc/src/mongoc/mongoc-topology-description.h
@@ -21,6 +21,7 @@
 
 #include <mongoc/mongoc-macros.h>
 #include <mongoc/mongoc-read-prefs.h>
+#include <mongoc/mongoc-server-description.h>
 
 #include <bson/bson.h>
 
diff --git a/src/libmongoc/src/mongoc/mongoc-uri-private.h b/src/libmongoc/src/mongoc/mongoc-uri-private.h
index fc60c37d859..5e9dc2ac38f 100644
--- a/src/libmongoc/src/mongoc/mongoc-uri-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-uri-private.h
@@ -19,11 +19,13 @@
 #ifndef MONGOC_URI_PRIVATE_H
 #define MONGOC_URI_PRIVATE_H
 
+#include <mongoc/mongoc-uri.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc-crypto-private.h>
 #include <mongoc/mongoc-scram-private.h>
 
-#include <mongoc/mongoc-uri.h>
-
 #include <mlib/str.h>
 
 
diff --git a/src/libmongoc/src/mongoc/mongoc-util-private.h b/src/libmongoc/src/mongoc/mongoc-util-private.h
index 60b19031ca6..9914febffdf 100644
--- a/src/libmongoc/src/mongoc/mongoc-util-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-util-private.h
@@ -19,6 +19,10 @@
 #ifndef MONGOC_UTIL_PRIVATE_H
 #define MONGOC_UTIL_PRIVATE_H
 
+#include <mongoc/mongoc-util-private.h> // IWYU pragma: export
+
+//
+
 #include <mongoc/mongoc.h>
 
 #include <bson/bson.h>
diff --git a/src/libmongoc/src/mongoc/mongoc-write-concern-private.h b/src/libmongoc/src/mongoc/mongoc-write-concern-private.h
index 2c6cf5d493e..741a17d080c 100644
--- a/src/libmongoc/src/mongoc/mongoc-write-concern-private.h
+++ b/src/libmongoc/src/mongoc/mongoc-write-concern-private.h
@@ -19,6 +19,10 @@
 #ifndef MONGOC_WRITE_CONCERN_PRIVATE_H
 #define MONGOC_WRITE_CONCERN_PRIVATE_H
 
+#include <mongoc/mongoc-write-concern.h> // IWYU pragma: export
+
+//
+
 #include <bson/bson.h>