Use modulemap to fix exposure of FirebaseCore's internal headers (#121)

21 files changed, 39 insertions, 70 deletions

diff --git a/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.h b/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.h
index c0e6d13..27927d3 100644
--- a/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.h
+++ b/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRAppInternal.h"
+#import "FirebaseCommunity/FIRAppInternal.h"
 
 /** @category FIRApp (FIRAuthUnitTests)
     @brief Tests for @c FIRAuth.
diff --git a/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.m b/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.m
index aba4136..7159452 100644
--- a/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.m
+++ b/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.m
@@ -16,7 +16,7 @@
 
 #import "FIRApp+FIRAuthUnitTests.h"
 
-#import "FIROptionsInternal.h"
+#import "FirebaseCommunity/FIROptionsInternal.h"
 
 @implementation FIRApp (FIRAuthUnitTests)
 
diff --git a/Example/Auth/Tests/FIRAuthTests.m b/Example/Auth/Tests/FIRAuthTests.m
index 6e4971a..299c0d9 100644
--- a/Example/Auth/Tests/FIRAuthTests.m
+++ b/Example/Auth/Tests/FIRAuthTests.m
@@ -18,11 +18,10 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FIRAppInternal.h"
-#import "FIREmailAuthProvider.h"
-#import "FIRGoogleAuthProvider.h"
-#import "FIRPhoneAuthCredential.h"
-#import "FIRAdditionalUserInfo.h"
+#import "FirebaseCommunity/FIRAppInternal.h"
+#import "FirebaseCommunity/FIREmailAuthProvider.h"
+#import "FirebaseCommunity/FIRGoogleAuthProvider.h"
+#import "FirebaseCommunity/FIRAdditionalUserInfo.h"
 #import "FIRAuth_Internal.h"
 #import "FIRAuthErrorUtils.h"
 #import "FIRAuthDispatcher.h"
@@ -56,6 +55,7 @@
 #import <OCMock/OCMock.h>
 
 #if TARGET_OS_IOS
+#import "FIRPhoneAuthCredential.h"
 #import "FIRPhoneAuthProvider.h"
 #endif
 
diff --git a/Example/Auth/Tests/FIRPhoneAuthProviderTests.m b/Example/Auth/Tests/FIRPhoneAuthProviderTests.m
index b7b8bf3..71bdd5d 100644
--- a/Example/Auth/Tests/FIRPhoneAuthProviderTests.m
+++ b/Example/Auth/Tests/FIRPhoneAuthProviderTests.m
@@ -16,6 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
+#import "FirebaseCommunity/FIRAuth.h"
 #import "FIRPhoneAuthProvider.h"
 #import "Phone/FIRPhoneAuthCredential_Internal.h"
 #import "Phone/NSString+FIRAuth.h"
diff --git a/Example/Auth/Tests/FIRUserTests.m b/Example/Auth/Tests/FIRUserTests.m
index 5905d97..64051a3 100644
--- a/Example/Auth/Tests/FIRUserTests.m
+++ b/Example/Auth/Tests/FIRUserTests.m
@@ -18,12 +18,12 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FIREmailAuthProvider.h"
-#import "FIRFacebookAuthProvider.h"
-#import "FIRGoogleAuthProvider.h"
-#import "Phone/FIRPhoneAuthCredential_Internal.h"
-#import "FIRAdditionalUserInfo.h"
-#import "FIRAuth.h"
+#import "FirebaseCommunity/FIRUser.h"
+#import "FirebaseCommunity/FIREmailAuthProvider.h"
+#import "FirebaseCommunity/FIRFacebookAuthProvider.h"
+#import "FirebaseCommunity/FIRGoogleAuthProvider.h"
+#import "FirebaseCommunity/FIRAdditionalUserInfo.h"
+#import "FirebaseCommunity/FIRAuth.h"
 #import "FIRAuthErrorUtils.h"
 #import "FIRAuthGlobalWorkQueue.h"
 #import "FIRUser_Internal.h"
@@ -44,6 +44,7 @@
 #import <OCMock/OCMock.h>
 
 #if TARGET_OS_IOS
+#import "Phone/FIRPhoneAuthCredential_Internal.h"
 #import "FIRPhoneAuthProvider.h"
 #endif
 
diff --git a/Example/Core/Tests/FIRAppAssociationRegistrationUnitTests.m b/Example/Core/Tests/FIRAppAssociationRegistrationUnitTests.m
index 9649c99..dd6a91a 100644
--- a/Example/Core/Tests/FIRAppAssociationRegistrationUnitTests.m
+++ b/Example/Core/Tests/FIRAppAssociationRegistrationUnitTests.m
@@ -14,7 +14,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FIRAppAssociationRegistration.h"
+#import "FirebaseCommunity/FIRAppAssociationRegistration.h"
 
 /** @var kKey
     @brief A unique string key.
diff --git a/Example/Core/Tests/FIRAppTest.m b/Example/Core/Tests/FIRAppTest.m
index da97c6c..05bec06 100644
--- a/Example/Core/Tests/FIRAppTest.m
+++ b/Example/Core/Tests/FIRAppTest.m
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRAppInternal.h"
-#import "FIROptionsInternal.h"
+#import "FirebaseCommunity/FIRAppInternal.h"
+#import "FirebaseCommunity/FIROptionsInternal.h"
 #import "FIRTestCase.h"
 
 NSString *const kFIRTestAppName1 = @"test_app_name_1";
diff --git a/Example/Core/Tests/FIRBundleUtilTest.m b/Example/Core/Tests/FIRBundleUtilTest.m
index 6a3e20a..22863a4 100644
--- a/Example/Core/Tests/FIRBundleUtilTest.m
+++ b/Example/Core/Tests/FIRBundleUtilTest.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRBundleUtil.h"
+#import "FirebaseCommunity/FIRBundleUtil.h"
 
 #import "FIRTestCase.h"
 
diff --git a/Example/Core/Tests/FIRLoggerTest.m b/Example/Core/Tests/FIRLoggerTest.m
index d13e207..c4d252a 100644
--- a/Example/Core/Tests/FIRLoggerTest.m
+++ b/Example/Core/Tests/FIRLoggerTest.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRLogger.h"
+#import "FirebaseCommunity/FIRLogger.h"
 #import "FIRTestCase.h"
 
 #import <asl.h>
diff --git a/Example/Core/Tests/FIROptionsTest.m b/Example/Core/Tests/FIROptionsTest.m
index 62b6294..ec3bc27 100644
--- a/Example/Core/Tests/FIROptionsTest.m
+++ b/Example/Core/Tests/FIROptionsTest.m
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRAppInternal.h"
-#import "FIRBundleUtil.h"
-#import "FIROptionsInternal.h"
+#import "FirebaseCommunity/FIRAppInternal.h"
+#import "FirebaseCommunity/FIRBundleUtil.h"
+#import "FirebaseCommunity/FIROptionsInternal.h"
 
 #import "FIRTestCase.h"
 
diff --git a/Example/Database/Tests/Helpers/FDevice.m b/Example/Database/Tests/Helpers/FDevice.m
index f9667df..4e87dd5 100644
--- a/Example/Database/Tests/Helpers/FDevice.m
+++ b/Example/Database/Tests/Helpers/FDevice.m
@@ -16,7 +16,7 @@
 
 #import <XCTest/XCTest.h>
 #import "FDevice.h"
-#import "FIRDatabaseReference.h"
+#import "FirebaseCommunity/FIRDatabaseReference.h"
 #import "FRepoManager.h"
 #import "FIRDatabaseReference_Private.h"
 #import "FIRDatabaseConfig_Private.h"
diff --git a/Example/Database/Tests/Helpers/FEventTester.m b/Example/Database/Tests/Helpers/FEventTester.m
index 8c7bd19..f75e11b 100644
--- a/Example/Database/Tests/Helpers/FEventTester.m
+++ b/Example/Database/Tests/Helpers/FEventTester.m
@@ -15,7 +15,7 @@
  */
 
 #import "FEventTester.h"
-#import "FIRDatabaseReference.h"
+#import "FirebaseCommunity/FIRDatabaseReference.h"
 #import "FTupleBoolBlock.h"
 #import "FTupleEventTypeString.h"
 #import "FTestHelpers.h"
diff --git a/Example/Database/Tests/Helpers/FTestBase.m b/Example/Database/Tests/Helpers/FTestBase.m
index 1cfe7ad..d94adea 100644
--- a/Example/Database/Tests/Helpers/FTestBase.m
+++ b/Example/Database/Tests/Helpers/FTestBase.m
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import "FIRApp.h"
-#import "FIROptions.h"
+#import "FirebaseCommunity/FIRApp.h"
+#import "FirebaseCommunity/FIROptions.h"
 #import "FTestBase.h"
 #import "FTestAuthTokenGenerator.h"
 #import "FIRDatabaseQuery_Private.h"
diff --git a/Example/Database/Tests/Integration/FConnectionTest.m b/Example/Database/Tests/Integration/FConnectionTest.m
index c658e8e..2924c63 100644
--- a/Example/Database/Tests/Integration/FConnectionTest.m
+++ b/Example/Database/Tests/Integration/FConnectionTest.m
@@ -16,8 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRApp.h"
-#import "FIROptions.h"
+#import "FirebaseCommunity/FIRApp.h"
+#import "FirebaseCommunity/FIROptions.h"
 #import "FTestHelpers.h"
 #import "FConnection.h"
 #import "FTestBase.h"
diff --git a/Example/Database/Tests/Integration/FIRAuthTests.m b/Example/Database/Tests/Integration/FIRAuthTests.m
index 2c44580..884b6c1 100644
--- a/Example/Database/Tests/Integration/FIRAuthTests.m
+++ b/Example/Database/Tests/Integration/FIRAuthTests.m
@@ -15,7 +15,7 @@
  */
 
 #import <XCTest/XCTest.h>
-#import "FIRApp.h"
+#import "FirebaseCommunity/FIRApp.h"
 #import "FTestHelpers.h"
 #import "FTestAuthTokenGenerator.h"
 #import "FIRTestAuthTokenProvider.h"
diff --git a/Example/Database/Tests/Integration/FIRDatabaseTests.m b/Example/Database/Tests/Integration/FIRDatabaseTests.m
index d0d0909..3b20a46 100644
--- a/Example/Database/Tests/Integration/FIRDatabaseTests.m
+++ b/Example/Database/Tests/Integration/FIRDatabaseTests.m
@@ -15,7 +15,7 @@
  */
 
 #import <XCTest/XCTest.h>
-#import "FIRApp.h"
+#import "FirebaseCommunity/FIRApp.h"
 #import "FIRDatabaseReference.h"
 #import "FIRDatabaseReference_Private.h"
 #import "FIRDatabase.h"
diff --git a/Example/Database/Tests/Unit/FSyncPointTests.m b/Example/Database/Tests/Unit/FSyncPointTests.m
index d36b48a..442975e 100644
--- a/Example/Database/Tests/Unit/FSyncPointTests.m
+++ b/Example/Database/Tests/Unit/FSyncPointTests.m
@@ -15,6 +15,7 @@
  */
 
 #import <Foundation/Foundation.h>
+#import "FirebaseCommunity/FIRLogger.h"
 #import "FSyncPointTests.h"
 #import "FListenProvider.h"
 #import "FQuerySpec.h"
diff --git a/Example/Firebase.xcodeproj/project.pbxproj b/Example/Firebase.xcodeproj/project.pbxproj
index 65b1612..631cdbb 100644
--- a/Example/Firebase.xcodeproj/project.pbxproj
+++ b/Example/Firebase.xcodeproj/project.pbxproj
@@ -4418,7 +4418,6 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_ROOT}/../../Firebase/Storage/Private\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Storage/Tests/Tests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
@@ -4442,7 +4441,6 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_ROOT}/../../Firebase/Storage/Private\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Storage/Tests/Tests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
@@ -4480,7 +4478,6 @@
 					"\"${PODS_ROOT}/../../Firebase/Database/Persistence\"",
 					"\"${PODS_ROOT}/../../Firebase/Database/FImmutableSortedDictionary/FImmutableSortedDictionary\"",
 					"\"${PODS_ROOT}/../../Firebase/Database/Core/View\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Database/Tests/FirebaseTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
@@ -4519,7 +4516,6 @@
 					"\"${PODS_ROOT}/../../Firebase/Database/Persistence\"",
 					"\"${PODS_ROOT}/../../Firebase/Database/FImmutableSortedDictionary/FImmutableSortedDictionary\"",
 					"\"${PODS_ROOT}/../../Firebase/Database/Core/View\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Database/Tests/FirebaseTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
@@ -4721,7 +4717,6 @@
 					"\"${PODS_ROOT}/../../Firebase/Auth/Source/RPCs\"",
 					"\"${PODS_ROOT}/../../Firebase/Auth/Source\"",
 					"\"${PODS_ROOT}/../../Firebase/Auth/Source/AuthProviders\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Auth/Tests/Tests-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -4748,7 +4743,6 @@
 					"\"${PODS_ROOT}/../../Firebase/Auth/Source/RPCs\"",
 					"\"${PODS_ROOT}/../../Firebase/Auth/Source\"",
 					"\"${PODS_ROOT}/../../Firebase/Auth/Source/AuthProviders\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Auth/Tests/Tests-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -4812,10 +4806,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = "";
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
-				);
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "Core/Tests/Tests-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
@@ -4836,10 +4827,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
-				);
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "Core/Tests/Tests-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
@@ -4908,7 +4896,6 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_ROOT}/../../Firebase/Storage/Private\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Storage/Tests/Tests-Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.google.Storage-Tests-macOS";
@@ -4930,7 +4917,6 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_ROOT}/../../Firebase/Storage/Private\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Storage/Tests/Tests-Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.google.Storage-Tests-macOS";
@@ -4952,7 +4938,6 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_ROOT}/../../Firebase/Storage/Private\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Storage/Tests/Tests-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -4976,7 +4961,6 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_ROOT}/../../Firebase/Storage/Private\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Storage/Tests/Tests-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -5077,7 +5061,6 @@
 					"\"${PODS_ROOT}/../../Firebase/Database/Persistence\"",
 					"\"${PODS_ROOT}/../../Firebase/Database/FImmutableSortedDictionary/FImmutableSortedDictionary\"",
 					"\"${PODS_ROOT}/../../Firebase/Database/Core/View\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Database/Tests/FirebaseTests-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -5117,7 +5100,6 @@
 					"\"${PODS_ROOT}/../../Firebase/Database/Persistence\"",
 					"\"${PODS_ROOT}/../../Firebase/Database/FImmutableSortedDictionary/FImmutableSortedDictionary\"",
 					"\"${PODS_ROOT}/../../Firebase/Database/Core/View\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Database/Tests/FirebaseTests-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -5155,7 +5137,6 @@
 					"\"${PODS_ROOT}/../../Firebase/Database/Persistence\"",
 					"\"${PODS_ROOT}/../../Firebase/Database/FImmutableSortedDictionary/FImmutableSortedDictionary\"",
 					"\"${PODS_ROOT}/../../Firebase/Database/Core/View\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Database/Tests/FirebaseTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
@@ -5195,7 +5176,6 @@
 					"\"${PODS_ROOT}/../../Firebase/Database/Persistence\"",
 					"\"${PODS_ROOT}/../../Firebase/Database/FImmutableSortedDictionary/FImmutableSortedDictionary\"",
 					"\"${PODS_ROOT}/../../Firebase/Database/Core/View\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Database/Tests/FirebaseTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
@@ -5289,7 +5269,6 @@
 					"\"${PODS_ROOT}/../../Firebase/Database/Persistence\"",
 					"\"${PODS_ROOT}/../../Firebase/Database/FImmutableSortedDictionary/FImmutableSortedDictionary\"",
 					"\"${PODS_ROOT}/../../Firebase/Database/Core/View\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Database/Tests/FirebaseTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
@@ -5331,7 +5310,6 @@
 					"\"${PODS_ROOT}/../../Firebase/Database/Persistence\"",
 					"\"${PODS_ROOT}/../../Firebase/Database/FImmutableSortedDictionary/FImmutableSortedDictionary\"",
 					"\"${PODS_ROOT}/../../Firebase/Database/Core/View\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Database/Tests/FirebaseTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
@@ -5402,7 +5380,6 @@
 					"\"${PODS_ROOT}/../../Firebase/Auth/Source/RPCs\"",
 					"\"${PODS_ROOT}/../../Firebase/Auth/Source\"",
 					"\"${PODS_ROOT}/../../Firebase/Auth/Source/AuthProviders\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Auth/Tests/Tests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
@@ -5429,7 +5406,6 @@
 					"\"${PODS_ROOT}/../../Firebase/Auth/Source/RPCs\"",
 					"\"${PODS_ROOT}/../../Firebase/Auth/Source\"",
 					"\"${PODS_ROOT}/../../Firebase/Auth/Source/AuthProviders\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Auth/Tests/Tests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
@@ -5461,7 +5437,6 @@
 					"\"${PODS_ROOT}/Headers/Public\"",
 					"\"${PODS_ROOT}/Headers/Public/FirebaseAnalytics\"",
 					"\"${PODS_ROOT}/../../Firebase/Messaging\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = Messaging/Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -5493,7 +5468,6 @@
 					"\"${PODS_ROOT}/Headers/Public\"",
 					"\"${PODS_ROOT}/Headers/Public/FirebaseAnalytics\"",
 					"\"${PODS_ROOT}/../../Firebase/Messaging\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = Messaging/Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -5561,7 +5535,6 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_ROOT}/../../Firebase/Storage/Private\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Storage/Tests/Tests-Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.google.Storage-Tests-iOS";
@@ -5582,7 +5555,6 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_ROOT}/../../Firebase/Storage/Private\"",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
 				);
 				INFOPLIST_FILE = "Storage/Tests/Tests-Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.google.Storage-Tests-iOS";
@@ -5636,10 +5608,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = "";
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
-				);
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "Core/Tests/Tests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -5660,10 +5629,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"${PODS_ROOT}/../../Firebase/Core/Private\"",
-				);
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "Core/Tests/Tests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
diff --git a/Example/Messaging/Tests/FIRMessagingClientTest.m b/Example/Messaging/Tests/FIRMessagingClientTest.m
index f36ec53..038e9db 100644
--- a/Example/Messaging/Tests/FIRMessagingClientTest.m
+++ b/Example/Messaging/Tests/FIRMessagingClientTest.m
@@ -31,7 +31,7 @@
 #import "FIRMessagingUtilities.h"
 #import "NSError+FIRMessaging.h"
 
-#import "FIRReachabilityChecker.h"
+#import "FirebaseCommunity/FIRReachabilityChecker.h"
 
 static NSString *const kFIRMessagingUserDefaultsSuite = @"FIRMessagingClientTestUserDefaultsSuite";
 
diff --git a/Example/Storage/Tests/Unit/FIRStorageTestHelpers.h b/Example/Storage/Tests/Unit/FIRStorageTestHelpers.h
index 4489c07..3069228 100644
--- a/Example/Storage/Tests/Unit/FIRStorageTestHelpers.h
+++ b/Example/Storage/Tests/Unit/FIRStorageTestHelpers.h
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#import "FIRAppInternal.h"
-
 #import <Foundation/Foundation.h>
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
diff --git a/Example/Storage/Tests/Unit/FIRStorageTokenAuthorizerTests.m b/Example/Storage/Tests/Unit/FIRStorageTokenAuthorizerTests.m
index e98ffbb..bc60fb4 100644
--- a/Example/Storage/Tests/Unit/FIRStorageTokenAuthorizerTests.m
+++ b/Example/Storage/Tests/Unit/FIRStorageTokenAuthorizerTests.m
@@ -14,6 +14,8 @@
 
 #import "FIRStorageTestHelpers.h"
 
+#import "FirebaseCommunity/FIRAppInternal.h"
+
 @interface FIRStorageTokenAuthorizerTests : XCTestCase
 
 @property(strong, nonatomic) GTMSessionFetcher *fetcher;