diff --git a/bootloader/config.c b/bootloader/config.c
index 37aed3b4..1fdfe9cc 100644
--- a/bootloader/config.c
+++ b/bootloader/config.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2022 CTCaer
+ * Copyright (c) 2018-2025 CTCaer
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -20,11 +20,8 @@
 #include <bdk.h>
 
 #include "config.h"
-#include "gfx/tui.h"
 #include <libs/fatfs/ff.h>
 
-extern hekate_config h_cfg;
-
 void set_default_configuration()
 {
 	h_cfg.t210b01 = hw_get_chip_id() == GP_HIDREV_MAJOR_T210B01;
diff --git a/bootloader/config.h b/bootloader/config.h
index 6710ce36..07d5986b 100644
--- a/bootloader/config.h
+++ b/bootloader/config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2022 CTCaer
+ * Copyright (c) 2018-2025 CTCaer
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -41,6 +41,8 @@ typedef struct _hekate_config
 	hos_eks_mbr_t *eks;
 } hekate_config;
 
+extern hekate_config h_cfg;
+
 void set_default_configuration();
 
 #endif /* _CONFIG_H_ */
diff --git a/bootloader/frontend/fe_info.c b/bootloader/frontend/fe_info.c
index 67bcfba9..bcbc38c8 100644
--- a/bootloader/frontend/fe_info.c
+++ b/bootloader/frontend/fe_info.c
@@ -25,8 +25,6 @@
 #include "../hos/pkg1.h"
 #include <libs/fatfs/ff.h>
 
-extern hekate_config h_cfg;
-
 #pragma GCC push_options
 #pragma GCC optimize ("Os")
 
diff --git a/bootloader/frontend/fe_tools.c b/bootloader/frontend/fe_tools.c
index eb47fb06..8c2231d8 100644
--- a/bootloader/frontend/fe_tools.c
+++ b/bootloader/frontend/fe_tools.c
@@ -27,7 +27,6 @@
 #include <libs/fatfs/ff.h>
 
 extern boot_cfg_t b_cfg;
-extern hekate_config h_cfg;
 
 #pragma GCC push_options
 #pragma GCC optimize ("Os")
diff --git a/bootloader/gfx/tui.c b/bootloader/gfx/tui.c
index 5c1ef280..339ee493 100644
--- a/bootloader/gfx/tui.c
+++ b/bootloader/gfx/tui.c
@@ -20,8 +20,6 @@
 #include "tui.h"
 #include "../config.h"
 
-extern hekate_config h_cfg;
-
 void tui_sbar(bool force_update)
 {
 	u32 cx, cy;
diff --git a/bootloader/hos/hos.c b/bootloader/hos/hos.c
index 4504a4a1..df7a01f1 100644
--- a/bootloader/hos/hos.c
+++ b/bootloader/hos/hos.c
@@ -29,8 +29,6 @@
 #include "../config.h"
 #include "../storage/emummc.h"
 
-extern hekate_config h_cfg;
-
 //#define DPRINTF(...) gfx_printf(__VA_ARGS__)
 #define DPRINTF(...)
 
diff --git a/bootloader/hos/pkg1.c b/bootloader/hos/pkg1.c
index 9d6b783d..618870b9 100644
--- a/bootloader/hos/pkg1.c
+++ b/bootloader/hos/pkg1.c
@@ -27,8 +27,6 @@
 #include "../config.h"
 #include <libs/compr/lz4.h>
 
-extern hekate_config h_cfg;
-
 // Secmon package2 signature/hash checks patches for Erista.
 #define SM_100_ADR 0x4002B020 // Original: 0x40014020.
 PATCHSET_DEF(_secmon_1_patchset,
diff --git a/bootloader/hos/pkg2.c b/bootloader/hos/pkg2.c
index 4ad838c6..e8b4aad3 100644
--- a/bootloader/hos/pkg2.c
+++ b/bootloader/hos/pkg2.c
@@ -31,7 +31,6 @@
 //#define DPRINTF(...) gfx_printf(__VA_ARGS__)
 #define DPRINTF(...)
 
-extern hekate_config h_cfg;
 extern const u8 package2_keyseed[];
 
 u32 pkg2_newkern_ini1_info;
diff --git a/bootloader/hos/pkg3.c b/bootloader/hos/pkg3.c
index 67520634..8ac885fc 100644
--- a/bootloader/hos/pkg3.c
+++ b/bootloader/hos/pkg3.c
@@ -29,8 +29,6 @@
 //#define DPRINTF(...) gfx_printf(__VA_ARGS__)
 #define DPRINTF(...)
 
-extern hekate_config h_cfg;
-
 extern bool is_ipl_updated(void *buf, const char *path, bool force);
 
 #define PKG3_KIP_SKIP_MAX 16
diff --git a/bootloader/hos/secmon_exo.c b/bootloader/hos/secmon_exo.c
index 5b2d9f1f..57938649 100644
--- a/bootloader/hos/secmon_exo.c
+++ b/bootloader/hos/secmon_exo.c
@@ -25,8 +25,6 @@
 #include <libs/fatfs/ff.h>
 #include "../storage/emummc.h"
 
-extern hekate_config h_cfg;
-
 enum emuMMC_Type
 {
 	emuMMC_None = 0,
diff --git a/bootloader/storage/emummc.c b/bootloader/storage/emummc.c
index 64fe907c..82072441 100644
--- a/bootloader/storage/emummc.c
+++ b/bootloader/storage/emummc.c
@@ -23,7 +23,6 @@
 #include "../config.h"
 #include <libs/fatfs/ff.h>
 
-extern hekate_config h_cfg;
 emummc_cfg_t emu_cfg = { 0 };
 
 void emummc_load_cfg()
diff --git a/nyx/nyx_gui/config.c b/nyx/nyx_gui/config.c
index b4e6f27a..32c7ad19 100644
--- a/nyx/nyx_gui/config.c
+++ b/nyx/nyx_gui/config.c
@@ -22,9 +22,6 @@
 #include "config.h"
 #include <libs/fatfs/ff.h>
 
-extern hekate_config h_cfg;
-extern nyx_config n_cfg;
-
 void set_default_configuration()
 {
 	h_cfg.t210b01 = hw_get_chip_id() == GP_HIDREV_MAJOR_T210B01;
diff --git a/nyx/nyx_gui/config.h b/nyx/nyx_gui/config.h
index 77ee3c54..f05b37a3 100644
--- a/nyx/nyx_gui/config.h
+++ b/nyx/nyx_gui/config.h
@@ -57,6 +57,9 @@ typedef struct _nyx_config
 	u32 bpmp_clock;
 } nyx_config;
 
+extern hekate_config h_cfg;
+extern nyx_config n_cfg;
+
 void set_default_configuration();
 void set_nyx_default_configuration();
 int create_config_entry();
diff --git a/nyx/nyx_gui/frontend/gui.c b/nyx/nyx_gui/frontend/gui.c
index d714643d..39e68f32 100644
--- a/nyx/nyx_gui/frontend/gui.c
+++ b/nyx/nyx_gui/frontend/gui.c
@@ -30,8 +30,6 @@
 #include "../config.h"
 #include <libs/fatfs/ff.h>
 
-extern hekate_config h_cfg;
-extern nyx_config n_cfg;
 extern volatile boot_cfg_t *b_cfg;
 extern volatile nyx_storage_t *nyx_str;
 
diff --git a/nyx/nyx_gui/frontend/gui_emmc_tools.c b/nyx/nyx_gui/frontend/gui_emmc_tools.c
index 9a4df698..793f58d1 100644
--- a/nyx/nyx_gui/frontend/gui_emmc_tools.c
+++ b/nyx/nyx_gui/frontend/gui_emmc_tools.c
@@ -29,7 +29,6 @@
 #include <libs/fatfs/ff.h>
 
 extern boot_cfg_t b_cfg;
-extern hekate_config h_cfg;
 
 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 d7351ab1..2c1eaad9 100644
--- a/nyx/nyx_gui/frontend/gui_info.c
+++ b/nyx/nyx_gui/frontend/gui_info.c
@@ -28,7 +28,6 @@
 
 #define SECTORS_TO_MIB_COEFF 11
 
-extern hekate_config h_cfg;
 extern volatile boot_cfg_t *b_cfg;
 extern volatile nyx_storage_t *nyx_str;
 
diff --git a/nyx/nyx_gui/frontend/gui_options.c b/nyx/nyx_gui/frontend/gui_options.c
index 2b834842..9b2b78ea 100644
--- a/nyx/nyx_gui/frontend/gui_options.c
+++ b/nyx/nyx_gui/frontend/gui_options.c
@@ -28,9 +28,6 @@
 #define CLOCK_MAX_YEAR (CLOCK_MIN_YEAR + 10)
 #define CLOCK_YEARLIST "2025\n2026\n2027\n2028\n2029\n2030\n2031\n2032\n2033\n2034\n2035"
 
-extern hekate_config h_cfg;
-extern nyx_config n_cfg;
-
 static lv_obj_t *autoboot_btn;
 static bool autoboot_first_time = true;
 
diff --git a/nyx/nyx_gui/frontend/gui_tools.c b/nyx/nyx_gui/frontend/gui_tools.c
index 42c04260..e97f45a3 100644
--- a/nyx/nyx_gui/frontend/gui_tools.c
+++ b/nyx/nyx_gui/frontend/gui_tools.c
@@ -31,8 +31,6 @@
 #include <libs/fatfs/ff.h>
 
 extern volatile boot_cfg_t *b_cfg;
-extern hekate_config h_cfg;
-extern nyx_config n_cfg;
 
 lv_obj_t *ums_mbox;
 
diff --git a/nyx/nyx_gui/hos/hos.c b/nyx/nyx_gui/hos/hos.c
index cef7bbe5..f6fa5969 100644
--- a/nyx/nyx_gui/hos/hos.c
+++ b/nyx/nyx_gui/hos/hos.c
@@ -25,8 +25,6 @@
 #include "hos.h"
 #include "../config.h"
 
-extern hekate_config h_cfg;
-
 u8 *cal0_buf = NULL;
 static u8 *bis_keys = NULL;
 
diff --git a/nyx/nyx_gui/hos/pkg1.c b/nyx/nyx_gui/hos/pkg1.c
index f0a4d533..cecbf599 100644
--- a/nyx/nyx_gui/hos/pkg1.c
+++ b/nyx/nyx_gui/hos/pkg1.c
@@ -25,8 +25,6 @@
 #include "pkg1.h"
 #include "../config.h"
 
-extern hekate_config h_cfg;
-
 /*
  * package1.1 header: <wb, ldr, sm>
  * package1.1 layout:
diff --git a/nyx/nyx_gui/hos/pkg2.c b/nyx/nyx_gui/hos/pkg2.c
index 7b6d6cb6..74fb7092 100644
--- a/nyx/nyx_gui/hos/pkg2.c
+++ b/nyx/nyx_gui/hos/pkg2.c
@@ -26,7 +26,6 @@
 #include <libs/fatfs/ff.h>
 #include <libs/compr/blz.h>
 
-extern hekate_config h_cfg;
 extern const u8 package2_keyseed[];
 
 u32 pkg2_newkern_ini1_start;