diff --git a/FirebaseFunctions.podspec b/FirebaseFunctions.podspec
index 20c0e8232aa..1d789c2a41c 100644
--- a/FirebaseFunctions.podspec
+++ b/FirebaseFunctions.podspec
@@ -28,7 +28,7 @@ Cloud Functions for Firebase.
     'Interop/Auth/Public/*.h',
     'FirebaseCore/Sources/Private/*.h',
   ]
-  s.public_header_files = 'Functions/FirebaseFunctions/Public/*.h'
+  s.public_header_files = 'Functions/FirebaseFunctions/Public/FirebaseFunctions/*.h'
 
   s.dependency 'FirebaseCore', '~> 6.8'
   s.dependency 'GTMSessionFetcher/Core', '~> 1.1'
diff --git a/Functions/Example/IntegrationTests/FIRIntegrationTests.m b/Functions/Example/IntegrationTests/FIRIntegrationTests.m
index 98738a94c9f..4163bddd165 100644
--- a/Functions/Example/IntegrationTests/FIRIntegrationTests.m
+++ b/Functions/Example/IntegrationTests/FIRIntegrationTests.m
@@ -19,9 +19,9 @@
 #import "FIRAuthInteropFake.h"
 #import "Functions/Example/TestUtils/FUNFakeInstanceID.h"
 #import "Functions/FirebaseFunctions/FIRFunctions+Internal.h"
-#import "Functions/FirebaseFunctions/Public/FIRError.h"
-#import "Functions/FirebaseFunctions/Public/FIRFunctions.h"
-#import "Functions/FirebaseFunctions/Public/FIRHTTPSCallable.h"
+#import "Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRError.h"
+#import "Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRFunctions.h"
+#import "Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRHTTPSCallable.h"
 
 // Project ID used by these tests.
 static NSString *const kDefaultProjectID = @"functions-integration-test";
diff --git a/Functions/Example/Tests/FIRFunctionsTests.m b/Functions/Example/Tests/FIRFunctionsTests.m
index 897799436b9..bf85c692e19 100644
--- a/Functions/Example/Tests/FIRFunctionsTests.m
+++ b/Functions/Example/Tests/FIRFunctionsTests.m
@@ -15,7 +15,7 @@
 #import <XCTest/XCTest.h>
 
 #import "Functions/FirebaseFunctions/FIRFunctions+Internal.h"
-#import "Functions/FirebaseFunctions/Public/FIRFunctions.h"
+#import "Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRFunctions.h"
 
 @interface FIRFunctionsTests : XCTestCase
 @end
diff --git a/Functions/Example/Tests/FUNSerializerTests.m b/Functions/Example/Tests/FUNSerializerTests.m
index 252f47ab78a..790c8c4cf01 100644
--- a/Functions/Example/Tests/FUNSerializerTests.m
+++ b/Functions/Example/Tests/FUNSerializerTests.m
@@ -15,7 +15,7 @@
 #import <XCTest/XCTest.h>
 
 #import "Functions/FirebaseFunctions/FUNSerializer.h"
-#import "Functions/FirebaseFunctions/Public/FIRError.h"
+#import "Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRError.h"
 
 @interface FUNSerializerTests : XCTestCase
 @end
diff --git a/Functions/FirebaseFunctions/FIRFunctions+Internal.h b/Functions/FirebaseFunctions/FIRFunctions+Internal.h
index 31de8a240c3..5f4506e66ff 100644
--- a/Functions/FirebaseFunctions/FIRFunctions+Internal.h
+++ b/Functions/FirebaseFunctions/FIRFunctions+Internal.h
@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "Functions/FirebaseFunctions/Public/FIRFunctions.h"
+#import "Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRFunctions.h"
 
 @protocol FIRAuthInterop;
 @class FIRHTTPSCallableResult;
diff --git a/Functions/FirebaseFunctions/FIRFunctions.m b/Functions/FirebaseFunctions/FIRFunctions.m
index 7e8bb018d08..5997feff7d0 100644
--- a/Functions/FirebaseFunctions/FIRFunctions.m
+++ b/Functions/FirebaseFunctions/FIRFunctions.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "Functions/FirebaseFunctions/Public/FIRFunctions.h"
+#import "Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRFunctions.h"
 #import "Functions/FirebaseFunctions/FIRFunctions+Internal.h"
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
@@ -23,8 +23,8 @@
 #import "Functions/FirebaseFunctions/FUNError.h"
 #import "Functions/FirebaseFunctions/FUNSerializer.h"
 #import "Functions/FirebaseFunctions/FUNUsageValidation.h"
-#import "Functions/FirebaseFunctions/Public/FIRError.h"
-#import "Functions/FirebaseFunctions/Public/FIRHTTPSCallable.h"
+#import "Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRError.h"
+#import "Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRHTTPSCallable.h"
 
 #if SWIFT_PACKAGE
 @import GTMSessionFetcherCore;
diff --git a/Functions/FirebaseFunctions/FIRHTTPSCallable+Internal.h b/Functions/FirebaseFunctions/FIRHTTPSCallable+Internal.h
index 25dea75d77e..d9339eac2d1 100644
--- a/Functions/FirebaseFunctions/FIRHTTPSCallable+Internal.h
+++ b/Functions/FirebaseFunctions/FIRHTTPSCallable+Internal.h
@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "Functions/FirebaseFunctions/Public/FIRHTTPSCallable.h"
+#import "Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRHTTPSCallable.h"
 
 @class FIRFunctions;
 
diff --git a/Functions/FirebaseFunctions/FIRHTTPSCallable.m b/Functions/FirebaseFunctions/FIRHTTPSCallable.m
index d3eb2c3d528..1734ce2bbc5 100644
--- a/Functions/FirebaseFunctions/FIRHTTPSCallable.m
+++ b/Functions/FirebaseFunctions/FIRHTTPSCallable.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "Functions/FirebaseFunctions/Public/FIRHTTPSCallable.h"
+#import "Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRHTTPSCallable.h"
 #import "Functions/FirebaseFunctions/FIRHTTPSCallable+Internal.h"
 
 #import "Functions/FirebaseFunctions/FIRFunctions+Internal.h"
diff --git a/Functions/FirebaseFunctions/FUNError.h b/Functions/FirebaseFunctions/FUNError.h
index bfd2b986b10..989010faf16 100644
--- a/Functions/FirebaseFunctions/FUNError.h
+++ b/Functions/FirebaseFunctions/FUNError.h
@@ -14,7 +14,7 @@
 // limitations under the License.
 
 #import <Foundation/Foundation.h>
-#import "Functions/FirebaseFunctions/Public/FIRError.h"
+#import "Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRError.h"
 
 @class FUNSerializer;
 
diff --git a/Functions/FirebaseFunctions/FUNSerializer.m b/Functions/FirebaseFunctions/FUNSerializer.m
index e011e393052..ecbc28cc602 100644
--- a/Functions/FirebaseFunctions/FUNSerializer.m
+++ b/Functions/FirebaseFunctions/FUNSerializer.m
@@ -15,7 +15,7 @@
 #import "Functions/FirebaseFunctions/FUNSerializer.h"
 
 #import "Functions/FirebaseFunctions/FUNUsageValidation.h"
-#import "Functions/FirebaseFunctions/Public/FIRError.h"
+#import "Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRError.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Functions/FirebaseFunctions/Public/FIRError.h b/Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRError.h
similarity index 100%
rename from Functions/FirebaseFunctions/Public/FIRError.h
rename to Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRError.h
diff --git a/Functions/FirebaseFunctions/Public/FIRFunctions.h b/Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRFunctions.h
similarity index 100%
rename from Functions/FirebaseFunctions/Public/FIRFunctions.h
rename to Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRFunctions.h
diff --git a/Functions/FirebaseFunctions/Public/FIRHTTPSCallable.h b/Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRHTTPSCallable.h
similarity index 100%
rename from Functions/FirebaseFunctions/Public/FIRHTTPSCallable.h
rename to Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRHTTPSCallable.h
diff --git a/Functions/FirebaseFunctions/Public/FirebaseFunctions.h b/Functions/FirebaseFunctions/Public/FirebaseFunctions/FirebaseFunctions.h
similarity index 100%
rename from Functions/FirebaseFunctions/Public/FirebaseFunctions.h
rename to Functions/FirebaseFunctions/Public/FirebaseFunctions/FirebaseFunctions.h
diff --git a/SwiftPMTests/objc-import-test/objc-header.m b/SwiftPMTests/objc-import-test/objc-header.m
index a5bdb003410..b64444152c8 100644
--- a/SwiftPMTests/objc-import-test/objc-header.m
+++ b/SwiftPMTests/objc-import-test/objc-header.m
@@ -12,25 +12,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#import "Firebase.h"
 #import "FirebaseABTesting/FirebaseABTesting.h"
 #import "FirebaseAuth/FirebaseAuth.h"
-//#import "FirebaseFunctions/FirebaseFunctions.h"
-#import "Firebase.h"
 #import "FirebaseCore/FirebaseCore.h"
 #import "FirebaseCrashlytics/FirebaseCrashlytics.h"
 #import "FirebaseDatabase/FirebaseDatabase.h"
+#import "FirebaseFunctions/FirebaseFunctions.h"
 //#import "FirebaseFirestore/FirebaseFirestore."
 #import "FirebaseInstallations/FirebaseInstallations.h"
 #import "FirebaseRemoteConfig/FirebaseRemoteConfig.h"
 #import "FirebaseStorage/FirebaseStorage.h"
 
+#import <Firebase.h>
 #import <FirebaseABTesting/FirebaseABTesting.h>
 #import <FirebaseAuth/FirebaseAuth.h>
-//#import <FirebaseFunctions/FirebaseFunctions.h>
-#import <Firebase.h>
 #import <FirebaseCore/FirebaseCore.h>
 #import <FirebaseCrashlytics/FirebaseCrashlytics.h>
 #import <FirebaseDatabase/FirebaseDatabase.h>
+#import <FirebaseFunctions/FirebaseFunctions.h>
 //#import <FirebaseFirestore/FirebaseFirestore.>
 #import <FirebaseInstallations/FirebaseInstallations.h>
 #import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>