diff --git a/libraries/AP_Vehicle/AP_Vehicle_Type.h b/libraries/AP_Vehicle/AP_Vehicle_Type.h
index a084b42765..9d65a3e480 100644
--- a/libraries/AP_Vehicle/AP_Vehicle_Type.h
+++ b/libraries/AP_Vehicle/AP_Vehicle_Type.h
@@ -38,10 +38,6 @@
 #define APM_BUILD_TYPE(type) ((type) == APM_BUILD_UNKNOWN)
 #endif
 
-#if APM_BUILD_TYPE(APM_BUILD_APMrover2) || APM_BUILD_TYPE(APM_BUILD_ArduPlane) || APM_BUILD_TYPE(APM_BUILD_ArduCopter)
-# define APM_BUILD_FUNCTOR 1
-#else
-# define APM_BUILD_FUNCTOR 0
-#endif
+#define APM_BUILD_FUNCTOR 1
 
 #endif // AP_VEHICLE_TYPE_H