diff --git a/ArduSub/version.h b/ArduSub/version.h
index 8f72749471..edd1971450 100644
--- a/ArduSub/version.h
+++ b/ArduSub/version.h
@@ -1,6 +1,10 @@
 #pragma once
 
-#include "AP_Common/AP_FWVersion.h"
+#ifndef FORCE_VERSION_H_INCLUDE
+#error version.h should never be included directly. You probably want to include AP_Common/AP_FWVersion.h
+#endif
+
+#include "ap_version.h"
 
 #define THISFIRMWARE "ArduSub V3.6-dev"