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

---
 libraries/AP_WindVane/AP_WindVane.cpp              | 3 +++
 libraries/AP_WindVane/AP_WindVane_Analog.cpp       | 4 ++++
 libraries/AP_WindVane/AP_WindVane_ModernDevice.cpp | 3 +++
 libraries/AP_WindVane/AP_WindVane_ModernDevice.h   | 4 ----
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/libraries/AP_WindVane/AP_WindVane.cpp b/libraries/AP_WindVane/AP_WindVane.cpp
index 186394a5e4..e92edc5381 100644
--- a/libraries/AP_WindVane/AP_WindVane.cpp
+++ b/libraries/AP_WindVane/AP_WindVane.cpp
@@ -24,9 +24,12 @@
 #include "AP_WindVane_NMEA.h"
 
 #include <AP_AHRS/AP_AHRS.h>
+#include <AP_HAL/AP_HAL.h>
 #include <AP_Logger/AP_Logger.h>
 #include <AP_SerialManager/AP_SerialManager.h>
 
+extern const AP_HAL::HAL& hal;
+
 const AP_Param::GroupInfo AP_WindVane::var_info[] = {
 
     // @Param: TYPE
diff --git a/libraries/AP_WindVane/AP_WindVane_Analog.cpp b/libraries/AP_WindVane/AP_WindVane_Analog.cpp
index 6e78c8c561..cee49bdd1e 100644
--- a/libraries/AP_WindVane/AP_WindVane_Analog.cpp
+++ b/libraries/AP_WindVane/AP_WindVane_Analog.cpp
@@ -22,6 +22,10 @@ extern const AP_HAL::HAL& hal;
 
 #define WINDVANE_CALIBRATION_VOLT_DIFF_MIN  1.0f    // calibration routine's min voltage difference required for success
 
+#include <AP_HAL/AP_HAL.h>
+
+extern const AP_HAL::HAL& hal;
+
 // constructor
 AP_WindVane_Analog::AP_WindVane_Analog(AP_WindVane &frontend) :
     AP_WindVane_Backend(frontend)
diff --git a/libraries/AP_WindVane/AP_WindVane_ModernDevice.cpp b/libraries/AP_WindVane/AP_WindVane_ModernDevice.cpp
index e273601a43..9daacb6c86 100644
--- a/libraries/AP_WindVane/AP_WindVane_ModernDevice.cpp
+++ b/libraries/AP_WindVane/AP_WindVane_ModernDevice.cpp
@@ -17,8 +17,11 @@
 // read wind speed from Modern Device rev p wind sensor
 // https://moderndevice.com/news/calibrating-rev-p-wind-sensor-new-regression/
 
+#include <AP_HAL/AP_HAL.h>
 #include <GCS_MAVLink/GCS.h>
 
+extern const AP_HAL::HAL& hal;
+
 // constructor
 AP_WindVane_ModernDevice::AP_WindVane_ModernDevice(AP_WindVane &frontend) :
     AP_WindVane_Backend(frontend)
diff --git a/libraries/AP_WindVane/AP_WindVane_ModernDevice.h b/libraries/AP_WindVane/AP_WindVane_ModernDevice.h
index bb05cb215a..1d32708881 100644
--- a/libraries/AP_WindVane/AP_WindVane_ModernDevice.h
+++ b/libraries/AP_WindVane/AP_WindVane_ModernDevice.h
@@ -16,10 +16,6 @@
 
 #include "AP_WindVane_Backend.h"
 
-#include <AP_HAL/AP_HAL.h>
-
-extern const AP_HAL::HAL& hal;
-
 class AP_WindVane_ModernDevice : public AP_WindVane_Backend
 {
 public: