diff --git a/Firestore/core/swift/src/used_by_swift.cc b/Firestore/core/swift/src/used_by_swift.cc
index b6cc5ee11c4..c497d8ee1b1 100644
--- a/Firestore/core/swift/src/used_by_swift.cc
+++ b/Firestore/core/swift/src/used_by_swift.cc
@@ -2,7 +2,7 @@
 // Created by Cheryl Lin on 2024-10-22.
 //
 
-#include "Firestore/core/swift/include/used_by_swift.h"
+#include "../include/used_by_swift.h"
 #include <iostream>
 
 UsedBySwift::UsedBySwift(std::string content) {
diff --git a/Package.swift b/Package.swift
index f1ea1ea901c..cfa9a273a05 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1174,7 +1174,10 @@ let package = Package(
         "FirebaseStorage",
         .product(name: "nanopb", package: "nanopb"),
       ],
-      path: "SwiftPMTests/swift-test"
+      path: "SwiftPMTests/swift-test",
+      swiftSettings: [
+          .interoperabilityMode(.Cxx), // C++ interoperability setting
+      ]
     ),
     .testTarget(
       name: "analytics-import-test",
@@ -1406,9 +1409,6 @@ func firebaseFirestoreCppTarget() -> Target {
     return .target(
         name: "FirebaseFirestoreCpp",
         path: "Firestore/core/swift",
-        sources: [
-          "src",
-        ],
         publicHeadersPath: "include", // Path to the public headers
         cxxSettings: [
           .headerSearchPath("umbrella"), // Ensure the header search path is correct