diff --git a/libraries/AP_Scheduler/AP_Scheduler.cpp b/libraries/AP_Scheduler/AP_Scheduler.cpp
index 85c5b27a6f..904aea7358 100644
--- a/libraries/AP_Scheduler/AP_Scheduler.cpp
+++ b/libraries/AP_Scheduler/AP_Scheduler.cpp
@@ -20,9 +20,9 @@
  *
  */
 
-#include <AP_HAL.h>
-#include <AP_Scheduler.h>
-#include <AP_Param.h>
+#include <AP_HAL/AP_HAL.h>
+#include "AP_Scheduler.h"
+#include <AP_Param/AP_Param.h>
 
 extern const AP_HAL::HAL& hal;
 
diff --git a/libraries/AP_Scheduler/AP_Scheduler.h b/libraries/AP_Scheduler/AP_Scheduler.h
index b929852fd3..67d251e70e 100644
--- a/libraries/AP_Scheduler/AP_Scheduler.h
+++ b/libraries/AP_Scheduler/AP_Scheduler.h
@@ -23,7 +23,7 @@
 #ifndef AP_SCHEDULER_H
 #define AP_SCHEDULER_H
 
-#include <AP_Param.h>
+#include <AP_Param/AP_Param.h>
 
 /*
   A task scheduler for APM main loops
@@ -35,8 +35,8 @@
   the scheduler is allowed to use before it must return
  */
 
-#include <AP_HAL.h>
-#include <AP_Vehicle.h>
+#include <AP_HAL/AP_HAL.h>
+#include <AP_Vehicle/AP_Vehicle.h>
 
 class AP_Scheduler
 {
diff --git a/libraries/AP_Scheduler/examples/Scheduler_test/Scheduler_test.cpp b/libraries/AP_Scheduler/examples/Scheduler_test/Scheduler_test.cpp
index 74af11a775..3cee72037b 100644
--- a/libraries/AP_Scheduler/examples/Scheduler_test/Scheduler_test.cpp
+++ b/libraries/AP_Scheduler/examples/Scheduler_test/Scheduler_test.cpp
@@ -4,41 +4,41 @@
 // Simple test for the AP_Scheduler interface
 //
 
-#include <AP_HAL.h>
-#include <AP_Common.h>
-#include <AP_Progmem.h>
-#include <AP_Math.h>
-#include <AP_Param.h>
-#include <AP_InertialSensor.h>
-#include <AP_ADC.h>
-#include <AP_ADC_AnalogSource.h>
-#include <AP_Baro.h>
-#include <AP_GPS.h>
-#include <AP_AHRS.h>
-#include <AP_Compass.h>
-#include <AP_Declination.h>
-#include <AP_Airspeed.h>
-#include <AP_Baro.h>
-#include <GCS_MAVLink.h>
-#include <AP_Mission.h>
-#include <StorageManager.h>
-#include <AP_Terrain.h>
-#include <Filter.h>
-#include <SITL.h>
-#include <AP_Buffer.h>
-#include <AP_Notify.h>
-#include <AP_Vehicle.h>
-#include <DataFlash.h>
-#include <AP_NavEKF.h>
-#include <AP_Rally.h>
-#include <AP_BattMonitor.h>
-#include <AP_Scheduler.h>
-#include <AP_RangeFinder.h>
+#include <AP_HAL/AP_HAL.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_Progmem/AP_Progmem.h>
+#include <AP_Math/AP_Math.h>
+#include <AP_Param/AP_Param.h>
+#include <AP_InertialSensor/AP_InertialSensor.h>
+#include <AP_ADC/AP_ADC.h>
+#include <AP_ADC_AnalogSource/AP_ADC_AnalogSource.h>
+#include <AP_Baro/AP_Baro.h>
+#include <AP_GPS/AP_GPS.h>
+#include <AP_AHRS/AP_AHRS.h>
+#include <AP_Compass/AP_Compass.h>
+#include <AP_Declination/AP_Declination.h>
+#include <AP_Airspeed/AP_Airspeed.h>
+#include <AP_Baro/AP_Baro.h>
+#include <GCS_MAVLink/GCS_MAVLink.h>
+#include <AP_Mission/AP_Mission.h>
+#include <StorageManager/StorageManager.h>
+#include <AP_Terrain/AP_Terrain.h>
+#include <Filter/Filter.h>
+#include <SITL/SITL.h>
+#include <AP_Buffer/AP_Buffer.h>
+#include <AP_Notify/AP_Notify.h>
+#include <AP_Vehicle/AP_Vehicle.h>
+#include <DataFlash/DataFlash.h>
+#include <AP_NavEKF/AP_NavEKF.h>
+#include <AP_Rally/AP_Rally.h>
+#include <AP_BattMonitor/AP_BattMonitor.h>
+#include <AP_Scheduler/AP_Scheduler.h>
+#include <AP_RangeFinder/AP_RangeFinder.h>
 
-#include <AP_HAL_AVR.h>
-#include <AP_HAL_SITL.h>
-#include <AP_HAL_Empty.h>
-#include <AP_HAL_PX4.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>
 
 const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;