diff --git a/libraries/AP_Common/AP_FWVersion.h b/libraries/AP_Common/AP_FWVersion.h
index 95a7eb50d1..0fdc3f22ae 100644
--- a/libraries/AP_Common/AP_FWVersion.h
+++ b/libraries/AP_Common/AP_FWVersion.h
@@ -3,6 +3,7 @@
 #include <stdint.h>
 #include <AP_Common/AP_Common.h>
 #include <AP_HAL/AP_HAL_Boards.h>
+#include <AP_Common/CxVersion.h>
 
 class PACKED AP_FWVersion {
 
diff --git a/libraries/AP_Common/AP_FWVersionDefine.h b/libraries/AP_Common/AP_FWVersionDefine.h
index fa8755753a..481f1cbdcd 100644
--- a/libraries/AP_Common/AP_FWVersionDefine.h
+++ b/libraries/AP_Common/AP_FWVersionDefine.h
@@ -22,7 +22,6 @@
 
 #include <AP_Common/AP_FWVersion.h>
 #include <AP_Vehicle/AP_Vehicle_Type.h>
-#include <AP_Common/CxVersion.h>
 
 /*
   allow vendors to set AP_CUSTOM_FIRMWARE_STRING in hwdef.dat