From 0e8ac68af4ba6b6be4f9ad809cee69074a55ffbd Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Tue, 1 Mar 2022 12:19:18 +1100
Subject: [PATCH] AP_RCTelemetry: tidy includes

---
 libraries/AP_RCTelemetry/AP_CRSF_Telem.h     | 4 ----
 libraries/AP_RCTelemetry/AP_RCTelemetry.h    | 4 ++--
 libraries/AP_RCTelemetry/AP_Spektrum_Telem.h | 3 +--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/libraries/AP_RCTelemetry/AP_CRSF_Telem.h b/libraries/AP_RCTelemetry/AP_CRSF_Telem.h
index c9e92e9cf5..27c9779826 100644
--- a/libraries/AP_RCTelemetry/AP_CRSF_Telem.h
+++ b/libraries/AP_RCTelemetry/AP_CRSF_Telem.h
@@ -14,7 +14,6 @@
 */
 #pragma once
 
-#include <AP_HAL/AP_HAL.h>
 #include <AP_HAL/AP_HAL_Boards.h>
 #include <AP_OSD/AP_OSD.h>
 
@@ -28,9 +27,6 @@
 
 #if HAL_CRSF_TELEM_ENABLED
 
-#include <AP_Notify/AP_Notify.h>
-#include <AP_SerialManager/AP_SerialManager.h>
-#include <AP_HAL/utility/RingBuffer.h>
 #include <AP_RCProtocol/AP_RCProtocol_CRSF.h>
 #include "AP_RCTelemetry.h"
 #include <AP_HAL/utility/sparse-endian.h>
diff --git a/libraries/AP_RCTelemetry/AP_RCTelemetry.h b/libraries/AP_RCTelemetry/AP_RCTelemetry.h
index 33250b8570..1228025a97 100644
--- a/libraries/AP_RCTelemetry/AP_RCTelemetry.h
+++ b/libraries/AP_RCTelemetry/AP_RCTelemetry.h
@@ -14,10 +14,10 @@
 */
 #pragma once
 
-#include <AP_HAL/AP_HAL.h>
-#include <AP_Notify/AP_Notify.h>
+#include <AP_HAL/Semaphores.h>
 #include <AP_HAL/utility/RingBuffer.h>
 #include <AP_Math/AP_Math.h>
+#include <GCS_MAVLink/GCS_MAVLink.h>
 
 #define TELEM_PAYLOAD_STATUS_CAPACITY          5 // size of the message buffer queue (max number of messages waiting to be sent)
 
diff --git a/libraries/AP_RCTelemetry/AP_Spektrum_Telem.h b/libraries/AP_RCTelemetry/AP_Spektrum_Telem.h
index 5ecb15af2c..32321e81e1 100644
--- a/libraries/AP_RCTelemetry/AP_Spektrum_Telem.h
+++ b/libraries/AP_RCTelemetry/AP_Spektrum_Telem.h
@@ -14,7 +14,7 @@
 */
 #pragma once
 
-#include <AP_HAL/AP_HAL.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 
 #ifndef HAL_SPEKTRUM_TELEM_ENABLED
 #define HAL_SPEKTRUM_TELEM_ENABLED !HAL_MINIMIZE_FEATURES
@@ -22,7 +22,6 @@
 
 #if HAL_SPEKTRUM_TELEM_ENABLED
 
-#include <AP_Notify/AP_Notify.h>
 #include <AP_SerialManager/AP_SerialManager.h>
 #include <AP_HAL/utility/RingBuffer.h>
 #include "AP_RCTelemetry.h"