From 8b677756732323f66f72bc7c2383ea87db73fbc6 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Fri, 13 Oct 2023 12:54:17 +1100
Subject: [PATCH] AP_OpenDroneID: remove duplicate definition of
 AP_OPENDRONEID_ENABLED

... my guess is conflict resolution caused this
---
 libraries/AP_OpenDroneID/AP_OpenDroneID.cpp | 3 ++-
 libraries/AP_OpenDroneID/AP_OpenDroneID.h   | 6 ------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/libraries/AP_OpenDroneID/AP_OpenDroneID.cpp b/libraries/AP_OpenDroneID/AP_OpenDroneID.cpp
index a3cc3ed372..9aa153706a 100644
--- a/libraries/AP_OpenDroneID/AP_OpenDroneID.cpp
+++ b/libraries/AP_OpenDroneID/AP_OpenDroneID.cpp
@@ -27,10 +27,11 @@
  * and DroneCAN
  */
 
-#include "AP_OpenDroneID.h"
+#include "AP_OpenDroneID_config.h"
 
 #if AP_OPENDRONEID_ENABLED
 
+#include "AP_OpenDroneID.h"
 #include <AP_HAL/AP_HAL.h>
 #include <GCS_MAVLink/GCS.h>
 #include <AP_GPS/AP_GPS.h>
diff --git a/libraries/AP_OpenDroneID/AP_OpenDroneID.h b/libraries/AP_OpenDroneID/AP_OpenDroneID.h
index a4bb5f9856..3ed65244ac 100644
--- a/libraries/AP_OpenDroneID/AP_OpenDroneID.h
+++ b/libraries/AP_OpenDroneID/AP_OpenDroneID.h
@@ -27,14 +27,8 @@
 
 #pragma once
 
-#include <AP_HAL/AP_HAL_Boards.h>
 #include "AP_OpenDroneID_config.h"
 
-#ifndef AP_OPENDRONEID_ENABLED
-// default to off. Enabled in hwdef.dat
-#define AP_OPENDRONEID_ENABLED 0
-#endif
-
 #if AP_OPENDRONEID_ENABLED
 
 #include <AP_Math/AP_Math.h>