diff --git a/libraries/AP_Baro/AP_Baro.cpp b/libraries/AP_Baro/AP_Baro.cpp index ffc6d8977a..e85ddd8683 100644 --- a/libraries/AP_Baro/AP_Baro.cpp +++ b/libraries/AP_Baro/AP_Baro.cpp @@ -19,10 +19,10 @@ * */ -#include <AP_Math.h> -#include <AP_Common.h> -#include <AP_Baro.h> -#include <AP_HAL.h> +#include <AP_Math/AP_Math.h> +#include <AP_Common/AP_Common.h> +#include "AP_Baro.h" +#include <AP_HAL/AP_HAL.h> extern const AP_HAL::HAL& hal; diff --git a/libraries/AP_Baro/AP_Baro.h b/libraries/AP_Baro/AP_Baro.h index 00d035ad6f..71ee54c54c 100644 --- a/libraries/AP_Baro/AP_Baro.h +++ b/libraries/AP_Baro/AP_Baro.h @@ -3,10 +3,10 @@ #ifndef __AP_BARO_H__ #define __AP_BARO_H__ -#include <AP_HAL.h> -#include <AP_Param.h> -#include <Filter.h> -#include <DerivativeFilter.h> +#include <AP_HAL/AP_HAL.h> +#include <AP_Param/AP_Param.h> +#include <Filter/Filter.h> +#include <Filter/DerivativeFilter.h> // maximum number of sensor instances #if HAL_CPU_CLASS == HAL_CPU_CLASS_16 diff --git a/libraries/AP_Baro/AP_Baro_BMP085.cpp b/libraries/AP_Baro/AP_Baro_BMP085.cpp index c52e591531..a43e454907 100644 --- a/libraries/AP_Baro/AP_Baro_BMP085.cpp +++ b/libraries/AP_Baro/AP_Baro_BMP085.cpp @@ -20,8 +20,8 @@ Substantially modified by Andrew Tridgell */ -#include <AP_HAL.h> -#include <AP_Common.h> +#include <AP_HAL/AP_HAL.h> +#include <AP_Common/AP_Common.h> #include "AP_Baro.h" diff --git a/libraries/AP_Baro/AP_Baro_Backend.cpp b/libraries/AP_Baro/AP_Baro_Backend.cpp index 13f32c9bbe..2d165206fd 100644 --- a/libraries/AP_Baro/AP_Baro_Backend.cpp +++ b/libraries/AP_Baro/AP_Baro_Backend.cpp @@ -1,6 +1,6 @@ /// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- -#include <AP_Baro.h> +#include "AP_Baro.h" extern const AP_HAL::HAL& hal; diff --git a/libraries/AP_Baro/AP_Baro_HIL.cpp b/libraries/AP_Baro/AP_Baro_HIL.cpp index 24f95bbe46..e223e68779 100644 --- a/libraries/AP_Baro/AP_Baro_HIL.cpp +++ b/libraries/AP_Baro/AP_Baro_HIL.cpp @@ -1,7 +1,7 @@ /// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- -#include <AP_Baro.h> -#include <AP_HAL.h> +#include "AP_Baro.h" +#include <AP_HAL/AP_HAL.h> extern const AP_HAL::HAL& hal; diff --git a/libraries/AP_Baro/AP_Baro_MS5611.cpp b/libraries/AP_Baro/AP_Baro_MS5611.cpp index f71e882ede..3aa88e2125 100644 --- a/libraries/AP_Baro/AP_Baro_MS5611.cpp +++ b/libraries/AP_Baro/AP_Baro_MS5611.cpp @@ -20,7 +20,7 @@ Heavily modified by Andrew Tridgell */ -#include <AP_HAL.h> +#include <AP_HAL/AP_HAL.h> #include "AP_Baro.h" extern const AP_HAL::HAL& hal; diff --git a/libraries/AP_Baro/AP_Baro_MS5611.h b/libraries/AP_Baro/AP_Baro_MS5611.h index 9644067497..f6ddc61b5c 100644 --- a/libraries/AP_Baro/AP_Baro_MS5611.h +++ b/libraries/AP_Baro/AP_Baro_MS5611.h @@ -3,7 +3,7 @@ #ifndef __AP_BARO_MS5611_H__ #define __AP_BARO_MS5611_H__ -#include <AP_HAL.h> +#include <AP_HAL/AP_HAL.h> #include "AP_Baro.h" /** Abstract serial bus device driver for I2C/SPI. */ diff --git a/libraries/AP_Baro/AP_Baro_PX4.cpp b/libraries/AP_Baro/AP_Baro_PX4.cpp index 0ddc172fe4..607230da77 100644 --- a/libraries/AP_Baro/AP_Baro_PX4.cpp +++ b/libraries/AP_Baro/AP_Baro_PX4.cpp @@ -1,9 +1,9 @@ /// -*- 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_PX4 || CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN -#include <AP_Baro.h> +#include "AP_Baro.h" #include "AP_Baro_PX4.h" #include <sys/types.h> diff --git a/libraries/AP_Baro/examples/BARO_generic/BARO_generic.cpp b/libraries/AP_Baro/examples/BARO_generic/BARO_generic.cpp index d672f9dd96..c0dd507799 100644 --- a/libraries/AP_Baro/examples/BARO_generic/BARO_generic.cpp +++ b/libraries/AP_Baro/examples/BARO_generic/BARO_generic.cpp @@ -1,40 +1,40 @@ /* generic Baro driver test */ -#include <AP_Common.h> -#include <AP_Progmem.h> -#include <AP_Param.h> -#include <AP_Math.h> -#include <AP_HAL.h> -#include <AP_Buffer.h> -#include <Filter.h> -#include <AP_Baro.h> -#include <AP_Notify.h> -#include <AP_GPS.h> -#include <GCS_MAVLink.h> -#include <AP_Vehicle.h> -#include <DataFlash.h> -#include <AP_InertialSensor.h> -#include <AP_Mission.h> -#include <StorageManager.h> -#include <AP_Terrain.h> -#include <AP_ADC.h> -#include <AP_ADC_AnalogSource.h> -#include <AP_AHRS.h> -#include <AP_Compass.h> -#include <AP_Declination.h> -#include <AP_Airspeed.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_Rally.h> -#include <AP_NavEKF.h> -#include <AP_Scheduler.h> -#include <AP_BattMonitor.h> -#include <AP_RangeFinder.h> +#include <AP_Common/AP_Common.h> +#include <AP_Progmem/AP_Progmem.h> +#include <AP_Param/AP_Param.h> +#include <AP_Math/AP_Math.h> +#include <AP_HAL/AP_HAL.h> +#include <AP_Buffer/AP_Buffer.h> +#include <Filter/Filter.h> +#include <AP_Baro/AP_Baro.h> +#include <AP_Notify/AP_Notify.h> +#include <AP_GPS/AP_GPS.h> +#include <GCS_MAVLink/GCS_MAVLink.h> +#include <AP_Vehicle/AP_Vehicle.h> +#include <DataFlash/DataFlash.h> +#include <AP_InertialSensor/AP_InertialSensor.h> +#include <AP_Mission/AP_Mission.h> +#include <StorageManager/StorageManager.h> +#include <AP_Terrain/AP_Terrain.h> +#include <AP_ADC/AP_ADC.h> +#include <AP_ADC_AnalogSource/AP_ADC_AnalogSource.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_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_Rally/AP_Rally.h> +#include <AP_NavEKF/AP_NavEKF.h> +#include <AP_Scheduler/AP_Scheduler.h> +#include <AP_BattMonitor/AP_BattMonitor.h> +#include <AP_RangeFinder/AP_RangeFinder.h> const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;