diff --git a/APMrover2/config.h b/APMrover2/config.h
index 173da34d76..856071395a 100644
--- a/APMrover2/config.h
+++ b/APMrover2/config.h
@@ -33,10 +33,6 @@
 /// change in your local copy of APM_Config.h.
 ///
 
-// Just so that it's completely clear...
-#define ENABLED			1
-#define DISABLED		0
-
 //////////////////////////////////////////////////////////////////////////////
 // sensor types
 
diff --git a/APMrover2/defines.h b/APMrover2/defines.h
index a47c596ff0..91c8df28c2 100644
--- a/APMrover2/defines.h
+++ b/APMrover2/defines.h
@@ -7,6 +7,14 @@
 #define TRUE 1
 #define FALSE 0
 
+// Just so that it's completely clear...
+#define ENABLED                 1
+#define DISABLED                0
+
+// this avoids a very common config error
+#define ENABLE ENABLED
+#define DISABLE DISABLED
+
 #define DEBUG 0
 #define SERVO_MAX 4500	// This value represents 45 degrees and is just an arbitrary representation of servo max travel.