diff --git a/libraries/AP_BoardConfig/AP_BoardConfig.cpp b/libraries/AP_BoardConfig/AP_BoardConfig.cpp
index 11e07c9094..e6fc49a36b 100644
--- a/libraries/AP_BoardConfig/AP_BoardConfig.cpp
+++ b/libraries/AP_BoardConfig/AP_BoardConfig.cpp
@@ -18,9 +18,9 @@
  */
 
 
-#include <AP_HAL.h>
-#include <AP_Common.h>
-#include <AP_BoardConfig.h>
+#include <AP_HAL/AP_HAL.h>
+#include <AP_Common/AP_Common.h>
+#include "AP_BoardConfig.h"
 
 #if CONFIG_HAL_BOARD == HAL_BOARD_PX4
 #include <sys/types.h>
diff --git a/libraries/AP_BoardConfig/AP_BoardConfig.h b/libraries/AP_BoardConfig/AP_BoardConfig.h
index e68e9b0e85..9550a6d6e0 100644
--- a/libraries/AP_BoardConfig/AP_BoardConfig.h
+++ b/libraries/AP_BoardConfig/AP_BoardConfig.h
@@ -3,9 +3,9 @@
 #ifndef __AP_BOARDCONFIG_H__
 #define __AP_BOARDCONFIG_H__
 
-#include <AP_HAL.h>
-#include <AP_Common.h>
-#include <AP_Param.h>
+#include <AP_HAL/AP_HAL.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_Param/AP_Param.h>
 
 class AP_BoardConfig
 {