diff --git a/libraries/AP_HAL/examples/AnalogIn/AnalogIn.pde b/libraries/AP_HAL/examples/AnalogIn/AnalogIn.cpp
similarity index 100%
rename from libraries/AP_HAL/examples/AnalogIn/AnalogIn.pde
rename to libraries/AP_HAL/examples/AnalogIn/AnalogIn.cpp
diff --git a/libraries/AP_HAL/examples/AnalogIn/make.inc b/libraries/AP_HAL/examples/AnalogIn/make.inc
new file mode 100644
index 0000000000..96997580f4
--- /dev/null
+++ b/libraries/AP_HAL/examples/AnalogIn/make.inc
@@ -0,0 +1,10 @@
+LIBRARIES += AP_Common
+LIBRARIES += AP_HAL
+LIBRARIES += AP_HAL_AVR
+LIBRARIES += AP_HAL_Empty
+LIBRARIES += AP_HAL_PX4
+LIBRARIES += AP_HAL_SITL
+LIBRARIES += AP_Math
+LIBRARIES += AP_Param
+LIBRARIES += AP_Progmem
+LIBRARIES += StorageManager
diff --git a/libraries/AP_HAL/examples/Delay/make.inc b/libraries/AP_HAL/examples/Delay/make.inc
new file mode 100644
index 0000000000..2432a0a624
--- /dev/null
+++ b/libraries/AP_HAL/examples/Delay/make.inc
@@ -0,0 +1,27 @@
+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_HAL
+LIBRARIES += AP_HAL_AVR
+LIBRARIES += AP_HAL_Empty
+LIBRARIES += AP_HAL_PX4
+LIBRARIES += AP_InertialSensor
+LIBRARIES += AP_Math
+LIBRARIES += AP_Mission
+LIBRARIES += AP_Notify
+LIBRARIES += AP_Param
+LIBRARIES += AP_Progmem
+LIBRARIES += AP_Terrain
+LIBRARIES += AP_Vehicle
+LIBRARIES += DataFlash
+LIBRARIES += Filter
+LIBRARIES += GCS_MAVLink
+LIBRARIES += SITL
+LIBRARIES += StorageManager
diff --git a/libraries/AP_HAL/examples/Printf/Printf.pde b/libraries/AP_HAL/examples/Printf/Printf.cpp
similarity index 100%
rename from libraries/AP_HAL/examples/Printf/Printf.pde
rename to libraries/AP_HAL/examples/Printf/Printf.cpp
diff --git a/libraries/AP_HAL/examples/Printf/make.inc b/libraries/AP_HAL/examples/Printf/make.inc
new file mode 100644
index 0000000000..b20141d400
--- /dev/null
+++ b/libraries/AP_HAL/examples/Printf/make.inc
@@ -0,0 +1,32 @@
+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_HAL
+LIBRARIES += AP_HAL_AVR
+LIBRARIES += AP_HAL_Empty
+LIBRARIES += AP_HAL_Linux
+LIBRARIES += AP_HAL_PX4
+LIBRARIES += AP_HAL_SITL
+LIBRARIES += AP_InertialSensor
+LIBRARIES += AP_Math
+LIBRARIES += AP_Mission
+LIBRARIES += AP_NavEKF
+LIBRARIES += AP_Notify
+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 += SITL
+LIBRARIES += StorageManager
diff --git a/libraries/AP_HAL/examples/RCInput/RCInput.pde b/libraries/AP_HAL/examples/RCInput/RCInput.cpp
similarity index 100%
rename from libraries/AP_HAL/examples/RCInput/RCInput.pde
rename to libraries/AP_HAL/examples/RCInput/RCInput.cpp
diff --git a/libraries/AP_HAL/examples/RCInput/make.inc b/libraries/AP_HAL/examples/RCInput/make.inc
new file mode 100644
index 0000000000..5378923665
--- /dev/null
+++ b/libraries/AP_HAL/examples/RCInput/make.inc
@@ -0,0 +1,33 @@
+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_HAL
+LIBRARIES += AP_HAL_AVR
+LIBRARIES += AP_HAL_Empty
+LIBRARIES += AP_HAL_Linux
+LIBRARIES += AP_HAL_PX4
+LIBRARIES += AP_HAL_SITL
+LIBRARIES += AP_InertialSensor
+LIBRARIES += AP_Math
+LIBRARIES += AP_Mission
+LIBRARIES += AP_NavEKF
+LIBRARIES += AP_Notify
+LIBRARIES += AP_Param
+LIBRARIES += AP_Progmem
+LIBRARIES += AP_Rally
+LIBRARIES += AP_RangeFinder
+LIBRARIES += AP_Scheduler
+LIBRARIES += AP_Terrain
+LIBRARIES += AP_Vehicle
+LIBRARIES += DataFlash
+LIBRARIES += Filter
+LIBRARIES += GCS_MAVLink
+LIBRARIES += SITL
+LIBRARIES += StorageManager
diff --git a/libraries/AP_HAL/examples/RCInputToRCOutput/RCInputToRCOutput.pde b/libraries/AP_HAL/examples/RCInputToRCOutput/RCInputToRCOutput.cpp
similarity index 100%
rename from libraries/AP_HAL/examples/RCInputToRCOutput/RCInputToRCOutput.pde
rename to libraries/AP_HAL/examples/RCInputToRCOutput/RCInputToRCOutput.cpp
diff --git a/libraries/AP_HAL/examples/RCInputToRCOutput/make.inc b/libraries/AP_HAL/examples/RCInputToRCOutput/make.inc
new file mode 100644
index 0000000000..5378923665
--- /dev/null
+++ b/libraries/AP_HAL/examples/RCInputToRCOutput/make.inc
@@ -0,0 +1,33 @@
+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_HAL
+LIBRARIES += AP_HAL_AVR
+LIBRARIES += AP_HAL_Empty
+LIBRARIES += AP_HAL_Linux
+LIBRARIES += AP_HAL_PX4
+LIBRARIES += AP_HAL_SITL
+LIBRARIES += AP_InertialSensor
+LIBRARIES += AP_Math
+LIBRARIES += AP_Mission
+LIBRARIES += AP_NavEKF
+LIBRARIES += AP_Notify
+LIBRARIES += AP_Param
+LIBRARIES += AP_Progmem
+LIBRARIES += AP_Rally
+LIBRARIES += AP_RangeFinder
+LIBRARIES += AP_Scheduler
+LIBRARIES += AP_Terrain
+LIBRARIES += AP_Vehicle
+LIBRARIES += DataFlash
+LIBRARIES += Filter
+LIBRARIES += GCS_MAVLink
+LIBRARIES += SITL
+LIBRARIES += StorageManager
diff --git a/libraries/AP_HAL/examples/RCOutput/RCOutput.pde b/libraries/AP_HAL/examples/RCOutput/RCOutput.cpp
similarity index 100%
rename from libraries/AP_HAL/examples/RCOutput/RCOutput.pde
rename to libraries/AP_HAL/examples/RCOutput/RCOutput.cpp
diff --git a/libraries/AP_HAL/examples/RCOutput/make.inc b/libraries/AP_HAL/examples/RCOutput/make.inc
new file mode 100644
index 0000000000..5378923665
--- /dev/null
+++ b/libraries/AP_HAL/examples/RCOutput/make.inc
@@ -0,0 +1,33 @@
+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_HAL
+LIBRARIES += AP_HAL_AVR
+LIBRARIES += AP_HAL_Empty
+LIBRARIES += AP_HAL_Linux
+LIBRARIES += AP_HAL_PX4
+LIBRARIES += AP_HAL_SITL
+LIBRARIES += AP_InertialSensor
+LIBRARIES += AP_Math
+LIBRARIES += AP_Mission
+LIBRARIES += AP_NavEKF
+LIBRARIES += AP_Notify
+LIBRARIES += AP_Param
+LIBRARIES += AP_Progmem
+LIBRARIES += AP_Rally
+LIBRARIES += AP_RangeFinder
+LIBRARIES += AP_Scheduler
+LIBRARIES += AP_Terrain
+LIBRARIES += AP_Vehicle
+LIBRARIES += DataFlash
+LIBRARIES += Filter
+LIBRARIES += GCS_MAVLink
+LIBRARIES += SITL
+LIBRARIES += StorageManager
diff --git a/libraries/AP_HAL/examples/UART_test/UART_test.pde b/libraries/AP_HAL/examples/UART_test/UART_test.cpp
similarity index 100%
rename from libraries/AP_HAL/examples/UART_test/UART_test.pde
rename to libraries/AP_HAL/examples/UART_test/UART_test.cpp
diff --git a/libraries/AP_HAL/examples/UART_test/make.inc b/libraries/AP_HAL/examples/UART_test/make.inc
new file mode 100644
index 0000000000..5378923665
--- /dev/null
+++ b/libraries/AP_HAL/examples/UART_test/make.inc
@@ -0,0 +1,33 @@
+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_HAL
+LIBRARIES += AP_HAL_AVR
+LIBRARIES += AP_HAL_Empty
+LIBRARIES += AP_HAL_Linux
+LIBRARIES += AP_HAL_PX4
+LIBRARIES += AP_HAL_SITL
+LIBRARIES += AP_InertialSensor
+LIBRARIES += AP_Math
+LIBRARIES += AP_Mission
+LIBRARIES += AP_NavEKF
+LIBRARIES += AP_Notify
+LIBRARIES += AP_Param
+LIBRARIES += AP_Progmem
+LIBRARIES += AP_Rally
+LIBRARIES += AP_RangeFinder
+LIBRARIES += AP_Scheduler
+LIBRARIES += AP_Terrain
+LIBRARIES += AP_Vehicle
+LIBRARIES += DataFlash
+LIBRARIES += Filter
+LIBRARIES += GCS_MAVLink
+LIBRARIES += SITL
+LIBRARIES += StorageManager