From 6cdbc95d9d6acde19e687e08765b26137a8a294f Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Wed, 25 Jan 2023 08:39:44 +1100
Subject: [PATCH] AP_UAVCAN: tidy includes of SRV_Channel.h

---
 libraries/AP_UAVCAN/AP_UAVCAN.h        | 2 +-
 libraries/AP_UAVCAN/AP_UAVCAN_pool.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/AP_UAVCAN/AP_UAVCAN.h b/libraries/AP_UAVCAN/AP_UAVCAN.h
index 7aae18c7a7..4e7ebabb18 100644
--- a/libraries/AP_UAVCAN/AP_UAVCAN.h
+++ b/libraries/AP_UAVCAN/AP_UAVCAN.h
@@ -29,7 +29,7 @@
 #include <AP_ESC_Telem/AP_ESC_Telem_Backend.h>
 #include <uavcan/protocol/param/GetSet.hpp>
 #include <uavcan/protocol/param/ExecuteOpcode.hpp>
-#include <SRV_Channel/SRV_Channel.h>
+#include <SRV_Channel/SRV_Channel_config.h>
 
 
 #ifndef UAVCAN_SRV_NUMBER
diff --git a/libraries/AP_UAVCAN/AP_UAVCAN_pool.cpp b/libraries/AP_UAVCAN/AP_UAVCAN_pool.cpp
index 2f68ab955c..152381c3b8 100644
--- a/libraries/AP_UAVCAN/AP_UAVCAN_pool.cpp
+++ b/libraries/AP_UAVCAN/AP_UAVCAN_pool.cpp
@@ -24,6 +24,7 @@
 
 #include "AP_UAVCAN.h"
 #include "AP_UAVCAN_pool.h"
+#include <AP_InternalError/AP_InternalError.h>
 
 AP_PoolAllocator::AP_PoolAllocator(uint16_t _pool_size) :
     num_blocks(_pool_size / UAVCAN_NODE_POOL_BLOCK_SIZE)