diff --git a/libraries/StorageManager/StorageManager.cpp b/libraries/StorageManager/StorageManager.cpp
index dd33a02bfe..1fd10dba74 100644
--- a/libraries/StorageManager/StorageManager.cpp
+++ b/libraries/StorageManager/StorageManager.cpp
@@ -20,8 +20,8 @@
   of storage offsets to available storage
  */
 
-#include <AP_HAL.h>
-#include <StorageManager.h>
+#include <AP_HAL/AP_HAL.h>
+#include "StorageManager.h"
 
 extern const AP_HAL::HAL& hal;
 
diff --git a/libraries/StorageManager/StorageManager.h b/libraries/StorageManager/StorageManager.h
index 19e241a354..6e2ef3e293 100644
--- a/libraries/StorageManager/StorageManager.h
+++ b/libraries/StorageManager/StorageManager.h
@@ -23,7 +23,7 @@
 #ifndef _STORAGEMANAGER_H_
 #define _STORAGEMANAGER_H_
 
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 
 /*
   use just one area per storage type for boards with 4k of
diff --git a/libraries/StorageManager/examples/StorageTest/StorageTest.cpp b/libraries/StorageManager/examples/StorageTest/StorageTest.cpp
index 669dca0500..59c5e21cc4 100644
--- a/libraries/StorageManager/examples/StorageTest/StorageTest.cpp
+++ b/libraries/StorageManager/examples/StorageTest/StorageTest.cpp
@@ -5,40 +5,40 @@
 //
 
 #include <stdarg.h>
-#include <AP_Common.h>
-#include <AP_Progmem.h>
-#include <AP_HAL.h>
-#include <AP_HAL_AVR.h>
-#include <AP_HAL_SITL.h>
-#include <AP_HAL_Linux.h>
-#include <AP_HAL_FLYMAPLE.h>
-#include <AP_HAL_PX4.h>
-#include <AP_HAL_Empty.h>
-#include <AP_Math.h>
-#include <AP_Param.h>
-#include <StorageManager.h>
-#include <AP_ADC.h>
-#include <AP_InertialSensor.h>
-#include <AP_Notify.h>
-#include <AP_GPS.h>
-#include <SITL.h>
-#include <AP_Baro.h>
-#include <Filter.h>
-#include <DataFlash.h>
-#include <GCS_MAVLink.h>
-#include <AP_Mission.h>
-#include <AP_Terrain.h>
-#include <AP_Rally.h>
-#include <AP_AHRS.h>
-#include <AP_Airspeed.h>
-#include <AP_Vehicle.h>
-#include <AP_ADC_AnalogSource.h>
-#include <AP_Compass.h>
-#include <AP_Declination.h>
-#include <AP_NavEKF.h>
-#include <AP_HAL_Linux.h>
-#include <AP_Scheduler.h>
-#include <AP_RangeFinder.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_Progmem/AP_Progmem.h>
+#include <AP_HAL/AP_HAL.h>
+#include <AP_HAL_AVR/AP_HAL_AVR.h>
+#include <AP_HAL_SITL/AP_HAL_SITL.h>
+#include <AP_HAL_Linux/AP_HAL_Linux.h>
+#include <AP_HAL_FLYMAPLE/AP_HAL_FLYMAPLE.h>
+#include <AP_HAL_PX4/AP_HAL_PX4.h>
+#include <AP_HAL_Empty/AP_HAL_Empty.h>
+#include <AP_Math/AP_Math.h>
+#include <AP_Param/AP_Param.h>
+#include <StorageManager/StorageManager.h>
+#include <AP_ADC/AP_ADC.h>
+#include <AP_InertialSensor/AP_InertialSensor.h>
+#include <AP_Notify/AP_Notify.h>
+#include <AP_GPS/AP_GPS.h>
+#include <SITL/SITL.h>
+#include <AP_Baro/AP_Baro.h>
+#include <Filter/Filter.h>
+#include <DataFlash/DataFlash.h>
+#include <GCS_MAVLink/GCS_MAVLink.h>
+#include <AP_Mission/AP_Mission.h>
+#include <AP_Terrain/AP_Terrain.h>
+#include <AP_Rally/AP_Rally.h>
+#include <AP_AHRS/AP_AHRS.h>
+#include <AP_Airspeed/AP_Airspeed.h>
+#include <AP_Vehicle/AP_Vehicle.h>
+#include <AP_ADC_AnalogSource/AP_ADC_AnalogSource.h>
+#include <AP_Compass/AP_Compass.h>
+#include <AP_Declination/AP_Declination.h>
+#include <AP_NavEKF/AP_NavEKF.h>
+#include <AP_HAL_Linux/AP_HAL_Linux.h>
+#include <AP_Scheduler/AP_Scheduler.h>
+#include <AP_RangeFinder/AP_RangeFinder.h>
 
 const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;