diff --git a/libraries/AP_Vehicle/AP_Vehicle_Type.h b/libraries/AP_Vehicle/AP_Vehicle_Type.h
index f415646f44..32f461ebdd 100644
--- a/libraries/AP_Vehicle/AP_Vehicle_Type.h
+++ b/libraries/AP_Vehicle/AP_Vehicle_Type.h
@@ -29,12 +29,12 @@
 #define APM_BUILD_iofirmware     8
 #define APM_BUILD_AP_Periph      9
 
+#ifndef APM_BUILD_DIRECTORY
+#define APM_BUILD_DIRECTORY APM_BUILD_UNKNOWN
+#endif
+
 /*
   using this macro catches cases where we try to check vehicle type on
   build systems that don't support it
  */
-#ifdef APM_BUILD_DIRECTORY
 #define APM_BUILD_TYPE(type) ((type) == APM_BUILD_DIRECTORY)
-#else
-#define APM_BUILD_TYPE(type) ((type) == APM_BUILD_UNKNOWN)
-#endif