diff --git a/AntennaTracker/AntennaTracker.cpp b/AntennaTracker/AntennaTracker.cpp
index dadcbee46b..da12f3b78a 100644
--- a/AntennaTracker/AntennaTracker.cpp
+++ b/AntennaTracker/AntennaTracker.cpp
@@ -18,7 +18,10 @@
  */
 
 #include "Tracker.h"
+
+#define FORCE_VERSION_H_INCLUDE
 #include "version.h"
+#undef FORCE_VERSION_H_INCLUDE
 
 #define SCHED_TASK(func, _interval_ticks, _max_time_micros) SCHED_TASK_CLASS(Tracker, &tracker, func, _interval_ticks, _max_time_micros)
 
diff --git a/AntennaTracker/Tracker.h b/AntennaTracker/Tracker.h
index 04a3a9ada6..b92c6f27f1 100644
--- a/AntennaTracker/Tracker.h
+++ b/AntennaTracker/Tracker.h
@@ -70,7 +70,6 @@
 #include "Parameters.h"
 #include "GCS_Mavlink.h"
 #include "GCS_Tracker.h"
-#include "version.h"
 
 #if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 #include <SITL/SITL.h>
@@ -84,17 +83,7 @@ public:
 
     Tracker(void);
 
-    const AP_FWVersion fwver {
-        major: FW_MAJOR,
-        minor: FW_MINOR,
-        patch: FW_PATCH,
-        fw_type: FW_TYPE,
-#ifndef GIT_VERSION
-        fw_string: THISFIRMWARE
-#else
-        fw_string: THISFIRMWARE " (" GIT_VERSION ")"
-#endif
-    };
+    static const AP_FWVersion fwver;
 
     // HAL::Callbacks implementation.
     void setup() override;
diff --git a/AntennaTracker/version.cpp b/AntennaTracker/version.cpp
new file mode 100644
index 0000000000..bc32ca3f43
--- /dev/null
+++ b/AntennaTracker/version.cpp
@@ -0,0 +1,40 @@
+/*
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "Tracker.h"
+
+#define FORCE_VERSION_H_INCLUDE
+#include "version.h"
+#undef FORCE_VERSION_H_INCLUDE
+
+#include <AP_Common/AP_FWVersion.h>
+
+const AP_FWVersion Tracker::fwver{
+    .major = FW_MAJOR,
+    .minor = FW_MINOR,
+    .patch = FW_PATCH,
+    .fw_type = FW_TYPE,
+#ifndef GIT_VERSION
+    .fw_string = THISFIRMWARE,
+#else
+    .fw_string = THISFIRMWARE " (" GIT_VERSION ")",
+    .fw_hash_str = GIT_VERSION,
+#endif
+#ifdef PX4_GIT_VERSION
+    .middleware_hash_str = PX4_GIT_VERSION,
+#endif
+#ifdef NUTTX_GIT_VERSION
+    .os_hash_str = NUTTX_GIT_VERSION,
+#endif
+};