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

---
 libraries/AP_Mission/AP_Mission.h                  | 3 ++-
 libraries/AP_Mission/AP_Mission_ChangeDetector.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libraries/AP_Mission/AP_Mission.h b/libraries/AP_Mission/AP_Mission.h
index 04f2bf16aa..b53d015002 100644
--- a/libraries/AP_Mission/AP_Mission.h
+++ b/libraries/AP_Mission/AP_Mission.h
@@ -12,11 +12,12 @@
  */
 #pragma once
 
+#include <AP_HAL/AP_HAL.h>
+
 #ifndef HAL_MISSION_ENABLED
 #define HAL_MISSION_ENABLED 1
 #endif
 
-#include <AP_HAL/AP_HAL.h>
 #include <GCS_MAVLink/GCS_MAVLink.h>
 #include <AP_Math/AP_Math.h>
 #include <AP_Common/AP_Common.h>
diff --git a/libraries/AP_Mission/AP_Mission_ChangeDetector.cpp b/libraries/AP_Mission/AP_Mission_ChangeDetector.cpp
index 5b8d8be146..f1ff7e32e2 100644
--- a/libraries/AP_Mission/AP_Mission_ChangeDetector.cpp
+++ b/libraries/AP_Mission/AP_Mission_ChangeDetector.cpp
@@ -3,7 +3,7 @@
 
 #include "AP_Mission_ChangeDetector.h"
 
-extern const AP_HAL::HAL& hal;
+#if HAL_MISSION_ENABLED
 
 // detect external changes to mission
 bool AP_Mission_ChangeDetector::check_for_mission_change()
@@ -59,3 +59,4 @@ bool AP_Mission_ChangeDetector::check_for_mission_change()
     return cmds_changed && !curr_cmd_idx_changed;
 }
 
+#endif  // AP_MISSION_ENABLED