diff --git a/libraries/GCS_MAVLink/GCS.h b/libraries/GCS_MAVLink/GCS.h
index f412d3c8cc..4552e97c35 100644
--- a/libraries/GCS_MAVLink/GCS.h
+++ b/libraries/GCS_MAVLink/GCS.h
@@ -14,6 +14,7 @@
 #include <AP_Mission.h>
 #include "../AP_BattMonitor/AP_BattMonitor.h"
 #include <stdint.h>
+#include <MAVLink_routing.h>
 
 //  GCS Message ID's
 /// NOTE: to ensure we never block on sending MAVLink messages
@@ -189,6 +190,9 @@ public:
     // last time we got a non-zero RSSI from RADIO_STATUS
     static uint32_t last_radio_status_remrssi_ms;
 
+    // mavlink routing object
+    static MAVLink_routing routing;
+
     // common send functions
     void send_meminfo(void);
     void send_power_status(void);
diff --git a/libraries/GCS_MAVLink/GCS_MAVLink.cpp b/libraries/GCS_MAVLink/GCS_MAVLink.cpp
index d27a4a96d3..8f3dffa18a 100644
--- a/libraries/GCS_MAVLink/GCS_MAVLink.cpp
+++ b/libraries/GCS_MAVLink/GCS_MAVLink.cpp
@@ -43,6 +43,9 @@ mavlink_system_t mavlink_system = {7,1};
 // mask of serial ports disabled to allow for SERIAL_CONTROL
 static uint8_t mavlink_locked_mask;
 
+// routing table
+MAVLink_routing GCS_MAVLINK::routing;
+
 /*
   lock a channel, preventing use by MAVLink
  */