diff --git a/bootloader/config.c b/bootloader/config.c
index 271ff5e..e9021e1 100644
--- a/bootloader/config.c
+++ b/bootloader/config.c
@@ -17,19 +17,11 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include <bdk.h>
+
 #include "config.h"
-#include <utils/ini.h>
-#include <gfx_utils.h>
 #include "gfx/tui.h"
 #include <libs/fatfs/ff.h>
-#include <soc/fuse.h>
-#include <soc/hw_init.h>
-#include <soc/t210.h>
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <utils/btn.h>
-#include <utils/list.h>
-#include <utils/util.h>
 
 extern hekate_config h_cfg;
 
diff --git a/bootloader/config.h b/bootloader/config.h
index 11f7f26..516cb2f 100644
--- a/bootloader/config.h
+++ b/bootloader/config.h
@@ -17,8 +17,9 @@
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
 
+#include <bdk.h>
+
 #include "hos/hos.h"
-#include <utils/types.h>
 
 typedef struct _hekate_config
 {
diff --git a/bootloader/frontend/fe_emmc_tools.c b/bootloader/frontend/fe_emmc_tools.c
index 15364c4..06ede88 100644
--- a/bootloader/frontend/fe_emmc_tools.c
+++ b/bootloader/frontend/fe_emmc_tools.c
@@ -19,20 +19,13 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include <bdk.h>
+
 #include "fe_emmc_tools.h"
-#include <memory_map.h>
 #include "../config.h"
-#include <gfx_utils.h>
 #include "../gfx/tui.h"
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-#include <sec/se.h>
-#include <sec/se_t210.h>
 #include "../storage/nx_emmc.h"
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <utils/btn.h>
-#include <utils/util.h>
 
 #define NUM_SECTORS_PER_ITER 8192 // 4MB Cache.
 #define OUT_FILENAME_SZ 128
diff --git a/bootloader/frontend/fe_info.c b/bootloader/frontend/fe_info.c
index 938e071..d043d5c 100644
--- a/bootloader/frontend/fe_info.c
+++ b/bootloader/frontend/fe_info.c
@@ -18,28 +18,14 @@
 
 #include <string.h>
 
+#include <bdk.h>
+
 #include "fe_info.h"
 #include "../config.h"
-#include <gfx_utils.h>
 #include "../hos/hos.h"
 #include "../hos/pkg1.h"
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-#include <mem/smmu.h>
-#include <power/bq24193.h>
-#include <power/max17050.h>
-#include <sec/se_t210.h>
-#include <sec/tsec.h>
-#include <soc/fuse.h>
-#include <soc/i2c.h>
-#include <soc/kfuse.h>
-#include <soc/t210.h>
-#include <storage/mmc.h>
 #include "../storage/nx_emmc.h"
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <utils/btn.h>
-#include <utils/util.h>
 
 extern hekate_config h_cfg;
 extern void emmcsn_path_impl(char *path, char *sub_dir, char *filename, sdmmc_storage_t *storage);
diff --git a/bootloader/frontend/fe_tools.c b/bootloader/frontend/fe_tools.c
index 93f99a7..2a53f32 100644
--- a/bootloader/frontend/fe_tools.c
+++ b/bootloader/frontend/fe_tools.c
@@ -19,24 +19,16 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include <bdk.h>
+
 #include "fe_tools.h"
 #include "../config.h"
-#include <gfx_utils.h>
 #include "../gfx/tui.h"
 #include "../hos/hos.h"
 #include "../hos/pkg1.h"
 #include "../hos/pkg2.h"
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-#include <power/max7762x.h>
-#include <sec/se.h>
-#include <sec/se_t210.h>
 #include "../storage/nx_emmc.h"
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <soc/fuse.h>
-#include <utils/btn.h>
-#include <utils/util.h>
 
 extern boot_cfg_t b_cfg;
 extern hekate_config h_cfg;
diff --git a/bootloader/gfx/gfx.h b/bootloader/gfx/gfx.h
index fe1b979..ef7f490 100644
--- a/bootloader/gfx/gfx.h
+++ b/bootloader/gfx/gfx.h
@@ -19,7 +19,7 @@
 #ifndef _GFX_H_
 #define _GFX_H_
 
-#include <utils/types.h>
+#include <bdk.h>
 
 #define EPRINTF(text) gfx_printf("%k"text"%k\n", 0xFFFF0000, 0xFFCCCCCC)
 #define EPRINTFARGS(text, args...) gfx_printf("%k"text"%k\n", 0xFFFF0000, args, 0xFFCCCCCC)
diff --git a/bootloader/gfx/tui.c b/bootloader/gfx/tui.c
index 12e3356..9e61f61 100644
--- a/bootloader/gfx/tui.c
+++ b/bootloader/gfx/tui.c
@@ -15,12 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <display/di.h>
+#include <bdk.h>
+
 #include "tui.h"
 #include "../config.h"
-#include <power/max17050.h>
-#include <utils/btn.h>
-#include <utils/util.h>
 
 extern hekate_config h_cfg;
 
diff --git a/bootloader/gfx/tui.h b/bootloader/gfx/tui.h
index 14537f6..0fd3194 100644
--- a/bootloader/gfx/tui.h
+++ b/bootloader/gfx/tui.h
@@ -18,8 +18,7 @@
 #ifndef _TUI_H_
 #define _TUI_H_
 
-#include <utils/types.h>
-#include <gfx_utils.h>
+#include <bdk.h>
 
 #define MENT_END     0
 #define MENT_HANDLER 1
diff --git a/bootloader/hos/fss.c b/bootloader/hos/fss.c
index 2056130..d6fb35c 100644
--- a/bootloader/hos/fss.c
+++ b/bootloader/hos/fss.c
@@ -18,15 +18,15 @@
 
 #include <string.h>
 
+#include <bdk.h>
+
 #include "fss.h"
 #include "hos.h"
 #include "../config.h"
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
 #include "../storage/emummc.h"
-#include <storage/nx_sd.h>
 
-#include <gfx_utils.h>
+//#define DPRINTF(...) gfx_printf(__VA_ARGS__)
 #define DPRINTF(...)
 
 extern hekate_config h_cfg;
diff --git a/bootloader/hos/hos.c b/bootloader/hos/hos.c
index 64de50d..8f373ca 100644
--- a/bootloader/hos/hos.c
+++ b/bootloader/hos/hos.c
@@ -20,32 +20,14 @@
 
 #include <string.h>
 
+#include <bdk.h>
+
 #include "hos.h"
 #include "hos_config.h"
 #include "secmon_exo.h"
 #include "../config.h"
-#include <display/di.h>
-#include <gfx_utils.h>
-#include <mem/heap.h>
-#include <mem/mc.h>
-#include <mem/minerva.h>
-#include <mem/smmu.h>
-#include <sec/se.h>
-#include <sec/se_t210.h>
-#include <sec/tsec.h>
-#include <soc/bpmp.h>
-#include <soc/ccplex.h>
-#include <soc/clock.h>
-#include <soc/fuse.h>
-#include <soc/pmc.h>
-#include <soc/t210.h>
 #include "../storage/emummc.h"
-#include <storage/mbr_gpt.h>
 #include "../storage/nx_emmc.h"
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <utils/btn.h>
-#include <utils/util.h>
 
 extern hekate_config h_cfg;
 
diff --git a/bootloader/hos/hos.h b/bootloader/hos/hos.h
index a74e3b4..170e313 100644
--- a/bootloader/hos/hos.h
+++ b/bootloader/hos/hos.h
@@ -18,12 +18,10 @@
 #ifndef _HOS_H_
 #define _HOS_H_
 
+#include <bdk.h>
+
 #include "pkg1.h"
 #include "pkg2.h"
-#include <sec/se_t210.h>
-#include <utils/types.h>
-#include <utils/ini.h>
-#include <sec/tsec.h>
 
 #include <assert.h>
 
diff --git a/bootloader/hos/hos_config.c b/bootloader/hos/hos_config.c
index 406e50d..84f6864 100644
--- a/bootloader/hos/hos_config.c
+++ b/bootloader/hos/hos_config.c
@@ -17,15 +17,12 @@
 
 #include <string.h>
 
+#include <bdk.h>
+
 #include "hos.h"
 #include "hos_config.h"
 #include "fss.h"
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-#include <storage/nx_sd.h>
-#include <utils/dirlist.h>
-
-#include <gfx_utils.h>
 
 //#define DPRINTF(...) gfx_printf(__VA_ARGS__)
 #define DPRINTF(...)
diff --git a/bootloader/hos/pkg1.c b/bootloader/hos/pkg1.c
index bcc8d59..cfffbcd 100644
--- a/bootloader/hos/pkg1.c
+++ b/bootloader/hos/pkg1.c
@@ -20,19 +20,12 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include <bdk.h>
+
 #include "hos.h"
 #include "pkg1.h"
 #include "../config.h"
-#include <gfx_utils.h>
 #include <libs/compr/lz4.h>
-#include <mem/heap.h>
-#include <soc/fuse.h>
-#include <sec/se.h>
-#include <soc/pmc.h>
-#include <soc/t210.h>
-#include <storage/nx_sd.h>
-#include <utils/aarch64_util.h>
-#include <utils/util.h>
 
 extern hekate_config h_cfg;
 
diff --git a/bootloader/hos/pkg1.h b/bootloader/hos/pkg1.h
index 6ae45f9..cf48838 100644
--- a/bootloader/hos/pkg1.h
+++ b/bootloader/hos/pkg1.h
@@ -17,7 +17,7 @@
 #ifndef _PKG1_H_
 #define _PKG1_H_
 
-#include <utils/types.h>
+#include <bdk.h>
 
 #define PKG1_MAGIC 0x31314B50
 
diff --git a/bootloader/hos/pkg2.c b/bootloader/hos/pkg2.c
index b0792b2..5501edb 100644
--- a/bootloader/hos/pkg2.c
+++ b/bootloader/hos/pkg2.c
@@ -17,6 +17,8 @@
 
 #include <string.h>
 
+#include <bdk.h>
+
 #include "hos.h"
 #include "pkg2.h"
 #include "pkg2_ini_kippatch.h"
@@ -24,14 +26,7 @@
 #include "../config.h"
 #include <libs/compr/blz.h>
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-#include <sec/se.h>
-#include <sec/se_t210.h>
 #include "../storage/emummc.h"
-#include <storage/nx_sd.h>
-#include <utils/aarch64_util.h>
-
-#include <gfx_utils.h>
 
 extern hekate_config h_cfg;
 extern const u8 package2_keyseed[];
@@ -41,7 +36,6 @@ u32 pkg2_newkern_ini1_start;
 u32 pkg2_newkern_ini1_end;
 
 #ifdef KIP1_PATCH_DEBUG
-	#include <utils/util.h>
 	#define DPRINTF(...) gfx_printf(__VA_ARGS__)
 	#define DEBUG_PRINTING
 #else
diff --git a/bootloader/hos/pkg2.h b/bootloader/hos/pkg2.h
index 2c2fdc9..a163677 100644
--- a/bootloader/hos/pkg2.h
+++ b/bootloader/hos/pkg2.h
@@ -18,8 +18,7 @@
 #ifndef _PKG2_H_
 #define _PKG2_H_
 
-#include <utils/types.h>
-#include <utils/list.h>
+#include <bdk.h>
 
 #define PKG2_MAGIC 0x31324B50
 #define PKG2_SEC_BASE 0x80000000
diff --git a/bootloader/hos/pkg2_ini_kippatch.c b/bootloader/hos/pkg2_ini_kippatch.c
index 4caf31d..ba8f0cd 100644
--- a/bootloader/hos/pkg2_ini_kippatch.c
+++ b/bootloader/hos/pkg2_ini_kippatch.c
@@ -1,9 +1,10 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include <bdk.h>
+
 #include "pkg2_ini_kippatch.h"
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
 
 #define KPS(x) ((u32)(x) << 29)
 
diff --git a/bootloader/hos/pkg2_ini_kippatch.h b/bootloader/hos/pkg2_ini_kippatch.h
index 039adaf..8fd9eb3 100644
--- a/bootloader/hos/pkg2_ini_kippatch.h
+++ b/bootloader/hos/pkg2_ini_kippatch.h
@@ -17,8 +17,7 @@
 #ifndef _INIPATCH_H_
 #define _INIPATCH_H_
 
-#include <utils/types.h>
-#include <utils/list.h>
+#include <bdk.h>
 
 typedef struct _ini_patchset_t
 {
diff --git a/bootloader/hos/secmon_exo.c b/bootloader/hos/secmon_exo.c
index dd270b0..eb70cf3 100644
--- a/bootloader/hos/secmon_exo.c
+++ b/bootloader/hos/secmon_exo.c
@@ -18,20 +18,13 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include <bdk.h>
+
 #include "hos.h"
 #include "../config.h"
-#include <display/di.h>
-#include <gfx_utils.h>
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-#include <soc/fuse.h>
 #include "../storage/emummc.h"
 #include "../storage/nx_emmc.h"
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <utils/btn.h>
-#include <utils/util.h>
-#include <utils/types.h>
 
 extern hekate_config h_cfg;
 
diff --git a/bootloader/hos/secmon_exo.h b/bootloader/hos/secmon_exo.h
index 78f4192..a5b494b 100644
--- a/bootloader/hos/secmon_exo.h
+++ b/bootloader/hos/secmon_exo.h
@@ -17,7 +17,7 @@
 #ifndef _SECMON_EXO_H_
 #define _SECMON_EXO_H_
 
-#include <utils/types.h>
+#include <bdk.h>
 
 void config_exosphere(launch_ctxt_t *ctxt, u32 warmboot_base);
 void secmon_exo_check_panic();
diff --git a/bootloader/libs/fatfs/diskio.c b/bootloader/libs/fatfs/diskio.c
index 0f87131..d207d96 100644
--- a/bootloader/libs/fatfs/diskio.c
+++ b/bootloader/libs/fatfs/diskio.c
@@ -9,10 +9,9 @@
 
 #include <string.h>
 
+#include <bdk.h>
+
 #include <libs/fatfs/diskio.h>	/* FatFs lower layer API */
-#include <memory_map.h>
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
 
 /*-----------------------------------------------------------------------*/
 /* Get Drive Status                                                      */
diff --git a/bootloader/libs/fatfs/ffsystem.c b/bootloader/libs/fatfs/ffsystem.c
index 6f5f435..a1a5172 100644
--- a/bootloader/libs/fatfs/ffsystem.c
+++ b/bootloader/libs/fatfs/ffsystem.c
@@ -4,11 +4,7 @@
 /* (C) CTCaer, 2018                                                       */
 /*------------------------------------------------------------------------*/
 
-
-#include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-
-
+#include <bdk.h>
 
 #if FF_USE_LFN == 3	/* Dynamic memory allocation */
 
diff --git a/bootloader/main.c b/bootloader/main.c
index 62f4f5d..5adc469 100644
--- a/bootloader/main.c
+++ b/bootloader/main.c
@@ -19,11 +19,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <memory_map.h>
+#include <bdk.h>
 
 #include "config.h"
-#include <display/di.h>
-#include <gfx_utils.h>
 #include "gfx/logos.h"
 #include "gfx/tui.h"
 #include "hos/hos.h"
@@ -31,29 +29,8 @@
 #include <ianos/ianos.h>
 #include <libs/compr/blz.h>
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-#include <mem/minerva.h>
-#include <mem/sdram.h>
-#include <power/bq24193.h>
-#include <power/max17050.h>
-#include <power/max77620.h>
-#include <power/max7762x.h>
-#include <rtc/max77620-rtc.h>
-#include <soc/bpmp.h>
-#include <soc/fuse.h>
-#include <soc/hw_init.h>
-#include <soc/i2c.h>
-#include <soc/pmc.h>
-#include <soc/t210.h>
-#include <soc/uart.h>
 #include "storage/emummc.h"
 #include "storage/nx_emmc.h"
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <utils/btn.h>
-#include <utils/dirlist.h>
-#include <utils/list.h>
-#include <utils/util.h>
 
 #include "frontend/fe_emmc_tools.h"
 #include "frontend/fe_tools.h"
diff --git a/bootloader/storage/emummc.c b/bootloader/storage/emummc.c
index fc44be3..b69c062 100644
--- a/bootloader/storage/emummc.c
+++ b/bootloader/storage/emummc.c
@@ -17,17 +17,12 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include <bdk.h>
+
 #include "emummc.h"
-#include <storage/sdmmc.h>
 #include "../config.h"
-#include <utils/ini.h>
-#include <gfx_utils.h>
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
 #include "../storage/nx_emmc.h"
-#include <storage/nx_sd.h>
-#include <utils/list.h>
-#include <utils/types.h>
 
 extern hekate_config h_cfg;
 emummc_cfg_t emu_cfg = { 0 };
diff --git a/bootloader/storage/emummc.h b/bootloader/storage/emummc.h
index 7e162fd..617b36b 100644
--- a/bootloader/storage/emummc.h
+++ b/bootloader/storage/emummc.h
@@ -17,8 +17,7 @@
 #ifndef EMUMMC_H
 #define EMUMMC_H
 
-#include <storage/sdmmc.h>
-#include <utils/types.h>
+#include <bdk.h>
 
 typedef enum
 {
diff --git a/bootloader/storage/nx_emmc.c b/bootloader/storage/nx_emmc.c
index 223c449..34f0395 100644
--- a/bootloader/storage/nx_emmc.c
+++ b/bootloader/storage/nx_emmc.c
@@ -17,12 +17,10 @@
 
 #include <string.h>
 
+#include <bdk.h>
+
 #include "nx_emmc.h"
 #include "emummc.h"
-#include <mem/heap.h>
-#include <soc/fuse.h>
-#include <storage/mbr_gpt.h>
-#include <utils/list.h>
 
 sdmmc_t emmc_sdmmc;
 sdmmc_storage_t emmc_storage;
diff --git a/bootloader/storage/nx_emmc.h b/bootloader/storage/nx_emmc.h
index f89f526..0615dc6 100644
--- a/bootloader/storage/nx_emmc.h
+++ b/bootloader/storage/nx_emmc.h
@@ -18,10 +18,9 @@
 #ifndef _NX_EMMC_H_
 #define _NX_EMMC_H_
 
-#include <storage/sdmmc.h>
+#include <bdk.h>
+
 #include <libs/fatfs/ff.h>
-#include <utils/types.h>
-#include <utils/list.h>
 
 #define NX_GPT_FIRST_LBA  1
 #define NX_GPT_NUM_BLOCKS 33
diff --git a/bootloader/storage/nx_sd.c b/bootloader/storage/nx_sd.c
index f2cec2f..e81e893 100644
--- a/bootloader/storage/nx_sd.c
+++ b/bootloader/storage/nx_sd.c
@@ -15,12 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <storage/sdmmc_driver.h>
-#include <gfx_utils.h>
+#include <bdk.h>
+
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
 
 static bool sd_mounted = false;
 static u16  sd_errors[3] = { 0 }; // Init and Read/Write errors.
diff --git a/nyx/nyx_gui/config.c b/nyx/nyx_gui/config.c
index 7ddf771..ab62296 100644
--- a/nyx/nyx_gui/config.c
+++ b/nyx/nyx_gui/config.c
@@ -17,18 +17,10 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include <bdk.h>
+
 #include "config.h"
-#include <utils/ini.h>
-#include <gfx_utils.h>
 #include <libs/fatfs/ff.h>
-#include <soc/fuse.h>
-#include <soc/hw_init.h>
-#include <soc/t210.h>
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <utils/btn.h>
-#include <utils/list.h>
-#include <utils/util.h>
 
 extern hekate_config h_cfg;
 extern nyx_config n_cfg;
diff --git a/nyx/nyx_gui/config.h b/nyx/nyx_gui/config.h
index aa23dec..04784c1 100644
--- a/nyx/nyx_gui/config.h
+++ b/nyx/nyx_gui/config.h
@@ -17,8 +17,9 @@
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
 
+#include <bdk.h>
+
 #include "hos/hos.h"
-#include <utils/types.h>
 
 typedef struct _hekate_config
 {
diff --git a/nyx/nyx_gui/frontend/fe_emmc_tools.c b/nyx/nyx_gui/frontend/fe_emmc_tools.c
index 2a40a0c..552979f 100644
--- a/nyx/nyx_gui/frontend/fe_emmc_tools.c
+++ b/nyx/nyx_gui/frontend/fe_emmc_tools.c
@@ -21,22 +21,14 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include <bdk.h>
+
 #include "gui.h"
 #include "fe_emmc_tools.h"
 #include "fe_emummc_tools.h"
-#include <memory_map.h>
 #include "../config.h"
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-#include <sec/se.h>
-#include <sec/se_t210.h>
-#include <storage/mbr_gpt.h>
 #include "../storage/nx_emmc.h"
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <utils/btn.h>
-#include <utils/sprintf.h>
-#include <utils/util.h>
 
 #define NUM_SECTORS_PER_ITER 8192 // 4MB Cache.
 #define OUT_FILENAME_SZ 128
diff --git a/nyx/nyx_gui/frontend/fe_emummc_tools.c b/nyx/nyx_gui/frontend/fe_emummc_tools.c
index 816d1b8..47454e7 100644
--- a/nyx/nyx_gui/frontend/fe_emummc_tools.c
+++ b/nyx/nyx_gui/frontend/fe_emummc_tools.c
@@ -21,22 +21,15 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include <bdk.h>
+
 #include "gui.h"
 #include "fe_emummc_tools.h"
 #include "../config.h"
-#include <utils/ini.h>
 #include <libs/fatfs/diskio.h>
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-#include <sec/se.h>
-#include <storage/mbr_gpt.h>
 #include "../storage/nx_emmc.h"
 #include "../storage/nx_emmc_bis.h"
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <utils/btn.h>
-#include <utils/sprintf.h>
-#include <utils/util.h>
 
 #define OUT_FILENAME_SZ 128
 #define NAND_PATROL_SECTOR 0xC20
diff --git a/nyx/nyx_gui/frontend/gui.c b/nyx/nyx_gui/frontend/gui.c
index 8dd579d..500ee9c 100644
--- a/nyx/nyx_gui/frontend/gui.c
+++ b/nyx/nyx_gui/frontend/gui.c
@@ -16,6 +16,8 @@
 
 #include <stdlib.h>
 
+#include <bdk.h>
+
 #include "gui.h"
 #include "gui_emummc_tools.h"
 #include "gui_tools.h"
@@ -26,30 +28,7 @@
 #include "../gfx/logos-gui.h"
 
 #include "../config.h"
-#include <utils/ini.h>
-#include <display/di.h>
-#include <gfx_utils.h>
-#include <input/joycon.h>
-#include <input/touch.h>
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-#include <mem/minerva.h>
-#include <power/bq24193.h>
-#include <power/max17050.h>
-#include <power/regulator_5v.h>
-#include <rtc/max77620-rtc.h>
-#include <soc/bpmp.h>
-#include <soc/fuse.h>
-#include <soc/hw_init.h>
-#include <soc/t210.h>
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <thermal/fan.h>
-#include <thermal/tmp451.h>
-#include <utils/dirlist.h>
-#include <utils/sprintf.h>
-#include <utils/types.h>
-#include <utils/util.h>
 
 extern hekate_config h_cfg;
 extern nyx_config n_cfg;
diff --git a/nyx/nyx_gui/frontend/gui_emmc_tools.c b/nyx/nyx_gui/frontend/gui_emmc_tools.c
index 749c6ba..7908921 100644
--- a/nyx/nyx_gui/frontend/gui_emmc_tools.c
+++ b/nyx/nyx_gui/frontend/gui_emmc_tools.c
@@ -16,6 +16,8 @@
 
 #include <stdlib.h>
 
+#include <bdk.h>
+
 #include "gui.h"
 #include "gui_emmc_tools.h"
 #include "gui_tools.h"
@@ -25,13 +27,6 @@
 #include "../hos/pkg2.h"
 #include "../hos/hos.h"
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-#include <sec/se.h>
-#include <soc/fuse.h>
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <utils/sprintf.h>
-#include <utils/util.h>
 
 extern boot_cfg_t b_cfg;
 extern hekate_config h_cfg;
diff --git a/nyx/nyx_gui/frontend/gui_emummc_tools.c b/nyx/nyx_gui/frontend/gui_emummc_tools.c
index 21e83c5..37cbb99 100644
--- a/nyx/nyx_gui/frontend/gui_emummc_tools.c
+++ b/nyx/nyx_gui/frontend/gui_emummc_tools.c
@@ -16,21 +16,13 @@
 
 #include <stdlib.h>
 
+#include <bdk.h>
+
 #include "gui.h"
 #include "fe_emummc_tools.h"
 #include "gui_tools_partition_manager.h"
-#include <memory_map.h>
-#include <utils/ini.h>
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-#include <storage/mbr_gpt.h>
 #include "../storage/nx_emmc_bis.h"
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <utils/dirlist.h>
-#include <utils/list.h>
-#include <utils/sprintf.h>
-#include <utils/types.h>
 
 extern char *emmcsn_path_impl(char *path, char *sub_dir, char *filename, sdmmc_storage_t *storage);
 
diff --git a/nyx/nyx_gui/frontend/gui_info.c b/nyx/nyx_gui/frontend/gui_info.c
index b895ccd..1779a55 100644
--- a/nyx/nyx_gui/frontend/gui_info.c
+++ b/nyx/nyx_gui/frontend/gui_info.c
@@ -16,36 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <bdk.h>
+
 #include "gui.h"
-#include <display/di.h>
 #include "../config.h"
 #include "../hos/hos.h"
 #include "../hos/pkg1.h"
 #include <libs/fatfs/ff.h>
-#include <input/touch.h>
-#include <mem/emc.h>
-#include <mem/heap.h>
-#include <mem/sdram.h>
-#include <mem/smmu.h>
-#include <power/bm92t36.h>
-#include <power/bq24193.h>
-#include <power/max17050.h>
-#include <power/max77620.h>
-#include <power/max7762x.h>
-#include <power/max77812.h>
-#include <sec/se.h>
-#include <sec/tsec.h>
-#include <soc/fuse.h>
-#include <soc/kfuse.h>
-#include <soc/i2c.h>
-#include <soc/t210.h>
-#include <storage/mmc.h>
 #include "../storage/nx_emmc_bis.h"
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <utils/btn.h>
-#include <utils/sprintf.h>
-#include <utils/util.h>
 
 #define SECTORS_TO_MIB_COEFF 11
 
diff --git a/nyx/nyx_gui/frontend/gui_options.c b/nyx/nyx_gui/frontend/gui_options.c
index f35312e..319c0c9 100644
--- a/nyx/nyx_gui/frontend/gui_options.c
+++ b/nyx/nyx_gui/frontend/gui_options.c
@@ -16,18 +16,11 @@
 
 #include <stdlib.h>
 
+#include <bdk.h>
+
 #include "gui.h"
 #include "../config.h"
-#include <utils/ini.h>
-#include <display/di.h>
-#include <input/joycon.h>
 #include <libs/lvgl/lvgl.h>
-#include <mem/heap.h>
-#include <rtc/max77620-rtc.h>
-#include <storage/nx_sd.h>
-#include <utils/list.h>
-#include <utils/sprintf.h>
-#include <utils/types.h>
 
 extern hekate_config h_cfg;
 extern nyx_config n_cfg;
diff --git a/nyx/nyx_gui/frontend/gui_tools.c b/nyx/nyx_gui/frontend/gui_tools.c
index 03ba0d9..c356e8a 100644
--- a/nyx/nyx_gui/frontend/gui_tools.c
+++ b/nyx/nyx_gui/frontend/gui_tools.c
@@ -17,33 +17,19 @@
 
 #include <stdlib.h>
 
+#include <bdk.h>
+
 #include "gui.h"
 #include "gui_tools.h"
 #include "gui_tools_partition_manager.h"
 #include "gui_emmc_tools.h"
 #include "fe_emummc_tools.h"
-#include <memory_map.h>
 #include "../config.h"
-#include <display/di.h>
 #include "../hos/pkg1.h"
 #include "../hos/pkg2.h"
 #include "../hos/hos.h"
-#include <input/touch.h>
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-#include <mem/minerva.h>
-#include <sec/se.h>
-#include <soc/bpmp.h>
-#include <soc/fuse.h>
-#include <soc/hw_init.h>
-#include <soc/t210.h>
 #include "../storage/nx_emmc.h"
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <usb/usbd.h>
-#include <utils/btn.h>
-#include <utils/sprintf.h>
-#include <utils/util.h>
 
 extern volatile boot_cfg_t *b_cfg;
 extern hekate_config h_cfg;
diff --git a/nyx/nyx_gui/frontend/gui_tools_partition_manager.c b/nyx/nyx_gui/frontend/gui_tools_partition_manager.c
index 713b827..75d00e7 100644
--- a/nyx/nyx_gui/frontend/gui_tools_partition_manager.c
+++ b/nyx/nyx_gui/frontend/gui_tools_partition_manager.c
@@ -16,24 +16,14 @@
 
 #include <stdlib.h>
 
+#include <bdk.h>
+
 #include "gui.h"
 #include "gui_tools.h"
 #include "gui_tools_partition_manager.h"
 #include <libs/fatfs/diskio.h>
 #include <libs/lvgl/lvgl.h>
-#include <mem/heap.h>
-#include <sec/se.h>
-#include <soc/hw_init.h>
-#include <soc/pmc.h>
-#include <soc/t210.h>
-#include <storage/mbr_gpt.h>
 #include "../storage/nx_emmc.h"
-#include <storage/nx_sd.h>
-#include <storage/ramdisk.h>
-#include <storage/sdmmc.h>
-#include <utils/btn.h>
-#include <utils/sprintf.h>
-#include <utils/util.h>
 
 extern volatile boot_cfg_t *b_cfg;
 extern volatile nyx_storage_t *nyx_str;
diff --git a/nyx/nyx_gui/gfx/gfx.h b/nyx/nyx_gui/gfx/gfx.h
index ce289d4..405f743 100644
--- a/nyx/nyx_gui/gfx/gfx.h
+++ b/nyx/nyx_gui/gfx/gfx.h
@@ -19,7 +19,7 @@
 #ifndef _GFX_H_
 #define _GFX_H_
 
-#include <utils/types.h>
+#include <bdk.h>
 
 #define EPRINTF(text) gfx_printf("%k"text"%k\n", 0xFFFF0000, 0xFFCCCCCC)
 #define EPRINTFARGS(text, args...) gfx_printf("%k"text"%k\n", 0xFFFF0000, args, 0xFFCCCCCC)
diff --git a/nyx/nyx_gui/gfx/logos-gui.h b/nyx/nyx_gui/gfx/logos-gui.h
index 6bae619..00de294 100644
--- a/nyx/nyx_gui/gfx/logos-gui.h
+++ b/nyx/nyx_gui/gfx/logos-gui.h
@@ -1,11 +1,10 @@
 #ifndef _LOGOS_GUI_H_
 #define _LOGOS_GUI_H_
 
-#include <memory_map.h>
+#include <bdk.h>
 
 #include <libs/lv_conf.h>
 #include <libs/lvgl/lv_draw/lv_draw_img.h>
-#include <utils/types.h>
 
 #define HEKATE_LOGO
 
diff --git a/nyx/nyx_gui/hos/hos.c b/nyx/nyx_gui/hos/hos.c
index c5aa410..ee32468 100644
--- a/nyx/nyx_gui/hos/hos.c
+++ b/nyx/nyx_gui/hos/hos.c
@@ -20,25 +20,11 @@
 
 #include <string.h>
 
+#include <bdk.h>
+
 #include "hos.h"
 #include "../config.h"
-#include <display/di.h>
-#include <gfx_utils.h>
-#include <mem/heap.h>
-#include <mem/mc.h>
-#include <mem/smmu.h>
-#include <sec/se.h>
-#include <sec/se_t210.h>
-#include <sec/tsec.h>
-#include <soc/bpmp.h>
-#include <soc/fuse.h>
-#include <soc/pmc.h>
-#include <soc/t210.h>
-#include <storage/mbr_gpt.h>
 #include "../storage/nx_emmc.h"
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <utils/util.h>
 
 extern hekate_config h_cfg;
 
diff --git a/nyx/nyx_gui/hos/hos.h b/nyx/nyx_gui/hos/hos.h
index 82bbb14..7d55a5a 100644
--- a/nyx/nyx_gui/hos/hos.h
+++ b/nyx/nyx_gui/hos/hos.h
@@ -18,12 +18,10 @@
 #ifndef _HOS_H_
 #define _HOS_H_
 
+#include <bdk.h>
+
 #include "pkg1.h"
 #include "pkg2.h"
-#include <sec/se_t210.h>
-#include <utils/types.h>
-#include <utils/ini.h>
-#include <sec/tsec.h>
 
 #include <assert.h>
 
diff --git a/nyx/nyx_gui/hos/pkg1.c b/nyx/nyx_gui/hos/pkg1.c
index cfa8b78..962b18e 100644
--- a/nyx/nyx_gui/hos/pkg1.c
+++ b/nyx/nyx_gui/hos/pkg1.c
@@ -19,13 +19,11 @@
 
 #include <string.h>
 
+#include <bdk.h>
+
 #include "hos.h"
 #include "pkg1.h"
 #include "../config.h"
-#include <gfx_utils.h>
-#include <mem/heap.h>
-#include <sec/se.h>
-#include <utils/aarch64_util.h>
 
 extern hekate_config h_cfg;
 
diff --git a/nyx/nyx_gui/hos/pkg1.h b/nyx/nyx_gui/hos/pkg1.h
index ca6295d..7d0ad4f 100644
--- a/nyx/nyx_gui/hos/pkg1.h
+++ b/nyx/nyx_gui/hos/pkg1.h
@@ -17,7 +17,7 @@
 #ifndef _PKG1_H_
 #define _PKG1_H_
 
-#include <utils/types.h>
+#include <bdk.h>
 
 #define PKG1_MAGIC 0x31314B50
 
diff --git a/nyx/nyx_gui/hos/pkg2.c b/nyx/nyx_gui/hos/pkg2.c
index 0fb48c6..a13d61b 100644
--- a/nyx/nyx_gui/hos/pkg2.c
+++ b/nyx/nyx_gui/hos/pkg2.c
@@ -17,18 +17,15 @@
 
 #include <string.h>
 
+#include <bdk.h>
+
 #include "pkg2.h"
 #include "hos.h"
 
 #include "../config.h"
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-#include <sec/se.h>
-#include <sec/se_t210.h>
 #include <libs/compr/blz.h>
 
-#include <gfx_utils.h>
-
 extern hekate_config h_cfg;
 extern const u8 package2_keyseed[];
 
@@ -36,8 +33,7 @@ u32 pkg2_newkern_ini1_val;
 u32 pkg2_newkern_ini1_start;
 u32 pkg2_newkern_ini1_end;
 
-/*#include <utils/util.h>
-#define DPRINTF(...) gfx_printf(__VA_ARGS__)
+/*#define DPRINTF(...) gfx_printf(__VA_ARGS__)
 #define DEBUG_PRINTING*/
 #define DPRINTF(...)
 
diff --git a/nyx/nyx_gui/hos/pkg2.h b/nyx/nyx_gui/hos/pkg2.h
index fddfce7..4f6cd4f 100644
--- a/nyx/nyx_gui/hos/pkg2.h
+++ b/nyx/nyx_gui/hos/pkg2.h
@@ -18,8 +18,7 @@
 #ifndef _PKG2_H_
 #define _PKG2_H_
 
-#include <utils/types.h>
-#include <utils/list.h>
+#include <bdk.h>
 
 #define PKG2_MAGIC 0x31324B50
 #define PKG2_SEC_BASE 0x80000000
diff --git a/nyx/nyx_gui/libs/fatfs/diskio.c b/nyx/nyx_gui/libs/fatfs/diskio.c
index 3d37f7d..1a7f98d 100644
--- a/nyx/nyx_gui/libs/fatfs/diskio.c
+++ b/nyx/nyx_gui/libs/fatfs/diskio.c
@@ -9,12 +9,10 @@
 
 #include <string.h>
 
+#include <bdk.h>
+
 #include <libs/fatfs/diskio.h>	/* FatFs lower layer API */
-#include <memory_map.h>
 #include "../../storage/nx_emmc_bis.h"
-#include <storage/nx_sd.h>
-#include <storage/ramdisk.h>
-#include <storage/sdmmc.h>
 
 static u32 sd_rsvd_sectors = 0;
 static u32 ramdisk_sectors = 0;
diff --git a/nyx/nyx_gui/libs/fatfs/ffsystem.c b/nyx/nyx_gui/libs/fatfs/ffsystem.c
index cdd2a7a..59df4cc 100644
--- a/nyx/nyx_gui/libs/fatfs/ffsystem.c
+++ b/nyx/nyx_gui/libs/fatfs/ffsystem.c
@@ -4,11 +4,10 @@
 /* (C) CTCaer, 2018                                                       */
 /*------------------------------------------------------------------------*/
 
+#include <bdk.h>
 
 #include <libs/fatfs/ff.h>
 #include "../../config.h"
-#include <mem/heap.h>
-#include <rtc/max77620-rtc.h>
 
 extern nyx_config n_cfg;
 
diff --git a/nyx/nyx_gui/nyx.c b/nyx/nyx_gui/nyx.c
index a8a026d..657e934 100644
--- a/nyx/nyx_gui/nyx.c
+++ b/nyx/nyx_gui/nyx.c
@@ -19,36 +19,14 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <memory_map.h>
+#include <bdk.h>
 
 #include "config.h"
-#include <display/di.h>
-#include <gfx_utils.h>
 #include "hos/hos.h"
+#include "storage/nx_emmc.h"
 #include <ianos/ianos.h>
 #include <libs/compr/blz.h>
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-#include <mem/minerva.h>
-#include <mem/sdram.h>
-#include <power/max77620.h>
-#include <soc/clock.h>
-#include <soc/bpmp.h>
-#include <soc/fuse.h>
-#include <soc/gpio.h>
-#include <soc/hw_init.h>
-#include <soc/i2c.h>
-#include <soc/pinmux.h>
-#include <soc/pmc.h>
-#include <soc/t210.h>
-#include <soc/uart.h>
-#include "storage/nx_emmc.h"
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <utils/btn.h>
-#include <utils/dirlist.h>
-#include <utils/list.h>
-#include <utils/util.h>
 
 #include "frontend/fe_emmc_tools.h"
 #include "frontend/gui.h"
diff --git a/nyx/nyx_gui/storage/nx_emmc.c b/nyx/nyx_gui/storage/nx_emmc.c
index f7a2a94..759db9f 100644
--- a/nyx/nyx_gui/storage/nx_emmc.c
+++ b/nyx/nyx_gui/storage/nx_emmc.c
@@ -17,11 +17,9 @@
 
 #include <string.h>
 
+#include <bdk.h>
+
 #include "nx_emmc.h"
-#include <mem/heap.h>
-#include <soc/fuse.h>
-#include <storage/mbr_gpt.h>
-#include <utils/list.h>
 
 sdmmc_t emmc_sdmmc;
 sdmmc_storage_t emmc_storage;
diff --git a/nyx/nyx_gui/storage/nx_emmc.h b/nyx/nyx_gui/storage/nx_emmc.h
index f89f526..0615dc6 100644
--- a/nyx/nyx_gui/storage/nx_emmc.h
+++ b/nyx/nyx_gui/storage/nx_emmc.h
@@ -18,10 +18,9 @@
 #ifndef _NX_EMMC_H_
 #define _NX_EMMC_H_
 
-#include <storage/sdmmc.h>
+#include <bdk.h>
+
 #include <libs/fatfs/ff.h>
-#include <utils/types.h>
-#include <utils/list.h>
 
 #define NX_GPT_FIRST_LBA  1
 #define NX_GPT_NUM_BLOCKS 33
diff --git a/nyx/nyx_gui/storage/nx_emmc_bis.c b/nyx/nyx_gui/storage/nx_emmc_bis.c
index 9951a7c..b983921 100644
--- a/nyx/nyx_gui/storage/nx_emmc_bis.c
+++ b/nyx/nyx_gui/storage/nx_emmc_bis.c
@@ -19,15 +19,9 @@
 
 #include <string.h>
 
-#include <memory_map.h>
+#include <bdk.h>
 
-#include <mem/heap.h>
-#include <sec/se.h>
-#include <sec/se_t210.h>
 #include "../storage/nx_emmc.h"
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <utils/types.h>
 
 #define BIS_CLUSTER_SECTORS   32
 #define BIS_CLUSTER_SIZE      16384
diff --git a/nyx/nyx_gui/storage/nx_emmc_bis.h b/nyx/nyx_gui/storage/nx_emmc_bis.h
index 1a137fa..1967d8b 100644
--- a/nyx/nyx_gui/storage/nx_emmc_bis.h
+++ b/nyx/nyx_gui/storage/nx_emmc_bis.h
@@ -18,8 +18,9 @@
 #ifndef NX_EMMC_BIS_H
 #define NX_EMMC_BIS_H
 
+#include <bdk.h>
+
 #include "../storage/nx_emmc.h"
-#include <storage/sdmmc.h>
 
 typedef struct _nx_emmc_cal0_spk_t
 {
diff --git a/nyx/nyx_gui/storage/nx_sd.c b/nyx/nyx_gui/storage/nx_sd.c
index 5037df1..1c22516 100644
--- a/nyx/nyx_gui/storage/nx_sd.c
+++ b/nyx/nyx_gui/storage/nx_sd.c
@@ -15,12 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <storage/sdmmc_driver.h>
-#include <gfx_utils.h>
+#include <bdk.h>
+
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
 
 static bool sd_mounted = false;
 static bool sd_init_done = false;