diff --git a/objectivec/src/cxx_api.h b/objectivec/src/cxx_api.h
new file mode 100644
index 0000000000..02ccf95058
--- /dev/null
+++ b/objectivec/src/cxx_api.h
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// wrapper for ORT C/C++ API headers
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+// ignore clang documentation-related warnings
+// instead, we will rely on Doxygen warnings for the C/C++ API headers
+#pragma clang diagnostic ignored "-Wdocumentation"
+#endif  // defined(__clang__)
+
+#include "onnxruntime_c_api.h"
+#include "onnxruntime_cxx_api.h"
+
+#if __has_include("coreml_provider_factory.h")
+#define ORT_OBJC_API_COREML_EP_AVAILABLE 1
+#else
+#define ORT_OBJC_API_COREML_EP_AVAILABLE 0
+#endif
+
+#if ORT_OBJC_API_COREML_EP_AVAILABLE
+#include "coreml_provider_factory.h"
+#endif
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif  // defined(__clang__)
diff --git a/objectivec/src/error_utils.h b/objectivec/src/error_utils.h
index 8c9663023d..0a32f944c5 100644
--- a/objectivec/src/error_utils.h
+++ b/objectivec/src/error_utils.h
@@ -5,7 +5,7 @@
 
 #include <exception>
 
-#include "onnxruntime_cxx_api.h"
+#import "src/cxx_api.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/objectivec/src/ort_coreml_execution_provider.mm b/objectivec/src/ort_coreml_execution_provider.mm
index 5f86bc28df..18b58db9d8 100644
--- a/objectivec/src/ort_coreml_execution_provider.mm
+++ b/objectivec/src/ort_coreml_execution_provider.mm
@@ -3,16 +3,7 @@
 
 #import "ort_coreml_execution_provider.h"
 
-#if __has_include("coreml_provider_factory.h")
-#define ORT_OBJC_API_COREML_EP_AVAILABLE 1
-#else
-#define ORT_OBJC_API_COREML_EP_AVAILABLE 0
-#endif
-
-#if ORT_OBJC_API_COREML_EP_AVAILABLE
-#include "coreml_provider_factory.h"
-#endif
-
+#import "src/cxx_api.h"
 #import "src/error_utils.h"
 #import "src/ort_session_internal.h"
 
diff --git a/objectivec/src/ort_enums.mm b/objectivec/src/ort_enums.mm
index e172bdbf9d..1a7d63decd 100644
--- a/objectivec/src/ort_enums.mm
+++ b/objectivec/src/ort_enums.mm
@@ -5,7 +5,7 @@
 
 #include <algorithm>
 
-#include "onnxruntime_cxx_api.h"
+#import "src/cxx_api.h"
 
 namespace {
 
diff --git a/objectivec/src/ort_enums_internal.h b/objectivec/src/ort_enums_internal.h
index 322e8cb5c8..b8a51f779b 100644
--- a/objectivec/src/ort_enums_internal.h
+++ b/objectivec/src/ort_enums_internal.h
@@ -3,7 +3,7 @@
 
 #import "ort_enums.h"
 
-#include "onnxruntime_c_api.h"
+#import "src/cxx_api.h"
 
 OrtLoggingLevel PublicToCAPILoggingLevel(ORTLoggingLevel logging_level);
 
diff --git a/objectivec/src/ort_env.mm b/objectivec/src/ort_env.mm
index fb1f6da962..c880d76560 100644
--- a/objectivec/src/ort_env.mm
+++ b/objectivec/src/ort_env.mm
@@ -5,7 +5,7 @@
 
 #include <optional>
 
-#include "onnxruntime_cxx_api.h"
+#import "src/cxx_api.h"
 
 #import "src/error_utils.h"
 #import "src/ort_enums_internal.h"
diff --git a/objectivec/src/ort_env_internal.h b/objectivec/src/ort_env_internal.h
index f2bb3b2a5f..ff127f8b6a 100644
--- a/objectivec/src/ort_env_internal.h
+++ b/objectivec/src/ort_env_internal.h
@@ -3,7 +3,7 @@
 
 #import "ort_env.h"
 
-#include "onnxruntime_cxx_api.h"
+#import "src/cxx_api.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/objectivec/src/ort_session.mm b/objectivec/src/ort_session.mm
index 070ceaa7d4..f801740f15 100644
--- a/objectivec/src/ort_session.mm
+++ b/objectivec/src/ort_session.mm
@@ -6,8 +6,7 @@
 #include <optional>
 #include <vector>
 
-#include "onnxruntime_cxx_api.h"
-
+#import "src/cxx_api.h"
 #import "src/error_utils.h"
 #import "src/ort_enums_internal.h"
 #import "src/ort_env_internal.h"
diff --git a/objectivec/src/ort_session_internal.h b/objectivec/src/ort_session_internal.h
index c97d1ed766..3adc2f96f4 100644
--- a/objectivec/src/ort_session_internal.h
+++ b/objectivec/src/ort_session_internal.h
@@ -3,7 +3,7 @@
 
 #import "ort_session.h"
 
-#include "onnxruntime_cxx_api.h"
+#import "src/cxx_api.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/objectivec/src/ort_value.mm b/objectivec/src/ort_value.mm
index f55659d896..710b20729a 100644
--- a/objectivec/src/ort_value.mm
+++ b/objectivec/src/ort_value.mm
@@ -7,8 +7,7 @@
 
 #include "safeint/SafeInt.hpp"
 
-#include "onnxruntime_cxx_api.h"
-
+#import "src/cxx_api.h"
 #import "src/error_utils.h"
 #import "src/ort_enums_internal.h"
 
diff --git a/objectivec/src/ort_value_internal.h b/objectivec/src/ort_value_internal.h
index 8e1b598767..3b1e74f598 100644
--- a/objectivec/src/ort_value_internal.h
+++ b/objectivec/src/ort_value_internal.h
@@ -3,7 +3,7 @@
 
 #import "ort_value.h"
 
-#include "onnxruntime_cxx_api.h"
+#import "src/cxx_api.h"
 
 NS_ASSUME_NONNULL_BEGIN