diff --git a/Makefile b/Makefile
index decd865b2..4350bba43 100644
--- a/Makefile
+++ b/Makefile
@@ -649,6 +649,7 @@ HIGHEND_SRC = \
             cms/cms_menu_osd.c \
             cms/cms_menu_vtx.c \
             common/colorconversion.c \
+            common/gps_conversion.c \
             drivers/display_ug2864hsweg01.c \
             drivers/light_ws2811strip.c \
             drivers/serial_escserial.c \
@@ -656,7 +657,6 @@ HIGHEND_SRC = \
             drivers/sonar_hcsr04.c \
             drivers/vtx_common.c \
             flight/navigation.c \
-            flight/gps_conversion.c \
             io/dashboard.c \
             io/displayport_max7456.c \
             io/displayport_msp.c \
diff --git a/src/main/flight/gps_conversion.c b/src/main/common/gps_conversion.c
similarity index 100%
rename from src/main/flight/gps_conversion.c
rename to src/main/common/gps_conversion.c
diff --git a/src/main/flight/gps_conversion.h b/src/main/common/gps_conversion.h
similarity index 100%
rename from src/main/flight/gps_conversion.h
rename to src/main/common/gps_conversion.h
diff --git a/src/main/flight/navigation.c b/src/main/flight/navigation.c
index dffd45689..fc1c4a144 100644
--- a/src/main/flight/navigation.c
+++ b/src/main/flight/navigation.c
@@ -27,6 +27,7 @@
 #include "build/debug.h"
 
 #include "common/axis.h"
+#include "common/gps_conversion.h"
 #include "common/maths.h"
 #include "common/time.h"
 
@@ -36,21 +37,20 @@
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
-#include "sensors/sensors.h"
-#include "sensors/boardalignment.h"
-#include "sensors/acceleration.h"
+#include "flight/imu.h"
+#include "flight/navigation.h"
+#include "flight/pid.h"
 
 #include "io/beeper.h"
 #include "io/serial.h"
 #include "io/gps.h"
 
-#include "flight/pid.h"
-#include "flight/navigation.h"
-#include "flight/gps_conversion.h"
-#include "flight/imu.h"
-
 #include "rx/rx.h"
 
+#include "sensors/acceleration.h"
+#include "sensors/boardalignment.h"
+#include "sensors/sensors.h"
+
 
 extern int16_t magHold;
 
diff --git a/src/main/io/gps.c b/src/main/io/gps.c
index c4925d8f4..9cae15f26 100755
--- a/src/main/io/gps.c
+++ b/src/main/io/gps.c
@@ -29,27 +29,27 @@
 #include "build/build_config.h"
 #include "build/debug.h"
 
-#include "common/maths.h"
 #include "common/axis.h"
+#include "common/gps_conversion.h"
+#include "common/maths.h"
 #include "common/utils.h"
 
-#include "drivers/system.h"
+#include "config/feature.h"
+
 #include "drivers/light_led.h"
+#include "drivers/system.h"
 
-#include "sensors/sensors.h"
-
-#include "io/serial.h"
 #include "io/dashboard.h"
 #include "io/gps.h"
-
-#include "flight/gps_conversion.h"
-#include "flight/pid.h"
-#include "flight/navigation.h"
+#include "io/serial.h"
 
 #include "fc/config.h"
 #include "fc/runtime_config.h"
 
-#include "config/feature.h"
+#include "flight/navigation.h"
+#include "flight/pid.h"
+
+#include "sensors/sensors.h"
 
 #define LOG_ERROR        '?'
 #define LOG_IGNORED      '!'