Try to pre-empt subsequent inclusions of wiring.h by grabbing it here and giving ourselves a chance to undo some of the less well-advised macros it defines.

libraries/AP_Common/AP_Common.h

@@ -15,6 +15,12 @@
 #ifndef _AP_COMMON_H
 #define _AP_COMMON_H
 
+// Get the common arduino functions
+#include "wiring.h"
+// ... and remove some of their stupid macros
+#undef round
+#undef abs
+
 #include <stdint.h>
 #include "include/menu.h"		/// simple menu subsystem
 #include "c++.h" // c++ additions
@@ -22,6 +28,8 @@
 //#include "AP_Loop.h"
 #include "AP_Var.h"
 
+
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @name	Warning control
 //@{