Mavlink compilation failure

radio/src/Makefile

@@ -1235,6 +1235,7 @@ endif
 
 ifeq ($(EXT), MAVLINK)
  CPPDEFS += -DMAVLINK
+ INCDIRS += thirdparty
  CPPSRC += telemetry/mavlink.cpp gui/$(GUIDIRECTORY)/view_mavlink.cpp serial.cpp
  EEPROM_VARIANT += ${MAVLINK_VARIANT}
 endif

radio/src/gui/9X/menu_model.cpp

@@ -36,7 +36,7 @@
 #include "../../opentx.h"
 
 #if defined(MAVLINK)
-#include "view_mavlink.h"
+#include "gui/9X/view_mavlink.h"
 #endif
 
 // TODO elsewhere!

radio/src/gui/9X/view_mavlink.cpp

@@ -41,7 +41,7 @@
  *	Contains the menu specific code for Mavlink support.
  */
 
-#include "view_mavlink.h"
+#include "gui/9X/view_mavlink.h"
 
 // Globals declaration
 

radio/src/gui/9X/view_mavlink.h

@@ -45,7 +45,7 @@
 
 #include "opentx.h"
 #include "telemetry/mavlink.h"
-#include "gui/menus.h"
+#include "gui/9X/menus.h"
 #include "serial.h"
 
 #define APSIZE (BSS | DBLSIZE)

radio/src/telemetry/mavlink.h

@@ -62,7 +62,7 @@ extern void SERIAL_send_uart_bytes(const uint8_t * buf, uint16_t len);
 #define MAVLINK_END_UART_SEND(chan,len) SERIAL_end_uart_send()
 #define MAVLINK_SEND_UART_BYTES(chan,buf,len) SERIAL_send_uart_bytes(buf,len)
 
-#include "../GCS_MAVLink/include_v1.0/ardupilotmega/mavlink.h"
+#include "GCS_MAVLink/include_v1.0/ardupilotmega/mavlink.h"
 
 //#define MAVLINK_PARAMS
 //#define DUMP_RX_TX