AP_HAL_Linux: standardize inclusion of libaries headers

This commit changes the way libraries headers are included in source files: - If the header is in the same directory the source belongs to, so the notation '#include ""' is used with the path relative to the directory containing the source. - If the header is outside the directory containing the source, then we use the notation '#include <>' with the path relative to libraries folder. Some of the advantages of such approach: - Only one search path for libraries headers. - OSs like Windows may have a better lookup time.
2015-08-11 16:28:43 +10:00 · 2015-08-11 16:28:43 +10:00 · 7ac51f60d0
parent c33fdc7b71
commit 7ac51f60d0
59 changed files with 72 additions and 72 deletions
--- a/libraries/AP_HAL_Linux/AP_HAL_Linux.h
+++ b/libraries/AP_HAL_Linux/AP_HAL_Linux.h
@ -3,7 +3,7 @@
 #define __AP_HAL_LINUX_H__

 /* Your layer exports should depend on AP_HAL.h ONLY. */
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 /**
 * Umbrella header for AP_HAL_Linux module.
--- a/libraries/AP_HAL_Linux/AnalogIn.cpp
+++ b/libraries/AP_HAL_Linux/AnalogIn.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include "AnalogIn.h"
--- a/libraries/AP_HAL_Linux/AnalogIn.h
+++ b/libraries/AP_HAL_Linux/AnalogIn.h
@ -2,7 +2,7 @@
 #ifndef __AP_HAL_LINUX_ANALOGIN_H__
 #define __AP_HAL_LINUX_ANALOGIN_H__

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"

 class Linux::LinuxAnalogSource : public AP_HAL::AnalogSource {
 public:
--- a/libraries/AP_HAL_Linux/AnalogIn_Navio.cpp
+++ b/libraries/AP_HAL_Linux/AnalogIn_Navio.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX

--- a/libraries/AP_HAL_Linux/AnalogIn_Navio.h
+++ b/libraries/AP_HAL_Linux/AnalogIn_Navio.h
@ -1,8 +1,8 @@
 #ifndef __NavioAnalogIn_H__
 #define __NavioAnalogIn_H__

-#include <AP_HAL_Linux.h>
-#include <AP_ADC.h>
+#include "AP_HAL_Linux.h"
+#include <AP_ADC/AP_ADC.h>

 #define NAVIO_ADC_MAX_CHANNELS 6

--- a/libraries/AP_HAL_Linux/ConsoleDevice.cpp
+++ b/libraries/AP_HAL_Linux/ConsoleDevice.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include "ConsoleDevice.h"
--- a/libraries/AP_HAL_Linux/GPIO.cpp
+++ b/libraries/AP_HAL_Linux/GPIO.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 #include "GPIO.h"

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
--- a/libraries/AP_HAL_Linux/GPIO.h
+++ b/libraries/AP_HAL_Linux/GPIO.h
@ -1,7 +1,7 @@
 #ifndef __AP_HAL_LINUX_GPIO_H__
 #define __AP_HAL_LINUX_GPIO_H__

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXF || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLE || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI
--- a/libraries/AP_HAL_Linux/GPIO_BBB.cpp
+++ b/libraries/AP_HAL_Linux/GPIO_BBB.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXF || \
    CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLE || \
--- a/libraries/AP_HAL_Linux/GPIO_BBB.h
+++ b/libraries/AP_HAL_Linux/GPIO_BBB.h
@ -2,7 +2,7 @@
 #ifndef __AP_HAL_LINUX_GPIO_BBB_H__
 #define __AP_HAL_LINUX_GPIO_BBB_H__

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"

 #define SYSFS_GPIO_DIR "/sys/class/gpio"

--- a/libraries/AP_HAL_Linux/GPIO_RPI.cpp
+++ b/libraries/AP_HAL_Linux/GPIO_RPI.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO

--- a/libraries/AP_HAL_Linux/GPIO_RPI.h
+++ b/libraries/AP_HAL_Linux/GPIO_RPI.h
@ -3,7 +3,7 @@
 #define __AP_HAL_LINUX_GPIO_RPI_H__

 #include <stdint.h>
-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"

 #define LOW                 0
 #define HIGH                1
--- a/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
+++ b/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
@ -1,16 +1,16 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX

 #include "HAL_Linux_Class.h"
 #include "AP_HAL_Linux_Private.h"

-#include <utility/getopt_cpp.h>
+#include <AP_HAL/utility/getopt_cpp.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>

-#include <AP_HAL_Empty.h>
-#include <AP_HAL_Empty_Private.h>
+#include <AP_HAL_Empty/AP_HAL_Empty.h>
+#include <AP_HAL_Empty/AP_HAL_Empty_Private.h>

 using namespace Linux;

--- a/libraries/AP_HAL_Linux/HAL_Linux_Class.h
+++ b/libraries/AP_HAL_Linux/HAL_Linux_Class.h
@ -2,7 +2,7 @@
 #ifndef __AP_HAL_LINUX_CLASS_H__
 #define __AP_HAL_LINUX_CLASS_H__

-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #include "AP_HAL_Linux_Namespace.h"

--- a/libraries/AP_HAL_Linux/I2CDriver.cpp
+++ b/libraries/AP_HAL_Linux/I2CDriver.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include "I2CDriver.h"
--- a/libraries/AP_HAL_Linux/I2CDriver.h
+++ b/libraries/AP_HAL_Linux/I2CDriver.h
@ -2,7 +2,7 @@
 #ifndef __AP_HAL_LINUX_I2CDRIVER_H__
 #define __AP_HAL_LINUX_I2CDRIVER_H__

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"

 class Linux::LinuxI2CDriver : public AP_HAL::I2CDriver {
 public:
--- a/libraries/AP_HAL_Linux/RCInput.cpp
+++ b/libraries/AP_HAL_Linux/RCInput.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include <stdio.h>
--- a/libraries/AP_HAL_Linux/RCInput.h
+++ b/libraries/AP_HAL_Linux/RCInput.h
@ -2,7 +2,7 @@
 #ifndef __AP_HAL_LINUX_RCINPUT_H__
 #define __AP_HAL_LINUX_RCINPUT_H__

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"

 #define LINUX_RC_INPUT_NUM_CHANNELS 16

--- a/libraries/AP_HAL_Linux/RCInput_AioPRU.cpp
+++ b/libraries/AP_HAL_Linux/RCInput_AioPRU.cpp
@ -10,7 +10,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_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI

--- a/libraries/AP_HAL_Linux/RCInput_AioPRU.h
+++ b/libraries/AP_HAL_Linux/RCInput_AioPRU.h
@ -18,7 +18,7 @@
  doing the edge detection of the PPM sum input
 */

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"

 #define RCIN_PRUSS_RAM_BASE   0x4a303000
 // we use 300 ring buffer entries to guarantee that a full 25 byte
--- a/libraries/AP_HAL_Linux/RCInput_Navio.cpp
+++ b/libraries/AP_HAL_Linux/RCInput_Navio.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO
 #include "GPIO.h"
--- a/libraries/AP_HAL_Linux/RCInput_Navio.h
+++ b/libraries/AP_HAL_Linux/RCInput_Navio.h
@ -1,7 +1,7 @@
 #ifndef __AP_HAL_LINUX_RCINPUT_NAVIO_H__
 #define __AP_HAL_LINUX_RCINPUT_NAVIO_H__

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"
 #include "RCInput.h"
 #include <signal.h>
 #include <pthread.h>
--- a/libraries/AP_HAL_Linux/RCInput_PRU.cpp
+++ b/libraries/AP_HAL_Linux/RCInput_PRU.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXF || \
    CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLE || \
--- a/libraries/AP_HAL_Linux/RCInput_PRU.h
+++ b/libraries/AP_HAL_Linux/RCInput_PRU.h
@ -7,7 +7,7 @@
  doing the edge detection of the PPM sum input
 */

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"

 #define RCIN_PRUSS_SHAREDRAM_BASE   0x4a312000
 // we use 300 ring buffer entries to guarantee that a full 25 byte
--- a/libraries/AP_HAL_Linux/RCInput_ZYNQ.cpp
+++ b/libraries/AP_HAL_Linux/RCInput_ZYNQ.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include <stdio.h>
--- a/libraries/AP_HAL_Linux/RCInput_ZYNQ.h
+++ b/libraries/AP_HAL_Linux/RCInput_ZYNQ.h
@ -7,7 +7,7 @@
  logic doing the edge detection of the PPM sum input
 */

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"

 // FIXME A puppie dies when you hard code an address
 #define RCIN_ZYNQ_PULSE_INPUT_BASE  0x43c10000
--- a/libraries/AP_HAL_Linux/RCOutput_AioPRU.cpp
+++ b/libraries/AP_HAL_Linux/RCOutput_AioPRU.cpp
@ -10,7 +10,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

--- a/libraries/AP_HAL_Linux/RCOutput_AioPRU.h
+++ b/libraries/AP_HAL_Linux/RCOutput_AioPRU.h
@ -13,7 +13,7 @@
 #ifndef __AP_HAL_LINUX_RCOUTPUT_AIOPRU_H__
 #define __AP_HAL_LINUX_RCOUTPUT_AIOPRU_H__

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"
 #define RCOUT_PRUSS_RAM_BASE 0x4a302000
 #define RCOUT_PRUSS_CTRL_BASE 0x4a324000
 #define RCOUT_PRUSS_IRAM_BASE 0x4a338000
--- a/libraries/AP_HAL_Linux/RCOutput_Bebop.cpp
+++ b/libraries/AP_HAL_Linux/RCOutput_Bebop.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP
 #include <endian.h>
--- a/libraries/AP_HAL_Linux/RCOutput_Bebop.h
+++ b/libraries/AP_HAL_Linux/RCOutput_Bebop.h
@ -1,7 +1,7 @@
 #ifndef __AP_HAL_LINUX_RCOUTPUT_BEBOP_H__
 #define __AP_HAL_LINUX_RCOUTPUT_BEBOP_H__

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"

 enum bebop_bldc_motor {
    BEBOP_BLDC_RIGHT_FRONT = 0,
--- a/libraries/AP_HAL_Linux/RCOutput_Navio.cpp
+++ b/libraries/AP_HAL_Linux/RCOutput_Navio.cpp
@ -1,5 +1,5 @@

-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 #include "GPIO.h"

 #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO
--- a/libraries/AP_HAL_Linux/RCOutput_Navio.h
+++ b/libraries/AP_HAL_Linux/RCOutput_Navio.h
@ -2,7 +2,7 @@
 #ifndef __AP_HAL_LINUX_RCOUTPUT_NAVIO_H__
 #define __AP_HAL_LINUX_RCOUTPUT_NAVIO_H__

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"

 class Linux::LinuxRCOutput_Navio : public AP_HAL::RCOutput {
    public:
--- a/libraries/AP_HAL_Linux/RCOutput_PRU.cpp
+++ b/libraries/AP_HAL_Linux/RCOutput_PRU.cpp
@ -1,5 +1,5 @@

-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX

--- a/libraries/AP_HAL_Linux/RCOutput_PRU.h
+++ b/libraries/AP_HAL_Linux/RCOutput_PRU.h
@ -2,7 +2,7 @@
 #ifndef __AP_HAL_LINUX_RCOUTPUT_PRU_H__
 #define __AP_HAL_LINUX_RCOUTPUT_PRU_H__

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"
 #define RCOUT_PRUSS_SHAREDRAM_BASE     0x4a310000
 #define MAX_PWMS                 12
 #define PWM_CMD_MAGIC            0xf00fbaaf
--- a/libraries/AP_HAL_Linux/RCOutput_ZYNQ.cpp
+++ b/libraries/AP_HAL_Linux/RCOutput_ZYNQ.cpp
@ -1,5 +1,5 @@

-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX

--- a/libraries/AP_HAL_Linux/RCOutput_ZYNQ.h
+++ b/libraries/AP_HAL_Linux/RCOutput_ZYNQ.h
@ -2,7 +2,7 @@
 #ifndef __AP_HAL_LINUX_RCOUTPUT_ZYNQ_H__
 #define __AP_HAL_LINUX_RCOUTPUT_ZYNQ_H__

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"
 #define RCOUT_ZYNQ_PWM_BASE	 0x43c00000	//FIXME hardcoding is the devil's work
 #define MAX_ZYNQ_PWMS            8	/* number of pwm channels */
 #define PWM_CMD_CONFIG	         0	/* full configuration in one go */
--- a/libraries/AP_HAL_Linux/SPIDriver.cpp
+++ b/libraries/AP_HAL_Linux/SPIDriver.cpp
@ -1,5 +1,5 @@
-#include <AP_Common.h>
-#include <AP_HAL.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include "SPIDriver.h"
--- a/libraries/AP_HAL_Linux/SPIDriver.h
+++ b/libraries/AP_HAL_Linux/SPIDriver.h
@ -2,7 +2,7 @@
 #ifndef __AP_HAL_EMPTY_SPIDRIVER_H__
 #define __AP_HAL_EMPTY_SPIDRIVER_H__

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"
 #include "Semaphores.h"

 // Most platforms won't need to declare the spidev bus offset
--- a/libraries/AP_HAL_Linux/SPIUARTDriver.cpp
+++ b/libraries/AP_HAL_Linux/SPIUARTDriver.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX

--- a/libraries/AP_HAL_Linux/SPIUARTDriver.h
+++ b/libraries/AP_HAL_Linux/SPIUARTDriver.h
@ -1,7 +1,7 @@
 #ifndef __AP_HAL_LINUX_SPIUARTDRIVER_H__
 #define __AP_HAL_LINUX_SPIUARTDRIVER_H__

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"

 #include "UARTDriver.h"

--- a/libraries/AP_HAL_Linux/Scheduler.cpp
+++ b/libraries/AP_HAL_Linux/Scheduler.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX

--- a/libraries/AP_HAL_Linux/Scheduler.h
+++ b/libraries/AP_HAL_Linux/Scheduler.h
@ -2,7 +2,7 @@
 #ifndef __AP_HAL_LINUX_SCHEDULER_H__
 #define __AP_HAL_LINUX_SCHEDULER_H__

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"
 #include "Semaphores.h"

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
--- a/libraries/AP_HAL_Linux/Semaphores.cpp
+++ b/libraries/AP_HAL_Linux/Semaphores.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX

--- a/libraries/AP_HAL_Linux/Semaphores.h
+++ b/libraries/AP_HAL_Linux/Semaphores.h
@ -2,10 +2,10 @@
 #ifndef __AP_HAL_LINUX_SEMAPHORE_H__
 #define __AP_HAL_LINUX_SEMAPHORE_H__

-#include <AP_HAL_Boards.h>
+#include <AP_HAL/AP_HAL_Boards.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"
 #include <pthread.h>

 class Linux::LinuxSemaphore : public AP_HAL::Semaphore {
--- a/libraries/AP_HAL_Linux/Storage.cpp
+++ b/libraries/AP_HAL_Linux/Storage.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX

--- a/libraries/AP_HAL_Linux/Storage.h
+++ b/libraries/AP_HAL_Linux/Storage.h
@ -7,7 +7,7 @@
 #define LINUX_STORAGE_USE_FRAM 0
 #endif

-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 #include "AP_HAL_Linux_Namespace.h"

 #define LINUX_STORAGE_SIZE HAL_STORAGE_SIZE
--- a/libraries/AP_HAL_Linux/Storage_FRAM.cpp
+++ b/libraries/AP_HAL_Linux/Storage_FRAM.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include <assert.h>
--- a/libraries/AP_HAL_Linux/Storage_FRAM.h
+++ b/libraries/AP_HAL_Linux/Storage_FRAM.h
@ -1,7 +1,7 @@
 #ifndef __AP_HAL_LINUX_STORAGE_FRAM_H__
 #define __AP_HAL_LINUX_STORAGE_FRAM_H__

-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 #include "AP_HAL_Linux_Namespace.h"

 #define OPCODE_WREN   0b0110        /* Write Enable Latch */
--- a/libraries/AP_HAL_Linux/TCPServerDevice.cpp
+++ b/libraries/AP_HAL_Linux/TCPServerDevice.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX

--- a/libraries/AP_HAL_Linux/ToneAlarmDriver.cpp
+++ b/libraries/AP_HAL_Linux/ToneAlarmDriver.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX

--- a/libraries/AP_HAL_Linux/ToneAlarmDriver.h
+++ b/libraries/AP_HAL_Linux/ToneAlarmDriver.h
@ -1,7 +1,7 @@
 #ifndef __TONE_ALARM_DRIVER_H__
 #define __TONE_ALARM_DRIVER_H__

-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 #include "AP_HAL_Linux_Namespace.h"

 #define OCTAVE_OFFSET 0
--- a/libraries/AP_HAL_Linux/UARTDevice.cpp
+++ b/libraries/AP_HAL_Linux/UARTDevice.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX

--- a/libraries/AP_HAL_Linux/UARTDriver.cpp
+++ b/libraries/AP_HAL_Linux/UARTDriver.cpp
@ -1,6 +1,6 @@
 // -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: -*- nil -*-

-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX

--- a/libraries/AP_HAL_Linux/UARTDriver.h
+++ b/libraries/AP_HAL_Linux/UARTDriver.h
@ -2,7 +2,7 @@
 #ifndef __AP_HAL_LINUX_UARTDRIVER_H__
 #define __AP_HAL_LINUX_UARTDRIVER_H__

-#include <AP_HAL_Linux.h>
+#include "AP_HAL_Linux.h"

 #include "SerialDevice.h"

--- a/libraries/AP_HAL_Linux/UDPDevice.cpp
+++ b/libraries/AP_HAL_Linux/UDPDevice.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>

 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX

--- a/libraries/AP_HAL_Linux/Util.cpp
+++ b/libraries/AP_HAL_Linux/Util.cpp
@ -1,4 +1,4 @@
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include <stdio.h>
 #include <stdarg.h>
--- a/libraries/AP_HAL_Linux/Util.h
+++ b/libraries/AP_HAL_Linux/Util.h
@ -2,7 +2,7 @@
 #ifndef __AP_HAL_LINUX_UTIL_H__
 #define __AP_HAL_LINUX_UTIL_H__

-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 #include "AP_HAL_Linux_Namespace.h"
 #include "ToneAlarmDriver.h"

--- a/libraries/AP_HAL_Linux/dsm.cpp
+++ b/libraries/AP_HAL_Linux/dsm.cpp
@ -39,7 +39,7 @@
 #include <stdint.h>
 #include <stdbool.h>

-#include <AP_Common.h>
+#include <AP_Common/AP_Common.h>

 #include "dsm.h"

--- a/libraries/AP_HAL_Linux/examples/BusTest/BusTest.cpp
+++ b/libraries/AP_HAL_Linux/examples/BusTest/BusTest.cpp
@ -4,14 +4,14 @@
 // scan I2C and SPI buses for expected devices
 //

-#include <AP_Common.h>
-#include <AP_Progmem.h>
-#include <AP_HAL.h>
-#include <AP_HAL_Linux.h>
-#include <AP_HAL_Empty.h>
-#include <AP_Math.h>
-#include <AP_Param.h>
-#include <StorageManager.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_Progmem/AP_Progmem.h>
+#include <AP_HAL/AP_HAL.h>
+#include <AP_HAL_Linux/AP_HAL_Linux.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>

 const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;