From a4f1f6a5db9981bc8dea0d28c91eb0c768f251c5 Mon Sep 17 00:00:00 2001
From: Pat Hickey <pat@galois.com>
Date: Fri, 26 Oct 2012 20:55:17 -0700
Subject: [PATCH] AP_Progmem: fix dependencies for all sketches touched by
 AP_HAL_AVR

---
 APMrover2/APMrover2.pde                                       | 1 +
 ArduCopter/ArduCopter.pde                                     | 1 +
 ArduPlane/ArduPlane.pde                                       | 1 +
 libraries/AC_PID/examples/AC_PID_test/AC_PID_test.pde         | 2 +-
 libraries/AP_ADC/examples/AP_ADC_test/AP_ADC_test.pde         | 3 +--
 libraries/AP_Airspeed/examples/Airspeed/Airspeed.pde          | 1 +
 .../examples/AP_Baro_BMP085_test/AP_Baro_BMP085_test.pde      | 3 +++
 .../examples/AP_Baro_MS5611_test/AP_Baro_MS5611_test.pde      | 1 +
 libraries/AP_Common/c++.cpp                                   | 2 --
 .../AP_Compass/examples/AP_Compass_test/AP_Compass_test.pde   | 4 +---
 .../examples/AP_Declination_test/AP_Declination_test.pde      | 1 +
 libraries/AP_GPS/examples/GPS_AUTO_test/GPS_AUTO_test.pde     | 1 +
 libraries/AP_GPS/examples/GPS_MTK_test/GPS_MTK_test.pde       | 1 +
 libraries/AP_GPS/examples/GPS_UBLOX_test/GPS_UBLOX_test.pde   | 1 +
 libraries/AP_HAL_AVR/Console.h                                | 1 -
 libraries/AP_HAL_AVR/UARTDriver.cpp                           | 1 -
 libraries/AP_HAL_AVR/UARTDriver.h                             | 1 -
 libraries/AP_HAL_AVR/examples/APM1/APM1.pde                   | 3 +--
 libraries/AP_HAL_AVR/examples/AnalogIn/AnalogIn.pde           | 3 +--
 libraries/AP_HAL_AVR/examples/Blink/Blink.pde                 | 3 +--
 libraries/AP_HAL_AVR/examples/Console/Console.pde             | 3 +--
 libraries/AP_HAL_AVR/examples/DataflashTest/DataflashTest.pde | 3 +--
 libraries/AP_HAL_AVR/examples/FastSerial/FastSerial.pde       | 3 +--
 .../examples/I2CDriver_HMC5883L/I2CDriver_HMC5883L.pde        | 3 +--
 libraries/AP_HAL_AVR/examples/LCDTest/LCDTest.pde             | 3 +--
 libraries/AP_HAL_AVR/examples/RCInputTest/RCInputTest.pde     | 3 +--
 .../examples/RCPassthroughTest/RCPassthroughTest.pde          | 3 +--
 .../examples/SPIDriver_MPU6000/SPIDriver_MPU6000.pde          | 3 +--
 libraries/AP_HAL_AVR/examples/Scheduler/Scheduler.pde         | 3 +--
 libraries/AP_HAL_AVR/examples/Storage/Storage.pde             | 3 +--
 libraries/AP_InertialSensor/examples/MPU6000/MPU6000.pde      | 1 +
 .../AP_LeadFilter/examples/AP_LeadFilter/AP_LeadFilter.pde    | 1 +
 libraries/AP_Math/examples/eulers/eulers.pde                  | 1 +
 libraries/AP_Math/examples/location/location.pde              | 1 +
 libraries/AP_Math/examples/polygon/polygon.pde                | 1 +
 libraries/AP_Math/examples/rotations/rotations.pde            | 3 ++-
 libraries/Filter/examples/Derivative/Derivative.pde           | 1 +
 libraries/Filter/examples/Filter/Filter.pde                   | 1 +
 libraries/Filter/examples/LowPassFilter/LowPassFilter.pde     | 1 +
 libraries/GCS_Console/examples/Console/Console.pde            | 1 +
 40 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/APMrover2/APMrover2.pde b/APMrover2/APMrover2.pde
index 865c0b5c8c..9bd5e3c25f 100644
--- a/APMrover2/APMrover2.pde
+++ b/APMrover2/APMrover2.pde
@@ -78,6 +78,7 @@ version 2.1 of the License, or (at your option) any later version.
 // Libraries
 #include <FastSerial.h>
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Menu.h>
 #include <AP_Param.h>
 #include <Arduino_Mega_ISR_Registry.h>
diff --git a/ArduCopter/ArduCopter.pde b/ArduCopter/ArduCopter.pde
index de3be2a05d..1866c5dfab 100644
--- a/ArduCopter/ArduCopter.pde
+++ b/ArduCopter/ArduCopter.pde
@@ -64,6 +64,7 @@
 // Libraries
 #include <FastSerial.h>
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Menu.h>
 #include <AP_Param.h>
 #include <Arduino_Mega_ISR_Registry.h>
diff --git a/ArduPlane/ArduPlane.pde b/ArduPlane/ArduPlane.pde
index a0de0b0f9a..eb257f2c28 100644
--- a/ArduPlane/ArduPlane.pde
+++ b/ArduPlane/ArduPlane.pde
@@ -27,6 +27,7 @@
 // Libraries
 #include <FastSerial.h>
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Menu.h>
 #include <AP_Param.h>
 #include <Arduino_Mega_ISR_Registry.h>
diff --git a/libraries/AC_PID/examples/AC_PID_test/AC_PID_test.pde b/libraries/AC_PID/examples/AC_PID_test/AC_PID_test.pde
index 2140b694e7..3ab8494232 100644
--- a/libraries/AC_PID/examples/AC_PID_test/AC_PID_test.pde
+++ b/libraries/AC_PID/examples/AC_PID_test/AC_PID_test.pde
@@ -4,7 +4,7 @@
  */
 
 #include <AP_Common.h>
-
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 #include <AP_Math.h>
diff --git a/libraries/AP_ADC/examples/AP_ADC_test/AP_ADC_test.pde b/libraries/AP_ADC/examples/AP_ADC_test/AP_ADC_test.pde
index 57f8c29183..4cffab7775 100644
--- a/libraries/AP_ADC/examples/AP_ADC_test/AP_ADC_test.pde
+++ b/libraries/AP_ADC/examples/AP_ADC_test/AP_ADC_test.pde
@@ -7,8 +7,7 @@
 #include <math.h>
 
 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 
diff --git a/libraries/AP_Airspeed/examples/Airspeed/Airspeed.pde b/libraries/AP_Airspeed/examples/Airspeed/Airspeed.pde
index aad45ccf64..811225cf80 100644
--- a/libraries/AP_Airspeed/examples/Airspeed/Airspeed.pde
+++ b/libraries/AP_Airspeed/examples/Airspeed/Airspeed.pde
@@ -9,6 +9,7 @@
  */
 
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_Math.h>
 #include <AP_HAL.h>
diff --git a/libraries/AP_Baro/examples/AP_Baro_BMP085_test/AP_Baro_BMP085_test.pde b/libraries/AP_Baro/examples/AP_Baro_BMP085_test/AP_Baro_BMP085_test.pde
index 291e4697e9..9da3a059ee 100644
--- a/libraries/AP_Baro/examples/AP_Baro_BMP085_test/AP_Baro_BMP085_test.pde
+++ b/libraries/AP_Baro/examples/AP_Baro_BMP085_test/AP_Baro_BMP085_test.pde
@@ -3,6 +3,7 @@
  *       Code by Jordi MuÒoz and Jose Julio. DIYDrones.com
  */
 
+
 #include <FastSerial.h>
 #include <AP_Common.h>
 #include <I2C.h>
@@ -12,6 +13,8 @@
 #include <Arduino_Mega_ISR_Registry.h>
 #include <AP_PeriodicProcess.h>
 #include <AP_InertialSensor.h>
+#include <math.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_Math.h>
 #include <AP_HAL.h>
diff --git a/libraries/AP_Baro/examples/AP_Baro_MS5611_test/AP_Baro_MS5611_test.pde b/libraries/AP_Baro/examples/AP_Baro_MS5611_test/AP_Baro_MS5611_test.pde
index 8d6e3b0173..fcff193ed9 100644
--- a/libraries/AP_Baro/examples/AP_Baro_MS5611_test/AP_Baro_MS5611_test.pde
+++ b/libraries/AP_Baro/examples/AP_Baro_MS5611_test/AP_Baro_MS5611_test.pde
@@ -1,5 +1,6 @@
 
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_Math.h>
 #include <AP_HAL.h>
diff --git a/libraries/AP_Common/c++.cpp b/libraries/AP_Common/c++.cpp
index b104b8a70c..a80f65781f 100644
--- a/libraries/AP_Common/c++.cpp
+++ b/libraries/AP_Common/c++.cpp
@@ -8,8 +8,6 @@
 //
 
 #include <stdlib.h>
-#include <stdint.h>
-#include "c++.h"
 
 void * operator new(size_t size)
 {
diff --git a/libraries/AP_Compass/examples/AP_Compass_test/AP_Compass_test.pde b/libraries/AP_Compass/examples/AP_Compass_test/AP_Compass_test.pde
index 175e8caedd..304beb469c 100644
--- a/libraries/AP_Compass/examples/AP_Compass_test/AP_Compass_test.pde
+++ b/libraries/AP_Compass/examples/AP_Compass_test/AP_Compass_test.pde
@@ -4,6 +4,7 @@
  */
 
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
@@ -12,9 +13,6 @@
 #include <AP_Declination.h>
 #include <AP_Compass.h> // Compass Library
 
-#define ToRad(x) (x*0.01745329252)  // *pi/180
-#define ToDeg(x) (x*57.2957795131)  // *180/pi
-
 const AP_HAL::HAL& hal = AP_HAL_AVR_APM2;
 
 AP_Compass_HMC5843 compass;
diff --git a/libraries/AP_Declination/examples/AP_Declination_test/AP_Declination_test.pde b/libraries/AP_Declination/examples/AP_Declination_test/AP_Declination_test.pde
index 1eb3954dd5..3f30ca9bbe 100644
--- a/libraries/AP_Declination/examples/AP_Declination_test/AP_Declination_test.pde
+++ b/libraries/AP_Declination/examples/AP_Declination_test/AP_Declination_test.pde
@@ -1,6 +1,7 @@
 /// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_HAL.h>
 #include <AP_Math.h>
diff --git a/libraries/AP_GPS/examples/GPS_AUTO_test/GPS_AUTO_test.pde b/libraries/AP_GPS/examples/GPS_AUTO_test/GPS_AUTO_test.pde
index 89b716a4db..34da387879 100644
--- a/libraries/AP_GPS/examples/GPS_AUTO_test/GPS_AUTO_test.pde
+++ b/libraries/AP_GPS/examples/GPS_AUTO_test/GPS_AUTO_test.pde
@@ -6,6 +6,7 @@
 #include <stdlib.h>
 
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
diff --git a/libraries/AP_GPS/examples/GPS_MTK_test/GPS_MTK_test.pde b/libraries/AP_GPS/examples/GPS_MTK_test/GPS_MTK_test.pde
index ff26658f41..eb6a2432d4 100644
--- a/libraries/AP_GPS/examples/GPS_MTK_test/GPS_MTK_test.pde
+++ b/libraries/AP_GPS/examples/GPS_MTK_test/GPS_MTK_test.pde
@@ -8,6 +8,7 @@
 
 #include <stdlib.h>
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
diff --git a/libraries/AP_GPS/examples/GPS_UBLOX_test/GPS_UBLOX_test.pde b/libraries/AP_GPS/examples/GPS_UBLOX_test/GPS_UBLOX_test.pde
index b6499a95bd..3b3c869779 100644
--- a/libraries/AP_GPS/examples/GPS_UBLOX_test/GPS_UBLOX_test.pde
+++ b/libraries/AP_GPS/examples/GPS_UBLOX_test/GPS_UBLOX_test.pde
@@ -8,6 +8,7 @@
 
 #include <stdlib.h>
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
diff --git a/libraries/AP_HAL_AVR/Console.h b/libraries/AP_HAL_AVR/Console.h
index 41b924403e..56b5a63ac3 100644
--- a/libraries/AP_HAL_AVR/Console.h
+++ b/libraries/AP_HAL_AVR/Console.h
@@ -4,7 +4,6 @@
 
 #include <stdlib.h>
 
-#include <AP_Common.h>
 #include <AP_HAL.h>
 #include "AP_HAL_AVR_Namespace.h"
 
diff --git a/libraries/AP_HAL_AVR/UARTDriver.cpp b/libraries/AP_HAL_AVR/UARTDriver.cpp
index 369bd685ba..afb92ff61e 100644
--- a/libraries/AP_HAL_AVR/UARTDriver.cpp
+++ b/libraries/AP_HAL_AVR/UARTDriver.cpp
@@ -14,7 +14,6 @@
 
 #include <avr/pgmspace.h>
 
-#include <AP_Common.h>
 #include <AP_HAL.h>
 
 #include "vprintf.h"
diff --git a/libraries/AP_HAL_AVR/UARTDriver.h b/libraries/AP_HAL_AVR/UARTDriver.h
index 6a23c47cba..f2b21a1085 100644
--- a/libraries/AP_HAL_AVR/UARTDriver.h
+++ b/libraries/AP_HAL_AVR/UARTDriver.h
@@ -7,7 +7,6 @@
 
 #include <avr/interrupt.h>
 
-#include <AP_Common.h>
 #include <AP_HAL.h>
 #include "AP_HAL_AVR_Namespace.h"
 
diff --git a/libraries/AP_HAL_AVR/examples/APM1/APM1.pde b/libraries/AP_HAL_AVR/examples/APM1/APM1.pde
index ad7136afc6..403aca3a3c 100644
--- a/libraries/AP_HAL_AVR/examples/APM1/APM1.pde
+++ b/libraries/AP_HAL_AVR/examples/APM1/APM1.pde
@@ -1,7 +1,6 @@
 
 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 
diff --git a/libraries/AP_HAL_AVR/examples/AnalogIn/AnalogIn.pde b/libraries/AP_HAL_AVR/examples/AnalogIn/AnalogIn.pde
index d5044ce843..50f2caa5db 100644
--- a/libraries/AP_HAL_AVR/examples/AnalogIn/AnalogIn.pde
+++ b/libraries/AP_HAL_AVR/examples/AnalogIn/AnalogIn.pde
@@ -1,7 +1,6 @@
 
 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 
diff --git a/libraries/AP_HAL_AVR/examples/Blink/Blink.pde b/libraries/AP_HAL_AVR/examples/Blink/Blink.pde
index 02a1662e90..f426b11eb0 100644
--- a/libraries/AP_HAL_AVR/examples/Blink/Blink.pde
+++ b/libraries/AP_HAL_AVR/examples/Blink/Blink.pde
@@ -1,7 +1,6 @@
 
 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 
diff --git a/libraries/AP_HAL_AVR/examples/Console/Console.pde b/libraries/AP_HAL_AVR/examples/Console/Console.pde
index 1d288afee0..9fe4c27a99 100644
--- a/libraries/AP_HAL_AVR/examples/Console/Console.pde
+++ b/libraries/AP_HAL_AVR/examples/Console/Console.pde
@@ -7,8 +7,7 @@
 //
 
 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 
diff --git a/libraries/AP_HAL_AVR/examples/DataflashTest/DataflashTest.pde b/libraries/AP_HAL_AVR/examples/DataflashTest/DataflashTest.pde
index 448de2e68e..71cd8d4d8b 100644
--- a/libraries/AP_HAL_AVR/examples/DataflashTest/DataflashTest.pde
+++ b/libraries/AP_HAL_AVR/examples/DataflashTest/DataflashTest.pde
@@ -1,7 +1,6 @@
 
 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 
diff --git a/libraries/AP_HAL_AVR/examples/FastSerial/FastSerial.pde b/libraries/AP_HAL_AVR/examples/FastSerial/FastSerial.pde
index 97d79f3ec5..185b31d386 100644
--- a/libraries/AP_HAL_AVR/examples/FastSerial/FastSerial.pde
+++ b/libraries/AP_HAL_AVR/examples/FastSerial/FastSerial.pde
@@ -7,8 +7,7 @@
 //
 
 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 
diff --git a/libraries/AP_HAL_AVR/examples/I2CDriver_HMC5883L/I2CDriver_HMC5883L.pde b/libraries/AP_HAL_AVR/examples/I2CDriver_HMC5883L/I2CDriver_HMC5883L.pde
index 3dcec23462..739f23db5a 100644
--- a/libraries/AP_HAL_AVR/examples/I2CDriver_HMC5883L/I2CDriver_HMC5883L.pde
+++ b/libraries/AP_HAL_AVR/examples/I2CDriver_HMC5883L/I2CDriver_HMC5883L.pde
@@ -5,9 +5,8 @@
 *******************************************/
 
 #include <AP_Common.h>
-#include <AP_Param.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
-#include <AP_Math.h>
 #include <AP_HAL_AVR.h>
 
 const AP_HAL_AVR::HAL_AVR& hal = AP_HAL_AVR_APM2;
diff --git a/libraries/AP_HAL_AVR/examples/LCDTest/LCDTest.pde b/libraries/AP_HAL_AVR/examples/LCDTest/LCDTest.pde
index 3e71890214..e34d1899a6 100644
--- a/libraries/AP_HAL_AVR/examples/LCDTest/LCDTest.pde
+++ b/libraries/AP_HAL_AVR/examples/LCDTest/LCDTest.pde
@@ -38,8 +38,7 @@
 // include the library code:
 
 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 
diff --git a/libraries/AP_HAL_AVR/examples/RCInputTest/RCInputTest.pde b/libraries/AP_HAL_AVR/examples/RCInputTest/RCInputTest.pde
index 6dc912ce0f..ae8263c071 100644
--- a/libraries/AP_HAL_AVR/examples/RCInputTest/RCInputTest.pde
+++ b/libraries/AP_HAL_AVR/examples/RCInputTest/RCInputTest.pde
@@ -1,7 +1,6 @@
 
 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 
diff --git a/libraries/AP_HAL_AVR/examples/RCPassthroughTest/RCPassthroughTest.pde b/libraries/AP_HAL_AVR/examples/RCPassthroughTest/RCPassthroughTest.pde
index fd6399e223..08545d3de0 100644
--- a/libraries/AP_HAL_AVR/examples/RCPassthroughTest/RCPassthroughTest.pde
+++ b/libraries/AP_HAL_AVR/examples/RCPassthroughTest/RCPassthroughTest.pde
@@ -1,7 +1,6 @@
 
 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 
diff --git a/libraries/AP_HAL_AVR/examples/SPIDriver_MPU6000/SPIDriver_MPU6000.pde b/libraries/AP_HAL_AVR/examples/SPIDriver_MPU6000/SPIDriver_MPU6000.pde
index edb629cd93..f00f40ba07 100644
--- a/libraries/AP_HAL_AVR/examples/SPIDriver_MPU6000/SPIDriver_MPU6000.pde
+++ b/libraries/AP_HAL_AVR/examples/SPIDriver_MPU6000/SPIDriver_MPU6000.pde
@@ -5,8 +5,7 @@
 *******************************************/
 
 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 
diff --git a/libraries/AP_HAL_AVR/examples/Scheduler/Scheduler.pde b/libraries/AP_HAL_AVR/examples/Scheduler/Scheduler.pde
index 4d6e87d4dc..03a934c722 100644
--- a/libraries/AP_HAL_AVR/examples/Scheduler/Scheduler.pde
+++ b/libraries/AP_HAL_AVR/examples/Scheduler/Scheduler.pde
@@ -1,7 +1,6 @@
 
 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 
diff --git a/libraries/AP_HAL_AVR/examples/Storage/Storage.pde b/libraries/AP_HAL_AVR/examples/Storage/Storage.pde
index 0eef614a71..9d4f11f27a 100644
--- a/libraries/AP_HAL_AVR/examples/Storage/Storage.pde
+++ b/libraries/AP_HAL_AVR/examples/Storage/Storage.pde
@@ -1,7 +1,6 @@
 
 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 
diff --git a/libraries/AP_InertialSensor/examples/MPU6000/MPU6000.pde b/libraries/AP_InertialSensor/examples/MPU6000/MPU6000.pde
index 74aa14f7d8..d13256bed7 100644
--- a/libraries/AP_InertialSensor/examples/MPU6000/MPU6000.pde
+++ b/libraries/AP_InertialSensor/examples/MPU6000/MPU6000.pde
@@ -6,6 +6,7 @@
 
 #include <stdarg.h>
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 #include <AP_Math.h>
diff --git a/libraries/AP_LeadFilter/examples/AP_LeadFilter/AP_LeadFilter.pde b/libraries/AP_LeadFilter/examples/AP_LeadFilter/AP_LeadFilter.pde
index 498c50c200..69e92ac56f 100644
--- a/libraries/AP_LeadFilter/examples/AP_LeadFilter/AP_LeadFilter.pde
+++ b/libraries/AP_LeadFilter/examples/AP_LeadFilter/AP_LeadFilter.pde
@@ -6,6 +6,7 @@
  */
 
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_Math.h>
 #include <AP_HAL.h>
diff --git a/libraries/AP_Math/examples/eulers/eulers.pde b/libraries/AP_Math/examples/eulers/eulers.pde
index fe29b991b3..f25cc75557 100644
--- a/libraries/AP_Math/examples/eulers/eulers.pde
+++ b/libraries/AP_Math/examples/eulers/eulers.pde
@@ -5,6 +5,7 @@
 
 #include <stdlib.h>
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_Math.h>
 #include <AP_HAL.h>
diff --git a/libraries/AP_Math/examples/location/location.pde b/libraries/AP_Math/examples/location/location.pde
index c9a11a8701..4ba71225f9 100644
--- a/libraries/AP_Math/examples/location/location.pde
+++ b/libraries/AP_Math/examples/location/location.pde
@@ -4,6 +4,7 @@
 //
 
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_HAL.h>
 #include <AP_Math.h>
diff --git a/libraries/AP_Math/examples/polygon/polygon.pde b/libraries/AP_Math/examples/polygon/polygon.pde
index a52f964e86..9d61026920 100644
--- a/libraries/AP_Math/examples/polygon/polygon.pde
+++ b/libraries/AP_Math/examples/polygon/polygon.pde
@@ -4,6 +4,7 @@
 //
 
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_Math.h>
 #include <AP_HAL.h>
diff --git a/libraries/AP_Math/examples/rotations/rotations.pde b/libraries/AP_Math/examples/rotations/rotations.pde
index 0fc7630aac..187190811a 100644
--- a/libraries/AP_Math/examples/rotations/rotations.pde
+++ b/libraries/AP_Math/examples/rotations/rotations.pde
@@ -4,8 +4,9 @@
 //
 #include <stdlib.h>
 #include <AP_Common.h>
-#include <AP_HAL.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
+#include <AP_HAL.h>
 #include <AP_Math.h>
 #include <AP_Declination.h> // ArduPilot Mega Declination Helper Library
 
diff --git a/libraries/Filter/examples/Derivative/Derivative.pde b/libraries/Filter/examples/Derivative/Derivative.pde
index e3fec5b6b9..011d3c98d5 100644
--- a/libraries/Filter/examples/Derivative/Derivative.pde
+++ b/libraries/Filter/examples/Derivative/Derivative.pde
@@ -4,6 +4,7 @@
 
 #include <stdlib.h>
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 #include <AP_Param.h>
diff --git a/libraries/Filter/examples/Filter/Filter.pde b/libraries/Filter/examples/Filter/Filter.pde
index 3177b82a52..a6d4c1f7ad 100644
--- a/libraries/Filter/examples/Filter/Filter.pde
+++ b/libraries/Filter/examples/Filter/Filter.pde
@@ -4,6 +4,7 @@
  */
 
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 
diff --git a/libraries/Filter/examples/LowPassFilter/LowPassFilter.pde b/libraries/Filter/examples/LowPassFilter/LowPassFilter.pde
index 8f0d90a71a..258ea3c037 100644
--- a/libraries/Filter/examples/LowPassFilter/LowPassFilter.pde
+++ b/libraries/Filter/examples/LowPassFilter/LowPassFilter.pde
@@ -4,6 +4,7 @@
  */
 
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 #include <AP_Param.h>
diff --git a/libraries/GCS_Console/examples/Console/Console.pde b/libraries/GCS_Console/examples/Console/Console.pde
index 059f0e495a..8fcd623c96 100644
--- a/libraries/GCS_Console/examples/Console/Console.pde
+++ b/libraries/GCS_Console/examples/Console/Console.pde
@@ -7,6 +7,7 @@
 //
 
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>