diff --git a/libraries/AP_Notify/AP_BoardLED.cpp b/libraries/AP_Notify/AP_BoardLED.cpp
index 045d6faf44..7a1ddbf45c 100644
--- a/libraries/AP_Notify/AP_BoardLED.cpp
+++ b/libraries/AP_Notify/AP_BoardLED.cpp
@@ -15,7 +15,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <AP_Notify.h>
+#include "AP_Notify.h"
 
 extern const AP_HAL::HAL& hal;
 
diff --git a/libraries/AP_Notify/AP_BoardLED.h b/libraries/AP_Notify/AP_BoardLED.h
index 8c64021e11..c72d9aa13a 100644
--- a/libraries/AP_Notify/AP_BoardLED.h
+++ b/libraries/AP_Notify/AP_BoardLED.h
@@ -18,8 +18,8 @@
 #ifndef __AP_HAL_BOARDLED_H__
 #define __AP_HAL_BOARDLED_H__
 
-#include <AP_Common.h>
-#include <AP_HAL.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_HAL/AP_HAL.h>
 #include "NotifyDevice.h"
 
 #define HIGH 1
diff --git a/libraries/AP_Notify/AP_Notify.cpp b/libraries/AP_Notify/AP_Notify.cpp
index 43fd282612..e56d38b5da 100644
--- a/libraries/AP_Notify/AP_Notify.cpp
+++ b/libraries/AP_Notify/AP_Notify.cpp
@@ -14,7 +14,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <AP_Notify.h>
+#include "AP_Notify.h"
 
 // static flags, to allow for direct class update from device drivers
 struct AP_Notify::notify_flags_type AP_Notify::flags;
diff --git a/libraries/AP_Notify/AP_Notify.h b/libraries/AP_Notify/AP_Notify.h
index 066407e44a..f89dd8af01 100644
--- a/libraries/AP_Notify/AP_Notify.h
+++ b/libraries/AP_Notify/AP_Notify.h
@@ -18,19 +18,19 @@
 #ifndef __AP_NOTIFY_H__
 #define __AP_NOTIFY_H__
 
-#include <AP_Common.h>
-#include <GCS_MAVLink.h>
-#include <AP_BoardLED.h>
-#include <ToshibaLED.h>
-#include <ToshibaLED_I2C.h>
-#include <ToshibaLED_PX4.h>
-#include <ToneAlarm_PX4.h>
-#include <ToneAlarm_Linux.h>
-#include <NavioLED_I2C.h>
-#include <ExternalLED.h>
-#include <Buzzer.h>
-#include <VRBoard_LED.h>
-#include <OreoLED_PX4.h>
+#include <AP_Common/AP_Common.h>
+#include <GCS_MAVLink/GCS_MAVLink.h>
+#include "AP_BoardLED.h"
+#include "ToshibaLED.h"
+#include "ToshibaLED_I2C.h"
+#include "ToshibaLED_PX4.h"
+#include "ToneAlarm_PX4.h"
+#include "ToneAlarm_Linux.h"
+#include "NavioLED_I2C.h"
+#include "ExternalLED.h"
+#include "Buzzer.h"
+#include "VRBoard_LED.h"
+#include "OreoLED_PX4.h"
 
 #ifndef OREOLED_ENABLED
  # define OREOLED_ENABLED   0   // set to 1 to enable OreoLEDs
diff --git a/libraries/AP_Notify/Buzzer.cpp b/libraries/AP_Notify/Buzzer.cpp
index 67487b9691..f77014c2b4 100644
--- a/libraries/AP_Notify/Buzzer.cpp
+++ b/libraries/AP_Notify/Buzzer.cpp
@@ -16,7 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 
 #include "Buzzer.h"
 #include "AP_Notify.h"
diff --git a/libraries/AP_Notify/ExternalLED.cpp b/libraries/AP_Notify/ExternalLED.cpp
index be06fe7215..30f08565d7 100644
--- a/libraries/AP_Notify/ExternalLED.cpp
+++ b/libraries/AP_Notify/ExternalLED.cpp
@@ -15,8 +15,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <AP_HAL.h>
-#include <AP_Notify.h>
+#include <AP_HAL/AP_HAL.h>
+#include "AP_Notify.h"
 
 extern const AP_HAL::HAL& hal;
 
diff --git a/libraries/AP_Notify/ExternalLED.h b/libraries/AP_Notify/ExternalLED.h
index 5d988b3992..364793dfe1 100644
--- a/libraries/AP_Notify/ExternalLED.h
+++ b/libraries/AP_Notify/ExternalLED.h
@@ -18,9 +18,9 @@
 #ifndef __EXTERNALLED_H__
 #define __EXTERNALLED_H__
 
-#include <AP_Common.h>
-#include <AP_HAL.h>
-#include <AP_Param.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_HAL/AP_HAL.h>
+#include <AP_Param/AP_Param.h>
 #include "NotifyDevice.h"
 
 #if CONFIG_HAL_BOARD == HAL_BOARD_APM2
diff --git a/libraries/AP_Notify/NavioLED_I2C.cpp b/libraries/AP_Notify/NavioLED_I2C.cpp
index 8d72c7800f..4802c90e3b 100644
--- a/libraries/AP_Notify/NavioLED_I2C.cpp
+++ b/libraries/AP_Notify/NavioLED_I2C.cpp
@@ -16,7 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 #include "NavioLED_I2C.h"
 
 #define PCA9685_ADDRESS 0x40
diff --git a/libraries/AP_Notify/NotifyDevice.h b/libraries/AP_Notify/NotifyDevice.h
index 9230d57704..2d9e8a8cd6 100644
--- a/libraries/AP_Notify/NotifyDevice.h
+++ b/libraries/AP_Notify/NotifyDevice.h
@@ -1,8 +1,8 @@
 #ifndef __NOTIFYDEVICE_H__
 #define __NOTIFYDEVICE_H__
 
-#include <AP_Common.h>
-#include <GCS_MAVLink.h>
+#include <AP_Common/AP_Common.h>
+#include <GCS_MAVLink/GCS_MAVLink.h>
 
 class NotifyDevice {
 public:
diff --git a/libraries/AP_Notify/OreoLED_PX4.cpp b/libraries/AP_Notify/OreoLED_PX4.cpp
index d636cb90a6..05701af0e1 100644
--- a/libraries/AP_Notify/OreoLED_PX4.cpp
+++ b/libraries/AP_Notify/OreoLED_PX4.cpp
@@ -16,7 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 
 #if CONFIG_HAL_BOARD == HAL_BOARD_PX4
 #include "OreoLED_PX4.h"
diff --git a/libraries/AP_Notify/OreoLED_PX4.h b/libraries/AP_Notify/OreoLED_PX4.h
index 902a7a563b..7647660262 100644
--- a/libraries/AP_Notify/OreoLED_PX4.h
+++ b/libraries/AP_Notify/OreoLED_PX4.h
@@ -19,7 +19,7 @@
 
 #if CONFIG_HAL_BOARD == HAL_BOARD_PX4
 
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 #include "NotifyDevice.h"
 #include <drivers/drv_oreoled.h>
 
diff --git a/libraries/AP_Notify/RGBLed.cpp b/libraries/AP_Notify/RGBLed.cpp
index 185dae7f54..51412685e0 100644
--- a/libraries/AP_Notify/RGBLed.cpp
+++ b/libraries/AP_Notify/RGBLed.cpp
@@ -16,8 +16,8 @@
 */
 
 
-#include <AP_HAL.h>
-#include <AP_GPS.h>
+#include <AP_HAL/AP_HAL.h>
+#include <AP_GPS/AP_GPS.h>
 #include "RGBLed.h"
 #include "AP_Notify.h"
 
diff --git a/libraries/AP_Notify/RGBLed.h b/libraries/AP_Notify/RGBLed.h
index e35f18966c..0c4116e716 100644
--- a/libraries/AP_Notify/RGBLed.h
+++ b/libraries/AP_Notify/RGBLed.h
@@ -21,7 +21,7 @@
 #ifndef __RGBLED_H__
 #define __RGBLED_H__
 
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 #include "NotifyDevice.h"
 
 class RGBLed: public NotifyDevice {
diff --git a/libraries/AP_Notify/ToneAlarm_Linux.cpp b/libraries/AP_Notify/ToneAlarm_Linux.cpp
index 11142a1e4a..5caf734adc 100644
--- a/libraries/AP_Notify/ToneAlarm_Linux.cpp
+++ b/libraries/AP_Notify/ToneAlarm_Linux.cpp
@@ -16,7 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 
 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include "ToneAlarm_Linux.h"
diff --git a/libraries/AP_Notify/ToneAlarm_PX4.cpp b/libraries/AP_Notify/ToneAlarm_PX4.cpp
index be8fe70aef..05abfc3312 100644
--- a/libraries/AP_Notify/ToneAlarm_PX4.cpp
+++ b/libraries/AP_Notify/ToneAlarm_PX4.cpp
@@ -16,7 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 
 #if CONFIG_HAL_BOARD == HAL_BOARD_PX4
 #include "ToneAlarm_PX4.h"
diff --git a/libraries/AP_Notify/ToshibaLED_I2C.cpp b/libraries/AP_Notify/ToshibaLED_I2C.cpp
index f8d0a6b679..a07d0889b7 100644
--- a/libraries/AP_Notify/ToshibaLED_I2C.cpp
+++ b/libraries/AP_Notify/ToshibaLED_I2C.cpp
@@ -16,7 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 #include "ToshibaLED.h"
 #include "ToshibaLED_I2C.h"
 
diff --git a/libraries/AP_Notify/ToshibaLED_PX4.cpp b/libraries/AP_Notify/ToshibaLED_PX4.cpp
index 6ceb418da5..2dc7df3ef8 100644
--- a/libraries/AP_Notify/ToshibaLED_PX4.cpp
+++ b/libraries/AP_Notify/ToshibaLED_PX4.cpp
@@ -16,7 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 
 #if CONFIG_HAL_BOARD == HAL_BOARD_PX4
 #include "ToshibaLED_PX4.h"
diff --git a/libraries/AP_Notify/ToshibaLED_PX4.h b/libraries/AP_Notify/ToshibaLED_PX4.h
index 01698063b5..38ecc2aceb 100644
--- a/libraries/AP_Notify/ToshibaLED_PX4.h
+++ b/libraries/AP_Notify/ToshibaLED_PX4.h
@@ -19,8 +19,8 @@
 #define __TOSHIBA_LED_PX4_H__
 
 #include "ToshibaLED.h"
-#include "AP_Math.h"
-#include "vectorN.h"
+#include <AP_Math/AP_Math.h>
+#include <AP_Math/vectorN.h>
 
 class ToshibaLED_PX4 : public ToshibaLED
 {
diff --git a/libraries/AP_Notify/VRBoard_LED.cpp b/libraries/AP_Notify/VRBoard_LED.cpp
index 9f9ba7e7b7..9161b1dd99 100644
--- a/libraries/AP_Notify/VRBoard_LED.cpp
+++ b/libraries/AP_Notify/VRBoard_LED.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "VRBoard_LED.h"
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 
 #define VRBRAIN_LED_BRIGHT  1    // full brightness
 #define VRBRAIN_LED_MEDIUM  1    // medium brightness
diff --git a/libraries/AP_Notify/examples/AP_Notify_test/AP_Notify_test.cpp b/libraries/AP_Notify/examples/AP_Notify_test/AP_Notify_test.cpp
index 0686019cdc..c8d64636d6 100644
--- a/libraries/AP_Notify/examples/AP_Notify_test/AP_Notify_test.cpp
+++ b/libraries/AP_Notify/examples/AP_Notify_test/AP_Notify_test.cpp
@@ -3,20 +3,20 @@
  *       DIYDrones.com
  */
 
-#include <AP_Common.h>
-#include <AP_Progmem.h>
-#include <AP_Math.h>            // ArduPilot Mega Vector/Matrix math Library
-#include <AP_Param.h>
-#include <AP_HAL.h>
-#include <AP_HAL_AVR.h>
-#include <AP_HAL_Linux.h>
-#include <AP_HAL_PX4.h>
-#include <AP_HAL_Empty.h>
-#include <AP_Notify.h>          // Notify library
-#include <AP_BoardLED.h>        // Board LED library
-#include <GCS_MAVLink.h>
-#include <StorageManager.h>
-#include <AP_RangeFinder.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_Progmem/AP_Progmem.h>
+#include <AP_Math/AP_Math.h>            // ArduPilot Mega Vector/Matrix math Library
+#include <AP_Param/AP_Param.h>
+#include <AP_HAL/AP_HAL.h>
+#include <AP_HAL_AVR/AP_HAL_AVR.h>
+#include <AP_HAL_Linux/AP_HAL_Linux.h>
+#include <AP_HAL_PX4/AP_HAL_PX4.h>
+#include <AP_HAL_Empty/AP_HAL_Empty.h>
+#include <AP_Notify/AP_Notify.h>          // Notify library
+#include <AP_Notify/AP_BoardLED.h>        // Board LED library
+#include <GCS_MAVLink/GCS_MAVLink.h>
+#include <StorageManager/StorageManager.h>
+#include <AP_RangeFinder/AP_RangeFinder.h>
 
 const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;
 
diff --git a/libraries/AP_Notify/examples/ToshibaLED_test/ToshibaLED_test.cpp b/libraries/AP_Notify/examples/ToshibaLED_test/ToshibaLED_test.cpp
index ed0d61e820..e62e4fe9ae 100644
--- a/libraries/AP_Notify/examples/ToshibaLED_test/ToshibaLED_test.cpp
+++ b/libraries/AP_Notify/examples/ToshibaLED_test/ToshibaLED_test.cpp
@@ -1,38 +1,38 @@
 // -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: t -*-
 
-#include <AP_Common.h>
-#include <AP_Progmem.h>
-#include <AP_Math.h>            // ArduPilot Mega Vector/Matrix math Library
-#include <AP_Param.h>
-#include <Filter.h>
-#include <AP_ADC.h>
-#include <AP_InertialSensor.h>
-#include <AP_GPS.h>
-#include <AP_Baro.h>
-#include <DataFlash.h>
-#include <GCS_MAVLink.h>
-#include <AP_Mission.h>
-#include <StorageManager.h>
-#include <AP_Terrain.h>
-#include <AP_Declination.h>
-#include <AP_HAL.h>
-#include <AP_HAL_AVR.h>
-#include <AP_HAL_SITL.h>
-#include <AP_HAL_Linux.h>
-#include <AP_HAL_PX4.h>
-#include <AP_HAL_Empty.h>
-#include <AP_HAL_FLYMAPLE.h>
-#include <AP_Notify.h>          // Notify library
-#include <ToshibaLED.h>
-#include <AP_AHRS.h>
-#include <AP_NavEKF.h>
-#include <AP_Airspeed.h>
-#include <AP_Vehicle.h>
-#include <AP_ADC_AnalogSource.h>
-#include <AP_Compass.h>
-#include <AP_Declination.h>
-#include <AP_BattMonitor.h>
-#include <AP_RangeFinder.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_Progmem/AP_Progmem.h>
+#include <AP_Math/AP_Math.h>            // ArduPilot Mega Vector/Matrix math Library
+#include <AP_Param/AP_Param.h>
+#include <Filter/Filter.h>
+#include <AP_ADC/AP_ADC.h>
+#include <AP_InertialSensor/AP_InertialSensor.h>
+#include <AP_GPS/AP_GPS.h>
+#include <AP_Baro/AP_Baro.h>
+#include <DataFlash/DataFlash.h>
+#include <GCS_MAVLink/GCS_MAVLink.h>
+#include <AP_Mission/AP_Mission.h>
+#include <StorageManager/StorageManager.h>
+#include <AP_Terrain/AP_Terrain.h>
+#include <AP_Declination/AP_Declination.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_PX4/AP_HAL_PX4.h>
+#include <AP_HAL_Empty/AP_HAL_Empty.h>
+#include <AP_HAL_FLYMAPLE/AP_HAL_FLYMAPLE.h>
+#include <AP_Notify/AP_Notify.h>          // Notify library
+#include <AP_Notify/ToshibaLED.h>
+#include <AP_AHRS/AP_AHRS.h>
+#include <AP_NavEKF/AP_NavEKF.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_BattMonitor/AP_BattMonitor.h>
+#include <AP_RangeFinder/AP_RangeFinder.h>
 
 const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;