diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp
index f7e39fc8a..8cfea154e 100644
--- a/src/modules/CannedMessageModule.cpp
+++ b/src/modules/CannedMessageModule.cpp
@@ -431,7 +431,7 @@ int32_t CannedMessageModule::runOnce()
                 runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
                 break;
             case 0x9e: // toggle GPS like triple press does
-#if !MESHTASTIC_EXCLUDE_GPS            
+#if !MESHTASTIC_EXCLUDE_GPS
                 if (gps != nullptr) {
                     gps->toggleGpsMode();
                 }
diff --git a/src/modules/Telemetry/AirQualityTelemetry.cpp b/src/modules/Telemetry/AirQualityTelemetry.cpp
index 86d296c34..e4f31ff9f 100644
--- a/src/modules/Telemetry/AirQualityTelemetry.cpp
+++ b/src/modules/Telemetry/AirQualityTelemetry.cpp
@@ -2,8 +2,8 @@
 
 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
-#include "AirQualityTelemetry.h"
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "AirQualityTelemetry.h"
 #include "Default.h"
 #include "MeshService.h"
 #include "NodeDB.h"
diff --git a/src/modules/Telemetry/EnvironmentTelemetry.cpp b/src/modules/Telemetry/EnvironmentTelemetry.cpp
index 8e2801a49..d77a45f18 100644
--- a/src/modules/Telemetry/EnvironmentTelemetry.cpp
+++ b/src/modules/Telemetry/EnvironmentTelemetry.cpp
@@ -2,9 +2,9 @@
 
 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
-#include "EnvironmentTelemetry.h"
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "Default.h"
+#include "EnvironmentTelemetry.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
diff --git a/src/modules/Telemetry/PowerTelemetry.cpp b/src/modules/Telemetry/PowerTelemetry.cpp
index 94d47d08a..e61a4e629 100644
--- a/src/modules/Telemetry/PowerTelemetry.cpp
+++ b/src/modules/Telemetry/PowerTelemetry.cpp
@@ -2,12 +2,12 @@
 
 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
-#include "PowerTelemetry.h"
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "Default.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
+#include "PowerTelemetry.h"
 #include "RTC.h"
 #include "Router.h"
 #include "main.h"
diff --git a/src/modules/Telemetry/Sensor/BME280Sensor.cpp b/src/modules/Telemetry/Sensor/BME280Sensor.cpp
index 396ba1242..aea6f2c3d 100644
--- a/src/modules/Telemetry/Sensor/BME280Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/BME280Sensor.cpp
@@ -2,8 +2,8 @@
 
 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
-#include "BME280Sensor.h"
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "BME280Sensor.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_BME280.h>
 #include <typeinfo>
diff --git a/src/modules/Telemetry/Sensor/BME680Sensor.cpp b/src/modules/Telemetry/Sensor/BME680Sensor.cpp
index 77c78e587..f2c3804f4 100644
--- a/src/modules/Telemetry/Sensor/BME680Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/BME680Sensor.cpp
@@ -2,8 +2,8 @@
 
 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
-#include "BME680Sensor.h"
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "BME680Sensor.h"
 #include "FSCommon.h"
 #include "TelemetrySensor.h"
 
diff --git a/src/modules/Telemetry/Sensor/BMP085Sensor.cpp b/src/modules/Telemetry/Sensor/BMP085Sensor.cpp
index be17ddcc2..0c4d0b5ca 100644
--- a/src/modules/Telemetry/Sensor/BMP085Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/BMP085Sensor.cpp
@@ -2,8 +2,8 @@
 
 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
-#include "BMP085Sensor.h"
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "BMP085Sensor.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_BMP085.h>
 #include <typeinfo>
diff --git a/src/modules/Telemetry/Sensor/BMP280Sensor.cpp b/src/modules/Telemetry/Sensor/BMP280Sensor.cpp
index fbaa9faaa..8d0e4c180 100644
--- a/src/modules/Telemetry/Sensor/BMP280Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/BMP280Sensor.cpp
@@ -2,8 +2,8 @@
 
 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
-#include "BMP280Sensor.h"
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "BMP280Sensor.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_BMP280.h>
 #include <typeinfo>
diff --git a/src/modules/Telemetry/Sensor/INA219Sensor.cpp b/src/modules/Telemetry/Sensor/INA219Sensor.cpp
index 52aaec964..040e59575 100644
--- a/src/modules/Telemetry/Sensor/INA219Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/INA219Sensor.cpp
@@ -2,8 +2,8 @@
 
 #if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
-#include "INA219Sensor.h"
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "INA219Sensor.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_INA219.h>
 
diff --git a/src/modules/Telemetry/Sensor/INA260Sensor.cpp b/src/modules/Telemetry/Sensor/INA260Sensor.cpp
index 4c51c7f0d..f156a9aba 100644
--- a/src/modules/Telemetry/Sensor/INA260Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/INA260Sensor.cpp
@@ -2,8 +2,8 @@
 
 #if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
-#include "INA260Sensor.h"
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "INA260Sensor.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_INA260.h>
 
diff --git a/src/modules/Telemetry/Sensor/INA3221Sensor.cpp b/src/modules/Telemetry/Sensor/INA3221Sensor.cpp
index a3e8af153..ea2cb4ea8 100644
--- a/src/modules/Telemetry/Sensor/INA3221Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/INA3221Sensor.cpp
@@ -2,8 +2,8 @@
 
 #if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
-#include "INA3221Sensor.h"
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "INA3221Sensor.h"
 #include "TelemetrySensor.h"
 #include <INA3221.h>
 
diff --git a/src/modules/Telemetry/Sensor/LPS22HBSensor.cpp b/src/modules/Telemetry/Sensor/LPS22HBSensor.cpp
index 0bd7f145e..c3c994cfa 100644
--- a/src/modules/Telemetry/Sensor/LPS22HBSensor.cpp
+++ b/src/modules/Telemetry/Sensor/LPS22HBSensor.cpp
@@ -2,8 +2,8 @@
 
 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
-#include "LPS22HBSensor.h"
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "LPS22HBSensor.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_LPS2X.h>
 #include <Adafruit_Sensor.h>
diff --git a/src/modules/Telemetry/Sensor/MCP9808Sensor.cpp b/src/modules/Telemetry/Sensor/MCP9808Sensor.cpp
index 9bb8947a2..b01a19291 100644
--- a/src/modules/Telemetry/Sensor/MCP9808Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/MCP9808Sensor.cpp
@@ -2,8 +2,8 @@
 
 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
-#include "MCP9808Sensor.h"
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "MCP9808Sensor.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_MCP9808.h>
 
diff --git a/src/modules/Telemetry/Sensor/SHT31Sensor.cpp b/src/modules/Telemetry/Sensor/SHT31Sensor.cpp
index 787372b0c..aa2b5dcfc 100644
--- a/src/modules/Telemetry/Sensor/SHT31Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/SHT31Sensor.cpp
@@ -2,8 +2,8 @@
 
 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
-#include "SHT31Sensor.h"
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "SHT31Sensor.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_SHT31.h>
 
diff --git a/src/modules/Telemetry/Sensor/SHTC3Sensor.cpp b/src/modules/Telemetry/Sensor/SHTC3Sensor.cpp
index 39b9570fa..37685fed7 100644
--- a/src/modules/Telemetry/Sensor/SHTC3Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/SHTC3Sensor.cpp
@@ -2,8 +2,8 @@
 
 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
-#include "SHTC3Sensor.h"
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "SHTC3Sensor.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_SHTC3.h>
 
diff --git a/src/modules/Telemetry/Sensor/TelemetrySensor.cpp b/src/modules/Telemetry/Sensor/TelemetrySensor.cpp
index 1c58b37e7..d6e7d1fac 100644
--- a/src/modules/Telemetry/Sensor/TelemetrySensor.cpp
+++ b/src/modules/Telemetry/Sensor/TelemetrySensor.cpp
@@ -2,9 +2,9 @@
 
 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
-#include "TelemetrySensor.h"
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "NodeDB.h"
+#include "TelemetrySensor.h"
 #include "main.h"
 
 #endif
\ No newline at end of file
diff --git a/src/power.h b/src/power.h
index 1fa683f8e..8d14ed7f8 100644
--- a/src/power.h
+++ b/src/power.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "configuration.h"
 #include "PowerStatus.h"
 #include "concurrency/OSThread.h"
+#include "configuration.h"
 #ifdef ARCH_ESP32
 #include <esp_adc_cal.h>
 #include <soc/adc_channel.h>