From 4639d12f0edba2083e0cc96e503b76e4ceff175b Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Fri, 22 Jul 2016 09:49:41 +1000
Subject: [PATCH] AP_ADSB: break circular dependency with Avoidance

---
 libraries/AP_ADSB/AP_ADSB.cpp | 1 +
 libraries/AP_ADSB/AP_ADSB.h   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/AP_ADSB/AP_ADSB.cpp b/libraries/AP_ADSB/AP_ADSB.cpp
index 1ecdd8495d..90d3ad7a73 100644
--- a/libraries/AP_ADSB/AP_ADSB.cpp
+++ b/libraries/AP_ADSB/AP_ADSB.cpp
@@ -27,6 +27,7 @@
 #include <stdio.h>  // for sprintf
 #include <limits.h>
 #include <AP_Vehicle/AP_Vehicle.h>
+#include <GCS_MAVLink/GCS.h>
 
 #define VEHICLE_THREAT_RADIUS_M         1000
 #define VEHICLE_TIMEOUT_MS              5000   // if no updates in this time, drop it from the list
diff --git a/libraries/AP_ADSB/AP_ADSB.h b/libraries/AP_ADSB/AP_ADSB.h
index 667200a6a6..34888125bc 100644
--- a/libraries/AP_ADSB/AP_ADSB.h
+++ b/libraries/AP_ADSB/AP_ADSB.h
@@ -24,7 +24,6 @@
 
 #include <AP_Common/AP_Common.h>
 #include <AP_Param/AP_Param.h>
-#include <GCS_MAVLink/GCS.h>
 #include <AP_Common/Location.h>
 
 class AP_ADSB