diff --git a/src/main/config/config.c b/src/main/config/config.c
index 1af50acbc..da0aaea2c 100755
--- a/src/main/config/config.c
+++ b/src/main/config/config.c
@@ -36,6 +36,7 @@
 #include "drivers/accgyro.h"
 #include "drivers/compass.h"
 #include "drivers/system.h"
+#include "drivers/io.h"
 #include "drivers/gpio.h"
 #include "drivers/timer.h"
 #include "drivers/pwm_rx.h"
diff --git a/src/main/drivers/accgyro_mpu.c b/src/main/drivers/accgyro_mpu.c
index 1c705ef13..428469721 100644
--- a/src/main/drivers/accgyro_mpu.c
+++ b/src/main/drivers/accgyro_mpu.c
@@ -29,7 +29,7 @@
 #include "nvic.h"
 
 #include "system.h"
-#include "gpio.h"
+#include "io.h"
 #include "exti.h"
 #include "bus_i2c.h"
 
diff --git a/src/main/drivers/accgyro_mpu.h b/src/main/drivers/accgyro_mpu.h
index 132c9e13a..0b70ebb14 100644
--- a/src/main/drivers/accgyro_mpu.h
+++ b/src/main/drivers/accgyro_mpu.h
@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include "io_types.h"
 #include "exti.h"
 
 // MPU6050
diff --git a/src/main/drivers/bus_spi.c b/src/main/drivers/bus_spi.c
index 690f25b52..c86fdbdb4 100644
--- a/src/main/drivers/bus_spi.c
+++ b/src/main/drivers/bus_spi.c
@@ -21,6 +21,7 @@
 #include <platform.h>
 
 #include "bus_spi.h"
+#include "exti.h"
 #include "io.h"
 #include "io_impl.h"
 #include "rcc.h"
diff --git a/src/main/drivers/exti.h b/src/main/drivers/exti.h
index 8071c65e3..adc95f13a 100644
--- a/src/main/drivers/exti.h
+++ b/src/main/drivers/exti.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "drivers/io.h"
+#include "io_types.h"
 
 // old EXTI interface, to be replaced
 typedef struct extiConfig_s {
diff --git a/src/main/drivers/rcc.h b/src/main/drivers/rcc.h
index 69dce965f..4dee74ee7 100644
--- a/src/main/drivers/rcc.h
+++ b/src/main/drivers/rcc.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "platform.h"
-#include "common/utils.h"
 #include "rcc_types.h"
 
 enum rcc_reg {
diff --git a/src/main/drivers/serial_usb_vcp.h b/src/main/drivers/serial_usb_vcp.h
index 7d1b88be1..26ef11215 100644
--- a/src/main/drivers/serial_usb_vcp.h
+++ b/src/main/drivers/serial_usb_vcp.h
@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include "serial.h"
-
 typedef struct {
     serialPort_t port;
 
@@ -30,4 +28,5 @@ typedef struct {
 } vcpPort_t;
 
 serialPort_t *usbVcpOpen(void);
-uint32_t usbVcpGetBaudRate(serialPort_t *instance);
+struct serialPort_s;
+uint32_t usbVcpGetBaudRate(struct serialPort_s *instance);
diff --git a/src/main/drivers/system_stm32f4xx.c b/src/main/drivers/system_stm32f4xx.c
index 5c09ebdf6..8b48f82f5 100644
--- a/src/main/drivers/system_stm32f4xx.c
+++ b/src/main/drivers/system_stm32f4xx.c
@@ -22,7 +22,7 @@
 #include "platform.h"
 
 #include "accgyro_mpu.h"
-#include "gpio.h"
+#include "exti.h"
 #include "nvic.h"
 #include "system.h"
 
diff --git a/src/main/drivers/timer_stm32f10x.c b/src/main/drivers/timer_stm32f10x.c
index 49106818f..d918b0711 100644
--- a/src/main/drivers/timer_stm32f10x.c
+++ b/src/main/drivers/timer_stm32f10x.c
@@ -10,6 +10,8 @@
 
 #include "platform.h"
 
+#include "common/utils.h"
+
 #include "stm32f10x.h"
 #include "rcc.h"
 #include "timer.h"
diff --git a/src/main/drivers/timer_stm32f30x.c b/src/main/drivers/timer_stm32f30x.c
index 99111bad7..871cfb6d7 100644
--- a/src/main/drivers/timer_stm32f30x.c
+++ b/src/main/drivers/timer_stm32f30x.c
@@ -10,6 +10,8 @@
 
 #include "platform.h"
 
+#include "common/utils.h"
+
 #include "stm32f30x.h"
 #include "rcc.h"
 #include "timer.h"
diff --git a/src/main/drivers/timer_stm32f4xx.c b/src/main/drivers/timer_stm32f4xx.c
index ccce10350..750324e94 100644
--- a/src/main/drivers/timer_stm32f4xx.c
+++ b/src/main/drivers/timer_stm32f4xx.c
@@ -10,6 +10,8 @@
 
 #include "platform.h"
 
+#include "common/utils.h"
+
 #include "stm32f4xx.h"
 #include "rcc.h"
 #include "timer.h"
diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c
index 716cf84b3..cd616044d 100644
--- a/src/main/io/beeper.c
+++ b/src/main/io/beeper.c
@@ -22,14 +22,14 @@
 #include <platform.h>
 #include "build_config.h"
 
-#include "io/rc_controls.h"
-
 #include "drivers/gpio.h"
 #include "drivers/sound_beeper.h"
 #include "drivers/system.h"
 #include "sensors/battery.h"
 #include "sensors/sensors.h"
 
+#include "io/rc_controls.h"
+
 #include "io/statusindicator.h"
 #include "io/vtx.h"
 
diff --git a/src/main/rx/jetiexbus.c b/src/main/rx/jetiexbus.c
index 2836d5ebc..d4050b8c8 100644
--- a/src/main/rx/jetiexbus.c
+++ b/src/main/rx/jetiexbus.c
@@ -39,12 +39,17 @@
 
 #include "platform.h"
 
-#include "common/utils.h"
 #include "build_config.h"
+#include "debug.h"
+
+#include "common/utils.h"
+
 #include "drivers/system.h"
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
+
 #include "io/serial.h"
+
 #include "rx/rx.h"
 #include "rx/jetiexbus.h"
 
@@ -61,9 +66,6 @@
 #endif //TELEMETRY
 
 
-#include "debug.h"
-#include "rx/rx.h"
-
 //
 // Serial driver for Jeti EX Bus receiver
 //
diff --git a/src/main/sensors/battery.h b/src/main/sensors/battery.h
index f459a3bcc..3cfc2702d 100644
--- a/src/main/sensors/battery.h
+++ b/src/main/sensors/battery.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "common/maths.h"
+#include "common/maths.h" // for fix12_t
 
 #ifndef VBAT_SCALE_DEFAULT
 #define VBAT_SCALE_DEFAULT 110
diff --git a/src/main/target/ALIENFLIGHTF3/hardware_revision.h b/src/main/target/ALIENFLIGHTF3/hardware_revision.h
index 9b23c614d..48d56a86a 100644
--- a/src/main/target/ALIENFLIGHTF3/hardware_revision.h
+++ b/src/main/target/ALIENFLIGHTF3/hardware_revision.h
@@ -29,4 +29,4 @@ extern uint8_t hardwareRevision;
 void updateHardwareRevision(void);
 void detectHardwareRevision(void);
 
-const extiConfig_t *selectMPUIntExtiConfigByHardwareRevision(void);
\ No newline at end of file
+const extiConfig_t *selectMPUIntExtiConfigByHardwareRevision(void);