diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 4315e0c216..c2678962d7 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -233,13 +233,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
       "objc/AppRTCMobile/common/ARDUtilities.m",
     ]
     public_configs = [ ":apprtc_common_config" ]
-
-    if (is_ios) {
-      # iOS must use WebRTC.framework which is dynamically linked.
-      deps = [ "../sdk:framework_objc+link" ]
-    } else {
-      deps = [ "../sdk:mac_framework_objc+link" ]
-    }
+    deps = [ "../sdk:base_objc" ]
   }
 
   config("apprtc_signaling_config") {
@@ -298,17 +292,16 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
     deps = [
       ":apprtc_common",
       ":socketrocket",
+      "../sdk:base_objc",
+      "../sdk:default_codec_factory_objc",
+      "../sdk:file_logger_objc",
+      "../sdk:helpers_objc",
+      "../sdk:mediaconstraints_objc",
+      "../sdk:peerconnectionfactory_base_objc",
+      "../sdk:videocapture_objc",
+      "../sdk:videoframebuffer_objc",
+      "../sdk:videosource_objc",
     ]
-
-    if (is_ios) {
-      # iOS must use WebRTC.framework which is dynamically linked.
-      deps += [
-        "../sdk:framework_objc+link",
-        "../sdk:ios_framework_bundle",
-      ]
-    } else {
-      deps += [ "../sdk:mac_framework_objc+link" ]
-    }
     frameworks = [
       "CoreMedia.framework",
       "QuartzCore.framework",
@@ -347,9 +340,19 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
       deps = [
         ":apprtc_common",
         ":apprtc_signaling",
-        "../sdk:framework_objc+link",
-        "../sdk:ios_framework_bundle",
+        "../sdk:audio_session_objc",
+        "../sdk:base_objc",
+        "../sdk:helpers_objc",
+        "../sdk:mediaconstraints_objc",
+        "../sdk:peerconnectionfactory_base_objc",
+        "../sdk:peerconnectionfactory_base_objc",
+        "../sdk:ui_objc",
+        "../sdk:videocapture_objc",
+        "../sdk:videocodec_objc",
       ]
+      if (rtc_use_metal_rendering) {
+        deps += [ "../sdk:metal_objc" ]
+      }
 
       frameworks = [ "AVFoundation.framework" ]
     }
@@ -539,7 +542,15 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
       deps = [
         ":apprtc_common",
         ":apprtc_signaling",
-        "../sdk:mac_framework_objc+link",
+        "../sdk:base_objc",
+        "../sdk:helpers_objc",
+        "../sdk:mediaconstraints_objc",
+        "../sdk:metal_objc",
+        "../sdk:peerconnectionfactory_base_objc",
+        "../sdk:peerconnectionfactory_base_objc",
+        "../sdk:ui_objc",
+        "../sdk:videocapture_objc",
+        "../sdk:videocodec_objc",
       ]
     }
 
@@ -624,8 +635,9 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
           ":AppRTCMobile_lib",
           ":apprtc_signaling",
           "../rtc_base",
-          "../sdk:framework_objc+link",
-          "../sdk:ios_framework_bundle",
+          "../sdk:mediaconstraints_objc",
+          "../sdk:peerconnectionfactory_base_objc",
+          "../sdk:videocapture_objc",
           "//build/config/ios:xctest",
           "//third_party/ocmock",
         ]
diff --git a/examples/objc/AppRTCMobile/ARDAppClient+Internal.h b/examples/objc/AppRTCMobile/ARDAppClient+Internal.h
index ef08c3546e..31e0e4dd7c 100644
--- a/examples/objc/AppRTCMobile/ARDAppClient+Internal.h
+++ b/examples/objc/AppRTCMobile/ARDAppClient+Internal.h
@@ -10,7 +10,7 @@
 
 #import "ARDAppClient.h"
 
-#import <WebRTC/RTCPeerConnection.h>
+#import "sdk/objc/api/peerconnection/RTCPeerConnection.h"
 
 #import "ARDRoomServerClient.h"
 #import "ARDSignalingChannel.h"
diff --git a/examples/objc/AppRTCMobile/ARDAppClient.h b/examples/objc/AppRTCMobile/ARDAppClient.h
index 98b1fe91e5..1fed247060 100644
--- a/examples/objc/AppRTCMobile/ARDAppClient.h
+++ b/examples/objc/AppRTCMobile/ARDAppClient.h
@@ -9,8 +9,9 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebRTC/RTCPeerConnection.h>
-#import <WebRTC/RTCVideoTrack.h>
+
+#import "sdk/objc/api/peerconnection/RTCPeerConnection.h"
+#import "sdk/objc/api/peerconnection/RTCVideoTrack.h"
 
 typedef NS_ENUM(NSInteger, ARDAppClientState) {
   // Disconnected from servers.
diff --git a/examples/objc/AppRTCMobile/ARDAppClient.m b/examples/objc/AppRTCMobile/ARDAppClient.m
index 74bdc653d8..8d12ff2627 100644
--- a/examples/objc/AppRTCMobile/ARDAppClient.m
+++ b/examples/objc/AppRTCMobile/ARDAppClient.m
@@ -10,23 +10,23 @@
 
 #import "ARDAppClient+Internal.h"
 
-#import <WebRTC/RTCAudioTrack.h>
-#import <WebRTC/RTCCameraVideoCapturer.h>
-#import <WebRTC/RTCConfiguration.h>
-#import <WebRTC/RTCDefaultVideoDecoderFactory.h>
-#import <WebRTC/RTCDefaultVideoEncoderFactory.h>
-#import <WebRTC/RTCFileLogger.h>
-#import <WebRTC/RTCFileVideoCapturer.h>
-#import <WebRTC/RTCIceServer.h>
-#import <WebRTC/RTCLogging.h>
-#import <WebRTC/RTCMediaConstraints.h>
-#import <WebRTC/RTCMediaStream.h>
-#import <WebRTC/RTCPeerConnectionFactory.h>
-#import <WebRTC/RTCRtpSender.h>
-#import <WebRTC/RTCRtpTransceiver.h>
-#import <WebRTC/RTCTracing.h>
-#import <WebRTC/RTCVideoSource.h>
-#import <WebRTC/RTCVideoTrack.h>
+#import "sdk/objc/api/peerconnection/RTCAudioTrack.h"
+#import "sdk/objc/api/peerconnection/RTCConfiguration.h"
+#import "sdk/objc/api/peerconnection/RTCFileLogger.h"
+#import "sdk/objc/api/peerconnection/RTCIceServer.h"
+#import "sdk/objc/api/peerconnection/RTCMediaConstraints.h"
+#import "sdk/objc/api/peerconnection/RTCMediaStream.h"
+#import "sdk/objc/api/peerconnection/RTCPeerConnectionFactory.h"
+#import "sdk/objc/api/peerconnection/RTCRtpSender.h"
+#import "sdk/objc/api/peerconnection/RTCRtpTransceiver.h"
+#import "sdk/objc/api/peerconnection/RTCTracing.h"
+#import "sdk/objc/api/peerconnection/RTCVideoSource.h"
+#import "sdk/objc/api/peerconnection/RTCVideoTrack.h"
+#import "sdk/objc/base/RTCLogging.h"
+#import "sdk/objc/components/capturer/RTCCameraVideoCapturer.h"
+#import "sdk/objc/components/capturer/RTCFileVideoCapturer.h"
+#import "sdk/objc/components/video_codec/RTCDefaultVideoDecoderFactory.h"
+#import "sdk/objc/components/video_codec/RTCDefaultVideoEncoderFactory.h"
 
 #import "ARDAppEngineClient.h"
 #import "ARDExternalSampleCapturer.h"
diff --git a/examples/objc/AppRTCMobile/ARDAppEngineClient.m b/examples/objc/AppRTCMobile/ARDAppEngineClient.m
index a392c658ab..5139de60d6 100644
--- a/examples/objc/AppRTCMobile/ARDAppEngineClient.m
+++ b/examples/objc/AppRTCMobile/ARDAppEngineClient.m
@@ -10,7 +10,7 @@
 
 #import "ARDAppEngineClient.h"
 
-#import <WebRTC/RTCLogging.h>
+#import "sdk/objc/base/RTCLogging.h"
 
 #import "ARDJoinResponse.h"
 #import "ARDMessageResponse.h"
diff --git a/examples/objc/AppRTCMobile/ARDCaptureController.h b/examples/objc/AppRTCMobile/ARDCaptureController.h
index 5bc99af1bb..4febccee96 100644
--- a/examples/objc/AppRTCMobile/ARDCaptureController.h
+++ b/examples/objc/AppRTCMobile/ARDCaptureController.h
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#import <WebRTC/RTCCameraVideoCapturer.h>
+#import "sdk/objc/components/capturer/RTCCameraVideoCapturer.h"
 
 @class ARDSettingsModel;
 
diff --git a/examples/objc/AppRTCMobile/ARDCaptureController.m b/examples/objc/AppRTCMobile/ARDCaptureController.m
index 222a5026f2..26cce9fdaa 100644
--- a/examples/objc/AppRTCMobile/ARDCaptureController.m
+++ b/examples/objc/AppRTCMobile/ARDCaptureController.m
@@ -10,7 +10,7 @@
 
 #import "ARDCaptureController.h"
 
-#import <WebRTC/RTCLogging.h>
+#import "sdk/objc/base/RTCLogging.h"
 
 #import "ARDSettingsModel.h"
 
diff --git a/examples/objc/AppRTCMobile/ARDExternalSampleCapturer.h b/examples/objc/AppRTCMobile/ARDExternalSampleCapturer.h
index dbbf18fb30..7c32c4b509 100644
--- a/examples/objc/AppRTCMobile/ARDExternalSampleCapturer.h
+++ b/examples/objc/AppRTCMobile/ARDExternalSampleCapturer.h
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#import <WebRTC/RTCVideoCapturer.h>
+#import "sdk/objc/base/RTCVideoCapturer.h"
 
 @protocol ARDExternalSampleDelegate <NSObject>
 - (void)didCaptureSampleBuffer:(CMSampleBufferRef)sampleBuffer;
diff --git a/examples/objc/AppRTCMobile/ARDExternalSampleCapturer.m b/examples/objc/AppRTCMobile/ARDExternalSampleCapturer.m
index a35fd2535c..8bf6716ddb 100644
--- a/examples/objc/AppRTCMobile/ARDExternalSampleCapturer.m
+++ b/examples/objc/AppRTCMobile/ARDExternalSampleCapturer.m
@@ -10,8 +10,14 @@
 
 #import "ARDExternalSampleCapturer.h"
 
-#import <WebRTC/RTCCVPixelBuffer.h>
-#import <WebRTC/RTCVideoFrameBuffer.h>
+#import "sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.h"
+#import "sdk/objc/api/video_frame_buffer/RTCNativeMutableI420Buffer.h"
+#import "sdk/objc/base/RTCI420Buffer.h"
+#import "sdk/objc/base/RTCMutableI420Buffer.h"
+#import "sdk/objc/base/RTCMutableYUVPlanarBuffer.h"
+#import "sdk/objc/base/RTCVideoFrameBuffer.h"
+#import "sdk/objc/base/RTCYUVPlanarBuffer.h"
+#import "sdk/objc/components/video_frame_buffer/RTCCVPixelBuffer.h"
 
 @implementation ARDExternalSampleCapturer
 
diff --git a/examples/objc/AppRTCMobile/ARDSettingsModel.h b/examples/objc/AppRTCMobile/ARDSettingsModel.h
index b89ac0bb20..47c7defacd 100644
--- a/examples/objc/AppRTCMobile/ARDSettingsModel.h
+++ b/examples/objc/AppRTCMobile/ARDSettingsModel.h
@@ -10,7 +10,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <WebRTC/RTCVideoCodecInfo.h>
+#import "sdk/objc/base/RTCVideoCodecInfo.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/examples/objc/AppRTCMobile/ARDSettingsModel.m b/examples/objc/AppRTCMobile/ARDSettingsModel.m
index 812e81aa4f..8b04c12f47 100644
--- a/examples/objc/AppRTCMobile/ARDSettingsModel.m
+++ b/examples/objc/AppRTCMobile/ARDSettingsModel.m
@@ -11,9 +11,9 @@
 #import "ARDSettingsModel+Private.h"
 #import "ARDSettingsStore.h"
 
-#import <WebRTC/RTCCameraVideoCapturer.h>
-#import <WebRTC/RTCDefaultVideoEncoderFactory.h>
-#import <WebRTC/RTCMediaConstraints.h>
+#import "sdk/objc/api/peerconnection/RTCMediaConstraints.h"
+#import "sdk/objc/components/capturer/RTCCameraVideoCapturer.h"
+#import "sdk/objc/components/video_codec/RTCDefaultVideoEncoderFactory.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/examples/objc/AppRTCMobile/ARDSignalingMessage.h b/examples/objc/AppRTCMobile/ARDSignalingMessage.h
index dd9a6ba1d8..ac19e8fba7 100644
--- a/examples/objc/AppRTCMobile/ARDSignalingMessage.h
+++ b/examples/objc/AppRTCMobile/ARDSignalingMessage.h
@@ -10,8 +10,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import <WebRTC/RTCIceCandidate.h>
-#import <WebRTC/RTCSessionDescription.h>
+#import "sdk/objc/api/peerconnection/RTCIceCandidate.h"
+#import "sdk/objc/api/peerconnection/RTCSessionDescription.h"
 
 typedef enum {
   kARDSignalingMessageTypeCandidate,
diff --git a/examples/objc/AppRTCMobile/ARDSignalingMessage.m b/examples/objc/AppRTCMobile/ARDSignalingMessage.m
index e1e897921d..049c0f5b0a 100644
--- a/examples/objc/AppRTCMobile/ARDSignalingMessage.m
+++ b/examples/objc/AppRTCMobile/ARDSignalingMessage.m
@@ -10,7 +10,7 @@
 
 #import "ARDSignalingMessage.h"
 
-#import <WebRTC/RTCLogging.h>
+#import "sdk/objc/base/RTCLogging.h"
 
 #import "ARDUtilities.h"
 #import "RTCIceCandidate+JSON.h"
diff --git a/examples/objc/AppRTCMobile/ARDStatsBuilder.h b/examples/objc/AppRTCMobile/ARDStatsBuilder.h
index 631648dd52..e8224dd707 100644
--- a/examples/objc/AppRTCMobile/ARDStatsBuilder.h
+++ b/examples/objc/AppRTCMobile/ARDStatsBuilder.h
@@ -10,7 +10,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <WebRTC/RTCMacros.h>
+#import "sdk/objc/base/RTCMacros.h"
 
 @class RTC_OBJC_TYPE(RTCLegacyStatsReport);
 
diff --git a/examples/objc/AppRTCMobile/ARDStatsBuilder.m b/examples/objc/AppRTCMobile/ARDStatsBuilder.m
index 759921e229..a74e351d51 100644
--- a/examples/objc/AppRTCMobile/ARDStatsBuilder.m
+++ b/examples/objc/AppRTCMobile/ARDStatsBuilder.m
@@ -10,8 +10,8 @@
 
 #import "ARDStatsBuilder.h"
 
-#import <WebRTC/RTCLegacyStatsReport.h>
-#import <WebRTC/RTCMacros.h>
+#import "sdk/objc/api/peerconnection/RTCLegacyStatsReport.h"
+#import "sdk/objc/base/RTCMacros.h"
 
 #import "ARDBitrateTracker.h"
 #import "ARDUtilities.h"
diff --git a/examples/objc/AppRTCMobile/ARDTURNClient.h b/examples/objc/AppRTCMobile/ARDTURNClient.h
index c192ffb540..0399736f03 100644
--- a/examples/objc/AppRTCMobile/ARDTURNClient.h
+++ b/examples/objc/AppRTCMobile/ARDTURNClient.h
@@ -10,7 +10,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <WebRTC/RTCMacros.h>
+#import "sdk/objc/base/RTCMacros.h"
 
 @class RTC_OBJC_TYPE(RTCIceServer);
 
diff --git a/examples/objc/AppRTCMobile/ARDWebSocketChannel.m b/examples/objc/AppRTCMobile/ARDWebSocketChannel.m
index c05d87b3d7..bbb0bf87f8 100644
--- a/examples/objc/AppRTCMobile/ARDWebSocketChannel.m
+++ b/examples/objc/AppRTCMobile/ARDWebSocketChannel.m
@@ -10,7 +10,8 @@
 
 #import "ARDWebSocketChannel.h"
 
-#import <WebRTC/RTCLogging.h>
+#import "sdk/objc/base/RTCLogging.h"
+
 #import "SRWebSocket.h"
 
 #import "ARDSignalingMessage.h"
diff --git a/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.h b/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.h
index 80f3ef7a26..5fd823f2de 100644
--- a/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.h
+++ b/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.h
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#import <WebRTC/RTCIceCandidate.h>
+#import "sdk/objc/api/peerconnection/RTCIceCandidate.h"
 
 @interface RTC_OBJC_TYPE (RTCIceCandidate)
 (JSON)
diff --git a/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.m b/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.m
index 579cadbe88..99cefbff0b 100644
--- a/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.m
+++ b/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.m
@@ -10,7 +10,7 @@
 
 #import "RTCIceCandidate+JSON.h"
 
-#import <WebRTC/RTCLogging.h>
+#import "sdk/objc/base/RTCLogging.h"
 
 static NSString const *kRTCICECandidateTypeKey = @"type";
 static NSString const *kRTCICECandidateTypeValue = @"candidate";
diff --git a/examples/objc/AppRTCMobile/RTCIceServer+JSON.h b/examples/objc/AppRTCMobile/RTCIceServer+JSON.h
index 4950a58684..35f6af7583 100644
--- a/examples/objc/AppRTCMobile/RTCIceServer+JSON.h
+++ b/examples/objc/AppRTCMobile/RTCIceServer+JSON.h
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#import <WebRTC/RTCIceServer.h>
+#import "sdk/objc/api/peerconnection/RTCIceServer.h"
 
 @interface RTC_OBJC_TYPE (RTCIceServer)
 (JSON)
diff --git a/examples/objc/AppRTCMobile/RTCSessionDescription+JSON.h b/examples/objc/AppRTCMobile/RTCSessionDescription+JSON.h
index 6130303335..74d03d11b9 100644
--- a/examples/objc/AppRTCMobile/RTCSessionDescription+JSON.h
+++ b/examples/objc/AppRTCMobile/RTCSessionDescription+JSON.h
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#import <WebRTC/RTCSessionDescription.h>
+#import "sdk/objc/api/peerconnection/RTCSessionDescription.h"
 
 @interface RTC_OBJC_TYPE (RTCSessionDescription)
 (JSON)
diff --git a/examples/objc/AppRTCMobile/common/ARDUtilities.m b/examples/objc/AppRTCMobile/common/ARDUtilities.m
index aabc45390c..119695fccd 100644
--- a/examples/objc/AppRTCMobile/common/ARDUtilities.m
+++ b/examples/objc/AppRTCMobile/common/ARDUtilities.m
@@ -12,7 +12,7 @@
 
 #import <mach/mach.h>
 
-#import <WebRTC/RTCLogging.h>
+#import "sdk/objc/base/RTCLogging.h"
 
 @implementation NSDictionary (ARDUtilites)
 
diff --git a/examples/objc/AppRTCMobile/ios/ARDAppDelegate.m b/examples/objc/AppRTCMobile/ios/ARDAppDelegate.m
index 16af444800..51e9910b87 100644
--- a/examples/objc/AppRTCMobile/ios/ARDAppDelegate.m
+++ b/examples/objc/AppRTCMobile/ios/ARDAppDelegate.m
@@ -10,10 +10,10 @@
 
 #import "ARDAppDelegate.h"
 
-#import <WebRTC/RTCFieldTrials.h>
-#import <WebRTC/RTCLogging.h>
-#import <WebRTC/RTCSSLAdapter.h>
-#import <WebRTC/RTCTracing.h>
+#import "sdk/objc/api/peerconnection/RTCFieldTrials.h"
+#import "sdk/objc/api/peerconnection/RTCSSLAdapter.h"
+#import "sdk/objc/api/peerconnection/RTCTracing.h"
+#import "sdk/objc/base/RTCLogging.h"
 
 #import "ARDMainViewController.h"
 
diff --git a/examples/objc/AppRTCMobile/ios/ARDFileCaptureController.h b/examples/objc/AppRTCMobile/ios/ARDFileCaptureController.h
index a42ef19683..82f8fcdd1b 100644
--- a/examples/objc/AppRTCMobile/ios/ARDFileCaptureController.h
+++ b/examples/objc/AppRTCMobile/ios/ARDFileCaptureController.h
@@ -10,7 +10,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <WebRTC/RTCMacros.h>
+#import "sdk/objc/base/RTCMacros.h"
 
 @class RTC_OBJC_TYPE(RTCFileVideoCapturer);
 
diff --git a/examples/objc/AppRTCMobile/ios/ARDFileCaptureController.m b/examples/objc/AppRTCMobile/ios/ARDFileCaptureController.m
index a6a1127059..2ddde6dd59 100644
--- a/examples/objc/AppRTCMobile/ios/ARDFileCaptureController.m
+++ b/examples/objc/AppRTCMobile/ios/ARDFileCaptureController.m
@@ -10,7 +10,7 @@
 
 #import "ARDFileCaptureController.h"
 
-#import <WebRTC/RTCFileVideoCapturer.h>
+#import "sdk/objc/components/capturer/RTCFileVideoCapturer.h"
 
 @interface ARDFileCaptureController ()
 
diff --git a/examples/objc/AppRTCMobile/ios/ARDMainViewController.m b/examples/objc/AppRTCMobile/ios/ARDMainViewController.m
index a3ede07f3b..e8b8112e41 100644
--- a/examples/objc/AppRTCMobile/ios/ARDMainViewController.m
+++ b/examples/objc/AppRTCMobile/ios/ARDMainViewController.m
@@ -12,10 +12,10 @@
 
 #import <AVFoundation/AVFoundation.h>
 
-#import <WebRTC/RTCAudioSession.h>
-#import <WebRTC/RTCAudioSessionConfiguration.h>
-#import <WebRTC/RTCDispatcher.h>
-#import <WebRTC/RTCLogging.h>
+#import "sdk/objc/base/RTCLogging.h"
+#import "sdk/objc/components/audio/RTCAudioSession.h"
+#import "sdk/objc/components/audio/RTCAudioSessionConfiguration.h"
+#import "sdk/objc/helpers/RTCDispatcher.h"
 
 #import "ARDAppClient.h"
 #import "ARDMainView.h"
diff --git a/examples/objc/AppRTCMobile/ios/ARDStatsView.m b/examples/objc/AppRTCMobile/ios/ARDStatsView.m
index 7e006a82f2..bd97d30fbe 100644
--- a/examples/objc/AppRTCMobile/ios/ARDStatsView.m
+++ b/examples/objc/AppRTCMobile/ios/ARDStatsView.m
@@ -10,7 +10,7 @@
 
 #import "ARDStatsView.h"
 
-#import <WebRTC/RTCLegacyStatsReport.h>
+#import "sdk/objc/api/peerconnection/RTCLegacyStatsReport.h"
 
 #import "ARDStatsBuilder.h"
 
diff --git a/examples/objc/AppRTCMobile/ios/ARDVideoCallView.h b/examples/objc/AppRTCMobile/ios/ARDVideoCallView.h
index a5943cce4c..a31c7fe742 100644
--- a/examples/objc/AppRTCMobile/ios/ARDVideoCallView.h
+++ b/examples/objc/AppRTCMobile/ios/ARDVideoCallView.h
@@ -10,8 +10,8 @@
 
 #import <UIKit/UIKit.h>
 
-#import <WebRTC/RTCCameraPreviewView.h>
-#import <WebRTC/RTCVideoRenderer.h>
+#import "sdk/objc/base/RTCVideoRenderer.h"
+#import "sdk/objc/helpers/RTCCameraPreviewView.h"
 
 #import "ARDStatsView.h"
 
diff --git a/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m b/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m
index 2ae18a616a..4301b7ede9 100644
--- a/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m
+++ b/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m
@@ -12,9 +12,9 @@
 
 #import <AVFoundation/AVFoundation.h>
 
-#import <WebRTC/RTCEAGLVideoView.h>
+#import "sdk/objc/components/renderer/opengl/RTCEAGLVideoView.h"
 #if defined(RTC_SUPPORTS_METAL)
-#import <WebRTC/RTCMTLVideoView.h>
+#import "sdk/objc/components/renderer/metal/RTCMTLVideoView.h"  // nogncheck
 #endif
 
 #import "UIImage+ARDUtilities.h"
diff --git a/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m b/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m
index bb3bc096c7..cd26829713 100644
--- a/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m
+++ b/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m
@@ -10,11 +10,11 @@
 
 #import "ARDVideoCallViewController.h"
 
-#import <WebRTC/RTCAudioSession.h>
-#import <WebRTC/RTCCameraVideoCapturer.h>
-#import <WebRTC/RTCDispatcher.h>
-#import <WebRTC/RTCLogging.h>
-#import <WebRTC/RTCMediaConstraints.h>
+#import "sdk/objc/api/peerconnection/RTCMediaConstraints.h"
+#import "sdk/objc/base/RTCLogging.h"
+#import "sdk/objc/components/audio/RTCAudioSession.h"
+#import "sdk/objc/components/capturer/RTCCameraVideoCapturer.h"
+#import "sdk/objc/helpers/RTCDispatcher.h"
 
 #import "ARDAppClient.h"
 #import "ARDCaptureController.h"
diff --git a/examples/objc/AppRTCMobile/ios/RTCVideoCodecInfo+HumanReadable.h b/examples/objc/AppRTCMobile/ios/RTCVideoCodecInfo+HumanReadable.h
index f6bdae5010..3a93c253b2 100644
--- a/examples/objc/AppRTCMobile/ios/RTCVideoCodecInfo+HumanReadable.h
+++ b/examples/objc/AppRTCMobile/ios/RTCVideoCodecInfo+HumanReadable.h
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#import <WebRTC/RTCVideoCodecInfo.h>
+#import "sdk/objc/base/RTCVideoCodecInfo.h"
 
 @interface RTC_OBJC_TYPE (RTCVideoCodecInfo)
 (HumanReadable)
diff --git a/examples/objc/AppRTCMobile/ios/RTCVideoCodecInfo+HumanReadable.m b/examples/objc/AppRTCMobile/ios/RTCVideoCodecInfo+HumanReadable.m
index 7a3ad4bd25..5e0c52c5c4 100644
--- a/examples/objc/AppRTCMobile/ios/RTCVideoCodecInfo+HumanReadable.m
+++ b/examples/objc/AppRTCMobile/ios/RTCVideoCodecInfo+HumanReadable.m
@@ -10,7 +10,7 @@
 
 #import "RTCVideoCodecInfo+HumanReadable.h"
 
-#import <WebRTC/RTCH264ProfileLevelId.h>
+#import "sdk/objc/components/video_codec/RTCH264ProfileLevelId.h"
 
 @implementation RTC_OBJC_TYPE (RTCVideoCodecInfo)
 (HumanReadable)
diff --git a/examples/objc/AppRTCMobile/ios/broadcast_extension/ARDBroadcastSampleHandler.h b/examples/objc/AppRTCMobile/ios/broadcast_extension/ARDBroadcastSampleHandler.h
index 931edac35c..2c4a56368a 100644
--- a/examples/objc/AppRTCMobile/ios/broadcast_extension/ARDBroadcastSampleHandler.h
+++ b/examples/objc/AppRTCMobile/ios/broadcast_extension/ARDBroadcastSampleHandler.h
@@ -10,7 +10,7 @@
 
 #import <ReplayKit/ReplayKit.h>
 
-#import <WebRTC/RTCLogging.h>
+#import "sdk/objc/base/RTCLogging.h"
 
 #import "ARDAppClient.h"
 
diff --git a/examples/objc/AppRTCMobile/ios/broadcast_extension/ARDBroadcastSampleHandler.m b/examples/objc/AppRTCMobile/ios/broadcast_extension/ARDBroadcastSampleHandler.m
index 1fab5b5eec..d9c816d573 100644
--- a/examples/objc/AppRTCMobile/ios/broadcast_extension/ARDBroadcastSampleHandler.m
+++ b/examples/objc/AppRTCMobile/ios/broadcast_extension/ARDBroadcastSampleHandler.m
@@ -15,8 +15,8 @@
 #import "ARDExternalSampleCapturer.h"
 #import "ARDSettingsModel.h"
 
-#import <WebRTC/RTCCallbackLogger.h>
-#import <WebRTC/RTCLogging.h>
+#import "sdk/objc/api/logging/RTCCallbackLogger.h"
+#import "sdk/objc/base/RTCLogging.h"
 
 @implementation ARDBroadcastSampleHandler {
   ARDAppClient *_client;
diff --git a/examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.m b/examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.m
index ea6fd733e0..7ca63ecad6 100644
--- a/examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.m
+++ b/examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.m
@@ -10,7 +10,7 @@
 
 #import "APPRTCAppDelegate.h"
 #import "APPRTCViewController.h"
-#import <WebRTC/RTCSSLAdapter.h>
+#import "sdk/objc/api/peerconnection/RTCSSLAdapter.h"
 
 @interface APPRTCAppDelegate () <NSWindowDelegate>
 @end
diff --git a/examples/objc/AppRTCMobile/mac/APPRTCViewController.m b/examples/objc/AppRTCMobile/mac/APPRTCViewController.m
index 1d0619d573..8904187215 100644
--- a/examples/objc/AppRTCMobile/mac/APPRTCViewController.m
+++ b/examples/objc/AppRTCMobile/mac/APPRTCViewController.m
@@ -12,9 +12,9 @@
 
 #import <AVFoundation/AVFoundation.h>
 
-#import <WebRTC/RTCMTLNSVideoView.h>
-#import <WebRTC/RTCNSGLVideoView.h>
-#import <WebRTC/RTCVideoTrack.h>
+#import "sdk/objc/api/peerconnection/RTCVideoTrack.h"
+#import "sdk/objc/components/renderer/metal/RTCMTLNSVideoView.h"
+#import "sdk/objc/components/renderer/opengl/RTCNSGLVideoView.h"
 
 #import "ARDAppClient.h"
 #import "ARDCaptureController.h"
diff --git a/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm b/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm
index 3592ed0e15..2694e49914 100644
--- a/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm
+++ b/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm
@@ -15,8 +15,8 @@
 
 #include "rtc_base/ssl_adapter.h"
 
-#import <WebRTC/RTCMediaConstraints.h>
-#import <WebRTC/RTCPeerConnectionFactory.h>
+#import "sdk/objc/api/peerconnection/RTCMediaConstraints.h"
+#import "sdk/objc/api/peerconnection/RTCPeerConnectionFactory.h"
 
 #import "ARDAppClient+Internal.h"
 #import "ARDJoinResponse+Internal.h"
diff --git a/examples/objc/AppRTCMobile/tests/ARDFileCaptureController_xctest.mm b/examples/objc/AppRTCMobile/tests/ARDFileCaptureController_xctest.mm
index e3d6cf46fe..2e39834190 100644
--- a/examples/objc/AppRTCMobile/tests/ARDFileCaptureController_xctest.mm
+++ b/examples/objc/AppRTCMobile/tests/ARDFileCaptureController_xctest.mm
@@ -14,7 +14,7 @@
 
 #import "ARDFileCaptureController.h"
 
-#import <WebRTC/RTCFileVideoCapturer.h>
+#import "sdk/objc/components/capturer/RTCFileVideoCapturer.h"
 
 NS_CLASS_AVAILABLE_IOS(10)
 @interface ARDFileCaptureControllerTests : XCTestCase
diff --git a/examples/objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm b/examples/objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm
index 7c34d0a3ca..dc62798963 100644
--- a/examples/objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm
+++ b/examples/objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm
@@ -12,7 +12,7 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
-#import <WebRTC/RTCMediaConstraints.h>
+#import "sdk/objc/api/peerconnection/RTCMediaConstraints.h"
 
 #import "ARDSettingsModel+Private.h"
 #import "ARDSettingsStore.h"
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 2a80c65049..ddd8431f76 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -579,16 +579,13 @@ if (is_ios || is_mac) {
       sources = [
         "objc/components/capturer/RTCCameraVideoCapturer.h",
         "objc/components/capturer/RTCCameraVideoCapturer.m",
+        "objc/components/capturer/RTCFileVideoCapturer.h",
+        "objc/components/capturer/RTCFileVideoCapturer.m",
       ]
-      if (is_ios) {
-        sources += [
-          "objc/components/capturer/RTCFileVideoCapturer.h",
-          "objc/components/capturer/RTCFileVideoCapturer.m",
-        ]
-      }
       frameworks = [
         "AVFoundation.framework",
         "CoreVideo.framework",
+        "QuartzCore.framework",
       ]
 
       configs += [ "..:common_objc" ]