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

---
 libraries/AP_Notify/AP_BoardLED.h      | 2 +-
 libraries/AP_Notify/AP_BoardLED2.h     | 2 +-
 libraries/AP_Notify/Buzzer.h           | 2 --
 libraries/AP_Notify/DiscoLED.h         | 2 +-
 libraries/AP_Notify/DiscreteRGBLed.cpp | 2 ++
 libraries/AP_Notify/ExternalLED.h      | 4 ----
 libraries/AP_Notify/Led_Sysfs.h        | 2 +-
 libraries/AP_Notify/PixRacerLED.cpp    | 2 ++
 libraries/AP_Notify/PixRacerLED.h      | 3 ---
 libraries/AP_Notify/RGBLed.h           | 1 -
 libraries/AP_Notify/SITL_SFML_LED.h    | 2 +-
 11 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/libraries/AP_Notify/AP_BoardLED.h b/libraries/AP_Notify/AP_BoardLED.h
index c812b6316b..810cacbde8 100644
--- a/libraries/AP_Notify/AP_BoardLED.h
+++ b/libraries/AP_Notify/AP_BoardLED.h
@@ -15,7 +15,7 @@
 #pragma once
 
 #include <AP_Common/AP_Common.h>
-#include <AP_HAL/AP_HAL.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 
 #include "NotifyDevice.h"
 
diff --git a/libraries/AP_Notify/AP_BoardLED2.h b/libraries/AP_Notify/AP_BoardLED2.h
index e440aa4a05..2d6b5e19a0 100644
--- a/libraries/AP_Notify/AP_BoardLED2.h
+++ b/libraries/AP_Notify/AP_BoardLED2.h
@@ -17,7 +17,7 @@
 
 
 #include <AP_Common/AP_Common.h>
-#include <AP_HAL/AP_HAL.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 
 #include "NotifyDevice.h"
 
diff --git a/libraries/AP_Notify/Buzzer.h b/libraries/AP_Notify/Buzzer.h
index 80567b5e58..4098148e76 100644
--- a/libraries/AP_Notify/Buzzer.h
+++ b/libraries/AP_Notify/Buzzer.h
@@ -17,8 +17,6 @@
  */
 #pragma once
 
-#include <AP_HAL/AP_HAL.h>
-
 #include "NotifyDevice.h"
 
 class Buzzer: public NotifyDevice
diff --git a/libraries/AP_Notify/DiscoLED.h b/libraries/AP_Notify/DiscoLED.h
index ee5ca96259..3c7585327e 100644
--- a/libraries/AP_Notify/DiscoLED.h
+++ b/libraries/AP_Notify/DiscoLED.h
@@ -16,7 +16,7 @@
 */
 #pragma once
 
-#include <AP_HAL/AP_HAL.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 
 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include <AP_HAL_Linux/Led_Sysfs.h>
diff --git a/libraries/AP_Notify/DiscreteRGBLed.cpp b/libraries/AP_Notify/DiscreteRGBLed.cpp
index a3e5229f1f..d47773e01e 100644
--- a/libraries/AP_Notify/DiscreteRGBLed.cpp
+++ b/libraries/AP_Notify/DiscreteRGBLed.cpp
@@ -13,6 +13,8 @@
 
 #include "DiscreteRGBLed.h"
 
+#include <AP_HAL/HAL.h>
+
 extern const AP_HAL::HAL& hal;
 
 DiscreteRGBLed::DiscreteRGBLed(uint16_t red, uint16_t green, uint16_t blue, bool normal_polarity)
diff --git a/libraries/AP_Notify/ExternalLED.h b/libraries/AP_Notify/ExternalLED.h
index 6c1b145d1d..404d300636 100644
--- a/libraries/AP_Notify/ExternalLED.h
+++ b/libraries/AP_Notify/ExternalLED.h
@@ -15,10 +15,6 @@
 
 #pragma once
 
-#include <AP_Common/AP_Common.h>
-#include <AP_HAL/AP_HAL.h>
-#include <AP_Param/AP_Param.h>
-
 #include "NotifyDevice.h"
 
 class ExternalLED: public NotifyDevice
diff --git a/libraries/AP_Notify/Led_Sysfs.h b/libraries/AP_Notify/Led_Sysfs.h
index 7deb049e04..be8fab15e8 100644
--- a/libraries/AP_Notify/Led_Sysfs.h
+++ b/libraries/AP_Notify/Led_Sysfs.h
@@ -16,7 +16,7 @@
 */
 #pragma once
 
-#include <AP_HAL/AP_HAL.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 
 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include <AP_HAL_Linux/Led_Sysfs.h>
diff --git a/libraries/AP_Notify/PixRacerLED.cpp b/libraries/AP_Notify/PixRacerLED.cpp
index dda60f97ad..3e543a0cf3 100644
--- a/libraries/AP_Notify/PixRacerLED.cpp
+++ b/libraries/AP_Notify/PixRacerLED.cpp
@@ -15,6 +15,8 @@
 
 #include "PixRacerLED.h"
 
+#include <AP_HAL/HAL.h>
+
 #if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
 
 #ifndef HAL_GPIO_A_LED_PIN
diff --git a/libraries/AP_Notify/PixRacerLED.h b/libraries/AP_Notify/PixRacerLED.h
index 09083d11a7..43dc34ac03 100644
--- a/libraries/AP_Notify/PixRacerLED.h
+++ b/libraries/AP_Notify/PixRacerLED.h
@@ -14,9 +14,6 @@
  */
 #pragma once
 
-#include <AP_Common/AP_Common.h>
-#include <AP_HAL/AP_HAL.h>
-
 #include "RGBLed.h"
 
 class PixRacerLED: public RGBLed
diff --git a/libraries/AP_Notify/RGBLed.h b/libraries/AP_Notify/RGBLed.h
index 9c2e7fa375..46dad5726f 100644
--- a/libraries/AP_Notify/RGBLed.h
+++ b/libraries/AP_Notify/RGBLed.h
@@ -19,7 +19,6 @@
  */
 #pragma once
 
-#include <AP_HAL/AP_HAL.h>
 #include "NotifyDevice.h"
 
 class RGBLed: public NotifyDevice {
diff --git a/libraries/AP_Notify/SITL_SFML_LED.h b/libraries/AP_Notify/SITL_SFML_LED.h
index 5750ab6ee8..52dc039c94 100644
--- a/libraries/AP_Notify/SITL_SFML_LED.h
+++ b/libraries/AP_Notify/SITL_SFML_LED.h
@@ -16,7 +16,7 @@
 */
 #pragma once
 
-#include <AP_HAL/AP_HAL.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 #include <SITL/SITL.h>
 
 #ifdef WITH_SITL_RGBLED