diff --git a/libraries/AP_Common/AP_Common.cpp b/libraries/AP_Common/AP_Common.cpp
index 0733f79b1b..25c4fb54a7 100644
--- a/libraries/AP_Common/AP_Common.cpp
+++ b/libraries/AP_Common/AP_Common.cpp
@@ -18,8 +18,8 @@
  */
 
 
-#include <AP_HAL.h>
-#include <AP_Common.h>
+#include <AP_HAL/AP_HAL.h>
+#include "AP_Common.h"
 
 extern const AP_HAL::HAL& hal;
 
diff --git a/libraries/AP_Common/c++.cpp b/libraries/AP_Common/c++.cpp
index 45bdb2a577..b94af393b2 100644
--- a/libraries/AP_Common/c++.cpp
+++ b/libraries/AP_Common/c++.cpp
@@ -6,7 +6,7 @@
 // Note: use new/delete with caution.  The heap is small and
 // easily fragmented.
 
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 #include <stdlib.h>
 
 /*
diff --git a/libraries/AP_Common/examples/AP_Common/AP_Common.cpp b/libraries/AP_Common/examples/AP_Common/AP_Common.cpp
index 5f6d452d31..8440766556 100644
--- a/libraries/AP_Common/examples/AP_Common/AP_Common.cpp
+++ b/libraries/AP_Common/examples/AP_Common/AP_Common.cpp
@@ -3,17 +3,17 @@
 // Unit tests for the AP_Common code
 //
 
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 #include <stdlib.h>
-#include <AP_Common.h>
-#include <AP_Progmem.h>
-#include <AP_Param.h>
-#include <AP_HAL_AVR.h>
-#include <AP_HAL_SITL.h>
-#include <AP_HAL_Empty.h>
-#include <AP_HAL_PX4.h>
-#include <AP_Math.h>
-#include <StorageManager.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_Progmem/AP_Progmem.h>
+#include <AP_Param/AP_Param.h>
+#include <AP_HAL_AVR/AP_HAL_AVR.h>
+#include <AP_HAL_SITL/AP_HAL_SITL.h>
+#include <AP_HAL_Empty/AP_HAL_Empty.h>
+#include <AP_HAL_PX4/AP_HAL_PX4.h>
+#include <AP_Math/AP_Math.h>
+#include <StorageManager/StorageManager.h>
 
 const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;