diff --git a/sw/airborne/subsystems/gps.h b/sw/airborne/subsystems/gps.h
index 09c87aa3ff..94aba411a2 100644
--- a/sw/airborne/subsystems/gps.h
+++ b/sw/airborne/subsystems/gps.h
@@ -146,13 +146,14 @@ extern struct GpsState gps;
 typedef void (*ImplGpsInit)(void);
 typedef void (*ImplGpsEvent)(void);
 
-#ifdef PRIMARY_GPS_TYPE_H
-  void GpsEvent(void);
-  /*
-   * register callbacks and state pointers
-   */ 
-  extern void gps_register_impl(ImplGpsInit init, ImplGpsEvent event, uint8_t id, int8_t instance);
 
+void GpsEvent(void);
+/*
+ * register callbacks and state pointers
+ */ 
+extern void gps_register_impl(ImplGpsInit init, ImplGpsEvent event, uint8_t id, int8_t instance);
+
+#ifdef PRIMARY_GPS_TYPE_H
 #include PRIMARY_GPS_TYPE_H
 #endif
 #ifdef SECONDARY_GPS_TYPE_H