diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/project.pbxproj b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/project.pbxproj
index b5958032298..bd75585b51c 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/project.pbxproj
@@ -242,6 +242,7 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				BB6BD9A1101E970BEF85B6D2 /* [CP] Copy Pods Resources */,
+				65FA8ABC2DB1E3267F397BFC /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -386,6 +387,24 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		65FA8ABC2DB1E3267F397BFC /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		74BF216DF17B0C7F983459BD /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/ExtractIconFromDataTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/ExtractIconFromDataTests.m
index 811f09d49b4..9a76c9d1b74 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/ExtractIconFromDataTests.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/ExtractIconFromDataTests.m
@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import google_maps_flutter_ios;
+#if __has_include(<google_maps_flutter_ios/google_maps_flutter_ios-umbrella.h>)
 @import google_maps_flutter_ios.Test;
+#endif
 @import XCTest;
 #import <OCMock/OCMock.h>
 #import <google_maps_flutter_ios/GoogleMapMarkerController_Test.h>
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FGMClusterManagersControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FGMClusterManagersControllerTests.m
index 8d435eb4941..b3a55d2d915 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FGMClusterManagersControllerTests.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FGMClusterManagersControllerTests.m
@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import google_maps_flutter_ios;
+#if __has_include(<google_maps_flutter_ios/google_maps_flutter_ios-umbrella.h>)
 @import google_maps_flutter_ios.Test;
+#endif
 @import XCTest;
 @import GoogleMaps;
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FLTGoogleMapJSONConversionsConversionTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FLTGoogleMapJSONConversionsConversionTests.m
index cb7c63a7276..34d3dc204a2 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FLTGoogleMapJSONConversionsConversionTests.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FLTGoogleMapJSONConversionsConversionTests.m
@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import google_maps_flutter_ios;
+#if __has_include(<google_maps_flutter_ios/google_maps_flutter_ios-umbrella.h>)
 @import google_maps_flutter_ios.Test;
+#endif
 @import XCTest;
 @import GoogleMaps;
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsPolylinesControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsPolylinesControllerTests.m
index edb0ed03096..87d4a5d2f3c 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsPolylinesControllerTests.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsPolylinesControllerTests.m
@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import google_maps_flutter_ios;
+#if __has_include(<google_maps_flutter_ios/google_maps_flutter_ios-umbrella.h>)
 @import google_maps_flutter_ios.Test;
+#endif
 @import XCTest;
 @import GoogleMaps;
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsTests.m
index c175550dd2c..cbbbf57e5ef 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsTests.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsTests.m
@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import google_maps_flutter_ios;
+#if __has_include(<google_maps_flutter_ios/google_maps_flutter_ios-umbrella.h>)
 @import google_maps_flutter_ios.Test;
+#endif
 @import XCTest;
 @import GoogleMaps;
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/RunnerTests/GoogleMapsTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/RunnerTests/GoogleMapsTests.m
index c175550dd2c..cbbbf57e5ef 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/RunnerTests/GoogleMapsTests.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/RunnerTests/GoogleMapsTests.m
@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import google_maps_flutter_ios;
+#if __has_include(<google_maps_flutter_ios/google_maps_flutter_ios-umbrella.h>)
 @import google_maps_flutter_ios.Test;
+#endif
 @import XCTest;
 @import GoogleMaps;
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMClusterManagersController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMClusterManagersController.m
index 26db81693bd..b212623654d 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMClusterManagersController.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMClusterManagersController.m
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "FGMClusterManagersController.h"
-
-#import "FGMMarkerUserData.h"
-#import "FLTGoogleMapJSONConversions.h"
+#import "./include/google_maps_flutter_ios/FGMClusterManagersController.h"
+#import "./include/google_maps_flutter_ios/FGMMarkerUserData.h"
+#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h"
 
 @interface FGMClusterManagersController ()
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerUserData.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerUserData.m
index 4e8e365c1ec..333a781cbfd 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerUserData.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerUserData.m
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "FGMMarkerUserData.h"
+#import "./include/google_maps_flutter_ios/FGMMarkerUserData.h"
 
 @implementation FGMMarkerUserData
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m
index 80011758050..c873a8a8729 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "FLTGoogleMapHeatmapController.h"
-#import "FLTGoogleMapJSONConversions.h"
+#import "./include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h"
+#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h"
 
 /// If Swift Package Manager is in use, Objective-C headers are available under the
 /// GoogleMapsUtilsObjC package. When using CocoaPods, the headers are provided by the
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapJSONConversions.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapJSONConversions.m
index 25504291192..ee519cf8513 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapJSONConversions.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapJSONConversions.m
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "FLTGoogleMapJSONConversions.h"
-#import "FGMMarkerUserData.h"
+#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h"
+#import "./include/google_maps_flutter_ios/FGMMarkerUserData.h"
 
 /// Returns dict[key], or nil if dict[key] is NSNull.
 id FGMGetValueOrNilFromDict(NSDictionary *dict, NSString *key) {
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m
index 37b2f8b6311..0eee51015a5 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "FLTGoogleMapTileOverlayController.h"
-#import "FLTGoogleMapJSONConversions.h"
+#import "./include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.h"
+#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h"
 
 @interface FLTGoogleMapTileOverlayController ()
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.m
index 70bde9022a0..bcf39b6977d 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.m
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "FLTGoogleMapsPlugin.h"
+#import "./include/google_maps_flutter_ios/FLTGoogleMapsPlugin.h"
 
 #pragma mark - GoogleMaps plugin implementation
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m
index 683538a67ee..0c7d3d9e388 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "GoogleMapCircleController.h"
-#import "FLTGoogleMapJSONConversions.h"
+#import "./include/google_maps_flutter_ios/GoogleMapCircleController.h"
+#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h"
 
 @interface FLTGoogleMapCircleController ()
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m
index 2b52180970e..a616d2e1707 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m
@@ -11,13 +11,12 @@
 @import GoogleMapsUtilsObjC;
 #endif
 
-#import "GoogleMapController.h"
-
-#import "FGMMarkerUserData.h"
-#import "FLTGoogleMapHeatmapController.h"
-#import "FLTGoogleMapJSONConversions.h"
-#import "FLTGoogleMapTileOverlayController.h"
-#import "messages.g.h"
+#import "./include/google_maps_flutter_ios/GoogleMapController.h"
+#import "./include/google_maps_flutter_ios/FGMMarkerUserData.h"
+#import "./include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h"
+#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h"
+#import "./include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.h"
+#import "./include/google_maps_flutter_ios/messages.g.h"
 
 #pragma mark - Conversion of JSON-like values sent via platform channels. Forward declarations.
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m
index cfbc9392159..c02bac9f43f 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "GoogleMapMarkerController.h"
-
-#import "FGMMarkerUserData.h"
-#import "FLTGoogleMapJSONConversions.h"
+#import "./include/google_maps_flutter_ios/GoogleMapMarkerController.h"
+#import "./include/google_maps_flutter_ios/FGMMarkerUserData.h"
+#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h"
 
 @interface FLTGoogleMapMarkerController ()
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m
index 46d7234c085..021edc6887f 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "GoogleMapPolygonController.h"
-#import "FLTGoogleMapJSONConversions.h"
+#import "./include/google_maps_flutter_ios/GoogleMapPolygonController.h"
+#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h"
 
 @interface FLTGoogleMapPolygonController ()
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m
index 16643b5e7e4..d1a039674c0 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "GoogleMapPolylineController.h"
-#import "FLTGoogleMapJSONConversions.h"
+#import "./include/google_maps_flutter_ios/GoogleMapPolylineController.h"
+#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h"
 
 @interface FLTGoogleMapPolylineController ()