diff --git a/FirebaseABTesting.podspec b/FirebaseABTesting.podspec
index 36a4d567692..82d101a20fa 100644
--- a/FirebaseABTesting.podspec
+++ b/FirebaseABTesting.podspec
@@ -31,7 +31,8 @@ Firebase Cloud Messaging and Firebase Remote Config in your app.
   base_dir = "FirebaseABTesting/Sources/"
   s.source_files = base_dir + '**/*.[mh]'
   s.requires_arc = base_dir + '*.m'
-  s.public_header_files = base_dir + 'Public/*.h'
+  s.public_header_files = base_dir + 'Public/*.h', base_dir + 'Protos/developers/mobile/abt/proto/*.h'
+  s.private_header_files = base_dir + 'Protos/developers/mobile/abt/proto/*.h'
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',
     'GCC_PREPROCESSOR_DEFINITIONS' =>
diff --git a/FirebaseRemoteConfig/Sources/RCNConfigExperiment.m b/FirebaseRemoteConfig/Sources/RCNConfigExperiment.m
index 963dd6b9d9c..6eb7f8fa0f1 100644
--- a/FirebaseRemoteConfig/Sources/RCNConfigExperiment.m
+++ b/FirebaseRemoteConfig/Sources/RCNConfigExperiment.m
@@ -18,10 +18,10 @@
 
 #import "Protos/wireless/android/config/proto/Config.pbobjc.h"
 
+#import <FirebaseABTesting/ExperimentPayload.pbobjc.h>
 #import <FirebaseABTesting/FIRExperimentController.h>
 #import <FirebaseABTesting/FIRLifecycleEvents.h>
 #import <FirebaseCore/FIRLogger.h>
-#import "FirebaseABTesting/Sources/Protos/developers/mobile/abt/proto/ExperimentPayload.pbobjc.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigDBManager.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigDefines.h"