diff --git a/build.py b/build.py
index ab72cdf86..6b1ed65ba 100755
--- a/build.py
+++ b/build.py
@@ -291,15 +291,7 @@ def write_if_diff(file_name: Path, text: str):
 
 
 def dump_flag_header():
-    flag_txt = textwrap.dedent(
-        """\
-        #pragma once
-        #define quote(s)            #s
-        #define str(s)              quote(s)
-        #define MAGISK_FULL_VER     MAGISK_VERSION "(" str(MAGISK_VER_CODE) ")"
-        #define NAME_WITH_VER(name) str(name) " " MAGISK_FULL_VER
-        """
-    )
+    flag_txt = "#pragma once\n"
     flag_txt += f'#define MAGISK_VERSION      "{config["version"]}"\n'
     flag_txt += f'#define MAGISK_VER_CODE     {config["versionCode"]}\n'
     flag_txt += f"#define MAGISK_DEBUG        {0 if args.release else 1}\n"
diff --git a/native/src/base/files.cpp b/native/src/base/files.cpp
index c66ff38d3..182157941 100644
--- a/native/src/base/files.cpp
+++ b/native/src/base/files.cpp
@@ -1,10 +1,8 @@
 #include <sys/mman.h>
 #include <sys/sendfile.h>
-#include <sys/sysmacros.h>
 #include <linux/fs.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <libgen.h>
 
 #include <base.hpp>
 
diff --git a/native/src/base/logging.cpp b/native/src/base/logging.cpp
index 683ff8742..922edff02 100644
--- a/native/src/base/logging.cpp
+++ b/native/src/base/logging.cpp
@@ -1,5 +1,4 @@
 #include <cstdio>
-#include <cstdlib>
 
 #include <android/log.h>
 
diff --git a/native/src/base/misc.cpp b/native/src/base/misc.cpp
index b75aac7d1..b2a8ca2ca 100644
--- a/native/src/base/misc.cpp
+++ b/native/src/base/misc.cpp
@@ -1,9 +1,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/prctl.h>
-#include <sys/sysmacros.h>
 #include <fcntl.h>
-#include <pwd.h>
 #include <unistd.h>
 #include <syscall.h>
 #include <random>
diff --git a/native/src/boot/bootimg.cpp b/native/src/boot/bootimg.cpp
index d94823f3c..61ad88107 100644
--- a/native/src/boot/bootimg.cpp
+++ b/native/src/boot/bootimg.cpp
@@ -43,6 +43,11 @@ static size_t restore(int fd, const char *filename) {
     return size;
 }
 
+static bool check_env(const char *name) {
+    const char *val = getenv(name);
+    return val != nullptr && val == "true"sv;
+}
+
 void dyn_img_hdr::print() const {
     uint32_t ver = header_version();
     fprintf(stderr, "%-*s [%u]\n", PADDING, "HEADER_VER", ver);
diff --git a/native/src/boot/magiskboot.hpp b/native/src/boot/magiskboot.hpp
index f590a740b..7bd8e43f9 100644
--- a/native/src/boot/magiskboot.hpp
+++ b/native/src/boot/magiskboot.hpp
@@ -1,9 +1,5 @@
 #pragma once
 
-#include <sys/types.h>
-
-#include <base.hpp>
-
 #define HEADER_FILE     "header"
 #define KERNEL_FILE     "kernel"
 #define RAMDISK_FILE    "ramdisk.cpio"
@@ -21,10 +17,3 @@ void repack(const char *src_img, const char *out_img, bool skip_comp = false);
 int verify(const char *image, const char *cert);
 int sign(const char *image, const char *name, const char *cert, const char *key);
 int split_image_dtb(const char *filename, bool skip_decomp = false);
-int dtb_commands(int argc, char *argv[]);
-
-static inline bool check_env(const char *name) {
-    using namespace std::string_view_literals;
-    const char *val = getenv(name);
-    return val != nullptr && val == "true"sv;
-}
diff --git a/native/src/core/deny/cli.cpp b/native/src/core/deny/cli.cpp
index 3fabf017e..d54c21bc4 100644
--- a/native/src/core/deny/cli.cpp
+++ b/native/src/core/deny/cli.cpp
@@ -1,8 +1,7 @@
 #include <sys/wait.h>
 #include <sys/mount.h>
 
-#include <consts.hpp>
-#include <base.hpp>
+#include <core.hpp>
 
 #include "deny.hpp"
 
diff --git a/native/src/core/deny/deny.hpp b/native/src/core/deny/deny.hpp
index dfbedc8d7..ff3a0065f 100644
--- a/native/src/core/deny/deny.hpp
+++ b/native/src/core/deny/deny.hpp
@@ -1,12 +1,6 @@
 #pragma once
 
-#include <pthread.h>
 #include <string_view>
-#include <functional>
-#include <map>
-#include <atomic>
-
-#include <core.hpp>
 
 #define ISOLATED_MAGIC "isolated"
 
diff --git a/native/src/core/deny/logcat.cpp b/native/src/core/deny/logcat.cpp
index 26bda5e29..c442b8258 100644
--- a/native/src/core/deny/logcat.cpp
+++ b/native/src/core/deny/logcat.cpp
@@ -1,10 +1,9 @@
 #include <unistd.h>
-#include <string>
-#include <cinttypes>
 #include <android/log.h>
 #include <sys/syscall.h>
+#include <string>
 
-#include <base.hpp>
+#include <core.hpp>
 
 #include "deny.hpp"
 
diff --git a/native/src/core/deny/utils.cpp b/native/src/core/deny/utils.cpp
index 016d12aa2..c77b53679 100644
--- a/native/src/core/deny/utils.cpp
+++ b/native/src/core/deny/utils.cpp
@@ -7,7 +7,6 @@
 #include <set>
 
 #include <consts.hpp>
-#include <base.hpp>
 #include <sqlite.hpp>
 #include <core.hpp>
 
diff --git a/native/src/core/include/core.hpp b/native/src/core/include/core.hpp
index b6d90ff53..a22526b58 100644
--- a/native/src/core/include/core.hpp
+++ b/native/src/core/include/core.hpp
@@ -1,10 +1,8 @@
 #pragma once
 
 #include <sys/socket.h>
-#include <pthread.h>
 #include <poll.h>
 #include <string>
-#include <limits>
 #include <atomic>
 #include <functional>
 
diff --git a/native/src/core/magisk.cpp b/native/src/core/magisk.cpp
index e262d6e55..c5ff2e912 100644
--- a/native/src/core/magisk.cpp
+++ b/native/src/core/magisk.cpp
@@ -46,6 +46,9 @@ Available applets:
     exit(1);
 }
 
+#define quote(s) #s
+#define str(s)   quote(s)
+
 int magisk_main(int argc, char *argv[]) {
     if (argc < 2)
         usage();
diff --git a/native/src/core/zygisk/hook.cpp b/native/src/core/zygisk/hook.cpp
index b6c5c1afc..1e8e1e439 100644
--- a/native/src/core/zygisk/hook.cpp
+++ b/native/src/core/zygisk/hook.cpp
@@ -1,3 +1,4 @@
+#include <sys/mman.h>
 #include <sys/mount.h>
 #include <sys/resource.h>
 #include <dlfcn.h>
diff --git a/native/src/core/zygisk/module.cpp b/native/src/core/zygisk/module.cpp
index bde9c8828..8aa8f8930 100644
--- a/native/src/core/zygisk/module.cpp
+++ b/native/src/core/zygisk/module.cpp
@@ -1,3 +1,4 @@
+#include <sys/mman.h>
 #include <android/dlext.h>
 #include <dlfcn.h>
 
diff --git a/native/src/core/zygisk/module.hpp b/native/src/core/zygisk/module.hpp
index a686a2020..5a303d35d 100644
--- a/native/src/core/zygisk/module.hpp
+++ b/native/src/core/zygisk/module.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <regex.h>
-#include <bitset>
 #include <list>
 
 #include "api.hpp"
diff --git a/native/src/core/zygisk/zygisk.hpp b/native/src/core/zygisk/zygisk.hpp
index 4cfad8fd4..edf5199c6 100644
--- a/native/src/core/zygisk/zygisk.hpp
+++ b/native/src/core/zygisk/zygisk.hpp
@@ -1,9 +1,6 @@
 #pragma once
 
-#include <sys/mman.h>
-#include <stdint.h>
 #include <jni.h>
-#include <vector>
 #include <core.hpp>
 
 #if defined(__LP64__)
diff --git a/native/src/init/getinfo.cpp b/native/src/init/getinfo.cpp
index b0799c443..7daab495c 100644
--- a/native/src/init/getinfo.cpp
+++ b/native/src/init/getinfo.cpp
@@ -1,6 +1,5 @@
 #include <sys/sysmacros.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <linux/input.h>
 #include <fcntl.h>
 #include <vector>
diff --git a/native/src/init/mount.cpp b/native/src/init/mount.cpp
index e19122bd9..fee90d1c9 100644
--- a/native/src/init/mount.cpp
+++ b/native/src/init/mount.cpp
@@ -4,7 +4,6 @@
 #include <libgen.h>
 
 #include <base.hpp>
-#include <flags.h>
 #include <consts.hpp>
 
 #include "init.hpp"
diff --git a/native/src/init/rootdir.cpp b/native/src/init/rootdir.cpp
index 5ae3b498b..cef17794e 100644
--- a/native/src/init/rootdir.cpp
+++ b/native/src/init/rootdir.cpp
@@ -1,11 +1,9 @@
 #include <sys/mount.h>
 #include <libgen.h>
-#include <sys/sysmacros.h>
 
 #include <sepolicy.hpp>
 #include <consts.hpp>
 #include <base.hpp>
-#include <flags.h>
 #include <xz.h>
 
 #include "init.hpp"
diff --git a/native/src/sepolicy/policydb.cpp b/native/src/sepolicy/policydb.cpp
index 8ee78014b..4c3e26ba3 100644
--- a/native/src/sepolicy/policydb.cpp
+++ b/native/src/sepolicy/policydb.cpp
@@ -2,7 +2,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 #include <unistd.h>
 
 #include <cil/cil.h>