diff --git a/libraries/AP_Motors/examples/AP_Motors_test/AP_Motors_test.pde b/libraries/AP_Motors/examples/AP_Motors_test/AP_Motors_test.pde
index 72fc375375..3b955adcf0 100644
--- a/libraries/AP_Motors/examples/AP_Motors_test/AP_Motors_test.pde
+++ b/libraries/AP_Motors/examples/AP_Motors_test/AP_Motors_test.pde
@@ -42,7 +42,7 @@ Arduino_Mega_ISR_Registry isr_registry;
 //APM_RC_APM1 APM_RC;
 APM_RC_APM2 APM_RC;
 
-RC_Channel rc1, rc2, rc3, rc4;
+RC_Channel rc1(CH_1), rc2(CH_2), rc3(CH_3), rc4(CH_4);
 
 // uncomment the row below depending upon what frame you are using
 //AP_MotorsTri	motors(AP_MOTORS_APM1, &APM_RC, &rc1, &rc2, &rc3, &rc4);
diff --git a/libraries/AP_RangeFinder/examples/AP_RangeFinder_test/AP_RangeFinder_test.pde b/libraries/AP_RangeFinder/examples/AP_RangeFinder_test/AP_RangeFinder_test.pde
index ed8fbe9374..13d4217356 100644
--- a/libraries/AP_RangeFinder/examples/AP_RangeFinder_test/AP_RangeFinder_test.pde
+++ b/libraries/AP_RangeFinder/examples/AP_RangeFinder_test/AP_RangeFinder_test.pde
@@ -13,6 +13,7 @@
 #include <AP_ADC.h>                             // ArduPilot Mega Analog to Digital Converter Library
 #include <AP_AnalogSource.h>
 #include <ModeFilter.h>                 // mode filter
+#include <AP_Buffer.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // Serial ports
@@ -57,7 +58,6 @@ void setup()
     timer_scheduler.init(&isr_registry);
 
 #ifdef USE_ADC_ADS7844
-    adc.filter_result = true;
     adc.Init(&timer_scheduler);   // APM ADC initialization
     aRF.calculate_scaler(SONAR_TYPE,3.3);   // setup scaling for sonar
 #else
diff --git a/libraries/Filter/examples/Derivative/Derivative.pde b/libraries/Filter/examples/Derivative/Derivative.pde
index 4ab1733c2b..8638faa508 100644
--- a/libraries/Filter/examples/Derivative/Derivative.pde
+++ b/libraries/Filter/examples/Derivative/Derivative.pde
@@ -7,6 +7,7 @@
 #include <AP_Math.h>
 #include <Filter.h>
 #include <DerivativeFilter.h>
+#include <AP_Buffer.h>
 
 #ifdef DESKTOP_BUILD
 // all of this is needed to build with SITL
@@ -24,6 +25,7 @@
  #include <I2C.h>
  #include <SPI.h>
  #include <AP_Declination.h>
+ #include <AP_Semaphore.h>
 Arduino_Mega_ISR_Registry isr_registry;
 AP_Baro_BMP085_HIL barometer;
 AP_Compass_HIL compass;
diff --git a/libraries/Filter/examples/Filter/Filter.pde b/libraries/Filter/examples/Filter/Filter.pde
index cddac9f413..c8526d42f2 100644
--- a/libraries/Filter/examples/Filter/Filter.pde
+++ b/libraries/Filter/examples/Filter/Filter.pde
@@ -9,6 +9,7 @@
 #include <Filter.h>                     // Filter library
 #include <ModeFilter.h>         // ModeFilter class (inherits from Filter class)
 #include <AverageFilter.h>      // AverageFilter class (inherits from Filter class)
+#include <AP_Buffer.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // Serial ports
diff --git a/libraries/Filter/examples/LowPassFilter/LowPassFilter.pde b/libraries/Filter/examples/LowPassFilter/LowPassFilter.pde
index 589f7ac816..8a4cdbcfed 100644
--- a/libraries/Filter/examples/LowPassFilter/LowPassFilter.pde
+++ b/libraries/Filter/examples/LowPassFilter/LowPassFilter.pde
@@ -8,6 +8,7 @@
 #include <AP_Math.h>            // ArduPilot Mega Vector/Matrix math Library
 #include <Filter.h>                     // Filter library
 #include <LowPassFilter.h>      // LowPassFilter class (inherits from Filter class)
+#include <AP_Buffer.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // Serial ports