diff --git a/core/src/main/jni/CMakeLists.txt b/core/src/main/jni/CMakeLists.txt
index 64e8b559c4d..dce214922ab 100644
--- a/core/src/main/jni/CMakeLists.txt
+++ b/core/src/main/jni/CMakeLists.txt
@@ -1,6 +1,8 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.10)
 project(core)
 
+set(CMAKE_CXX_STANDARD 23)
+
 add_subdirectory(${EXTERNAL_ROOT} external)
 
 aux_source_directory(src SRC_LIST)
@@ -9,8 +11,16 @@ aux_source_directory(src/xz SRC_LIST)
 
 add_library(${PROJECT_NAME} STATIC ${SRC_LIST})
 
+set(IGNORED_WARNINGS
+	-Wno-c99-extensions
+	-Wno-gnu-zero-variadic-macro-arguments
+	-Wno-gnu-flexible-array-initializer
+	-Wno-variadic-macros
+	-Wno-zero-length-array)
+
 target_include_directories(${PROJECT_NAME} PUBLIC include)
 target_include_directories(${PROJECT_NAME} PRIVATE src ${EXTERNAL_ROOT}/xz-embedded/linux/include)
+target_compile_options(${PROJECT_NAME} PRIVATE -Wpedantic ${IGNORED_WARNINGS})
 
 target_link_libraries(${PROJECT_NAME} PUBLIC dobby_static lsplant_static xz_static log fmt-header-only)
 target_link_libraries(${PROJECT_NAME} PRIVATE dex_builder_static)
diff --git a/daemon/src/main/jni/CMakeLists.txt b/daemon/src/main/jni/CMakeLists.txt
index 782fc6a331b..2e0a89296d7 100644
--- a/daemon/src/main/jni/CMakeLists.txt
+++ b/daemon/src/main/jni/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.10)
 project(daemon)
 
 add_subdirectory(${EXTERNAL_ROOT} external)
diff --git a/dex2oat/src/main/cpp/CMakeLists.txt b/dex2oat/src/main/cpp/CMakeLists.txt
index 94cd67657f8..748b3743177 100644
--- a/dex2oat/src/main/cpp/CMakeLists.txt
+++ b/dex2oat/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.10)
 project(dex2oat)
 
 add_executable(dex2oat dex2oat.c)
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 406ceae47b1..122addffea5 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -109,6 +109,7 @@ set(XZ_SOURCES
 set(XZ_INCLUDES xz-embedded/linux/include/linux xz-embedded/userspace)
 list(TRANSFORM XZ_SOURCES PREPEND xz-embedded/linux/lib/xz/)
 add_library(xz_static STATIC ${XZ_SOURCES})
+target_compile_options(xz_static PRIVATE -DXZ_USE_CRC64)
 target_include_directories(xz_static PRIVATE ${XZ_INCLUDES})
 
 link_libraries(cxx)
diff --git a/external/dobby b/external/dobby
index e430ce2f08a..05a09ac6807 160000
--- a/external/dobby
+++ b/external/dobby
@@ -1 +1 @@
-Subproject commit e430ce2f08ab433093e05b38ee3da7cecb474575
+Subproject commit 05a09ac6807a6bb1726350e40ea4b127c1c79809
diff --git a/external/lsplant b/external/lsplant
index 6da9b91a2e3..af2fe418f6d 160000
--- a/external/lsplant
+++ b/external/lsplant
@@ -1 +1 @@
-Subproject commit 6da9b91a2e305c6d473ab39f2af8504ba65ff16e
+Subproject commit af2fe418f6dda53e5b03b064af2fd3815c4c37e7
diff --git a/magisk-loader/src/main/jni/CMakeLists.txt b/magisk-loader/src/main/jni/CMakeLists.txt
index c550ef65cb8..82600d7a629 100644
--- a/magisk-loader/src/main/jni/CMakeLists.txt
+++ b/magisk-loader/src/main/jni/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.10)
 project(lspd)
 
 add_subdirectory(${CORE_ROOT} core)