diff --git a/libraries/AP_GPS/examples/GPS_406_test/GPS_406_test.pde b/libraries/AP_GPS/examples/GPS_406_test/GPS_406_test.pde
index 8ffadd5680..533f27a635 100644
--- a/libraries/AP_GPS/examples/GPS_406_test/GPS_406_test.pde
+++ b/libraries/AP_GPS/examples/GPS_406_test/GPS_406_test.pde
@@ -1,3 +1,4 @@
+// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: t -*-
 /*
 	Example of GPS 406 library.
 	Code by Jordi Munoz and Jose Julio. DIYDrones.com
@@ -6,7 +7,7 @@
 */
 
 #include <FastSerial.h>
-#include <AP_GPS_406.h>
+#include <AP_GPS.h>
 #include <stdio.h>
 
 FastSerialPort0(Serial);
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 bda3b85229..2af983ab9f 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
@@ -1,3 +1,4 @@
+// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: t -*-
 /*
 	Example of GPS MTK library.
 	Code by Jordi Munoz and Jose Julio. DIYDrones.com
@@ -6,7 +7,7 @@
 */
 
 #include <FastSerial.h>
-#include <AP_GPS_MTK.h>
+#include <AP_GPS.h>
 #include <stdio.h>
 
 FastSerialPort0(Serial);
diff --git a/libraries/AP_GPS/examples/GPS_NMEA_test/GPS_NMEA_test.pde b/libraries/AP_GPS/examples/GPS_NMEA_test/GPS_NMEA_test.pde
index dd6fe2e323..3ecfd595f5 100644
--- a/libraries/AP_GPS/examples/GPS_NMEA_test/GPS_NMEA_test.pde
+++ b/libraries/AP_GPS/examples/GPS_NMEA_test/GPS_NMEA_test.pde
@@ -5,7 +5,7 @@
 
 #include <FastSerial.h>
 #include <AP_Common.h>
-#include <AP_GPS_NMEA.h>
+#include <AP_GPS.h>
 #include <stdio.h>
 
 FastSerialPort0(Serial);
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 43eb239495..f40aba2254 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
@@ -1,3 +1,4 @@
+// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: t -*-
 /*
 	Example of GPS UBlox library.
 	Code by Jordi Munoz and Jose Julio. DIYDrones.com
@@ -6,8 +7,8 @@
 */
 
 #include <FastSerial.h>
-#include <AP_GPS_UBLOX.h>
-#include <stdio.h>
+#include <AP_Common.h>
+#include <AP_GPS.h>
 
 FastSerialPort0(Serial);
 FastSerialPort1(Serial1);