diff --git a/libraries/AP_HAL_Linux/GPIO_Aero.cpp b/libraries/AP_HAL_Linux/GPIO_Aero.cpp
index 4be0185b00..78ee8206c8 100644
--- a/libraries/AP_HAL_Linux/GPIO_Aero.cpp
+++ b/libraries/AP_HAL_Linux/GPIO_Aero.cpp
@@ -18,8 +18,6 @@
 
 #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_AERO
 
-#include <AP_Common/AP_Common.h>
-
 #include "GPIO_Aero.h"
 
 const unsigned Linux::GPIO_Sysfs::pin_table[] = {
diff --git a/libraries/AP_HAL_Linux/GPIO_Bebop.cpp b/libraries/AP_HAL_Linux/GPIO_Bebop.cpp
index 3790e0cbe2..0012401e8e 100644
--- a/libraries/AP_HAL_Linux/GPIO_Bebop.cpp
+++ b/libraries/AP_HAL_Linux/GPIO_Bebop.cpp
@@ -1,4 +1,4 @@
-#include <AP_Common/AP_Common.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 
 #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP
 #include "GPIO_Bebop.h"
diff --git a/libraries/AP_HAL_Linux/GPIO_Disco.cpp b/libraries/AP_HAL_Linux/GPIO_Disco.cpp
index 2c797e843f..d51a8a8b24 100644
--- a/libraries/AP_HAL_Linux/GPIO_Disco.cpp
+++ b/libraries/AP_HAL_Linux/GPIO_Disco.cpp
@@ -1,4 +1,4 @@
-#include <AP_Common/AP_Common.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 
 #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_DISCO
 
diff --git a/libraries/AP_HAL_Linux/GPIO_Edge.cpp b/libraries/AP_HAL_Linux/GPIO_Edge.cpp
index 001504caf7..34060f1ab7 100644
--- a/libraries/AP_HAL_Linux/GPIO_Edge.cpp
+++ b/libraries/AP_HAL_Linux/GPIO_Edge.cpp
@@ -1,4 +1,4 @@
-#include <AP_Common/AP_Common.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 
 #include "GPIO_Edge.h"
 
diff --git a/libraries/AP_HAL_Linux/GPIO_Navio.cpp b/libraries/AP_HAL_Linux/GPIO_Navio.cpp
index b66d478f40..021f2f176f 100644
--- a/libraries/AP_HAL_Linux/GPIO_Navio.cpp
+++ b/libraries/AP_HAL_Linux/GPIO_Navio.cpp
@@ -1,4 +1,4 @@
-#include <AP_Common/AP_Common.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 
 #include "GPIO_Navio.h"
 
diff --git a/libraries/AP_HAL_Linux/GPIO_Navio2.cpp b/libraries/AP_HAL_Linux/GPIO_Navio2.cpp
index c5c0eefe69..b904651783 100644
--- a/libraries/AP_HAL_Linux/GPIO_Navio2.cpp
+++ b/libraries/AP_HAL_Linux/GPIO_Navio2.cpp
@@ -1,4 +1,4 @@
-#include <AP_Common/AP_Common.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 
 #include "GPIO_Navio2.h"
 
diff --git a/libraries/AP_HAL_Linux/RCOutput_Disco.cpp b/libraries/AP_HAL_Linux/RCOutput_Disco.cpp
index 313ef4eb68..a482753e5d 100644
--- a/libraries/AP_HAL_Linux/RCOutput_Disco.cpp
+++ b/libraries/AP_HAL_Linux/RCOutput_Disco.cpp
@@ -22,7 +22,6 @@
  */
 #include "RCOutput_Disco.h"
 
-#include <AP_Common/AP_Common.h>
 #include <AP_HAL/AP_HAL.h>
 #include <stdio.h>
 
diff --git a/libraries/AP_HAL_Linux/RCOutput_Sysfs.cpp b/libraries/AP_HAL_Linux/RCOutput_Sysfs.cpp
index e5092f1aea..5ffbf9ed22 100644
--- a/libraries/AP_HAL_Linux/RCOutput_Sysfs.cpp
+++ b/libraries/AP_HAL_Linux/RCOutput_Sysfs.cpp
@@ -16,7 +16,6 @@
  */
 #include "RCOutput_Sysfs.h"
 
-#include <AP_Common/AP_Common.h>
 #include <AP_HAL/AP_HAL.h>
 #include <AP_Math/AP_Math.h>