more clearly indicate Foundation imports to avoid recursion

14 files changed, 36 insertions, 9 deletions

diff --git a/include/mbgl/ios/MGLAccountManager.h b/include/mbgl/ios/MGLAccountManager.h
index 9d6ba3d063..4c239d6a1f 100644
--- a/include/mbgl/ios/MGLAccountManager.h
+++ b/include/mbgl/ios/MGLAccountManager.h
@@ -1,3 +1,5 @@
+#import <Foundation/Foundation.h>
+
 #import "MGLTypes.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/include/mbgl/ios/MGLAnnotation.h b/include/mbgl/ios/MGLAnnotation.h
index 18388d8485..aef21ecbc6 100644
--- a/include/mbgl/ios/MGLAnnotation.h
+++ b/include/mbgl/ios/MGLAnnotation.h
@@ -1,3 +1,4 @@
+#import <Foundation/Foundation.h>
 #import <CoreLocation/CoreLocation.h>
 
 #import "MGLTypes.h"
diff --git a/include/mbgl/ios/MGLGeometry.h b/include/mbgl/ios/MGLGeometry.h
index 05bec9fc08..a2ae9c991c 100644
--- a/include/mbgl/ios/MGLGeometry.h
+++ b/include/mbgl/ios/MGLGeometry.h
@@ -1,10 +1,9 @@
-#pragma once
-
-#import "MGLTypes.h"
-
+#import <Foundation/Foundation.h>
 #import <CoreLocation/CoreLocation.h>
 #import <CoreGraphics/CGBase.h>
 
+#import "MGLTypes.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 /** Defines the area spanned by an MGLCoordinateBounds. */
diff --git a/include/mbgl/ios/MGLMapCamera.h b/include/mbgl/ios/MGLMapCamera.h
index 68f3923fd3..7c00ad8665 100644
--- a/include/mbgl/ios/MGLMapCamera.h
+++ b/include/mbgl/ios/MGLMapCamera.h
@@ -1,6 +1,8 @@
-#import "Mapbox.h"
+#import <Foundation/Foundation.h>
+#import <CoreGraphics/CoreGraphics.h>
+#import <CoreLocation/CoreLocation.h>
 
-#pragma once
+#import "MGLTypes.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/include/mbgl/ios/MGLMapView+IBAdditions.h b/include/mbgl/ios/MGLMapView+IBAdditions.h
index e7a602eacc..52d5d433b6 100644
--- a/include/mbgl/ios/MGLMapView+IBAdditions.h
+++ b/include/mbgl/ios/MGLMapView+IBAdditions.h
@@ -1,6 +1,9 @@
-#import "MGLMapView.h"
+#import <Foundation/Foundation.h>
+
 #import "MGLTypes.h"
 
+@class MGLMapView;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface MGLMapView (IBAdditions)
diff --git a/include/mbgl/ios/MGLMapView.h b/include/mbgl/ios/MGLMapView.h
index 1ff6c9eb6e..c715725bd3 100644
--- a/include/mbgl/ios/MGLMapView.h
+++ b/include/mbgl/ios/MGLMapView.h
@@ -4,10 +4,11 @@
 #import <UIKit/UIKit.h>
 #import <CoreLocation/CoreLocation.h>
 
+#import "MGLTypes.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 @class MGLAnnotationImage;
-@class MGLMapCamera;
 @class MGLUserLocation;
 @class MGLPolyline;
 @class MGLPolygon;
diff --git a/include/mbgl/ios/MGLMultiPoint.h b/include/mbgl/ios/MGLMultiPoint.h
index 1fc7ef6dcf..5c58016df4 100644
--- a/include/mbgl/ios/MGLMultiPoint.h
+++ b/include/mbgl/ios/MGLMultiPoint.h
@@ -3,6 +3,8 @@
 
 #import "MGLShape.h"
 
+#import "MGLTypes.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 /** The `MGLMultiPoint` class is an abstract superclass used to define shapes composed of multiple points. You should not create instances of this class directly. Instead, you should create instances of the `MGLPolyline` or `MGLPolygon` classes. However, you can use the method and properties of this class to access information about the specific points associated with the line or polygon. */
diff --git a/include/mbgl/ios/MGLOverlay.h b/include/mbgl/ios/MGLOverlay.h
index eee362d57b..ab827c0d22 100644
--- a/include/mbgl/ios/MGLOverlay.h
+++ b/include/mbgl/ios/MGLOverlay.h
@@ -4,6 +4,8 @@
 #import "MGLAnnotation.h"
 #import "MGLGeometry.h"
 
+#import "MGLTypes.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 /** The `MGLOverlay` protocol defines a specific type of annotation that represents both a point and an area on a map. Overlay objects are essentially data objects that contain the geographic data needed to represent the map area. For example, overlays can take the form of common shapes such as rectangles and circles. They can also describe polygons and other complex shapes.
diff --git a/include/mbgl/ios/MGLPointAnnotation.h b/include/mbgl/ios/MGLPointAnnotation.h
index ed50002751..d186cbff18 100644
--- a/include/mbgl/ios/MGLPointAnnotation.h
+++ b/include/mbgl/ios/MGLPointAnnotation.h
@@ -3,6 +3,8 @@
 
 #import "MGLShape.h"
 
+#import "MGLTypes.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 /** The `MGLPointAnnotation` class defines a concrete annotation object located at a specified point. You can use this class, rather than define your own, in situations where all you want to do is associate a point on the map with a title. */
diff --git a/include/mbgl/ios/MGLPolygon.h b/include/mbgl/ios/MGLPolygon.h
index c2fef6de62..a19b984f1c 100644
--- a/include/mbgl/ios/MGLPolygon.h
+++ b/include/mbgl/ios/MGLPolygon.h
@@ -4,6 +4,8 @@
 #import "MGLMultiPoint.h"
 #import "MGLOverlay.h"
 
+#import "MGLTypes.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 /** The `MGLPolygon` class represents a shape consisting of one or more points that define a closed polygon. The points are connected end-to-end in the order they are provided. The first and last points are connected to each other to create the closed shape. */
diff --git a/include/mbgl/ios/MGLPolyline.h b/include/mbgl/ios/MGLPolyline.h
index 07c5286c80..c849bc9876 100644
--- a/include/mbgl/ios/MGLPolyline.h
+++ b/include/mbgl/ios/MGLPolyline.h
@@ -4,6 +4,8 @@
 #import "MGLMultiPoint.h"
 #import "MGLOverlay.h"
 
+#import "MGLTypes.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 /** The `MGLPolyline` class represents a shape consisting of one or more points that define connecting line segments. The points are connected end-to-end in the order they are provided. The first and last points are not connected to each other. */
diff --git a/include/mbgl/ios/MGLShape.h b/include/mbgl/ios/MGLShape.h
index afc2dbb5a5..f54d4bfb74 100644
--- a/include/mbgl/ios/MGLShape.h
+++ b/include/mbgl/ios/MGLShape.h
@@ -2,6 +2,8 @@
 
 #import "MGLAnnotation.h"
 
+#import "MGLTypes.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 /** The `MGLShape` class is an abstract class that defines the basic properties for all shape-based annotation objects. This class must be subclassed and cannot be used as is. Subclasses are responsible for defining the geometry of the shape and providing an appropriate value for the coordinate property inherited from the `MGLAnnotation` protocol. */
diff --git a/include/mbgl/ios/MGLStyle.h b/include/mbgl/ios/MGLStyle.h
index e27b8b32c7..88cb8aaa83 100644
--- a/include/mbgl/ios/MGLStyle.h
+++ b/include/mbgl/ios/MGLStyle.h
@@ -1,4 +1,6 @@
-#import "Mapbox.h"
+#import <Foundation/Foundation.h>
+
+#import "MGLTypes.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/include/mbgl/ios/MGLUserLocation.h b/include/mbgl/ios/MGLUserLocation.h
index 2eea515908..a681ac5932 100644
--- a/include/mbgl/ios/MGLUserLocation.h
+++ b/include/mbgl/ios/MGLUserLocation.h
@@ -1,5 +1,10 @@
+#import <Foundation/Foundation.h>
+#import <CoreLocation/CoreLocation.h>
+
 #import "MGLAnnotation.h"
 
+#import "MGLTypes.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 /** The MGLUserLocation class defines a specific type of annotation that identifies the user’s current location. You do not create instances of this class directly. Instead, you retrieve an existing MGLUserLocation object from the userLocation property of the map view displayed in your application. */