15 files changed, 19 insertions, 23 deletions
diff --git a/platform/ios/app/MBXAnnotationView.h b/platform/ios/app/MBXAnnotationView.h
index 5337ffae57..6bd799673d 100644
--- a/platform/ios/app/MBXAnnotationView.h
+++ b/platform/ios/app/MBXAnnotationView.h
@@ -1,4 +1,4 @@
-#import <Mapbox/Mapbox.h>
+@import Mapbox;
 
 @interface MBXAnnotationView : MGLAnnotationView
 @end
diff --git a/platform/ios/app/MBXAppDelegate.m b/platform/ios/app/MBXAppDelegate.m
index 519c70766a..bf62866b8e 100644
--- a/platform/ios/app/MBXAppDelegate.m
+++ b/platform/ios/app/MBXAppDelegate.m
@@ -1,6 +1,7 @@
+@import Mapbox;
+
 #import "MBXAppDelegate.h"
 #import "MBXViewController.h"
-#import <Mapbox/Mapbox.h>
 
 @interface MBXAppDelegate() <MGLMetricsManagerDelegate>
 
diff --git a/platform/ios/app/MBXCustomCalloutView.h b/platform/ios/app/MBXCustomCalloutView.h
index 961f2d7f6a..5a7c9c926f 100644
--- a/platform/ios/app/MBXCustomCalloutView.h
+++ b/platform/ios/app/MBXCustomCalloutView.h
@@ -1,5 +1,4 @@
-#import <UIKit/UIKit.h>
-#import <Mapbox/Mapbox.h>
+@import Mapbox;
 
 /**
  * Basic custom callout view to demonstrate how to
diff --git a/platform/ios/app/MBXCustomLocationViewController.m b/platform/ios/app/MBXCustomLocationViewController.m
index 0473f8c2ef..c77d990bac 100644
--- a/platform/ios/app/MBXCustomLocationViewController.m
+++ b/platform/ios/app/MBXCustomLocationViewController.m
@@ -1,6 +1,6 @@
-#import "MBXCustomLocationViewController.h"
+@import Mapbox;
 
-#import <Mapbox/Mapbox.h>
+#import "MBXCustomLocationViewController.h"
 
 @interface MBXCustomLocationManager : NSObject<MGLLocationManager>
 @end
diff --git a/platform/ios/app/MBXEmbeddedMapViewController.m b/platform/ios/app/MBXEmbeddedMapViewController.m
index f26a007c15..dacbdb5124 100644
--- a/platform/ios/app/MBXEmbeddedMapViewController.m
+++ b/platform/ios/app/MBXEmbeddedMapViewController.m
@@ -1,5 +1,6 @@
+@import Mapbox;
+
 #import "MBXEmbeddedMapViewController.h"
-#import <Mapbox/Mapbox.h>
 
 typedef NS_ENUM(NSInteger, MBXEmbeddedControl) {
     MBXEmbeddedControlZoom = 0,
diff --git a/platform/ios/app/MBXOfflinePacksTableViewController.m b/platform/ios/app/MBXOfflinePacksTableViewController.m
index 90497ca939..bc8407a46d 100644
--- a/platform/ios/app/MBXOfflinePacksTableViewController.m
+++ b/platform/ios/app/MBXOfflinePacksTableViewController.m
@@ -1,6 +1,7 @@
+@import Mapbox;
+
 #import "MBXOfflinePacksTableViewController.h"
 
-#import <Mapbox/Mapbox.h>
 
 static NSString * const MBXOfflinePackContextNameKey = @"Name";
 
diff --git a/platform/ios/app/MBXOrnamentsViewController.m b/platform/ios/app/MBXOrnamentsViewController.m
index 09ae787503..f451f647e5 100644
--- a/platform/ios/app/MBXOrnamentsViewController.m
+++ b/platform/ios/app/MBXOrnamentsViewController.m
@@ -1,6 +1,6 @@
-#import "MBXOrnamentsViewController.h"
+@import Mapbox;
 
-#import <Mapbox/Mapbox.h>
+#import "MBXOrnamentsViewController.h"
 
 @interface MBXOrnamentsViewController ()<MGLMapViewDelegate>
 
diff --git a/platform/ios/app/MBXSnapshotsViewController.m b/platform/ios/app/MBXSnapshotsViewController.m
index 95d3251e2e..747ff39248 100644
--- a/platform/ios/app/MBXSnapshotsViewController.m
+++ b/platform/ios/app/MBXSnapshotsViewController.m
@@ -1,6 +1,6 @@
-#import "MBXSnapshotsViewController.h"
+@import Mapbox;
 
-#import <Mapbox/Mapbox.h>
+#import "MBXSnapshotsViewController.h"
 
 @interface MBXSnapshotsViewController ()
 
diff --git a/platform/ios/app/MBXState.h b/platform/ios/app/MBXState.h
index 346c31d586..cf68016e98 100644
--- a/platform/ios/app/MBXState.h
+++ b/platform/ios/app/MBXState.h
@@ -1,5 +1,4 @@
-#import <Foundation/Foundation.h>
-#import <Mapbox/Mapbox.h>
+@import Mapbox;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/platform/ios/app/MBXStateManager.m b/platform/ios/app/MBXStateManager.m
index 7203ae462d..f9dc771e26 100644
--- a/platform/ios/app/MBXStateManager.m
+++ b/platform/ios/app/MBXStateManager.m
@@ -1,5 +1,4 @@
 #import "MBXStateManager.h"
-#import <Mapbox/Mapbox.h>
 #import "MBXState.h"
 #import "MBXViewController.h"
 
diff --git a/platform/ios/app/MBXUserLocationAnnotationView.h b/platform/ios/app/MBXUserLocationAnnotationView.h
index 39ed729d2b..a60658dd18 100644
--- a/platform/ios/app/MBXUserLocationAnnotationView.h
+++ b/platform/ios/app/MBXUserLocationAnnotationView.h
@@ -1,4 +1,4 @@
-#import <Mapbox/Mapbox.h>
+@import Mapbox;
 
 @interface MBXUserLocationAnnotationView : MGLUserLocationAnnotationView
 
diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m
index 31a2ff1d6d..82a68e074a 100644
--- a/platform/ios/app/MBXViewController.m
+++ b/platform/ios/app/MBXViewController.m
@@ -1,3 +1,5 @@
+@import Mapbox;
+
 #import "MBXViewController.h"
 
 #import "MBXAppDelegate.h"
@@ -12,8 +14,6 @@
 #import "MBXState.h"
 
 #import "MBXFrameTimeGraphView.h"
-
-#import <Mapbox/Mapbox.h>
 #import "../src/MGLMapView_Experimental.h"
 
 #import <objc/runtime.h>
diff --git a/platform/ios/benchmark/MBXBenchAppDelegate.m b/platform/ios/benchmark/MBXBenchAppDelegate.m
index 522ebb2dbc..d1a0ddf943 100644
--- a/platform/ios/benchmark/MBXBenchAppDelegate.m
+++ b/platform/ios/benchmark/MBXBenchAppDelegate.m
@@ -1,6 +1,5 @@
 #import "MBXBenchAppDelegate.h"
 #import "MBXBenchViewController.h"
-#import <Mapbox/Mapbox.h>
 
 @implementation MBXBenchAppDelegate
 
diff --git a/platform/ios/benchmark/MBXBenchViewController.mm b/platform/ios/benchmark/MBXBenchViewController.mm
index 67d9b5cb6e..901eb07cd1 100644
--- a/platform/ios/benchmark/MBXBenchViewController.mm
+++ b/platform/ios/benchmark/MBXBenchViewController.mm
@@ -1,8 +1,5 @@
 #import "MBXBenchViewController.h"
-
 #import "MBXBenchAppDelegate.h"
-
-#import <Mapbox/Mapbox.h>
 #import "MGLMapView_Private.h"
 
 #include "locations.hpp"
diff --git a/platform/ios/framework/Info.plist b/platform/ios/framework/Info.plist
index 64bff94b78..d8962c53ab 100644
--- a/platform/ios/framework/Info.plist
+++ b/platform/ios/framework/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.mapbox.core</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>