diff --git a/conf/airframes/examples/quadrotor_lisa_mx.xml b/conf/airframes/examples/quadrotor_lisa_mx.xml
index f9bb619787..30341971ab 100644
--- a/conf/airframes/examples/quadrotor_lisa_mx.xml
+++ b/conf/airframes/examples/quadrotor_lisa_mx.xml
@@ -17,7 +17,6 @@
 
     <target name="nps" board="pc">
       <module name="fdm" type="jsbsim"/>
-      <module name="gps" type="nps"/>
     </target>
 
     <module name="radio_control" type="spektrum">
diff --git a/conf/modules/gps_furuno.xml b/conf/modules/gps_furuno.xml
index fd45e7febc..d1d128dbf9 100644
--- a/conf/modules/gps_furuno.xml
+++ b/conf/modules/gps_furuno.xml
@@ -10,6 +10,8 @@
     <configure name="FURUNO_GPS_BAUD" value="B38400" description="UART baud rate"/>
     <configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
   </doc>
+  <autoload name="gps_nps"/>
+  <autoload name="gps_sim"/>
   <header>
     <file name="gps.h" dir="subsystems"/>
   </header>
diff --git a/conf/modules/gps_mediatek_diy.xml b/conf/modules/gps_mediatek_diy.xml
index f5cf63fbea..5d6c20b6e0 100644
--- a/conf/modules/gps_mediatek_diy.xml
+++ b/conf/modules/gps_mediatek_diy.xml
@@ -10,6 +10,8 @@
     <configure name="MTK_GPS_BAUD" value="B38400" description="UART baud rate"/>
     <configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
   </doc>
+  <autoload name="gps_nps"/>
+  <autoload name="gps_sim"/>
   <header>
     <file name="gps.h" dir="subsystems"/>
   </header>
diff --git a/conf/modules/gps_nmea.xml b/conf/modules/gps_nmea.xml
index 1a4767516c..0b65a81ab1 100644
--- a/conf/modules/gps_nmea.xml
+++ b/conf/modules/gps_nmea.xml
@@ -10,6 +10,8 @@
     <configure name="NMEA_GPS_BAUD" value="B38400" description="UART baud rate"/>
     <configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
   </doc>
+  <autoload name="gps_nps"/>
+  <autoload name="gps_sim"/>
   <header>
     <file name="gps.h" dir="subsystems"/>
   </header>
diff --git a/conf/modules/gps_piksi.xml b/conf/modules/gps_piksi.xml
index 5c6299e900..8634ded256 100644
--- a/conf/modules/gps_piksi.xml
+++ b/conf/modules/gps_piksi.xml
@@ -10,6 +10,8 @@
     <configure name="PIKSI_GPS_BAUD" value="B115200" description="UART baud rate"/>
     <configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
   </doc>
+  <autoload name="gps_nps"/>
+  <autoload name="gps_sim"/>
   <header>
     <file name="gps.h" dir="subsystems"/>
   </header>
diff --git a/conf/modules/gps_sim_hitl.xml b/conf/modules/gps_sim_hitl.xml
index dae6752746..f5526ddafb 100644
--- a/conf/modules/gps_sim_hitl.xml
+++ b/conf/modules/gps_sim_hitl.xml
@@ -8,6 +8,7 @@
     </description>
     <configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
   </doc>
+  <autoload name="gps_nps"/>
   <header>
     <file name="gps.h" dir="subsystems"/>
   </header>
diff --git a/conf/modules/gps_sirf.xml b/conf/modules/gps_sirf.xml
index accd551147..2902b7b3d0 100644
--- a/conf/modules/gps_sirf.xml
+++ b/conf/modules/gps_sirf.xml
@@ -10,6 +10,8 @@
     <configure name="SIRF_GPS_BAUD" value="B38400" description="UART baud rate"/>
     <configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
   </doc>
+  <autoload name="gps_nps"/>
+  <autoload name="gps_sim"/>
   <header>
     <file name="gps.h" dir="subsystems"/>
   </header>
diff --git a/conf/modules/gps_skytraq.xml b/conf/modules/gps_skytraq.xml
index 18aea9ee74..0c13944868 100644
--- a/conf/modules/gps_skytraq.xml
+++ b/conf/modules/gps_skytraq.xml
@@ -10,6 +10,8 @@
     <configure name="SKYTRAQ_GPS_BAUD" value="B38400" description="UART baud rate"/>
     <configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
   </doc>
+  <autoload name="gps_nps"/>
+  <autoload name="gps_sim"/>
   <header>
     <file name="gps.h" dir="subsystems"/>
   </header>
diff --git a/conf/modules/gps_ublox.xml b/conf/modules/gps_ublox.xml
index 70184ef175..52e2402434 100644
--- a/conf/modules/gps_ublox.xml
+++ b/conf/modules/gps_ublox.xml
@@ -10,6 +10,8 @@
     <configure name="UBX_GPS_BAUD" value="B38400" description="UART baud rate"/>
     <configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
   </doc>
+  <autoload name="gps_nps"/>
+  <autoload name="gps_sim"/>
   <header>
     <file name="gps.h" dir="subsystems"/>
   </header>
diff --git a/conf/modules/gps_udp.xml b/conf/modules/gps_udp.xml
index 32fca4c882..6a4866b6a9 100644
--- a/conf/modules/gps_udp.xml
+++ b/conf/modules/gps_udp.xml
@@ -9,6 +9,8 @@
     <define name="GPS_UDP_HOST" value="192.168.1.2" description="host sending GPS messages"/>
     <configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
   </doc>
+  <autoload name="gps_nps"/>
+  <autoload name="gps_sim"/>
   <header>
     <file name="gps.h" dir="subsystems"/>
   </header>