diff --git a/Makefile b/Makefile
index d93188444..deb81b41e 100644
--- a/Makefile
+++ b/Makefile
@@ -158,6 +158,8 @@ copy-bin:
 	$(Q)cp common/include/kubridge.h dist/PC/sdk/include/
 	$(Q)cp common/include/systemctrl.h dist/PC/sdk/include/
 	$(Q)cp common/include/systemctrl_se.h dist/PC/sdk/include/
+	$(Q)cp common/include/module2.h dist/PC/sdk/include/
+	$(Q)cp common/include/ark.h dist/PC/sdk/include/
 	$(Q)cp -r contrib/PC/ciso dist/PC/
 
 encrypt-prx: \
diff --git a/common/include/globals.h b/common/include/ark.h
similarity index 100%
rename from common/include/globals.h
rename to common/include/ark.h
diff --git a/common/include/functions.h b/common/include/functions.h
index c77e3d24a..2ca11bbac 100644
--- a/common/include/functions.h
+++ b/common/include/functions.h
@@ -21,7 +21,7 @@
 #include <sdk.h>
 #include <psploadexec_kernel.h>
 #include "module2.h"
-#include "globals.h"
+#include "ark.h"
 
 struct minZipHeader {
     char pk[2];
diff --git a/common/include/rebootconfig.h b/common/include/rebootconfig.h
index fbb1e1040..b40c7cb92 100644
--- a/common/include/rebootconfig.h
+++ b/common/include/rebootconfig.h
@@ -23,7 +23,7 @@
 #include <systemctrl_se.h>
 #include <functions.h>
 #include "ansi_c_functions.h"
-#include "globals.h"
+#include "ark.h"
 
 #define REBOOTEX_MAX_SIZE 0x5000
 #define BTCNF_MAGIC 0x0F803001
diff --git a/common/include/systemctrl.h b/common/include/systemctrl.h
index db2cd88fe..da007b6a0 100644
--- a/common/include/systemctrl.h
+++ b/common/include/systemctrl.h
@@ -27,7 +27,7 @@ extern "C"{
 #include <pspiofilemgr_kernel.h>
 #include <pspthreadman_kernel.h>
 #include <psploadcore.h>
-#include <globals.h>
+#include <ark.h>
 #include <pspkernel.h>
 #include <pspinit.h>
 #include "module2.h"
@@ -38,7 +38,7 @@ extern "C"{
 //#define sctrlKernelQuerySystemCall sceKernelQuerySystemCall
 
 // Prologue Module Start Handler
-typedef void (* STMOD_HANDLER)(SceModule2 *);
+typedef int (* STMOD_HANDLER)(SceModule2 *);
 
 // Thread Context
 typedef struct SceThreadContext SceThreadContext;
diff --git a/common/include/systemctrl_private.h b/common/include/systemctrl_private.h
index 0f6d82987..c00c0e78d 100644
--- a/common/include/systemctrl_private.h
+++ b/common/include/systemctrl_private.h
@@ -23,7 +23,7 @@ extern "C"{
 #endif
 
 #include "module2.h"
-#include "globals.h"
+#include "ark.h"
 
 /*
  * This File contains the required headers for exported, but internally used
diff --git a/core/compat/pentazemin/impose_patch.c b/core/compat/pentazemin/impose_patch.c
index ac408164a..4978cbcd7 100644
--- a/core/compat/pentazemin/impose_patch.c
+++ b/core/compat/pentazemin/impose_patch.c
@@ -5,7 +5,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include <systemctrl_private.h>
-#include <globals.h> 
+#include <ark.h> 
 #include "functions.h"
 #include "macros.h"
 #include "exitgame.h"
diff --git a/core/compat/pentazemin/init_patch.c b/core/compat/pentazemin/init_patch.c
index 2ffabbe78..cf01b195e 100644
--- a/core/compat/pentazemin/init_patch.c
+++ b/core/compat/pentazemin/init_patch.c
@@ -5,7 +5,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include <systemctrl_private.h>
-#include <globals.h> 
+#include <ark.h> 
 #include "functions.h"
 #include "macros.h"
 #include "exitgame.h"
diff --git a/core/compat/pentazemin/loadexec.c b/core/compat/pentazemin/loadexec.c
index c507d00e9..f30e09c46 100644
--- a/core/compat/pentazemin/loadexec.c
+++ b/core/compat/pentazemin/loadexec.c
@@ -5,7 +5,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include <systemctrl_private.h>
-#include <globals.h> 
+#include <ark.h> 
 #include "functions.h"
 #include "macros.h"
 
diff --git a/core/compat/pentazemin/main.c b/core/compat/pentazemin/main.c
index fd28ceafc..3bb1e0eea 100644
--- a/core/compat/pentazemin/main.c
+++ b/core/compat/pentazemin/main.c
@@ -20,7 +20,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include <systemctrl_private.h>
-#include <globals.h>
+#include <ark.h>
 #include "functions.h"
 #include "macros.h"
 #include "exitgame.h"
diff --git a/core/compat/pentazemin/syspatch.c b/core/compat/pentazemin/syspatch.c
index 98b07ae24..29f4204f1 100644
--- a/core/compat/pentazemin/syspatch.c
+++ b/core/compat/pentazemin/syspatch.c
@@ -5,7 +5,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include <systemctrl_private.h>
-#include <globals.h> 
+#include <ark.h> 
 #include "functions.h"
 #include "macros.h"
 #include "exitgame.h"
diff --git a/core/compat/pentazemin/vitamem.c b/core/compat/pentazemin/vitamem.c
index 66ae78db7..83fce1f3d 100644
--- a/core/compat/pentazemin/vitamem.c
+++ b/core/compat/pentazemin/vitamem.c
@@ -6,7 +6,7 @@
 #include <pspiofilemgr.h>
 #include <stdio.h>
 #include <string.h>
-#include "globals.h"
+#include "ark.h"
 #include <systemctrl.h>
 #include "sysmem.h"
 
diff --git a/core/compat/psp/high_mem.c b/core/compat/psp/high_mem.c
index db4036868..7752a25b2 100644
--- a/core/compat/psp/high_mem.c
+++ b/core/compat/psp/high_mem.c
@@ -23,7 +23,7 @@
 #include <pspiofilemgr.h>
 #include <stdio.h>
 #include <string.h>
-#include "globals.h"
+#include "ark.h"
 #include <systemctrl.h>
 #include "sysmem.h"
 
diff --git a/core/compat/psp/libertas.c b/core/compat/psp/libertas.c
index 89d07daa7..cd091493c 100644
--- a/core/compat/psp/libertas.c
+++ b/core/compat/psp/libertas.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <pspiofilemgr.h>
 #include "libertas.h"
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 #include "systemctrl_se.h"
 
diff --git a/core/compat/psp/main.c b/core/compat/psp/main.c
index 3f608d03d..598513724 100644
--- a/core/compat/psp/main.c
+++ b/core/compat/psp/main.c
@@ -1,6 +1,6 @@
 #include <pspsdk.h>
 #include <pspinit.h>
-#include <globals.h>
+#include <ark.h>
 #include <graphics.h>
 #include <macros.h>
 #include <module2.h>
diff --git a/core/compat/psp/pops4tool.c b/core/compat/psp/pops4tool.c
index 761a6ecc8..3bfd9de49 100644
--- a/core/compat/psp/pops4tool.c
+++ b/core/compat/psp/pops4tool.c
@@ -1,7 +1,7 @@
 #include <pspsdk.h>
 #include <pspsysmem_kernel.h>
 #include <pspinit.h>
-#include <globals.h>
+#include <ark.h>
 #include <graphics.h>
 #include <macros.h>
 #include <module2.h>
diff --git a/core/compat/psp/region_free.c b/core/compat/psp/region_free.c
index 410ae28ae..6c9b0a4a9 100644
--- a/core/compat/psp/region_free.c
+++ b/core/compat/psp/region_free.c
@@ -24,7 +24,7 @@
 #include <systemctrl_se.h>
 #include <stdio.h>
 #include <string.h>
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 #include "module2.h"
 #include "region_free.h"
diff --git a/core/compat/psp/syspatch.c b/core/compat/psp/syspatch.c
index 678d3a300..cc198ca3b 100644
--- a/core/compat/psp/syspatch.c
+++ b/core/compat/psp/syspatch.c
@@ -1,7 +1,7 @@
 #include <pspsdk.h>
 #include <pspsysmem_kernel.h>
 #include <pspinit.h>
-#include <globals.h>
+#include <ark.h>
 #include <graphics.h>
 #include <macros.h>
 #include <module2.h>
diff --git a/core/compat/vita/filesystem.c b/core/compat/vita/filesystem.c
index cf4672c6b..580f7d067 100644
--- a/core/compat/vita/filesystem.c
+++ b/core/compat/vita/filesystem.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <module2.h>
-#include <globals.h>
+#include <ark.h>
 #include <systemctrl.h>
 #include <systemctrl_private.h>
 #include <macros.h>
diff --git a/core/compat/vita/gameinfo.c b/core/compat/vita/gameinfo.c
index d13a6ece7..c7ec0a893 100644
--- a/core/compat/vita/gameinfo.c
+++ b/core/compat/vita/gameinfo.c
@@ -5,7 +5,7 @@
 #include <rebootconfig.h>
 #include <systemctrl.h>
 
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 #include "module2.h"
 
diff --git a/core/compat/vita/main.c b/core/compat/vita/main.c
index f175c24eb..69bbe3060 100644
--- a/core/compat/vita/main.c
+++ b/core/compat/vita/main.c
@@ -20,7 +20,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include <systemctrl_private.h>
-#include <globals.h>
+#include <ark.h>
 #include "functions.h"
 #include "macros.h"
 #include "exitgame.h"
diff --git a/core/compat/vita/syspatch.c b/core/compat/vita/syspatch.c
index 47a0badd0..e8f5f293f 100644
--- a/core/compat/vita/syspatch.c
+++ b/core/compat/vita/syspatch.c
@@ -7,7 +7,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include <systemctrl_private.h>
-#include <globals.h> 
+#include <ark.h> 
 #include "functions.h"
 #include "macros.h"
 #include "exitgame.h"
diff --git a/core/compat/vitapops/main.c b/core/compat/vitapops/main.c
index 0728d1023..68db00aac 100644
--- a/core/compat/vitapops/main.c
+++ b/core/compat/vitapops/main.c
@@ -1,5 +1,5 @@
 #include <pspsdk.h>
-#include <globals.h>
+#include <ark.h>
 #include <graphics.h>
 #include <macros.h>
 #include <module2.h>
diff --git a/core/compat/vitapops/popsdisplay.c b/core/compat/vitapops/popsdisplay.c
index 7029fc9db..4a499f9e4 100644
--- a/core/compat/vitapops/popsdisplay.c
+++ b/core/compat/vitapops/popsdisplay.c
@@ -1,5 +1,5 @@
 #include <pspsdk.h>
-#include <globals.h>
+#include <ark.h>
 #include <macros.h>
 #include <module2.h>
 #include <pspdisplay_kernel.h>
diff --git a/core/compat/vitapops/syspatch.c b/core/compat/vitapops/syspatch.c
index 29597ba4e..7745af367 100644
--- a/core/compat/vitapops/syspatch.c
+++ b/core/compat/vitapops/syspatch.c
@@ -1,5 +1,5 @@
 #include <pspsdk.h>
-#include <globals.h>
+#include <ark.h>
 #include <macros.h>
 #include <module2.h>
 #include <pspdisplay_kernel.h>
diff --git a/core/inferno/iodrv_funcs.c b/core/inferno/iodrv_funcs.c
index cfb8e9041..bd66eb611 100644
--- a/core/inferno/iodrv_funcs.c
+++ b/core/inferno/iodrv_funcs.c
@@ -28,7 +28,7 @@
 #include <pspthreadman_kernel.h>
 #include "systemctrl_private.h"
 #include "inferno.h"
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 
 /*
diff --git a/core/inferno/isocache.c b/core/inferno/isocache.c
index 1060ee54e..9cb301436 100644
--- a/core/inferno/isocache.c
+++ b/core/inferno/isocache.c
@@ -10,7 +10,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include "systemctrl_private.h"
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 
 static u32 read_call = 0;
diff --git a/core/inferno/isoread.c b/core/inferno/isoread.c
index 8e271613b..2fa3f8ad6 100644
--- a/core/inferno/isoread.c
+++ b/core/inferno/isoread.c
@@ -28,7 +28,7 @@
 #include "systemctrl_private.h"
 #include "inferno.h"
 #include "lz4.h"
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 
 #define CSO_MAGIC 0x4F534943 // CISO
diff --git a/core/inferno/main.c b/core/inferno/main.c
index 04e96590f..b1686f110 100644
--- a/core/inferno/main.c
+++ b/core/inferno/main.c
@@ -28,7 +28,7 @@
 #include <pspinit.h>
 #include "systemctrl_private.h"
 #include "inferno.h"
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 
 PSP_MODULE_INFO("PRO_Inferno_Driver", 0x1000, 2, 1);
diff --git a/core/inferno/umd.c b/core/inferno/umd.c
index 94c328ca8..098c011ef 100644
--- a/core/inferno/umd.c
+++ b/core/inferno/umd.c
@@ -27,7 +27,7 @@
 #include <psprtc.h>
 #include "systemctrl_private.h"
 #include "inferno.h"
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 
 extern int sceKernelGetCompiledSdkVersion(void);
diff --git a/core/popcorn/main.c b/core/popcorn/main.c
index 0f55d9fdb..7de3cd6fe 100644
--- a/core/popcorn/main.c
+++ b/core/popcorn/main.c
@@ -24,7 +24,7 @@
 #include <systemctrl.h>
 #include <systemctrl_private.h>
 #include <macros.h>
-#include <globals.h>
+#include <ark.h>
 #include <functions.h>
 
 extern unsigned char g_icon_png[6108];
diff --git a/core/stargate/chn_iso.c b/core/stargate/chn_iso.c
index 92b369ae5..2502d3e31 100644
--- a/core/stargate/chn_iso.c
+++ b/core/stargate/chn_iso.c
@@ -29,7 +29,7 @@
 #include "systemctrl_private.h"
 #include "kubridge.h"
 #include "strsafe.h"
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 
 typedef struct _pspMsPrivateDirent {
diff --git a/core/stargate/gamefix.c b/core/stargate/gamefix.c
index e854c08b8..aade5764b 100644
--- a/core/stargate/gamefix.c
+++ b/core/stargate/gamefix.c
@@ -9,7 +9,7 @@
 #include <systemctrl.h>
 #include <systemctrl_private.h>
 #include <macros.h>
-#include <globals.h>
+#include <ark.h>
 #include <functions.h>
 
 
diff --git a/core/stargate/io_patch.c b/core/stargate/io_patch.c
index af1aff945..ed7d3cbd9 100644
--- a/core/stargate/io_patch.c
+++ b/core/stargate/io_patch.c
@@ -9,7 +9,7 @@
 #include <systemctrl.h>
 #include <systemctrl_private.h>
 #include <macros.h>
-#include <globals.h>
+#include <ark.h>
 #include <functions.h>
 
 struct DeviceSize {
diff --git a/core/stargate/main.c b/core/stargate/main.c
index 7dd921b28..5229829cc 100644
--- a/core/stargate/main.c
+++ b/core/stargate/main.c
@@ -26,7 +26,7 @@
 #include <systemctrl.h>
 #include <systemctrl_private.h>
 #include <macros.h>
-#include <globals.h>
+#include <ark.h>
 #include <functions.h>
 #include "loadmodule_patch.h"
 #include "nodrm_patch.h"
diff --git a/core/systemctrl/debug/dummy.c b/core/systemctrl/debug/dummy.c
index 21409a4f7..0adbbab23 100644
--- a/core/systemctrl/debug/dummy.c
+++ b/core/systemctrl/debug/dummy.c
@@ -1,7 +1,7 @@
 #include <pspsdk.h>
 #include <systemctrl.h>
 #include <systemctrl_private.h>
-#include <globals.h> 
+#include <ark.h> 
 #include "rebootex.h"
 #include "modulemanager.h"
 #include "loadercore.h"
diff --git a/core/systemctrl/debug/printk.c b/core/systemctrl/debug/printk.c
index 9db6ed960..b3e037fc7 100644
--- a/core/systemctrl/debug/printk.c
+++ b/core/systemctrl/debug/printk.c
@@ -38,7 +38,7 @@
 #include <systemctrl_private.h>
 #include <stdarg.h>
 #include <string.h>
-#include <globals.h>
+#include <ark.h>
 
 #if DEBUG >= 3
 
diff --git a/core/systemctrl/include/loadexec_patch.h b/core/systemctrl/include/loadexec_patch.h
index 53bc6a181..c83d37995 100644
--- a/core/systemctrl/include/loadexec_patch.h
+++ b/core/systemctrl/include/loadexec_patch.h
@@ -4,7 +4,7 @@
 #include <sdk.h>
 #include <module2.h>
 #include <macros.h>
-#include <globals.h>
+#include <ark.h>
 
 extern void patchLoadExec(SceModule2* loadexec, u32 LoadReboot, u32 GetUserLevel, int k1_checks);
 
diff --git a/core/systemctrl/main.c b/core/systemctrl/main.c
index 849fcac05..0501aab97 100644
--- a/core/systemctrl/main.c
+++ b/core/systemctrl/main.c
@@ -18,7 +18,7 @@
 #include <pspsdk.h>
 #include <systemctrl.h>
 #include <systemctrl_private.h>
-#include <globals.h> 
+#include <ark.h> 
 #include "rebootex.h"
 #include "modulemanager.h"
 #include "loadercore.h"
diff --git a/core/systemctrl/src/cryptography.c b/core/systemctrl/src/cryptography.c
index 0399114ee..9e8515c46 100644
--- a/core/systemctrl/src/cryptography.c
+++ b/core/systemctrl/src/cryptography.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <macros.h>
 #include <module2.h>
-#include <globals.h>
+#include <ark.h>
 #include <functions.h>
 #include "imports.h"
 #include "elf.h"
diff --git a/core/systemctrl/src/exitgame.c b/core/systemctrl/src/exitgame.c
index 832ec3d12..b505b26e0 100644
--- a/core/systemctrl/src/exitgame.c
+++ b/core/systemctrl/src/exitgame.c
@@ -23,7 +23,7 @@
 #include <systemctrl_se.h>
 #include <macros.h>
 #include <string.h>
-#include <globals.h>
+#include <ark.h>
 #include <functions.h>
 #include <graphics.h>
 
diff --git a/core/systemctrl/src/gameinfo.c b/core/systemctrl/src/gameinfo.c
index e3d007fb3..8d77a4ac3 100644
--- a/core/systemctrl/src/gameinfo.c
+++ b/core/systemctrl/src/gameinfo.c
@@ -5,7 +5,7 @@
 #include <rebootconfig.h>
 #include <systemctrl.h>
 
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 #include "module2.h"
 
diff --git a/core/systemctrl/src/hooknids.c b/core/systemctrl/src/hooknids.c
index 2371de5be..0e530afcc 100644
--- a/core/systemctrl/src/hooknids.c
+++ b/core/systemctrl/src/hooknids.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <macros.h>
-#include <globals.h>
+#include <ark.h>
 #include <systemctrl.h>
 #include "nidresolver.h"
 #include "imports.h"
diff --git a/core/systemctrl/src/interruptman.c b/core/systemctrl/src/interruptman.c
index 7a2bc9b4e..dc1e9a745 100644
--- a/core/systemctrl/src/interruptman.c
+++ b/core/systemctrl/src/interruptman.c
@@ -19,7 +19,7 @@
 #include <pspkernel.h>
 #include <stdio.h>
 #include <string.h>
-#include <globals.h>
+#include <ark.h>
 #include <macros.h>
 #include "module2.h"
 
diff --git a/core/systemctrl/src/leda.c b/core/systemctrl/src/leda.c
index 703dea857..8937c3aa6 100644
--- a/core/systemctrl/src/leda.c
+++ b/core/systemctrl/src/leda.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 #include <systemctrl.h>
 
diff --git a/core/systemctrl/src/loadercore.c b/core/systemctrl/src/loadercore.c
index 7b1073a3a..007f2f1b9 100644
--- a/core/systemctrl/src/loadercore.c
+++ b/core/systemctrl/src/loadercore.c
@@ -24,7 +24,7 @@
 #include <module2.h>
 #include <systemctrl.h>
 #include <systemctrl_private.h>
-#include <globals.h>
+#include <ark.h>
 #include <functions.h>
 #include "imports.h"
 #include "modulemanager.h"
diff --git a/core/systemctrl/src/mediasync.c b/core/systemctrl/src/mediasync.c
index 4bd312019..c7aeeb556 100644
--- a/core/systemctrl/src/mediasync.c
+++ b/core/systemctrl/src/mediasync.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <macros.h>
 #include <systemctrl_private.h>
-#include <globals.h>
+#include <ark.h>
 
 // Patch mediasync.prx
 void patchMediaSync(SceModule2* mod)
diff --git a/core/systemctrl/src/modulemanager.c b/core/systemctrl/src/modulemanager.c
index 795607a7f..033d76806 100644
--- a/core/systemctrl/src/modulemanager.c
+++ b/core/systemctrl/src/modulemanager.c
@@ -20,7 +20,7 @@
 #include <pspiofilemgr.h>
 #include <string.h>
 #include <macros.h>
-#include <globals.h>
+#include <ark.h>
 #include <systemctrl_private.h>
 #include "elf.h"
 #include "modulemanager.h"
diff --git a/core/systemctrl/src/msstor_cache.c b/core/systemctrl/src/msstor_cache.c
index 8e82d14c5..572812a20 100644
--- a/core/systemctrl/src/msstor_cache.c
+++ b/core/systemctrl/src/msstor_cache.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <macros.h>
-#include <globals.h>
+#include <ark.h>
 #include <systemctrl.h>
 #include "systemctrl_private.h"
 #include "imports.h"
diff --git a/core/systemctrl/src/nidresolver.c b/core/systemctrl/src/nidresolver.c
index 29faf1df9..2942679a8 100644
--- a/core/systemctrl/src/nidresolver.c
+++ b/core/systemctrl/src/nidresolver.c
@@ -24,7 +24,7 @@
 #include <module2.h>
 #include <systemctrl.h>
 #include <systemctrl_private.h>
-#include <globals.h>
+#include <ark.h>
 #include "missingfunc.h"
 #include "nidresolver.h"
 
diff --git a/core/systemctrl/src/plugin.c b/core/systemctrl/src/plugin.c
index 72b624d21..20a2ad523 100644
--- a/core/systemctrl/src/plugin.c
+++ b/core/systemctrl/src/plugin.c
@@ -19,7 +19,7 @@
 #include <pspinit.h>
 #include <pspmodulemgr.h>
 #include <pspiofilemgr.h>
-#include <globals.h>
+#include <ark.h>
 #include <systemctrl_se.h>
 #include <systemctrl_private.h>
 #include "plugin.h"
diff --git a/core/systemctrl/src/savedata_patch.c b/core/systemctrl/src/savedata_patch.c
index 0075838a3..1b96d80a7 100644
--- a/core/systemctrl/src/savedata_patch.c
+++ b/core/systemctrl/src/savedata_patch.c
@@ -19,7 +19,7 @@
 #include <pspkernel.h>
 #include <psputility.h>
 #include <systemctrl.h>
-#include <globals.h>
+#include <ark.h>
 #include <module2.h>
 
 extern ARKConfig config;
diff --git a/core/systemctrl/src/sctrl.c b/core/systemctrl/src/sctrl.c
index a74e7af47..9e85823bd 100644
--- a/core/systemctrl/src/sctrl.c
+++ b/core/systemctrl/src/sctrl.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <module2.h>
-#include <globals.h>
+#include <ark.h>
 #include <macros.h>
 #include <functions.h>
 #include "rebootex.h"
diff --git a/core/systemctrl/src/sctrl_hen.c b/core/systemctrl/src/sctrl_hen.c
index c2006f82a..591483f0a 100644
--- a/core/systemctrl/src/sctrl_hen.c
+++ b/core/systemctrl/src/sctrl_hen.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <module2.h>
-#include <globals.h>
+#include <ark.h>
 #include <macros.h>
 #include <functions.h>
 #include "rebootex.h"
diff --git a/core/systemctrl/src/sctrl_se.c b/core/systemctrl/src/sctrl_se.c
index 60f0bd8a3..ce05918e3 100644
--- a/core/systemctrl/src/sctrl_se.c
+++ b/core/systemctrl/src/sctrl_se.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <module2.h>
-#include <globals.h>
+#include <ark.h>
 #include <macros.h>
 #include "rebootex.h"
 #include "nidresolver.h"
diff --git a/core/systemctrl/src/sysmem.c b/core/systemctrl/src/sysmem.c
index 6850b3351..a5b55df17 100644
--- a/core/systemctrl/src/sysmem.c
+++ b/core/systemctrl/src/sysmem.c
@@ -17,7 +17,7 @@
 
 #include <pspsdk.h>
 #include <string.h>
-#include <globals.h>
+#include <ark.h>
 #include <systemctrl.h>
 #include <systemctrl_private.h>
 #include "sysmem.h"
diff --git a/core/vshctrl/custom_update.c b/core/vshctrl/custom_update.c
index cf11bde06..d45c3bccb 100644
--- a/core/vshctrl/custom_update.c
+++ b/core/vshctrl/custom_update.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <systemctrl.h>
 #include <systemctrl_se.h>
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 
 extern ARKConfig* ark_config;
diff --git a/core/vshctrl/main.c b/core/vshctrl/main.c
index 08f2a430c..2c16d9277 100644
--- a/core/vshctrl/main.c
+++ b/core/vshctrl/main.c
@@ -28,7 +28,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include "macros.h"
-#include "globals.h"
+#include "ark.h"
 #include "functions.h"
 
 PSP_MODULE_INFO("VshCtrl", 0x1007, 1, 2);
diff --git a/core/vshctrl/usbdevice.c b/core/vshctrl/usbdevice.c
index e2c228822..eb4f1c32b 100644
--- a/core/vshctrl/usbdevice.c
+++ b/core/vshctrl/usbdevice.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 #include <systemctrl.h>
 #include <systemctrl_se.h>
diff --git a/core/vshctrl/vshmenu.c b/core/vshctrl/vshmenu.c
index 44405dc56..dc0ae77f0 100644
--- a/core/vshctrl/vshmenu.c
+++ b/core/vshctrl/vshmenu.c
@@ -24,7 +24,7 @@
 #include <pspctrl.h>
 #include <stdio.h>
 #include <string.h>
-#include "globals.h"
+#include "ark.h"
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include "systemctrl_private.h"
diff --git a/core/vshctrl/vshpatch.c b/core/vshctrl/vshpatch.c
index 7a694dca8..93bc60533 100644
--- a/core/vshctrl/vshpatch.c
+++ b/core/vshctrl/vshpatch.c
@@ -33,7 +33,7 @@
 #include "virtual_pbp.h"
 #include "macros.h"
 #include "strsafe.h"
-#include "globals.h"
+#include "ark.h"
 
 extern int _sceCtrlReadBufferPositive(SceCtrlData *ctrl, int count);
 extern void patch_sceUSB_Driver(void);
diff --git a/extras/apps/installer/main.c b/extras/apps/installer/main.c
index 942b6d669..02770c8c9 100644
--- a/extras/apps/installer/main.c
+++ b/extras/apps/installer/main.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <systemctrl.h>
 #include <systemctrl_se.h>
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 
 PSP_MODULE_INFO("ARKInstaller", 0x800, 1, 0);
diff --git a/extras/apps/uninstaller/main.c b/extras/apps/uninstaller/main.c
index e51271553..359869a67 100644
--- a/extras/apps/uninstaller/main.c
+++ b/extras/apps/uninstaller/main.c
@@ -3,7 +3,7 @@
 #include <pspreg.h>
 #include <pspctrl.h>
 #include <pspdebug.h>
-#include <globals.h>
+#include <ark.h>
 #include <stdio.h>
 
 #include "systemctrl.h"
diff --git a/extras/apps/updater/main.c b/extras/apps/updater/main.c
index 9d63ef461..107a45599 100644
--- a/extras/apps/updater/main.c
+++ b/extras/apps/updater/main.c
@@ -10,7 +10,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include <kubridge.h>
-#include "globals.h"
+#include "ark.h"
 
 #include <tmctrl/tmctrl.h>
 #include <msipl/mainbinex/payload.h>
diff --git a/extras/menus/arkMenu/include/common.h b/extras/menus/arkMenu/include/common.h
index 7e3b0ae1f..e9ed28513 100644
--- a/extras/menus/arkMenu/include/common.h
+++ b/extras/menus/arkMenu/include/common.h
@@ -12,7 +12,7 @@
 #include <cstdlib>
 #include <malloc.h>
 #include <time.h>
-#include <globals.h>
+#include <ark.h>
 #include "gfx.h"
 #include "mp3.h"
 #include "conf.h"
diff --git a/extras/menus/recovery/submenu.c b/extras/menus/recovery/submenu.c
index 21631c1ae..981d056e2 100644
--- a/extras/menus/recovery/submenu.c
+++ b/extras/menus/recovery/submenu.c
@@ -9,7 +9,7 @@
 #include <list.h>
 #include <plugins.h>
 
-#include "globals.h"
+#include "ark.h"
 
 extern ARKConfig* ark_config;
 extern CFWConfig config;
diff --git a/extras/menus/recovery/usb.c b/extras/menus/recovery/usb.c
index 4843deb9d..f6ac4f0be 100644
--- a/extras/menus/recovery/usb.c
+++ b/extras/menus/recovery/usb.c
@@ -3,7 +3,7 @@
 #include <systemctrl_se.h>
 #include <pspusb.h>
 #include <pspusbstor.h>
-#include "globals.h"
+#include "ark.h"
 
 #define PSP_USBSTOR_EF_DRIVERNAME "USBStorEFlash_Driver"
 
diff --git a/extras/menus/vshmenu/include/vsh.h b/extras/menus/vshmenu/include/vsh.h
index eaa4132b7..898d826f9 100644
--- a/extras/menus/vshmenu/include/vsh.h
+++ b/extras/menus/vshmenu/include/vsh.h
@@ -6,7 +6,7 @@
 #include <pspctrl.h>
 #include <pspkernel.h>
 
-#include "globals.h"
+#include "ark.h"
 #include <systemctrl_se.h>
 #include "umdvideo_list.h"
 
diff --git a/extras/menus/xMenu/include/common.h b/extras/menus/xMenu/include/common.h
index 1c194cd50..502ae7356 100644
--- a/extras/menus/xMenu/include/common.h
+++ b/extras/menus/xMenu/include/common.h
@@ -8,7 +8,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include <string>
-#include <globals.h>
+#include <ark.h>
 #include "graphics.h"
 #include "../../arkMenu/include/conf.h"
 
diff --git a/extras/menus/xMenu/src/menu.cpp b/extras/menus/xMenu/src/menu.cpp
index 0e6899344..2cc6203c2 100644
--- a/extras/menus/xMenu/src/menu.cpp
+++ b/extras/menus/xMenu/src/menu.cpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <unistd.h>
 #include <algorithm>
-#include <globals.h>
+#include <ark.h>
 
 string ark_version;
 
diff --git a/extras/modules/xmbctrl/config.c b/extras/modules/xmbctrl/config.c
index 956d5fad4..e26bf1b80 100644
--- a/extras/modules/xmbctrl/config.c
+++ b/extras/modules/xmbctrl/config.c
@@ -5,7 +5,7 @@
 #include <kubridge.h>
 #include <stddef.h>
 
-#include "globals.h"
+#include "ark.h"
 
 #include "main.h"
 #include "list.h"
diff --git a/extras/modules/xmbctrl/main.c b/extras/modules/xmbctrl/main.c
index c0dd42625..8ab333365 100644
--- a/extras/modules/xmbctrl/main.c
+++ b/extras/modules/xmbctrl/main.c
@@ -28,7 +28,7 @@
 #include <systemctrl_se.h>
 #include <stddef.h>
 
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 
 #include "include/main.h"
diff --git a/extras/modules/xmbctrl/plugins.c b/extras/modules/xmbctrl/plugins.c
index d8ad5e9e5..b1f7c276a 100644
--- a/extras/modules/xmbctrl/plugins.c
+++ b/extras/modules/xmbctrl/plugins.c
@@ -1,4 +1,4 @@
-#include "globals.h"
+#include "ark.h"
 
 #include "list.h"
 #include "settings.h"
diff --git a/libs/libsploit/freemem.c b/libs/libsploit/freemem.c
index ea711235b..bfb0bb93a 100644
--- a/libs/libsploit/freemem.c
+++ b/libs/libsploit/freemem.c
@@ -10,7 +10,7 @@
 #include <rebootconfig.h>
 #include <systemctrl_se.h>
 #include <string.h>
-#include "globals.h"
+#include "ark.h"
 #include "functions.h"
 
 // attempt to free as much memory as possible, some kernel/user exploits need this, others don't
diff --git a/libs/libsploit/functions.c b/libs/libsploit/functions.c
index a59d9f9c0..b19d5ed14 100644
--- a/libs/libsploit/functions.c
+++ b/libs/libsploit/functions.c
@@ -27,7 +27,7 @@
 #include <rebootconfig.h>
 #include <systemctrl_se.h>
 #include <string.h>
-#include "globals.h"
+#include "ark.h"
 #include "functions.h"
 
 static UserFunctions _g_tbl;
diff --git a/libs/libsploit/imports.c b/libs/libsploit/imports.c
index 3963415b7..a927bca96 100644
--- a/libs/libsploit/imports.c
+++ b/libs/libsploit/imports.c
@@ -10,7 +10,7 @@
 #include <rebootconfig.h>
 #include <systemctrl_se.h>
 #include <string.h>
-#include "globals.h"
+#include "ark.h"
 #include "functions.h"
 
 void _flush_cache(){
diff --git a/libs/libsploit/patches.c b/libs/libsploit/patches.c
index a07a44840..6bd90ea83 100644
--- a/libs/libsploit/patches.c
+++ b/libs/libsploit/patches.c
@@ -10,7 +10,7 @@
 #include <rebootconfig.h>
 #include <systemctrl_se.h>
 #include <string.h>
-#include "globals.h"
+#include "ark.h"
 #include "functions.h"
 
 u32 _findJAL(u32 addr, int reversed, int skip){
diff --git a/libs/libsploit/scanner.c b/libs/libsploit/scanner.c
index 99437ee80..68b307b53 100644
--- a/libs/libsploit/scanner.c
+++ b/libs/libsploit/scanner.c
@@ -10,7 +10,7 @@
 #include <rebootconfig.h>
 #include <systemctrl_se.h>
 #include <string.h>
-#include "globals.h"
+#include "ark.h"
 #include "functions.h"
 
 // counter for relocated stubs
diff --git a/libs/psid/psidcheck.c b/libs/psid/psidcheck.c
index 31400837e..a412829dc 100644
--- a/libs/psid/psidcheck.c
+++ b/libs/psid/psidcheck.c
@@ -26,7 +26,7 @@
 #include <systemctrl.h>
 #include <systemctrl_private.h>
 #include <macros.h>
-#include <globals.h>
+#include <ark.h>
 #include "psid.h"
 
 static unsigned char salt[20] __attribute__((aligned(64)));
diff --git a/loader/dc/installer/main.c b/loader/dc/installer/main.c
index 73b35fd42..4328008ec 100644
--- a/loader/dc/installer/main.c
+++ b/loader/dc/installer/main.c
@@ -11,7 +11,7 @@
 #include <stdarg.h>
 #include <stdbool.h>
 
-#include <globals.h>
+#include <ark.h>
 #include <libpsardumper.h>
 #include <pspdecrypt.h>
 #include <kubridge.h>
diff --git a/loader/dc/tmctrl/flashemu.c b/loader/dc/tmctrl/flashemu.c
index 4818a2c6c..29d85f35f 100644
--- a/loader/dc/tmctrl/flashemu.c
+++ b/loader/dc/tmctrl/flashemu.c
@@ -6,7 +6,7 @@
 #include <pspsysmem_kernel.h>
 #include <pspinit.h>
 
-#include <globals.h>
+#include <ark.h>
 
 #define PSP_INIT_KEYCONFIG_APP 0x400
 #define PSP_BOOT_FLASH3 0x80
diff --git a/loader/live/kernel/chain_loader/main.c b/loader/live/kernel/chain_loader/main.c
index 45ed6bc88..ffc14d271 100644
--- a/loader/live/kernel/chain_loader/main.c
+++ b/loader/live/kernel/chain_loader/main.c
@@ -18,7 +18,7 @@
 #include <pspsdk.h>
 #include <psptypes.h>
 #include "graphics.h"
-#include "globals.h"
+#include "ark.h"
 #include "functions.h"
 
 #define ARK_LOADADDR 0x08D30000
diff --git a/loader/live/kernel/kernel_loader/flashinstall.c b/loader/live/kernel/kernel_loader/flashinstall.c
index cdd87524e..b84d340df 100644
--- a/loader/live/kernel/kernel_loader/flashinstall.c
+++ b/loader/live/kernel/kernel_loader/flashinstall.c
@@ -16,7 +16,7 @@
  */
 
 #include <macros.h>
-#include <globals.h>
+#include <ark.h>
 #include "functions.h"
 
 #define BUF_SIZE 16*1024
diff --git a/loader/live/kernel/kernel_loader/reboot.c b/loader/live/kernel/kernel_loader/reboot.c
index 44a3e2b06..26c90a77a 100644
--- a/loader/live/kernel/kernel_loader/reboot.c
+++ b/loader/live/kernel/kernel_loader/reboot.c
@@ -16,7 +16,7 @@
  */
 
 #include "reboot.h"
-#include "globals.h"
+#include "ark.h"
 #include "main.h"
 
 u8* rebootbuffer = NULL;
diff --git a/loader/live/kernel/kxploit/sceUID/kxploit.c b/loader/live/kernel/kxploit/sceUID/kxploit.c
index ac7df08e3..2298867e8 100644
--- a/loader/live/kernel/kxploit/sceUID/kxploit.c
+++ b/loader/live/kernel/kxploit/sceUID/kxploit.c
@@ -21,7 +21,7 @@ Made to work on OFW and CFW.
 #include <string.h>
 
 #include "macros.h"
-#include "globals.h"
+#include "ark.h"
 #include "functions.h"
 #include "kxploit.h"
 
diff --git a/loader/live/user/psxloader/main.c b/loader/live/user/psxloader/main.c
index e65ba446d..0078821d9 100644
--- a/loader/live/user/psxloader/main.c
+++ b/loader/live/user/psxloader/main.c
@@ -13,7 +13,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "globals.h"
+#include "ark.h"
 
 PSP_MODULE_INFO("ARK VitaPOPS Loader", 0, 1, 0);
 
diff --git a/loader/live/user/signed_eboot/eboot/main.c b/loader/live/user/signed_eboot/eboot/main.c
index c4bab0648..2baa654de 100644
--- a/loader/live/user/signed_eboot/eboot/main.c
+++ b/loader/live/user/signed_eboot/eboot/main.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "globals.h"
+#include "ark.h"
 #include "rebootconfig.h"
 #include "functions.h"
 #include "graphics.h"
diff --git a/loader/perma/cipl/classic/mainbinex/main.c b/loader/perma/cipl/classic/mainbinex/main.c
index 763a43ecb..bcfe5074c 100644
--- a/loader/perma/cipl/classic/mainbinex/main.c
+++ b/loader/perma/cipl/classic/mainbinex/main.c
@@ -1,5 +1,5 @@
 #include <pspsdk.h>
-#include <globals.h>
+#include <ark.h>
 #include <macros.h>
 #include "ansi_c_functions.h"
 
diff --git a/loader/perma/cipl/installer/main.c b/loader/perma/cipl/installer/main.c
index 1f2961288..d7747464a 100644
--- a/loader/perma/cipl/installer/main.c
+++ b/loader/perma/cipl/installer/main.c
@@ -35,7 +35,7 @@
 #include <origipl_07G.h>
 #include <origipl_09G.h>
 #include <origipl_11G.h>
-#include <globals.h>
+#include <ark.h>
 
 PSP_MODULE_INFO("IPLFlasher", 0x0800, 1, 0); 
 PSP_MAIN_THREAD_ATTR(PSP_THREAD_ATTR_VSH);