diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake
index 6343b5efc..753e105ef 100644
--- a/cmake/core-files.cmake
+++ b/cmake/core-files.cmake
@@ -123,9 +123,6 @@ set(MBGL_CORE_FILES
     include/mbgl/math/wrap.hpp
     src/mbgl/math/log2.cpp
 
-    # mbgl
-    include/mbgl/mbgl.hpp
-
     # parsedate
     src/parsedate/parsedate.c
     src/parsedate/parsedate.h
diff --git a/include/mbgl/mbgl.hpp b/include/mbgl/mbgl.hpp
deleted file mode 100644
index 5cfc9cb45..000000000
--- a/include/mbgl/mbgl.hpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include "map/map.hpp"
-#include "map/view.hpp"
diff --git a/platform/darwin/src/MGLSource_Private.h b/platform/darwin/src/MGLSource_Private.h
index dff230ede..954dd5ae3 100644
--- a/platform/darwin/src/MGLSource_Private.h
+++ b/platform/darwin/src/MGLSource_Private.h
@@ -1,6 +1,5 @@
 #import "MGLSource.h"
 
-#include <mbgl/mbgl.hpp>
 #include <mbgl/style/source.hpp>
 
 @class MGLMapView;
diff --git a/platform/darwin/src/MGLStyle.mm b/platform/darwin/src/MGLStyle.mm
index 2deaf794e..20c191706 100644
--- a/platform/darwin/src/MGLStyle.mm
+++ b/platform/darwin/src/MGLStyle.mm
@@ -31,7 +31,6 @@
 #include <mbgl/style/sources/geojson_source.hpp>
 #include <mbgl/style/sources/vector_source.hpp>
 #include <mbgl/style/sources/raster_source.hpp>
-#include <mbgl/mbgl.hpp>
 
 #if TARGET_OS_IPHONE
     #import "UIImage+MGLAdditions.h"
diff --git a/platform/darwin/src/MGLStyle_Private.h b/platform/darwin/src/MGLStyle_Private.h
index 46291b37b..6f52b67fa 100644
--- a/platform/darwin/src/MGLStyle_Private.h
+++ b/platform/darwin/src/MGLStyle_Private.h
@@ -3,7 +3,6 @@
 #import "MGLStyleLayer.h"
 #import "MGLFillStyleLayer.h"
 #import <mbgl/util/default_styles.hpp>
-#include <mbgl/mbgl.hpp>
 
 @interface MGLStyle (Private)
 @property (nonatomic, weak) MGLMapView *mapView;
diff --git a/platform/darwin/src/NSDate+MGLAdditions.h b/platform/darwin/src/NSDate+MGLAdditions.h
index a116ef32d..918aae233 100644
--- a/platform/darwin/src/NSDate+MGLAdditions.h
+++ b/platform/darwin/src/NSDate+MGLAdditions.h
@@ -1,6 +1,5 @@
 #import <Foundation/Foundation.h>
 
-#include <mbgl/mbgl.hpp>
 #include <mbgl/util/chrono.hpp>
 
 @interface NSDate (MGLAdditions)
diff --git a/platform/glfw/glfw_view.hpp b/platform/glfw/glfw_view.hpp
index c640f188f..672fa2e13 100644
--- a/platform/glfw/glfw_view.hpp
+++ b/platform/glfw/glfw_view.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <mbgl/mbgl.hpp>
+#include <mbgl/map/map.hpp>
+#include <mbgl/map/view.hpp>
 #include <mbgl/map/backend.hpp>
 #include <mbgl/util/run_loop.hpp>
 #include <mbgl/util/timer.hpp>
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 98a1f768f..bff17fa0e 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -7,7 +7,7 @@
 #import <GLKit/GLKit.h>
 #import <OpenGLES/EAGL.h>
 
-#include <mbgl/mbgl.hpp>
+#include <mbgl/map/view.hpp>
 #include <mbgl/annotation/annotation.hpp>
 #include <mbgl/sprite/sprite_image.hpp>
 #include <mbgl/map/camera.hpp>
diff --git a/platform/ios/src/MGLMapView_Private.h b/platform/ios/src/MGLMapView_Private.h
index 5c74ba6dc..6b6a898f9 100644
--- a/platform/ios/src/MGLMapView_Private.h
+++ b/platform/ios/src/MGLMapView_Private.h
@@ -1,6 +1,6 @@
 #import <Mapbox/Mapbox.h>
 
-#include <mbgl/mbgl.hpp>
+#import <mbgl/map/map.hpp>
 
 /// Minimum size of an annotation’s accessibility element.
 extern const CGSize MGLAnnotationAccessibilityElementMinimumSize;
diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm
index 0feaa3d30..6442d73c7 100644
--- a/platform/macos/src/MGLMapView.mm
+++ b/platform/macos/src/MGLMapView.mm
@@ -18,7 +18,7 @@
 #import "MGLAnnotationImage.h"
 #import "MGLMapViewDelegate.h"
 
-#import <mbgl/mbgl.hpp>
+#import <mbgl/map/view.hpp>
 #import <mbgl/annotation/annotation.hpp>
 #import <mbgl/map/camera.hpp>
 #import <mbgl/storage/reachability.h>
diff --git a/platform/macos/src/MGLMapView_Private.h b/platform/macos/src/MGLMapView_Private.h
index 2d9fc52a6..cf813e0bf 100644
--- a/platform/macos/src/MGLMapView_Private.h
+++ b/platform/macos/src/MGLMapView_Private.h
@@ -1,6 +1,6 @@
 #import "MGLMapView.h"
 
-#import <mbgl/mbgl.hpp>
+#include <mbgl/map/map.hpp>
 
 @interface MGLMapView (Private)