Clean/refactor includes

native/jni/magiskboot/bootimg.cpp

@@ -6,11 +6,11 @@
 
 #include <mincrypt/sha.h>
 #include <mincrypt/sha256.h>
+#include <utils.h>
+#include <logging.h>
 
 #include "bootimg.h"
 #include "magiskboot.h"
-#include "utils.h"
-#include "logging.h"
 
 static void dump(void *buf, size_t size, const char *filename) {
 	if (size == 0)

native/jni/magiskboot/compress.cpp

@@ -10,10 +10,10 @@
 #include <lz4frame.h>
 #include <lz4hc.h>
 #include <bzlib.h>
+#include <logging.h>
+#include <utils.h>
 
 #include "magiskboot.h"
-#include "logging.h"
-#include "utils.h"
 
 #define CHUNK 0x40000
 

native/jni/magiskboot/cpio.cpp

@@ -4,9 +4,10 @@
 #include <stdlib.h>
 #include <algorithm>
 
+#include <utils.h>
+#include <logging.h>
+
 #include "cpio.h"
-#include "utils.h"
-#include "logging.h"
 
 using namespace std;
 

native/jni/magiskboot/dtb.cpp

@@ -3,9 +3,9 @@
 extern "C" {
 #include <libfdt.h>
 }
+#include <utils.h>
 
 #include "magiskboot.h"
-#include "utils.h"
 
 static void print_props(const void *fdt, int node, int depth) {
 	int prop;

native/jni/magiskboot/hexpatch.cpp

@@ -3,8 +3,9 @@
 #include <string.h>
 #include <sys/mman.h>
 
+#include <utils.h>
+
 #include "magiskboot.h"
-#include "utils.h"
 
 static void hex2byte(uint8_t *hex, uint8_t *str) {
 	char high, low;

native/jni/magiskboot/main.cpp

@@ -5,11 +5,11 @@
 #include <sys/mman.h>
 
 #include <mincrypt/sha.h>
+#include <logging.h>
+#include <utils.h>
+#include <flags.h>
 
 #include "magiskboot.h"
-#include "logging.h"
-#include "utils.h"
-#include "flags.h"
 
 /********************
   Patch Boot Image

native/jni/magiskboot/pattern.cpp

@@ -1,8 +1,9 @@
 #include <malloc.h>
 #include <string.h>
 
+#include <utils.h>
+
 #include "magiskboot.h"
-#include "utils.h"
 
 static int check_verity_pattern(const char *s) {
 	int skip = 0;

native/jni/magiskboot/ramdisk.cpp

@@ -2,9 +2,10 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
+#include <utils.h>
+
 #include "magiskboot.h"
 #include "cpio.h"
-#include "utils.h"
 
 using namespace std;