diff --git a/lib/gui/src/mainScr.cpp b/lib/gui/src/mainScr.cpp
index 8fd876ea..ba7ffd27 100644
--- a/lib/gui/src/mainScr.cpp
+++ b/lib/gui/src/mainScr.cpp
@@ -46,9 +46,7 @@ lv_obj_t *satTrackTile;
 lv_obj_t *btnFullScreen;
 lv_obj_t *btnZoomIn;
 lv_obj_t *btnZoomOut;
-lv_obj_t *nameNav;
-lv_obj_t *latNav;
-lv_obj_t *lonNav;
+
 
 /**
  * @brief Update compass screen event
diff --git a/lib/gui/src/mainScr.hpp b/lib/gui/src/mainScr.hpp
index 94ea7907..c1dce932 100644
--- a/lib/gui/src/mainScr.hpp
+++ b/lib/gui/src/mainScr.hpp
@@ -17,8 +17,8 @@
 #include "buttonBar.hpp"
 #include "renderMaps.hpp"
 #include "vectorMaps.hpp"
-#include "navWpt.hpp"
 #include "addWaypoint.hpp"
+#include "navWpt.hpp"
 
 static lv_timer_t *mainTimer;    // Main Screen Timer
 #define UPDATE_MAINSCR_PERIOD 30 // Main Screen update time
@@ -74,14 +74,6 @@ extern lv_obj_t *longitude;
 extern lv_obj_t *altitude;
 extern lv_obj_t *speedLabel;
 
-/**
- * @brief Navigation Tile screen objects
- *
- */
- extern lv_obj_t *nameNav;
- extern lv_obj_t *latNav;
- extern lv_obj_t *lonNav;
-
 /**
  * @brief Satellite Tracking Tile screen objects
  *
diff --git a/lib/navigation/src/navWpt.cpp b/lib/navigation/src/navWpt.cpp
index 3df6e597..54ae716f 100644
--- a/lib/navigation/src/navWpt.cpp
+++ b/lib/navigation/src/navWpt.cpp
@@ -8,6 +8,10 @@
 
  #include "navWpt.hpp"
 
+lv_obj_t *nameNav;
+lv_obj_t *latNav;
+lv_obj_t *lonNav;
+
  /**
  * @brief Update navigation screen
  *
diff --git a/lib/navigation/src/navWpt.hpp b/lib/navigation/src/navWpt.hpp
index 574b1955..812ef1f9 100644
--- a/lib/navigation/src/navWpt.hpp
+++ b/lib/navigation/src/navWpt.hpp
@@ -9,20 +9,20 @@
 #ifndef NAVWPT_HPP
 #define NAVWPT_HPP
 
-// #include "lvgl.h"
-// #include "lvglFuncs.hpp"
-// #include "tft.hpp"
-// #include "gps."
-// #include "globalGuiDef.h"
-// #include "gpsMath.hpp"
-// #include "mainScr.hpp"
+#include "lvgl.h"
+#include "addWaypoint.hpp"
+#include "gpsMath.hpp"
 
-#include <Arduino.h>
-#include "tft.hpp"
-#include "compass.hpp"
-#include "settings.hpp"
-#include "globalMapsDef.h"
-#include "mapsDrawFunc.h"
+char *latFormatString(double lat);
+char *lonFormatString(double lon);
+
+/**
+ * @brief Navigation Tile screen objects
+ *
+ */
+ extern lv_obj_t *nameNav;
+ extern lv_obj_t *latNav;
+ extern lv_obj_t *lonNav;
 
 void updateNavScreen();