diff --git a/make/source.mk b/make/source.mk
index c9326c255e..0fb318bec2 100644
--- a/make/source.mk
+++ b/make/source.mk
@@ -9,6 +9,7 @@ COMMON_SRC = \
             $(addprefix config/,$(notdir $(wildcard $(SRC_DIR)/config/*.c))) \
             cli/cli.c \
             cli/settings.c \
+            config/config.c \
             drivers/adc.c \
             drivers/dshot.c \
             drivers/dshot_dpwm.c \
@@ -47,7 +48,6 @@ COMMON_SRC = \
             drivers/transponder_ir_ilap.c \
             drivers/transponder_ir_erlt.c \
             fc/board_info.c \
-            fc/config.c \
             fc/dispatch.c \
             fc/hardfaults.c \
             fc/tasks.c \
diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c
index 606e68ec21..76154413f1 100644
--- a/src/main/blackbox/blackbox.c
+++ b/src/main/blackbox/blackbox.c
@@ -52,7 +52,7 @@
 #include "drivers/sensor.h"
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/rc.h"
 #include "fc/rc_controls.h"
diff --git a/src/main/cli/cli.c b/src/main/cli/cli.c
index a201ce619e..8fa0b888dc 100644
--- a/src/main/cli/cli.c
+++ b/src/main/cli/cli.c
@@ -94,7 +94,7 @@ bool cliMode = false;
 #include "drivers/vtx_table.h"
 
 #include "fc/board_info.h"
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/core.h"
 #include "fc/rc.h"
diff --git a/src/main/cli/settings.c b/src/main/cli/settings.c
index cb8d677aad..36ed629ab8 100644
--- a/src/main/cli/settings.c
+++ b/src/main/cli/settings.c
@@ -43,7 +43,7 @@
 #include "drivers/vtx_common.h"
 #include "drivers/vtx_table.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/core.h"
 #include "fc/rc_adjustments.h"
diff --git a/src/main/cms/cms.c b/src/main/cms/cms.c
index ee355b162e..f3f11fb0e5 100644
--- a/src/main/cms/cms.c
+++ b/src/main/cms/cms.c
@@ -59,7 +59,7 @@
 #include "pg/rx.h"
 
 // For 'ARM' related
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
diff --git a/src/main/cms/cms_menu_blackbox.c b/src/main/cms/cms_menu_blackbox.c
index 1332cfa4bb..531c3660bb 100644
--- a/src/main/cms/cms_menu_blackbox.c
+++ b/src/main/cms/cms_menu_blackbox.c
@@ -49,7 +49,7 @@
 #include "drivers/time.h"
 #include "drivers/sdcard.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "io/asyncfatfs/asyncfatfs.h"
 #include "io/flashfs.h"
diff --git a/src/main/cms/cms_menu_builtin.c b/src/main/cms/cms_menu_builtin.c
index b5c151baba..8c9cf81f63 100644
--- a/src/main/cms/cms_menu_builtin.c
+++ b/src/main/cms/cms_menu_builtin.c
@@ -53,7 +53,7 @@
 
 #include "drivers/system.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "msp/msp_protocol.h" // XXX for FC identification... not available elsewhere
 
diff --git a/src/main/cms/cms_menu_failsafe.c b/src/main/cms/cms_menu_failsafe.c
index b7c60f4f47..8499a0ce46 100644
--- a/src/main/cms/cms_menu_failsafe.c
+++ b/src/main/cms/cms_menu_failsafe.c
@@ -37,7 +37,7 @@
 
 #include "config/feature.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "flight/failsafe.h"
 
diff --git a/src/main/cms/cms_menu_gps_rescue.c b/src/main/cms/cms_menu_gps_rescue.c
index b5406029c4..b2d9b7a756 100644
--- a/src/main/cms/cms_menu_gps_rescue.c
+++ b/src/main/cms/cms_menu_gps_rescue.c
@@ -35,7 +35,7 @@
 
 #include "config/feature.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "flight/gps_rescue.h"
 
diff --git a/src/main/cms/cms_menu_imu.c b/src/main/cms/cms_menu_imu.c
index 50077bd185..4fd79d457c 100644
--- a/src/main/cms/cms_menu_imu.c
+++ b/src/main/cms/cms_menu_imu.c
@@ -43,7 +43,7 @@
 
 #include "drivers/pwm_output.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/core.h"
 #include "fc/rc_controls.h"
diff --git a/src/main/cms/cms_menu_ledstrip.c b/src/main/cms/cms_menu_ledstrip.c
index 72f2ede1bd..25ec667b8f 100644
--- a/src/main/cms/cms_menu_ledstrip.c
+++ b/src/main/cms/cms_menu_ledstrip.c
@@ -36,7 +36,7 @@
 
 #include "config/feature.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "io/ledstrip.h"
 
diff --git a/src/main/cms/cms_menu_misc.c b/src/main/cms/cms_menu_misc.c
index 6e2b647ae5..c76b95d463 100644
--- a/src/main/cms/cms_menu_misc.c
+++ b/src/main/cms/cms_menu_misc.c
@@ -44,7 +44,7 @@
 #include "pg/motor.h"
 #include "pg/rx.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_controls.h"
 
 #include "flight/mixer.h"
diff --git a/src/main/cms/cms_menu_power.c b/src/main/cms/cms_menu_power.c
index 47a66ffa63..e0005cbb25 100644
--- a/src/main/cms/cms_menu_power.c
+++ b/src/main/cms/cms_menu_power.c
@@ -37,7 +37,7 @@
 #include "sensors/current.h"
 #include "sensors/voltage.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 voltageMeterSource_e batteryConfig_voltageMeterSource;
 currentMeterSource_e batteryConfig_currentMeterSource;
diff --git a/src/main/cms/cms_menu_saveexit.c b/src/main/cms/cms_menu_saveexit.c
index 2cafea32ba..0c6055ff67 100644
--- a/src/main/cms/cms_menu_saveexit.c
+++ b/src/main/cms/cms_menu_saveexit.c
@@ -32,7 +32,7 @@
 
 #include "config/feature.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 static const OSD_Entry cmsx_menuSaveExitEntries[] =
 {
diff --git a/src/main/cms/cms_menu_vtx_rtc6705.c b/src/main/cms/cms_menu_vtx_rtc6705.c
index 16d7c9d571..d7f3c3f8cb 100644
--- a/src/main/cms/cms_menu_vtx_rtc6705.c
+++ b/src/main/cms/cms_menu_vtx_rtc6705.c
@@ -35,7 +35,7 @@
 
 #include "drivers/vtx_common.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "io/vtx_rtc6705.h"
 #include "io/vtx.h"
diff --git a/src/main/cms/cms_menu_vtx_smartaudio.c b/src/main/cms/cms_menu_vtx_smartaudio.c
index 02371767c0..9743d332e6 100644
--- a/src/main/cms/cms_menu_vtx_smartaudio.c
+++ b/src/main/cms/cms_menu_vtx_smartaudio.c
@@ -37,7 +37,7 @@
 
 #include "drivers/vtx_common.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "io/vtx_smartaudio.h"
 #include "io/vtx.h"
diff --git a/src/main/cms/cms_menu_vtx_tramp.c b/src/main/cms/cms_menu_vtx_tramp.c
index ea0e3a792f..3a927066a5 100644
--- a/src/main/cms/cms_menu_vtx_tramp.c
+++ b/src/main/cms/cms_menu_vtx_tramp.c
@@ -36,7 +36,7 @@
 
 #include "drivers/vtx_common.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "io/vtx_tramp.h"
 #include "io/vtx.h"
diff --git a/src/main/fc/config.c b/src/main/config/config.c
similarity index 99%
rename from src/main/fc/config.c
rename to src/main/config/config.c
index c5bf5cbd19..1e069c7cd4 100644
--- a/src/main/fc/config.c
+++ b/src/main/config/config.c
@@ -22,7 +22,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <math.h>
-#include <common/printf.h>
 
 #include "platform.h"
 
@@ -32,6 +31,8 @@
 
 #include "cli/cli.h"
 
+#include "common/sensor_alignment.h"
+
 #include "config/config_eeprom.h"
 #include "config/feature.h"
 
@@ -39,7 +40,6 @@
 #include "drivers/motor.h"
 #include "drivers/system.h"
 
-#include "fc/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/core.h"
 #include "fc/rc.h"
@@ -65,9 +65,9 @@
 #include "pg/beeper.h"
 #include "pg/beeper_dev.h"
 #include "pg/gyrodev.h"
+#include "pg/motor.h"
 #include "pg/pg.h"
 #include "pg/pg_ids.h"
-#include "pg/motor.h"
 #include "pg/rx.h"
 #include "pg/vtx_table.h"
 
@@ -80,7 +80,7 @@
 #include "sensors/compass.h"
 #include "sensors/gyro.h"
 
-#include "common/sensor_alignment.h"
+#include "config.h"
 
 static bool configIsDirty; /* someone indicated that the config is modified and it is not yet saved */
 
diff --git a/src/main/fc/config.h b/src/main/config/config.h
similarity index 100%
rename from src/main/fc/config.h
rename to src/main/config/config.h
diff --git a/src/main/config/config_eeprom.c b/src/main/config/config_eeprom.c
index 68b5a88d0e..4f4055a4bb 100644
--- a/src/main/config/config_eeprom.c
+++ b/src/main/config/config_eeprom.c
@@ -32,7 +32,7 @@
 #include "config/config_eeprom.h"
 #include "config/config_streamer.h"
 #include "pg/pg.h"
-#include "fc/config.h"
+#include "config/config.h"
 
 #ifdef CONFIG_IN_SDCARD
 #include "io/asyncfatfs/asyncfatfs.h"
diff --git a/src/main/drivers/serial_softserial.c b/src/main/drivers/serial_softserial.c
index c14f5da7d1..4b96140e88 100644
--- a/src/main/drivers/serial_softserial.c
+++ b/src/main/drivers/serial_softserial.c
@@ -39,13 +39,11 @@
 
 #include "drivers/nvic.h"
 #include "drivers/io.h"
-#include "timer.h"
+#include "drivers/serial.h"
+#include "drivers/timer.h"
 
-#include "serial.h"
 #include "serial_softserial.h"
 
-#include "fc/config.h" //!!TODO remove this dependency
-
 #define RX_TOTAL_BITS 10
 #define TX_TOTAL_BITS 10
 
diff --git a/src/main/fc/controlrate_profile.c b/src/main/fc/controlrate_profile.c
index 54dfb92c15..3c2651e9d2 100644
--- a/src/main/fc/controlrate_profile.c
+++ b/src/main/fc/controlrate_profile.c
@@ -30,7 +30,7 @@
 #include "pg/pg.h"
 #include "pg/pg_ids.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/rc.h"
 #include "fc/rc_controls.h"
diff --git a/src/main/fc/core.c b/src/main/fc/core.c
index 82f6110a04..fd7278cf16 100644
--- a/src/main/fc/core.c
+++ b/src/main/fc/core.c
@@ -49,7 +49,7 @@
 #include "drivers/time.h"
 #include "drivers/transponder_ir.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/core.h"
 #include "fc/rc.h"
diff --git a/src/main/fc/init.c b/src/main/fc/init.c
index b0decce104..af196a94f9 100644
--- a/src/main/fc/init.c
+++ b/src/main/fc/init.c
@@ -83,7 +83,7 @@
 #include "drivers/vtx_table.h"
 
 #include "fc/board_info.h"
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/dispatch.h"
 #include "fc/init.h"
 #include "fc/rc_controls.h"
diff --git a/src/main/fc/rc.c b/src/main/fc/rc.c
index 1efc7ce372..1e73eb4a47 100644
--- a/src/main/fc/rc.c
+++ b/src/main/fc/rc.c
@@ -32,7 +32,7 @@
 
 #include "config/feature.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "drivers/time.h"
 #include "fc/core.h"
diff --git a/src/main/fc/rc_adjustments.c b/src/main/fc/rc_adjustments.c
index 33f4c9f569..44f395c1fc 100644
--- a/src/main/fc/rc_adjustments.c
+++ b/src/main/fc/rc_adjustments.c
@@ -39,7 +39,7 @@
 
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/rc_controls.h"
 #include "fc/rc.h"
diff --git a/src/main/fc/rc_controls.c b/src/main/fc/rc_controls.c
index ca11f92571..003ecf9fc4 100644
--- a/src/main/fc/rc_controls.c
+++ b/src/main/fc/rc_controls.c
@@ -37,7 +37,7 @@
 
 #include "drivers/camera_control.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/core.h"
 #include "fc/rc.h"
 #include "fc/runtime_config.h"
diff --git a/src/main/fc/rc_modes.c b/src/main/fc/rc_modes.c
index 040e780502..f7a15f4093 100644
--- a/src/main/fc/rc_modes.c
+++ b/src/main/fc/rc_modes.c
@@ -35,7 +35,7 @@
 #include "pg/pg_ids.h"
 #include "pg/rx.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_controls.h"
 
 #include "rx/rx.h"
diff --git a/src/main/fc/stats.c b/src/main/fc/stats.c
index 25d571fd27..d0619a0ae5 100644
--- a/src/main/fc/stats.c
+++ b/src/main/fc/stats.c
@@ -24,7 +24,7 @@
 
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/dispatch.h"
 #include "fc/runtime_config.h"
 #include "fc/stats.h"
diff --git a/src/main/fc/tasks.c b/src/main/fc/tasks.c
index 457ccc2e3f..f49705ec2a 100644
--- a/src/main/fc/tasks.c
+++ b/src/main/fc/tasks.c
@@ -46,7 +46,7 @@
 #include "drivers/usb_io.h"
 #include "drivers/vtx_common.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/core.h"
 #include "fc/rc.h"
 #include "fc/dispatch.h"
diff --git a/src/main/flight/failsafe.c b/src/main/flight/failsafe.c
index 0a3b804e56..d8b01b15a5 100644
--- a/src/main/flight/failsafe.c
+++ b/src/main/flight/failsafe.c
@@ -33,7 +33,7 @@
 
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/core.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"
diff --git a/src/main/flight/gps_rescue.c b/src/main/flight/gps_rescue.c
index df4f4be800..59a69e39d5 100644
--- a/src/main/flight/gps_rescue.c
+++ b/src/main/flight/gps_rescue.c
@@ -32,7 +32,7 @@
 
 #include "io/gps.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/core.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"
diff --git a/src/main/flight/mixer.c b/src/main/flight/mixer.c
index d4a13ad0ed..a8afa68701 100644
--- a/src/main/flight/mixer.c
+++ b/src/main/flight/mixer.c
@@ -44,7 +44,7 @@
 
 #include "io/motors.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"
diff --git a/src/main/flight/servos.c b/src/main/flight/servos.c
index a25491f064..812b3c746b 100644
--- a/src/main/flight/servos.c
+++ b/src/main/flight/servos.c
@@ -40,7 +40,7 @@
 
 #include "drivers/pwm_output.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"
 #include "fc/runtime_config.h"
diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c
index 51bbfd0af9..f9b689c822 100644
--- a/src/main/io/beeper.c
+++ b/src/main/io/beeper.c
@@ -36,7 +36,7 @@
 
 #include "flight/mixer.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/core.h"
 #include "fc/runtime_config.h"
 
diff --git a/src/main/io/dashboard.c b/src/main/io/dashboard.c
index 6887bb4142..a8baf8560d 100644
--- a/src/main/io/dashboard.c
+++ b/src/main/io/dashboard.c
@@ -50,7 +50,7 @@
 #include "pg/dashboard.h"
 #include "pg/rx.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
diff --git a/src/main/io/displayport_max7456.c b/src/main/io/displayport_max7456.c
index 59e26ceaf5..f185e042be 100644
--- a/src/main/io/displayport_max7456.c
+++ b/src/main/io/displayport_max7456.c
@@ -30,7 +30,7 @@
 #include "drivers/display.h"
 #include "drivers/max7456.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "io/displayport_max7456.h"
 
diff --git a/src/main/io/gps.c b/src/main/io/gps.c
index 706b57b9c9..de1e4ff9e7 100644
--- a/src/main/io/gps.c
+++ b/src/main/io/gps.c
@@ -47,7 +47,7 @@
 #include "io/gps.h"
 #include "io/serial.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/runtime_config.h"
 
 #include "flight/imu.h"
diff --git a/src/main/io/ledstrip.c b/src/main/io/ledstrip.c
index a57b08ebed..eac37dd67c 100644
--- a/src/main/io/ledstrip.c
+++ b/src/main/io/ledstrip.c
@@ -48,7 +48,7 @@
 #include "drivers/time.h"
 #include "drivers/vtx_common.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/core.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"
diff --git a/src/main/io/serial.c b/src/main/io/serial.c
index 8f33a29e7c..2f0877ab42 100644
--- a/src/main/io/serial.c
+++ b/src/main/io/serial.c
@@ -48,7 +48,7 @@
 #include "drivers/serial_usb_vcp.h"
 #endif
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "io/serial.h"
 
diff --git a/src/main/io/spektrum_vtx_control.c b/src/main/io/spektrum_vtx_control.c
index 7ef3d3f115..97daddc51e 100644
--- a/src/main/io/spektrum_vtx_control.c
+++ b/src/main/io/spektrum_vtx_control.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "drivers/vtx_common.h"
 #include "io/vtx.h"
 
diff --git a/src/main/io/transponder_ir.c b/src/main/io/transponder_ir.c
index a6511ddefa..adb723fa2a 100644
--- a/src/main/io/transponder_ir.c
+++ b/src/main/io/transponder_ir.c
@@ -38,7 +38,7 @@
 #include "drivers/system.h"
 #include "drivers/usb_io.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "io/transponder_ir.h"
 
diff --git a/src/main/io/vtx.c b/src/main/io/vtx.c
index 9a8b19988a..d7393e1e5e 100644
--- a/src/main/io/vtx.c
+++ b/src/main/io/vtx.c
@@ -36,7 +36,7 @@
 #endif
 #include "drivers/vtx_table.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_modes.h"
 #include "fc/runtime_config.h"
 
diff --git a/src/main/io/vtx_control.c b/src/main/io/vtx_control.c
index e2b8013132..0672164683 100644
--- a/src/main/io/vtx_control.c
+++ b/src/main/io/vtx_control.c
@@ -35,7 +35,7 @@
 #include "drivers/time.h"
 #include "drivers/vtx_common.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/runtime_config.h"
 
 #include "io/spektrum_vtx_control.h"
diff --git a/src/main/msp/msp.c b/src/main/msp/msp.c
index 572a9a6a56..b9cf361895 100644
--- a/src/main/msp/msp.c
+++ b/src/main/msp/msp.c
@@ -67,7 +67,7 @@
 #include "drivers/vtx_table.h"
 
 #include "fc/board_info.h"
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/core.h"
 #include "fc/rc.h"
diff --git a/src/main/msp/msp_box.c b/src/main/msp/msp_box.c
index a6779a0944..d49d4a210b 100644
--- a/src/main/msp/msp_box.c
+++ b/src/main/msp/msp_box.c
@@ -30,7 +30,7 @@
 
 #include "config/feature.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/runtime_config.h"
 
 #include "flight/mixer.h"
diff --git a/src/main/osd/osd_elements.c b/src/main/osd/osd_elements.c
index 9e43bd6cd4..fce38de8cb 100644
--- a/src/main/osd/osd_elements.c
+++ b/src/main/osd/osd_elements.c
@@ -72,7 +72,7 @@
 #include "drivers/time.h"
 #include "drivers/vtx_common.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/core.h"
 #include "fc/rc_adjustments.h"
diff --git a/src/main/rx/a7105_flysky.c b/src/main/rx/a7105_flysky.c
index 0f7c0f11d0..16b61c2fc4 100644
--- a/src/main/rx/a7105_flysky.c
+++ b/src/main/rx/a7105_flysky.c
@@ -35,7 +35,7 @@
 #include "drivers/system.h"
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "pg/pg.h"
 #include "pg/pg_ids.h"
diff --git a/src/main/rx/cc2500_common.c b/src/main/rx/cc2500_common.c
index 4e7ca47d22..510dc7b42a 100644
--- a/src/main/rx/cc2500_common.c
+++ b/src/main/rx/cc2500_common.c
@@ -30,7 +30,7 @@
 #include "drivers/rx/rx_cc2500.h"
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "pg/pg.h"
 #include "pg/pg_ids.h"
diff --git a/src/main/rx/cc2500_frsky_d.c b/src/main/rx/cc2500_frsky_d.c
index b57369dae4..b375ee146c 100644
--- a/src/main/rx/cc2500_frsky_d.c
+++ b/src/main/rx/cc2500_frsky_d.c
@@ -41,7 +41,7 @@
 #include "drivers/system.h"
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "pg/rx.h"
 #include "pg/rx_spi.h"
diff --git a/src/main/rx/cc2500_frsky_shared.c b/src/main/rx/cc2500_frsky_shared.c
index 9ab32d72c3..1aae54c1ad 100644
--- a/src/main/rx/cc2500_frsky_shared.c
+++ b/src/main/rx/cc2500_frsky_shared.c
@@ -30,7 +30,7 @@
 #include "drivers/io.h"
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "pg/rx.h"
 #include "pg/rx_spi.h"
diff --git a/src/main/rx/cc2500_frsky_x.c b/src/main/rx/cc2500_frsky_x.c
index 154d9fe7bd..53d1a7b64f 100644
--- a/src/main/rx/cc2500_frsky_x.c
+++ b/src/main/rx/cc2500_frsky_x.c
@@ -41,7 +41,7 @@
 #include "drivers/system.h"
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "pg/rx.h"
 #include "pg/rx_spi.h"
diff --git a/src/main/rx/cc2500_sfhss.c b/src/main/rx/cc2500_sfhss.c
index a12eec332e..fcb97e46de 100644
--- a/src/main/rx/cc2500_sfhss.c
+++ b/src/main/rx/cc2500_sfhss.c
@@ -33,7 +33,7 @@
 #include "drivers/io.h"
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "pg/rx.h"
 #include "pg/rx_spi.h"
diff --git a/src/main/rx/cyrf6936_spektrum.c b/src/main/rx/cyrf6936_spektrum.c
index 66a79a30cd..6246ee1347 100644
--- a/src/main/rx/cyrf6936_spektrum.c
+++ b/src/main/rx/cyrf6936_spektrum.c
@@ -32,7 +32,7 @@
 
 #include "sensors/battery.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "config/feature.h"
 
 #include "pg/pg.h"
diff --git a/src/main/rx/pwm.c b/src/main/rx/pwm.c
index 7f7d992478..44b3a152b7 100644
--- a/src/main/rx/pwm.c
+++ b/src/main/rx/pwm.c
@@ -36,7 +36,7 @@
 
 #include "drivers/rx/rx_pwm.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "rx/rx.h"
 #include "rx/pwm.h"
diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c
index 026c66edfe..66c96f3327 100644
--- a/src/main/rx/rx.c
+++ b/src/main/rx/rx.c
@@ -41,7 +41,7 @@
 #include "drivers/rx/rx_spi.h"
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"
 
diff --git a/src/main/rx/rx_spi.c b/src/main/rx/rx_spi.c
index 12a86afe1f..4095496a56 100644
--- a/src/main/rx/rx_spi.c
+++ b/src/main/rx/rx_spi.c
@@ -34,7 +34,7 @@
 #include "drivers/rx/rx_spi.h"
 #include "drivers/rx/rx_nrf24l01.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "pg/rx_spi.h"
 
diff --git a/src/main/rx/spektrum.c b/src/main/rx/spektrum.c
index 1863e0843a..849657a8f7 100644
--- a/src/main/rx/spektrum.c
+++ b/src/main/rx/spektrum.c
@@ -38,7 +38,7 @@
 
 #include "io/serial.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "io/spektrum_rssi.h"
 #include "io/spektrum_vtx_control.h"
diff --git a/src/main/scheduler/scheduler.h b/src/main/scheduler/scheduler.h
index 378399d9c9..7931afbfb3 100644
--- a/src/main/scheduler/scheduler.h
+++ b/src/main/scheduler/scheduler.h
@@ -21,7 +21,7 @@
 #pragma once
 
 #include "common/time.h"
-#include "fc/config.h"
+#include "config/config.h"
 
 #define TASK_PERIOD_HZ(hz) (1000000 / (hz))
 #define TASK_PERIOD_MS(ms) ((ms) * 1000)
diff --git a/src/main/sensors/acceleration.c b/src/main/sensors/acceleration.c
index 6af3f04101..43a3bcc8fe 100644
--- a/src/main/sensors/acceleration.c
+++ b/src/main/sensors/acceleration.c
@@ -67,7 +67,7 @@
 
 #include "drivers/bus_spi.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/runtime_config.h"
 
 #include "io/beeper.h"
diff --git a/src/main/sensors/battery.c b/src/main/sensors/battery.c
index 716cc3faa7..25a2dfacfb 100644
--- a/src/main/sensors/battery.c
+++ b/src/main/sensors/battery.c
@@ -36,7 +36,7 @@
 #include "drivers/adc.h"
 
 #include "fc/runtime_config.h"
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_controls.h"
 
 #include "io/beeper.h"
diff --git a/src/main/sensors/compass.c b/src/main/sensors/compass.c
index cfee7835e4..9107a61c83 100644
--- a/src/main/sensors/compass.c
+++ b/src/main/sensors/compass.c
@@ -43,7 +43,7 @@
 #include "drivers/io.h"
 #include "drivers/light_led.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/runtime_config.h"
 
 #include "sensors/boardalignment.h"
diff --git a/src/main/sensors/esc_sensor.c b/src/main/sensors/esc_sensor.c
index 2f7c0063bd..83e5b50055 100644
--- a/src/main/sensors/esc_sensor.c
+++ b/src/main/sensors/esc_sensor.c
@@ -47,7 +47,7 @@
 
 #include "esc_sensor.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "flight/mixer.h"
 
diff --git a/src/main/sensors/gyro.c b/src/main/sensors/gyro.c
index 2eae9232fd..a4fb73d92b 100644
--- a/src/main/sensors/gyro.c
+++ b/src/main/sensors/gyro.c
@@ -63,7 +63,7 @@
 #include "drivers/bus_spi.h"
 #include "drivers/io.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/runtime_config.h"
 
 #ifdef USE_GYRO_DATA_ANALYSE
diff --git a/src/main/sensors/initialisation.c b/src/main/sensors/initialisation.c
index 2f8a4a596b..3ace81ec11 100644
--- a/src/main/sensors/initialisation.c
+++ b/src/main/sensors/initialisation.c
@@ -30,7 +30,7 @@
 #include "pg/pg.h"
 #include "pg/pg_ids.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/runtime_config.h"
 
 #include "sensors/sensors.h"
diff --git a/src/main/sensors/rangefinder.c b/src/main/sensors/rangefinder.c
index 6a7af62d44..6ed1a0b872 100644
--- a/src/main/sensors/rangefinder.c
+++ b/src/main/sensors/rangefinder.c
@@ -44,7 +44,7 @@
 #include "drivers/rangefinder/rangefinder_hcsr04.h"
 #include "drivers/rangefinder/rangefinder_lidartf.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/runtime_config.h"
 #include "fc/tasks.h"
 
diff --git a/src/main/target/ALIENFLIGHTF1/config.c b/src/main/target/ALIENFLIGHTF1/config.c
index 676342c3c2..babc00da69 100644
--- a/src/main/target/ALIENFLIGHTF1/config.c
+++ b/src/main/target/ALIENFLIGHTF1/config.c
@@ -29,7 +29,7 @@
 
 #include "drivers/pwm_esc_detect.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "flight/pid.h"
 
diff --git a/src/main/target/ALIENFLIGHTF4/config.c b/src/main/target/ALIENFLIGHTF4/config.c
index dbbd6f44ca..04c84398cf 100644
--- a/src/main/target/ALIENFLIGHTF4/config.c
+++ b/src/main/target/ALIENFLIGHTF4/config.c
@@ -31,7 +31,7 @@
 
 #include "drivers/pwm_esc_detect.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "flight/mixer.h"
 #include "flight/pid.h"
diff --git a/src/main/target/ALIENFLIGHTNGF7/config.c b/src/main/target/ALIENFLIGHTNGF7/config.c
index d1ec51473f..c45f604f6a 100644
--- a/src/main/target/ALIENFLIGHTNGF7/config.c
+++ b/src/main/target/ALIENFLIGHTNGF7/config.c
@@ -30,7 +30,7 @@
 
 #include "drivers/pwm_esc_detect.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "flight/mixer.h"
 #include "flight/pid.h"
diff --git a/src/main/target/ALIENWHOOP/config.c b/src/main/target/ALIENWHOOP/config.c
index cf515b30d9..18d651b994 100644
--- a/src/main/target/ALIENWHOOP/config.c
+++ b/src/main/target/ALIENWHOOP/config.c
@@ -47,7 +47,7 @@
 #include "common/filter.h"
 #include "config/feature.h"
 #include "drivers/pwm_esc_detect.h"
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"
diff --git a/src/main/target/BEEBRAIN_V2F/config.c b/src/main/target/BEEBRAIN_V2F/config.c
index fbe888687f..8f3bf84f5f 100644
--- a/src/main/target/BEEBRAIN_V2F/config.c
+++ b/src/main/target/BEEBRAIN_V2F/config.c
@@ -34,7 +34,7 @@
 #include "drivers/light_led.h"
 #include "drivers/pwm_esc_detect.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/rc_modes.h"
 #include "fc/rc_controls.h"
diff --git a/src/main/target/BLUEJAYF4/initialisation.c b/src/main/target/BLUEJAYF4/initialisation.c
index ff17d47307..bf08512323 100644
--- a/src/main/target/BLUEJAYF4/initialisation.c
+++ b/src/main/target/BLUEJAYF4/initialisation.c
@@ -29,7 +29,7 @@
 #include "drivers/bus_spi.h"
 #include "drivers/io.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "io/serial.h"
 
diff --git a/src/main/target/CLRACINGF4/config.c b/src/main/target/CLRACINGF4/config.c
index b008fe7715..2291955796 100644
--- a/src/main/target/CLRACINGF4/config.c
+++ b/src/main/target/CLRACINGF4/config.c
@@ -26,12 +26,12 @@
 #include "pg/piniobox.h"
 #include "rx/rx.h"
 #include "telemetry/telemetry.h"
-#include "fc/config.h"
+#include "config/config.h"
 #include "drivers/pwm_output.h"
 #include "sensors/gyro.h"
 #include "io/vtx.h"
 #include "io/ledstrip.h"
-#include "fc/config.h"
+#include "config/config.h"
 #include "pg/piniobox.h"
 #include "pg/motor.h"
 #include "common/axis.h"
diff --git a/src/main/target/COLIBRI_RACE/i2c_bst.c b/src/main/target/COLIBRI_RACE/i2c_bst.c
index f1303bb66b..fa8c6cf32f 100644
--- a/src/main/target/COLIBRI_RACE/i2c_bst.c
+++ b/src/main/target/COLIBRI_RACE/i2c_bst.c
@@ -25,7 +25,7 @@
 #include "drivers/time.h"
 #include "drivers/timer.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/core.h"
 #include "fc/rc_adjustments.h"
diff --git a/src/main/target/ELINF722/config.c b/src/main/target/ELINF722/config.c
index c6d8a057b6..c5c3f4c9e1 100644
--- a/src/main/target/ELINF722/config.c
+++ b/src/main/target/ELINF722/config.c
@@ -27,7 +27,7 @@
 #include "pg/piniobox.h"
 #include "rx/rx.h"
 #include "telemetry/telemetry.h"
-#include "fc/config.h"
+#include "config/config.h"
 
 #ifdef USE_TARGET_CONFIG
 #include "pg/pg.h"
diff --git a/src/main/target/FF_FORTINIF4/config.c b/src/main/target/FF_FORTINIF4/config.c
index 6252aee960..deb22164f1 100644
--- a/src/main/target/FF_FORTINIF4/config.c
+++ b/src/main/target/FF_FORTINIF4/config.c
@@ -24,7 +24,7 @@
 #include "platform.h"
 
 #ifdef USE_TARGET_CONFIG
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "config/feature.h"
 
diff --git a/src/main/target/FF_PIKOBLX/config.c b/src/main/target/FF_PIKOBLX/config.c
index 9413cd945b..94b8f88dcf 100644
--- a/src/main/target/FF_PIKOBLX/config.c
+++ b/src/main/target/FF_PIKOBLX/config.c
@@ -30,7 +30,7 @@
 
 #include "drivers/pwm_esc_detect.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 
 #include "flight/pid.h"
diff --git a/src/main/target/KISSFC/config.c b/src/main/target/KISSFC/config.c
index 990bd34990..90cf8c666d 100644
--- a/src/main/target/KISSFC/config.c
+++ b/src/main/target/KISSFC/config.c
@@ -25,7 +25,7 @@
 
 #ifdef USE_TARGET_CONFIG
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "sensors/boardalignment.h"
 
diff --git a/src/main/target/KISSFCV2F7/config.c b/src/main/target/KISSFCV2F7/config.c
index 5d103add0e..839c8f1333 100644
--- a/src/main/target/KISSFCV2F7/config.c
+++ b/src/main/target/KISSFCV2F7/config.c
@@ -29,7 +29,7 @@
 
 #include "telemetry/telemetry.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 
 #ifdef USE_TARGET_CONFIG
diff --git a/src/main/target/MOTOLAB/config.c b/src/main/target/MOTOLAB/config.c
index 0c6dbdcc0d..f0e53b17af 100644
--- a/src/main/target/MOTOLAB/config.c
+++ b/src/main/target/MOTOLAB/config.c
@@ -25,7 +25,7 @@
 
 #ifdef USE_TARGET_CONFIG
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "flight/pid.h"
 
diff --git a/src/main/target/MULTIFLITEPICO/config.c b/src/main/target/MULTIFLITEPICO/config.c
index 6ee7bbbae8..d2230b8ff5 100644
--- a/src/main/target/MULTIFLITEPICO/config.c
+++ b/src/main/target/MULTIFLITEPICO/config.c
@@ -28,7 +28,7 @@
 #include "common/axis.h"
 #include "common/maths.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/rc_modes.h"
 #include "fc/rc_controls.h"
diff --git a/src/main/target/NAZE/config.c b/src/main/target/NAZE/config.c
index fcbcf88b87..80edf54189 100644
--- a/src/main/target/NAZE/config.c
+++ b/src/main/target/NAZE/config.c
@@ -30,7 +30,7 @@
 
 #include "drivers/io.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_controls.h"
 #include "fc/controlrate_profile.h"
 
diff --git a/src/main/target/NUCLEOF103RG/config.c b/src/main/target/NUCLEOF103RG/config.c
index 4622045de2..a30e7c9e0b 100644
--- a/src/main/target/NUCLEOF103RG/config.c
+++ b/src/main/target/NUCLEOF103RG/config.c
@@ -30,7 +30,7 @@
 
 #include "drivers/io.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_controls.h"
 #include "fc/controlrate_profile.h"
 
diff --git a/src/main/target/OMNIBUSF4/config.c b/src/main/target/OMNIBUSF4/config.c
index 1931c11800..63927ff07e 100644
--- a/src/main/target/OMNIBUSF4/config.c
+++ b/src/main/target/OMNIBUSF4/config.c
@@ -35,7 +35,7 @@
 #ifdef SYNERGYF4
 #include "io/vtx.h"
 #include "io/ledstrip.h"
-#include "fc/config.h"
+#include "config/config.h"
 #include "pg/piniobox.h"
 #include "common/axis.h"
 #include "sensors/barometer.h"
diff --git a/src/main/target/RACEBASE/config.c b/src/main/target/RACEBASE/config.c
index 8719bd52e0..f67fa552c3 100644
--- a/src/main/target/RACEBASE/config.c
+++ b/src/main/target/RACEBASE/config.c
@@ -25,7 +25,7 @@
 
 #ifdef USE_TARGET_CONFIG
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "pg/rx.h"
 
diff --git a/src/main/target/REVO/config.c b/src/main/target/REVO/config.c
index c6d8a057b6..c5c3f4c9e1 100644
--- a/src/main/target/REVO/config.c
+++ b/src/main/target/REVO/config.c
@@ -27,7 +27,7 @@
 #include "pg/piniobox.h"
 #include "rx/rx.h"
 #include "telemetry/telemetry.h"
-#include "fc/config.h"
+#include "config/config.h"
 
 #ifdef USE_TARGET_CONFIG
 #include "pg/pg.h"
diff --git a/src/main/target/REVOLT/config.c b/src/main/target/REVOLT/config.c
index 1351601130..07e7281628 100644
--- a/src/main/target/REVOLT/config.c
+++ b/src/main/target/REVOLT/config.c
@@ -29,7 +29,7 @@
 
 #include "telemetry/telemetry.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 
 #ifdef USE_TARGET_CONFIG
diff --git a/src/main/target/RG_SSD_F3/config.c b/src/main/target/RG_SSD_F3/config.c
index 071a9d5cad..20d7e434e3 100644
--- a/src/main/target/RG_SSD_F3/config.c
+++ b/src/main/target/RG_SSD_F3/config.c
@@ -24,7 +24,7 @@
 
 #ifdef USE_TARGET_CONFIG
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "sensors/battery.h"
 
diff --git a/src/main/target/SITL/target.c b/src/main/target/SITL/target.c
index a2fffa08bf..acd9c8495c 100644
--- a/src/main/target/SITL/target.c
+++ b/src/main/target/SITL/target.c
@@ -46,7 +46,7 @@ const timerHardware_t timerHardware[1]; // unused
 #include "flight/imu.h"
 
 #include "config/feature.h"
-#include "fc/config.h"
+#include "config/config.h"
 #include "scheduler/scheduler.h"
 
 #include "pg/rx.h"
diff --git a/src/main/target/SPRACINGF4NEO/config.c b/src/main/target/SPRACINGF4NEO/config.c
index 701c140832..79fc3ad22f 100644
--- a/src/main/target/SPRACINGF4NEO/config.c
+++ b/src/main/target/SPRACINGF4NEO/config.c
@@ -27,7 +27,7 @@
 
 #include "telemetry/telemetry.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "config_helper.h"
 
diff --git a/src/main/target/SPRACINGF7DUAL/config.c b/src/main/target/SPRACINGF7DUAL/config.c
index 96e96a2418..53654f1f84 100644
--- a/src/main/target/SPRACINGF7DUAL/config.c
+++ b/src/main/target/SPRACINGF7DUAL/config.c
@@ -49,7 +49,7 @@
 
 #include "config/feature.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #ifdef USE_TARGET_CONFIG
 
diff --git a/src/main/target/TINYFISH/config.c b/src/main/target/TINYFISH/config.c
index f2c31e5041..e2ac78b690 100644
--- a/src/main/target/TINYFISH/config.c
+++ b/src/main/target/TINYFISH/config.c
@@ -29,7 +29,7 @@
 
 #include "config/feature.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "io/serial.h"
 
diff --git a/src/main/target/TMOTORF4/config.c b/src/main/target/TMOTORF4/config.c
index 7611d69831..ab59ba91bb 100644
--- a/src/main/target/TMOTORF4/config.c
+++ b/src/main/target/TMOTORF4/config.c
@@ -25,7 +25,7 @@
 
 #ifdef USE_TARGET_CONFIG
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "telemetry/telemetry.h"
 
diff --git a/src/main/telemetry/crsf.c b/src/main/telemetry/crsf.c
index 0481a6f94e..a042ae317d 100644
--- a/src/main/telemetry/crsf.c
+++ b/src/main/telemetry/crsf.c
@@ -44,7 +44,7 @@
 
 #include "drivers/nvic.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_modes.h"
 #include "fc/runtime_config.h"
 
diff --git a/src/main/telemetry/frsky_hub.c b/src/main/telemetry/frsky_hub.c
index fbea6e6bf0..8d484e6983 100644
--- a/src/main/telemetry/frsky_hub.c
+++ b/src/main/telemetry/frsky_hub.c
@@ -45,7 +45,7 @@
 #include "drivers/serial.h"
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
diff --git a/src/main/telemetry/ibus_shared.c b/src/main/telemetry/ibus_shared.c
index e8923df5fa..6c5b3e069e 100644
--- a/src/main/telemetry/ibus_shared.c
+++ b/src/main/telemetry/ibus_shared.c
@@ -45,7 +45,7 @@ static uint16_t calculateChecksum(const uint8_t *ibusPacket);
 #include "pg/pg_ids.h"
 #include "sensors/battery.h"
 #include "fc/rc_controls.h"
-#include "fc/config.h"
+#include "config/config.h"
 #include "sensors/gyro.h"
 #include "drivers/accgyro/accgyro.h"
 #include "fc/runtime_config.h"
diff --git a/src/main/telemetry/ltm.c b/src/main/telemetry/ltm.c
index 08fc21cf64..667b79b35b 100644
--- a/src/main/telemetry/ltm.c
+++ b/src/main/telemetry/ltm.c
@@ -49,7 +49,7 @@
 #include "drivers/sensor.h"
 #include "drivers/accgyro/accgyro.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
diff --git a/src/main/telemetry/mavlink.c b/src/main/telemetry/mavlink.c
index 0db8b66e90..ede42bd263 100644
--- a/src/main/telemetry/mavlink.c
+++ b/src/main/telemetry/mavlink.c
@@ -44,7 +44,7 @@
 #include "drivers/sensor.h"
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
diff --git a/src/main/telemetry/smartport.c b/src/main/telemetry/smartport.c
index 774bd98db5..decdb2dfbd 100644
--- a/src/main/telemetry/smartport.c
+++ b/src/main/telemetry/smartport.c
@@ -44,7 +44,7 @@
 #include "drivers/sensor.h"
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
diff --git a/src/main/telemetry/srxl.c b/src/main/telemetry/srxl.c
index 4a283a47f9..0fbdf0521c 100644
--- a/src/main/telemetry/srxl.c
+++ b/src/main/telemetry/srxl.c
@@ -40,7 +40,7 @@
 #include "io/gps.h"
 #include "io/serial.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
diff --git a/src/main/telemetry/telemetry.c b/src/main/telemetry/telemetry.c
index bdb66bd1c1..daacd8bf35 100644
--- a/src/main/telemetry/telemetry.c
+++ b/src/main/telemetry/telemetry.c
@@ -38,7 +38,7 @@
 
 #include "io/serial.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_modes.h"
 #include "fc/runtime_config.h"
 
diff --git a/src/test/unit/arming_prevention_unittest.cc b/src/test/unit/arming_prevention_unittest.cc
index f27a78984a..c8907992d9 100644
--- a/src/test/unit/arming_prevention_unittest.cc
+++ b/src/test/unit/arming_prevention_unittest.cc
@@ -25,7 +25,7 @@ extern "C" {
     #include "pg/pg.h"
     #include "pg/pg_ids.h"
     #include "pg/rx.h"
-    #include "fc/config.h"
+    #include "config/config.h"
     #include "fc/controlrate_profile.h"
     #include "fc/core.h"
     #include "fc/rc_controls.h"
diff --git a/src/test/unit/cli_unittest.cc b/src/test/unit/cli_unittest.cc
index 6fa3d5554b..c59415e57d 100644
--- a/src/test/unit/cli_unittest.cc
+++ b/src/test/unit/cli_unittest.cc
@@ -32,7 +32,7 @@ extern "C" {
     #include "config/feature.h"
     #include "drivers/buf_writer.h"
     #include "drivers/vtx_common.h"
-    #include "fc/config.h"
+    #include "config/config.h"
     #include "fc/rc_adjustments.h"
     #include "fc/runtime_config.h"
     #include "flight/mixer.h"
diff --git a/src/test/unit/ledstrip_unittest.cc b/src/test/unit/ledstrip_unittest.cc
index 2b053c012b..6afd0b4f8b 100644
--- a/src/test/unit/ledstrip_unittest.cc
+++ b/src/test/unit/ledstrip_unittest.cc
@@ -37,7 +37,7 @@ extern "C" {
     #include "drivers/timer.h"
     #include "drivers/timer_def.h"
 
-    #include "fc/config.h"
+    #include "config/config.h"
     #include "fc/rc_controls.h"
     #include "fc/rc_modes.h"
     #include "fc/runtime_config.h"
diff --git a/src/test/unit/link_quality_unittest.cc b/src/test/unit/link_quality_unittest.cc
index a3be3f1202..a3885e6b59 100644
--- a/src/test/unit/link_quality_unittest.cc
+++ b/src/test/unit/link_quality_unittest.cc
@@ -38,7 +38,7 @@ extern "C" {
     #include "drivers/serial.h"
     #include "drivers/system.h"
 
-    #include "fc/config.h"
+    #include "config/config.h"
     #include "fc/core.h"
     #include "fc/rc_controls.h"
     #include "fc/rc_modes.h"
diff --git a/src/test/unit/osd_unittest.cc b/src/test/unit/osd_unittest.cc
index 0f36fb906e..4e32647115 100644
--- a/src/test/unit/osd_unittest.cc
+++ b/src/test/unit/osd_unittest.cc
@@ -40,7 +40,7 @@ extern "C" {
     #include "drivers/persistent.h"
     #include "drivers/serial.h"
 
-    #include "fc/config.h"
+    #include "config/config.h"
     #include "fc/core.h"
     #include "fc/rc_controls.h"
     #include "fc/rc_modes.h"
diff --git a/src/test/unit/rc_controls_unittest.cc b/src/test/unit/rc_controls_unittest.cc
index 7d25883a4a..248ecc430d 100644
--- a/src/test/unit/rc_controls_unittest.cc
+++ b/src/test/unit/rc_controls_unittest.cc
@@ -45,7 +45,7 @@ extern "C" {
 
     #include "flight/pid.h"
 
-    #include "fc/config.h"
+    #include "config/config.h"
     #include "fc/controlrate_profile.h"
     #include "fc/rc_modes.h"
     #include "fc/rc_adjustments.h"
diff --git a/src/test/unit/telemetry_crsf_msp_unittest.cc b/src/test/unit/telemetry_crsf_msp_unittest.cc
index ce021e235f..71143e0b31 100644
--- a/src/test/unit/telemetry_crsf_msp_unittest.cc
+++ b/src/test/unit/telemetry_crsf_msp_unittest.cc
@@ -44,7 +44,7 @@ extern "C" {
     #include "drivers/system.h"
 
     #include "fc/runtime_config.h"
-    #include "fc/config.h"
+    #include "config/config.h"
     #include "flight/imu.h"
 
     #include "io/serial.h"
diff --git a/src/test/unit/telemetry_crsf_unittest.cc b/src/test/unit/telemetry_crsf_unittest.cc
index 4682f9454f..3681ec2f1b 100644
--- a/src/test/unit/telemetry_crsf_unittest.cc
+++ b/src/test/unit/telemetry_crsf_unittest.cc
@@ -41,7 +41,7 @@ extern "C" {
     #include "drivers/serial.h"
     #include "drivers/system.h"
 
-    #include "fc/config.h"
+    #include "config/config.h"
     #include "fc/runtime_config.h"
 
     #include "flight/pid.h"
diff --git a/src/test/unit/telemetry_ibus_unittest.cc b/src/test/unit/telemetry_ibus_unittest.cc
index 83107b3d6c..ab1463e1c1 100644
--- a/src/test/unit/telemetry_ibus_unittest.cc
+++ b/src/test/unit/telemetry_ibus_unittest.cc
@@ -26,7 +26,7 @@ extern "C" {
 #include "io/serial.h"
 #include "io/gps.h"
 #include "flight/imu.h"
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_controls.h"
 #include "telemetry/telemetry.h"
 #include "telemetry/ibus.h"
diff --git a/src/test/unit/vtx_unittest.cc b/src/test/unit/vtx_unittest.cc
index 77c99c6077..2b837979a1 100644
--- a/src/test/unit/vtx_unittest.cc
+++ b/src/test/unit/vtx_unittest.cc
@@ -25,7 +25,7 @@ extern "C" {
     #include "pg/pg.h"
     #include "pg/pg_ids.h"
     #include "pg/rx.h"
-    #include "fc/config.h"
+    #include "config/config.h"
     #include "fc/controlrate_profile.h"
     #include "fc/core.h"
     #include "fc/rc_controls.h"