diff --git a/libraries/AP_Math/examples/eulers/eulers.cpp b/libraries/AP_Math/examples/eulers/eulers.cpp
index 921932e85c..32e1360491 100644
--- a/libraries/AP_Math/examples/eulers/eulers.cpp
+++ b/libraries/AP_Math/examples/eulers/eulers.cpp
@@ -4,38 +4,7 @@
 //
 
 #include <AP_HAL/AP_HAL.h>
-#include <stdlib.h>
-#include <AP_Common/AP_Common.h>
-#include <AP_Progmem/AP_Progmem.h>
-#include <AP_Param/AP_Param.h>
-#include <AP_HAL_AVR/AP_HAL_AVR.h>
-#include <AP_HAL_SITL/AP_HAL_SITL.h>
-#include <AP_HAL_Empty/AP_HAL_Empty.h>
-#include <AP_HAL_PX4/AP_HAL_PX4.h>
-#include <AP_HAL_Linux/AP_HAL_Linux.h>
 #include <AP_Math/AP_Math.h>
-#include <Filter/Filter.h>
-#include <AP_ADC/AP_ADC.h>
-#include <SITL/SITL.h>
-#include <AP_Compass/AP_Compass.h>
-#include <AP_Baro/AP_Baro.h>
-#include <AP_Notify/AP_Notify.h>
-#include <AP_InertialSensor/AP_InertialSensor.h>
-#include <AP_GPS/AP_GPS.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_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_Rally/AP_Rally.h>
-#include <AP_BattMonitor/AP_BattMonitor.h>
-#include <AP_RangeFinder/AP_RangeFinder.h>
 
 const AP_HAL::HAL& hal = AP_HAL::get_HAL();
 
diff --git a/libraries/AP_Math/examples/location/location.cpp b/libraries/AP_Math/examples/location/location.cpp
index 26cc8f1394..f10554b919 100644
--- a/libraries/AP_Math/examples/location/location.cpp
+++ b/libraries/AP_Math/examples/location/location.cpp
@@ -3,39 +3,8 @@
 // Unit tests for the AP_Math polygon code
 //
 
-#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_Math/AP_Math.h>
-#include <Filter/Filter.h>
-#include <AP_ADC/AP_ADC.h>
-#include <AP_Notify/AP_Notify.h>
-#include <AP_InertialSensor/AP_InertialSensor.h>
-#include <AP_GPS/AP_GPS.h>
-#include <DataFlash/DataFlash.h>
-#include <AP_Baro/AP_Baro.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_Rally/AP_Rally.h>
-#include <AP_OpticalFlow/AP_OpticalFlow.h>
-
-#include <AP_HAL_AVR/AP_HAL_AVR.h>
-#include <AP_HAL_SITL/AP_HAL_SITL.h>
-#include <AP_HAL_Empty/AP_HAL_Empty.h>
-#include <AP_HAL_Linux/AP_HAL_Linux.h>
-#include <AP_AHRS/AP_AHRS.h>
-#include <SITL/SITL.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_BattMonitor/AP_BattMonitor.h>
-#include <AP_RangeFinder/AP_RangeFinder.h>
 
 const AP_HAL::HAL& hal = AP_HAL::get_HAL();
 
diff --git a/libraries/AP_Math/examples/polygon/make.inc b/libraries/AP_Math/examples/polygon/make.inc
index 5033b8b3fc..f667199307 100644
--- a/libraries/AP_Math/examples/polygon/make.inc
+++ b/libraries/AP_Math/examples/polygon/make.inc
@@ -1,5 +1,26 @@
+LIBRARIES += AP_ADC
+LIBRARIES += AP_ADC_AnalogSource
+LIBRARIES += AP_AHRS
+LIBRARIES += AP_Airspeed
+LIBRARIES += AP_Baro
+LIBRARIES += AP_BattMonitor
 LIBRARIES += AP_Common
+LIBRARIES += AP_Compass
+LIBRARIES += AP_Declination
+LIBRARIES += AP_GPS
+LIBRARIES += AP_InertialSensor
 LIBRARIES += AP_Math
+LIBRARIES += AP_Mission
+LIBRARIES += AP_NavEKF
+LIBRARIES += AP_Notify
+LIBRARIES += AP_OpticalFlow
 LIBRARIES += AP_Param
 LIBRARIES += AP_Progmem
+LIBRARIES += AP_Rally
+LIBRARIES += AP_RangeFinder
+LIBRARIES += AP_Terrain
+LIBRARIES += AP_Vehicle
+LIBRARIES += DataFlash
+LIBRARIES += Filter
+LIBRARIES += GCS_MAVLink
 LIBRARIES += StorageManager
diff --git a/libraries/AP_Math/examples/polygon/polygon.cpp b/libraries/AP_Math/examples/polygon/polygon.cpp
index ec6aa3946d..4ddd4f6298 100644
--- a/libraries/AP_Math/examples/polygon/polygon.cpp
+++ b/libraries/AP_Math/examples/polygon/polygon.cpp
@@ -3,14 +3,8 @@
 // Unit tests for the AP_Math polygon code
 //
 
-#include <AP_Common/AP_Common.h>
-#include <AP_Progmem/AP_Progmem.h>
-#include <AP_Param/AP_Param.h>
-#include <StorageManager/StorageManager.h>
-#include <AP_Math/AP_Math.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_Math/AP_Math.h>
 
 const AP_HAL::HAL& hal = AP_HAL::get_HAL();
 
diff --git a/libraries/AP_Math/examples/rotations/rotations.cpp b/libraries/AP_Math/examples/rotations/rotations.cpp
index 97495b8441..ae5909e02f 100644
--- a/libraries/AP_Math/examples/rotations/rotations.cpp
+++ b/libraries/AP_Math/examples/rotations/rotations.cpp
@@ -2,40 +2,9 @@
 //
 // Unit tests for the AP_Math rotations code
 //
+
 #include <AP_HAL/AP_HAL.h>
-#include <stdlib.h>
-#include <AP_Common/AP_Common.h>
-#include <AP_Progmem/AP_Progmem.h>
-#include <AP_Param/AP_Param.h>
-#include <AP_HAL_AVR/AP_HAL_AVR.h>
-#include <AP_HAL_SITL/AP_HAL_SITL.h>
-#include <AP_HAL_Empty/AP_HAL_Empty.h>
-#include <AP_HAL_PX4/AP_HAL_PX4.h>
-#include <AP_HAL_Linux/AP_HAL_Linux.h>
 #include <AP_Math/AP_Math.h>
-#include <Filter/Filter.h>
-#include <AP_ADC/AP_ADC.h>
-#include <SITL/SITL.h>
-#include <AP_Compass/AP_Compass.h>
-#include <AP_Baro/AP_Baro.h>
-#include <AP_Notify/AP_Notify.h>
-#include <AP_InertialSensor/AP_InertialSensor.h>
-#include <AP_GPS/AP_GPS.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> // ArduPilot Mega Declination Helper Library
-#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_Rally/AP_Rally.h>
-#include <AP_BattMonitor/AP_BattMonitor.h>
-#include <AP_RangeFinder/AP_RangeFinder.h>
-#include <AP_OpticalFlow/AP_OpticalFlow.h>
 
 const AP_HAL::HAL& hal = AP_HAL::get_HAL();