diff --git a/libraries/AP_GPS/AP_GPS_NMEA.cpp b/libraries/AP_GPS/AP_GPS_NMEA.cpp
index f6d603260b..5671c81679 100644
--- a/libraries/AP_GPS/AP_GPS_NMEA.cpp
+++ b/libraries/AP_GPS/AP_GPS_NMEA.cpp
@@ -27,7 +27,7 @@
 
 #include <AP_Common.h>
 
-#include <avr/pgmspace.h>
+#include <AP_Progmem.h>
 #include <ctype.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/libraries/AP_GPS/AP_GPS_NMEA.h b/libraries/AP_GPS/AP_GPS_NMEA.h
index 634d797f14..2a82bf01b2 100644
--- a/libraries/AP_GPS/AP_GPS_NMEA.h
+++ b/libraries/AP_GPS/AP_GPS_NMEA.h
@@ -44,7 +44,7 @@
 
 #include <AP_HAL.h>
 #include "GPS.h"
-#include <avr/pgmspace.h>
+#include <AP_Progmem.h>
 
 
 /// NMEA parser
diff --git a/libraries/AP_GPS/GPS.h b/libraries/AP_GPS/GPS.h
index b881bdbfe1..02ce6a49e3 100644
--- a/libraries/AP_GPS/GPS.h
+++ b/libraries/AP_GPS/GPS.h
@@ -9,7 +9,7 @@
 #include <AP_HAL.h>
 
 #include <inttypes.h>
-#include <avr/pgmspace.h>
+#include <AP_Progmem.h>
 
 /// @class	GPS
 /// @brief	Abstract base class for GPS receiver drivers.