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

---
 libraries/AP_RPM/AP_RPM.h      | 6 ++----
 libraries/AP_RPM/RPM_Backend.h | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/libraries/AP_RPM/AP_RPM.h b/libraries/AP_RPM/AP_RPM.h
index 2b2c4070a2..68d48cb51f 100644
--- a/libraries/AP_RPM/AP_RPM.h
+++ b/libraries/AP_RPM/AP_RPM.h
@@ -15,7 +15,7 @@
 #pragma once
 
 #include <AP_Common/AP_Common.h>
-#include <AP_HAL/AP_HAL.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 #include <AP_Param/AP_Param.h>
 #include <AP_Math/AP_Math.h>
 #include "AP_RPM_Params.h"
@@ -32,9 +32,7 @@ class AP_RPM
 public:
     AP_RPM();
 
-    /* Do not allow copies */
-    AP_RPM(const AP_RPM &other) = delete;
-    AP_RPM &operator=(const AP_RPM&) = delete;
+    CLASS_NO_COPY(AP_RPM);  /* Do not allow copies */
 
     // RPM driver types
     enum RPM_Type {
diff --git a/libraries/AP_RPM/RPM_Backend.h b/libraries/AP_RPM/RPM_Backend.h
index 77885969f3..c0a4c8cbcc 100644
--- a/libraries/AP_RPM/RPM_Backend.h
+++ b/libraries/AP_RPM/RPM_Backend.h
@@ -14,8 +14,6 @@
  */
 #pragma once
 
-#include <AP_Common/AP_Common.h>
-#include <AP_HAL/AP_HAL.h>
 #include "AP_RPM.h"
 
 class AP_RPM_Backend