[build] rework platform/default directory and add -files.txt for vendored libsupstream/build-changes

76 files changed, 855 insertions, 719 deletions

diff --git a/platform/android/config.cmake b/platform/android/config.cmake
index 8c94842de5..b553b5b8ab 100644
--- a/platform/android/config.cmake
+++ b/platform/android/config.cmake
@@ -38,7 +38,7 @@ macro(mbgl_platform_core)
     target_sources_from_file(mbgl-core PRIVATE platform/android/core-files.txt)
 
     target_include_directories(mbgl-core
-        PUBLIC platform/default
+        PUBLIC platform/default/include
         PRIVATE platform/android
     )
 
@@ -90,7 +90,7 @@ target_link_libraries(mapbox-gl
 set(MBGL_TEST_TARGET_TYPE "library")
 macro(mbgl_platform_test)
     target_sources(mbgl-test
-        PRIVATE platform/default/mbgl/test/main.cpp
+        PRIVATE platform/default/src/mbgl/test/main.cpp
 
         # Main test entry point
         platform/android/src/test/main.jni.cpp
diff --git a/platform/android/core-files.txt b/platform/android/core-files.txt
index 03735198a2..bc31c035c5 100644
--- a/platform/android/core-files.txt
+++ b/platform/android/core-files.txt
@@ -1,3 +1,6 @@
+# JNI overrides
+platform/default/include/jni/string_conversion.hpp
+
 # Loop
 platform/android/src/async_task.cpp
 platform/android/src/run_loop.cpp
@@ -12,14 +15,14 @@ platform/android/src/text/local_glyph_rasterizer_jni.hpp
 platform/android/src/logging_android.cpp
 platform/android/src/thread.cpp
 platform/android/src/string_util.cpp
-platform/default/bidi.cpp
-platform/default/thread_local.cpp
+platform/default/src/mbgl/text/bidi.cpp
+platform/default/src/mbgl/util/thread_local.cpp
 platform/android/src/unaccent.cpp
-platform/default/unaccent.hpp
-platform/default/utf.cpp
+platform/default/include/mbgl/text/unaccent.hpp
+platform/default/src/mbgl/util/utf.cpp
 
 # Image handling
-platform/default/png_writer.cpp
+platform/default/src/mbgl/util/png_writer.cpp
 platform/android/src/bitmap.cpp
 platform/android/src/bitmap.hpp
 platform/android/src/bitmap_factory.cpp
@@ -27,10 +30,10 @@ platform/android/src/bitmap_factory.hpp
 platform/android/src/image.cpp
 
 # Thread pool
-platform/default/mbgl/util/shared_thread_pool.cpp
-platform/default/mbgl/util/shared_thread_pool.hpp
-platform/default/mbgl/util/default_thread_pool.cpp
-platform/default/mbgl/util/default_thread_pool.hpp
+platform/default/src/mbgl/util/shared_thread_pool.cpp
+platform/default/include/mbgl/util/shared_thread_pool.hpp
+platform/default/src/mbgl/util/default_thread_pool.cpp
+platform/default/include/mbgl/util/default_thread_pool.hpp
 
 # Rendering
 platform/android/src/android_renderer_backend.cpp
@@ -39,12 +42,12 @@ platform/android/src/android_renderer_frontend.cpp
 platform/android/src/android_renderer_frontend.hpp
 
 # Snapshots (core)
-platform/default/mbgl/gl/headless_backend.cpp
-platform/default/mbgl/gl/headless_backend.hpp
-platform/default/mbgl/gl/headless_frontend.cpp
-platform/default/mbgl/gl/headless_frontend.hpp
-platform/default/mbgl/map/map_snapshotter.cpp
-platform/default/mbgl/map/map_snapshotter.hpp
+platform/default/src/mbgl/gl/headless_backend.cpp
+platform/default/include/mbgl/gl/headless_backend.hpp
+platform/default/src/mbgl/gl/headless_frontend.cpp
+platform/default/include/mbgl/gl/headless_frontend.hpp
+platform/default/src/mbgl/map/map_snapshotter.cpp
+platform/default/include/mbgl/map/map_snapshotter.hpp
 platform/linux/src/headless_backend_egl.cpp
 
 # Conversion C++ -> Java
@@ -74,7 +77,6 @@ platform/android/src/map/image.hpp
 platform/android/src/style/android_conversion.hpp
 platform/android/src/style/value.cpp
 platform/android/src/style/value.hpp
-platform/android/src/style/conversion/url_or_tileset.hpp
 
 # Style
 platform/android/src/style/transition_options.cpp
@@ -160,13 +162,13 @@ platform/android/src/geojson/line_string.hpp
 platform/android/src/geojson/multi_line_string.cpp
 platform/android/src/geojson/multi_line_string.hpp
 platform/android/src/geojson/multi_point.cpp
-platform/android/src/geojson/multi_point.hpp
 platform/android/src/geojson/multi_polygon.cpp
 platform/android/src/geojson/multi_polygon.hpp
 platform/android/src/geojson/point.cpp
 platform/android/src/geojson/point.hpp
 platform/android/src/geojson/polygon.cpp
 platform/android/src/geojson/polygon.hpp
+platform/android/src/geojson/util.hpp
 
 # Geometry
 platform/android/src/geometry/lat_lng.cpp
@@ -191,6 +193,7 @@ platform/android/src/gson/json_primitive.hpp
 # Annotation
 platform/android/src/annotation/marker.cpp
 platform/android/src/annotation/marker.hpp
+platform/android/src/annotation/multi_point.hpp
 platform/android/src/annotation/polygon.cpp
 platform/android/src/annotation/polygon.hpp
 platform/android/src/annotation/polyline.cpp
diff --git a/platform/android/filesource-files.txt b/platform/android/filesource-files.txt
index c88db6c725..2485e2a7ed 100644
--- a/platform/android/filesource-files.txt
+++ b/platform/android/filesource-files.txt
@@ -25,4 +25,4 @@ platform/android/src/offline/offline_region_status.cpp
 platform/android/src/offline/offline_region_status.hpp
 
 # Database
-platform/default/sqlite3.cpp
+platform/default/src/mbgl/storage/sqlite3.cpp
diff --git a/platform/android/src/file_source.cpp b/platform/android/src/file_source.cpp
index 9b639d2610..daddd0b9cd 100644
--- a/platform/android/src/file_source.cpp
+++ b/platform/android/src/file_source.cpp
@@ -6,7 +6,7 @@
 #include <mbgl/storage/resource_transform.hpp>
 #include <mbgl/util/logging.hpp>
 
-#include <sqlite3.hpp>
+#include <mbgl/storage/sqlite3.hpp>
 
 #include "asset_manager_file_source.hpp"
 
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp
index 8c1e45f7d3..45b3e02252 100755
--- a/platform/android/src/jni.cpp
+++ b/platform/android/src/jni.cpp
@@ -1,8 +1,6 @@
 #include "jni.hpp"
 
 #include <mbgl/util/logging.hpp>
-#include <src/style/formatted.hpp>
-#include <src/style/formatted_section.hpp>
 
 #include "annotation/marker.hpp"
 #include "annotation/polygon.hpp"
@@ -46,6 +44,8 @@
 #include "style/layers/layer_manager.hpp"
 #include "style/sources/source.hpp"
 #include "style/light.hpp"
+#include "style/formatted.hpp"
+#include "style/formatted_section.hpp"
 #include "snapshotter/map_snapshotter.hpp"
 #include "snapshotter/map_snapshot.hpp"
 #include "text/collator_jni.hpp"
diff --git a/platform/android/src/text/collator.cpp b/platform/android/src/text/collator.cpp
index 381851eff2..acb4f36ee1 100644
--- a/platform/android/src/text/collator.cpp
+++ b/platform/android/src/text/collator.cpp
@@ -2,7 +2,7 @@
 #include <mbgl/text/language_tag.hpp>
 #include <mbgl/util/platform.hpp>
 
-#include <unaccent.hpp>
+#include <mbgl/text/unaccent.hpp>
 
 #include <jni/jni.hpp>
 
diff --git a/platform/android/src/unaccent.cpp b/platform/android/src/unaccent.cpp
index bc2ec354d6..8da0ce4931 100644
--- a/platform/android/src/unaccent.cpp
+++ b/platform/android/src/unaccent.cpp
@@ -1,4 +1,4 @@
-#include <unaccent.hpp>
+#include <mbgl/text/unaccent.hpp>
 #include <string>
 #include "attach_env.hpp"
 #include "text/collator_jni.hpp"
diff --git a/platform/darwin/filesource-files.txt b/platform/darwin/filesource-files.txt
index 095bf4c6b0..eebb7a6e7c 100644
--- a/platform/darwin/filesource-files.txt
+++ b/platform/darwin/filesource-files.txt
@@ -3,4 +3,4 @@ platform/darwin/src/http_file_source.mm
 platform/darwin/src/MGLLoggingConfiguration.m
 
 # Database
-platform/default/sqlite3.cpp
+platform/default/src/mbgl/storage/sqlite3.cpp
diff --git a/platform/darwin/mbgl/gl/gl_impl.hpp b/platform/darwin/include/mbgl/gl/gl_impl.hpp
index 0db125c7b4..0db125c7b4 100644
--- a/platform/darwin/mbgl/gl/gl_impl.hpp
+++ b/platform/darwin/include/mbgl/gl/gl_impl.hpp
diff --git a/platform/darwin/mbgl/storage/reachability.h b/platform/darwin/include/mbgl/storage/reachability.h
index e38c9b1e20..e38c9b1e20 100644
--- a/platform/darwin/mbgl/storage/reachability.h
+++ b/platform/darwin/include/mbgl/storage/reachability.h
diff --git a/platform/darwin/mbgl/util/image+MGLAdditions.hpp b/platform/darwin/include/mbgl/util/image+MGLAdditions.hpp
index c5343af4de..c5343af4de 100644
--- a/platform/darwin/mbgl/util/image+MGLAdditions.hpp
+++ b/platform/darwin/include/mbgl/util/image+MGLAdditions.hpp
diff --git a/platform/darwin/mbgl/storage/reachability.m b/platform/darwin/src/reachability.m
index 2030e7ef71..2030e7ef71 100644
--- a/platform/darwin/mbgl/storage/reachability.m
+++ b/platform/darwin/src/reachability.m
diff --git a/platform/default/jni/string_conversion.hpp b/platform/default/include/jni/string_conversion.hpp
index 66df539f4e..66df539f4e 100644
--- a/platform/default/jni/string_conversion.hpp
+++ b/platform/default/include/jni/string_conversion.hpp
diff --git a/platform/default/mbgl/gl/headless_backend.hpp b/platform/default/include/mbgl/gl/headless_backend.hpp
index 7757037533..7757037533 100644
--- a/platform/default/mbgl/gl/headless_backend.hpp
+++ b/platform/default/include/mbgl/gl/headless_backend.hpp
diff --git a/platform/default/mbgl/gl/headless_frontend.hpp b/platform/default/include/mbgl/gl/headless_frontend.hpp
index 18f0cfa537..18f0cfa537 100644
--- a/platform/default/mbgl/gl/headless_frontend.hpp
+++ b/platform/default/include/mbgl/gl/headless_frontend.hpp
diff --git a/platform/default/mbgl/map/map_snapshotter.hpp b/platform/default/include/mbgl/map/map_snapshotter.hpp
index 2deb2b3cda..2deb2b3cda 100644
--- a/platform/default/mbgl/map/map_snapshotter.hpp
+++ b/platform/default/include/mbgl/map/map_snapshotter.hpp
diff --git a/platform/default/mbgl/storage/file_source_request.hpp b/platform/default/include/mbgl/storage/file_source_request.hpp
index 6bd0d44df6..6bd0d44df6 100644
--- a/platform/default/mbgl/storage/file_source_request.hpp
+++ b/platform/default/include/mbgl/storage/file_source_request.hpp
diff --git a/platform/default/mbgl/storage/merge_sideloaded.hpp b/platform/default/include/mbgl/storage/merge_sideloaded.hpp
index 494018c966..494018c966 100644
--- a/platform/default/mbgl/storage/merge_sideloaded.hpp
+++ b/platform/default/include/mbgl/storage/merge_sideloaded.hpp
diff --git a/platform/default/mbgl/storage/merge_sideloaded.js b/platform/default/include/mbgl/storage/merge_sideloaded.js
index 98d52eb8b3..98d52eb8b3 100644
--- a/platform/default/mbgl/storage/merge_sideloaded.js
+++ b/platform/default/include/mbgl/storage/merge_sideloaded.js
diff --git a/platform/default/mbgl/storage/merge_sideloaded.sql b/platform/default/include/mbgl/storage/merge_sideloaded.sql
index 55345a6f15..55345a6f15 100644
--- a/platform/default/mbgl/storage/merge_sideloaded.sql
+++ b/platform/default/include/mbgl/storage/merge_sideloaded.sql
diff --git a/platform/default/mbgl/storage/offline_database.hpp b/platform/default/include/mbgl/storage/offline_database.hpp
index 993f36a606..993f36a606 100644
--- a/platform/default/mbgl/storage/offline_database.hpp
+++ b/platform/default/include/mbgl/storage/offline_database.hpp
diff --git a/platform/default/mbgl/storage/offline_download.hpp b/platform/default/include/mbgl/storage/offline_download.hpp
index 1e77ff1d35..1e77ff1d35 100644
--- a/platform/default/mbgl/storage/offline_download.hpp
+++ b/platform/default/include/mbgl/storage/offline_download.hpp
diff --git a/platform/default/mbgl/storage/offline_schema.hpp b/platform/default/include/mbgl/storage/offline_schema.hpp
index e177d0dbd3..e177d0dbd3 100644
--- a/platform/default/mbgl/storage/offline_schema.hpp
+++ b/platform/default/include/mbgl/storage/offline_schema.hpp
diff --git a/platform/default/mbgl/storage/offline_schema.js b/platform/default/include/mbgl/storage/offline_schema.js
index fdb7dc6405..fdb7dc6405 100644
--- a/platform/default/mbgl/storage/offline_schema.js
+++ b/platform/default/include/mbgl/storage/offline_schema.js
diff --git a/platform/default/mbgl/storage/offline_schema.sql b/platform/default/include/mbgl/storage/offline_schema.sql
index 722b0e0451..722b0e0451 100644
--- a/platform/default/mbgl/storage/offline_schema.sql
+++ b/platform/default/include/mbgl/storage/offline_schema.sql
diff --git a/platform/default/sqlite3.hpp b/platform/default/include/mbgl/storage/sqlite3.hpp
index 33f735d904..44dc746075 100644
--- a/platform/default/sqlite3.hpp
+++ b/platform/default/include/mbgl/storage/sqlite3.hpp
@@ -72,10 +72,10 @@ void setTempPath(const std::string&);
 class Database {
 private:
     Database(std::unique_ptr<DatabaseImpl>);
-    Database(const Database &) = delete;
-    Database &operator=(const Database &) = delete;
 
 public:
+    Database(const Database &) = delete;
+    Database &operator=(const Database &) = delete;
     static mapbox::util::variant<Database, Exception> tryOpen(const std::string &filename, int flags = 0);
     static Database open(const std::string &filename, int flags = 0);
 
@@ -154,12 +154,11 @@ private:
 };
 
 class Transaction {
-private:
+public:
     Transaction(const Transaction&) = delete;
     Transaction(Transaction&&) = delete;
     Transaction& operator=(const Transaction&) = delete;
 
-public:
     enum Mode {
         Deferred,
         Immediate,
@@ -177,5 +176,5 @@ private:
     bool needRollback = true;
 };
 
-}
-}
+} // namespace sqlite
+} // namespace mapbox
diff --git a/platform/default/unaccent.hpp b/platform/default/include/mbgl/text/unaccent.hpp
index 85ac37a7de..85ac37a7de 100644
--- a/platform/default/unaccent.hpp
+++ b/platform/default/include/mbgl/text/unaccent.hpp
diff --git a/platform/default/mbgl/util/default_styles.hpp b/platform/default/include/mbgl/util/default_styles.hpp
index 13f08252a7..13f08252a7 100644
--- a/platform/default/mbgl/util/default_styles.hpp
+++ b/platform/default/include/mbgl/util/default_styles.hpp
diff --git a/platform/default/mbgl/util/default_thread_pool.hpp b/platform/default/include/mbgl/util/default_thread_pool.hpp
index a14d16d771..a14d16d771 100644
--- a/platform/default/mbgl/util/default_thread_pool.hpp
+++ b/platform/default/include/mbgl/util/default_thread_pool.hpp
diff --git a/platform/default/mbgl/util/shared_thread_pool.hpp b/platform/default/include/mbgl/util/shared_thread_pool.hpp
index 04a3cb58d5..04a3cb58d5 100644
--- a/platform/default/mbgl/util/shared_thread_pool.hpp
+++ b/platform/default/include/mbgl/util/shared_thread_pool.hpp
diff --git a/platform/default/mbgl/storage/.clang-tidy b/platform/default/mbgl/storage/.clang-tidy
deleted file mode 100644
index b4ecd26b95..0000000000
--- a/platform/default/mbgl/storage/.clang-tidy
+++ /dev/null
@@ -1,2 +0,0 @@
-Checks: 'modernize-*,misc-static-assert,llvm-namespace-comment,-clang-analyzer-security.insecureAPI.rand,-clang-analyzer-core.uninitialized.UndefReturn,-clang-analyzer-core.StackAddressEscape,-clang-analyzer-core.CallAndMessage,-clang-diagnostic-unused-command-line-argument,-clang-analyzer-core.uninitialized.*,-clang-analyzer-core.NullDereference,-clang-analyzer-cplusplus.NewDelete,-clang-analyzer-unix.MismatchedDeallocator,-clang-analyzer-unix.cstring.NullArg,-clang-analyzer-cplusplus.NewDeleteLeaks,-clang-analyzer-unix.Malloc,-clang-analyzer-core.NonNullParamChecker'
-HeaderFilterRegex: '\/mbgl\/'
diff --git a/platform/default/mbgl/gl/headless_backend.cpp b/platform/default/src/mbgl/gl/headless_backend.cpp
index ba08aecab7..ba08aecab7 100644
--- a/platform/default/mbgl/gl/headless_backend.cpp
+++ b/platform/default/src/mbgl/gl/headless_backend.cpp
diff --git a/platform/default/headless_backend_osmesa.cpp b/platform/default/src/mbgl/gl/headless_backend_osmesa.cpp
index 0da1caf9af..0da1caf9af 100644
--- a/platform/default/headless_backend_osmesa.cpp
+++ b/platform/default/src/mbgl/gl/headless_backend_osmesa.cpp
diff --git a/platform/default/mbgl/gl/headless_frontend.cpp b/platform/default/src/mbgl/gl/headless_frontend.cpp
index 37b0f91f32..37b0f91f32 100644
--- a/platform/default/mbgl/gl/headless_frontend.cpp
+++ b/platform/default/src/mbgl/gl/headless_frontend.cpp
diff --git a/platform/default/layer_manager.cpp b/platform/default/src/mbgl/layermanager/layer_manager.cpp
index 05d0f4d1ae..05d0f4d1ae 100644
--- a/platform/default/layer_manager.cpp
+++ b/platform/default/src/mbgl/layermanager/layer_manager.cpp
diff --git a/platform/default/mbgl/map/map_snapshotter.cpp b/platform/default/src/mbgl/map/map_snapshotter.cpp
index ae14b20721..ae14b20721 100644
--- a/platform/default/mbgl/map/map_snapshotter.cpp
+++ b/platform/default/src/mbgl/map/map_snapshotter.cpp
diff --git a/platform/default/asset_file_source.cpp b/platform/default/src/mbgl/storage/asset_file_source.cpp
index 7988654ae5..7988654ae5 100644
--- a/platform/default/asset_file_source.cpp
+++ b/platform/default/src/mbgl/storage/asset_file_source.cpp
diff --git a/platform/default/default_file_source.cpp b/platform/default/src/mbgl/storage/default_file_source.cpp
index cad68e7de9..cad68e7de9 100644
--- a/platform/default/default_file_source.cpp
+++ b/platform/default/src/mbgl/storage/default_file_source.cpp
diff --git a/platform/default/file_source_request.cpp b/platform/default/src/mbgl/storage/file_source_request.cpp
index 09ea8cc32a..09ea8cc32a 100644
--- a/platform/default/file_source_request.cpp
+++ b/platform/default/src/mbgl/storage/file_source_request.cpp
diff --git a/platform/default/http_file_source.cpp b/platform/default/src/mbgl/storage/http_file_source.cpp
index 213b53de98..213b53de98 100644
--- a/platform/default/http_file_source.cpp
+++ b/platform/default/src/mbgl/storage/http_file_source.cpp
diff --git a/platform/default/local_file_source.cpp b/platform/default/src/mbgl/storage/local_file_source.cpp
index 1b7b7b9278..1b7b7b9278 100644
--- a/platform/default/local_file_source.cpp
+++ b/platform/default/src/mbgl/storage/local_file_source.cpp
diff --git a/platform/default/mbgl/storage/offline.cpp b/platform/default/src/mbgl/storage/offline.cpp
index e1ec0acb31..e1ec0acb31 100644
--- a/platform/default/mbgl/storage/offline.cpp
+++ b/platform/default/src/mbgl/storage/offline.cpp
diff --git a/platform/default/mbgl/storage/offline_database.cpp b/platform/default/src/mbgl/storage/offline_database.cpp
index 28c1359106..7732076991 100644
--- a/platform/default/mbgl/storage/offline_database.cpp
+++ b/platform/default/src/mbgl/storage/offline_database.cpp
@@ -1,15 +1,15 @@
 #include <mbgl/storage/offline_database.hpp>
 #include <mbgl/storage/response.hpp>
+#include <mbgl/storage/sqlite3.hpp>
 #include <mbgl/util/compression.hpp>
 #include <mbgl/util/io.hpp>
 #include <mbgl/util/string.hpp>
 #include <mbgl/util/chrono.hpp>
 #include <mbgl/util/logging.hpp>
 
-#include "offline_schema.hpp"
-#include "merge_sideloaded.hpp"
+#include <mbgl/storage/offline_schema.hpp>
+#include <mbgl/storage/merge_sideloaded.hpp>
 
-#include "sqlite3.hpp"
 
 namespace mbgl {
 
diff --git a/platform/default/mbgl/storage/offline_download.cpp b/platform/default/src/mbgl/storage/offline_download.cpp
index c97797a5a2..c97797a5a2 100644
--- a/platform/default/mbgl/storage/offline_download.cpp
+++ b/platform/default/src/mbgl/storage/offline_download.cpp
diff --git a/platform/default/online_file_source.cpp b/platform/default/src/mbgl/storage/online_file_source.cpp
index fce1c3e2b6..fce1c3e2b6 100644
--- a/platform/default/online_file_source.cpp
+++ b/platform/default/src/mbgl/storage/online_file_source.cpp
diff --git a/platform/default/sqlite3.cpp b/platform/default/src/mbgl/storage/sqlite3.cpp
index f8a7daefe6..0017dc45db 100644
--- a/platform/default/sqlite3.cpp
+++ b/platform/default/src/mbgl/storage/sqlite3.cpp
@@ -1,4 +1,4 @@
-#include "sqlite3.hpp"
+#include <mbgl/storage/sqlite3.hpp>
 #include <sqlite3.h>
 
 #include <algorithm>
diff --git a/platform/default/mbgl/test/main.cpp b/platform/default/src/mbgl/test/main.cpp
index d01cf75ffc..d01cf75ffc 100644
--- a/platform/default/mbgl/test/main.cpp
+++ b/platform/default/src/mbgl/test/main.cpp
diff --git a/platform/default/bidi.cpp b/platform/default/src/mbgl/text/bidi.cpp
index 32a3dc23ef..32a3dc23ef 100644
--- a/platform/default/bidi.cpp
+++ b/platform/default/src/mbgl/text/bidi.cpp
diff --git a/platform/default/collator.cpp b/platform/default/src/mbgl/text/collator.cpp
index b7f256756e..400fa4d94d 100644
--- a/platform/default/collator.cpp
+++ b/platform/default/src/mbgl/text/collator.cpp
@@ -1,7 +1,7 @@
 #include <mbgl/style/expression/collator.hpp>
 #include <mbgl/util/platform.hpp>
 #include <libnu/strcoll.h>
-#include <unaccent.hpp>
+#include <mbgl/text/unaccent.hpp>
 
 /*
     The default implementation of Collator ignores locale.
diff --git a/platform/default/local_glyph_rasterizer.cpp b/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp
index 7866f29420..7866f29420 100644
--- a/platform/default/local_glyph_rasterizer.cpp
+++ b/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp
diff --git a/platform/default/unaccent.cpp b/platform/default/src/mbgl/text/unaccent.cpp
index faefb4b4cd..37b9a0d9ca 100644
--- a/platform/default/unaccent.cpp
+++ b/platform/default/src/mbgl/text/unaccent.cpp
@@ -1,6 +1,6 @@
 #include <mbgl/util/platform.hpp>
 #include <libnu/unaccent.h>
-#include <unaccent.hpp>
+#include <mbgl/text/unaccent.hpp>
 
 #include <cstring>
 #include <sstream>
diff --git a/platform/default/async_task.cpp b/platform/default/src/mbgl/util/async_task.cpp
index 50891056d8..50891056d8 100644
--- a/platform/default/async_task.cpp
+++ b/platform/default/src/mbgl/util/async_task.cpp
diff --git a/platform/default/mbgl/util/default_thread_pool.cpp b/platform/default/src/mbgl/util/default_thread_pool.cpp
index d3950bb8aa..d3950bb8aa 100644
--- a/platform/default/mbgl/util/default_thread_pool.cpp
+++ b/platform/default/src/mbgl/util/default_thread_pool.cpp
diff --git a/platform/default/image.cpp b/platform/default/src/mbgl/util/image.cpp
index 25063892b7..25063892b7 100644
--- a/platform/default/image.cpp
+++ b/platform/default/src/mbgl/util/image.cpp
diff --git a/platform/default/jpeg_reader.cpp b/platform/default/src/mbgl/util/jpeg_reader.cpp
index 5f613f9423..5f613f9423 100644
--- a/platform/default/jpeg_reader.cpp
+++ b/platform/default/src/mbgl/util/jpeg_reader.cpp
diff --git a/platform/default/logging_stderr.cpp b/platform/default/src/mbgl/util/logging_stderr.cpp
index 41585fb7bb..41585fb7bb 100644
--- a/platform/default/logging_stderr.cpp
+++ b/platform/default/src/mbgl/util/logging_stderr.cpp
diff --git a/platform/default/png_reader.cpp b/platform/default/src/mbgl/util/png_reader.cpp
index 4d4ee29d1f..4d4ee29d1f 100644
--- a/platform/default/png_reader.cpp
+++ b/platform/default/src/mbgl/util/png_reader.cpp
diff --git a/platform/default/png_writer.cpp b/platform/default/src/mbgl/util/png_writer.cpp
index b89e253f85..b89e253f85 100644
--- a/platform/default/png_writer.cpp
+++ b/platform/default/src/mbgl/util/png_writer.cpp
diff --git a/platform/default/run_loop.cpp b/platform/default/src/mbgl/util/run_loop.cpp
index 868ee72114..868ee72114 100644
--- a/platform/default/run_loop.cpp
+++ b/platform/default/src/mbgl/util/run_loop.cpp
diff --git a/platform/default/mbgl/util/shared_thread_pool.cpp b/platform/default/src/mbgl/util/shared_thread_pool.cpp
index 7a42df21de..d7facbab94 100644
--- a/platform/default/mbgl/util/shared_thread_pool.cpp
+++ b/platform/default/src/mbgl/util/shared_thread_pool.cpp
@@ -1,4 +1,4 @@
-#include "shared_thread_pool.hpp"
+#include <mbgl/util/shared_thread_pool.hpp>
 
 namespace mbgl {
 
diff --git a/platform/default/string_stdlib.cpp b/platform/default/src/mbgl/util/string_stdlib.cpp
index 103444df1c..103444df1c 100644
--- a/platform/default/string_stdlib.cpp
+++ b/platform/default/src/mbgl/util/string_stdlib.cpp
diff --git a/platform/default/thread.cpp b/platform/default/src/mbgl/util/thread.cpp
index c7c79b4fb0..c7c79b4fb0 100644
--- a/platform/default/thread.cpp
+++ b/platform/default/src/mbgl/util/thread.cpp
diff --git a/platform/default/thread_local.cpp b/platform/default/src/mbgl/util/thread_local.cpp
index db70773c12..db70773c12 100644
--- a/platform/default/thread_local.cpp
+++ b/platform/default/src/mbgl/util/thread_local.cpp
diff --git a/platform/default/timer.cpp b/platform/default/src/mbgl/util/timer.cpp
index 90a85bfc1f..90a85bfc1f 100644
--- a/platform/default/timer.cpp
+++ b/platform/default/src/mbgl/util/timer.cpp
diff --git a/platform/default/utf.cpp b/platform/default/src/mbgl/util/utf.cpp
index f0f9d3e67a..f0f9d3e67a 100644
--- a/platform/default/utf.cpp
+++ b/platform/default/src/mbgl/util/utf.cpp
diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake
index 320ef7e73b..98a8b48a05 100644
--- a/platform/ios/config.cmake
+++ b/platform/ios/config.cmake
@@ -20,49 +20,11 @@ initialize_ios_target(mbgl-loop-darwin)
 macro(mbgl_platform_core)
     initialize_ios_target(mbgl-core)
 
-    target_sources(mbgl-core
-        # Default styles
-        PRIVATE platform/default/mbgl/util/default_styles.hpp
-
-        # Misc
-        PRIVATE platform/darwin/mbgl/storage/reachability.h
-        PRIVATE platform/darwin/mbgl/storage/reachability.m
-        PRIVATE platform/darwin/src/CFHandle.hpp
-        PRIVATE platform/darwin/src/collator.mm
-        PRIVATE platform/darwin/src/local_glyph_rasterizer.mm
-        PRIVATE platform/darwin/src/logging_nslog.mm
-        PRIVATE platform/darwin/src/nsthread.mm
-        PRIVATE platform/darwin/src/string_nsstring.mm
-        PRIVATE platform/default/bidi.cpp
-        PRIVATE platform/default/thread_local.cpp
-        PRIVATE platform/default/utf.cpp
-
-        # Image handling
-        PRIVATE platform/darwin/mbgl/util/image+MGLAdditions.hpp
-        PRIVATE platform/darwin/src/image.mm
-        PRIVATE platform/default/png_writer.cpp
-
-        # Headless view
-        PRIVATE platform/default/mbgl/gl/headless_frontend.cpp
-        PRIVATE platform/default/mbgl/gl/headless_frontend.hpp
-        PRIVATE platform/default/mbgl/gl/headless_backend.cpp
-        PRIVATE platform/default/mbgl/gl/headless_backend.hpp
-        PRIVATE platform/darwin/src/headless_backend_eagl.mm
-
-        # Snapshotting
-        PRIVATE platform/default/mbgl/map/map_snapshotter.cpp
-        PRIVATE platform/default/mbgl/map/map_snapshotter.hpp
-
-        # Thread pool
-        PRIVATE platform/default/mbgl/util/shared_thread_pool.cpp
-        PRIVATE platform/default/mbgl/util/shared_thread_pool.hpp
-        PRIVATE platform/default/mbgl/util/default_thread_pool.cpp
-        PRIVATE platform/default/mbgl/util/default_thread_pool.cpp
-    )
+    target_sources_from_file(mbgl-core PRIVATE platform/ios/core-files.txt)
 
     target_include_directories(mbgl-core
-        PUBLIC platform/darwin
-        PUBLIC platform/default
+        PUBLIC platform/darwin/include
+        PUBLIC platform/default/include
     )
 
     target_link_libraries(mbgl-core
diff --git a/platform/ios/core-files.txt b/platform/ios/core-files.txt
index b1e708e727..fa6d263d00 100644
--- a/platform/ios/core-files.txt
+++ b/platform/ios/core-files.txt
@@ -1,320 +1,36 @@
-# This file is generated. Do not edit. Regenerate this with scripts/generate-cmake-files.js
-
-# SDK
-platform/ios/src/Mapbox.h
-
-# SDK/Foundation
-platform/darwin/src/MGLAccountManager.h
-platform/darwin/src/MGLAccountManager.m
-platform/darwin/src/MGLAccountManager_Private.h
-platform/darwin/src/MGLAttributionInfo.h
-platform/darwin/src/MGLAttributionInfo.mm
-platform/darwin/src/MGLAttributionInfo_Private.h
-platform/darwin/src/MGLFoundation.h
-platform/darwin/src/MGLFoundation.mm
-platform/darwin/src/MGLFoundation_Private.h
-platform/darwin/src/MGLLocationManager.h
-platform/darwin/src/MGLLocationManager.m
-platform/darwin/src/MGLLocationManager_Private.h
-platform/darwin/src/MGLLoggingConfiguration.h
-platform/darwin/src/MGLLoggingConfiguration.m
-platform/darwin/src/MGLLoggingConfiguration_Private.h
-platform/darwin/src/MGLMapCamera.h
-platform/darwin/src/MGLMapCamera.mm
-platform/darwin/src/MGLMapSnapshotter.h
-platform/darwin/src/MGLMapSnapshotter.mm
-platform/darwin/src/MGLNetworkConfiguration.h
-platform/darwin/src/MGLNetworkConfiguration.m
-platform/darwin/src/MGLRendererConfiguration.h
-platform/darwin/src/MGLRendererConfiguration.mm
-platform/darwin/src/MGLRendererFrontend.h
-platform/darwin/src/MGLStyle.h
-platform/darwin/src/MGLStyle.mm
-platform/darwin/src/MGLStyle_Private.h
-platform/darwin/src/MGLTypes.h
-platform/darwin/src/MGLTypes.m
-platform/darwin/src/MGLValueEvaluator.h
-
-# SDK/Foundation/Categories
-platform/darwin/src/NSArray+MGLAdditions.h
-platform/darwin/src/NSArray+MGLAdditions.mm
-platform/darwin/src/NSBundle+MGLAdditions.h
-platform/darwin/src/NSBundle+MGLAdditions.m
-platform/darwin/src/NSComparisonPredicate+MGLAdditions.h
-platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm
-platform/darwin/src/NSCompoundPredicate+MGLAdditions.h
-platform/darwin/src/NSCompoundPredicate+MGLAdditions.mm
-platform/darwin/src/NSData+MGLAdditions.h
-platform/darwin/src/NSData+MGLAdditions.mm
-platform/darwin/src/NSDate+MGLAdditions.h
-platform/darwin/src/NSDate+MGLAdditions.mm
-platform/darwin/src/NSDictionary+MGLAdditions.h
-platform/darwin/src/NSDictionary+MGLAdditions.mm
-platform/darwin/src/NSException+MGLAdditions.h
-platform/darwin/src/NSExpression+MGLAdditions.h
-platform/darwin/src/NSExpression+MGLAdditions.mm
-platform/darwin/src/NSExpression+MGLPrivateAdditions.h
-platform/darwin/src/NSPredicate+MGLAdditions.h
-platform/darwin/src/NSPredicate+MGLAdditions.mm
-platform/darwin/src/NSPredicate+MGLPrivateAdditions.h
-platform/darwin/src/NSProcessInfo+MGLAdditions.h
-platform/darwin/src/NSProcessInfo+MGLAdditions.m
-platform/darwin/src/NSString+MGLAdditions.h
-platform/darwin/src/NSString+MGLAdditions.m
-platform/darwin/src/NSURL+MGLAdditions.h
-platform/darwin/src/NSURL+MGLAdditions.m
-platform/darwin/src/NSValue+MGLAdditions.h
-platform/darwin/src/NSValue+MGLAdditions.m
-
-# SDK/Foundation/Formatters
-platform/darwin/src/MGLClockDirectionFormatter.h
-platform/darwin/src/MGLClockDirectionFormatter.m
-platform/darwin/src/MGLCompassDirectionFormatter.h
-platform/darwin/src/MGLCompassDirectionFormatter.m
-platform/darwin/src/MGLCoordinateFormatter.h
-platform/darwin/src/MGLCoordinateFormatter.m
-platform/darwin/src/MGLDistanceFormatter.h
-platform/darwin/src/MGLDistanceFormatter.m
-
-# SDK/Foundation/Geometry
-platform/darwin/src/MGLAnnotation.h
-platform/darwin/src/MGLFeature.h
-platform/darwin/src/MGLFeature.mm
-platform/darwin/src/MGLFeature_Private.h
-platform/darwin/src/MGLGeometry.h
-platform/darwin/src/MGLGeometry.mm
-platform/darwin/src/MGLGeometry_Private.h
-platform/darwin/src/MGLMultiPoint.h
-platform/darwin/src/MGLMultiPoint.mm
-platform/darwin/src/MGLMultiPoint_Private.h
-platform/darwin/src/MGLOverlay.h
-platform/darwin/src/MGLPointAnnotation.h
-platform/darwin/src/MGLPointAnnotation.mm
-platform/darwin/src/MGLPointCollection.h
-platform/darwin/src/MGLPointCollection.mm
-platform/darwin/src/MGLPointCollection_Private.h
-platform/darwin/src/MGLPolygon.h
-platform/darwin/src/MGLPolygon.mm
-platform/darwin/src/MGLPolygon_Private.h
-platform/darwin/src/MGLPolyline.h
-platform/darwin/src/MGLPolyline.mm
-platform/darwin/src/MGLPolyline_Private.h
-platform/darwin/src/MGLShape.h
-platform/darwin/src/MGLShape.mm
-platform/darwin/src/MGLShapeCollection.h
-platform/darwin/src/MGLShapeCollection.mm
-platform/darwin/src/MGLShape_Private.h
-
-# SDK/Foundation/Offline Maps
-platform/darwin/src/MGLOfflinePack.h
-platform/darwin/src/MGLOfflinePack.mm
-platform/darwin/src/MGLOfflinePack_Private.h
-platform/darwin/src/MGLOfflineRegion.h
-platform/darwin/src/MGLOfflineRegion_Private.h
-platform/darwin/src/MGLOfflineStorage.h
-platform/darwin/src/MGLOfflineStorage.mm
-platform/darwin/src/MGLOfflineStorage_Private.h
-platform/darwin/src/MGLShapeOfflineRegion.h
-platform/darwin/src/MGLShapeOfflineRegion.mm
-platform/darwin/src/MGLShapeOfflineRegion_Private.h
-platform/darwin/src/MGLTilePyramidOfflineRegion.h
-platform/darwin/src/MGLTilePyramidOfflineRegion.mm
-platform/darwin/src/MGLTilePyramidOfflineRegion_Private.h
-
-# SDK/Foundation/Styling
-platform/darwin/src/MGLConversion.h
-platform/darwin/src/MGLLight.h
-platform/darwin/src/MGLLight.mm
-platform/darwin/src/MGLLight_Private.h
-platform/darwin/src/MGLStyleValue.h
-platform/darwin/src/MGLStyleValue.mm
-platform/darwin/src/MGLStyleValue_Private.h
-
-# SDK/Foundation/Styling/Categories
-platform/darwin/src/NSValue+MGLStyleAttributeAdditions.h
-platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm
-
-# SDK/Foundation/Styling/Layers
-platform/darwin/src/MGLBackgroundStyleLayer.h
-platform/darwin/src/MGLBackgroundStyleLayer.mm
-platform/darwin/src/MGLBackgroundStyleLayer_Private.h
-platform/darwin/src/MGLCircleStyleLayer.h
-platform/darwin/src/MGLCircleStyleLayer.mm
-platform/darwin/src/MGLCircleStyleLayer_Private.h
-platform/darwin/src/MGLFillExtrusionStyleLayer.h
-platform/darwin/src/MGLFillExtrusionStyleLayer.mm
-platform/darwin/src/MGLFillExtrusionStyleLayer_Private.h
-platform/darwin/src/MGLFillStyleLayer.h
-platform/darwin/src/MGLFillStyleLayer.mm
-platform/darwin/src/MGLFillStyleLayer_Private.h
-platform/darwin/src/MGLForegroundStyleLayer.h
-platform/darwin/src/MGLForegroundStyleLayer.mm
-platform/darwin/src/MGLHeatmapStyleLayer.h
-platform/darwin/src/MGLHeatmapStyleLayer.mm
-platform/darwin/src/MGLHeatmapStyleLayer_Private.h
-platform/darwin/src/MGLHillshadeStyleLayer.h
-platform/darwin/src/MGLHillshadeStyleLayer.mm
-platform/darwin/src/MGLHillshadeStyleLayer_Private.h
-platform/darwin/src/MGLLineStyleLayer.h
-platform/darwin/src/MGLLineStyleLayer.mm
-platform/darwin/src/MGLLineStyleLayer_Private.h
-platform/darwin/src/MGLOpenGLStyleLayer.h
-platform/darwin/src/MGLOpenGLStyleLayer.mm
-platform/darwin/src/MGLOpenGLStyleLayer_Private.h
-platform/darwin/src/MGLRasterStyleLayer.h
-platform/darwin/src/MGLRasterStyleLayer.mm
-platform/darwin/src/MGLRasterStyleLayer_Private.h
-platform/darwin/src/MGLStyleLayer.h
-platform/darwin/src/MGLStyleLayer.mm
-platform/darwin/src/MGLStyleLayerManager.h
-platform/darwin/src/MGLStyleLayerManager.mm
-platform/darwin/src/MGLStyleLayer_Private.h
-platform/darwin/src/MGLSymbolStyleLayer.h
-platform/darwin/src/MGLSymbolStyleLayer.mm
-platform/darwin/src/MGLSymbolStyleLayer_Private.h
-platform/darwin/src/MGLVectorStyleLayer.h
-platform/darwin/src/MGLVectorStyleLayer.m
-
-# SDK/Foundation/Styling/Sources
-platform/darwin/src/MGLComputedShapeSource.h
-platform/darwin/src/MGLComputedShapeSource.mm
-platform/darwin/src/MGLComputedShapeSource_Private.h
-platform/darwin/src/MGLImageSource.h
-platform/darwin/src/MGLImageSource.mm
-platform/darwin/src/MGLRasterDEMSource.h
-platform/darwin/src/MGLRasterDEMSource.mm
-platform/darwin/src/MGLRasterTileSource.h
-platform/darwin/src/MGLRasterTileSource.mm
-platform/darwin/src/MGLRasterTileSource_Private.h
-platform/darwin/src/MGLShapeSource.h
-platform/darwin/src/MGLShapeSource.mm
-platform/darwin/src/MGLShapeSource_Private.h
-platform/darwin/src/MGLSource.h
-platform/darwin/src/MGLSource.mm
-platform/darwin/src/MGLSource_Private.h
-platform/darwin/src/MGLTileSource.h
-platform/darwin/src/MGLTileSource.mm
-platform/darwin/src/MGLTileSource_Private.h
-platform/darwin/src/MGLVectorTileSource.h
-platform/darwin/src/MGLVectorTileSource.mm
-platform/darwin/src/MGLVectorTileSource_Private.h
-
-# SDK/Kit
-platform/ios/src/MGLCameraChangeReason.h
-platform/ios/src/MGLMapAccessibilityElement.h
-platform/ios/src/MGLMapAccessibilityElement.mm
-platform/ios/src/MGLMapView+IBAdditions.h
-platform/ios/src/MGLMapView.h
-platform/ios/src/MGLMapView.mm
-platform/ios/src/MGLMapViewDelegate.h
-platform/ios/src/MGLMapView_Private.h
-
-# SDK/Kit/Annotations
-platform/ios/src/MGLAnnotationContainerView.h
-platform/ios/src/MGLAnnotationContainerView.m
-platform/ios/src/MGLAnnotationContainerView_Private.h
-platform/ios/src/MGLAnnotationImage.h
-platform/ios/src/MGLAnnotationImage.m
-platform/ios/src/MGLAnnotationImage_Private.h
-platform/ios/src/MGLAnnotationView.h
-platform/ios/src/MGLAnnotationView.mm
-platform/ios/src/MGLAnnotationView_Private.h
-platform/ios/src/MGLCalloutView.h
-platform/ios/src/MGLCompactCalloutView.h
-platform/ios/src/MGLCompactCalloutView.m
-platform/ios/src/MGLFaux3DUserLocationAnnotationView.h
-platform/ios/src/MGLFaux3DUserLocationAnnotationView.m
-platform/ios/src/MGLUserLocation.h
-platform/ios/src/MGLUserLocation.m
-platform/ios/src/MGLUserLocationAnnotationView.h
-platform/ios/src/MGLUserLocationAnnotationView.m
-platform/ios/src/MGLUserLocationAnnotationView_Private.h
-platform/ios/src/MGLUserLocationHeadingArrowLayer.h
-platform/ios/src/MGLUserLocationHeadingArrowLayer.m
-platform/ios/src/MGLUserLocationHeadingBeamLayer.h
-platform/ios/src/MGLUserLocationHeadingBeamLayer.m
-platform/ios/src/MGLUserLocationHeadingIndicator.h
-platform/ios/src/MGLUserLocation_Private.h
-
-# SDK/Kit/Categories
-platform/darwin/src/NSCoder+MGLAdditions.h
-platform/darwin/src/NSCoder+MGLAdditions.mm
-platform/ios/src/NSOrthography+MGLAdditions.h
-platform/ios/src/NSOrthography+MGLAdditions.m
-platform/ios/src/UIColor+MGLAdditions.h
-platform/ios/src/UIColor+MGLAdditions.mm
-platform/ios/src/UIDevice+MGLAdditions.h
-platform/ios/src/UIDevice+MGLAdditions.m
-platform/ios/src/UIImage+MGLAdditions.h
-platform/ios/src/UIImage+MGLAdditions.mm
-platform/ios/src/UIViewController+MGLAdditions.h
-platform/ios/src/UIViewController+MGLAdditions.m
-
-# SDK/Kit/SMCalloutView
-platform/ios/vendor/SMCalloutView/SMCalloutView.h
-platform/ios/vendor/SMCalloutView/SMCalloutView.m
-
-# SDK/Kit/Telemetry
-platform/ios/src/MGLTelemetryConfig.h
-platform/ios/src/MGLTelemetryConfig.m
-
-# SDK/Kit/Telemetry/Development
-platform/ios/src/MGLSDKUpdateChecker.h
-platform/ios/src/MGLSDKUpdateChecker.mm
-
-# SDK/Kit/Telemetry/Runtime
-platform/ios/src/MGLMapboxEvents.h
-platform/ios/src/MGLMapboxEvents.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/CLLocation+MMEMobileEvents.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEAPIClient.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMECategoryLoader.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMECommonEventData.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEConfigurator.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEConstants.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEDependencyManager.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEDispatchManager.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEvent.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEventLogReportViewController.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEventLogger.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEventsConfiguration.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEventsManager.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEHashProvider.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMELocationManager.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEMetrics.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEMetricsManager.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMENSDateWrapper.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMENSURLSessionWrapper.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMETimerManager.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMETrustKitProvider.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMETypes.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEUIApplicationWrapper.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEUINavigation.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEUniqueIdentifier.m
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/NSData+MMEGZIP.m
-
-# SDK/Kit/Telemetry/Runtime/Reachability
-platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/Reachability/MMEReachability.m
-
-# SDK/Kit/Telemetry/Runtime/TrustKit
-platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TSKPinningValidator.m
-platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TSKPinningValidatorResult.m
-platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TSKTrustKitConfig.m
-platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TrustKit.m
-platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/configuration_utils.m
-platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/parse_configuration.m
-
-# SDK/Kit/Telemetry/Runtime/TrustKit/Pinning
-platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Pinning/TSKSPKIHashCache.m
-platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Pinning/ssl_pin_verifier.m
-
-# SDK/Kit/Telemetry/Runtime/TrustKit/Reporting
-platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/TSKBackgroundReporter.m
-platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/TSKPinFailureReport.m
-platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/TSKReportsRateLimiter.m
-platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/reporting_utils.m
-platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/vendor_identifier.m
-
-# SDK/Kit/Views
-platform/ios/src/MGLScaleBar.h
-platform/ios/src/MGLScaleBar.mm
-
+platform/default/include/mbgl/util/default_styles.hpp
+
+# Misc
+platform/darwin/include/mbgl/storage/reachability.h
+platform/darwin/src/reachability.m
+platform/darwin/src/CFHandle.hpp
+platform/darwin/src/collator.mm
+platform/darwin/src/local_glyph_rasterizer.mm
+platform/darwin/src/logging_nslog.mm
+platform/darwin/src/nsthread.mm
+platform/darwin/src/string_nsstring.mm
+platform/default/src/mbgl/text/bidi.cpp
+platform/default/src/mbgl/util/thread_local.cpp
+platform/default/src/mbgl/util/utf.cpp
+
+# Image handling
+platform/darwin/include/mbgl/util/image+MGLAdditions.hpp
+platform/darwin/src/image.mm
+platform/default/src/mbgl/util/png_writer.cpp
+
+# Headless view
+platform/default/src/mbgl/gl/headless_frontend.cpp
+platform/default/include/mbgl/gl/headless_frontend.hpp
+platform/default/src/mbgl/gl/headless_backend.cpp
+platform/default/include/mbgl/gl/headless_backend.hpp
+platform/darwin/src/headless_backend_eagl.mm
+
+# Snapshotting
+platform/default/src/mbgl/map/map_snapshotter.cpp
+platform/default/include/mbgl/map/map_snapshotter.hpp
+
+# Thread pool
+platform/default/src/mbgl/util/shared_thread_pool.cpp
+platform/default/include/mbgl/util/shared_thread_pool.hpp
+platform/default/src/mbgl/util/default_thread_pool.cpp
+platform/default/include/mbgl/util/default_thread_pool.hpp
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj
index b2d43f502b..77cf0dd6d9 100644
--- a/platform/ios/ios.xcodeproj/project.pbxproj
+++ b/platform/ios/ios.xcodeproj/project.pbxproj
@@ -298,6 +298,53 @@
 		55D120A61F791007004B6D81 /* libmbgl-loop-darwin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 55D120A71F791007004B6D81 /* libmbgl-loop-darwin.a */; };
 		55D120A81F79100C004B6D81 /* libmbgl-filesource.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 55D120A91F79100C004B6D81 /* libmbgl-filesource.a */; };
 		55E2AD131E5B125400E8C587 /* MGLOfflineStorageTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 55E2AD121E5B125400E8C587 /* MGLOfflineStorageTests.mm */; };
+		55E5663F21C2A0920008B8B5 /* configuration_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C0F1FE05F3600C1BD0D /* configuration_utils.h */; };
+		55E5664021C2A0920008B8B5 /* parse_configuration.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C131FE05F3600C1BD0D /* parse_configuration.h */; };
+		55E5664121C2A0920008B8B5 /* ssl_pin_verifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C161FE05F3600C1BD0D /* ssl_pin_verifier.h */; };
+		55E5664221C2A0920008B8B5 /* TSKPublicKeyAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C181FE05F3600C1BD0D /* TSKPublicKeyAlgorithm.h */; };
+		55E5664321C2A0920008B8B5 /* TSKSPKIHashCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C191FE05F3600C1BD0D /* TSKSPKIHashCache.h */; };
+		55E5664421C2A0920008B8B5 /* reporting_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C1C1FE05F3600C1BD0D /* reporting_utils.h */; };
+		55E5664521C2A0930008B8B5 /* TSKBackgroundReporter.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C1E1FE05F3600C1BD0D /* TSKBackgroundReporter.h */; };
+		55E5664621C2A0930008B8B5 /* TSKPinFailureReport.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C201FE05F3600C1BD0D /* TSKPinFailureReport.h */; };
+		55E5664721C2A0930008B8B5 /* TSKReportsRateLimiter.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C221FE05F3600C1BD0D /* TSKReportsRateLimiter.h */; };
+		55E5664821C2A0930008B8B5 /* vendor_identifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C241FE05F3600C1BD0D /* vendor_identifier.h */; };
+		55E5664921C2A0930008B8B5 /* TrustKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C261FE05F3600C1BD0D /* TrustKit.h */; };
+		55E5664A21C2A0930008B8B5 /* TSKLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C281FE05F3600C1BD0D /* TSKLog.h */; };
+		55E5664B21C2A0930008B8B5 /* TSKPinningValidator.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C291FE05F3600C1BD0D /* TSKPinningValidator.h */; };
+		55E5664C21C2A0930008B8B5 /* TSKPinningValidator_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C2B1FE05F3600C1BD0D /* TSKPinningValidator_Private.h */; };
+		55E5664D21C2A0930008B8B5 /* TSKPinningValidatorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C2C1FE05F3600C1BD0D /* TSKPinningValidatorCallback.h */; };
+		55E5664E21C2A0930008B8B5 /* TSKPinningValidatorResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C2D1FE05F3600C1BD0D /* TSKPinningValidatorResult.h */; };
+		55E5664F21C2A0930008B8B5 /* TSKTrustDecision.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C2F1FE05F3600C1BD0D /* TSKTrustDecision.h */; };
+		55E5665021C2A0930008B8B5 /* TSKTrustKitConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834C301FE05F3600C1BD0D /* TSKTrustKitConfig.h */; };
+		55E5665121C2A1C20008B8B5 /* MMEReachability.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BCC1FE05D7100C1BD0D /* MMEReachability.h */; };
+		55E5665221C2A2080008B8B5 /* MMENamespacedDependencies.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BC81FE05D7000C1BD0D /* MMENamespacedDependencies.h */; };
+		55E5665321C2A2080008B8B5 /* MapboxMobileEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BAC1FE05D6C00C1BD0D /* MapboxMobileEvents.h */; };
+		55E5665421C2A2080008B8B5 /* CLLocation+MMEMobileEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BC21FE05D6F00C1BD0D /* CLLocation+MMEMobileEvents.h */; };
+		55E5665521C2A2080008B8B5 /* MMEAPIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BAB1FE05D6C00C1BD0D /* MMEAPIClient.h */; };
+		55E5665621C2A2080008B8B5 /* MMECategoryLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BB51FE05D6D00C1BD0D /* MMECategoryLoader.h */; };
+		55E5665721C2A2080008B8B5 /* MMECommonEventData.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BAE1FE05D6C00C1BD0D /* MMECommonEventData.h */; };
+		55E5665821C2A2080008B8B5 /* MMEConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BB01FE05D6C00C1BD0D /* MMEConstants.h */; };
+		55E5665921C2A2080008B8B5 /* MMEDependencyManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BB11FE05D6D00C1BD0D /* MMEDependencyManager.h */; };
+		55E5665A21C2A2080008B8B5 /* MMEEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BBA1FE05D6E00C1BD0D /* MMEEvent.h */; };
+		55E5665B21C2A2080008B8B5 /* MMEEventLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BA61FE05D6B00C1BD0D /* MMEEventLogger.h */; };
+		55E5665C21C2A2080008B8B5 /* MMEEventLogReportViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 406E99B51FFEFED600D9FFCC /* MMEEventLogReportViewController.h */; };
+		55E5665D21C2A2080008B8B5 /* MMEEventsConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BBB1FE05D6E00C1BD0D /* MMEEventsConfiguration.h */; };
+		55E5665E21C2A2080008B8B5 /* MMEHashProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = ACA65F4A214066AB00537748 /* MMEHashProvider.h */; };
+		55E5665F21C2A2080008B8B5 /* MMETrustKitProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = ACA65F442140667D00537748 /* MMETrustKitProvider.h */; };
+		55E5666021C2A2080008B8B5 /* MMEConfigurator.h in Headers */ = {isa = PBXBuildFile; fileRef = ACA65F4F214066E200537748 /* MMEConfigurator.h */; };
+		55E5666121C2A2080008B8B5 /* MMEEventsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BA31FE05D6B00C1BD0D /* MMEEventsManager.h */; };
+		55E5666221C2A2080008B8B5 /* MMELocationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BB31FE05D6D00C1BD0D /* MMELocationManager.h */; };
+		55E5666321C2A2080008B8B5 /* MMEMetrics.h in Headers */ = {isa = PBXBuildFile; fileRef = ACD024552187EAAF00D8C8A7 /* MMEMetrics.h */; };
+		55E5666421C2A2080008B8B5 /* MMEMetricsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = ACD024562187EAAF00D8C8A7 /* MMEMetricsManager.h */; };
+		55E5666521C2A2080008B8B5 /* MMENSDateWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BC51FE05D6F00C1BD0D /* MMENSDateWrapper.h */; };
+		55E5666621C2A2080008B8B5 /* MMENSURLSessionWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BAA1FE05D6C00C1BD0D /* MMENSURLSessionWrapper.h */; };
+		55E5666721C2A2080008B8B5 /* MMETimerManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BC91FE05D7000C1BD0D /* MMETimerManager.h */; };
+		55E5666821C2A2080008B8B5 /* MMETypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BB61FE05D6D00C1BD0D /* MMETypes.h */; };
+		55E5666921C2A2080008B8B5 /* MMEUIApplicationWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BBE1FE05D6E00C1BD0D /* MMEUIApplicationWrapper.h */; };
+		55E5666A21C2A2080008B8B5 /* MMEUINavigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 406E99B31FFEFED600D9FFCC /* MMEUINavigation.h */; };
+		55E5666B21C2A2080008B8B5 /* MMEUniqueIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BBF1FE05D6E00C1BD0D /* MMEUniqueIdentifier.h */; };
+		55E5666C21C2A2080008B8B5 /* MMEDispatchManager.h in Headers */ = {isa = PBXBuildFile; fileRef = ACA65F552140696B00537748 /* MMEDispatchManager.h */; };
+		55E5666D21C2A2080008B8B5 /* NSData+MMEGZIP.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BCF1FE05D7100C1BD0D /* NSData+MMEGZIP.h */; };
 		632281DF1E6F855900D75A5D /* MBXEmbeddedMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 632281DE1E6F855900D75A5D /* MBXEmbeddedMapViewController.m */; };
 		6407D6701E0085FD00F6A9C3 /* MGLDocumentationExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6407D66F1E0085FD00F6A9C3 /* MGLDocumentationExampleTests.swift */; };
 		74CB5EB1219B252C00102936 /* MGLStyleLayerManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 74CB5EAF219B252C00102936 /* MGLStyleLayerManager.h */; };
@@ -2359,7 +2406,6 @@
 				DA6408DB1DA4E7D300908C90 /* MGLVectorStyleLayer.h in Headers */,
 				DA704CC21F65A475004B3F28 /* MGLMapAccessibilityElement.h in Headers */,
 				DD0902AB1DB192A800C5BDCE /* MGLNetworkConfiguration.h in Headers */,
-				DA8848571CBAFB9800AB86E3 /* MGLMapboxEvents.h in Headers */,
 				35D3A1E61E9BE7EB002B38EE /* MGLScaleBar.h in Headers */,
 				0778DD431F67556700A73B34 /* MGLComputedShapeSource.h in Headers */,
 				1F6A82A221360F9D00BA5B41 /* MGLLoggingConfiguration.h in Headers */,
@@ -2441,6 +2487,54 @@
 				DAD1656E1CF41981001FF4B9 /* MGLFeature_Private.h in Headers */,
 				DA88483C1CBAFB8500AB86E3 /* MGLMapView.h in Headers */,
 				3EA9363147E77DD29FA06063 /* MGLRendererConfiguration.h in Headers */,
+				55E5663F21C2A0920008B8B5 /* configuration_utils.h in Headers */,
+				55E5664021C2A0920008B8B5 /* parse_configuration.h in Headers */,
+				55E5664121C2A0920008B8B5 /* ssl_pin_verifier.h in Headers */,
+				55E5664221C2A0920008B8B5 /* TSKPublicKeyAlgorithm.h in Headers */,
+				55E5664321C2A0920008B8B5 /* TSKSPKIHashCache.h in Headers */,
+				55E5664421C2A0920008B8B5 /* reporting_utils.h in Headers */,
+				55E5664521C2A0930008B8B5 /* TSKBackgroundReporter.h in Headers */,
+				55E5664621C2A0930008B8B5 /* TSKPinFailureReport.h in Headers */,
+				55E5664721C2A0930008B8B5 /* TSKReportsRateLimiter.h in Headers */,
+				55E5664821C2A0930008B8B5 /* vendor_identifier.h in Headers */,
+				55E5664921C2A0930008B8B5 /* TrustKit.h in Headers */,
+				55E5664A21C2A0930008B8B5 /* TSKLog.h in Headers */,
+				55E5664B21C2A0930008B8B5 /* TSKPinningValidator.h in Headers */,
+				55E5664C21C2A0930008B8B5 /* TSKPinningValidator_Private.h in Headers */,
+				55E5664D21C2A0930008B8B5 /* TSKPinningValidatorCallback.h in Headers */,
+				55E5664E21C2A0930008B8B5 /* TSKPinningValidatorResult.h in Headers */,
+				55E5664F21C2A0930008B8B5 /* TSKTrustDecision.h in Headers */,
+				55E5665021C2A0930008B8B5 /* TSKTrustKitConfig.h in Headers */,
+				55E5665121C2A1C20008B8B5 /* MMEReachability.h in Headers */,
+				55E5665221C2A2080008B8B5 /* MMENamespacedDependencies.h in Headers */,
+				55E5665321C2A2080008B8B5 /* MapboxMobileEvents.h in Headers */,
+				DA8848571CBAFB9800AB86E3 /* MGLMapboxEvents.h in Headers */,
+				55E5665421C2A2080008B8B5 /* CLLocation+MMEMobileEvents.h in Headers */,
+				55E5665521C2A2080008B8B5 /* MMEAPIClient.h in Headers */,
+				55E5665621C2A2080008B8B5 /* MMECategoryLoader.h in Headers */,
+				55E5665721C2A2080008B8B5 /* MMECommonEventData.h in Headers */,
+				55E5665821C2A2080008B8B5 /* MMEConstants.h in Headers */,
+				55E5665921C2A2080008B8B5 /* MMEDependencyManager.h in Headers */,
+				55E5665A21C2A2080008B8B5 /* MMEEvent.h in Headers */,
+				55E5665B21C2A2080008B8B5 /* MMEEventLogger.h in Headers */,
+				55E5665C21C2A2080008B8B5 /* MMEEventLogReportViewController.h in Headers */,
+				55E5665D21C2A2080008B8B5 /* MMEEventsConfiguration.h in Headers */,
+				55E5665E21C2A2080008B8B5 /* MMEHashProvider.h in Headers */,
+				55E5665F21C2A2080008B8B5 /* MMETrustKitProvider.h in Headers */,
+				55E5666021C2A2080008B8B5 /* MMEConfigurator.h in Headers */,
+				55E5666221C2A2080008B8B5 /* MMELocationManager.h in Headers */,
+				55E5666321C2A2080008B8B5 /* MMEMetrics.h in Headers */,
+				55E5666421C2A2080008B8B5 /* MMEMetricsManager.h in Headers */,
+				55E5666521C2A2080008B8B5 /* MMENSDateWrapper.h in Headers */,
+				55E5666621C2A2080008B8B5 /* MMENSURLSessionWrapper.h in Headers */,
+				55E5666721C2A2080008B8B5 /* MMETimerManager.h in Headers */,
+				55E5666821C2A2080008B8B5 /* MMETypes.h in Headers */,
+				55E5666921C2A2080008B8B5 /* MMEUIApplicationWrapper.h in Headers */,
+				55E5666A21C2A2080008B8B5 /* MMEUINavigation.h in Headers */,
+				55E5666B21C2A2080008B8B5 /* MMEUniqueIdentifier.h in Headers */,
+				55E5666C21C2A2080008B8B5 /* MMEDispatchManager.h in Headers */,
+				55E5666121C2A2080008B8B5 /* MMEEventsManager.h in Headers */,
+				55E5666D21C2A2080008B8B5 /* NSData+MMEGZIP.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/platform/ios/sdk-files.txt b/platform/ios/sdk-files.txt
new file mode 100644
index 0000000000..474eb3bbc8
--- /dev/null
+++ b/platform/ios/sdk-files.txt
@@ -0,0 +1,366 @@
+# This file is generated. Do not edit. Regenerate this with scripts/generate-cmake-files.js
+
+# SDK
+platform/ios/src/Mapbox.h
+
+# SDK/Foundation
+platform/darwin/src/MGLAccountManager.h
+platform/darwin/src/MGLAccountManager.m
+platform/darwin/src/MGLAccountManager_Private.h
+platform/darwin/src/MGLAttributionInfo.h
+platform/darwin/src/MGLAttributionInfo.mm
+platform/darwin/src/MGLAttributionInfo_Private.h
+platform/darwin/src/MGLFoundation.h
+platform/darwin/src/MGLFoundation.mm
+platform/darwin/src/MGLFoundation_Private.h
+platform/darwin/src/MGLLocationManager.h
+platform/darwin/src/MGLLocationManager.m
+platform/darwin/src/MGLLocationManager_Private.h
+platform/darwin/src/MGLLoggingConfiguration.h
+platform/darwin/src/MGLLoggingConfiguration.m
+platform/darwin/src/MGLLoggingConfiguration_Private.h
+platform/darwin/src/MGLMapCamera.h
+platform/darwin/src/MGLMapCamera.mm
+platform/darwin/src/MGLMapSnapshotter.h
+platform/darwin/src/MGLMapSnapshotter.mm
+platform/darwin/src/MGLNetworkConfiguration.h
+platform/darwin/src/MGLNetworkConfiguration.m
+platform/darwin/src/MGLRendererConfiguration.h
+platform/darwin/src/MGLRendererConfiguration.mm
+platform/darwin/src/MGLRendererFrontend.h
+platform/darwin/src/MGLStyle.h
+platform/darwin/src/MGLStyle.mm
+platform/darwin/src/MGLStyle_Private.h
+platform/darwin/src/MGLTypes.h
+platform/darwin/src/MGLTypes.m
+platform/darwin/src/MGLValueEvaluator.h
+
+# SDK/Foundation/Categories
+platform/darwin/src/NSArray+MGLAdditions.h
+platform/darwin/src/NSArray+MGLAdditions.mm
+platform/darwin/src/NSBundle+MGLAdditions.h
+platform/darwin/src/NSBundle+MGLAdditions.m
+platform/darwin/src/NSComparisonPredicate+MGLAdditions.h
+platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm
+platform/darwin/src/NSCompoundPredicate+MGLAdditions.h
+platform/darwin/src/NSCompoundPredicate+MGLAdditions.mm
+platform/darwin/src/NSData+MGLAdditions.h
+platform/darwin/src/NSData+MGLAdditions.mm
+platform/darwin/src/NSDate+MGLAdditions.h
+platform/darwin/src/NSDate+MGLAdditions.mm
+platform/darwin/src/NSDictionary+MGLAdditions.h
+platform/darwin/src/NSDictionary+MGLAdditions.mm
+platform/darwin/src/NSException+MGLAdditions.h
+platform/darwin/src/NSExpression+MGLAdditions.h
+platform/darwin/src/NSExpression+MGLAdditions.mm
+platform/darwin/src/NSExpression+MGLPrivateAdditions.h
+platform/darwin/src/NSPredicate+MGLAdditions.h
+platform/darwin/src/NSPredicate+MGLAdditions.mm
+platform/darwin/src/NSPredicate+MGLPrivateAdditions.h
+platform/darwin/src/NSProcessInfo+MGLAdditions.h
+platform/darwin/src/NSProcessInfo+MGLAdditions.m
+platform/darwin/src/NSString+MGLAdditions.h
+platform/darwin/src/NSString+MGLAdditions.m
+platform/darwin/src/NSURL+MGLAdditions.h
+platform/darwin/src/NSURL+MGLAdditions.m
+platform/darwin/src/NSValue+MGLAdditions.h
+platform/darwin/src/NSValue+MGLAdditions.m
+
+# SDK/Foundation/Formatters
+platform/darwin/src/MGLClockDirectionFormatter.h
+platform/darwin/src/MGLClockDirectionFormatter.m
+platform/darwin/src/MGLCompassDirectionFormatter.h
+platform/darwin/src/MGLCompassDirectionFormatter.m
+platform/darwin/src/MGLCoordinateFormatter.h
+platform/darwin/src/MGLCoordinateFormatter.m
+platform/darwin/src/MGLDistanceFormatter.h
+platform/darwin/src/MGLDistanceFormatter.m
+
+# SDK/Foundation/Geometry
+platform/darwin/src/MGLAnnotation.h
+platform/darwin/src/MGLFeature.h
+platform/darwin/src/MGLFeature.mm
+platform/darwin/src/MGLFeature_Private.h
+platform/darwin/src/MGLGeometry.h
+platform/darwin/src/MGLGeometry.mm
+platform/darwin/src/MGLGeometry_Private.h
+platform/darwin/src/MGLMultiPoint.h
+platform/darwin/src/MGLMultiPoint.mm
+platform/darwin/src/MGLMultiPoint_Private.h
+platform/darwin/src/MGLOverlay.h
+platform/darwin/src/MGLPointAnnotation.h
+platform/darwin/src/MGLPointAnnotation.mm
+platform/darwin/src/MGLPointCollection.h
+platform/darwin/src/MGLPointCollection.mm
+platform/darwin/src/MGLPointCollection_Private.h
+platform/darwin/src/MGLPolygon.h
+platform/darwin/src/MGLPolygon.mm
+platform/darwin/src/MGLPolygon_Private.h
+platform/darwin/src/MGLPolyline.h
+platform/darwin/src/MGLPolyline.mm
+platform/darwin/src/MGLPolyline_Private.h
+platform/darwin/src/MGLShape.h
+platform/darwin/src/MGLShape.mm
+platform/darwin/src/MGLShapeCollection.h
+platform/darwin/src/MGLShapeCollection.mm
+platform/darwin/src/MGLShape_Private.h
+
+# SDK/Foundation/Offline Maps
+platform/darwin/src/MGLOfflinePack.h
+platform/darwin/src/MGLOfflinePack.mm
+platform/darwin/src/MGLOfflinePack_Private.h
+platform/darwin/src/MGLOfflineRegion.h
+platform/darwin/src/MGLOfflineRegion_Private.h
+platform/darwin/src/MGLOfflineStorage.h
+platform/darwin/src/MGLOfflineStorage.mm
+platform/darwin/src/MGLOfflineStorage_Private.h
+platform/darwin/src/MGLShapeOfflineRegion.h
+platform/darwin/src/MGLShapeOfflineRegion.mm
+platform/darwin/src/MGLShapeOfflineRegion_Private.h
+platform/darwin/src/MGLTilePyramidOfflineRegion.h
+platform/darwin/src/MGLTilePyramidOfflineRegion.mm
+platform/darwin/src/MGLTilePyramidOfflineRegion_Private.h
+
+# SDK/Foundation/Styling
+platform/darwin/src/MGLConversion.h
+platform/darwin/src/MGLLight.h
+platform/darwin/src/MGLLight.mm
+platform/darwin/src/MGLLight_Private.h
+platform/darwin/src/MGLStyleValue.h
+platform/darwin/src/MGLStyleValue.mm
+platform/darwin/src/MGLStyleValue_Private.h
+
+# SDK/Foundation/Styling/Categories
+platform/darwin/src/NSValue+MGLStyleAttributeAdditions.h
+platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm
+
+# SDK/Foundation/Styling/Layers
+platform/darwin/src/MGLBackgroundStyleLayer.h
+platform/darwin/src/MGLBackgroundStyleLayer.mm
+platform/darwin/src/MGLBackgroundStyleLayer_Private.h
+platform/darwin/src/MGLCircleStyleLayer.h
+platform/darwin/src/MGLCircleStyleLayer.mm
+platform/darwin/src/MGLCircleStyleLayer_Private.h
+platform/darwin/src/MGLFillExtrusionStyleLayer.h
+platform/darwin/src/MGLFillExtrusionStyleLayer.mm
+platform/darwin/src/MGLFillExtrusionStyleLayer_Private.h
+platform/darwin/src/MGLFillStyleLayer.h
+platform/darwin/src/MGLFillStyleLayer.mm
+platform/darwin/src/MGLFillStyleLayer_Private.h
+platform/darwin/src/MGLForegroundStyleLayer.h
+platform/darwin/src/MGLForegroundStyleLayer.mm
+platform/darwin/src/MGLHeatmapStyleLayer.h
+platform/darwin/src/MGLHeatmapStyleLayer.mm
+platform/darwin/src/MGLHeatmapStyleLayer_Private.h
+platform/darwin/src/MGLHillshadeStyleLayer.h
+platform/darwin/src/MGLHillshadeStyleLayer.mm
+platform/darwin/src/MGLHillshadeStyleLayer_Private.h
+platform/darwin/src/MGLLineStyleLayer.h
+platform/darwin/src/MGLLineStyleLayer.mm
+platform/darwin/src/MGLLineStyleLayer_Private.h
+platform/darwin/src/MGLOpenGLStyleLayer.h
+platform/darwin/src/MGLOpenGLStyleLayer.mm
+platform/darwin/src/MGLOpenGLStyleLayer_Private.h
+platform/darwin/src/MGLRasterStyleLayer.h
+platform/darwin/src/MGLRasterStyleLayer.mm
+platform/darwin/src/MGLRasterStyleLayer_Private.h
+platform/darwin/src/MGLStyleLayer.h
+platform/darwin/src/MGLStyleLayer.mm
+platform/darwin/src/MGLStyleLayerManager.h
+platform/darwin/src/MGLStyleLayerManager.mm
+platform/darwin/src/MGLStyleLayer_Private.h
+platform/darwin/src/MGLSymbolStyleLayer.h
+platform/darwin/src/MGLSymbolStyleLayer.mm
+platform/darwin/src/MGLSymbolStyleLayer_Private.h
+platform/darwin/src/MGLVectorStyleLayer.h
+platform/darwin/src/MGLVectorStyleLayer.m
+
+# SDK/Foundation/Styling/Sources
+platform/darwin/src/MGLComputedShapeSource.h
+platform/darwin/src/MGLComputedShapeSource.mm
+platform/darwin/src/MGLComputedShapeSource_Private.h
+platform/darwin/src/MGLImageSource.h
+platform/darwin/src/MGLImageSource.mm
+platform/darwin/src/MGLRasterDEMSource.h
+platform/darwin/src/MGLRasterDEMSource.mm
+platform/darwin/src/MGLRasterTileSource.h
+platform/darwin/src/MGLRasterTileSource.mm
+platform/darwin/src/MGLRasterTileSource_Private.h
+platform/darwin/src/MGLShapeSource.h
+platform/darwin/src/MGLShapeSource.mm
+platform/darwin/src/MGLShapeSource_Private.h
+platform/darwin/src/MGLSource.h
+platform/darwin/src/MGLSource.mm
+platform/darwin/src/MGLSource_Private.h
+platform/darwin/src/MGLTileSource.h
+platform/darwin/src/MGLTileSource.mm
+platform/darwin/src/MGLTileSource_Private.h
+platform/darwin/src/MGLVectorTileSource.h
+platform/darwin/src/MGLVectorTileSource.mm
+platform/darwin/src/MGLVectorTileSource_Private.h
+
+# SDK/Kit
+platform/ios/src/MGLCameraChangeReason.h
+platform/ios/src/MGLMapAccessibilityElement.h
+platform/ios/src/MGLMapAccessibilityElement.mm
+platform/ios/src/MGLMapView+IBAdditions.h
+platform/ios/src/MGLMapView.h
+platform/ios/src/MGLMapView.mm
+platform/ios/src/MGLMapViewDelegate.h
+platform/ios/src/MGLMapView_Private.h
+
+# SDK/Kit/Annotations
+platform/ios/src/MGLAnnotationContainerView.h
+platform/ios/src/MGLAnnotationContainerView.m
+platform/ios/src/MGLAnnotationContainerView_Private.h
+platform/ios/src/MGLAnnotationImage.h
+platform/ios/src/MGLAnnotationImage.m
+platform/ios/src/MGLAnnotationImage_Private.h
+platform/ios/src/MGLAnnotationView.h
+platform/ios/src/MGLAnnotationView.mm
+platform/ios/src/MGLAnnotationView_Private.h
+platform/ios/src/MGLCalloutView.h
+platform/ios/src/MGLCompactCalloutView.h
+platform/ios/src/MGLCompactCalloutView.m
+platform/ios/src/MGLFaux3DUserLocationAnnotationView.h
+platform/ios/src/MGLFaux3DUserLocationAnnotationView.m
+platform/ios/src/MGLUserLocation.h
+platform/ios/src/MGLUserLocation.m
+platform/ios/src/MGLUserLocationAnnotationView.h
+platform/ios/src/MGLUserLocationAnnotationView.m
+platform/ios/src/MGLUserLocationAnnotationView_Private.h
+platform/ios/src/MGLUserLocationHeadingArrowLayer.h
+platform/ios/src/MGLUserLocationHeadingArrowLayer.m
+platform/ios/src/MGLUserLocationHeadingBeamLayer.h
+platform/ios/src/MGLUserLocationHeadingBeamLayer.m
+platform/ios/src/MGLUserLocationHeadingIndicator.h
+platform/ios/src/MGLUserLocation_Private.h
+
+# SDK/Kit/Categories
+platform/darwin/src/NSCoder+MGLAdditions.h
+platform/darwin/src/NSCoder+MGLAdditions.mm
+platform/ios/src/NSOrthography+MGLAdditions.h
+platform/ios/src/NSOrthography+MGLAdditions.m
+platform/ios/src/UIColor+MGLAdditions.h
+platform/ios/src/UIColor+MGLAdditions.mm
+platform/ios/src/UIDevice+MGLAdditions.h
+platform/ios/src/UIDevice+MGLAdditions.m
+platform/ios/src/UIImage+MGLAdditions.h
+platform/ios/src/UIImage+MGLAdditions.mm
+platform/ios/src/UIViewController+MGLAdditions.h
+platform/ios/src/UIViewController+MGLAdditions.m
+
+# SDK/Kit/SMCalloutView
+platform/ios/vendor/SMCalloutView/SMCalloutView.h
+platform/ios/vendor/SMCalloutView/SMCalloutView.m
+
+# SDK/Kit/Telemetry
+platform/ios/src/MGLTelemetryConfig.h
+platform/ios/src/MGLTelemetryConfig.m
+
+# SDK/Kit/Telemetry/Development
+platform/ios/src/MGLSDKUpdateChecker.h
+platform/ios/src/MGLSDKUpdateChecker.mm
+
+# SDK/Kit/Telemetry/Runtime
+platform/ios/src/MGLMapboxEvents.h
+platform/ios/src/MGLMapboxEvents.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/CLLocation+MMEMobileEvents.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/CLLocation+MMEMobileEvents.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEAPIClient.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEAPIClient.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMECategoryLoader.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMECategoryLoader.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMECommonEventData.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMECommonEventData.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEConfigurator.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEConfigurator.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEConstants.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEConstants.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEDependencyManager.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEDependencyManager.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEDispatchManager.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEDispatchManager.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEvent.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEvent.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEventLogReportViewController.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEventLogReportViewController.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEventLogger.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEventLogger.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEventsConfiguration.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEventsConfiguration.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEventsManager.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEventsManager.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEHashProvider.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEHashProvider.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMELocationManager.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMELocationManager.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEMetrics.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEMetrics.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEMetricsManager.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEMetricsManager.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMENSDateWrapper.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMENSDateWrapper.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMENSURLSessionWrapper.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMENSURLSessionWrapper.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMENamespacedDependencies.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMETimerManager.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMETimerManager.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMETrustKitProvider.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMETrustKitProvider.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMETypes.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMETypes.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEUIApplicationWrapper.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEUIApplicationWrapper.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEUINavigation.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEUINavigation.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEUniqueIdentifier.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEUniqueIdentifier.m
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MapboxMobileEvents.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/NSData+MMEGZIP.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/NSData+MMEGZIP.m
+
+# SDK/Kit/Telemetry/Runtime/Reachability
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/Reachability/MMEReachability.h
+platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/Reachability/MMEReachability.m
+
+# SDK/Kit/Telemetry/Runtime/TrustKit
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TSKLog.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TSKPinningValidator.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TSKPinningValidator.m
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TSKPinningValidatorCallback.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TSKPinningValidatorResult.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TSKPinningValidatorResult.m
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TSKPinningValidator_Private.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TSKTrustDecision.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TSKTrustKitConfig.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TSKTrustKitConfig.m
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TrustKit.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TrustKit.m
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/configuration_utils.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/configuration_utils.m
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/parse_configuration.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/parse_configuration.m
+
+# SDK/Kit/Telemetry/Runtime/TrustKit/Pinning
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Pinning/TSKPublicKeyAlgorithm.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Pinning/TSKSPKIHashCache.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Pinning/TSKSPKIHashCache.m
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Pinning/ssl_pin_verifier.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Pinning/ssl_pin_verifier.m
+
+# SDK/Kit/Telemetry/Runtime/TrustKit/Reporting
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/TSKBackgroundReporter.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/TSKBackgroundReporter.m
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/TSKPinFailureReport.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/TSKPinFailureReport.m
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/TSKReportsRateLimiter.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/TSKReportsRateLimiter.m
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/reporting_utils.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/reporting_utils.m
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/vendor_identifier.h
+platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/vendor_identifier.m
+
+# SDK/Kit/Views
+platform/ios/src/MGLScaleBar.h
+platform/ios/src/MGLScaleBar.mm
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake
index 984389e4e8..bcd60cac9e 100644
--- a/platform/linux/config.cmake
+++ b/platform/linux/config.cmake
@@ -1,9 +1,9 @@
 include(cmake/sqlite.cmake)
 
 add_library(mbgl-loop-uv STATIC
-    platform/default/async_task.cpp
-    platform/default/run_loop.cpp
-    platform/default/timer.cpp
+    platform/default/src/mbgl/util/async_task.cpp
+    platform/default/src/mbgl/util/run_loop.cpp
+    platform/default/src/mbgl/util/timer.cpp
 )
 
 target_include_directories(mbgl-loop-uv
@@ -20,7 +20,7 @@ target_add_mason_package(mbgl-loop-uv PUBLIC libuv)
 macro(mbgl_platform_core)
     if(WITH_OSMESA)
         target_sources(mbgl-core
-            PRIVATE platform/default/headless_backend_osmesa.cpp
+            PRIVATE platform/default/src/mbgl/gl/headless_backend_osmesa.cpp
         )
         target_link_libraries(mbgl-core
             PUBLIC -lOSMesa
@@ -42,42 +42,42 @@ macro(mbgl_platform_core)
 
     target_sources(mbgl-core
         # Misc
-        PRIVATE platform/default/logging_stderr.cpp
-        PRIVATE platform/default/string_stdlib.cpp
-        PRIVATE platform/default/thread.cpp
-        PRIVATE platform/default/bidi.cpp
-        PRIVATE platform/default/collator.cpp
-        PRIVATE platform/default/layer_manager.cpp
-        PRIVATE platform/default/local_glyph_rasterizer.cpp
-        PRIVATE platform/default/thread_local.cpp
-        PRIVATE platform/default/unaccent.cpp
-        PRIVATE platform/default/unaccent.hpp
-        PRIVATE platform/default/utf.cpp
+        PRIVATE platform/default/src/mbgl/util/logging_stderr.cpp
+        PRIVATE platform/default/src/mbgl/util/string_stdlib.cpp
+        PRIVATE platform/default/src/mbgl/util/thread.cpp
+        PRIVATE platform/default/src/mbgl/text/bidi.cpp
+        PRIVATE platform/default/src/mbgl/text/collator.cpp
+        PRIVATE platform/default/src/mbgl/layermanager/layer_manager.cpp
+        PRIVATE platform/default/src/mbgl/text/local_glyph_rasterizer.cpp
+        PRIVATE platform/default/src/mbgl/util/thread_local.cpp
+        PRIVATE platform/default/src/mbgl/text/unaccent.cpp
+        PRIVATE platform/default/include/mbgl/text/unaccent.hpp
+        PRIVATE platform/default/src/mbgl/util/utf.cpp
 
         # Image handling
-        PRIVATE platform/default/image.cpp
-        PRIVATE platform/default/jpeg_reader.cpp
-        PRIVATE platform/default/png_writer.cpp
-        PRIVATE platform/default/png_reader.cpp
+        PRIVATE platform/default/src/mbgl/util/image.cpp
+        PRIVATE platform/default/src/mbgl/util/jpeg_reader.cpp
+        PRIVATE platform/default/src/mbgl/util/png_writer.cpp
+        PRIVATE platform/default/src/mbgl/util/png_reader.cpp
 
         # Headless view
-        PRIVATE platform/default/mbgl/gl/headless_frontend.cpp
-        PRIVATE platform/default/mbgl/gl/headless_frontend.hpp
-        PRIVATE platform/default/mbgl/gl/headless_backend.cpp
-        PRIVATE platform/default/mbgl/gl/headless_backend.hpp
+        PRIVATE platform/default/src/mbgl/gl/headless_frontend.cpp
+        PRIVATE platform/default/include/mbgl/gl/headless_frontend.hpp
+        PRIVATE platform/default/src/mbgl/gl/headless_backend.cpp
+        PRIVATE platform/default/include/mbgl/gl/headless_backend.hpp
 
         # Snapshotting
-        PRIVATE platform/default/mbgl/map/map_snapshotter.cpp
-        PRIVATE platform/default/mbgl/map/map_snapshotter.hpp
+        PRIVATE platform/default/src/mbgl/map/map_snapshotter.cpp
+        PRIVATE platform/default/include/mbgl/map/map_snapshotter.hpp
 
         # Thread pool
-        PRIVATE platform/default/mbgl/util/default_thread_pool.cpp
-        PRIVATE platform/default/mbgl/util/default_thread_pool.cpp
-        PRIVATE platform/default/mbgl/util/shared_thread_pool.cpp
+        PRIVATE platform/default/src/mbgl/util/default_thread_pool.cpp
+        PRIVATE platform/default/src/mbgl/util/default_thread_pool.cpp
+        PRIVATE platform/default/src/mbgl/util/shared_thread_pool.cpp
     )
 
     target_include_directories(mbgl-core
-        PRIVATE platform/default
+        PRIVATE platform/default/include
         PRIVATE platform/linux
     )
 
@@ -103,10 +103,10 @@ endmacro()
 macro(mbgl_filesource)
     target_sources(mbgl-filesource
         # File source
-        PRIVATE platform/default/http_file_source.cpp
+        PRIVATE platform/default/src/mbgl/storage/http_file_source.cpp
 
         # Database
-        PRIVATE platform/default/sqlite3.cpp
+        PRIVATE platform/default/src/mbgl/storage/sqlite3.cpp
     )
 
     # We're not referencing any cURL symbols since we're dynamically loading it. However, we want to
@@ -151,7 +151,7 @@ endmacro()
 
 macro(mbgl_platform_test)
     target_sources(mbgl-test
-        PRIVATE platform/default/mbgl/test/main.cpp
+        PRIVATE platform/default/src/mbgl/test/main.cpp
     )
 
     target_include_directories(mbgl-test
@@ -159,7 +159,7 @@ macro(mbgl_platform_test)
     )
 
     set_source_files_properties(
-        platform/default/mbgl/test/main.cpp
+        platform/default/src/mbgl/test/main.cpp
             PROPERTIES
         COMPILE_FLAGS -DWORK_DIRECTORY="${CMAKE_SOURCE_DIR}"
     )
diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake
index e2335842dd..e49a54f5eb 100644
--- a/platform/macos/config.cmake
+++ b/platform/macos/config.cmake
@@ -1,41 +1,7 @@
 include(cmake/loop-darwin.cmake)
 
 macro(mbgl_platform_core)
-    target_sources(mbgl-core
-        # Misc
-        PRIVATE platform/darwin/mbgl/storage/reachability.h
-        PRIVATE platform/darwin/mbgl/storage/reachability.m
-        PRIVATE platform/darwin/src/CFHandle.hpp
-        PRIVATE platform/darwin/src/collator.mm
-        PRIVATE platform/darwin/src/local_glyph_rasterizer.mm
-        PRIVATE platform/darwin/src/logging_nslog.mm
-        PRIVATE platform/darwin/src/nsthread.mm
-        PRIVATE platform/darwin/src/string_nsstring.mm
-        PRIVATE platform/default/bidi.cpp
-        PRIVATE platform/default/thread_local.cpp
-        PRIVATE platform/default/utf.cpp
-
-        # Image handling
-        PRIVATE platform/darwin/mbgl/util/image+MGLAdditions.hpp
-        PRIVATE platform/darwin/src/image.mm
-        PRIVATE platform/default/png_writer.cpp
-
-        # Headless view
-        PRIVATE platform/default/mbgl/gl/headless_frontend.cpp
-        PRIVATE platform/default/mbgl/gl/headless_frontend.hpp
-        PRIVATE platform/default/mbgl/gl/headless_backend.cpp
-        PRIVATE platform/default/mbgl/gl/headless_backend.hpp
-
-        # Snapshotting
-        PRIVATE platform/default/mbgl/map/map_snapshotter.cpp
-        PRIVATE platform/default/mbgl/map/map_snapshotter.hpp
-
-        # Thread pool
-        PRIVATE platform/default/mbgl/util/shared_thread_pool.cpp
-        PRIVATE platform/default/mbgl/util/shared_thread_pool.hpp
-        PRIVATE platform/default/mbgl/util/default_thread_pool.cpp
-        PRIVATE platform/default/mbgl/util/default_thread_pool.cpp
-    )
+    target_sources_from_file(mbgl-core PRIVATE platform/macos/core-files.txt)
 
     if(WITH_EGL)
         target_sources(mbgl-core
@@ -56,8 +22,8 @@ macro(mbgl_platform_core)
     )
 
     target_include_directories(mbgl-core
-        PUBLIC platform/darwin
-        PUBLIC platform/default
+        PUBLIC platform/darwin/include
+        PUBLIC platform/default/include
     )
 
     target_link_libraries(mbgl-core
@@ -113,8 +79,8 @@ endmacro()
 
 macro(mbgl_platform_test)
     target_sources(mbgl-test
-        PRIVATE platform/default/layer_manager.cpp
-        PRIVATE platform/default/mbgl/test/main.cpp
+        PRIVATE platform/default/src/mbgl/layermanager/layer_manager.cpp
+        PRIVATE platform/default/src/mbgl/test/main.cpp
     )
 
     target_include_directories(mbgl-test
@@ -122,7 +88,7 @@ macro(mbgl_platform_test)
     )
 
     set_source_files_properties(
-        platform/default/mbgl/test/main.cpp
+        platform/default/src/mbgl/test/main.cpp
             PROPERTIES
         COMPILE_FLAGS -DWORK_DIRECTORY="${CMAKE_SOURCE_DIR}"
     )
@@ -135,7 +101,7 @@ endmacro()
 
 macro(mbgl_platform_benchmark)
     target_sources(mbgl-benchmark
-        PRIVATE platform/default/layer_manager.cpp
+        PRIVATE platform/default/src/mbgl/layermanager/layer_manager.cpp
         PRIVATE benchmark/src/main.cpp
     )
 
@@ -153,7 +119,7 @@ endmacro()
 
 macro(mbgl_platform_node)
     target_sources(mbgl-core
-        PRIVATE platform/default/layer_manager.cpp
+        PRIVATE platform/default/src/mbgl/layermanager/layer_manager.cpp
     )
     target_link_libraries(mbgl-node INTERFACE
         -exported_symbols_list ${CMAKE_SOURCE_DIR}/platform/node/symbol-list
diff --git a/platform/macos/core-files.txt b/platform/macos/core-files.txt
index 1c85deccef..c99e735af8 100644
--- a/platform/macos/core-files.txt
+++ b/platform/macos/core-files.txt
@@ -1,221 +1,33 @@
-# This file is generated. Do not edit. Regenerate this with scripts/generate-cmake-files.js
-
-# SDK
-platform/macos/src/Mapbox.h
-
-# SDK/Foundation
-platform/darwin/src/MGLAccountManager.h
-platform/darwin/src/MGLAccountManager.m
-platform/darwin/src/MGLAccountManager_Private.h
-platform/darwin/src/MGLAttributionInfo.h
-platform/darwin/src/MGLAttributionInfo.mm
-platform/darwin/src/MGLAttributionInfo_Private.h
-platform/darwin/src/MGLFoundation.h
-platform/darwin/src/MGLFoundation.mm
-platform/darwin/src/MGLFoundation_Private.h
-platform/darwin/src/MGLLoggingConfiguration.h
-platform/darwin/src/MGLLoggingConfiguration.m
-platform/darwin/src/MGLLoggingConfiguration_Private.h
-platform/darwin/src/MGLMapCamera.h
-platform/darwin/src/MGLMapCamera.mm
-platform/darwin/src/MGLMapSnapshotter.h
-platform/darwin/src/MGLMapSnapshotter.mm
-platform/darwin/src/MGLNetworkConfiguration.h
-platform/darwin/src/MGLNetworkConfiguration.m
-platform/darwin/src/MGLRendererConfiguration.h
-platform/darwin/src/MGLRendererConfiguration.mm
-platform/darwin/src/MGLRendererFrontend.h
-platform/darwin/src/MGLStyle.h
-platform/darwin/src/MGLStyle.mm
-platform/darwin/src/MGLStyle_Private.h
-platform/darwin/src/MGLTypes.h
-platform/darwin/src/MGLTypes.m
-platform/darwin/src/MGLValueEvaluator.h
-
-# SDK/Foundation/Categories
-platform/darwin/src/NSArray+MGLAdditions.h
-platform/darwin/src/NSArray+MGLAdditions.mm
-platform/darwin/src/NSBundle+MGLAdditions.h
-platform/darwin/src/NSBundle+MGLAdditions.m
-platform/darwin/src/NSCoder+MGLAdditions.h
-platform/darwin/src/NSCoder+MGLAdditions.mm
-platform/darwin/src/NSComparisonPredicate+MGLAdditions.h
-platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm
-platform/darwin/src/NSCompoundPredicate+MGLAdditions.h
-platform/darwin/src/NSCompoundPredicate+MGLAdditions.mm
-platform/darwin/src/NSDate+MGLAdditions.h
-platform/darwin/src/NSDate+MGLAdditions.mm
-platform/darwin/src/NSDictionary+MGLAdditions.h
-platform/darwin/src/NSDictionary+MGLAdditions.mm
-platform/darwin/src/NSException+MGLAdditions.h
-platform/darwin/src/NSExpression+MGLAdditions.h
-platform/darwin/src/NSExpression+MGLAdditions.mm
-platform/darwin/src/NSExpression+MGLPrivateAdditions.h
-platform/darwin/src/NSPredicate+MGLAdditions.h
-platform/darwin/src/NSPredicate+MGLAdditions.mm
-platform/darwin/src/NSPredicate+MGLPrivateAdditions.h
-platform/darwin/src/NSProcessInfo+MGLAdditions.h
-platform/darwin/src/NSProcessInfo+MGLAdditions.m
-platform/darwin/src/NSString+MGLAdditions.h
-platform/darwin/src/NSString+MGLAdditions.m
-platform/darwin/src/NSURL+MGLAdditions.h
-platform/darwin/src/NSURL+MGLAdditions.m
-platform/darwin/src/NSValue+MGLAdditions.h
-platform/darwin/src/NSValue+MGLAdditions.m
-
-# SDK/Foundation/Formatters
-platform/darwin/src/MGLClockDirectionFormatter.h
-platform/darwin/src/MGLClockDirectionFormatter.m
-platform/darwin/src/MGLCompassDirectionFormatter.h
-platform/darwin/src/MGLCompassDirectionFormatter.m
-platform/darwin/src/MGLCoordinateFormatter.h
-platform/darwin/src/MGLCoordinateFormatter.m
-platform/darwin/src/MGLDistanceFormatter.h
-platform/darwin/src/MGLDistanceFormatter.m
-
-# SDK/Foundation/Geometry
-platform/darwin/src/MGLAnnotation.h
-platform/darwin/src/MGLFeature.h
-platform/darwin/src/MGLFeature.mm
-platform/darwin/src/MGLFeature_Private.h
-platform/darwin/src/MGLGeometry.h
-platform/darwin/src/MGLGeometry.mm
-platform/darwin/src/MGLGeometry_Private.h
-platform/darwin/src/MGLMultiPoint.h
-platform/darwin/src/MGLMultiPoint.mm
-platform/darwin/src/MGLMultiPoint_Private.h
-platform/darwin/src/MGLOverlay.h
-platform/darwin/src/MGLPointAnnotation.h
-platform/darwin/src/MGLPointAnnotation.mm
-platform/darwin/src/MGLPointCollection.h
-platform/darwin/src/MGLPointCollection.mm
-platform/darwin/src/MGLPointCollection_Private.h
-platform/darwin/src/MGLPolygon.h
-platform/darwin/src/MGLPolygon.mm
-platform/darwin/src/MGLPolygon_Private.h
-platform/darwin/src/MGLPolyline.h
-platform/darwin/src/MGLPolyline.mm
-platform/darwin/src/MGLPolyline_Private.h
-platform/darwin/src/MGLShape.h
-platform/darwin/src/MGLShape.mm
-platform/darwin/src/MGLShapeCollection.h
-platform/darwin/src/MGLShapeCollection.mm
-platform/darwin/src/MGLShape_Private.h
-
-# SDK/Foundation/Offline Maps
-platform/darwin/src/MGLOfflinePack.h
-platform/darwin/src/MGLOfflinePack.mm
-platform/darwin/src/MGLOfflinePack_Private.h
-platform/darwin/src/MGLOfflineRegion.h
-platform/darwin/src/MGLOfflineRegion_Private.h
-platform/darwin/src/MGLOfflineStorage.h
-platform/darwin/src/MGLOfflineStorage.mm
-platform/darwin/src/MGLOfflineStorage_Private.h
-platform/darwin/src/MGLShapeOfflineRegion.h
-platform/darwin/src/MGLShapeOfflineRegion.mm
-platform/darwin/src/MGLShapeOfflineRegion_Private.h
-platform/darwin/src/MGLTilePyramidOfflineRegion.h
-platform/darwin/src/MGLTilePyramidOfflineRegion.mm
-platform/darwin/src/MGLTilePyramidOfflineRegion_Private.h
-
-# SDK/Foundation/Styling
-platform/darwin/src/MGLConversion.h
-platform/darwin/src/MGLLight.h
-platform/darwin/src/MGLLight.mm
-platform/darwin/src/MGLLight_Private.h
-platform/darwin/src/MGLStyleValue.h
-platform/darwin/src/MGLStyleValue.mm
-platform/darwin/src/MGLStyleValue_Private.h
-
-# SDK/Foundation/Styling/Categories
-platform/darwin/src/NSValue+MGLStyleAttributeAdditions.h
-platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm
-
-# SDK/Foundation/Styling/Layers
-platform/darwin/src/MGLBackgroundStyleLayer.h
-platform/darwin/src/MGLBackgroundStyleLayer.mm
-platform/darwin/src/MGLBackgroundStyleLayer_Private.h
-platform/darwin/src/MGLCircleStyleLayer.h
-platform/darwin/src/MGLCircleStyleLayer.mm
-platform/darwin/src/MGLCircleStyleLayer_Private.h
-platform/darwin/src/MGLFillExtrusionStyleLayer.h
-platform/darwin/src/MGLFillExtrusionStyleLayer.mm
-platform/darwin/src/MGLFillExtrusionStyleLayer_Private.h
-platform/darwin/src/MGLFillStyleLayer.h
-platform/darwin/src/MGLFillStyleLayer.mm
-platform/darwin/src/MGLFillStyleLayer_Private.h
-platform/darwin/src/MGLForegroundStyleLayer.h
-platform/darwin/src/MGLForegroundStyleLayer.mm
-platform/darwin/src/MGLHeatmapStyleLayer.h
-platform/darwin/src/MGLHeatmapStyleLayer.mm
-platform/darwin/src/MGLHeatmapStyleLayer_Private.h
-platform/darwin/src/MGLHillshadeStyleLayer.h
-platform/darwin/src/MGLHillshadeStyleLayer.mm
-platform/darwin/src/MGLHillshadeStyleLayer_Private.h
-platform/darwin/src/MGLLineStyleLayer.h
-platform/darwin/src/MGLLineStyleLayer.mm
-platform/darwin/src/MGLLineStyleLayer_Private.h
-platform/darwin/src/MGLOpenGLStyleLayer.h
-platform/darwin/src/MGLOpenGLStyleLayer.mm
-platform/darwin/src/MGLOpenGLStyleLayer_Private.h
-platform/darwin/src/MGLRasterStyleLayer.h
-platform/darwin/src/MGLRasterStyleLayer.mm
-platform/darwin/src/MGLRasterStyleLayer_Private.h
-platform/darwin/src/MGLStyleLayer.h
-platform/darwin/src/MGLStyleLayer.mm
-platform/darwin/src/MGLStyleLayerManager.h
-platform/darwin/src/MGLStyleLayerManager.mm
-platform/darwin/src/MGLStyleLayer_Private.h
-platform/darwin/src/MGLSymbolStyleLayer.h
-platform/darwin/src/MGLSymbolStyleLayer.mm
-platform/darwin/src/MGLSymbolStyleLayer_Private.h
-platform/darwin/src/MGLVectorStyleLayer.h
-platform/darwin/src/MGLVectorStyleLayer.m
-
-# SDK/Foundation/Styling/Sources
-platform/darwin/src/MGLComputedShapeSource.h
-platform/darwin/src/MGLComputedShapeSource.mm
-platform/darwin/src/MGLComputedShapeSource_Private.h
-platform/darwin/src/MGLImageSource.h
-platform/darwin/src/MGLImageSource.mm
-platform/darwin/src/MGLRasterDEMSource.h
-platform/darwin/src/MGLRasterDEMSource.mm
-platform/darwin/src/MGLRasterTileSource.h
-platform/darwin/src/MGLRasterTileSource.mm
-platform/darwin/src/MGLRasterTileSource_Private.h
-platform/darwin/src/MGLShapeSource.h
-platform/darwin/src/MGLShapeSource.mm
-platform/darwin/src/MGLShapeSource_Private.h
-platform/darwin/src/MGLSource.h
-platform/darwin/src/MGLSource.mm
-platform/darwin/src/MGLSource_Private.h
-platform/darwin/src/MGLTileSource.h
-platform/darwin/src/MGLTileSource.mm
-platform/darwin/src/MGLTileSource_Private.h
-platform/darwin/src/MGLVectorTileSource.h
-platform/darwin/src/MGLVectorTileSource.mm
-platform/darwin/src/MGLVectorTileSource_Private.h
-
-# SDK/Kit
-platform/macos/src/MGLAnnotationImage.h
-platform/macos/src/MGLAnnotationImage.m
-platform/macos/src/MGLAnnotationImage_Private.h
-platform/macos/src/MGLAttributionButton.h
-platform/macos/src/MGLAttributionButton.mm
-platform/macos/src/MGLCompassCell.h
-platform/macos/src/MGLCompassCell.m
-platform/macos/src/MGLMapView+IBAdditions.h
-platform/macos/src/MGLMapView+IBAdditions.mm
-platform/macos/src/MGLMapView.h
-platform/macos/src/MGLMapView.mm
-platform/macos/src/MGLMapViewDelegate.h
-platform/macos/src/MGLMapView_Private.h
-platform/macos/src/MGLOpenGLLayer.h
-platform/macos/src/MGLOpenGLLayer.mm
-
-# SDK/Kit/Categories
-platform/macos/src/NSColor+MGLAdditions.h
-platform/macos/src/NSColor+MGLAdditions.mm
-platform/macos/src/NSImage+MGLAdditions.h
-platform/macos/src/NSImage+MGLAdditions.mm
-
+# Misc
+platform/darwin/include/mbgl/storage/reachability.h
+platform/darwin/src/reachability.m
+platform/darwin/src/CFHandle.hpp
+platform/darwin/src/collator.mm
+platform/darwin/src/local_glyph_rasterizer.mm
+platform/darwin/src/logging_nslog.mm
+platform/darwin/src/nsthread.mm
+platform/darwin/src/string_nsstring.mm
+platform/default/src/mbgl/text/bidi.cpp
+platform/default/src/mbgl/util/thread_local.cpp
+platform/default/src/mbgl/util/utf.cpp
+
+# Image handling
+platform/darwin/include/mbgl/util/image+MGLAdditions.hpp
+platform/darwin/src/image.mm
+platform/default/src/mbgl/util/png_writer.cpp
+
+# Headless view
+platform/default/src/mbgl/gl/headless_frontend.cpp
+platform/default/include/mbgl/gl/headless_frontend.hpp
+platform/default/src/mbgl/gl/headless_backend.cpp
+platform/default/include/mbgl/gl/headless_backend.hpp
+
+# Snapshotting
+platform/default/src/mbgl/map/map_snapshotter.cpp
+platform/default/include/mbgl/map/map_snapshotter.hpp
+
+# Thread pool
+platform/default/src/mbgl/util/shared_thread_pool.cpp
+platform/default/include/mbgl/util/shared_thread_pool.hpp
+platform/default/src/mbgl/util/default_thread_pool.cpp
+platform/default/include/mbgl/util/default_thread_pool.hpp
diff --git a/platform/macos/sdk-files.txt b/platform/macos/sdk-files.txt
new file mode 100644
index 0000000000..baae924236
--- /dev/null
+++ b/platform/macos/sdk-files.txt
@@ -0,0 +1,220 @@
+# This file is generated. Do not edit. Regenerate this with scripts/generate-cmake-files.js
+
+# SDK
+platform/macos/src/Mapbox.h
+
+# SDK/Foundation
+platform/darwin/src/MGLAccountManager.h
+platform/darwin/src/MGLAccountManager.m
+platform/darwin/src/MGLAccountManager_Private.h
+platform/darwin/src/MGLAttributionInfo.h
+platform/darwin/src/MGLAttributionInfo.mm
+platform/darwin/src/MGLAttributionInfo_Private.h
+platform/darwin/src/MGLFoundation.h
+platform/darwin/src/MGLFoundation.mm
+platform/darwin/src/MGLFoundation_Private.h
+platform/darwin/src/MGLLoggingConfiguration.h
+platform/darwin/src/MGLLoggingConfiguration.m
+platform/darwin/src/MGLLoggingConfiguration_Private.h
+platform/darwin/src/MGLMapCamera.h
+platform/darwin/src/MGLMapCamera.mm
+platform/darwin/src/MGLMapSnapshotter.h
+platform/darwin/src/MGLMapSnapshotter.mm
+platform/darwin/src/MGLNetworkConfiguration.h
+platform/darwin/src/MGLNetworkConfiguration.m
+platform/darwin/src/MGLRendererConfiguration.h
+platform/darwin/src/MGLRendererConfiguration.mm
+platform/darwin/src/MGLRendererFrontend.h
+platform/darwin/src/MGLStyle.h
+platform/darwin/src/MGLStyle.mm
+platform/darwin/src/MGLStyle_Private.h
+platform/darwin/src/MGLTypes.h
+platform/darwin/src/MGLTypes.m
+platform/darwin/src/MGLValueEvaluator.h
+
+# SDK/Foundation/Categories
+platform/darwin/src/NSArray+MGLAdditions.h
+platform/darwin/src/NSArray+MGLAdditions.mm
+platform/darwin/src/NSBundle+MGLAdditions.h
+platform/darwin/src/NSBundle+MGLAdditions.m
+platform/darwin/src/NSCoder+MGLAdditions.h
+platform/darwin/src/NSCoder+MGLAdditions.mm
+platform/darwin/src/NSComparisonPredicate+MGLAdditions.h
+platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm
+platform/darwin/src/NSCompoundPredicate+MGLAdditions.h
+platform/darwin/src/NSCompoundPredicate+MGLAdditions.mm
+platform/darwin/src/NSDate+MGLAdditions.h
+platform/darwin/src/NSDate+MGLAdditions.mm
+platform/darwin/src/NSDictionary+MGLAdditions.h
+platform/darwin/src/NSDictionary+MGLAdditions.mm
+platform/darwin/src/NSException+MGLAdditions.h
+platform/darwin/src/NSExpression+MGLAdditions.h
+platform/darwin/src/NSExpression+MGLAdditions.mm
+platform/darwin/src/NSExpression+MGLPrivateAdditions.h
+platform/darwin/src/NSPredicate+MGLAdditions.h
+platform/darwin/src/NSPredicate+MGLAdditions.mm
+platform/darwin/src/NSPredicate+MGLPrivateAdditions.h
+platform/darwin/src/NSProcessInfo+MGLAdditions.h
+platform/darwin/src/NSProcessInfo+MGLAdditions.m
+platform/darwin/src/NSString+MGLAdditions.h
+platform/darwin/src/NSString+MGLAdditions.m
+platform/darwin/src/NSURL+MGLAdditions.h
+platform/darwin/src/NSURL+MGLAdditions.m
+platform/darwin/src/NSValue+MGLAdditions.h
+platform/darwin/src/NSValue+MGLAdditions.m
+
+# SDK/Foundation/Formatters
+platform/darwin/src/MGLClockDirectionFormatter.h
+platform/darwin/src/MGLClockDirectionFormatter.m
+platform/darwin/src/MGLCompassDirectionFormatter.h
+platform/darwin/src/MGLCompassDirectionFormatter.m
+platform/darwin/src/MGLCoordinateFormatter.h
+platform/darwin/src/MGLCoordinateFormatter.m
+platform/darwin/src/MGLDistanceFormatter.h
+platform/darwin/src/MGLDistanceFormatter.m
+
+# SDK/Foundation/Geometry
+platform/darwin/src/MGLAnnotation.h
+platform/darwin/src/MGLFeature.h
+platform/darwin/src/MGLFeature.mm
+platform/darwin/src/MGLFeature_Private.h
+platform/darwin/src/MGLGeometry.h
+platform/darwin/src/MGLGeometry.mm
+platform/darwin/src/MGLGeometry_Private.h
+platform/darwin/src/MGLMultiPoint.h
+platform/darwin/src/MGLMultiPoint.mm
+platform/darwin/src/MGLMultiPoint_Private.h
+platform/darwin/src/MGLOverlay.h
+platform/darwin/src/MGLPointAnnotation.h
+platform/darwin/src/MGLPointAnnotation.mm
+platform/darwin/src/MGLPointCollection.h
+platform/darwin/src/MGLPointCollection.mm
+platform/darwin/src/MGLPointCollection_Private.h
+platform/darwin/src/MGLPolygon.h
+platform/darwin/src/MGLPolygon.mm
+platform/darwin/src/MGLPolygon_Private.h
+platform/darwin/src/MGLPolyline.h
+platform/darwin/src/MGLPolyline.mm
+platform/darwin/src/MGLPolyline_Private.h
+platform/darwin/src/MGLShape.h
+platform/darwin/src/MGLShape.mm
+platform/darwin/src/MGLShapeCollection.h
+platform/darwin/src/MGLShapeCollection.mm
+platform/darwin/src/MGLShape_Private.h
+
+# SDK/Foundation/Offline Maps
+platform/darwin/src/MGLOfflinePack.h
+platform/darwin/src/MGLOfflinePack.mm
+platform/darwin/src/MGLOfflinePack_Private.h
+platform/darwin/src/MGLOfflineRegion.h
+platform/darwin/src/MGLOfflineRegion_Private.h
+platform/darwin/src/MGLOfflineStorage.h
+platform/darwin/src/MGLOfflineStorage.mm
+platform/darwin/src/MGLOfflineStorage_Private.h
+platform/darwin/src/MGLShapeOfflineRegion.h
+platform/darwin/src/MGLShapeOfflineRegion.mm
+platform/darwin/src/MGLShapeOfflineRegion_Private.h
+platform/darwin/src/MGLTilePyramidOfflineRegion.h
+platform/darwin/src/MGLTilePyramidOfflineRegion.mm
+platform/darwin/src/MGLTilePyramidOfflineRegion_Private.h
+
+# SDK/Foundation/Styling
+platform/darwin/src/MGLConversion.h
+platform/darwin/src/MGLLight.h
+platform/darwin/src/MGLLight.mm
+platform/darwin/src/MGLLight_Private.h
+platform/darwin/src/MGLStyleValue.h
+platform/darwin/src/MGLStyleValue.mm
+platform/darwin/src/MGLStyleValue_Private.h
+
+# SDK/Foundation/Styling/Categories
+platform/darwin/src/NSValue+MGLStyleAttributeAdditions.h
+platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm
+
+# SDK/Foundation/Styling/Layers
+platform/darwin/src/MGLBackgroundStyleLayer.h
+platform/darwin/src/MGLBackgroundStyleLayer.mm
+platform/darwin/src/MGLBackgroundStyleLayer_Private.h
+platform/darwin/src/MGLCircleStyleLayer.h
+platform/darwin/src/MGLCircleStyleLayer.mm
+platform/darwin/src/MGLCircleStyleLayer_Private.h
+platform/darwin/src/MGLFillExtrusionStyleLayer.h
+platform/darwin/src/MGLFillExtrusionStyleLayer.mm
+platform/darwin/src/MGLFillExtrusionStyleLayer_Private.h
+platform/darwin/src/MGLFillStyleLayer.h
+platform/darwin/src/MGLFillStyleLayer.mm
+platform/darwin/src/MGLFillStyleLayer_Private.h
+platform/darwin/src/MGLForegroundStyleLayer.h
+platform/darwin/src/MGLForegroundStyleLayer.mm
+platform/darwin/src/MGLHeatmapStyleLayer.h
+platform/darwin/src/MGLHeatmapStyleLayer.mm
+platform/darwin/src/MGLHeatmapStyleLayer_Private.h
+platform/darwin/src/MGLHillshadeStyleLayer.h
+platform/darwin/src/MGLHillshadeStyleLayer.mm
+platform/darwin/src/MGLHillshadeStyleLayer_Private.h
+platform/darwin/src/MGLLineStyleLayer.h
+platform/darwin/src/MGLLineStyleLayer.mm
+platform/darwin/src/MGLLineStyleLayer_Private.h
+platform/darwin/src/MGLOpenGLStyleLayer.h
+platform/darwin/src/MGLOpenGLStyleLayer.mm
+platform/darwin/src/MGLOpenGLStyleLayer_Private.h
+platform/darwin/src/MGLRasterStyleLayer.h
+platform/darwin/src/MGLRasterStyleLayer.mm
+platform/darwin/src/MGLRasterStyleLayer_Private.h
+platform/darwin/src/MGLStyleLayer.h
+platform/darwin/src/MGLStyleLayer.mm
+platform/darwin/src/MGLStyleLayerManager.h
+platform/darwin/src/MGLStyleLayerManager.mm
+platform/darwin/src/MGLStyleLayer_Private.h
+platform/darwin/src/MGLSymbolStyleLayer.h
+platform/darwin/src/MGLSymbolStyleLayer.mm
+platform/darwin/src/MGLSymbolStyleLayer_Private.h
+platform/darwin/src/MGLVectorStyleLayer.h
+platform/darwin/src/MGLVectorStyleLayer.m
+
+# SDK/Foundation/Styling/Sources
+platform/darwin/src/MGLComputedShapeSource.h
+platform/darwin/src/MGLComputedShapeSource.mm
+platform/darwin/src/MGLComputedShapeSource_Private.h
+platform/darwin/src/MGLImageSource.h
+platform/darwin/src/MGLImageSource.mm
+platform/darwin/src/MGLRasterDEMSource.h
+platform/darwin/src/MGLRasterDEMSource.mm
+platform/darwin/src/MGLRasterTileSource.h
+platform/darwin/src/MGLRasterTileSource.mm
+platform/darwin/src/MGLRasterTileSource_Private.h
+platform/darwin/src/MGLShapeSource.h
+platform/darwin/src/MGLShapeSource.mm
+platform/darwin/src/MGLShapeSource_Private.h
+platform/darwin/src/MGLSource.h
+platform/darwin/src/MGLSource.mm
+platform/darwin/src/MGLSource_Private.h
+platform/darwin/src/MGLTileSource.h
+platform/darwin/src/MGLTileSource.mm
+platform/darwin/src/MGLTileSource_Private.h
+platform/darwin/src/MGLVectorTileSource.h
+platform/darwin/src/MGLVectorTileSource.mm
+platform/darwin/src/MGLVectorTileSource_Private.h
+
+# SDK/Kit
+platform/macos/src/MGLAnnotationImage.h
+platform/macos/src/MGLAnnotationImage.m
+platform/macos/src/MGLAnnotationImage_Private.h
+platform/macos/src/MGLAttributionButton.h
+platform/macos/src/MGLAttributionButton.mm
+platform/macos/src/MGLCompassCell.h
+platform/macos/src/MGLCompassCell.m
+platform/macos/src/MGLMapView+IBAdditions.h
+platform/macos/src/MGLMapView+IBAdditions.mm
+platform/macos/src/MGLMapView.h
+platform/macos/src/MGLMapView.mm
+platform/macos/src/MGLMapViewDelegate.h
+platform/macos/src/MGLMapView_Private.h
+platform/macos/src/MGLOpenGLLayer.h
+platform/macos/src/MGLOpenGLLayer.mm
+
+# SDK/Kit/Categories
+platform/macos/src/NSColor+MGLAdditions.h
+platform/macos/src/NSColor+MGLAdditions.mm
+platform/macos/src/NSImage+MGLAdditions.h
+platform/macos/src/NSImage+MGLAdditions.mm
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake
index a2c6b0a9e9..68b32b9eb9 100644
--- a/platform/qt/config.cmake
+++ b/platform/qt/config.cmake
@@ -6,7 +6,7 @@ macro(mbgl_platform_core)
     )
 
     target_include_directories(mbgl-core
-        PUBLIC platform/default
+        PUBLIC platform/default/include
         PRIVATE platform/qt
         PRIVATE platform/qt/include
     )
@@ -18,8 +18,8 @@ macro(mbgl_platform_core)
 
     if(NOT WITH_QT_DECODERS)
         target_sources(mbgl-core
-            PRIVATE platform/default/jpeg_reader.cpp
-            PRIVATE platform/default/png_reader.cpp
+            PRIVATE platform/default/src/mbgl/util/jpeg_reader.cpp
+            PRIVATE platform/default/src/mbgl/util/png_reader.cpp
         )
 
         target_add_mason_package(mbgl-core PRIVATE libjpeg-turbo)
@@ -29,7 +29,7 @@ macro(mbgl_platform_core)
     endif()
 
     if(NOT WITH_QT_I18N)
-        target_sources(mbgl-core PRIVATE platform/default/bidi.cpp)
+        target_sources(mbgl-core PRIVATE platform/default/src/mbgl/text/bidi.cpp)
         target_link_libraries(mbgl-core PRIVATE icu)
     else()
         target_sources(mbgl-core PRIVATE platform/qt/src/bidi.cpp)
diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake
index 2e334563ed..a7b48ac4b1 100644
--- a/platform/qt/qt.cmake
+++ b/platform/qt/qt.cmake
@@ -11,17 +11,17 @@ set(CMAKE_AUTORCC ON)
 
 set(MBGL_QT_CORE_FILES
     # Headless view
-    PRIVATE platform/default/mbgl/gl/headless_frontend.cpp
-    PRIVATE platform/default/mbgl/gl/headless_frontend.hpp
-    PRIVATE platform/default/mbgl/gl/headless_backend.cpp
-    PRIVATE platform/default/mbgl/gl/headless_backend.hpp
+    PRIVATE platform/default/src/mbgl/gl/headless_frontend.cpp
+    PRIVATE platform/default/include/mbgl/gl/headless_frontend.hpp
+    PRIVATE platform/default/src/mbgl/gl/headless_backend.cpp
+    PRIVATE platform/default/include/mbgl/gl/headless_backend.hpp
     PRIVATE platform/qt/src/headless_backend_qt.cpp
 
     # Thread pool
-    PRIVATE platform/default/mbgl/util/shared_thread_pool.cpp
-    PRIVATE platform/default/mbgl/util/shared_thread_pool.hpp
-    PRIVATE platform/default/mbgl/util/default_thread_pool.cpp
-    PRIVATE platform/default/mbgl/util/default_thread_pool.hpp
+    PRIVATE platform/default/src/mbgl/util/shared_thread_pool.cpp
+    PRIVATE platform/default/include/mbgl/util/shared_thread_pool.hpp
+    PRIVATE platform/default/src/mbgl/util/default_thread_pool.cpp
+    PRIVATE platform/default/include/mbgl/util/default_thread_pool.hpp
 
     # Thread
     PRIVATE platform/qt/src/thread_local.cpp
@@ -38,13 +38,13 @@ set(MBGL_QT_CORE_FILES
     PRIVATE platform/qt/src/timer_impl.hpp
     PRIVATE platform/qt/src/utf.cpp
 
-    PRIVATE platform/default/local_glyph_rasterizer.cpp
-    PRIVATE platform/default/collator.cpp
-    PRIVATE platform/default/unaccent.cpp
-    PRIVATE platform/default/unaccent.hpp
+    PRIVATE platform/default/src/mbgl/text/local_glyph_rasterizer.cpp
+    PRIVATE platform/default/src/mbgl/text/collator.cpp
+    PRIVATE platform/default/src/mbgl/text/unaccent.cpp
+    PRIVATE platform/default/include/mbgl/text/unaccent.hpp
 
     #Layer manager
-    PRIVATE platform/default/layer_manager.cpp
+    PRIVATE platform/default/src/mbgl/layermanager/layer_manager.cpp
 )
 
 set(MBGL_QT_FILESOURCE_FILES
@@ -76,7 +76,7 @@ add_library(qmapboxgl SHARED
     platform/qt/src/qmapboxgl_renderer_backend.hpp
     platform/qt/src/qmapboxgl_scheduler.cpp
     platform/qt/src/qmapboxgl_scheduler.hpp
-    platform/default/mbgl/util/default_styles.hpp
+    platform/default/include/mbgl/util/default_styles.hpp
 )
 
 target_include_directories(qmapboxgl
@@ -150,7 +150,7 @@ if (MASON_PLATFORM STREQUAL "osx" OR MASON_PLATFORM STREQUAL "ios")
     )
 elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
     list(APPEND MBGL_QT_CORE_FILES
-        PRIVATE platform/default/thread.cpp
+        PRIVATE platform/default/src/mbgl/util/thread.cpp
     )
 elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
     add_definitions("-DQT_COMPILING_QIMAGE_COMPAT_CPP")
diff --git a/platform/qt/src/sqlite3.cpp b/platform/qt/src/sqlite3.cpp
index 6427126875..75befc37c8 100644
--- a/platform/qt/src/sqlite3.cpp
+++ b/platform/qt/src/sqlite3.cpp
@@ -1,4 +1,4 @@
-#include "sqlite3.hpp"
+#include <mbgl/storage/sqlite3.hpp>
 
 #include <QSqlDatabase>
 #include <QSqlError>