From e340c4655b8f6154fb1a80422b698244a10c62ee Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Tue, 8 Nov 2022 21:10:56 +1100
Subject: [PATCH] AC_AutoTune: change namespace of MultiCopter and FixedWing
 params

this stops the libraries knowing anything about AP_Vehicle
---
 libraries/AC_AutoTune/AC_AutoTune.cpp       | 2 ++
 libraries/AC_AutoTune/AC_AutoTune_Heli.cpp  | 1 +
 libraries/AC_AutoTune/AC_AutoTune_Heli.h    | 2 ++
 libraries/AC_AutoTune/AC_AutoTune_Multi.cpp | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/libraries/AC_AutoTune/AC_AutoTune.cpp b/libraries/AC_AutoTune/AC_AutoTune.cpp
index 8257be5543..f7ca6bd8df 100644
--- a/libraries/AC_AutoTune/AC_AutoTune.cpp
+++ b/libraries/AC_AutoTune/AC_AutoTune.cpp
@@ -2,7 +2,9 @@
 
 #include <AP_Logger/AP_Logger.h>
 #include <AP_Scheduler/AP_Scheduler.h>
+#include <AP_Notify/AP_Notify.h>
 #include <GCS_MAVLink/GCS.h>
+#include <AP_Vehicle/AP_Vehicle_Type.h>
 
 #define AUTOTUNE_PILOT_OVERRIDE_TIMEOUT_MS  500     // restart tuning if pilot has left sticks in middle for 2 seconds
 #if APM_BUILD_TYPE(APM_BUILD_ArduPlane)
diff --git a/libraries/AC_AutoTune/AC_AutoTune_Heli.cpp b/libraries/AC_AutoTune/AC_AutoTune_Heli.cpp
index f7f75b902b..ecfe5e0fe2 100644
--- a/libraries/AC_AutoTune/AC_AutoTune_Heli.cpp
+++ b/libraries/AC_AutoTune/AC_AutoTune_Heli.cpp
@@ -20,6 +20,7 @@
 #include "AC_AutoTune_Heli.h"
 
 #include <AP_Logger/AP_Logger.h>
+#include <GCS_MAVLink/GCS.h>
 
 #define AUTOTUNE_TESTING_STEP_TIMEOUT_MS   5000U     // timeout for tuning mode's testing step
 
diff --git a/libraries/AC_AutoTune/AC_AutoTune_Heli.h b/libraries/AC_AutoTune/AC_AutoTune_Heli.h
index 07c791afe5..133047a12d 100644
--- a/libraries/AC_AutoTune/AC_AutoTune_Heli.h
+++ b/libraries/AC_AutoTune/AC_AutoTune_Heli.h
@@ -21,6 +21,8 @@
 #include "AC_AutoTune.h"
 #include <AP_Math/chirp.h>
 
+#include <AP_Scheduler/AP_Scheduler.h>
+
 class AC_AutoTune_Heli : public AC_AutoTune
 {
 public:
diff --git a/libraries/AC_AutoTune/AC_AutoTune_Multi.cpp b/libraries/AC_AutoTune/AC_AutoTune_Multi.cpp
index f75101c333..cb358a86d5 100644
--- a/libraries/AC_AutoTune/AC_AutoTune_Multi.cpp
+++ b/libraries/AC_AutoTune/AC_AutoTune_Multi.cpp
@@ -1,6 +1,8 @@
 #include "AC_AutoTune_Multi.h"
 
 #include <AP_Logger/AP_Logger.h>
+#include <AP_Scheduler/AP_Scheduler.h>
+#include <GCS_MAVLink/GCS.h>
 
 /*
  * autotune support for multicopters