diff --git a/src/main/target/ALIENFLIGHTF1/config.c b/src/main/target/ALIENFLIGHTF1/config.c
index 1cc84e07d6..693c42ebd1 100644
--- a/src/main/target/ALIENFLIGHTF1/config.c
+++ b/src/main/target/ALIENFLIGHTF1/config.c
@@ -20,6 +20,7 @@
 
 #include <platform.h>
 
+#ifdef TARGET_CONFIG
 #include "drivers/pwm_esc_detect.h"
 #include "drivers/pwm_output.h"
 
@@ -36,7 +37,6 @@
 
 #define BRUSHED_MOTORS_PWM_RATE 32000           // 32kHz
 
-#ifdef TARGET_CONFIG
 // alternative defaults settings for AlienFlight targets
 void targetConfiguration(master_t *config)
 {
diff --git a/src/main/target/ALIENFLIGHTF3/config.c b/src/main/target/ALIENFLIGHTF3/config.c
index 95126f693c..3499fbade4 100644
--- a/src/main/target/ALIENFLIGHTF3/config.c
+++ b/src/main/target/ALIENFLIGHTF3/config.c
@@ -20,6 +20,7 @@
 
 #include <platform.h>
 
+#ifdef TARGET_CONFIG
 #include "common/axis.h"
 
 #include "drivers/compass.h"
@@ -46,7 +47,6 @@
 
 #define BRUSHED_MOTORS_PWM_RATE 32000           // 32kHz
 
-#ifdef TARGET_CONFIG
 // alternative defaults settings for AlienFlight targets
 void targetConfiguration(master_t *config)
 {
diff --git a/src/main/target/ALIENFLIGHTF4/config.c b/src/main/target/ALIENFLIGHTF4/config.c
index 49d7f1442f..e2b5831003 100644
--- a/src/main/target/ALIENFLIGHTF4/config.c
+++ b/src/main/target/ALIENFLIGHTF4/config.c
@@ -20,6 +20,7 @@
 
 #include <platform.h>
 
+#ifdef TARGET_CONFIG
 #include "common/axis.h"
 
 #include "drivers/sensor.h"
@@ -54,7 +55,6 @@
 
 #define BRUSHED_MOTORS_PWM_RATE 32000           // 32kHz
 
-#ifdef TARGET_CONFIG
 // alternative defaults settings for AlienFlight targets
 void targetConfiguration(master_t *config)
 {
diff --git a/src/main/target/BETAFLIGHTF3/config.c b/src/main/target/BETAFLIGHTF3/config.c
index 7381d4b5fe..8f23f53af8 100755
--- a/src/main/target/BETAFLIGHTF3/config.c
+++ b/src/main/target/BETAFLIGHTF3/config.c
@@ -20,6 +20,7 @@
 
 #include <platform.h>
 
+#ifdef TARGET_CONFIG
 #include "common/utils.h"
 
 #include "drivers/io.h"
@@ -35,7 +36,6 @@
 #include "config/config_profile.h"
 #include "config/config_master.h"
 
-#ifdef TARGET_CONFIG
 void targetConfiguration(master_t *config)
 {
     UNUSED(config);
diff --git a/src/main/target/BLUEJAYF4/config.c b/src/main/target/BLUEJAYF4/config.c
index fa5d9cfc06..9a1c7df207 100644
--- a/src/main/target/BLUEJAYF4/config.c
+++ b/src/main/target/BLUEJAYF4/config.c
@@ -20,6 +20,7 @@
 
 #include <platform.h>
 
+#ifdef TARGET_CONFIG
 #include "blackbox/blackbox_io.h"
 
 #include "config/config_master.h"
@@ -29,7 +30,6 @@
 
 #include "hardware_revision.h"
 
-#ifdef TARGET_CONFIG
 // alternative defaults settings for BlueJayF4 targets
 void targetConfiguration(master_t *config)
 {
diff --git a/src/main/target/COLIBRI/config.c b/src/main/target/COLIBRI/config.c
index 00fa98733d..76e4c52101 100644
--- a/src/main/target/COLIBRI/config.c
+++ b/src/main/target/COLIBRI/config.c
@@ -20,6 +20,7 @@
 
 #include "platform.h"
 
+#ifdef TARGET_CONFIG
 #include "drivers/serial.h"
 
 #include "fc/rc_controls.h"
@@ -35,7 +36,6 @@
 #include "config/config_profile.h"
 #include "config/config_master.h"
 
-#ifdef TARGET_CONFIG
 // alternative defaults settings for Colibri/Gemini targets
 void targetConfiguration(master_t *config)
 {
diff --git a/src/main/target/COLIBRI_RACE/config.c b/src/main/target/COLIBRI_RACE/config.c
index 2326168fee..dc1c2da645 100644
--- a/src/main/target/COLIBRI_RACE/config.c
+++ b/src/main/target/COLIBRI_RACE/config.c
@@ -21,6 +21,7 @@
 
 #include <platform.h>
 
+#ifdef TARGET_CONFIG
 #include "io/motors.h"
 
 #include "sensors/battery.h"
@@ -29,7 +30,6 @@
 #include "config/feature.h"
 #include "io/ledstrip.h"
 
-#ifdef TARGET_CONFIG
 void targetApplyDefaultLedStripConfig(ledConfig_t *ledConfigs)
 {
     const ledConfig_t defaultLedStripConfig[] = {
diff --git a/src/main/target/KISSFC/config.c b/src/main/target/KISSFC/config.c
index a984089285..d2ecd36704 100755
--- a/src/main/target/KISSFC/config.c
+++ b/src/main/target/KISSFC/config.c
@@ -20,6 +20,7 @@
 
 #include <platform.h>
 
+#ifdef TARGET_CONFIG
 #include "common/utils.h"
 
 #include "drivers/io.h"
@@ -37,7 +38,6 @@
 
 #include "sensors/boardalignment.h"
 
-#ifdef TARGET_CONFIG
 void targetConfiguration(master_t *config)
 {
     UNUSED(config);
diff --git a/src/main/target/MOTOLAB/config.c b/src/main/target/MOTOLAB/config.c
index ffdb5bef71..1a86943511 100755
--- a/src/main/target/MOTOLAB/config.c
+++ b/src/main/target/MOTOLAB/config.c
@@ -20,9 +20,9 @@
 
 #include <platform.h>
 
+#ifdef TARGET_CONFIG
 #include "config/config_master.h"
 
-#ifdef TARGET_CONFIG
 // Motolab target supports 2 different type of boards Tornado / Cyclone.
 void targetConfiguration(master_t *config)
 {
diff --git a/src/main/target/MULTIFLITEPICO/config.c b/src/main/target/MULTIFLITEPICO/config.c
index 11c72d8b4c..e335f672ad 100755
--- a/src/main/target/MULTIFLITEPICO/config.c
+++ b/src/main/target/MULTIFLITEPICO/config.c
@@ -20,6 +20,7 @@
 
 #include <platform.h>
 
+#ifdef TARGET_CONFIG
 #include "common/axis.h"
 
 #include "drivers/sensor.h"
@@ -39,7 +40,6 @@
 #include "config/config_profile.h"
 #include "config/config_master.h"
 
-#ifdef TARGET_CONFIG
 // alternative defaults settings for MULTIFLITEPICO targets
 void targetConfiguration(master_t *config)
 {
diff --git a/src/main/target/NAZE/config.c b/src/main/target/NAZE/config.c
index 68b8ca2630..ee3ad4db62 100755
--- a/src/main/target/NAZE/config.c
+++ b/src/main/target/NAZE/config.c
@@ -20,6 +20,7 @@
 
 #include <platform.h>
 
+#ifdef TARGET_CONFIG
 #include "common/utils.h"
 
 #include "drivers/io.h"
@@ -37,7 +38,6 @@
 
 #include "hardware_revision.h"
 
-#ifdef TARGET_CONFIG
 void targetConfiguration(master_t *config)
 {
     UNUSED(config);
diff --git a/src/main/target/PIKOBLX/config.c b/src/main/target/PIKOBLX/config.c
index 72171529e5..8a18f7c4c2 100644
--- a/src/main/target/PIKOBLX/config.c
+++ b/src/main/target/PIKOBLX/config.c
@@ -19,9 +19,9 @@
 
 #include <platform.h>
 
+#ifdef TARGET_CONFIG
 #include "config/config_master.h"
 
-#ifdef TARGET_CONFIG
 void targetConfiguration(master_t *config) {
     config->batteryConfig.currentMeterScale = 125;
 }
diff --git a/src/main/target/RACEBASE/config.c b/src/main/target/RACEBASE/config.c
index 37873b0b1b..d4c63c0c6f 100755
--- a/src/main/target/RACEBASE/config.c
+++ b/src/main/target/RACEBASE/config.c
@@ -20,11 +20,11 @@
 
 #include <platform.h>
 
+#ifdef TARGET_CONFIG
 #include "rx/rx.h"
 
 #include "config/config_master.h"
 
-#ifdef TARGET_CONFIG
 // alternative defaults settings for COLIBRI RACE targets
 void targetConfiguration(master_t *config)
 {
diff --git a/src/main/target/RG_SSD_F3/config.c b/src/main/target/RG_SSD_F3/config.c
index f1cfa35f68..e58067221e 100644
--- a/src/main/target/RG_SSD_F3/config.c
+++ b/src/main/target/RG_SSD_F3/config.c
@@ -19,9 +19,9 @@
 
 #include <platform.h>
 
+#ifdef TARGET_CONFIG
 #include "config/config_master.h"
 
-#ifdef TARGET_CONFIG
 void targetConfiguration(master_t *config) {
     config->batteryConfig.vbatmaxcellvoltage = 45;
     config->batteryConfig.currentMeterScale = 119;
diff --git a/src/main/target/SPRACINGF3EVO/config.c b/src/main/target/SPRACINGF3EVO/config.c
index ccdb8dcbb8..68806ec584 100644
--- a/src/main/target/SPRACINGF3EVO/config.c
+++ b/src/main/target/SPRACINGF3EVO/config.c
@@ -16,9 +16,10 @@
  */
 
 #include <platform.h>
-#include "config/config_master.h"
 
 #ifdef TARGET_CONFIG
+#include "config/config_master.h"
+
 void targetConfiguration(master_t *config)
 {
     // Temporary workaround: Disable SDCard DMA by default since it causes errors on this target
diff --git a/src/main/target/TINYFISH/config.c b/src/main/target/TINYFISH/config.c
index ec22348b23..6ae8488d87 100644
--- a/src/main/target/TINYFISH/config.c
+++ b/src/main/target/TINYFISH/config.c
@@ -18,6 +18,8 @@
 #include <stdint.h>
 
 #include <platform.h>
+
+#ifdef TARGET_CONFIG
 #include "drivers/io.h"
 
 #include "drivers/timer.h"
@@ -33,7 +35,6 @@
 
 #define TARGET_CPU_VOLTAGE 3.0
 
-#ifdef TARGET_CONFIG
 // set default settings to match our target
 void targetConfiguration(master_t *config)
 {