diff --git a/Doxyfile b/Doxyfile
index 3c84c6e80a..2199c0e8dd 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -2412,7 +2412,9 @@ SEARCH_INCLUDES        = YES
 # RECURSIVE has no effect here.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           = build/doxygen/install/include
+INCLUDE_PATH           = build/doxygen/install/include/bsoncxx/v_noabi \
+                         build/doxygen/install/include/mongocxx/v_noabi \
+                         build/doxygen/install/include
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
@@ -2430,13 +2432,11 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = BSONCXX_ABI_CDECL= \
-                         BSONCXX_ABI_EXPORT= \
-                         BSONCXX_ABI_EXPORT_CDECL(...)=__VA_ARGS__ \
+PREDEFINED             = __attribute__(...)= \
+                         __declspec(...)= \
+                         _Pragma(...)= \
+                         __pragma(...)= \
                          BSONCXX_PRIVATE_DOXYGEN_PREPROCESSOR= \
-                         MONGOCXX_ABI_CDECL= \
-                         MONGOCXX_ABI_EXPORT= \
-                         MONGOCXX_ABI_EXPORT_CDECL(...)=__VA_ARGS__ \
                          MONGOCXX_PRIVATE_DOXYGEN_PREPROCESSOR=
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt
index 05b22be563..5c18db21be 100644
--- a/src/bsoncxx/CMakeLists.txt
+++ b/src/bsoncxx/CMakeLists.txt
@@ -153,11 +153,6 @@ if(1)
 /// @warning For internal use only!
 ///
 
-// Doxygen `PREDEFINED` does not define the macro *in code* as required by `@def`.
-#if defined(BSONCXX_PRIVATE_DOXYGEN_PREPROCESSOR)
-#define BSONCXX_ABI_EXPORT ...
-#endif
-
 ///
 /// @def BSONCXX_ABI_EXPORT
 /// @hideinitializer
diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt
index 4651d4a4a5..e92198c7bb 100644
--- a/src/mongocxx/CMakeLists.txt
+++ b/src/mongocxx/CMakeLists.txt
@@ -121,11 +121,6 @@ if(1)
 
 #define MONGOCXX_ABI_EXPORT_CDECL(...) MONGOCXX_ABI_EXPORT __VA_ARGS__ MONGOCXX_ABI_CDECL
 
-// Doxygen `PREDEFINED` does not define the macro *in code* as required by `@def`.
-#if defined(MONGOCXX_PRIVATE_DOXYGEN_PREPROCESSOR)
-#define MONGOCXX_ABI_EXPORT ...
-#endif
-
 ///
 /// @file
 /// Provides macros to control the set of symbols exported in the ABI.