diff --git a/FirebaseFirestoreInternal.podspec b/FirebaseFirestoreInternal.podspec
index 33a61dbca85..9c941e8d6a0 100644
--- a/FirebaseFirestoreInternal.podspec
+++ b/FirebaseFirestoreInternal.podspec
@@ -45,6 +45,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
   # that "quick open" by filename in Xcode will continue to work.
   s.source_files = [
     'FirebaseCore/Extension/*.h',
+    'FirebaseCore/InternalObjC/*.h',
     'FirebaseCore/Sources/FIROptionsInternal.h',
     'Firestore/Source/Public/FirebaseFirestore/*.h',
     'Firestore/Source/**/*.{m,mm}',
@@ -94,6 +95,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
 
   s.dependency 'FirebaseAppCheckInterop', '~> 11.0'
   s.dependency 'FirebaseCore', '11.5'
+  s.dependency 'FirebaseCoreInternal', '11.5'
 
   abseil_version = '~> 1.20240116.1'
   s.dependency 'abseil/algorithm', abseil_version
diff --git a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm
index 4b7c7b9f034..b53a2f9c57a 100644
--- a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm
+++ b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm
@@ -33,7 +33,7 @@
 #include <utility>
 
 #import "FirebaseCore/Extension/FIRAppInternal.h"
-#import "FirebaseCore/Extension/FIRLogger.h"
+#import "FirebaseCore/InternalObjC/FIRLogger.h"
 #import "FirebaseCore/Sources/Public/FirebaseCore/FIRLoggerLevel.h"
 #import "FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h"
 #import "Firestore/Example/Tests/Util/FIRFirestore+Testing.h"
diff --git a/Firestore/Source/API/FIRFirestore.mm b/Firestore/Source/API/FIRFirestore.mm
index f6dbf9dc059..db03357667f 100644
--- a/Firestore/Source/API/FIRFirestore.mm
+++ b/Firestore/Source/API/FIRFirestore.mm
@@ -30,8 +30,8 @@
 #import "FIRTransactionOptions.h"
 
 #import "FirebaseCore/Extension/FIRAppInternal.h"
-#import "FirebaseCore/Extension/FIRComponentContainer.h"
-#import "FirebaseCore/Extension/FIRComponentType.h"
+#import "FirebaseCore/InternalObjC/FIRComponentContainer.h"
+#import "FirebaseCore/InternalObjC/FIRComponentType.h"
 #import "Firestore/Source/API/FIRCollectionReference+Internal.h"
 #import "Firestore/Source/API/FIRDocumentReference+Internal.h"
 #import "Firestore/Source/API/FIRListenerRegistration+Internal.h"
diff --git a/Firestore/Source/API/FSTFirestoreComponent.mm b/Firestore/Source/API/FSTFirestoreComponent.mm
index d07ac36f899..f2614ee2346 100644
--- a/Firestore/Source/API/FSTFirestoreComponent.mm
+++ b/Firestore/Source/API/FSTFirestoreComponent.mm
@@ -24,10 +24,10 @@
 
 #import "FirebaseAuth/Interop/Public/FirebaseAuthInterop/FIRAuthInterop.h"
 #import "FirebaseCore/Extension/FIRAppInternal.h"
-#import "FirebaseCore/Extension/FIRComponent.h"
-#import "FirebaseCore/Extension/FIRComponentContainer.h"
-#import "FirebaseCore/Extension/FIRComponentType.h"
-#import "FirebaseCore/Extension/FIRLibrary.h"
+#import "FirebaseCore/InternalObjC/FIRComponent.h"
+#import "FirebaseCore/InternalObjC/FIRComponentContainer.h"
+#import "FirebaseCore/InternalObjC/FIRComponentType.h"
+#import "FirebaseCore/InternalObjC/FIRLibrary.h"
 #import "FirebaseCore/Sources/FIROptionsInternal.h"
 #import "Firestore/Source/API/FIRFirestore+Internal.h"
 
diff --git a/Firestore/core/src/util/log_apple.mm b/Firestore/core/src/util/log_apple.mm
index b57b156b403..a1634d58acc 100644
--- a/Firestore/core/src/util/log_apple.mm
+++ b/Firestore/core/src/util/log_apple.mm
@@ -23,7 +23,7 @@
 #include <cstdarg>
 #include <string>
 
-#import "FirebaseCore/Extension/FIRLogger.h"
+#import "FirebaseCore/InternalObjC/FIRLogger.h"
 
 #include "Firestore/core/src/util/string_apple.h"
 
diff --git a/Package.swift b/Package.swift
index 18491eee55e..e2155a6fa9e 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1428,6 +1428,7 @@ func firestoreTargets() -> [Target] {
         dependencies: [
           "FirebaseAppCheckInterop",
           "FirebaseCore",
+          "FirebaseCoreInternalObjC",
           "leveldb",
           .product(name: "nanopb", package: "nanopb"),
           .product(name: "abseil", package: "abseil-cpp-SwiftPM"),
@@ -1560,6 +1561,7 @@ func firestoreTargets() -> [Target] {
         .product(name: "nanopb", package: "nanopb"),
         "FirebaseAppCheckInterop",
         "FirebaseCore",
+        "FirebaseCoreInternalObjC",
         "FirebaseCoreExtension",
         "leveldb",
         "FirebaseSharedSwift",