diff --git a/src/main/fc/cli.c b/src/main/fc/cli.c
index 8c004b685..d6507da39 100755
--- a/src/main/fc/cli.c
+++ b/src/main/fc/cli.c
@@ -45,8 +45,8 @@ uint8_t cliMode = 0;
 #include "common/typeconversion.h"
 
 #include "config/config_eeprom.h"
-#include "config/config_profile.h"
 #include "config/config_master.h"
+#include "config/config_profile.h"
 #include "config/feature.h"
 
 #include "config/parameter_group.h"
diff --git a/src/main/fc/fc_msp.c b/src/main/fc/fc_msp.c
index 6de708dc6..45587418d 100755
--- a/src/main/fc/fc_msp.c
+++ b/src/main/fc/fc_msp.c
@@ -34,20 +34,25 @@
 #include "common/maths.h"
 #include "common/streambuf.h"
 
-#include "drivers/system.h"
+#include "config/config_eeprom.h"
+#include "config/config_profile.h"
+#include "config/config_master.h"
+#include "config/feature.h"
+
 #include "drivers/accgyro.h"
-#include "drivers/compass.h"
-#include "drivers/serial.h"
 #include "drivers/bus_i2c.h"
-#include "drivers/io.h"
+#include "drivers/compass.h"
 #include "drivers/flash.h"
-#include "drivers/sdcard.h"
-#include "drivers/vcd.h"
+#include "drivers/io.h"
 #include "drivers/max7456.h"
-#include "drivers/vtx_soft_spi_rtc6705.h"
 #include "drivers/pwm_output.h"
+#include "drivers/sdcard.h"
+#include "drivers/serial.h"
 #include "drivers/serial_escserial.h"
+#include "drivers/system.h"
+#include "drivers/vcd.h"
 #include "drivers/vtx_common.h"
+#include "drivers/vtx_soft_spi_rtc6705.h"
 
 #include "fc/config.h"
 #include "fc/fc_core.h"
@@ -55,17 +60,25 @@
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
+#include "flight/altitudehold.h"
+#include "flight/failsafe.h"
+#include "flight/imu.h"
+#include "flight/mixer.h"
+#include "flight/navigation.h"
+#include "flight/pid.h"
+#include "flight/servos.h"
+
+#include "io/asyncfatfs/asyncfatfs.h"
 #include "io/beeper.h"
-#include "io/motors.h"
-#include "io/servos.h"
+#include "io/flashfs.h"
 #include "io/gps.h"
 #include "io/gimbal.h"
-#include "io/serial.h"
 #include "io/ledstrip.h"
-#include "io/flashfs.h"
-#include "io/transponder_ir.h"
-#include "io/asyncfatfs/asyncfatfs.h"
+#include "io/motors.h"
+#include "io/serial.h"
 #include "io/serial_4way.h"
+#include "io/servos.h"
+#include "io/transponder_ir.h"
 
 #include "msp/msp.h"
 #include "msp/msp_protocol.h"
@@ -76,30 +89,17 @@
 
 #include "scheduler/scheduler.h"
 
-#include "sensors/boardalignment.h"
-#include "sensors/sensors.h"
-#include "sensors/battery.h"
-#include "sensors/sonar.h"
 #include "sensors/acceleration.h"
 #include "sensors/barometer.h"
+#include "sensors/battery.h"
+#include "sensors/boardalignment.h"
 #include "sensors/compass.h"
 #include "sensors/gyro.h"
+#include "sensors/sensors.h"
+#include "sensors/sonar.h"
 
 #include "telemetry/telemetry.h"
 
-#include "flight/mixer.h"
-#include "flight/servos.h"
-#include "flight/pid.h"
-#include "flight/imu.h"
-#include "flight/failsafe.h"
-#include "flight/navigation.h"
-#include "flight/altitudehold.h"
-
-#include "config/config_eeprom.h"
-#include "config/config_profile.h"
-#include "config/config_master.h"
-#include "config/feature.h"
-
 #ifdef USE_HARDWARE_REVISION_DETECTION
 #include "hardware_revision.h"
 #endif