13 files changed, 30 insertions, 34 deletions
diff --git a/cmake/benchmark-files.txt b/cmake/benchmark-files.txt
index 16224e9cad..d739710d27 100644
--- a/cmake/benchmark-files.txt
+++ b/cmake/benchmark-files.txt
@@ -23,4 +23,3 @@ benchmark/parse/vector_tile.benchmark.cpp
 # util
 benchmark/util/dtoa.benchmark.cpp
 benchmark/util/tilecover.benchmark.cpp
-
diff --git a/cmake/benchmark.cmake b/cmake/benchmark.cmake
index b5452a573a..0d2eebb228 100644
--- a/cmake/benchmark.cmake
+++ b/cmake/benchmark.cmake
@@ -6,7 +6,7 @@ target_include_directories(mbgl-benchmark
     PRIVATE src
     PRIVATE benchmark/include
     PRIVATE benchmark/src
-    PRIVATE platform/default
+    PRIVATE platform/default/include
 )
 
 target_link_libraries(mbgl-benchmark
diff --git a/cmake/core-files.txt b/cmake/core-files.txt
index 5712db9f15..008cf23180 100644
--- a/cmake/core-files.txt
+++ b/cmake/core-files.txt
@@ -802,4 +802,3 @@ src/mbgl/util/utf.hpp
 src/mbgl/util/version.cpp
 src/mbgl/util/version.hpp
 src/mbgl/util/work_request.cpp
-
diff --git a/cmake/files.txt.ejs b/cmake/files.txt.ejs
index 6c210347f6..6faa184c29 100644
--- a/cmake/files.txt.ejs
+++ b/cmake/files.txt.ejs
@@ -2,9 +2,8 @@
   const groups = locals.groups;
 -%>
 # This file is generated. Do not edit. Regenerate this with scripts/generate-cmake-files.js
-
 <% for (const key of Object.keys(groups).sort()) { -%>
+
 # <%- key %>
 <%- groups[key].sort().join('\n') %>
-
 <% } -%>
diff --git a/cmake/filesource-files.txt b/cmake/filesource-files.txt
index 472a08fa08..1909885e47 100644
--- a/cmake/filesource-files.txt
+++ b/cmake/filesource-files.txt
@@ -1,25 +1,25 @@
 # File source
 include/mbgl/storage/default_file_source.hpp
-platform/default/default_file_source.cpp
-platform/default/mbgl/storage/file_source_request.hpp
-platform/default/file_source_request.cpp
+platform/default/src/mbgl/storage/default_file_source.cpp
+platform/default/include/mbgl/storage/file_source_request.hpp
+platform/default/src/mbgl/storage/file_source_request.cpp
 include/mbgl/storage/online_file_source.hpp
-platform/default/online_file_source.cpp
+platform/default/src/mbgl/storage/online_file_source.cpp
 src/mbgl/storage/http_file_source.hpp
 src/mbgl/storage/asset_file_source.hpp
-platform/default/asset_file_source.cpp
+platform/default/src/mbgl/storage/asset_file_source.cpp
 src/mbgl/storage/local_file_source.hpp
-platform/default/local_file_source.cpp
+platform/default/src/mbgl/storage/local_file_source.cpp
 
 # Offline
 include/mbgl/storage/offline.hpp
-platform/default/mbgl/storage/offline.cpp
-platform/default/mbgl/storage/offline_database.hpp
-platform/default/mbgl/storage/offline_database.cpp
-platform/default/mbgl/storage/offline_download.hpp
-platform/default/mbgl/storage/offline_download.cpp
-platform/default/mbgl/storage/offline_schema.hpp
-platform/default/mbgl/storage/merge_sideloaded.hpp
+platform/default/src/mbgl/storage/offline.cpp
+platform/default/include/mbgl/storage/offline_database.hpp
+platform/default/src/mbgl/storage/offline_database.cpp
+platform/default/include/mbgl/storage/offline_download.hpp
+platform/default/src/mbgl/storage/offline_download.cpp
+platform/default/include/mbgl/storage/offline_schema.hpp
+platform/default/include/mbgl/storage/merge_sideloaded.hpp
 
 # Database
-platform/default/sqlite3.hpp
+platform/default/include/mbgl/storage/sqlite3.hpp
diff --git a/cmake/filesource.cmake b/cmake/filesource.cmake
index 5b99170489..e02467633b 100644
--- a/cmake/filesource.cmake
+++ b/cmake/filesource.cmake
@@ -5,7 +5,7 @@ add_library(mbgl-filesource STATIC ${MBGL_FILESOURCE_FILES})
 target_include_directories(mbgl-filesource
     PRIVATE include
     PRIVATE src
-    PRIVATE platform/default
+    PRIVATE platform/default/include
 )
 
 target_link_libraries(mbgl-filesource
diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake
index fe514196d5..b87ba74caf 100644
--- a/cmake/glfw.cmake
+++ b/cmake/glfw.cmake
@@ -9,11 +9,11 @@ target_sources(mbgl-glfw
     PRIVATE platform/glfw/glfw_renderer_frontend.cpp
     PRIVATE platform/glfw/settings_json.hpp
     PRIVATE platform/glfw/settings_json.cpp
-    PRIVATE platform/default/mbgl/util/default_styles.hpp
+    PRIVATE platform/default/include/mbgl/util/default_styles.hpp
 )
 
 target_include_directories(mbgl-glfw
-    PRIVATE platform/default
+    PRIVATE platform/default/include
 )
 
 target_link_libraries(mbgl-glfw
diff --git a/cmake/loop-uv.cmake b/cmake/loop-uv.cmake
index e1d3166b63..320545b3c3 100644
--- a/cmake/loop-uv.cmake
+++ b/cmake/loop-uv.cmake
@@ -1,9 +1,9 @@
 add_library(mbgl-loop-uv INTERFACE)
 
 target_sources(mbgl-loop-uv INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/async_task.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/run_loop.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/timer.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/async_task.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/run_loop.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/timer.cpp
 )
 
 target_include_directories(mbgl-loop-uv INTERFACE
diff --git a/cmake/node.cmake b/cmake/node.cmake
index cb98d570f7..f126b81637 100644
--- a/cmake/node.cmake
+++ b/cmake/node.cmake
@@ -5,9 +5,9 @@ include(node_modules/@mapbox/cmake-node-module/module.cmake)
 add_library(mbgl-loop-node INTERFACE)
 
 target_sources(mbgl-loop-node INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/async_task.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/run_loop.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/timer.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/async_task.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/run_loop.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/timer.cpp
 )
 
 target_include_directories(mbgl-loop-node INTERFACE
@@ -49,7 +49,7 @@ target_sources(mbgl-node INTERFACE
 )
 
 target_include_directories(mbgl-node INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default
+    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/include
 )
 
 target_link_libraries(mbgl-node INTERFACE
diff --git a/cmake/offline.cmake b/cmake/offline.cmake
index c17ffb2ef3..9f7261cd6c 100644
--- a/cmake/offline.cmake
+++ b/cmake/offline.cmake
@@ -3,11 +3,11 @@ add_executable(mbgl-offline
 )
 
 target_sources(mbgl-offline
-    PRIVATE platform/default/mbgl/util/default_styles.hpp
+    PRIVATE platform/default/include/mbgl/util/default_styles.hpp
 )
 
 target_include_directories(mbgl-offline
-    PRIVATE platform/default
+    PRIVATE platform/default/include
 )
 
 target_link_libraries(mbgl-offline
diff --git a/cmake/render.cmake b/cmake/render.cmake
index 44912e5302..9a67a2a25e 100644
--- a/cmake/render.cmake
+++ b/cmake/render.cmake
@@ -3,7 +3,7 @@ add_executable(mbgl-render
 )
 
 target_include_directories(mbgl-render
-    PRIVATE platform/default
+    PRIVATE platform/default/include
 )
 
 target_link_libraries(mbgl-render
diff --git a/cmake/test-files.txt b/cmake/test-files.txt
index 4c7029f9f0..c7f71bd24a 100644
--- a/cmake/test-files.txt
+++ b/cmake/test-files.txt
@@ -153,4 +153,3 @@ test/util/tile_range.test.cpp
 test/util/timer.test.cpp
 test/util/token.test.cpp
 test/util/url.test.cpp
-
diff --git a/cmake/test.cmake b/cmake/test.cmake
index 4f7933ade2..977f4a1413 100644
--- a/cmake/test.cmake
+++ b/cmake/test.cmake
@@ -21,7 +21,7 @@ target_include_directories(mbgl-test
     PRIVATE src
     PRIVATE test/include
     PRIVATE test/src
-    PRIVATE platform/default
+    PRIVATE platform/default/include
 )
 
 target_link_libraries(mbgl-test PRIVATE