diff --git a/iOS/SonarKit.podspec b/iOS/SonarKit.podspec
index 138184662..3d1b2a41e 100644
--- a/iOS/SonarKit.podspec
+++ b/iOS/SonarKit.podspec
@@ -27,6 +27,14 @@ Pod::Spec.new do |spec|
     ss.public_header_files = 'iOS/FBDefines/**/*.h'
   end
 
+  spec.subspec 'CppBridge' do |ss|
+    ss.header_dir = 'CppBridge'
+    ss.compiler_flags = folly_compiler_flags
+    ss.source_files = 'iOS/SonarKit/CppBridge/**/*.{h,mm}'
+    ss.public_header_files = 'iOS/SonarKit/CppBridge/**/*.h'
+    ss.preserve_path = 'SonarKit/CppBridge/**/*.h'
+  end
+
   spec.subspec 'FBCxxUtils' do |ss|
     ss.header_dir = 'FBCxxUtils'
     ss.compiler_flags = folly_compiler_flags
@@ -39,6 +47,7 @@ Pod::Spec.new do |spec|
   spec.subspec "Core" do |ss|
     ss.dependency 'SonarKit/FBDefines'
     ss.dependency 'SonarKit/FBCxxUtils'
+    ss.dependency 'SonarKit/CppBridge'
     ss.dependency 'Folly', '~>1.0'
     ss.dependency 'Sonar', '~>'+sonarkit_version
     ss.dependency 'CocoaAsyncSocket', '~> 7.6'
diff --git a/iOS/SonarKit/CppBridge/SonarCppWrapperPlugin.h b/iOS/SonarKit/CppBridge/SonarCppWrapperPlugin.h
index bf5db01fc..41984c68e 100644
--- a/iOS/SonarKit/CppBridge/SonarCppWrapperPlugin.h
+++ b/iOS/SonarKit/CppBridge/SonarCppWrapperPlugin.h
@@ -10,7 +10,7 @@
 #endif
 
 #import <Sonar/SonarPlugin.h>
-#import <SonarKit/SonarCppBridgingConnection.h>
+#import <SonarKit/CppBridge/SonarCppBridgingConnection.h>
 #import <SonarKit/SonarPlugin.h>
 
 namespace facebook {
diff --git a/iOS/SonarKitTests/SonarCppBridgingTests.mm b/iOS/SonarKitTests/SonarCppBridgingTests.mm
index 1d28998d4..60f621975 100644
--- a/iOS/SonarKitTests/SonarCppBridgingTests.mm
+++ b/iOS/SonarKitTests/SonarCppBridgingTests.mm
@@ -9,7 +9,7 @@
 
 #if FB_SONARKIT_ENABLED
 
-#import <SonarKit/SonarCppWrapperPlugin.h>
+#import <SonarKit/CppBridge/SonarCppWrapperPlugin.h>
 #import <SonarKit/SonarPlugin.h>
 
 using facebook::sonar::SonarCppWrapperPlugin;