diff --git a/ArduPlane/ArduPlane.pde b/ArduPlane/ArduPlane.pde
index 8f6f6f739c..d416ae03d7 100644
--- a/ArduPlane/ArduPlane.pde
+++ b/ArduPlane/ArduPlane.pde
@@ -54,8 +54,7 @@ version 2.1 of the License, or (at your option) any later version.
 
 #include <GCS_MAVLink.h>    // MAVLink GCS definitions
 
-// AP_Mount disabled until it works with MAVLink10
-// #include <AP_Mount.h>		// Camera/Antenna mount
+#include <AP_Mount.h>		// Camera/Antenna mount
 
 // Local modules
 #include "defines.h"
diff --git a/Tools/scripts/build_all.sh b/Tools/scripts/build_all.sh
index 833fbfb6e4..233b3a2365 100755
--- a/Tools/scripts/build_all.sh
+++ b/Tools/scripts/build_all.sh
@@ -8,7 +8,7 @@ set -x
 
 echo "Testing ArduPlane build"
 pushd ArduPlane
-for b in all apm2 apm2beta hil hilsensors mavlink10 mavlink09 sitl sitl-mavlink10 sitl-mavlink09; do
+for b in all apm2 apm2beta hil hilsensors mavlink10 mavlink09 sitl sitl-mavlink10 sitl-mavlink09 sitl-mount; do
     pwd
     make clean
     make $b
diff --git a/libraries/GCS_MAVLink/GCS_MAVLink.h b/libraries/GCS_MAVLink/GCS_MAVLink.h
index c256d4c05a..ad52e23672 100644
--- a/libraries/GCS_MAVLink/GCS_MAVLink.h
+++ b/libraries/GCS_MAVLink/GCS_MAVLink.h
@@ -12,6 +12,11 @@
 // to select MAVLink 1.0 in the arduino GUI build
 //#define MAVLINK_SEPARATE_HELPERS
 
+#ifndef MAVLINK10
+// default to MAVLINK 1.0
+#define MAVLINK10 ENABLED
+#endif
+
 #if MAVLINK10 == ENABLED
 # include "include/mavlink/v1.0/ardupilotmega/version.h"
 #else
@@ -119,7 +124,7 @@ static inline int comm_get_txspace(mavlink_channel_t chan)
 }
 
 #define MAVLINK_USE_CONVENIENCE_FUNCTIONS
-#if MAVLINK10==1
+#if MAVLINK10==ENABLED
 # include "include/mavlink/v1.0/ardupilotmega/mavlink.h"
 #else
 # include "include/mavlink/v0.9/ardupilotmega/mavlink.h"