diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index 32f9a05d58..50559161c5 100755
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -43,39 +43,50 @@ uint8_t cliMode = 0;
 #include "common/printf.h"
 #include "common/typeconversion.h"
 
-#include "drivers/system.h"
-#include "drivers/sensor.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/buf_writer.h"
 #include "drivers/bus_i2c.h"
+#include "drivers/compass.h"
+#include "drivers/dma.h"
 #include "drivers/flash.h"
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/dma.h"
-#include "drivers/timer.h"
 #include "drivers/rx_pwm.h"
 #include "drivers/sdcard.h"
-#include "drivers/buf_writer.h"
+#include "drivers/sensor.h"
+#include "drivers/serial.h"
 #include "drivers/serial_escserial.h"
 #include "drivers/stack_check.h"
+#include "drivers/system.h"
+#include "drivers/timer.h"
 #include "drivers/vcd.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
-#include "io/motors.h"
-#include "io/servos.h"
-#include "io/gps.h"
+#include "flight/failsafe.h"
+#include "flight/imu.h"
+#include "flight/mixer.h"
+#include "flight/navigation.h"
+#include "flight/pid.h"
+
+#include "io/asyncfatfs/asyncfatfs.h"
+#include "io/beeper.h"
+#include "io/flashfs.h"
 #include "io/gimbal.h"
+#include "io/gps.h"
+#include "io/ledstrip.h"
+#include "io/motors.h"
+#include "io/osd.h"
 #include "io/serial.h"
 #include "io/serial_cli.h"
-#include "io/ledstrip.h"
-#include "io/flashfs.h"
-#include "io/beeper.h"
-#include "io/asyncfatfs/asyncfatfs.h"
-#include "io/osd.h"
+#include "io/servos.h"
 #include "io/vtx.h"
 
 #include "rx/rx.h"
@@ -83,27 +94,16 @@ uint8_t cliMode = 0;
 
 #include "scheduler/scheduler.h"
 
+#include "sensors/acceleration.h"
+#include "sensors/barometer.h"
 #include "sensors/battery.h"
 #include "sensors/boardalignment.h"
-#include "sensors/sensors.h"
-#include "sensors/acceleration.h"
-#include "sensors/gyro.h"
 #include "sensors/compass.h"
-#include "sensors/barometer.h"
+#include "sensors/gyro.h"
+#include "sensors/sensors.h"
 
-#include "flight/pid.h"
-#include "flight/imu.h"
-#include "flight/mixer.h"
-#include "flight/navigation.h"
-#include "flight/failsafe.h"
-
-#include "telemetry/telemetry.h"
 #include "telemetry/frsky.h"
-
-#include "config/config_eeprom.h"
-#include "config/config_profile.h"
-#include "config/config_master.h"
-#include "config/feature.h"
+#include "telemetry/telemetry.h"
 
 extern uint16_t cycleTime; // FIXME dependency on mw.c