diff --git a/sdk/objc/api/logging/RTCCallbackLogger.h b/sdk/objc/api/logging/RTCCallbackLogger.h
index 669f2a3e4a..4867b31e36 100644
--- a/sdk/objc/api/logging/RTCCallbackLogger.h
+++ b/sdk/objc/api/logging/RTCCallbackLogger.h
@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 // This class intercepts WebRTC logs and forwards them to a registered block.
 // This class is not threadsafe.
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCCallbackLogger : NSObject
 
 // The severity level to capture. The default is kRTCLoggingSeverityInfo.
diff --git a/sdk/objc/api/peerconnection/RTCAudioSource.h b/sdk/objc/api/peerconnection/RTCAudioSource.h
index f6bccc94d8..d1030e3fef 100644
--- a/sdk/objc/api/peerconnection/RTCAudioSource.h
+++ b/sdk/objc/api/peerconnection/RTCAudioSource.h
@@ -15,7 +15,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCAudioSource : RTCMediaSource
 
 - (instancetype)init NS_UNAVAILABLE;
diff --git a/sdk/objc/api/peerconnection/RTCAudioTrack.h b/sdk/objc/api/peerconnection/RTCAudioTrack.h
index 4fb634fcab..501ef92ec4 100644
--- a/sdk/objc/api/peerconnection/RTCAudioTrack.h
+++ b/sdk/objc/api/peerconnection/RTCAudioTrack.h
@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class RTCAudioSource;
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCAudioTrack : RTCMediaStreamTrack
 
 - (instancetype)init NS_UNAVAILABLE;
diff --git a/sdk/objc/api/peerconnection/RTCCertificate.h b/sdk/objc/api/peerconnection/RTCCertificate.h
index f6e9d02511..50c1ca55a3 100644
--- a/sdk/objc/api/peerconnection/RTCCertificate.h
+++ b/sdk/objc/api/peerconnection/RTCCertificate.h
@@ -14,7 +14,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCCertificate : NSObject <NSCopying>
 
 /** Private key in PEM. */
diff --git a/sdk/objc/api/peerconnection/RTCConfiguration.h b/sdk/objc/api/peerconnection/RTCConfiguration.h
index bc70f0f573..9fb8b4df35 100644
--- a/sdk/objc/api/peerconnection/RTCConfiguration.h
+++ b/sdk/objc/api/peerconnection/RTCConfiguration.h
@@ -69,7 +69,7 @@ typedef NS_ENUM(NSInteger, RTCSdpSemantics) {
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCConfiguration : NSObject
 
 /** An array of Ice Servers available to be used by ICE. */
diff --git a/sdk/objc/api/peerconnection/RTCDataChannel.h b/sdk/objc/api/peerconnection/RTCDataChannel.h
index 8bde37239f..0cc2de87f2 100644
--- a/sdk/objc/api/peerconnection/RTCDataChannel.h
+++ b/sdk/objc/api/peerconnection/RTCDataChannel.h
@@ -15,7 +15,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCDataBuffer : NSObject
 
 /** NSData representation of the underlying buffer. */
@@ -35,7 +35,7 @@ RTC_EXPORT
 @end
 
 @class RTCDataChannel;
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCDataChannelDelegate <NSObject>
 
 /** The data channel state changed. */
@@ -59,7 +59,7 @@ typedef NS_ENUM(NSInteger, RTCDataChannelState) {
   RTCDataChannelStateClosed,
 };
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCDataChannel : NSObject
 
 /**
diff --git a/sdk/objc/api/peerconnection/RTCDataChannelConfiguration.h b/sdk/objc/api/peerconnection/RTCDataChannelConfiguration.h
index de4b72a62d..96d33f4d72 100644
--- a/sdk/objc/api/peerconnection/RTCDataChannelConfiguration.h
+++ b/sdk/objc/api/peerconnection/RTCDataChannelConfiguration.h
@@ -15,7 +15,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCDataChannelConfiguration : NSObject
 
 /** Set to YES if ordered delivery is required. */
diff --git a/sdk/objc/api/peerconnection/RTCDtmfSender.h b/sdk/objc/api/peerconnection/RTCDtmfSender.h
index 1beed5c7a4..5d86d01892 100644
--- a/sdk/objc/api/peerconnection/RTCDtmfSender.h
+++ b/sdk/objc/api/peerconnection/RTCDtmfSender.h
@@ -14,7 +14,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCDtmfSender <NSObject>
 
 /**
diff --git a/sdk/objc/api/peerconnection/RTCFileLogger.h b/sdk/objc/api/peerconnection/RTCFileLogger.h
index 36b0f75e84..cd5c1c466b 100644
--- a/sdk/objc/api/peerconnection/RTCFileLogger.h
+++ b/sdk/objc/api/peerconnection/RTCFileLogger.h
@@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
 // are preserved while the middle section is overwritten instead.
 // For kRTCFileLoggerTypeApp, the oldest log is overwritten.
 // This class is not threadsafe.
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCFileLogger : NSObject
 
 // The severity level to capture. The default is kRTCFileLoggerSeverityInfo.
diff --git a/sdk/objc/api/peerconnection/RTCIceCandidate.h b/sdk/objc/api/peerconnection/RTCIceCandidate.h
index 7c72e56944..3e305cc418 100644
--- a/sdk/objc/api/peerconnection/RTCIceCandidate.h
+++ b/sdk/objc/api/peerconnection/RTCIceCandidate.h
@@ -14,7 +14,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCIceCandidate : NSObject
 
 /**
diff --git a/sdk/objc/api/peerconnection/RTCIceServer.h b/sdk/objc/api/peerconnection/RTCIceServer.h
index c2def045a9..ab5fc4a9ed 100644
--- a/sdk/objc/api/peerconnection/RTCIceServer.h
+++ b/sdk/objc/api/peerconnection/RTCIceServer.h
@@ -19,7 +19,7 @@ typedef NS_ENUM(NSUInteger, RTCTlsCertPolicy) {
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCIceServer : NSObject
 
 /** URI(s) for this server represented as NSStrings. */
diff --git a/sdk/objc/api/peerconnection/RTCLegacyStatsReport.h b/sdk/objc/api/peerconnection/RTCLegacyStatsReport.h
index 5ea9ff5367..85f2b8fb3d 100644
--- a/sdk/objc/api/peerconnection/RTCLegacyStatsReport.h
+++ b/sdk/objc/api/peerconnection/RTCLegacyStatsReport.h
@@ -15,7 +15,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /** This does not currently conform to the spec. */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCLegacyStatsReport : NSObject
 
 /** Time since 1970-01-01T00:00:00Z in milliseconds. */
diff --git a/sdk/objc/api/peerconnection/RTCMediaConstraints.h b/sdk/objc/api/peerconnection/RTCMediaConstraints.h
index adde356fd3..eb12a592f9 100644
--- a/sdk/objc/api/peerconnection/RTCMediaConstraints.h
+++ b/sdk/objc/api/peerconnection/RTCMediaConstraints.h
@@ -38,7 +38,7 @@ RTC_EXTERN NSString *const kRTCMediaConstraintsVoiceActivityDetection;
 RTC_EXTERN NSString *const kRTCMediaConstraintsValueTrue;
 RTC_EXTERN NSString *const kRTCMediaConstraintsValueFalse;
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCMediaConstraints : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
diff --git a/sdk/objc/api/peerconnection/RTCMediaSource.h b/sdk/objc/api/peerconnection/RTCMediaSource.h
index 9a1137a322..838c783208 100644
--- a/sdk/objc/api/peerconnection/RTCMediaSource.h
+++ b/sdk/objc/api/peerconnection/RTCMediaSource.h
@@ -21,7 +21,7 @@ typedef NS_ENUM(NSInteger, RTCSourceState) {
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCMediaSource : NSObject
 
 /** The current state of the RTCMediaSource. */
diff --git a/sdk/objc/api/peerconnection/RTCMediaStream.h b/sdk/objc/api/peerconnection/RTCMediaStream.h
index 675e4b9bed..bb9bec690a 100644
--- a/sdk/objc/api/peerconnection/RTCMediaStream.h
+++ b/sdk/objc/api/peerconnection/RTCMediaStream.h
@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class RTCPeerConnectionFactory;
 @class RTCVideoTrack;
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCMediaStream : NSObject
 
 /** The audio tracks in this stream. */
diff --git a/sdk/objc/api/peerconnection/RTCMediaStreamTrack.h b/sdk/objc/api/peerconnection/RTCMediaStreamTrack.h
index 60c9af46a0..d1ea0f28f3 100644
--- a/sdk/objc/api/peerconnection/RTCMediaStreamTrack.h
+++ b/sdk/objc/api/peerconnection/RTCMediaStreamTrack.h
@@ -25,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
 RTC_EXTERN NSString *const kRTCMediaStreamTrackKindAudio;
 RTC_EXTERN NSString *const kRTCMediaStreamTrackKindVideo;
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCMediaStreamTrack : NSObject
 
 /**
diff --git a/sdk/objc/api/peerconnection/RTCMetricsSampleInfo.h b/sdk/objc/api/peerconnection/RTCMetricsSampleInfo.h
index 707f866acd..cd38ab9a91 100644
--- a/sdk/objc/api/peerconnection/RTCMetricsSampleInfo.h
+++ b/sdk/objc/api/peerconnection/RTCMetricsSampleInfo.h
@@ -14,7 +14,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCMetricsSampleInfo : NSObject
 
 /**
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnection.h b/sdk/objc/api/peerconnection/RTCPeerConnection.h
index fa1e3c1e86..0179ec0e26 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnection.h
+++ b/sdk/objc/api/peerconnection/RTCPeerConnection.h
@@ -72,7 +72,7 @@ typedef NS_ENUM(NSInteger, RTCStatsOutputLevel) {
 
 @class RTCPeerConnection;
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCPeerConnectionDelegate <NSObject>
 
 /** Called when the SignalingState changed. */
@@ -130,7 +130,7 @@ RTC_EXPORT
 
 @end
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCPeerConnection : NSObject
 
 /** The object that will be notifed about events such as state changes and
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.h b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.h
index a5faeaee8f..c808218b54 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.h
+++ b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.h
@@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol RTCVideoDecoderFactory;
 @protocol RTCVideoEncoderFactory;
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCPeerConnectionFactory : NSObject
 
 /* Initialize object with default H264 video encoder/decoder factories */
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions.h b/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions.h
index 26a743b3f4..af327f987b 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions.h
+++ b/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions.h
@@ -14,7 +14,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCPeerConnectionFactoryOptions : NSObject
 
 @property(nonatomic, assign) BOOL disableEncryption;
diff --git a/sdk/objc/api/peerconnection/RTCRtcpParameters.h b/sdk/objc/api/peerconnection/RTCRtcpParameters.h
index 2f4c43b879..5c265806b1 100644
--- a/sdk/objc/api/peerconnection/RTCRtcpParameters.h
+++ b/sdk/objc/api/peerconnection/RTCRtcpParameters.h
@@ -14,7 +14,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCRtcpParameters : NSObject
 
 /** The Canonical Name used by RTCP. */
diff --git a/sdk/objc/api/peerconnection/RTCRtpCodecParameters.h b/sdk/objc/api/peerconnection/RTCRtpCodecParameters.h
index cb69a37c95..5d3cac5c96 100644
--- a/sdk/objc/api/peerconnection/RTCRtpCodecParameters.h
+++ b/sdk/objc/api/peerconnection/RTCRtpCodecParameters.h
@@ -32,7 +32,7 @@ RTC_EXTERN const NSString *const kRTCVp9CodecName;
 RTC_EXTERN const NSString *const kRTCH264CodecName;
 
 /** Defined in http://w3c.github.io/webrtc-pc/#idl-def-RTCRtpCodecParameters */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCRtpCodecParameters : NSObject
 
 /** The RTP payload type. */
diff --git a/sdk/objc/api/peerconnection/RTCRtpEncodingParameters.h b/sdk/objc/api/peerconnection/RTCRtpEncodingParameters.h
index 900b37918f..0634791b39 100644
--- a/sdk/objc/api/peerconnection/RTCRtpEncodingParameters.h
+++ b/sdk/objc/api/peerconnection/RTCRtpEncodingParameters.h
@@ -14,7 +14,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCRtpEncodingParameters : NSObject
 
 /** Controls whether the encoding is currently transmitted. */
diff --git a/sdk/objc/api/peerconnection/RTCRtpHeaderExtension.h b/sdk/objc/api/peerconnection/RTCRtpHeaderExtension.h
index 8dd80ff46c..32114499ce 100644
--- a/sdk/objc/api/peerconnection/RTCRtpHeaderExtension.h
+++ b/sdk/objc/api/peerconnection/RTCRtpHeaderExtension.h
@@ -14,7 +14,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCRtpHeaderExtension : NSObject
 
 /** The URI of the RTP header extension, as defined in RFC5285. */
diff --git a/sdk/objc/api/peerconnection/RTCRtpParameters.h b/sdk/objc/api/peerconnection/RTCRtpParameters.h
index a4acc9ba72..c1f2d5cea9 100644
--- a/sdk/objc/api/peerconnection/RTCRtpParameters.h
+++ b/sdk/objc/api/peerconnection/RTCRtpParameters.h
@@ -18,7 +18,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCRtpParameters : NSObject
 
 /** A unique identifier for the last set of parameters applied. */
diff --git a/sdk/objc/api/peerconnection/RTCRtpReceiver.h b/sdk/objc/api/peerconnection/RTCRtpReceiver.h
index 902347995b..7a7dacea2b 100644
--- a/sdk/objc/api/peerconnection/RTCRtpReceiver.h
+++ b/sdk/objc/api/peerconnection/RTCRtpReceiver.h
@@ -25,7 +25,7 @@ typedef NS_ENUM(NSInteger, RTCRtpMediaType) {
 
 @class RTCRtpReceiver;
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCRtpReceiverDelegate <NSObject>
 
 /** Called when the first RTP packet is received.
@@ -45,7 +45,7 @@ RTC_EXPORT
 
 @end
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCRtpReceiver <NSObject>
 
 /** A unique identifier for this receiver. */
@@ -72,7 +72,7 @@ RTC_EXPORT
 
 @end
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCRtpReceiver : NSObject <RTCRtpReceiver>
 
 - (instancetype)init NS_UNAVAILABLE;
diff --git a/sdk/objc/api/peerconnection/RTCRtpSender.h b/sdk/objc/api/peerconnection/RTCRtpSender.h
index 55ab383a6f..49f61b81d5 100644
--- a/sdk/objc/api/peerconnection/RTCRtpSender.h
+++ b/sdk/objc/api/peerconnection/RTCRtpSender.h
@@ -17,7 +17,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCRtpSender <NSObject>
 
 /** A unique identifier for this sender. */
@@ -40,7 +40,7 @@ RTC_EXPORT
 
 @end
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCRtpSender : NSObject <RTCRtpSender>
 
 - (instancetype)init NS_UNAVAILABLE;
diff --git a/sdk/objc/api/peerconnection/RTCRtpTransceiver.h b/sdk/objc/api/peerconnection/RTCRtpTransceiver.h
index 402b04e0d7..8b962e4884 100644
--- a/sdk/objc/api/peerconnection/RTCRtpTransceiver.h
+++ b/sdk/objc/api/peerconnection/RTCRtpTransceiver.h
@@ -56,7 +56,7 @@ typedef NS_ENUM(NSInteger, RTCRtpTransceiverDirection) {
  *  WebRTC specification for RTCRtpTransceiver, the JavaScript analog:
  *  https://w3c.github.io/webrtc-pc/#dom-rtcrtptransceiver
  */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCRtpTransceiver <NSObject>
 
 /** Media type of the transceiver. The sender and receiver will also have this
@@ -118,7 +118,7 @@ RTC_EXPORT
 
 @end
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCRtpTransceiver : NSObject <RTCRtpTransceiver>
 
 - (instancetype)init NS_UNAVAILABLE;
diff --git a/sdk/objc/api/peerconnection/RTCSessionDescription.h b/sdk/objc/api/peerconnection/RTCSessionDescription.h
index bef3a4ce1c..b9bcab1a46 100644
--- a/sdk/objc/api/peerconnection/RTCSessionDescription.h
+++ b/sdk/objc/api/peerconnection/RTCSessionDescription.h
@@ -24,7 +24,7 @@ typedef NS_ENUM(NSInteger, RTCSdpType) {
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCSessionDescription : NSObject
 
 /** The type of session description. */
diff --git a/sdk/objc/api/peerconnection/RTCVideoSource.h b/sdk/objc/api/peerconnection/RTCVideoSource.h
index 1ead394d6c..ec8a45c1c2 100644
--- a/sdk/objc/api/peerconnection/RTCVideoSource.h
+++ b/sdk/objc/api/peerconnection/RTCVideoSource.h
@@ -16,7 +16,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 
 @interface RTCVideoSource : RTCMediaSource <RTCVideoCapturerDelegate>
 
diff --git a/sdk/objc/api/peerconnection/RTCVideoTrack.h b/sdk/objc/api/peerconnection/RTCVideoTrack.h
index 547f4d4f13..b946889eb4 100644
--- a/sdk/objc/api/peerconnection/RTCVideoTrack.h
+++ b/sdk/objc/api/peerconnection/RTCVideoTrack.h
@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class RTCPeerConnectionFactory;
 @class RTCVideoSource;
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCVideoTrack : RTCMediaStreamTrack
 
 /** The video source for this video track. */
diff --git a/sdk/objc/api/video_codec/RTCVideoCodecConstants.h b/sdk/objc/api/video_codec/RTCVideoCodecConstants.h
index fb9043ff62..03f36e22ca 100644
--- a/sdk/objc/api/video_codec/RTCVideoCodecConstants.h
+++ b/sdk/objc/api/video_codec/RTCVideoCodecConstants.h
@@ -12,5 +12,5 @@
 
 #import "RTCMacros.h"
 
-RTC_EXPORT extern NSString *const kRTCVideoCodecVp8Name;
-RTC_EXPORT extern NSString *const kRTCVideoCodecVp9Name;
+RTC_OBJC_EXPORT extern NSString* const kRTCVideoCodecVp8Name;
+RTC_OBJC_EXPORT extern NSString* const kRTCVideoCodecVp9Name;
diff --git a/sdk/objc/api/video_codec/RTCVideoDecoderVP8.h b/sdk/objc/api/video_codec/RTCVideoDecoderVP8.h
index e5050ff636..00786dc514 100644
--- a/sdk/objc/api/video_codec/RTCVideoDecoderVP8.h
+++ b/sdk/objc/api/video_codec/RTCVideoDecoderVP8.h
@@ -13,7 +13,7 @@
 #import "RTCMacros.h"
 #import "RTCVideoDecoder.h"
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCVideoDecoderVP8 : NSObject
 
 /* This returns a VP8 decoder that can be returned from a RTCVideoDecoderFactory injected into
diff --git a/sdk/objc/api/video_codec/RTCVideoDecoderVP9.h b/sdk/objc/api/video_codec/RTCVideoDecoderVP9.h
index 06d0a03a42..b74c1ef999 100644
--- a/sdk/objc/api/video_codec/RTCVideoDecoderVP9.h
+++ b/sdk/objc/api/video_codec/RTCVideoDecoderVP9.h
@@ -13,7 +13,7 @@
 #import "RTCMacros.h"
 #import "RTCVideoDecoder.h"
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCVideoDecoderVP9 : NSObject
 
 /* This returns a VP9 decoder that can be returned from a RTCVideoDecoderFactory injected into
diff --git a/sdk/objc/api/video_codec/RTCVideoEncoderVP8.h b/sdk/objc/api/video_codec/RTCVideoEncoderVP8.h
index e3a50f233a..8d87a89893 100644
--- a/sdk/objc/api/video_codec/RTCVideoEncoderVP8.h
+++ b/sdk/objc/api/video_codec/RTCVideoEncoderVP8.h
@@ -13,7 +13,7 @@
 #import "RTCMacros.h"
 #import "RTCVideoEncoder.h"
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCVideoEncoderVP8 : NSObject
 
 /* This returns a VP8 encoder that can be returned from a RTCVideoEncoderFactory injected into
diff --git a/sdk/objc/api/video_codec/RTCVideoEncoderVP9.h b/sdk/objc/api/video_codec/RTCVideoEncoderVP9.h
index 955f382a6c..9efea4be2a 100644
--- a/sdk/objc/api/video_codec/RTCVideoEncoderVP9.h
+++ b/sdk/objc/api/video_codec/RTCVideoEncoderVP9.h
@@ -13,7 +13,7 @@
 #import "RTCMacros.h"
 #import "RTCVideoEncoder.h"
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCVideoEncoderVP9 : NSObject
 
 /* This returns a VP9 encoder that can be returned from a RTCVideoEncoderFactory injected into
diff --git a/sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.h b/sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.h
index 48309522d0..9a904f5396 100644
--- a/sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.h
+++ b/sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.h
@@ -16,7 +16,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /** RTCI420Buffer implements the RTCI420Buffer protocol */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCI420Buffer : NSObject<RTCI420Buffer>
 @end
 
diff --git a/sdk/objc/api/video_frame_buffer/RTCNativeMutableI420Buffer.h b/sdk/objc/api/video_frame_buffer/RTCNativeMutableI420Buffer.h
index 035666d3e8..6cd5110460 100644
--- a/sdk/objc/api/video_frame_buffer/RTCNativeMutableI420Buffer.h
+++ b/sdk/objc/api/video_frame_buffer/RTCNativeMutableI420Buffer.h
@@ -17,7 +17,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /** Mutable version of RTCI420Buffer */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCMutableI420Buffer : RTCI420Buffer<RTCMutableI420Buffer>
 @end
 
diff --git a/sdk/objc/base/RTCCodecSpecificInfo.h b/sdk/objc/base/RTCCodecSpecificInfo.h
index 18f06f4078..e2ae4cafa1 100644
--- a/sdk/objc/base/RTCCodecSpecificInfo.h
+++ b/sdk/objc/base/RTCCodecSpecificInfo.h
@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 /** Implement this protocol to pass codec specific info from the encoder.
  *  Corresponds to webrtc::CodecSpecificInfo.
  */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCCodecSpecificInfo <NSObject>
 @end
 
diff --git a/sdk/objc/base/RTCEncodedImage.h b/sdk/objc/base/RTCEncodedImage.h
index 904e8ab62e..670c7276ff 100644
--- a/sdk/objc/base/RTCEncodedImage.h
+++ b/sdk/objc/base/RTCEncodedImage.h
@@ -30,7 +30,7 @@ typedef NS_ENUM(NSUInteger, RTCVideoContentType) {
 };
 
 /** Represents an encoded frame. Corresponds to webrtc::EncodedImage. */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCEncodedImage : NSObject
 
 @property(nonatomic, strong) NSData *buffer;
diff --git a/sdk/objc/base/RTCI420Buffer.h b/sdk/objc/base/RTCI420Buffer.h
index 27d73379ae..a6c7e41bcb 100644
--- a/sdk/objc/base/RTCI420Buffer.h
+++ b/sdk/objc/base/RTCI420Buffer.h
@@ -15,7 +15,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /** Protocol for RTCYUVPlanarBuffers containing I420 data */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCI420Buffer <RTCYUVPlanarBuffer>
 @end
 
diff --git a/sdk/objc/base/RTCMacros.h b/sdk/objc/base/RTCMacros.h
index 4379058188..c2def9169c 100644
--- a/sdk/objc/base/RTCMacros.h
+++ b/sdk/objc/base/RTCMacros.h
@@ -11,12 +11,15 @@
 #ifndef SDK_OBJC_BASE_RTCMACROS_H_
 #define SDK_OBJC_BASE_RTCMACROS_H_
 
-#define RTC_EXPORT __attribute__((visibility("default")))
+#define RTC_OBJC_EXPORT __attribute__((visibility("default")))
+// TODO(mbonadei): Remove RTC_EXPORT in order to be able to land
+// https://webrtc-review.googlesource.com/c/src/+/97960.
+#define RTC_EXPORT RTC_OBJC_EXPORT
 
 #if defined(__cplusplus)
-#define RTC_EXTERN extern "C" RTC_EXPORT
+#define RTC_EXTERN extern "C" RTC_OBJC_EXPORT
 #else
-#define RTC_EXTERN extern RTC_EXPORT
+#define RTC_EXTERN extern RTC_OBJC_EXPORT
 #endif
 
 #ifdef __OBJC__
diff --git a/sdk/objc/base/RTCMutableI420Buffer.h b/sdk/objc/base/RTCMutableI420Buffer.h
index 2eea6d06a9..098fb9a66f 100644
--- a/sdk/objc/base/RTCMutableI420Buffer.h
+++ b/sdk/objc/base/RTCMutableI420Buffer.h
@@ -16,7 +16,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /** Extension of the I420 buffer with mutable data access */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCMutableI420Buffer <RTCI420Buffer, RTCMutableYUVPlanarBuffer>
 @end
 
diff --git a/sdk/objc/base/RTCMutableYUVPlanarBuffer.h b/sdk/objc/base/RTCMutableYUVPlanarBuffer.h
index 50b097d2db..00dfcd94ca 100644
--- a/sdk/objc/base/RTCMutableYUVPlanarBuffer.h
+++ b/sdk/objc/base/RTCMutableYUVPlanarBuffer.h
@@ -15,7 +15,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /** Extension of the YUV planar data buffer with mutable data access */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCMutableYUVPlanarBuffer <RTCYUVPlanarBuffer>
 
 @property(nonatomic, readonly) uint8_t *mutableDataY;
diff --git a/sdk/objc/base/RTCRtpFragmentationHeader.h b/sdk/objc/base/RTCRtpFragmentationHeader.h
index 2fed6f60d1..2e26b08b8a 100644
--- a/sdk/objc/base/RTCRtpFragmentationHeader.h
+++ b/sdk/objc/base/RTCRtpFragmentationHeader.h
@@ -15,7 +15,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /** Information for header. Corresponds to webrtc::RTPFragmentationHeader. */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCRtpFragmentationHeader : NSObject
 
 @property(nonatomic, strong) NSArray<NSNumber *> *fragmentationOffset;
diff --git a/sdk/objc/base/RTCVideoCapturer.h b/sdk/objc/base/RTCVideoCapturer.h
index 42e4b25ecc..5212627692 100644
--- a/sdk/objc/base/RTCVideoCapturer.h
+++ b/sdk/objc/base/RTCVideoCapturer.h
@@ -16,12 +16,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class RTCVideoCapturer;
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCVideoCapturerDelegate <NSObject>
 - (void)capturer:(RTCVideoCapturer *)capturer didCaptureVideoFrame:(RTCVideoFrame *)frame;
 @end
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCVideoCapturer : NSObject
 
 @property(nonatomic, weak) id<RTCVideoCapturerDelegate> delegate;
diff --git a/sdk/objc/base/RTCVideoCodecInfo.h b/sdk/objc/base/RTCVideoCodecInfo.h
index 9a4e4ab5fc..2162caaa21 100644
--- a/sdk/objc/base/RTCVideoCodecInfo.h
+++ b/sdk/objc/base/RTCVideoCodecInfo.h
@@ -15,7 +15,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /** Holds information to identify a codec. Corresponds to webrtc::SdpVideoFormat. */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCVideoCodecInfo : NSObject <NSCoding>
 
 - (instancetype)init NS_UNAVAILABLE;
diff --git a/sdk/objc/base/RTCVideoDecoder.h b/sdk/objc/base/RTCVideoDecoder.h
index 21925f0c67..18c6f6b000 100644
--- a/sdk/objc/base/RTCVideoDecoder.h
+++ b/sdk/objc/base/RTCVideoDecoder.h
@@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
 typedef void (^RTCVideoDecoderCallback)(RTCVideoFrame *frame);
 
 /** Protocol for decoder implementations. */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCVideoDecoder <NSObject>
 
 - (void)setCallback:(RTCVideoDecoderCallback)callback;
diff --git a/sdk/objc/base/RTCVideoDecoderFactory.h b/sdk/objc/base/RTCVideoDecoderFactory.h
index a78228c06f..3e24153b82 100644
--- a/sdk/objc/base/RTCVideoDecoderFactory.h
+++ b/sdk/objc/base/RTCVideoDecoderFactory.h
@@ -17,7 +17,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /** RTCVideoDecoderFactory is an Objective-C version of webrtc::VideoDecoderFactory. */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCVideoDecoderFactory <NSObject>
 
 - (nullable id<RTCVideoDecoder>)createDecoder:(RTCVideoCodecInfo *)info;
diff --git a/sdk/objc/base/RTCVideoEncoder.h b/sdk/objc/base/RTCVideoEncoder.h
index b566615bd9..c5257674d8 100644
--- a/sdk/objc/base/RTCVideoEncoder.h
+++ b/sdk/objc/base/RTCVideoEncoder.h
@@ -26,7 +26,7 @@ typedef BOOL (^RTCVideoEncoderCallback)(RTCEncodedImage *frame,
                                         RTCRtpFragmentationHeader *header);
 
 /** Protocol for encoder implementations. */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCVideoEncoder <NSObject>
 
 - (void)setCallback:(RTCVideoEncoderCallback)callback;
diff --git a/sdk/objc/base/RTCVideoEncoderFactory.h b/sdk/objc/base/RTCVideoEncoderFactory.h
index 9a14390d7b..20c603d6fe 100644
--- a/sdk/objc/base/RTCVideoEncoderFactory.h
+++ b/sdk/objc/base/RTCVideoEncoderFactory.h
@@ -17,7 +17,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /** RTCVideoEncoderFactory is an Objective-C version of webrtc::VideoEncoderFactory. */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCVideoEncoderFactory <NSObject>
 
 - (nullable id<RTCVideoEncoder>)createEncoder:(RTCVideoCodecInfo *)info;
diff --git a/sdk/objc/base/RTCVideoEncoderQpThresholds.h b/sdk/objc/base/RTCVideoEncoderQpThresholds.h
index de9b62e78a..2b48f45ce0 100644
--- a/sdk/objc/base/RTCVideoEncoderQpThresholds.h
+++ b/sdk/objc/base/RTCVideoEncoderQpThresholds.h
@@ -15,7 +15,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /** QP thresholds for encoder. Corresponds to webrtc::VideoEncoder::QpThresholds. */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCVideoEncoderQpThresholds : NSObject
 
 - (instancetype)initWithThresholdsLow:(NSInteger)low high:(NSInteger)high;
diff --git a/sdk/objc/base/RTCVideoEncoderSettings.h b/sdk/objc/base/RTCVideoEncoderSettings.h
index d0a4425fa1..69e04cac70 100644
--- a/sdk/objc/base/RTCVideoEncoderSettings.h
+++ b/sdk/objc/base/RTCVideoEncoderSettings.h
@@ -20,7 +20,7 @@ typedef NS_ENUM(NSUInteger, RTCVideoCodecMode) {
 };
 
 /** Settings for encoder. Corresponds to webrtc::VideoCodec. */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCVideoEncoderSettings : NSObject
 
 @property(nonatomic, strong) NSString *name;
diff --git a/sdk/objc/base/RTCVideoFrame.h b/sdk/objc/base/RTCVideoFrame.h
index bc665d4038..9aca7433f3 100644
--- a/sdk/objc/base/RTCVideoFrame.h
+++ b/sdk/objc/base/RTCVideoFrame.h
@@ -25,7 +25,7 @@ typedef NS_ENUM(NSInteger, RTCVideoRotation) {
 @protocol RTCVideoFrameBuffer;
 
 // RTCVideoFrame is an ObjectiveC version of webrtc::VideoFrame.
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCVideoFrame : NSObject
 
 /** Width without rotation applied. */
diff --git a/sdk/objc/base/RTCVideoFrameBuffer.h b/sdk/objc/base/RTCVideoFrameBuffer.h
index 7f340e1a76..bb9e6fba63 100644
--- a/sdk/objc/base/RTCVideoFrameBuffer.h
+++ b/sdk/objc/base/RTCVideoFrameBuffer.h
@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol RTCI420Buffer;
 
 // RTCVideoFrameBuffer is an ObjectiveC version of webrtc::VideoFrameBuffer.
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCVideoFrameBuffer <NSObject>
 
 @property(nonatomic, readonly) int width;
diff --git a/sdk/objc/base/RTCVideoRenderer.h b/sdk/objc/base/RTCVideoRenderer.h
index 63a69ff2dd..7b359a35c2 100644
--- a/sdk/objc/base/RTCVideoRenderer.h
+++ b/sdk/objc/base/RTCVideoRenderer.h
@@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class RTCVideoFrame;
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCVideoRenderer <NSObject>
 
 /** The size of the frame. */
@@ -30,7 +30,7 @@ RTC_EXPORT
 
 @end
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCVideoViewDelegate
 
 - (void)videoView:(id<RTCVideoRenderer>)videoView didChangeVideoSize:(CGSize)size;
diff --git a/sdk/objc/base/RTCYUVPlanarBuffer.h b/sdk/objc/base/RTCYUVPlanarBuffer.h
index b9dd282257..8ceb66c99d 100644
--- a/sdk/objc/base/RTCYUVPlanarBuffer.h
+++ b/sdk/objc/base/RTCYUVPlanarBuffer.h
@@ -16,7 +16,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /** Protocol for RTCVideoFrameBuffers containing YUV planar data. */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCYUVPlanarBuffer <RTCVideoFrameBuffer>
 
 @property(nonatomic, readonly) int chromaWidth;
diff --git a/sdk/objc/components/audio/RTCAudioSession.h b/sdk/objc/components/audio/RTCAudioSession.h
index a8325b65fd..d43418b44a 100644
--- a/sdk/objc/components/audio/RTCAudioSession.h
+++ b/sdk/objc/components/audio/RTCAudioSession.h
@@ -27,7 +27,7 @@ extern NSInteger const kRTCAudioSessionErrorConfiguration;
 // Surfaces AVAudioSession events. WebRTC will listen directly for notifications
 // from AVAudioSession and handle them before calling these delegate methods,
 // at which point applications can perform additional processing if required.
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCAudioSessionDelegate <NSObject>
 
 @optional
@@ -102,7 +102,7 @@ RTC_EXPORT
  *  activation state has changed outside of RTCAudioSession. The current known use
  *  case of this is when CallKit activates the audio session for the application
  */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCAudioSessionActivationDelegate <NSObject>
 
 /** Called when the audio session is activated outside of the app by iOS. */
@@ -120,7 +120,7 @@ RTC_EXPORT
  *  RTCAudioSession also coordinates activation so that the audio session is
  *  activated only once. See |setActive:error:|.
  */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCAudioSession : NSObject <RTCAudioSessionActivationDelegate>
 
 /** Convenience property to access the AVAudioSession singleton. Callers should
diff --git a/sdk/objc/components/audio/RTCAudioSessionConfiguration.h b/sdk/objc/components/audio/RTCAudioSessionConfiguration.h
index 3eb5e3ad79..9f3765da22 100644
--- a/sdk/objc/components/audio/RTCAudioSessionConfiguration.h
+++ b/sdk/objc/components/audio/RTCAudioSessionConfiguration.h
@@ -22,7 +22,7 @@ RTC_EXTERN const double kRTCAudioSessionHighPerformanceIOBufferDuration;
 RTC_EXTERN const double kRTCAudioSessionLowComplexityIOBufferDuration;
 
 // Struct to hold configuration values.
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCAudioSessionConfiguration : NSObject
 
 @property(nonatomic, strong) NSString *category;
diff --git a/sdk/objc/components/capturer/RTCCameraVideoCapturer.h b/sdk/objc/components/capturer/RTCCameraVideoCapturer.h
index 4333baf3b9..2b5e56f4ec 100644
--- a/sdk/objc/components/capturer/RTCCameraVideoCapturer.h
+++ b/sdk/objc/components/capturer/RTCCameraVideoCapturer.h
@@ -16,7 +16,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 // Camera capture that implements RTCVideoCapturer. Delivers frames to a RTCVideoCapturerDelegate
 // (usually RTCVideoSource).
 NS_EXTENSION_UNAVAILABLE_IOS("Camera not available in app extensions.")
diff --git a/sdk/objc/components/capturer/RTCFileVideoCapturer.h b/sdk/objc/components/capturer/RTCFileVideoCapturer.h
index 60a9afa485..0782588d9c 100644
--- a/sdk/objc/components/capturer/RTCFileVideoCapturer.h
+++ b/sdk/objc/components/capturer/RTCFileVideoCapturer.h
@@ -24,7 +24,7 @@ typedef void (^RTCFileVideoCapturerErrorBlock)(NSError *error);
  *
  * See @c RTCVideoCapturer for more info on capturers.
  */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 
 NS_CLASS_AVAILABLE_IOS(10)
 @interface RTCFileVideoCapturer : RTCVideoCapturer
diff --git a/sdk/objc/components/renderer/metal/RTCMTLNSVideoView.h b/sdk/objc/components/renderer/metal/RTCMTLNSVideoView.h
index 891b377878..ffed4b8b39 100644
--- a/sdk/objc/components/renderer/metal/RTCMTLNSVideoView.h
+++ b/sdk/objc/components/renderer/metal/RTCMTLNSVideoView.h
@@ -14,7 +14,7 @@
 
 NS_AVAILABLE_MAC(10.11)
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCMTLNSVideoView : NSView <RTCVideoRenderer>
 
 @property(nonatomic, weak) id<RTCVideoViewDelegate> delegate;
diff --git a/sdk/objc/components/renderer/metal/RTCMTLVideoView.h b/sdk/objc/components/renderer/metal/RTCMTLVideoView.h
index ff64ba3243..36cb144a13 100644
--- a/sdk/objc/components/renderer/metal/RTCMTLVideoView.h
+++ b/sdk/objc/components/renderer/metal/RTCMTLVideoView.h
@@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 NS_CLASS_AVAILABLE_IOS(9)
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCMTLVideoView : UIView<RTCVideoRenderer>
 
 @property(nonatomic, weak) id<RTCVideoViewDelegate> delegate;
diff --git a/sdk/objc/components/renderer/opengl/RTCEAGLVideoView.h b/sdk/objc/components/renderer/opengl/RTCEAGLVideoView.h
index 50bbf2eb06..c35fc2dfda 100644
--- a/sdk/objc/components/renderer/opengl/RTCEAGLVideoView.h
+++ b/sdk/objc/components/renderer/opengl/RTCEAGLVideoView.h
@@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class RTCEAGLVideoView;
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCEAGLVideoViewDelegate <RTCVideoViewDelegate>
 @end
 
@@ -27,7 +27,7 @@ RTC_EXPORT
  * RTCEAGLVideoView is an RTCVideoRenderer which renders video frames in its
  * bounds using OpenGLES 2.0 or OpenGLES 3.0.
  */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 NS_EXTENSION_UNAVAILABLE_IOS("Rendering not available in app extensions.")
 @interface RTCEAGLVideoView : UIView <RTCVideoRenderer>
 
diff --git a/sdk/objc/components/renderer/opengl/RTCNSGLVideoView.h b/sdk/objc/components/renderer/opengl/RTCNSGLVideoView.h
index ad47705d85..2540f38154 100644
--- a/sdk/objc/components/renderer/opengl/RTCNSGLVideoView.h
+++ b/sdk/objc/components/renderer/opengl/RTCNSGLVideoView.h
@@ -21,11 +21,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class RTCNSGLVideoView;
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCNSGLVideoViewDelegate <RTCVideoViewDelegate>
 @end
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCNSGLVideoView : NSOpenGLView <RTCVideoRenderer>
 
 @property(nonatomic, weak) id<RTCVideoViewDelegate> delegate;
diff --git a/sdk/objc/components/renderer/opengl/RTCVideoViewShading.h b/sdk/objc/components/renderer/opengl/RTCVideoViewShading.h
index a570129a82..6876cc3ab5 100644
--- a/sdk/objc/components/renderer/opengl/RTCVideoViewShading.h
+++ b/sdk/objc/components/renderer/opengl/RTCVideoViewShading.h
@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
  * RTCVideoViewShading provides a way for apps to customize the OpenGL(ES) shaders used in
  * rendering for the RTCEAGLVideoView/RTCNSGLVideoView.
  */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @protocol RTCVideoViewShading <NSObject>
 
 /** Callback for I420 frames. Each plane is given as a texture. */
diff --git a/sdk/objc/components/video_codec/RTCCodecSpecificInfoH264.h b/sdk/objc/components/video_codec/RTCCodecSpecificInfoH264.h
index e9af571487..ece9570a13 100644
--- a/sdk/objc/components/video_codec/RTCCodecSpecificInfoH264.h
+++ b/sdk/objc/components/video_codec/RTCCodecSpecificInfoH264.h
@@ -19,7 +19,7 @@ typedef NS_ENUM(NSUInteger, RTCH264PacketizationMode) {
   RTCH264PacketizationModeSingleNalUnit        // Mode 0 - only single NALU allowed
 };
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCCodecSpecificInfoH264 : NSObject <RTCCodecSpecificInfo>
 
 @property(nonatomic, assign) RTCH264PacketizationMode packetizationMode;
diff --git a/sdk/objc/components/video_codec/RTCDefaultVideoDecoderFactory.h b/sdk/objc/components/video_codec/RTCDefaultVideoDecoderFactory.h
index 1ad9c43e64..7ca9463a59 100644
--- a/sdk/objc/components/video_codec/RTCDefaultVideoDecoderFactory.h
+++ b/sdk/objc/components/video_codec/RTCDefaultVideoDecoderFactory.h
@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 /** This decoder factory include support for all codecs bundled with WebRTC. If using custom
  *  codecs, create custom implementations of RTCVideoEncoderFactory and RTCVideoDecoderFactory.
  */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCDefaultVideoDecoderFactory : NSObject <RTCVideoDecoderFactory>
 @end
 
diff --git a/sdk/objc/components/video_codec/RTCDefaultVideoEncoderFactory.h b/sdk/objc/components/video_codec/RTCDefaultVideoEncoderFactory.h
index b0e0af6bc4..c45e54362b 100644
--- a/sdk/objc/components/video_codec/RTCDefaultVideoEncoderFactory.h
+++ b/sdk/objc/components/video_codec/RTCDefaultVideoEncoderFactory.h
@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 /** This encoder factory include support for all codecs bundled with WebRTC. If using custom
  *  codecs, create custom implementations of RTCVideoEncoderFactory and RTCVideoDecoderFactory.
  */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCDefaultVideoEncoderFactory : NSObject <RTCVideoEncoderFactory>
 
 @property(nonatomic, retain) RTCVideoCodecInfo *preferredCodec;
diff --git a/sdk/objc/components/video_codec/RTCH264ProfileLevelId.h b/sdk/objc/components/video_codec/RTCH264ProfileLevelId.h
index 7b4e788e2b..56b353215a 100644
--- a/sdk/objc/components/video_codec/RTCH264ProfileLevelId.h
+++ b/sdk/objc/components/video_codec/RTCH264ProfileLevelId.h
@@ -12,11 +12,11 @@
 
 #import "RTCMacros.h"
 
-RTC_EXPORT extern NSString *const kRTCVideoCodecH264Name;
-RTC_EXPORT extern NSString *const kRTCLevel31ConstrainedHigh;
-RTC_EXPORT extern NSString *const kRTCLevel31ConstrainedBaseline;
-RTC_EXPORT extern NSString *const kRTCMaxSupportedH264ProfileLevelConstrainedHigh;
-RTC_EXPORT extern NSString *const kRTCMaxSupportedH264ProfileLevelConstrainedBaseline;
+RTC_OBJC_EXPORT extern NSString *const kRTCVideoCodecH264Name;
+RTC_OBJC_EXPORT extern NSString *const kRTCLevel31ConstrainedHigh;
+RTC_OBJC_EXPORT extern NSString *const kRTCLevel31ConstrainedBaseline;
+RTC_OBJC_EXPORT extern NSString *const kRTCMaxSupportedH264ProfileLevelConstrainedHigh;
+RTC_OBJC_EXPORT extern NSString *const kRTCMaxSupportedH264ProfileLevelConstrainedBaseline;
 
 /** H264 Profiles and levels. */
 typedef NS_ENUM(NSUInteger, RTCH264Profile) {
@@ -47,7 +47,7 @@ typedef NS_ENUM(NSUInteger, RTCH264Level) {
   RTCH264Level5_2 = 52
 };
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCH264ProfileLevelId : NSObject
 
 @property(nonatomic, readonly) RTCH264Profile profile;
diff --git a/sdk/objc/components/video_codec/RTCVideoDecoderFactoryH264.h b/sdk/objc/components/video_codec/RTCVideoDecoderFactoryH264.h
index 850ba7e317..4fcff1dff7 100644
--- a/sdk/objc/components/video_codec/RTCVideoDecoderFactoryH264.h
+++ b/sdk/objc/components/video_codec/RTCVideoDecoderFactoryH264.h
@@ -13,6 +13,6 @@
 #import "RTCMacros.h"
 #import "RTCVideoDecoderFactory.h"
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCVideoDecoderFactoryH264 : NSObject <RTCVideoDecoderFactory>
 @end
diff --git a/sdk/objc/components/video_codec/RTCVideoDecoderH264.h b/sdk/objc/components/video_codec/RTCVideoDecoderH264.h
index 227200fee0..b860276206 100644
--- a/sdk/objc/components/video_codec/RTCVideoDecoderH264.h
+++ b/sdk/objc/components/video_codec/RTCVideoDecoderH264.h
@@ -13,6 +13,6 @@
 #import "RTCMacros.h"
 #import "RTCVideoDecoder.h"
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCVideoDecoderH264 : NSObject <RTCVideoDecoder>
 @end
diff --git a/sdk/objc/components/video_codec/RTCVideoEncoderFactoryH264.h b/sdk/objc/components/video_codec/RTCVideoEncoderFactoryH264.h
index d185656b42..c64405e4da 100644
--- a/sdk/objc/components/video_codec/RTCVideoEncoderFactoryH264.h
+++ b/sdk/objc/components/video_codec/RTCVideoEncoderFactoryH264.h
@@ -13,6 +13,6 @@
 #import "RTCMacros.h"
 #import "RTCVideoEncoderFactory.h"
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCVideoEncoderFactoryH264 : NSObject <RTCVideoEncoderFactory>
 @end
diff --git a/sdk/objc/components/video_codec/RTCVideoEncoderH264.h b/sdk/objc/components/video_codec/RTCVideoEncoderH264.h
index d57713eb86..a9c05580a4 100644
--- a/sdk/objc/components/video_codec/RTCVideoEncoderH264.h
+++ b/sdk/objc/components/video_codec/RTCVideoEncoderH264.h
@@ -14,7 +14,7 @@
 #import "RTCVideoCodecInfo.h"
 #import "RTCVideoEncoder.h"
 
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCVideoEncoderH264 : NSObject <RTCVideoEncoder>
 
 - (instancetype)initWithCodecInfo:(RTCVideoCodecInfo *)codecInfo;
diff --git a/sdk/objc/components/video_frame_buffer/RTCCVPixelBuffer.h b/sdk/objc/components/video_frame_buffer/RTCCVPixelBuffer.h
index a12bd7a86d..432a382574 100644
--- a/sdk/objc/components/video_frame_buffer/RTCCVPixelBuffer.h
+++ b/sdk/objc/components/video_frame_buffer/RTCCVPixelBuffer.h
@@ -16,7 +16,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /** RTCVideoFrameBuffer containing a CVPixelBufferRef */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCCVPixelBuffer : NSObject <RTCVideoFrameBuffer>
 
 @property(nonatomic, readonly) CVPixelBufferRef pixelBuffer;
diff --git a/sdk/objc/helpers/RTCCameraPreviewView.h b/sdk/objc/helpers/RTCCameraPreviewView.h
index 3942811357..17f8d33d77 100644
--- a/sdk/objc/helpers/RTCCameraPreviewView.h
+++ b/sdk/objc/helpers/RTCCameraPreviewView.h
@@ -18,7 +18,7 @@
 /** RTCCameraPreviewView is a view that renders local video from an
  *  AVCaptureSession.
  */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCCameraPreviewView : UIView
 
 /** The capture session being rendered in the view. Capture session
diff --git a/sdk/objc/helpers/RTCDispatcher.h b/sdk/objc/helpers/RTCDispatcher.h
index e3e606f956..4f8359b32c 100644
--- a/sdk/objc/helpers/RTCDispatcher.h
+++ b/sdk/objc/helpers/RTCDispatcher.h
@@ -25,7 +25,7 @@ typedef NS_ENUM(NSInteger, RTCDispatcherQueueType) {
 /** Dispatcher that asynchronously dispatches blocks to a specific
  *  shared dispatch queue.
  */
-RTC_EXPORT
+RTC_OBJC_EXPORT
 @interface RTCDispatcher : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;