diff --git a/cmake/mln_ffi_platform.cmake b/cmake/mln_ffi_platform.cmake
index 727139a9e..8b997fb9a 100644
--- a/cmake/mln_ffi_platform.cmake
+++ b/cmake/mln_ffi_platform.cmake
@@ -48,51 +48,51 @@ endfunction()
 
 function(mln_ffi_configure_platform_support target)
   set(MLN_FFI_VENDOR_PLATFORM_SOURCES
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/monotonic_timer.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/gfx/headless_backend.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/layermanager/layer_manager.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/storage/database_file_source.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/storage/file_source_request.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/storage/local_file_request.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/storage/local_file_source.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/storage/main_resource_loader.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/storage/mbtiles_file_source.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/storage/offline.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/storage/offline_database.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/storage/offline_download.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/storage/online_file_source.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/storage/sqlite3.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/platform/time.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/compression.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/filesystem.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/utf.cpp)
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/monotonic_timer.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/gfx/headless_backend.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/layermanager/layer_manager.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/storage/database_file_source.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/storage/file_source_request.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/storage/local_file_request.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/storage/local_file_source.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/storage/main_resource_loader.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/storage/mbtiles_file_source.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/storage/offline.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/storage/offline_database.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/storage/offline_download.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/storage/online_file_source.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/storage/sqlite3.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/platform/time.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/compression.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/filesystem.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/utf.cpp)
 
   get_target_property(
     MLN_FFI_DEFAULT_LOGGING_STDERR mln_ffi_platform_dependencies
     MLN_FFI_DEFAULT_LOGGING_STDERR)
   if(MLN_FFI_DEFAULT_LOGGING_STDERR)
     list(APPEND MLN_FFI_VENDOR_PLATFORM_SOURCES
-         ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/logging_stderr.cpp)
+         ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/logging_stderr.cpp)
   endif()
 
   get_target_property(MLN_FFI_DEFAULT_THREAD_LOCAL mln_ffi_platform_dependencies
                       MLN_FFI_DEFAULT_THREAD_LOCAL)
   if(MLN_FFI_DEFAULT_THREAD_LOCAL)
     list(APPEND MLN_FFI_VENDOR_PLATFORM_SOURCES
-         ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/thread_local.cpp)
+         ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/thread_local.cpp)
   endif()
 
   if(NOT CMAKE_SYSTEM_NAME STREQUAL "Android")
     list(APPEND MLN_FFI_VENDOR_PLATFORM_SOURCES
-         ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/storage/asset_file_source.cpp)
+         ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/storage/asset_file_source.cpp)
   endif()
 
   if(MLN_WITH_PMTILES)
     list(APPEND MLN_FFI_VENDOR_PLATFORM_SOURCES
-         ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/storage/pmtiles_file_source.cpp)
+         ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/storage/pmtiles_file_source.cpp)
   else()
     list(APPEND MLN_FFI_VENDOR_PLATFORM_SOURCES
-         ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/storage/pmtiles_file_source_stub.cpp)
+         ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/storage/pmtiles_file_source_stub.cpp)
   endif()
 
   mln_ffi_target_vendor_sources(${target} ${MLN_FFI_VENDOR_PLATFORM_SOURCES})
diff --git a/cmake/platform/android.cmake b/cmake/platform/android.cmake
index 8dbe61a79..10e4f89ad 100644
--- a/cmake/platform/android.cmake
+++ b/cmake/platform/android.cmake
@@ -48,12 +48,12 @@ function(mln_ffi_configure_platform target)
       ${MLN_FFI_SOURCE_DIR}/platform/android/src/async_task.cpp
       ${MLN_FFI_SOURCE_DIR}/platform/android/src/run_loop.cpp
       ${MLN_FFI_SOURCE_DIR}/platform/android/src/timer.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/i18n/collator.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/i18n/number_format.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/text/bidi.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/png_writer.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/string_stdlib.cpp)
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/i18n/collator.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/i18n/number_format.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/text/bidi.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/text/local_glyph_rasterizer.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/png_writer.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/string_stdlib.cpp)
 
   set(MLN_FFI_ANDROID_SOURCES
       ${PROJECT_SOURCE_DIR}/src/platform/android/asset_file_source.cpp
@@ -66,7 +66,7 @@ function(mln_ffi_configure_platform target)
   mln_ffi_target_project_sources(${target} ${MLN_FFI_ANDROID_SOURCES})
 
   set_source_files_properties(
-    ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/i18n/number_format.cpp
+    ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/i18n/number_format.cpp
     PROPERTIES COMPILE_DEFINITIONS MBGL_USE_BUILTIN_ICU)
 
   target_include_directories(
diff --git a/cmake/platform/apple.cmake b/cmake/platform/apple.cmake
index ada97b58a..471bc55ad 100644
--- a/cmake/platform/apple.cmake
+++ b/cmake/platform/apple.cmake
@@ -127,7 +127,7 @@ endfunction()
 
 function(mln_ffi_configure_platform target)
   set(MLN_FFI_VENDOR_APPLE_SOURCES
-      ${MLN_FFI_SOURCE_DIR}/platform/qt/src/mbgl/bidi.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/qt/src/mln/bidi.cpp
       ${MLN_FFI_SOURCE_DIR}/platform/darwin/core/async_task.cpp
       ${MLN_FFI_SOURCE_DIR}/platform/darwin/core/collator.mm
       ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../../src/platform/apple/http_file_source.mm
diff --git a/cmake/platform/emscripten.cmake b/cmake/platform/emscripten.cmake
index 8cd04f01b..6b6e0cba2 100644
--- a/cmake/platform/emscripten.cmake
+++ b/cmake/platform/emscripten.cmake
@@ -45,13 +45,13 @@ function(mln_ffi_configure_platform target)
   # built on libuv, whose event loop has no browser backing. src/platform/
   # emscripten supplies them instead.
   set(MLN_FFI_VENDOR_EMSCRIPTEN_SOURCES
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/i18n/collator.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/i18n/number_format.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/text/bidi.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/monotonic_timer.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/png_writer.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/string_stdlib.cpp)
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/i18n/collator.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/i18n/number_format.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/text/bidi.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/text/local_glyph_rasterizer.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/monotonic_timer.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/png_writer.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/string_stdlib.cpp)
 
   set(MLN_FFI_EMSCRIPTEN_SOURCES
       ${PROJECT_SOURCE_DIR}/src/platform/emscripten/async_task.cpp
@@ -65,7 +65,7 @@ function(mln_ffi_configure_platform target)
   mln_ffi_target_project_sources(${target} ${MLN_FFI_EMSCRIPTEN_SOURCES})
 
   set_source_files_properties(
-    ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/i18n/number_format.cpp
+    ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/i18n/number_format.cpp
     PROPERTIES COMPILE_DEFINITIONS MBGL_USE_BUILTIN_ICU)
 
   target_include_directories(
diff --git a/cmake/platform/linux.cmake b/cmake/platform/linux.cmake
index c402f4af4..4c2a9becb 100644
--- a/cmake/platform/linux.cmake
+++ b/cmake/platform/linux.cmake
@@ -179,16 +179,16 @@ function(mln_ffi_configure_platform target)
   include("${MLN_FFI_SOURCE_DIR}/vendor/icu.cmake")
 
   set(MLN_FFI_VENDOR_LINUX_SOURCES
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/i18n/collator.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/i18n/number_format.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/text/bidi.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/async_task.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/png_writer.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/run_loop.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/string_stdlib.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/thread.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/timer.cpp)
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/i18n/collator.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/i18n/number_format.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/text/bidi.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/text/local_glyph_rasterizer.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/async_task.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/png_writer.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/run_loop.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/string_stdlib.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/thread.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/timer.cpp)
 
   set(MLN_FFI_LINUX_SOURCES
       ${PROJECT_SOURCE_DIR}/src/platform/rust/http_file_source.cpp
@@ -198,7 +198,7 @@ function(mln_ffi_configure_platform target)
   mln_ffi_target_project_sources(${target} ${MLN_FFI_LINUX_SOURCES})
 
   set_source_files_properties(
-    ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/i18n/number_format.cpp
+    ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/i18n/number_format.cpp
     PROPERTIES COMPILE_DEFINITIONS MBGL_USE_BUILTIN_ICU)
 
   target_include_directories(
diff --git a/cmake/platform/ohos.cmake b/cmake/platform/ohos.cmake
index ff2b157d1..eebfb6b52 100644
--- a/cmake/platform/ohos.cmake
+++ b/cmake/platform/ohos.cmake
@@ -66,20 +66,20 @@ function(mln_ffi_configure_platform target)
   include("${MLN_FFI_SOURCE_DIR}/vendor/icu.cmake")
 
   set_source_files_properties(
-    ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/i18n/number_format.cpp
+    ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/i18n/number_format.cpp
     PROPERTIES COMPILE_DEFINITIONS MBGL_USE_BUILTIN_ICU)
 
   set(MLN_FFI_VENDOR_OHOS_SOURCES
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/i18n/collator.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/i18n/number_format.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/text/bidi.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/async_task.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/png_writer.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/run_loop.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/string_stdlib.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/thread.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/timer.cpp)
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/i18n/collator.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/i18n/number_format.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/text/bidi.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/text/local_glyph_rasterizer.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/async_task.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/png_writer.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/run_loop.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/string_stdlib.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/thread.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/timer.cpp)
   set(MLN_FFI_OHOS_SOURCES
       ${PROJECT_SOURCE_DIR}/src/platform/ohos/http_file_source.cpp
       ${PROJECT_SOURCE_DIR}/src/platform/ohos/image.cpp
diff --git a/cmake/platform/windows.cmake b/cmake/platform/windows.cmake
index e38a7bbe1..194115e0d 100644
--- a/cmake/platform/windows.cmake
+++ b/cmake/platform/windows.cmake
@@ -74,15 +74,15 @@ function(mln_ffi_configure_platform target)
   include("${MLN_FFI_SOURCE_DIR}/vendor/icu.cmake")
 
   set(MLN_FFI_VENDOR_WINDOWS_SOURCES
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/i18n/collator.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/i18n/number_format.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/text/bidi.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/async_task.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/png_writer.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/run_loop.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/string_stdlib.cpp
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/util/timer.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/i18n/collator.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/i18n/number_format.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/text/bidi.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/text/local_glyph_rasterizer.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/async_task.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/png_writer.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/run_loop.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/string_stdlib.cpp
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/util/timer.cpp
       ${MLN_FFI_SOURCE_DIR}/platform/windows/src/thread.cpp
       ${MLN_FFI_SOURCE_DIR}/platform/windows/src/thread_local.cpp)
 
@@ -94,7 +94,7 @@ function(mln_ffi_configure_platform target)
   mln_ffi_target_project_sources(${target} ${MLN_FFI_WINDOWS_SOURCES})
 
   set_source_files_properties(
-    ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/i18n/number_format.cpp
+    ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/i18n/number_format.cpp
     PROPERTIES COMPILE_DEFINITIONS MBGL_USE_BUILTIN_ICU)
 
   target_include_directories(
diff --git a/cmake/render/metal.cmake b/cmake/render/metal.cmake
index 7035b3363..d20aa88a8 100644
--- a/cmake/render/metal.cmake
+++ b/cmake/render/metal.cmake
@@ -8,7 +8,7 @@ function(mln_ffi_configure_renderer target)
   target_compile_definitions(${target} PRIVATE MLN_RENDER_BACKEND_METAL=1)
 
   set(MLN_FFI_VENDOR_METAL_SOURCES
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/mtl/headless_backend.cpp)
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/mtl/headless_backend.cpp)
   set(MLN_FFI_METAL_SOURCES
       ${PROJECT_SOURCE_DIR}/src/render/metal/metal_texture_session.mm
       ${PROJECT_SOURCE_DIR}/src/render/metal/metal_texture_backend.mm
diff --git a/cmake/render/opengl.cmake b/cmake/render/opengl.cmake
index a428c8fc9..cbba658be 100644
--- a/cmake/render/opengl.cmake
+++ b/cmake/render/opengl.cmake
@@ -94,7 +94,7 @@ function(mln_ffi_configure_renderer target)
   target_compile_definitions(${target} PRIVATE MLN_RENDER_BACKEND_OPENGL=1)
 
   set(MLN_FFI_VENDOR_OPENGL_SOURCES
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/gl/headless_backend.cpp)
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/gl/headless_backend.cpp)
   if(MLN_FFI_OPENGL_CONTEXT_PROVIDER STREQUAL "webgl")
     # A browser host owns its WebGL context and hands it to a session, so
     # upstream's EGL headless host has nothing to do here.
diff --git a/cmake/render/vulkan.cmake b/cmake/render/vulkan.cmake
index 0c4839beb..52ce0d809 100644
--- a/cmake/render/vulkan.cmake
+++ b/cmake/render/vulkan.cmake
@@ -102,7 +102,7 @@ function(mln_ffi_configure_renderer target)
   target_compile_definitions(${target} PRIVATE MLN_RENDER_BACKEND_VULKAN=1)
 
   set(MLN_FFI_VENDOR_VULKAN_SOURCES
-      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mbgl/vulkan/headless_backend.cpp)
+      ${MLN_FFI_SOURCE_DIR}/platform/default/src/mln/vulkan/headless_backend.cpp)
   set(MLN_FFI_VULKAN_SOURCES
       ${PROJECT_SOURCE_DIR}/src/render/vulkan/vulkan_dispatch.cpp
       ${PROJECT_SOURCE_DIR}/src/render/vulkan/vulkan_texture_session.cpp
diff --git a/patches/maplibre-native/0002-windows-local-file-urls.patch b/patches/maplibre-native/0002-windows-local-file-urls.patch
index 38bd03563..6e2225eaf 100644
--- a/patches/maplibre-native/0002-windows-local-file-urls.patch
+++ b/patches/maplibre-native/0002-windows-local-file-urls.patch
@@ -1,7 +1,7 @@
-diff --git a/platform/default/src/mbgl/storage/local_file_request.cpp b/platform/default/src/mbgl/storage/local_file_request.cpp
+diff --git a/platform/default/src/mln/storage/local_file_request.cpp b/platform/default/src/mln/storage/local_file_request.cpp
 index 8c6cf43..325e1aa 100644
---- a/platform/default/src/mbgl/storage/local_file_request.cpp
-+++ b/platform/default/src/mbgl/storage/local_file_request.cpp
+--- a/platform/default/src/mln/storage/local_file_request.cpp
++++ b/platform/default/src/mln/storage/local_file_request.cpp
 @@ -5,6 +5,10 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -28,10 +28,10 @@ index 8c6cf43..325e1aa 100644
  
      if (result == 0 && (S_IFDIR & buf.st_mode)) {
          response.error = std::make_unique<Response::Error>(Response::Error::Reason::NotFound);
-diff --git a/platform/default/src/mbgl/storage/local_file_source.cpp b/platform/default/src/mbgl/storage/local_file_source.cpp
+diff --git a/platform/default/src/mln/storage/local_file_source.cpp b/platform/default/src/mln/storage/local_file_source.cpp
 index e855e06..26f9c84 100644
---- a/platform/default/src/mbgl/storage/local_file_source.cpp
-+++ b/platform/default/src/mbgl/storage/local_file_source.cpp
+--- a/platform/default/src/mln/storage/local_file_source.cpp
++++ b/platform/default/src/mln/storage/local_file_source.cpp
 @@ -34,8 +34,16 @@ public:
          }
  
@@ -50,10 +50,10 @@ index e855e06..26f9c84 100644
          requestLocalFile(path, req, resource.dataRange);
      }
  
-diff --git a/src/mbgl/util/io.cpp b/src/mbgl/util/io.cpp
+diff --git a/src/mln/util/io.cpp b/src/mln/util/io.cpp
 index af44566..e705eea 100644
---- a/src/mbgl/util/io.cpp
-+++ b/src/mbgl/util/io.cpp
+--- a/src/mln/util/io.cpp
++++ b/src/mln/util/io.cpp
 @@ -8,6 +8,10 @@
  #include <sstream>
  #include <fstream>
diff --git a/patches/maplibre-native/0003-run-loop-process-gate.patch b/patches/maplibre-native/0003-run-loop-process-gate.patch
index 3c5d55698..5a06aee24 100644
--- a/patches/maplibre-native/0003-run-loop-process-gate.patch
+++ b/patches/maplibre-native/0003-run-loop-process-gate.patch
@@ -1,7 +1,7 @@
-diff --git a/include/mbgl/util/run_loop.hpp b/include/mbgl/util/run_loop.hpp
+diff --git a/include/mln/util/run_loop.hpp b/include/mln/util/run_loop.hpp
 index 88b3a35..968c0aa 100644
---- a/include/mbgl/util/run_loop.hpp
-+++ b/include/mbgl/util/run_loop.hpp
+--- a/include/mln/util/run_loop.hpp
++++ b/include/mln/util/run_loop.hpp
 @@ -56,6 +56,12 @@ public:
      /// same thread as the Map object lives.
      void setPlatformCallback(std::function<void()> callback) { platformCallback = std::move(callback); }
diff --git a/scripts/generate-gl-functions.py b/scripts/generate-gl-functions.py
index 08cfb0416..687a2dc78 100755
--- a/scripts/generate-gl-functions.py
+++ b/scripts/generate-gl-functions.py
@@ -54,7 +54,7 @@ def replace(match: re.Match[str]) -> str:
 
     # The prototypes only existed to give the initializers something to bind to.
     rewritten = rewritten.replace("#define GL_GLEXT_PROTOTYPES\n", "")
-    marker = "#include <mbgl/platform/gl_functions.hpp>\n"
+    marker = "#include <mln/platform/gl_functions.hpp>\n"
     if marker not in rewritten:
         raise SystemExit(f"error: unexpected header layout in {origin}")
     declarations = "".join(
diff --git a/src/geojson/geojson.cpp b/src/geojson/geojson.cpp
index cf5092429..71d7c6b03 100644
--- a/src/geojson/geojson.cpp
+++ b/src/geojson/geojson.cpp
@@ -3,18 +3,17 @@
 #include <string_view>
 #include <vector>
 
-#include <mbgl/style/conversion/geojson.hpp>
-#include <mbgl/style/conversion/stringify.hpp>
-#include <mbgl/style/conversion_impl.hpp>
-#include <mbgl/style/rapidjson_conversion.hpp>
-#include <mbgl/util/feature.hpp>
-#include <mbgl/util/geo.hpp>
-#include <mbgl/util/geojson.hpp>
-#include <mbgl/util/geometry.hpp>
-#include <mbgl/util/rapidjson.hpp>
-
 #include <mapbox/geojson.hpp>
 #include <mapbox/geojson/rapidjson.hpp>
+#include <mln/style/conversion/geojson.hpp>
+#include <mln/style/conversion/stringify.hpp>
+#include <mln/style/conversion_impl.hpp>
+#include <mln/style/rapidjson_conversion.hpp>
+#include <mln/util/feature.hpp>
+#include <mln/util/geo.hpp>
+#include <mln/util/geojson.hpp>
+#include <mln/util/geometry.hpp>
+#include <mln/util/rapidjson.hpp>
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>
 #include <rapidjson/stringbuffer.h>
diff --git a/src/geojson/geojson.hpp b/src/geojson/geojson.hpp
index 40034a13c..25bbfe049 100644
--- a/src/geojson/geojson.hpp
+++ b/src/geojson/geojson.hpp
@@ -4,11 +4,11 @@
 #include <string>
 #include <vector>
 
-#include <mbgl/util/feature.hpp>
-#include <mbgl/util/geo.hpp>
-#include <mbgl/util/geojson.hpp>
-#include <mbgl/util/geometry.hpp>
-#include <mbgl/util/rapidjson.hpp>
+#include <mln/util/feature.hpp>
+#include <mln/util/geo.hpp>
+#include <mln/util/geojson.hpp>
+#include <mln/util/geometry.hpp>
+#include <mln/util/rapidjson.hpp>
 
 #include "maplibre_native_c/base.h"
 
diff --git a/src/geojson/geojson_source_data.cpp b/src/geojson/geojson_source_data.cpp
index c4808322f..b67dad79b 100644
--- a/src/geojson/geojson_source_data.cpp
+++ b/src/geojson/geojson_source_data.cpp
@@ -10,14 +10,14 @@
 #include <utility>
 #include <vector>
 
-#include <mbgl/actor/scheduler.hpp>
-#include <mbgl/style/conversion/geojson_options.hpp>  // IWYU pragma: keep
-#include <mbgl/style/conversion/json.hpp>
-#include <mbgl/style/conversion_impl.hpp>
-#include <mbgl/tile/tile_id.hpp>
-#include <mbgl/util/geometry.hpp>
-#include <mbgl/util/identity.hpp>
-#include <mbgl/util/rapidjson.hpp>
+#include <mln/actor/scheduler.hpp>
+#include <mln/style/conversion/geojson_options.hpp>  // IWYU pragma: keep
+#include <mln/style/conversion/json.hpp>
+#include <mln/style/conversion_impl.hpp>
+#include <mln/tile/tile_id.hpp>
+#include <mln/util/geometry.hpp>
+#include <mln/util/identity.hpp>
+#include <mln/util/rapidjson.hpp>
 
 #include "geojson/geojson_source_data.hpp"
 
diff --git a/src/geojson/geojson_source_data.hpp b/src/geojson/geojson_source_data.hpp
index 775b6867d..d93764bf3 100644
--- a/src/geojson/geojson_source_data.hpp
+++ b/src/geojson/geojson_source_data.hpp
@@ -3,9 +3,9 @@
 #include <memory>
 #include <optional>
 
-#include <mbgl/style/sources/geojson_source.hpp>
-#include <mbgl/util/geojson.hpp>
-#include <mbgl/util/immutable.hpp>
+#include <mln/style/sources/geojson_source.hpp>
+#include <mln/util/geojson.hpp>
+#include <mln/util/immutable.hpp>
 
 #include "handles/handle_table.hpp"
 #include "maplibre_native_c/base.h"
diff --git a/src/logging/logging.cpp b/src/logging/logging.cpp
index 5e9211dde..5a61be6b0 100644
--- a/src/logging/logging.cpp
+++ b/src/logging/logging.cpp
@@ -2,8 +2,8 @@
 #include <memory>
 #include <string>
 
-#include <mbgl/util/event.hpp>
-#include <mbgl/util/logging.hpp>
+#include <mln/util/event.hpp>
+#include <mln/util/logging.hpp>
 
 #include "logging/logging.hpp"
 
diff --git a/src/map/feature_state.cpp b/src/map/feature_state.cpp
index 464c8871d..d26ee760e 100644
--- a/src/map/feature_state.cpp
+++ b/src/map/feature_state.cpp
@@ -2,10 +2,10 @@
 #include <ranges>
 #include <utility>
 
-#include <mbgl/renderer/renderer.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
-#include <mbgl/style/source_impl.hpp>
-#include <mbgl/util/feature.hpp>
+#include <mln/renderer/renderer.hpp>
+#include <mln/renderer/update_parameters.hpp>
+#include <mln/style/source_impl.hpp>
+#include <mln/util/feature.hpp>
 
 #include "map/feature_state.hpp"
 
diff --git a/src/map/feature_state.hpp b/src/map/feature_state.hpp
index 746d3bdda..43e62dfa1 100644
--- a/src/map/feature_state.hpp
+++ b/src/map/feature_state.hpp
@@ -9,7 +9,7 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include <mbgl/util/feature.hpp>
+#include <mln/util/feature.hpp>
 
 #include "maplibre_native_c.h"
 
diff --git a/src/map/map.cpp b/src/map/map.cpp
index d3eea9399..428e2f63c 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -24,59 +24,59 @@
 #include <utility>
 #include <vector>
 
-#include <mbgl/actor/actor_ref.hpp>
-#include <mbgl/actor/mailbox.hpp>
-#include <mbgl/actor/scheduler.hpp>
-#include <mbgl/gfx/rendering_stats.hpp>
-#include <mbgl/map/bound_options.hpp>
-#include <mbgl/map/camera.hpp>
-#include <mbgl/map/map.hpp>
-#include <mbgl/map/map_observer.hpp>
-#include <mbgl/map/map_options.hpp>
-#include <mbgl/map/map_projection.hpp>
-#include <mbgl/map/mode.hpp>
-#include <mbgl/map/projection_mode.hpp>
-#include <mbgl/renderer/renderer_frontend.hpp>
-#include <mbgl/renderer/renderer_observer.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
-#include <mbgl/style/conversion.hpp>
-#include <mbgl/style/conversion/json.hpp>
-#include <mbgl/style/conversion/layer.hpp>   // IWYU pragma: keep
-#include <mbgl/style/conversion/light.hpp>   // IWYU pragma: keep
-#include <mbgl/style/conversion/source.hpp>  // IWYU pragma: keep
-#include <mbgl/style/conversion_impl.hpp>
-#include <mbgl/style/image.hpp>
-#include <mbgl/style/layer.hpp>
-#include <mbgl/style/layers/color_relief_layer.hpp>
-#include <mbgl/style/layers/hillshade_layer.hpp>
-#include <mbgl/style/layers/location_indicator_layer.hpp>
-#include <mbgl/style/light.hpp>
-#include <mbgl/style/rapidjson_conversion.hpp>
-#include <mbgl/style/source.hpp>
-#include <mbgl/style/sources/custom_geometry_source.hpp>
-#include <mbgl/style/sources/custom_vector_source.hpp>
-#include <mbgl/style/sources/geojson_source.hpp>
-#include <mbgl/style/sources/image_source.hpp>
-#include <mbgl/style/sources/raster_dem_source.hpp>
-#include <mbgl/style/sources/raster_source.hpp>
-#include <mbgl/style/sources/vector_source.hpp>
-#include <mbgl/style/style.hpp>
-#include <mbgl/style/style_property.hpp>
-#include <mbgl/style/transition_options.hpp>
-#include <mbgl/style/types.hpp>
-#include <mbgl/tile/tile_id.hpp>
-#include <mbgl/tile/tile_operation.hpp>
-#include <mbgl/util/chrono.hpp>
-#include <mbgl/util/constants.hpp>
-#include <mbgl/util/feature.hpp>
-#include <mbgl/util/geo.hpp>
-#include <mbgl/util/image.hpp>
-#include <mbgl/util/immutable.hpp>
-#include <mbgl/util/projection.hpp>
-#include <mbgl/util/range.hpp>
-#include <mbgl/util/size.hpp>
-#include <mbgl/util/tileset.hpp>
-#include <mbgl/util/vectors.hpp>
+#include <mln/actor/actor_ref.hpp>
+#include <mln/actor/mailbox.hpp>
+#include <mln/actor/scheduler.hpp>
+#include <mln/gfx/rendering_stats.hpp>
+#include <mln/map/bound_options.hpp>
+#include <mln/map/camera.hpp>
+#include <mln/map/map.hpp>
+#include <mln/map/map_observer.hpp>
+#include <mln/map/map_options.hpp>
+#include <mln/map/map_projection.hpp>
+#include <mln/map/mode.hpp>
+#include <mln/map/projection_mode.hpp>
+#include <mln/renderer/renderer_frontend.hpp>
+#include <mln/renderer/renderer_observer.hpp>
+#include <mln/renderer/update_parameters.hpp>
+#include <mln/style/conversion.hpp>
+#include <mln/style/conversion/json.hpp>
+#include <mln/style/conversion/layer.hpp>   // IWYU pragma: keep
+#include <mln/style/conversion/light.hpp>   // IWYU pragma: keep
+#include <mln/style/conversion/source.hpp>  // IWYU pragma: keep
+#include <mln/style/conversion_impl.hpp>
+#include <mln/style/image.hpp>
+#include <mln/style/layer.hpp>
+#include <mln/style/layers/color_relief_layer.hpp>
+#include <mln/style/layers/hillshade_layer.hpp>
+#include <mln/style/layers/location_indicator_layer.hpp>
+#include <mln/style/light.hpp>
+#include <mln/style/rapidjson_conversion.hpp>
+#include <mln/style/source.hpp>
+#include <mln/style/sources/custom_geometry_source.hpp>
+#include <mln/style/sources/custom_vector_source.hpp>
+#include <mln/style/sources/geojson_source.hpp>
+#include <mln/style/sources/image_source.hpp>
+#include <mln/style/sources/raster_dem_source.hpp>
+#include <mln/style/sources/raster_source.hpp>
+#include <mln/style/sources/vector_source.hpp>
+#include <mln/style/style.hpp>
+#include <mln/style/style_property.hpp>
+#include <mln/style/transition_options.hpp>
+#include <mln/style/types.hpp>
+#include <mln/tile/tile_id.hpp>
+#include <mln/tile/tile_operation.hpp>
+#include <mln/util/chrono.hpp>
+#include <mln/util/constants.hpp>
+#include <mln/util/feature.hpp>
+#include <mln/util/geo.hpp>
+#include <mln/util/image.hpp>
+#include <mln/util/immutable.hpp>
+#include <mln/util/projection.hpp>
+#include <mln/util/range.hpp>
+#include <mln/util/size.hpp>
+#include <mln/util/tileset.hpp>
+#include <mln/util/vectors.hpp>
 
 #include "map/map.hpp"
 
diff --git a/src/platform/android/asset_file_source.cpp b/src/platform/android/asset_file_source.cpp
index d63f115a9..305cb6328 100644
--- a/src/platform/android/asset_file_source.cpp
+++ b/src/platform/android/asset_file_source.cpp
@@ -7,20 +7,19 @@
 #include <string_view>
 #include <utility>
 
-#include <mbgl/actor/actor.hpp>
-#include <mbgl/platform/settings.hpp>
-#include <mbgl/storage/asset_file_source.hpp>
-#include <mbgl/storage/file_source_request.hpp>
-#include <mbgl/storage/resource.hpp>
-#include <mbgl/storage/resource_options.hpp>
-#include <mbgl/storage/response.hpp>
-#include <mbgl/util/async_request.hpp>
-#include <mbgl/util/client_options.hpp>
-#include <mbgl/util/constants.hpp>
-#include <mbgl/util/thread.hpp>
-#include <mbgl/util/url.hpp>
-
 #include <android/asset_manager.h>
+#include <mln/actor/actor.hpp>
+#include <mln/platform/settings.hpp>
+#include <mln/storage/asset_file_source.hpp>
+#include <mln/storage/file_source_request.hpp>
+#include <mln/storage/resource.hpp>
+#include <mln/storage/resource_options.hpp>
+#include <mln/storage/response.hpp>
+#include <mln/util/async_request.hpp>
+#include <mln/util/client_options.hpp>
+#include <mln/util/constants.hpp>
+#include <mln/util/thread.hpp>
+#include <mln/util/url.hpp>
 #include <sys/types.h>
 
 #include "platform/android/asset_manager.hpp"
diff --git a/src/platform/android/thread.cpp b/src/platform/android/thread.cpp
index a18c7f75d..2086fae97 100644
--- a/src/platform/android/thread.cpp
+++ b/src/platform/android/thread.cpp
@@ -2,11 +2,10 @@
 #include <cmath>
 #include <string>
 
-#include <mbgl/platform/thread.hpp>
-#include <mbgl/util/event.hpp>
-#include <mbgl/util/logging.hpp>
-#include <mbgl/util/platform.hpp>
-
+#include <mln/platform/thread.hpp>
+#include <mln/util/event.hpp>
+#include <mln/util/logging.hpp>
+#include <mln/util/platform.hpp>
 #include <sys/prctl.h>
 #include <sys/resource.h>
 
diff --git a/src/platform/apple/http_file_source.mm b/src/platform/apple/http_file_source.mm
index 39dfe23cb..d0d86bf5b 100644
--- a/src/platform/apple/http_file_source.mm
+++ b/src/platform/apple/http_file_source.mm
@@ -3,18 +3,17 @@
 #include <cstdint>
 #include <mutex>
 
-#include <mbgl/interface/native_apple_interface.h>
-#include <mbgl/storage/http_file_source.hpp>
-#include <mbgl/storage/resource.hpp>
-#include <mbgl/storage/resource_options.hpp>
-#include <mbgl/storage/response.hpp>
-#include <mbgl/util/async_request.hpp>
-#include <mbgl/util/async_task.hpp>
-#include <mbgl/util/client_options.hpp>
-#include <mbgl/util/http_header.hpp>
-#include <mbgl/util/version.hpp>
-
 #import <Foundation/Foundation.h>
+#include <mln/interface/native_apple_interface.h>
+#include <mln/storage/http_file_source.hpp>
+#include <mln/storage/resource.hpp>
+#include <mln/storage/resource_options.hpp>
+#include <mln/storage/response.hpp>
+#include <mln/util/async_request.hpp>
+#include <mln/util/async_task.hpp>
+#include <mln/util/client_options.hpp>
+#include <mln/util/http_header.hpp>
+#include <mln/util/version.hpp>
 #import <objc/runtime.h>
 
 #include "maplibre_native_c.h"
diff --git a/src/platform/emscripten/async_task.cpp b/src/platform/emscripten/async_task.cpp
index 83e287a8b..48e8c028d 100644
--- a/src/platform/emscripten/async_task.cpp
+++ b/src/platform/emscripten/async_task.cpp
@@ -2,8 +2,8 @@
 #include <functional>
 #include <memory>
 
-#include <mbgl/util/async_task.hpp>
-#include <mbgl/util/run_loop.hpp>
+#include <mln/util/async_task.hpp>
+#include <mln/util/run_loop.hpp>
 
 #include "run_loop_wake.hpp"
 
diff --git a/src/platform/emscripten/http_file_source.cpp b/src/platform/emscripten/http_file_source.cpp
index bb5a7fb14..38f748daa 100644
--- a/src/platform/emscripten/http_file_source.cpp
+++ b/src/platform/emscripten/http_file_source.cpp
@@ -16,22 +16,21 @@
 #include <utility>
 #include <vector>
 
-#include <mbgl/storage/http_file_source.hpp>
-#include <mbgl/storage/resource.hpp>
-#include <mbgl/storage/resource_options.hpp>
-#include <mbgl/storage/response.hpp>
-#include <mbgl/util/async_request.hpp>
-#include <mbgl/util/async_task.hpp>
-#include <mbgl/util/chrono.hpp>
-#include <mbgl/util/client_options.hpp>
-#include <mbgl/util/http_header.hpp>
-#include <mbgl/util/string.hpp>
-#include <mbgl/util/util.hpp>
-
 #include <emscripten.h>
 #include <emscripten/fetch.h>
 #include <emscripten/proxying.h>
 #include <emscripten/threading.h>
+#include <mln/storage/http_file_source.hpp>
+#include <mln/storage/resource.hpp>
+#include <mln/storage/resource_options.hpp>
+#include <mln/storage/response.hpp>
+#include <mln/util/async_request.hpp>
+#include <mln/util/async_task.hpp>
+#include <mln/util/chrono.hpp>
+#include <mln/util/client_options.hpp>
+#include <mln/util/http_header.hpp>
+#include <mln/util/string.hpp>
+#include <mln/util/util.hpp>
 #include <pthread.h>
 
 #include "../offline_url.hpp"
diff --git a/src/platform/emscripten/run_loop.cpp b/src/platform/emscripten/run_loop.cpp
index 17ed5336e..41708899e 100644
--- a/src/platform/emscripten/run_loop.cpp
+++ b/src/platform/emscripten/run_loop.cpp
@@ -17,13 +17,12 @@
 #include <set>
 #include <stdexcept>
 
-#include <mbgl/actor/scheduler.hpp>
-#include <mbgl/util/chrono.hpp>
-#include <mbgl/util/run_loop.hpp>
-
 #include <emscripten/eventloop.h>
 #include <emscripten/proxying.h>
 #include <emscripten/threading.h>
+#include <mln/actor/scheduler.hpp>
+#include <mln/util/chrono.hpp>
+#include <mln/util/run_loop.hpp>
 
 #include "run_loop_wake.hpp"
 
diff --git a/src/platform/emscripten/run_loop_wake.hpp b/src/platform/emscripten/run_loop_wake.hpp
index aa3c1826e..defa33455 100644
--- a/src/platform/emscripten/run_loop_wake.hpp
+++ b/src/platform/emscripten/run_loop_wake.hpp
@@ -8,7 +8,7 @@
 #include <mutex>
 #include <vector>
 
-#include <mbgl/util/chrono.hpp>
+#include <mln/util/chrono.hpp>
 
 namespace mln::platform::emscripten {
 
diff --git a/src/platform/emscripten/thread.cpp b/src/platform/emscripten/thread.cpp
index dfb54ee9e..674fd07cb 100644
--- a/src/platform/emscripten/thread.cpp
+++ b/src/platform/emscripten/thread.cpp
@@ -1,7 +1,7 @@
 #include <string>
 
-#include <mbgl/platform/thread.hpp>
-#include <mbgl/util/platform.hpp>
+#include <mln/platform/thread.hpp>
+#include <mln/util/platform.hpp>
 
 namespace mln {
 namespace platform {
diff --git a/src/platform/emscripten/timer.cpp b/src/platform/emscripten/timer.cpp
index 792038b30..ad2b931fc 100644
--- a/src/platform/emscripten/timer.cpp
+++ b/src/platform/emscripten/timer.cpp
@@ -4,8 +4,8 @@
 #include <memory>
 #include <utility>
 
-#include <mbgl/util/run_loop.hpp>
-#include <mbgl/util/timer.hpp>
+#include <mln/util/run_loop.hpp>
+#include <mln/util/timer.hpp>
 
 #include "run_loop_wake.hpp"
 
diff --git a/src/platform/offline_url.hpp b/src/platform/offline_url.hpp
index 62d591a94..5b37cbd9e 100644
--- a/src/platform/offline_url.hpp
+++ b/src/platform/offline_url.hpp
@@ -6,8 +6,8 @@
 
 #include <string>
 
-#include <mbgl/storage/resource.hpp>
-#include <mbgl/util/url.hpp>
+#include <mln/storage/resource.hpp>
+#include <mln/util/url.hpp>
 
 namespace mln::platform {
 
diff --git a/src/platform/ohos/http_file_source.cpp b/src/platform/ohos/http_file_source.cpp
index e757031e2..aa09ce1db 100644
--- a/src/platform/ohos/http_file_source.cpp
+++ b/src/platform/ohos/http_file_source.cpp
@@ -10,17 +10,16 @@
 #include <string>
 #include <utility>
 
-#include <mbgl/storage/http_file_source.hpp>
-#include <mbgl/storage/resource.hpp>
-#include <mbgl/storage/resource_options.hpp>
-#include <mbgl/storage/response.hpp>
-#include <mbgl/util/chrono.hpp>
-#include <mbgl/util/client_options.hpp>
-#include <mbgl/util/http_header.hpp>
-#include <mbgl/util/run_loop.hpp>
-#include <mbgl/util/string.hpp>
-#include <mbgl/util/util.hpp>
-
+#include <mln/storage/http_file_source.hpp>
+#include <mln/storage/resource.hpp>
+#include <mln/storage/resource_options.hpp>
+#include <mln/storage/response.hpp>
+#include <mln/util/chrono.hpp>
+#include <mln/util/client_options.hpp>
+#include <mln/util/http_header.hpp>
+#include <mln/util/run_loop.hpp>
+#include <mln/util/string.hpp>
+#include <mln/util/util.hpp>
 #include <network/netstack/net_http.h>
 
 #include "http_user_agent.hpp"
diff --git a/src/platform/ohos/http_user_agent.hpp b/src/platform/ohos/http_user_agent.hpp
index ac7c356b3..093a7fe65 100644
--- a/src/platform/ohos/http_user_agent.hpp
+++ b/src/platform/ohos/http_user_agent.hpp
@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include <mbgl/util/client_options.hpp>
-#include <mbgl/util/version.hpp>
+#include <mln/util/client_options.hpp>
+#include <mln/util/version.hpp>
 
 namespace mln {
 namespace ohos {
diff --git a/src/platform/ohos/image.cpp b/src/platform/ohos/image.cpp
index debe03e15..6202346d5 100644
--- a/src/platform/ohos/image.cpp
+++ b/src/platform/ohos/image.cpp
@@ -5,9 +5,8 @@
 #include <string>
 #include <vector>
 
-#include <mbgl/util/image.hpp>
-#include <mbgl/util/premultiply.hpp>
-
+#include <mln/util/image.hpp>
+#include <mln/util/premultiply.hpp>
 #include <multimedia/image_framework/image/image_source_native.h>
 #include <multimedia/image_framework/image/pixelmap_native.h>
 
diff --git a/src/platform/ohos/logging_hilog.cpp b/src/platform/ohos/logging_hilog.cpp
index 20bcbe9b9..9f04eec3f 100644
--- a/src/platform/ohos/logging_hilog.cpp
+++ b/src/platform/ohos/logging_hilog.cpp
@@ -1,9 +1,8 @@
 #include <string>
 
-#include <mbgl/util/enum.hpp>
-#include <mbgl/util/logging.hpp>
-
 #include <hilog/log.h>
+#include <mln/util/enum.hpp>
+#include <mln/util/logging.hpp>
 
 namespace mln {
 namespace {
diff --git a/src/platform/rust/http_file_source.cpp b/src/platform/rust/http_file_source.cpp
index f090c6757..986e61b73 100644
--- a/src/platform/rust/http_file_source.cpp
+++ b/src/platform/rust/http_file_source.cpp
@@ -8,18 +8,18 @@
 #include <utility>
 #include <vector>
 
-#include <mbgl/storage/file_source.hpp>
-#include <mbgl/storage/http_file_source.hpp>
-#include <mbgl/storage/resource.hpp>
-#include <mbgl/storage/resource_options.hpp>
-#include <mbgl/storage/response.hpp>
-#include <mbgl/util/async_request.hpp>
-#include <mbgl/util/async_task.hpp>
-#include <mbgl/util/chrono.hpp>
-#include <mbgl/util/client_options.hpp>
-#include <mbgl/util/http_header.hpp>
-#include <mbgl/util/string.hpp>
-#include <mbgl/util/url.hpp>
+#include <mln/storage/file_source.hpp>
+#include <mln/storage/http_file_source.hpp>
+#include <mln/storage/resource.hpp>
+#include <mln/storage/resource_options.hpp>
+#include <mln/storage/response.hpp>
+#include <mln/util/async_request.hpp>
+#include <mln/util/async_task.hpp>
+#include <mln/util/chrono.hpp>
+#include <mln/util/client_options.hpp>
+#include <mln/util/http_header.hpp>
+#include <mln/util/string.hpp>
+#include <mln/util/url.hpp>
 
 #include "../offline_url.hpp"
 #include "maplibre_native_c.h"
diff --git a/src/platform/rust/image.cpp b/src/platform/rust/image.cpp
index 0e94589e6..f172de7d3 100644
--- a/src/platform/rust/image.cpp
+++ b/src/platform/rust/image.cpp
@@ -4,7 +4,7 @@
 #include <stdexcept>
 #include <string>
 
-#include <mbgl/util/image.hpp>
+#include <mln/util/image.hpp>
 
 extern "C" {
 
diff --git a/src/render/metal/metal_surface_session.mm b/src/render/metal/metal_surface_session.mm
index af3493c71..5e9ac0d59 100644
--- a/src/render/metal/metal_surface_session.mm
+++ b/src/render/metal/metal_surface_session.mm
@@ -1,13 +1,6 @@
 #include <memory>
 #include <stdexcept>
 
-#include <mbgl/gfx/backend_scope.hpp>
-#include <mbgl/mtl/context.hpp>
-#include <mbgl/mtl/renderable_resource.hpp>
-#include <mbgl/mtl/renderer_backend.hpp>
-#include <mbgl/mtl/texture2d.hpp>
-#include <mbgl/util/size.hpp>
-
 #include <Foundation/NSSharedPtr.hpp>
 #include <Metal/MTLBlitPass.hpp>
 #include <Metal/MTLCommandBuffer.hpp>
@@ -17,6 +10,12 @@
 #include <Metal/MTLRenderPass.hpp>
 #include <QuartzCore/CAMetalDrawable.hpp>
 #include <QuartzCore/CAMetalLayer.hpp>
+#include <mln/gfx/backend_scope.hpp>
+#include <mln/mtl/context.hpp>
+#include <mln/mtl/renderable_resource.hpp>
+#include <mln/mtl/renderer_backend.hpp>
+#include <mln/mtl/texture2d.hpp>
+#include <mln/util/size.hpp>
 
 #include "diagnostics/diagnostics.hpp"
 #include "map/map.hpp"
diff --git a/src/render/metal/metal_texture_backend.inc b/src/render/metal/metal_texture_backend.inc
index f3a63aff0..4332f0436 100644
--- a/src/render/metal/metal_texture_backend.inc
+++ b/src/render/metal/metal_texture_backend.inc
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <mbgl/gfx/headless_backend.hpp>
-#include <mbgl/mtl/headless_backend.hpp>
+#include <mln/gfx/headless_backend.hpp>
+#include <mln/mtl/headless_backend.hpp>
 
 #include <Metal/MTLDevice.hpp>
 #include <Metal/MTLTexture.hpp>
diff --git a/src/render/metal/metal_texture_backend.mm b/src/render/metal/metal_texture_backend.mm
index 9b6e477dc..6f23d94a2 100644
--- a/src/render/metal/metal_texture_backend.mm
+++ b/src/render/metal/metal_texture_backend.mm
@@ -1,16 +1,15 @@
 #include <memory>
 
-#include <mbgl/gfx/backend_scope.hpp>
-#include <mbgl/gfx/offscreen_texture.hpp>
-#include <mbgl/mtl/context.hpp>
-#include <mbgl/mtl/renderable_resource.hpp>
-#include <mbgl/mtl/texture2d.hpp>
-
 #include <Metal/MTLBlitPass.hpp>
 #include <Metal/MTLCommandBuffer.hpp>
 #include <Metal/MTLCommandQueue.hpp>
 #include <Metal/MTLRenderPass.hpp>
 #include <TargetConditionals.h>
+#include <mln/gfx/backend_scope.hpp>
+#include <mln/gfx/offscreen_texture.hpp>
+#include <mln/mtl/context.hpp>
+#include <mln/mtl/renderable_resource.hpp>
+#include <mln/mtl/texture2d.hpp>
 
 #include "render/metal/metal_texture_backend.inc"
 
diff --git a/src/render/metal/metal_texture_session.mm b/src/render/metal/metal_texture_session.mm
index b576b5af1..fad7ee2ab 100644
--- a/src/render/metal/metal_texture_session.mm
+++ b/src/render/metal/metal_texture_session.mm
@@ -1,10 +1,9 @@
 #include <memory>
 
-#include <mbgl/util/size.hpp>
-
 #include <Metal/MTLDevice.hpp>
 #include <Metal/MTLPixelFormat.hpp>
 #include <Metal/MTLTexture.hpp>
+#include <mln/util/size.hpp>
 
 #include "diagnostics/diagnostics.hpp"
 #include "map/map.hpp"
diff --git a/src/render/opengl/context_mode.hpp b/src/render/opengl/context_mode.hpp
index 9602d2c17..5e3efa6b9 100644
--- a/src/render/opengl/context_mode.hpp
+++ b/src/render/opengl/context_mode.hpp
@@ -3,7 +3,7 @@
 // The context mode every OpenGL session runs its renderer in, whether it draws
 // into a surface or a texture.
 
-#include <mbgl/gfx/renderer_backend.hpp>
+#include <mln/gfx/renderer_backend.hpp>
 
 namespace mln::core::opengl {
 
diff --git a/src/render/opengl/opengl_surface_session.cpp b/src/render/opengl/opengl_surface_session.cpp
index c5096791c..b2a790f0c 100644
--- a/src/render/opengl/opengl_surface_session.cpp
+++ b/src/render/opengl/opengl_surface_session.cpp
@@ -4,12 +4,12 @@
 #include <stdexcept>
 #include <utility>
 
-#include <mbgl/gfx/backend_scope.hpp>
-#include <mbgl/gfx/renderable.hpp>
-#include <mbgl/gl/context.hpp>
-#include <mbgl/gl/renderable_resource.hpp>
-#include <mbgl/gl/renderer_backend.hpp>
-#include <mbgl/util/size.hpp>
+#include <mln/gfx/backend_scope.hpp>
+#include <mln/gfx/renderable.hpp>
+#include <mln/gl/context.hpp>
+#include <mln/gl/renderable_resource.hpp>
+#include <mln/gl/renderer_backend.hpp>
+#include <mln/util/size.hpp>
 
 #if defined(MLN_FFI_OPENGL_PROVIDER_WGL)
 #ifndef WIN32_LEAN_AND_MEAN
diff --git a/src/render/opengl/opengl_texture_session.cpp b/src/render/opengl/opengl_texture_session.cpp
index 9b8854bb2..474d23897 100644
--- a/src/render/opengl/opengl_texture_session.cpp
+++ b/src/render/opengl/opengl_texture_session.cpp
@@ -6,19 +6,19 @@
 #include <string>
 #include <utility>
 
-#include <mbgl/gfx/backend_scope.hpp>
-#include <mbgl/gfx/headless_backend.hpp>
-#include <mbgl/gfx/renderable.hpp>
-#include <mbgl/gl/context.hpp>
-#include <mbgl/gl/defines.hpp>
-#include <mbgl/gl/framebuffer.hpp>
-#include <mbgl/gl/renderable_resource.hpp>
-#include <mbgl/gl/renderbuffer_resource.hpp>
-#include <mbgl/gl/renderer_backend.hpp>
-#include <mbgl/gl/texture2d.hpp>
-#include <mbgl/platform/gl_functions.hpp>
-#include <mbgl/util/image.hpp>
-#include <mbgl/util/size.hpp>
+#include <mln/gfx/backend_scope.hpp>
+#include <mln/gfx/headless_backend.hpp>
+#include <mln/gfx/renderable.hpp>
+#include <mln/gl/context.hpp>
+#include <mln/gl/defines.hpp>
+#include <mln/gl/framebuffer.hpp>
+#include <mln/gl/renderable_resource.hpp>
+#include <mln/gl/renderbuffer_resource.hpp>
+#include <mln/gl/renderer_backend.hpp>
+#include <mln/gl/texture2d.hpp>
+#include <mln/platform/gl_functions.hpp>
+#include <mln/util/image.hpp>
+#include <mln/util/size.hpp>
 
 #if defined(MLN_FFI_OPENGL_PROVIDER_WGL)
 #ifndef WIN32_LEAN_AND_MEAN
diff --git a/src/render/render_session_common.cpp b/src/render/render_session_common.cpp
index 294d9883f..7de0094f1 100644
--- a/src/render/render_session_common.cpp
+++ b/src/render/render_session_common.cpp
@@ -18,20 +18,20 @@
 #include <sys/system_properties.h>
 #endif
 
-#include <mbgl/gfx/backend_scope.hpp>
-#include <mbgl/gfx/renderer_backend.hpp>
-#include <mbgl/map/map.hpp>
-#include <mbgl/renderer/query.hpp>
-#include <mbgl/renderer/renderer.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
-#include <mbgl/style/filter.hpp>
-#include <mbgl/style/source_impl.hpp>
-#include <mbgl/util/feature.hpp>
-#include <mbgl/util/geo.hpp>
-#include <mbgl/util/geojson.hpp>
-#include <mbgl/util/logging.hpp>
-#include <mbgl/util/size.hpp>
-#include <mbgl/util/string.hpp>
+#include <mln/gfx/backend_scope.hpp>
+#include <mln/gfx/renderer_backend.hpp>
+#include <mln/map/map.hpp>
+#include <mln/renderer/query.hpp>
+#include <mln/renderer/renderer.hpp>
+#include <mln/renderer/update_parameters.hpp>
+#include <mln/style/filter.hpp>
+#include <mln/style/source_impl.hpp>
+#include <mln/util/feature.hpp>
+#include <mln/util/geo.hpp>
+#include <mln/util/geojson.hpp>
+#include <mln/util/logging.hpp>
+#include <mln/util/size.hpp>
+#include <mln/util/string.hpp>
 
 #include "bytes/buffer.hpp"
 #include "diagnostics/diagnostics.hpp"
diff --git a/src/render/render_session_common.hpp b/src/render/render_session_common.hpp
index 886faf695..98e8d0641 100644
--- a/src/render/render_session_common.hpp
+++ b/src/render/render_session_common.hpp
@@ -13,13 +13,13 @@
 #include <unordered_set>
 #include <vector>
 
-#include <mbgl/actor/scheduler.hpp>
-#include <mbgl/gfx/headless_backend.hpp>
-#include <mbgl/gfx/renderer_backend.hpp>
-#include <mbgl/renderer/renderer.hpp>
-#include <mbgl/renderer/renderer_observer.hpp>
-#include <mbgl/util/feature.hpp>
-#include <mbgl/util/size.hpp>
+#include <mln/actor/scheduler.hpp>
+#include <mln/gfx/headless_backend.hpp>
+#include <mln/gfx/renderer_backend.hpp>
+#include <mln/renderer/renderer.hpp>
+#include <mln/renderer/renderer_observer.hpp>
+#include <mln/util/feature.hpp>
+#include <mln/util/size.hpp>
 
 #include "diagnostics/diagnostics.hpp"
 #include "map/feature_state.hpp"
diff --git a/src/render/texture_session.cpp b/src/render/texture_session.cpp
index dbf4eacf8..0eac80e9a 100644
--- a/src/render/texture_session.cpp
+++ b/src/render/texture_session.cpp
@@ -2,8 +2,8 @@
 #include <cstring>
 #include <limits>
 
-#include <mbgl/gfx/backend_scope.hpp>
-#include <mbgl/util/image.hpp>
+#include <mln/gfx/backend_scope.hpp>
+#include <mln/util/image.hpp>
 
 #include "render/texture_session.hpp"
 
diff --git a/src/render/vulkan/vulkan_dispatch.hpp b/src/render/vulkan/vulkan_dispatch.hpp
index 1907a35a1..de63f20a8 100644
--- a/src/render/vulkan/vulkan_dispatch.hpp
+++ b/src/render/vulkan/vulkan_dispatch.hpp
@@ -9,8 +9,7 @@
 #define VULKAN_HPP_NO_DEFAULT_DISPATCHER
 #endif
 
-#include <mbgl/vulkan/renderer_backend.hpp>
-
+#include <mln/vulkan/renderer_backend.hpp>
 #include <vulkan/vulkan.hpp>
 #include <vulkan/vulkan_core.h>
 
diff --git a/src/render/vulkan/vulkan_surface_session.cpp b/src/render/vulkan/vulkan_surface_session.cpp
index 55318265e..fb64b84f9 100644
--- a/src/render/vulkan/vulkan_surface_session.cpp
+++ b/src/render/vulkan/vulkan_surface_session.cpp
@@ -5,14 +5,13 @@
 #include <utility>
 #include <vector>
 
-#include <mbgl/gfx/backend_scope.hpp>
-#include <mbgl/gfx/renderable.hpp>
-#include <mbgl/gfx/renderer_backend.hpp>
-#include <mbgl/util/size.hpp>
-#include <mbgl/vulkan/context.hpp>
-#include <mbgl/vulkan/renderable_resource.hpp>
-#include <mbgl/vulkan/renderer_backend.hpp>
-
+#include <mln/gfx/backend_scope.hpp>
+#include <mln/gfx/renderable.hpp>
+#include <mln/gfx/renderer_backend.hpp>
+#include <mln/util/size.hpp>
+#include <mln/vulkan/context.hpp>
+#include <mln/vulkan/renderable_resource.hpp>
+#include <mln/vulkan/renderer_backend.hpp>
 #include <vulkan/vulkan.hpp>
 #include <vulkan/vulkan_core.h>
 
diff --git a/src/render/vulkan/vulkan_texture_backend.cpp b/src/render/vulkan/vulkan_texture_backend.cpp
index 60058d4a8..03d87de76 100644
--- a/src/render/vulkan/vulkan_texture_backend.cpp
+++ b/src/render/vulkan/vulkan_texture_backend.cpp
@@ -8,18 +8,17 @@
 #include <utility>
 #include <vector>
 
-#include <mbgl/gfx/backend_scope.hpp>
-#include <mbgl/gfx/headless_backend.hpp>
-#include <mbgl/gfx/renderable.hpp>
-#include <mbgl/gfx/renderer_backend.hpp>
-#include <mbgl/util/image.hpp>
-#include <mbgl/util/size.hpp>
-#include <mbgl/vulkan/buffer_resource.hpp>
-#include <mbgl/vulkan/context.hpp>
-#include <mbgl/vulkan/renderable_resource.hpp>
-#include <mbgl/vulkan/renderer_backend.hpp>
-#include <mbgl/vulkan/texture2d.hpp>
-
+#include <mln/gfx/backend_scope.hpp>
+#include <mln/gfx/headless_backend.hpp>
+#include <mln/gfx/renderable.hpp>
+#include <mln/gfx/renderer_backend.hpp>
+#include <mln/util/image.hpp>
+#include <mln/util/size.hpp>
+#include <mln/vulkan/buffer_resource.hpp>
+#include <mln/vulkan/context.hpp>
+#include <mln/vulkan/renderable_resource.hpp>
+#include <mln/vulkan/renderer_backend.hpp>
+#include <mln/vulkan/texture2d.hpp>
 #include <vk_mem_alloc.h>
 #include <vulkan/vulkan.hpp>
 #include <vulkan/vulkan_core.h>
diff --git a/src/render/vulkan/vulkan_texture_backend.hpp b/src/render/vulkan/vulkan_texture_backend.hpp
index 64c72f03b..7a2ccecb3 100644
--- a/src/render/vulkan/vulkan_texture_backend.hpp
+++ b/src/render/vulkan/vulkan_texture_backend.hpp
@@ -2,13 +2,12 @@
 
 #include <vector>
 
-#include <mbgl/gfx/headless_backend.hpp>
-#include <mbgl/gfx/renderable.hpp>
-#include <mbgl/gfx/renderer_backend.hpp>
-#include <mbgl/util/image.hpp>
-#include <mbgl/util/size.hpp>
-#include <mbgl/vulkan/renderer_backend.hpp>
-
+#include <mln/gfx/headless_backend.hpp>
+#include <mln/gfx/renderable.hpp>
+#include <mln/gfx/renderer_backend.hpp>
+#include <mln/util/image.hpp>
+#include <mln/util/size.hpp>
+#include <mln/vulkan/renderer_backend.hpp>
 #include <vulkan/vulkan_core.h>
 
 #include "maplibre_native_c/texture.h"
diff --git a/src/render/vulkan/vulkan_texture_session.cpp b/src/render/vulkan/vulkan_texture_session.cpp
index f1c70cc3d..5964f6b7a 100644
--- a/src/render/vulkan/vulkan_texture_session.cpp
+++ b/src/render/vulkan/vulkan_texture_session.cpp
@@ -3,9 +3,8 @@
 #include <utility>
 #include <vector>
 
-#include <mbgl/gfx/headless_backend.hpp>
-#include <mbgl/util/size.hpp>
-
+#include <mln/gfx/headless_backend.hpp>
+#include <mln/util/size.hpp>
 #include <vulkan/vulkan_core.h>
 
 #include "diagnostics/diagnostics.hpp"
diff --git a/src/render/webgpu/webgpu_texture_session.cpp b/src/render/webgpu/webgpu_texture_session.cpp
index b6f4b1362..8a9c073dc 100644
--- a/src/render/webgpu/webgpu_texture_session.cpp
+++ b/src/render/webgpu/webgpu_texture_session.cpp
@@ -16,11 +16,11 @@
 #include <webgpu/webgpu.h>
 #include <webgpu/webgpu_cpp.h>
 
-#include <mbgl/gfx/headless_backend.hpp>
-#include <mbgl/util/image.hpp>
-#include <mbgl/util/size.hpp>
-#include <mbgl/webgpu/renderable_resource.hpp>
-#include <mbgl/webgpu/renderer_backend.hpp>
+#include <mln/gfx/headless_backend.hpp>
+#include <mln/util/image.hpp>
+#include <mln/util/size.hpp>
+#include <mln/webgpu/renderable_resource.hpp>
+#include <mln/webgpu/renderer_backend.hpp>
 
 #include "diagnostics/diagnostics.hpp"
 #include "map/map.hpp"
diff --git a/src/resources/custom_resource_provider.cpp b/src/resources/custom_resource_provider.cpp
index 288274cc0..c0969b7d2 100644
--- a/src/resources/custom_resource_provider.cpp
+++ b/src/resources/custom_resource_provider.cpp
@@ -10,13 +10,13 @@
 #include <string>
 #include <utility>
 
-#include <mbgl/actor/actor_ref.hpp>
-#include <mbgl/storage/file_source.hpp>
-#include <mbgl/storage/file_source_request.hpp>
-#include <mbgl/storage/resource.hpp>
-#include <mbgl/storage/response.hpp>
-#include <mbgl/util/async_request.hpp>
-#include <mbgl/util/chrono.hpp>
+#include <mln/actor/actor_ref.hpp>
+#include <mln/storage/file_source.hpp>
+#include <mln/storage/file_source_request.hpp>
+#include <mln/storage/resource.hpp>
+#include <mln/storage/response.hpp>
+#include <mln/util/async_request.hpp>
+#include <mln/util/chrono.hpp>
 
 #include "resources/custom_resource_provider.hpp"
 
diff --git a/src/resources/custom_resource_provider.hpp b/src/resources/custom_resource_provider.hpp
index 8c0483918..b7a00e98f 100644
--- a/src/resources/custom_resource_provider.hpp
+++ b/src/resources/custom_resource_provider.hpp
@@ -3,9 +3,9 @@
 #include <memory>
 #include <string>
 
-#include <mbgl/storage/file_source.hpp>
-#include <mbgl/storage/resource.hpp>
-#include <mbgl/util/async_request.hpp>
+#include <mln/storage/file_source.hpp>
+#include <mln/storage/resource.hpp>
+#include <mln/util/async_request.hpp>
 
 #include "maplibre_native_c.h"
 
diff --git a/src/resources/file_source_manager.cpp b/src/resources/file_source_manager.cpp
index 3837f3be6..d3de4e965 100644
--- a/src/resources/file_source_manager.cpp
+++ b/src/resources/file_source_manager.cpp
@@ -1,14 +1,14 @@
 #include <exception>
 #include <memory>
 
-#include <mbgl/storage/asset_file_source.hpp>
-#include <mbgl/storage/file_source.hpp>
-#include <mbgl/storage/file_source_manager.hpp>
-#include <mbgl/storage/local_file_source.hpp>
-#include <mbgl/storage/mbtiles_file_source.hpp>
-#include <mbgl/storage/pmtiles_file_source.hpp>
-#include <mbgl/storage/resource_options.hpp>
-#include <mbgl/util/client_options.hpp>
+#include <mln/storage/asset_file_source.hpp>
+#include <mln/storage/file_source.hpp>
+#include <mln/storage/file_source_manager.hpp>
+#include <mln/storage/local_file_source.hpp>
+#include <mln/storage/mbtiles_file_source.hpp>
+#include <mln/storage/pmtiles_file_source.hpp>
+#include <mln/storage/resource_options.hpp>
+#include <mln/util/client_options.hpp>
 
 #include "resources/resource_loader.hpp"
 
diff --git a/src/resources/network_status.cpp b/src/resources/network_status.cpp
index 71e4b3611..bb38cc926 100644
--- a/src/resources/network_status.cpp
+++ b/src/resources/network_status.cpp
@@ -1,6 +1,6 @@
 #include <cstdint>
 
-#include <mbgl/storage/network_status.hpp>
+#include <mln/storage/network_status.hpp>
 
 #include "resources/network_status.hpp"
 
diff --git a/src/resources/resource_loader.cpp b/src/resources/resource_loader.cpp
index 2399edacb..cde637629 100644
--- a/src/resources/resource_loader.cpp
+++ b/src/resources/resource_loader.cpp
@@ -9,19 +9,19 @@
 #include <string_view>
 #include <utility>
 
-#include <mbgl/storage/database_file_source.hpp>
-#include <mbgl/storage/file_source.hpp>
-#include <mbgl/storage/file_source_request.hpp>
-#include <mbgl/storage/main_resource_loader.hpp>
-#include <mbgl/storage/online_file_source.hpp>
-#include <mbgl/storage/resource.hpp>
-#include <mbgl/storage/resource_options.hpp>
-#include <mbgl/storage/resource_transform.hpp>
-#include <mbgl/storage/response.hpp>
-#include <mbgl/util/async_request.hpp>
-#include <mbgl/util/client_options.hpp>
-#include <mbgl/util/mapbox.hpp>
-#include <mbgl/util/tile_server_options.hpp>
+#include <mln/storage/database_file_source.hpp>
+#include <mln/storage/file_source.hpp>
+#include <mln/storage/file_source_request.hpp>
+#include <mln/storage/main_resource_loader.hpp>
+#include <mln/storage/online_file_source.hpp>
+#include <mln/storage/resource.hpp>
+#include <mln/storage/resource_options.hpp>
+#include <mln/storage/resource_transform.hpp>
+#include <mln/storage/response.hpp>
+#include <mln/util/async_request.hpp>
+#include <mln/util/client_options.hpp>
+#include <mln/util/mapbox.hpp>
+#include <mln/util/tile_server_options.hpp>
 
 #include "resources/resource_loader.hpp"
 
diff --git a/src/resources/resource_loader.hpp b/src/resources/resource_loader.hpp
index 738d4a237..53e5afbca 100644
--- a/src/resources/resource_loader.hpp
+++ b/src/resources/resource_loader.hpp
@@ -2,9 +2,9 @@
 
 #include <memory>
 
-#include <mbgl/storage/file_source.hpp>
-#include <mbgl/storage/resource_options.hpp>
-#include <mbgl/util/client_options.hpp>
+#include <mln/storage/file_source.hpp>
+#include <mln/storage/resource_options.hpp>
+#include <mln/util/client_options.hpp>
 
 namespace mln::core {
 
diff --git a/src/runtime/runtime.cpp b/src/runtime/runtime.cpp
index 4996669ad..f4cb6ab85 100644
--- a/src/runtime/runtime.cpp
+++ b/src/runtime/runtime.cpp
@@ -23,18 +23,18 @@
 #include <variant>
 #include <vector>
 
-#include <mbgl/actor/scheduler.hpp>
-#include <mbgl/storage/database_file_source.hpp>
-#include <mbgl/storage/file_source.hpp>
-#include <mbgl/storage/file_source_manager.hpp>
-#include <mbgl/storage/offline.hpp>
-#include <mbgl/storage/resource_options.hpp>
-#include <mbgl/storage/response.hpp>
-#include <mbgl/storage/sqlite3.hpp>
-#include <mbgl/util/client_options.hpp>
-#include <mbgl/util/expected.hpp>
-#include <mbgl/util/geo.hpp>
-#include <mbgl/util/run_loop.hpp>
+#include <mln/actor/scheduler.hpp>
+#include <mln/storage/database_file_source.hpp>
+#include <mln/storage/file_source.hpp>
+#include <mln/storage/file_source_manager.hpp>
+#include <mln/storage/offline.hpp>
+#include <mln/storage/resource_options.hpp>
+#include <mln/storage/response.hpp>
+#include <mln/storage/sqlite3.hpp>
+#include <mln/util/client_options.hpp>
+#include <mln/util/expected.hpp>
+#include <mln/util/geo.hpp>
+#include <mln/util/run_loop.hpp>
 
 #include "runtime/runtime.hpp"
 
diff --git a/src/runtime/runtime.hpp b/src/runtime/runtime.hpp
index 1c99a2857..d40b3a0e3 100644
--- a/src/runtime/runtime.hpp
+++ b/src/runtime/runtime.hpp
@@ -17,8 +17,8 @@
 #include <utility>
 #include <vector>
 
-#include <mbgl/storage/resource_options.hpp>
-#include <mbgl/util/run_loop.hpp>
+#include <mln/storage/resource_options.hpp>
+#include <mln/util/run_loop.hpp>
 
 #include "handles/handle_table.hpp"
 #include "maplibre_native_c.h"
diff --git a/src/style/style_value.cpp b/src/style/style_value.cpp
index 6e6c79b22..db0c04c67 100644
--- a/src/style/style_value.cpp
+++ b/src/style/style_value.cpp
@@ -1,10 +1,10 @@
 #include <optional>
 #include <string>
 
-#include <mbgl/style/conversion.hpp>
-#include <mbgl/style/conversion/filter.hpp>
-#include <mbgl/style/conversion/json.hpp>
-#include <mbgl/style/filter.hpp>
+#include <mln/style/conversion.hpp>
+#include <mln/style/conversion/filter.hpp>
+#include <mln/style/conversion/json.hpp>
+#include <mln/style/filter.hpp>
 
 #include "style/style_value.hpp"
 
diff --git a/src/style/style_value.hpp b/src/style/style_value.hpp
index 5aeea2ef6..d26880332 100644
--- a/src/style/style_value.hpp
+++ b/src/style/style_value.hpp
@@ -2,8 +2,8 @@
 
 #include <optional>
 
-#include <mbgl/style/conversion.hpp>
-#include <mbgl/style/filter.hpp>
+#include <mln/style/conversion.hpp>
+#include <mln/style/filter.hpp>
 
 #include "maplibre_native_c/base.h"
 
diff --git a/third_party/maplibre-native b/third_party/maplibre-native
index 550f64be2..2a8ebc490 160000
--- a/third_party/maplibre-native
+++ b/third_party/maplibre-native
@@ -1 +1 @@
-Subproject commit 550f64be2232e09934ffc660a9acdbacff8b164a
+Subproject commit 2a8ebc4906df6037e756534e583a3b8e55283ed7