diff --git a/src/main/build/build_config.c b/src/main/build/build_config.c
index 6c876a4ed6..6e8901959e 100644
--- a/src/main/build/build_config.c
+++ b/src/main/build/build_config.c
@@ -20,8 +20,4 @@
 
 #include "platform.h"
 
-#include "drivers/gpio.h"
-#include "drivers/timer.h"
-#include "flight/mixer.h"
-
 #include "build_config.h"
diff --git a/src/main/drivers/compass.h b/src/main/drivers/compass.h
index b20ae332bc..1d2c883468 100644
--- a/src/main/drivers/compass.h
+++ b/src/main/drivers/compass.h
@@ -17,6 +17,8 @@
 
 #pragma once
 
+#include "sensor.h"
+
 typedef struct mag_s {
     sensorInitFuncPtr init;                                 // initialize function
     sensorReadFuncPtr read;                                 // read 3 axis data function
diff --git a/src/main/fc/fc_msp.c b/src/main/fc/fc_msp.c
index 358d5a4438..bfeaf319ff 100755
--- a/src/main/fc/fc_msp.c
+++ b/src/main/fc/fc_msp.c
@@ -35,18 +35,13 @@
 #include "common/streambuf.h"
 
 #include "drivers/system.h"
-#include "drivers/sensor.h"
 #include "drivers/accgyro.h"
 #include "drivers/compass.h"
 #include "drivers/serial.h"
 #include "drivers/bus_i2c.h"
 #include "drivers/io.h"
 #include "drivers/flash.h"
-#include "drivers/gpio.h"
-#include "drivers/timer.h"
-#include "drivers/pwm_rx.h"
 #include "drivers/sdcard.h"
-#include "drivers/buf_writer.h"
 #include "drivers/max7456.h"
 #include "drivers/vtx_soft_spi_rtc6705.h"
 #include "drivers/pwm_output.h"
diff --git a/src/main/fc/mw.c b/src/main/fc/mw.c
index 48d234fe32..23baaea678 100644
--- a/src/main/fc/mw.c
+++ b/src/main/fc/mw.c
@@ -29,13 +29,8 @@
 #include "common/utils.h"
 #include "common/filter.h"
 
-#include "drivers/sensor.h"
-#include "drivers/accgyro.h"
-#include "drivers/compass.h"
 #include "drivers/light_led.h"
 #include "drivers/system.h"
-#include "drivers/serial.h"
-#include "drivers/timer.h"
 #include "drivers/gyro_sync.h"
 
 #include "sensors/sensors.h"
diff --git a/src/main/fc/rc_controls.c b/src/main/fc/rc_controls.c
index 1dbf51b70a..316d5178b2 100644
--- a/src/main/fc/rc_controls.c
+++ b/src/main/fc/rc_controls.c
@@ -23,6 +23,8 @@
 
 #include "platform.h"
 
+#include "blackbox/blackbox.h"
+
 #include "build/build_config.h"
 
 #include "common/axis.h"
@@ -30,14 +32,19 @@
 
 #include "config/feature.h"
 
+#include "drivers/system.h"
+
 #include "fc/config.h"
+#include "fc/mw.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_curves.h"
 #include "fc/runtime_config.h"
 
-#include "drivers/system.h"
-#include "drivers/sensor.h"
-#include "drivers/accgyro.h"
+#include "io/gps.h"
+#include "io/beeper.h"
+#include "io/motors.h"
+#include "io/vtx.h"
+#include "io/display.h"
 
 #include "sensors/barometer.h"
 #include "sensors/battery.h"
@@ -47,20 +54,10 @@
 
 #include "rx/rx.h"
 
-#include "io/gps.h"
-#include "io/beeper.h"
-#include "io/motors.h"
-#include "io/vtx.h"
-
-#include "io/display.h"
-
 #include "flight/pid.h"
 #include "flight/navigation.h"
 #include "flight/failsafe.h"
 
-#include "blackbox/blackbox.h"
-
-#include "fc/mw.h"
 
 static motorConfig_t *motorConfig;
 static pidProfile_t *pidProfile;
diff --git a/src/main/flight/altitudehold.c b/src/main/flight/altitudehold.c
index a6eea2088b..9907f3b524 100644
--- a/src/main/flight/altitudehold.c
+++ b/src/main/flight/altitudehold.c
@@ -28,12 +28,6 @@
 #include "common/maths.h"
 #include "common/axis.h"
 
-#include "drivers/sensor.h"
-#include "drivers/accgyro.h"
-#include "drivers/sonar_hcsr04.h"
-
-#include "sensors/sensors.h"
-#include "sensors/acceleration.h"
 #include "sensors/barometer.h"
 #include "sensors/sonar.h"
 
@@ -42,7 +36,6 @@
 #include "fc/rc_controls.h"
 #include "io/motors.h"
 
-#include "flight/mixer.h"
 #include "flight/pid.h"
 #include "flight/imu.h"
 
diff --git a/src/main/flight/imu.c b/src/main/flight/imu.c
index 994a8f1830..b745e5fd2f 100644
--- a/src/main/flight/imu.c
+++ b/src/main/flight/imu.c
@@ -31,9 +31,6 @@
 #include "common/axis.h"
 
 #include "drivers/system.h"
-#include "drivers/sensor.h"
-#include "drivers/accgyro.h"
-#include "drivers/compass.h"
 
 #include "sensors/sensors.h"
 #include "sensors/gyro.h"
diff --git a/src/main/flight/navigation.c b/src/main/flight/navigation.c
index 133ba56364..144cae3968 100644
--- a/src/main/flight/navigation.c
+++ b/src/main/flight/navigation.c
@@ -30,12 +30,6 @@
 #include "common/axis.h"
 
 #include "drivers/system.h"
-#include "drivers/serial.h"
-#include "drivers/serial_uart.h"
-#include "drivers/gpio.h"
-#include "drivers/light_led.h"
-#include "drivers/sensor.h"
-#include "drivers/accgyro.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"
diff --git a/src/main/flight/pid.c b/src/main/flight/pid.c
index a2c5bb4e7c..c2a2364934 100644
--- a/src/main/flight/pid.c
+++ b/src/main/flight/pid.c
@@ -28,24 +28,20 @@
 #include "common/maths.h"
 #include "common/filter.h"
 
-#include "drivers/sensor.h"
-
-#include "drivers/accgyro.h"
-#include "sensors/sensors.h"
-#include "sensors/gyro.h"
-#include "sensors/acceleration.h"
-
-#include "rx/rx.h"
-
 #include "fc/rc_controls.h"
-#include "io/gps.h"
+#include "fc/runtime_config.h"
 
 #include "flight/pid.h"
 #include "flight/imu.h"
 #include "flight/navigation.h"
 #include "flight/gtune.h"
 
-#include "fc/runtime_config.h"
+#include "io/gps.h"
+
+#include "rx/rx.h"
+
+#include "sensors/gyro.h"
+#include "sensors/acceleration.h"
 
 extern float rcInput[3];
 extern float setpointRate[3];
diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c
index 0f0cb06751..7718f49dab 100644
--- a/src/main/io/beeper.c
+++ b/src/main/io/beeper.c
@@ -23,14 +23,11 @@
 
 #include "common/utils.h"
 
-#include "drivers/gpio.h"
 #include "drivers/sound_beeper.h"
 #include "drivers/system.h"
 #include "sensors/battery.h"
 #include "sensors/sensors.h"
 
-#include "fc/rc_controls.h"
-
 #include "io/statusindicator.h"
 #include "io/vtx.h"
 
diff --git a/src/main/io/display.c b/src/main/io/display.c
index f2bf158a4c..1d7c88199a 100644
--- a/src/main/io/display.c
+++ b/src/main/io/display.c
@@ -28,12 +28,8 @@
 
 #include "build/build_config.h"
 
-#include "drivers/serial.h"
 #include "drivers/system.h"
 #include "drivers/display_ug2864hsweg01.h"
-#include "drivers/sensor.h"
-#include "drivers/accgyro.h"
-#include "drivers/compass.h"
 
 #include "common/printf.h"
 #include "common/maths.h"
diff --git a/src/main/io/gps.c b/src/main/io/gps.c
index 59fca7deef..f8e9d880f0 100755
--- a/src/main/io/gps.c
+++ b/src/main/io/gps.c
@@ -34,9 +34,6 @@
 #include "common/utils.h"
 
 #include "drivers/system.h"
-#include "drivers/serial.h"
-#include "drivers/serial_uart.h"
-#include "drivers/gpio.h"
 #include "drivers/light_led.h"
 
 #include "sensors/sensors.h"
diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index 2d08cbf11f..f024d1ae31 100755
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -48,7 +48,6 @@ uint8_t cliMode = 0;
 #include "drivers/serial.h"
 #include "drivers/bus_i2c.h"
 #include "drivers/flash.h"
-#include "drivers/gpio.h"
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
 #include "drivers/timer.h"
diff --git a/src/main/io/statusindicator.c b/src/main/io/statusindicator.c
index e8b01ac9a2..1a5ea4c30f 100644
--- a/src/main/io/statusindicator.c
+++ b/src/main/io/statusindicator.c
@@ -21,9 +21,7 @@
 #include "platform.h"
 
 #include "drivers/system.h"
-#include "drivers/gpio.h"
 #include "drivers/light_led.h"
-#include "drivers/sound_beeper.h"
 
 #include "statusindicator.h"
 
diff --git a/src/main/msp/msp_serial.c b/src/main/msp/msp_serial.c
index 8bfff6b37b..d3f68b125a 100644
--- a/src/main/msp/msp_serial.c
+++ b/src/main/msp/msp_serial.c
@@ -24,8 +24,6 @@
 #include "common/streambuf.h"
 #include "common/utils.h"
 
-#include "drivers/serial.h"
-
 #include "io/serial.h"
 
 #include "msp/msp.h"
diff --git a/src/main/rx/msp.c b/src/main/rx/msp.c
index 0d183c9123..2200ea57f6 100644
--- a/src/main/rx/msp.c
+++ b/src/main/rx/msp.c
@@ -24,10 +24,6 @@
 
 #include "common/utils.h"
 
-#include "drivers/system.h"
-#include "drivers/serial.h"
-#include "drivers/serial_uart.h"
-
 #include "rx/rx.h"
 #include "rx/msp.h"
 
diff --git a/src/main/rx/pwm.c b/src/main/rx/pwm.c
index b9a0d52e38..5f2c69b802 100644
--- a/src/main/rx/pwm.c
+++ b/src/main/rx/pwm.c
@@ -27,7 +27,6 @@
 
 #include "build/build_config.h"
 
-#include "drivers/timer.h"
 #include "drivers/pwm_rx.h"
 
 #include "fc/config.h"
diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c
index 29c3a111ac..318c85e7e9 100644
--- a/src/main/rx/rx.c
+++ b/src/main/rx/rx.c
@@ -30,10 +30,7 @@
 
 #include "config/feature.h"
 
-#include "drivers/serial.h"
 #include "drivers/adc.h"
-#include "drivers/gpio.h"
-#include "drivers/timer.h"
 #include "drivers/pwm_rx.h"
 #include "drivers/rx_spi.h"
 #include "drivers/system.h"
diff --git a/src/main/rx/sbus.c b/src/main/rx/sbus.c
index b18b704928..babea6fea8 100644
--- a/src/main/rx/sbus.c
+++ b/src/main/rx/sbus.c
@@ -27,11 +27,6 @@
 
 #include "drivers/system.h"
 
-#include "drivers/gpio.h"
-#include "drivers/inverter.h"
-
-#include "drivers/serial.h"
-#include "drivers/serial_uart.h"
 #include "io/serial.h"
 
 #ifdef TELEMETRY
diff --git a/src/main/rx/spektrum.c b/src/main/rx/spektrum.c
index 4fdbee9692..0ca7f0b32d 100644
--- a/src/main/rx/spektrum.c
+++ b/src/main/rx/spektrum.c
@@ -29,8 +29,6 @@
 #include "drivers/io_impl.h"
 #include "drivers/system.h"
 #include "drivers/light_led.h"
-#include "drivers/serial.h"
-#include "drivers/serial_uart.h"
 
 #include "io/serial.h"
 
diff --git a/src/main/rx/sumd.c b/src/main/rx/sumd.c
index 37799aaba5..91906b0c7b 100644
--- a/src/main/rx/sumd.c
+++ b/src/main/rx/sumd.c
@@ -26,8 +26,6 @@
 #include "common/utils.h"
 
 #include "drivers/system.h"
-#include "drivers/serial.h"
-#include "drivers/serial_uart.h"
 
 #include "io/serial.h"
 
diff --git a/src/main/rx/sumh.c b/src/main/rx/sumh.c
index 3aebec42b4..98749638eb 100644
--- a/src/main/rx/sumh.c
+++ b/src/main/rx/sumh.c
@@ -33,8 +33,6 @@
 
 #include "drivers/system.h"
 
-#include "drivers/serial.h"
-#include "drivers/serial_uart.h"
 #include "io/serial.h"
 
 #ifdef TELEMETRY
diff --git a/src/main/rx/xbus.c b/src/main/rx/xbus.c
index e0635b72af..09dbeb6a55 100644
--- a/src/main/rx/xbus.c
+++ b/src/main/rx/xbus.c
@@ -25,8 +25,6 @@
 
 #include "drivers/system.h"
 
-#include "drivers/serial.h"
-#include "drivers/serial_uart.h"
 #include "io/serial.h"
 
 #ifdef TELEMETRY
diff --git a/src/main/sensors/acceleration.c b/src/main/sensors/acceleration.c
index 8c23bccd42..a9036a1bec 100644
--- a/src/main/sensors/acceleration.c
+++ b/src/main/sensors/acceleration.c
@@ -26,8 +26,6 @@
 #include "common/axis.h"
 #include "common/filter.h"
 
-#include "drivers/sensor.h"
-#include "drivers/accgyro.h"
 #include "drivers/system.h"
 
 #include "fc/config.h"
diff --git a/src/main/sensors/compass.c b/src/main/sensors/compass.c
index 30b34d83f5..5b4000e282 100644
--- a/src/main/sensors/compass.c
+++ b/src/main/sensors/compass.c
@@ -22,9 +22,6 @@
 
 #include "common/axis.h"
 
-#include "drivers/sensor.h"
-#include "drivers/compass.h"
-#include "drivers/compass_hmc5883l.h"
 #include "drivers/light_led.h"
 
 #include "fc/config.h"
diff --git a/src/main/sensors/compass.h b/src/main/sensors/compass.h
index 33ecbb1d56..6e8e23779a 100644
--- a/src/main/sensors/compass.h
+++ b/src/main/sensors/compass.h
@@ -17,6 +17,9 @@
 
 #pragma once
 
+#include "drivers/compass.h"
+
+
 // Type of magnetometer used/detected
 typedef enum {
     MAG_DEFAULT = 0,
diff --git a/src/main/sensors/gyro.c b/src/main/sensors/gyro.c
index 364502adeb..c139da4273 100644
--- a/src/main/sensors/gyro.c
+++ b/src/main/sensors/gyro.c
@@ -27,9 +27,7 @@
 #include "common/maths.h"
 #include "common/filter.h"
 
-#include "drivers/sensor.h"
 #include "drivers/system.h"
-#include "drivers/accgyro.h"
 
 #include "io/beeper.h"
 #include "io/statusindicator.h"
diff --git a/src/main/sensors/sonar.c b/src/main/sensors/sonar.c
index ef6ce3b709..b463a399f5 100644
--- a/src/main/sensors/sonar.c
+++ b/src/main/sensors/sonar.c
@@ -28,10 +28,6 @@
 #include "common/maths.h"
 #include "common/axis.h"
 
-#include "drivers/sonar_hcsr04.h"
-#include "drivers/io.h"
-
-#include "fc/config.h"
 #include "fc/runtime_config.h"
 
 #include "config/feature.h"
diff --git a/src/main/telemetry/frsky.c b/src/main/telemetry/frsky.c
index 800ff24353..a2f452ed1a 100644
--- a/src/main/telemetry/frsky.c
+++ b/src/main/telemetry/frsky.c
@@ -36,8 +36,6 @@
 #include "drivers/system.h"
 #include "drivers/sensor.h"
 #include "drivers/accgyro.h"
-#include "drivers/gpio.h"
-#include "drivers/timer.h"
 #include "drivers/serial.h"
 
 #include "fc/config.h"
diff --git a/src/main/telemetry/hott.c b/src/main/telemetry/hott.c
index 62eb11fbba..997c1d3659 100644
--- a/src/main/telemetry/hott.c
+++ b/src/main/telemetry/hott.c
@@ -67,7 +67,6 @@
 
 #include "drivers/system.h"
 
-#include "drivers/serial.h"
 #include "io/serial.h"
 
 #include "fc/runtime_config.h"
diff --git a/src/main/telemetry/ltm.c b/src/main/telemetry/ltm.c
index 691d208c6d..15030e1517 100644
--- a/src/main/telemetry/ltm.c
+++ b/src/main/telemetry/ltm.c
@@ -44,10 +44,6 @@
 #include "drivers/system.h"
 #include "drivers/sensor.h"
 #include "drivers/accgyro.h"
-#include "drivers/gpio.h"
-#include "drivers/timer.h"
-#include "drivers/serial.h"
-#include "drivers/pwm_rx.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"
diff --git a/src/main/telemetry/mavlink.c b/src/main/telemetry/mavlink.c
index a5b4b6af4b..dc0c424705 100755
--- a/src/main/telemetry/mavlink.c
+++ b/src/main/telemetry/mavlink.c
@@ -35,13 +35,10 @@
 #include "drivers/system.h"
 #include "drivers/sensor.h"
 #include "drivers/accgyro.h"
-#include "drivers/gpio.h"
-#include "drivers/timer.h"
-#include "drivers/serial.h"
-#include "drivers/pwm_rx.h"
+
+#include "fc/rc_controls.h"
 
 #include "io/serial.h"
-#include "fc/rc_controls.h"
 #include "io/gimbal.h"
 #include "io/gps.h"
 #include "io/ledstrip.h"
diff --git a/src/main/telemetry/smartport.c b/src/main/telemetry/smartport.c
index 0e9fb6fa0e..4be785d479 100644
--- a/src/main/telemetry/smartport.c
+++ b/src/main/telemetry/smartport.c
@@ -19,13 +19,6 @@
 #include "drivers/sensor.h"
 #include "drivers/accgyro.h"
 #include "drivers/compass.h"
-#include "drivers/serial.h"
-#include "drivers/bus_i2c.h"
-#include "drivers/gpio.h"
-#include "drivers/timer.h"
-#include "drivers/pwm_rx.h"
-#include "drivers/adc.h"
-#include "drivers/light_led.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"
@@ -34,7 +27,6 @@
 #include "io/beeper.h"
 #include "io/motors.h"
 #include "io/gps.h"
-#include "io/gimbal.h"
 #include "io/serial.h"
 #include "io/ledstrip.h"
 #include "io/osd.h"