diff --git a/libraries/AP_HAL_Linux/RCInput_RCProtocol.cpp b/libraries/AP_HAL_Linux/RCInput_RCProtocol.cpp
index 321c5bf33a..1880003e43 100644
--- a/libraries/AP_HAL_Linux/RCInput_RCProtocol.cpp
+++ b/libraries/AP_HAL_Linux/RCInput_RCProtocol.cpp
@@ -23,6 +23,10 @@
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <asm/termbits.h>
+#include <stdarg.h>
+
+#include <AP_RCProtocol/AP_RCProtocol.h>
+#include "RCInput.h"
 #include "RCInput_RCProtocol.h"
 #include <GCS_MAVLink/GCS.h>
 
diff --git a/libraries/AP_HAL_Linux/RCInput_RCProtocol.h b/libraries/AP_HAL_Linux/RCInput_RCProtocol.h
index d15a3417fe..4fa6cafcf7 100644
--- a/libraries/AP_HAL_Linux/RCInput_RCProtocol.h
+++ b/libraries/AP_HAL_Linux/RCInput_RCProtocol.h
@@ -18,10 +18,7 @@
  */
 #pragma once
 
-#include <AP_HAL/AP_HAL.h>
-#include <AP_RCProtocol/AP_RCProtocol.h>
-#include "RCInput.h"
-#include <stdarg.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 
 #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_DISCO || \
     CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BLUE || \