From cc1fd93f021baf09e1982818b09f487e4e873e54 Mon Sep 17 00:00:00 2001
From: Phillip Burgess <paintyourdragon@dslextreme.com>
Date: Fri, 19 Nov 2021 12:00:35 -0800
Subject: [PATCH] No functional change, cleaning up shotgun-style #includes

---
 Adafruit_BusIO_Register.h | 12 +++++-------
 Adafruit_I2CDevice.cpp    |  3 +--
 Adafruit_I2CDevice.h      |  6 +++---
 Adafruit_I2CRegister.h    |  3 ++-
 Adafruit_SPIDevice.cpp    |  3 +--
 Adafruit_SPIDevice.h      |  9 ++++-----
 6 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/Adafruit_BusIO_Register.h b/Adafruit_BusIO_Register.h
index 8454b21..e58bca1 100644
--- a/Adafruit_BusIO_Register.h
+++ b/Adafruit_BusIO_Register.h
@@ -1,12 +1,11 @@
-#include <Adafruit_I2CDevice.h>
-#include <Adafruit_SPIDevice.h>
-#include <Arduino.h>
+#ifndef Adafruit_BusIO_Register_h
+#define Adafruit_BusIO_Register_h
 
 #if !defined(SPI_INTERFACES_COUNT) ||                                          \
     (defined(SPI_INTERFACES_COUNT) && (SPI_INTERFACES_COUNT > 0))
 
-#ifndef Adafruit_BusIO_Register_h
-#define Adafruit_BusIO_Register_h
+#include <Adafruit_I2CDevice.h>
+#include <Adafruit_SPIDevice.h>
 
 typedef enum _Adafruit_BusIO_SPIRegType {
   ADDRBIT8_HIGH_TOREAD = 0,
@@ -100,6 +99,5 @@ private:
   uint8_t _bits, _shift;
 };
 
-#endif // BusIO_Register_h
-
 #endif // SPI exists
+#endif // BusIO_Register_h
diff --git a/Adafruit_I2CDevice.cpp b/Adafruit_I2CDevice.cpp
index bc09e78..9db9095 100644
--- a/Adafruit_I2CDevice.cpp
+++ b/Adafruit_I2CDevice.cpp
@@ -1,5 +1,4 @@
-#include <Adafruit_I2CDevice.h>
-#include <Arduino.h>
+#include "Adafruit_I2CDevice.h"
 
 //#define DEBUG_SERIAL Serial
 
diff --git a/Adafruit_I2CDevice.h b/Adafruit_I2CDevice.h
index 598b18d..1e27416 100644
--- a/Adafruit_I2CDevice.h
+++ b/Adafruit_I2CDevice.h
@@ -1,9 +1,9 @@
-#include <Arduino.h>
-#include <Wire.h>
-
 #ifndef Adafruit_I2CDevice_h
 #define Adafruit_I2CDevice_h
 
+#include <Arduino.h>
+#include <Wire.h>
+
 ///< The class which defines how we will talk to this device over I2C
 class Adafruit_I2CDevice {
 public:
diff --git a/Adafruit_I2CRegister.h b/Adafruit_I2CRegister.h
index 703e93b..041b7d0 100644
--- a/Adafruit_I2CRegister.h
+++ b/Adafruit_I2CRegister.h
@@ -1,7 +1,8 @@
-#include "Adafruit_BusIO_Register.h"
 #ifndef _ADAFRUIT_I2C_REGISTER_H_
 #define _ADAFRUIT_I2C_REGISTER_H_
 
+#include "Adafruit_BusIO_Register.h"
+
 typedef Adafruit_BusIO_Register Adafruit_I2CRegister;
 typedef Adafruit_BusIO_RegisterBits Adafruit_I2CRegisterBits;
 
diff --git a/Adafruit_SPIDevice.cpp b/Adafruit_SPIDevice.cpp
index f39627a..44b0edd 100644
--- a/Adafruit_SPIDevice.cpp
+++ b/Adafruit_SPIDevice.cpp
@@ -1,5 +1,4 @@
-#include <Adafruit_SPIDevice.h>
-#include <Arduino.h>
+#include "Adafruit_SPIDevice.h"
 
 #if !defined(SPI_INTERFACES_COUNT) ||                                          \
     (defined(SPI_INTERFACES_COUNT) && (SPI_INTERFACES_COUNT > 0))
diff --git a/Adafruit_SPIDevice.h b/Adafruit_SPIDevice.h
index 921030a..01cbed1 100644
--- a/Adafruit_SPIDevice.h
+++ b/Adafruit_SPIDevice.h
@@ -1,13 +1,12 @@
-#include <Arduino.h>
+#ifndef Adafruit_SPIDevice_h
+#define Adafruit_SPIDevice_h
 
 #if !defined(SPI_INTERFACES_COUNT) ||                                          \
     (defined(SPI_INTERFACES_COUNT) && (SPI_INTERFACES_COUNT > 0))
 
+#include <Arduino.h>
 #include <SPI.h>
 
-#ifndef Adafruit_SPIDevice_h
-#define Adafruit_SPIDevice_h
-
 // some modern SPI definitions don't have BitOrder enum
 #if (defined(__AVR__) && !defined(ARDUINO_ARCH_MEGAAVR)) ||                    \
     defined(ESP8266) || defined(TEENSYDUINO) || defined(SPARK) ||              \
@@ -103,5 +102,5 @@ private:
   bool _begun;
 };
 
-#endif // Adafruit_SPIDevice_h
 #endif // has SPI defined
+#endif // Adafruit_SPIDevice_h