From 2aba5319ed173d7d8c8678d236ff1821dbc86e64 Mon Sep 17 00:00:00 2001
From: Gustavo Jose de Sousa <gustavo.sousa@intel.com>
Date: Tue, 11 Aug 2015 16:28:44 +1000
Subject: [PATCH] AP_Motors: 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.
---
 libraries/AP_Motors/AP_MotorsCoax.cpp         |  4 +-
 libraries/AP_Motors/AP_MotorsCoax.h           |  6 +-
 libraries/AP_Motors/AP_MotorsHeli.cpp         |  2 +-
 libraries/AP_Motors/AP_MotorsHeli.h           |  6 +-
 libraries/AP_Motors/AP_MotorsHexa.h           |  6 +-
 libraries/AP_Motors/AP_MotorsMatrix.cpp       |  2 +-
 libraries/AP_Motors/AP_MotorsMatrix.h         |  6 +-
 libraries/AP_Motors/AP_MotorsMulticopter.cpp  |  2 +-
 libraries/AP_Motors/AP_MotorsOcta.h           |  6 +-
 libraries/AP_Motors/AP_MotorsOctaQuad.h       |  6 +-
 libraries/AP_Motors/AP_MotorsQuad.h           |  6 +-
 libraries/AP_Motors/AP_MotorsSingle.cpp       |  4 +-
 libraries/AP_Motors/AP_MotorsSingle.h         |  6 +-
 libraries/AP_Motors/AP_MotorsTri.cpp          |  4 +-
 libraries/AP_Motors/AP_MotorsTri.h            |  6 +-
 libraries/AP_Motors/AP_MotorsY6.h             |  8 +--
 libraries/AP_Motors/AP_Motors_Class.cpp       |  2 +-
 libraries/AP_Motors/AP_Motors_Class.h         | 12 ++--
 .../AP_Motors_Time_test.cpp                   | 64 +++++++++----------
 .../AP_Motors_test/AP_Motors_test.cpp         | 64 +++++++++----------
 20 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/libraries/AP_Motors/AP_MotorsCoax.cpp b/libraries/AP_Motors/AP_MotorsCoax.cpp
index 6921982096..ec120b1552 100644
--- a/libraries/AP_Motors/AP_MotorsCoax.cpp
+++ b/libraries/AP_Motors/AP_MotorsCoax.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include <AP_HAL.h>
-#include <AP_Math.h>
+#include <AP_HAL/AP_HAL.h>
+#include <AP_Math/AP_Math.h>
 #include "AP_MotorsCoax.h"
 
 extern const AP_HAL::HAL& hal;
diff --git a/libraries/AP_Motors/AP_MotorsCoax.h b/libraries/AP_Motors/AP_MotorsCoax.h
index 9be3527bba..68592d341f 100644
--- a/libraries/AP_Motors/AP_MotorsCoax.h
+++ b/libraries/AP_Motors/AP_MotorsCoax.h
@@ -6,9 +6,9 @@
 #ifndef __AP_MOTORS_COAX_H__
 #define __AP_MOTORS_COAX_H__
 
-#include <AP_Common.h>
-#include <AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
-#include <RC_Channel.h>     // RC Channel Library
+#include <AP_Common/AP_Common.h>
+#include <AP_Math/AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
+#include <RC_Channel/RC_Channel.h>     // RC Channel Library
 #include "AP_MotorsMulticopter.h"
 
 // feedback direction
diff --git a/libraries/AP_Motors/AP_MotorsHeli.cpp b/libraries/AP_Motors/AP_MotorsHeli.cpp
index 5c43d3e5f7..f401f2dfb2 100644
--- a/libraries/AP_Motors/AP_MotorsHeli.cpp
+++ b/libraries/AP_Motors/AP_MotorsHeli.cpp
@@ -20,7 +20,7 @@
  *
  */
 #include <stdlib.h>
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 #include "AP_MotorsHeli.h"
 
 extern const AP_HAL::HAL& hal;
diff --git a/libraries/AP_Motors/AP_MotorsHeli.h b/libraries/AP_Motors/AP_MotorsHeli.h
index fb05132fc3..76c75aee37 100644
--- a/libraries/AP_Motors/AP_MotorsHeli.h
+++ b/libraries/AP_Motors/AP_MotorsHeli.h
@@ -7,9 +7,9 @@
 #define __AP_MOTORS_HELI_H__
 
 #include <inttypes.h>
-#include <AP_Common.h>
-#include <AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
-#include <RC_Channel.h>     // RC Channel Library
+#include <AP_Common/AP_Common.h>
+#include <AP_Math/AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
+#include <RC_Channel/RC_Channel.h>     // RC Channel Library
 #include "AP_Motors.h"
 
 // maximum number of swashplate servos
diff --git a/libraries/AP_Motors/AP_MotorsHexa.h b/libraries/AP_Motors/AP_MotorsHexa.h
index 707d969f94..335d263385 100644
--- a/libraries/AP_Motors/AP_MotorsHexa.h
+++ b/libraries/AP_Motors/AP_MotorsHexa.h
@@ -6,9 +6,9 @@
 #ifndef __AP_MOTORS_HEXA_H__
 #define __AP_MOTORS_HEXA_H__
 
-#include <AP_Common.h>
-#include <AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
-#include <RC_Channel.h>     // RC Channel Library
+#include <AP_Common/AP_Common.h>
+#include <AP_Math/AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
+#include <RC_Channel/RC_Channel.h>     // RC Channel Library
 #include "AP_MotorsMatrix.h"    // Parent Motors Matrix library
 
 /// @class      AP_MotorsHexa
diff --git a/libraries/AP_Motors/AP_MotorsMatrix.cpp b/libraries/AP_Motors/AP_MotorsMatrix.cpp
index 8080e0ae47..9cc2d48d21 100644
--- a/libraries/AP_Motors/AP_MotorsMatrix.cpp
+++ b/libraries/AP_Motors/AP_MotorsMatrix.cpp
@@ -19,7 +19,7 @@
  *       Code by RandyMackay. DIYDrones.com
  *
  */
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 #include "AP_MotorsMatrix.h"
 
 extern const AP_HAL::HAL& hal;
diff --git a/libraries/AP_Motors/AP_MotorsMatrix.h b/libraries/AP_Motors/AP_MotorsMatrix.h
index c6ea90ff83..dbd571b008 100644
--- a/libraries/AP_Motors/AP_MotorsMatrix.h
+++ b/libraries/AP_Motors/AP_MotorsMatrix.h
@@ -6,9 +6,9 @@
 #ifndef __AP_MOTORS_MATRIX_H__
 #define __AP_MOTORS_MATRIX_H__
 
-#include <AP_Common.h>
-#include <AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
-#include <RC_Channel.h>     // RC Channel Library
+#include <AP_Common/AP_Common.h>
+#include <AP_Math/AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
+#include <RC_Channel/RC_Channel.h>     // RC Channel Library
 #include "AP_MotorsMulticopter.h"
 
 #define AP_MOTORS_MATRIX_YAW_FACTOR_CW   -1
diff --git a/libraries/AP_Motors/AP_MotorsMulticopter.cpp b/libraries/AP_Motors/AP_MotorsMulticopter.cpp
index c068d05ca1..9f44cef018 100644
--- a/libraries/AP_Motors/AP_MotorsMulticopter.cpp
+++ b/libraries/AP_Motors/AP_MotorsMulticopter.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "AP_MotorsMulticopter.h"
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 extern const AP_HAL::HAL& hal;
 
 // parameters for the motor class
diff --git a/libraries/AP_Motors/AP_MotorsOcta.h b/libraries/AP_Motors/AP_MotorsOcta.h
index 75df137d9c..d1b0cb40a1 100644
--- a/libraries/AP_Motors/AP_MotorsOcta.h
+++ b/libraries/AP_Motors/AP_MotorsOcta.h
@@ -6,9 +6,9 @@
 #ifndef __AP_MOTORS_OCTA_H__
 #define __AP_MOTORS_OCTA_H__
 
-#include <AP_Common.h>
-#include <AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
-#include <RC_Channel.h>     // RC Channel Library
+#include <AP_Common/AP_Common.h>
+#include <AP_Math/AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
+#include <RC_Channel/RC_Channel.h>     // RC Channel Library
 #include "AP_MotorsMatrix.h"    // Parent Motors Matrix library
 
 /// @class      AP_MotorsOcta
diff --git a/libraries/AP_Motors/AP_MotorsOctaQuad.h b/libraries/AP_Motors/AP_MotorsOctaQuad.h
index 1b05a9a204..50a3ce0c27 100644
--- a/libraries/AP_Motors/AP_MotorsOctaQuad.h
+++ b/libraries/AP_Motors/AP_MotorsOctaQuad.h
@@ -6,9 +6,9 @@
 #ifndef __AP_MOTORS_OCTA_QUAD_H__
 #define __AP_MOTORS_OCTA_QUAD_H__
 
-#include <AP_Common.h>
-#include <AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
-#include <RC_Channel.h>     // RC Channel Library
+#include <AP_Common/AP_Common.h>
+#include <AP_Math/AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
+#include <RC_Channel/RC_Channel.h>     // RC Channel Library
 #include "AP_MotorsMatrix.h"   // Parent Motors Matrix library
 
 /// @class      AP_MotorsOcta
diff --git a/libraries/AP_Motors/AP_MotorsQuad.h b/libraries/AP_Motors/AP_MotorsQuad.h
index 2d01b4cedf..394bdeeb89 100644
--- a/libraries/AP_Motors/AP_MotorsQuad.h
+++ b/libraries/AP_Motors/AP_MotorsQuad.h
@@ -6,9 +6,9 @@
 #ifndef __AP_MOTORS_QUAD_H__
 #define __AP_MOTORS_QUAD_H__
 
-#include <AP_Common.h>
-#include <AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
-#include <RC_Channel.h>     // RC Channel Library
+#include <AP_Common/AP_Common.h>
+#include <AP_Math/AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
+#include <RC_Channel/RC_Channel.h>     // RC Channel Library
 #include "AP_MotorsMatrix.h"    // Parent Motors Matrix library
 
 /// @class      AP_MotorsQuad
diff --git a/libraries/AP_Motors/AP_MotorsSingle.cpp b/libraries/AP_Motors/AP_MotorsSingle.cpp
index 780a8cbf0c..70d03b586d 100644
--- a/libraries/AP_Motors/AP_MotorsSingle.cpp
+++ b/libraries/AP_Motors/AP_MotorsSingle.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include <AP_HAL.h>
-#include <AP_Math.h>
+#include <AP_HAL/AP_HAL.h>
+#include <AP_Math/AP_Math.h>
 #include "AP_MotorsSingle.h"
 
 extern const AP_HAL::HAL& hal;
diff --git a/libraries/AP_Motors/AP_MotorsSingle.h b/libraries/AP_Motors/AP_MotorsSingle.h
index e0de2ea135..167e620710 100644
--- a/libraries/AP_Motors/AP_MotorsSingle.h
+++ b/libraries/AP_Motors/AP_MotorsSingle.h
@@ -6,9 +6,9 @@
 #ifndef __AP_MOTORS_SING_H__
 #define __AP_MOTORS_SING_H__
 
-#include <AP_Common.h>
-#include <AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
-#include <RC_Channel.h>     // RC Channel Library
+#include <AP_Common/AP_Common.h>
+#include <AP_Math/AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
+#include <RC_Channel/RC_Channel.h>     // RC Channel Library
 #include "AP_MotorsMulticopter.h"
 
 // feedback direction
diff --git a/libraries/AP_Motors/AP_MotorsTri.cpp b/libraries/AP_Motors/AP_MotorsTri.cpp
index 3cfaacafa8..efe4f98e7d 100644
--- a/libraries/AP_Motors/AP_MotorsTri.cpp
+++ b/libraries/AP_Motors/AP_MotorsTri.cpp
@@ -19,8 +19,8 @@
  *       Code by RandyMackay. DIYDrones.com
  *
  */
-#include <AP_HAL.h>
-#include <AP_Math.h>
+#include <AP_HAL/AP_HAL.h>
+#include <AP_Math/AP_Math.h>
 #include "AP_MotorsTri.h"
 
 extern const AP_HAL::HAL& hal;
diff --git a/libraries/AP_Motors/AP_MotorsTri.h b/libraries/AP_Motors/AP_MotorsTri.h
index 303f00d6b3..2699b60775 100644
--- a/libraries/AP_Motors/AP_MotorsTri.h
+++ b/libraries/AP_Motors/AP_MotorsTri.h
@@ -6,9 +6,9 @@
 #ifndef __AP_MOTORS_TRI_H__
 #define __AP_MOTORS_TRI_H__
 
-#include <AP_Common.h>
-#include <AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
-#include <RC_Channel.h>     // RC Channel Library
+#include <AP_Common/AP_Common.h>
+#include <AP_Math/AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
+#include <RC_Channel/RC_Channel.h>     // RC Channel Library
 #include "AP_MotorsMulticopter.h"
 
 // tail servo uses channel 7
diff --git a/libraries/AP_Motors/AP_MotorsY6.h b/libraries/AP_Motors/AP_MotorsY6.h
index 88d86c9e32..d582246955 100644
--- a/libraries/AP_Motors/AP_MotorsY6.h
+++ b/libraries/AP_Motors/AP_MotorsY6.h
@@ -6,10 +6,10 @@
 #ifndef __AP_MOTORS_Y6_H__
 #define __AP_MOTORS_Y6_H__
 
-#include <AP_Common.h>
-#include <AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
-#include <RC_Channel.h>     // RC Channel Library
-#include <AP_MotorsMatrix.h>    // Parent Motors Matrix library
+#include <AP_Common/AP_Common.h>
+#include <AP_Math/AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
+#include <RC_Channel/RC_Channel.h>     // RC Channel Library
+#include "AP_MotorsMatrix.h"    // Parent Motors Matrix library
 
 #define AP_MOTORS_Y6_YAW_DIRECTION 1    // this really should be a user selectable parameter
 
diff --git a/libraries/AP_Motors/AP_Motors_Class.cpp b/libraries/AP_Motors/AP_Motors_Class.cpp
index 7f5568c870..03918e899e 100644
--- a/libraries/AP_Motors/AP_Motors_Class.cpp
+++ b/libraries/AP_Motors/AP_Motors_Class.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "AP_Motors_Class.h"
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 extern const AP_HAL::HAL& hal;
 
 // initialise motor map
diff --git a/libraries/AP_Motors/AP_Motors_Class.h b/libraries/AP_Motors/AP_Motors_Class.h
index 6a6912f7b7..99fba4bb41 100644
--- a/libraries/AP_Motors/AP_Motors_Class.h
+++ b/libraries/AP_Motors/AP_Motors_Class.h
@@ -3,12 +3,12 @@
 #ifndef __AP_MOTORS_CLASS_H__
 #define __AP_MOTORS_CLASS_H__
 
-#include <AP_Common.h>
-#include <AP_Progmem.h>
-#include <AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
-#include <AP_Notify.h>      // Notify library
-#include <RC_Channel.h>     // RC Channel Library
-#include <Filter.h>         // filter library
+#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_Notify/AP_Notify.h>      // Notify library
+#include <RC_Channel/RC_Channel.h>     // RC Channel Library
+#include <Filter/Filter.h>         // filter library
 
 // offsets for motors in motor_out, _motor_filtered and _motor_to_channel_map arrays
 #define AP_MOTORS_MOT_1 0
diff --git a/libraries/AP_Motors/examples/AP_Motors_Time_test/AP_Motors_Time_test.cpp b/libraries/AP_Motors/examples/AP_Motors_Time_test/AP_Motors_Time_test.cpp
index 1c01ce9721..8b690d7d4b 100644
--- a/libraries/AP_Motors/examples/AP_Motors_Time_test/AP_Motors_Time_test.cpp
+++ b/libraries/AP_Motors/examples/AP_Motors_Time_test/AP_Motors_Time_test.cpp
@@ -4,38 +4,38 @@
  */
 
 // Libraries
-#include <AP_Common.h>
-#include <AP_Progmem.h>
-#include <AP_Param.h>
-#include <AP_HAL.h>
-#include <AP_HAL_AVR.h>
-#include <AP_HAL_PX4.h>
-#include <AP_HAL_Linux.h>
-#include <AP_HAL_Empty.h>
-#include <AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
-#include <RC_Channel.h>     // RC Channel Library
-#include <AP_Motors.h>
-#include <AP_Curve.h>
-#include <AP_Notify.h>
-#include <AP_GPS.h>
-#include <DataFlash.h>
-#include <AP_InertialSensor.h>
-#include <AP_ADC.h>
-#include <GCS_MAVLink.h>
-#include <AP_Baro.h>
-#include <Filter.h>
-#include <AP_AHRS.h>
-#include <AP_Compass.h>
-#include <AP_Declination.h>
-#include <AP_Airspeed.h>
-#include <AP_Vehicle.h>
-#include <AP_ADC_AnalogSource.h>
-#include <AP_Mission.h>
-#include <StorageManager.h>
-#include <AP_Terrain.h>
-#include <AP_NavEKF.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_HAL/AP_HAL.h>
+#include <AP_HAL_AVR/AP_HAL_AVR.h>
+#include <AP_HAL_PX4/AP_HAL_PX4.h>
+#include <AP_HAL_Linux/AP_HAL_Linux.h>
+#include <AP_HAL_Empty/AP_HAL_Empty.h>
+#include <AP_Math/AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
+#include <RC_Channel/RC_Channel.h>     // RC Channel Library
+#include <AP_Motors/AP_Motors.h>
+#include <AP_Curve/AP_Curve.h>
+#include <AP_Notify/AP_Notify.h>
+#include <AP_GPS/AP_GPS.h>
+#include <DataFlash/DataFlash.h>
+#include <AP_InertialSensor/AP_InertialSensor.h>
+#include <AP_ADC/AP_ADC.h>
+#include <GCS_MAVLink/GCS_MAVLink.h>
+#include <AP_Baro/AP_Baro.h>
+#include <Filter/Filter.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_Vehicle/AP_Vehicle.h>
+#include <AP_ADC_AnalogSource/AP_ADC_AnalogSource.h>
+#include <AP_Mission/AP_Mission.h>
+#include <StorageManager/StorageManager.h>
+#include <AP_Terrain/AP_Terrain.h>
+#include <AP_NavEKF/AP_NavEKF.h>
+#include <AP_BattMonitor/AP_BattMonitor.h>
+#include <AP_RangeFinder/AP_RangeFinder.h>
 
 const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;
 
diff --git a/libraries/AP_Motors/examples/AP_Motors_test/AP_Motors_test.cpp b/libraries/AP_Motors/examples/AP_Motors_test/AP_Motors_test.cpp
index c591aed9af..89d6a1fe0f 100644
--- a/libraries/AP_Motors/examples/AP_Motors_test/AP_Motors_test.cpp
+++ b/libraries/AP_Motors/examples/AP_Motors_test/AP_Motors_test.cpp
@@ -4,38 +4,38 @@
  */
 
 // Libraries
-#include <AP_Common.h>
-#include <AP_Progmem.h>
-#include <AP_Param.h>
-#include <AP_HAL.h>
-#include <AP_HAL_AVR.h>
-#include <AP_HAL_PX4.h>
-#include <AP_HAL_Linux.h>
-#include <AP_HAL_Empty.h>
-#include <AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
-#include <RC_Channel.h>     // RC Channel Library
-#include <AP_Motors.h>
-#include <AP_Curve.h>
-#include <AP_Notify.h>
-#include <AP_GPS.h>
-#include <DataFlash.h>
-#include <AP_InertialSensor.h>
-#include <AP_ADC.h>
-#include <GCS_MAVLink.h>
-#include <AP_Baro.h>
-#include <Filter.h>
-#include <AP_AHRS.h>
-#include <AP_Compass.h>
-#include <AP_Declination.h>
-#include <AP_Airspeed.h>
-#include <AP_Vehicle.h>
-#include <AP_ADC_AnalogSource.h>
-#include <AP_Mission.h>
-#include <StorageManager.h>
-#include <AP_Terrain.h>
-#include <AP_NavEKF.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_HAL/AP_HAL.h>
+#include <AP_HAL_AVR/AP_HAL_AVR.h>
+#include <AP_HAL_PX4/AP_HAL_PX4.h>
+#include <AP_HAL_Linux/AP_HAL_Linux.h>
+#include <AP_HAL_Empty/AP_HAL_Empty.h>
+#include <AP_Math/AP_Math.h>        // ArduPilot Mega Vector/Matrix math Library
+#include <RC_Channel/RC_Channel.h>     // RC Channel Library
+#include <AP_Motors/AP_Motors.h>
+#include <AP_Curve/AP_Curve.h>
+#include <AP_Notify/AP_Notify.h>
+#include <AP_GPS/AP_GPS.h>
+#include <DataFlash/DataFlash.h>
+#include <AP_InertialSensor/AP_InertialSensor.h>
+#include <AP_ADC/AP_ADC.h>
+#include <GCS_MAVLink/GCS_MAVLink.h>
+#include <AP_Baro/AP_Baro.h>
+#include <Filter/Filter.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_Vehicle/AP_Vehicle.h>
+#include <AP_ADC_AnalogSource/AP_ADC_AnalogSource.h>
+#include <AP_Mission/AP_Mission.h>
+#include <StorageManager/StorageManager.h>
+#include <AP_Terrain/AP_Terrain.h>
+#include <AP_NavEKF/AP_NavEKF.h>
+#include <AP_BattMonitor/AP_BattMonitor.h>
+#include <AP_RangeFinder/AP_RangeFinder.h>
 
 const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;