diff --git a/src/drivers/serial_common.c b/src/drivers/serial_common.c
index 276101f6d0..4507de4515 100644
--- a/src/drivers/serial_common.c
+++ b/src/drivers/serial_common.c
@@ -1,4 +1,10 @@
-#include "board.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "platform.h"
+
+#include "serial_common.h"
 
 void serialPrint(serialPort_t *instance, const char *str)
 {
diff --git a/src/drivers/serial_softserial.c b/src/drivers/serial_softserial.c
index 44eb7882ed..91e4b027c3 100644
--- a/src/drivers/serial_softserial.c
+++ b/src/drivers/serial_softserial.c
@@ -1,4 +1,15 @@
-#include "board.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "platform.h"
+
+#include "system_common.h"
+#include "gpio_common.h"
+#include "timer_common.h"
+
+#include "serial_common.h"
+#include "serial_softserial.h"
 
 #define SOFT_SERIAL_TIMER_MHZ 3
 #define SOFT_SERIAL_1_TIMER_RX_HARDWARE 4
diff --git a/src/drivers/serial_uart.c b/src/drivers/serial_uart.c
index 0bdc6253b2..cac0119381 100755
--- a/src/drivers/serial_uart.c
+++ b/src/drivers/serial_uart.c
@@ -1,4 +1,16 @@
-#include "board.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "platform.h"
+
+#include "system_common.h"
+#include "gpio_common.h"
+
+#include "serial_common.h"
+#include "serial_uart.h"
+
 /*
     DMA UART routines idea lifted from AutoQuad
     Copyright © 2011  Bill Nesbitt