7 files changed, 28 insertions, 25 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"