diff --git a/APMrover2/version.h b/APMrover2/version.h
index d4b7dae4db..678233cb41 100644
--- a/APMrover2/version.h
+++ b/APMrover2/version.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "ap_version.h"
+
 #define THISFIRMWARE "ArduRover v3.0.0"
 #define FIRMWARE_VERSION 3,0,0,FIRMWARE_VERSION_TYPE_OFFICIAL
 
diff --git a/AntennaTracker/version.h b/AntennaTracker/version.h
index 126a6820b5..25cc7b8c97 100644
--- a/AntennaTracker/version.h
+++ b/AntennaTracker/version.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "ap_version.h"
+
 #define THISFIRMWARE "AntennaTracker V0.7.6"
 #define FIRMWARE_VERSION 0,7,6,FIRMWARE_VERSION_TYPE_DEV
 
diff --git a/ArduCopter/version.h b/ArduCopter/version.h
index d5b95b6c7a..d251c168d4 100644
--- a/ArduCopter/version.h
+++ b/ArduCopter/version.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "ap_version.h"
+
 #define THISFIRMWARE "APM:Copter V3.4-dev"
 #define FIRMWARE_VERSION 3,4,0,FIRMWARE_VERSION_TYPE_DEV
 
diff --git a/ArduPlane/version.h b/ArduPlane/version.h
index fdccefa562..014079673c 100644
--- a/ArduPlane/version.h
+++ b/ArduPlane/version.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "ap_version.h"
+
 #define THISFIRMWARE "ArduPlane V3.6.0beta1"
 #define FIRMWARE_VERSION 3,6,0,FIRMWARE_VERSION_TYPE_BETA
 
diff --git a/libraries/AP_Common/missing/ap_version.h b/libraries/AP_Common/missing/ap_version.h
new file mode 100644
index 0000000000..299f1d293d
--- /dev/null
+++ b/libraries/AP_Common/missing/ap_version.h
@@ -0,0 +1 @@
+/* Placeholder header for make build system */
diff --git a/libraries/DataFlash/DFMessageWriter.cpp b/libraries/DataFlash/DFMessageWriter.cpp
index 307457c6bb..b180c9c40d 100644
--- a/libraries/DataFlash/DFMessageWriter.cpp
+++ b/libraries/DataFlash/DFMessageWriter.cpp
@@ -1,3 +1,4 @@
+#include "ap_version.h"
 #include "DFMessageWriter.h"
 
 extern const AP_HAL::HAL& hal;
diff --git a/libraries/GCS_MAVLink/GCS_Common.cpp b/libraries/GCS_MAVLink/GCS_Common.cpp
index 477a0ed1a6..26e5d55077 100644
--- a/libraries/GCS_MAVLink/GCS_Common.cpp
+++ b/libraries/GCS_MAVLink/GCS_Common.cpp
@@ -16,13 +16,14 @@
    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 "GCS.h"
 #include <AP_AHRS/AP_AHRS.h>
 #include <AP_HAL/AP_HAL.h>
 #include <AP_OpticalFlow/AP_OpticalFlow.h>
 #include <AP_Vehicle/AP_Vehicle.h>
 
+#include "ap_version.h"
+#include "GCS.h"
+
 extern const AP_HAL::HAL& hal;
 
 uint32_t GCS_MAVLINK::last_radio_status_remrssi_ms;