diff --git a/libraries/AP_ADC/AP_ADC.h b/libraries/AP_ADC/AP_ADC.h
index f9c0ce95da..37cfbc6be3 100644
--- a/libraries/AP_ADC/AP_ADC.h
+++ b/libraries/AP_ADC/AP_ADC.h
@@ -1,7 +1,7 @@
 #ifndef AP_ADC_H
 #define AP_ADC_H
 
-#include <AP_Common.h>
+#include <AP_Common/AP_Common.h>
 /*
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/libraries/AP_ADC/AP_ADC_ADS1115.cpp b/libraries/AP_ADC/AP_ADC_ADS1115.cpp
index a31f4af7c7..119712bc4e 100644
--- a/libraries/AP_ADC/AP_ADC_ADS1115.cpp
+++ b/libraries/AP_ADC/AP_ADC_ADS1115.cpp
@@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 
 #include "AP_ADC_ADS1115.h"
 
diff --git a/libraries/AP_ADC/AP_ADC_ADS1115.h b/libraries/AP_ADC/AP_ADC_ADS1115.h
index 2445566a2b..dc8d2a76e2 100644
--- a/libraries/AP_ADC/AP_ADC_ADS1115.h
+++ b/libraries/AP_ADC/AP_ADC_ADS1115.h
@@ -5,7 +5,7 @@
 
 #include <inttypes.h>
 #include "AP_ADC.h"
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 
 
 struct adc_report_s 
diff --git a/libraries/AP_ADC/AP_ADC_ADS7844.cpp b/libraries/AP_ADC/AP_ADC_ADS7844.cpp
index 3dd0e59264..6829725d18 100644
--- a/libraries/AP_ADC/AP_ADC_ADS7844.cpp
+++ b/libraries/AP_ADC/AP_ADC_ADS7844.cpp
@@ -54,9 +54,9 @@
  *
  */
 
-#include <AP_Progmem.h>
-#include <AP_Common.h>
-#include <AP_HAL.h>
+#include <AP_Progmem/AP_Progmem.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_HAL/AP_HAL.h>
 
 #include "AP_ADC_ADS7844.h"
 
diff --git a/libraries/AP_ADC/AP_ADC_ADS7844.h b/libraries/AP_ADC/AP_ADC_ADS7844.h
index e102c0ab6e..c4244f05b5 100644
--- a/libraries/AP_ADC/AP_ADC_ADS7844.h
+++ b/libraries/AP_ADC/AP_ADC_ADS7844.h
@@ -5,7 +5,7 @@
 
 #include <inttypes.h>
 #include "AP_ADC.h"
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 
 class AP_ADC_ADS7844 : public AP_ADC
 {
diff --git a/libraries/AP_ADC/examples/AP_ADC_test/AP_ADC_test.cpp b/libraries/AP_ADC/examples/AP_ADC_test/AP_ADC_test.cpp
index a890ef5b90..f3aa6446eb 100644
--- a/libraries/AP_ADC/examples/AP_ADC_test/AP_ADC_test.cpp
+++ b/libraries/AP_ADC/examples/AP_ADC_test/AP_ADC_test.cpp
@@ -6,17 +6,17 @@
 
 #include <math.h>
 
-#include <AP_Common.h>
-#include <AP_Math.h>
-#include <AP_Param.h>
-#include <StorageManager.h>
-#include <AP_Progmem.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_Math/AP_Math.h>
+#include <AP_Param/AP_Param.h>
+#include <StorageManager/StorageManager.h>
+#include <AP_Progmem/AP_Progmem.h>
 
-#include <AP_HAL.h>
-#include <AP_HAL_AVR.h>
-#include <AP_HAL_Linux.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_ADC.h>
+#include <AP_ADC/AP_ADC.h>
 
 uint32_t timer;