diff --git a/src/Power.cpp b/src/Power.cpp
index 602b9a10c..c3aa60111 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -13,7 +13,7 @@
  * This file is part of the Meshtastic project.
  * For more information, see: https://meshtastic.org/
  */
-#include "power.h"
+#include "Power.h"
 #include "BluetoothCommon.h"
 #include "MessageStore.h"
 #include "NodeDB.h"
diff --git a/src/power.h b/src/Power.h
similarity index 100%
rename from src/power.h
rename to src/Power.h
diff --git a/src/PowerFSMThread.h b/src/PowerFSMThread.h
index 135f53298..47c45c262 100644
--- a/src/PowerFSMThread.h
+++ b/src/PowerFSMThread.h
@@ -1,10 +1,10 @@
 #include "Default.h"
 #include "NodeDB.h"
+#include "Power.h"
 #include "PowerFSM.h"
 #include "concurrency/OSThread.h"
 #include "configuration.h"
 #include "main.h"
-#include "power.h"
 
 namespace concurrency
 {
diff --git a/src/graphics/Screen.h b/src/graphics/Screen.h
index 21a96a1f4..424b162b4 100644
--- a/src/graphics/Screen.h
+++ b/src/graphics/Screen.h
@@ -43,7 +43,7 @@ struct BannerOverlayOptions {
 bool shouldWakeOnReceivedMessage();
 
 #if !HAS_SCREEN
-#include "power.h"
+#include "Power.h"
 namespace graphics
 {
 // Noop class for boards without screen.
@@ -107,6 +107,7 @@ class Screen
 #include "EInkDisplay2.h"
 #include "EInkDynamicDisplay.h"
 #include "PointStruct.h"
+#include "Power.h"
 #include "TFTDisplay.h"
 #include "TypedQueue.h"
 #include "commands.h"
@@ -116,7 +117,6 @@ class Screen
 #include "input/InputBroker.h"
 #include "mesh/MeshModule.h"
 #include "modules/AdminModule.h"
-#include "power.h"
 #include <string>
 #include <vector>
 
diff --git a/src/graphics/SharedUIDisplay.cpp b/src/graphics/SharedUIDisplay.cpp
index f74fbb3fb..989d00a73 100644
--- a/src/graphics/SharedUIDisplay.cpp
+++ b/src/graphics/SharedUIDisplay.cpp
@@ -2,6 +2,7 @@
 #if HAS_SCREEN
 #include "MeshService.h"
 #include "NodeDB.h"
+#include "Power.h"
 #include "RTC.h"
 #include "draw/NodeListRenderer.h"
 #include "graphics/ScreenFonts.h"
@@ -12,7 +13,6 @@
 #include "main.h"
 #include "meshtastic/config.pb.h"
 #include "modules/ExternalNotificationModule.h"
-#include "power.h"
 #include <OLEDDisplay.h>
 #include <cctype>
 #include <graphics/images.h>
diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
index a0c155521..6c1a1c79e 100644
--- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
@@ -7,6 +7,7 @@
 #include "MeshRadio.h"
 #include "MeshService.h"
 #include "MessageStore.h"
+#include "Power.h"
 #include "RTC.h"
 #include "Router.h"
 #include "airtime.h"
@@ -14,7 +15,6 @@
 #include "graphics/niche/Utils/FlashData.h"
 #include "main.h"
 #include "mesh/generated/meshtastic/deviceonly.pb.h"
-#include "power.h"
 #include <RadioLibInterface.h>
 #include <target_specific.h>
 #if defined(ARCH_ESP32) && HAS_WIFI
diff --git a/src/input/ButtonThread.cpp b/src/input/ButtonThread.cpp
index 3b0a46e88..481b245da 100644
--- a/src/input/ButtonThread.cpp
+++ b/src/input/ButtonThread.cpp
@@ -6,13 +6,13 @@
 #include "GPS.h"
 #endif
 #include "MeshService.h"
+#include "Power.h"
 #include "RadioLibInterface.h"
 #include "buzz.h"
 #include "input/InputBroker.h"
 #include "main.h"
 #include "modules/CannedMessageModule.h"
 #include "modules/ExternalNotificationModule.h"
-#include "power.h"
 #include "sleep.h"
 #ifdef ARCH_PORTDUINO
 #include "platform/portduino/PortduinoGlue.h"
diff --git a/src/input/i2cButton.cpp b/src/input/i2cButton.cpp
index d874146cd..6adf6ed63 100644
--- a/src/input/i2cButton.cpp
+++ b/src/input/i2cButton.cpp
@@ -5,13 +5,13 @@
 #if defined(M5STACK_UNITC6L)
 
 #include "MeshService.h"
+#include "Power.h"
 #include "RadioLibInterface.h"
 #include "buzz.h"
 #include "input/InputBroker.h"
 #include "main.h"
 #include "modules/CannedMessageModule.h"
 #include "modules/ExternalNotificationModule.h"
-#include "power.h"
 #include "sleep.h"
 #ifdef ARCH_PORTDUINO
 #include "platform/portduino/PortduinoGlue.h"
diff --git a/src/main.cpp b/src/main.cpp
index da07c6e01..4083bfac3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,6 +21,7 @@
 #include "power/PowerHAL.h"
 
 #include "FSCommon.h"
+#include "Power.h"
 #include "RTC.h"
 #include "SPILock.h"
 #include "Throttle.h"
@@ -28,7 +29,6 @@
 #include "concurrency/Periodic.h"
 #include "detect/ScanI2C.h"
 #include "error.h"
-#include "power.h"
 
 #if !MESHTASTIC_EXCLUDE_I2C
 #include "detect/ScanI2CConsumer.h"
diff --git a/src/mesh/MeshService.cpp b/src/mesh/MeshService.cpp
index 44e7e5cf4..dac6c4d98 100644
--- a/src/mesh/MeshService.cpp
+++ b/src/mesh/MeshService.cpp
@@ -9,6 +9,7 @@
 #include "MeshService.h"
 #include "MessageStore.h"
 #include "NodeDB.h"
+#include "Power.h"
 #include "PowerFSM.h"
 #include "RTC.h"
 #include "TypeConversions.h"
@@ -19,7 +20,6 @@
 #include "modules/NodeInfoModule.h"
 #include "modules/PositionModule.h"
 #include "modules/RoutingModule.h"
-#include "power.h"
 #include <assert.h>
 #include <string>
 
diff --git a/src/mesh/http/ContentHandler.cpp b/src/mesh/http/ContentHandler.cpp
index a2919ec08..598419c25 100644
--- a/src/mesh/http/ContentHandler.cpp
+++ b/src/mesh/http/ContentHandler.cpp
@@ -9,8 +9,8 @@
 #if HAS_WIFI
 #include "mesh/wifi/WiFiAPClient.h"
 #endif
+#include "Power.h"
 #include "SPILock.h"
-#include "power.h"
 #include <FSCommon.h>
 #include <HTTPBodyParser.hpp>
 #include <HTTPMultipartBodyParser.hpp>
diff --git a/src/modules/Telemetry/EnvironmentTelemetry.cpp b/src/modules/Telemetry/EnvironmentTelemetry.cpp
index 53dc3e7be..f87300917 100644
--- a/src/modules/Telemetry/EnvironmentTelemetry.cpp
+++ b/src/modules/Telemetry/EnvironmentTelemetry.cpp
@@ -7,6 +7,7 @@
 #include "EnvironmentTelemetry.h"
 #include "MeshService.h"
 #include "NodeDB.h"
+#include "Power.h"
 #include "PowerFSM.h"
 #include "RTC.h"
 #include "Router.h"
@@ -17,7 +18,6 @@
 #include "graphics/images.h"
 #include "main.h"
 #include "modules/ExternalNotificationModule.h"
-#include "power.h"
 #include "sleep.h"
 #include "target_specific.h"
 #include <OLEDDisplay.h>
diff --git a/src/modules/Telemetry/HealthTelemetry.cpp b/src/modules/Telemetry/HealthTelemetry.cpp
index da6ee2b58..c28dee38b 100644
--- a/src/modules/Telemetry/HealthTelemetry.cpp
+++ b/src/modules/Telemetry/HealthTelemetry.cpp
@@ -7,13 +7,13 @@
 #include "HealthTelemetry.h"
 #include "MeshService.h"
 #include "NodeDB.h"
+#include "Power.h"
 #include "PowerFSM.h"
 #include "RTC.h"
 #include "Router.h"
 #include "TransmitHistory.h"
 #include "UnitConversions.h"
 #include "main.h"
-#include "power.h"
 #include "sleep.h"
 #include "target_specific.h"
 #include <OLEDDisplay.h>
diff --git a/src/modules/Telemetry/PowerTelemetry.cpp b/src/modules/Telemetry/PowerTelemetry.cpp
index 6216f2bb7..33da66941 100644
--- a/src/modules/Telemetry/PowerTelemetry.cpp
+++ b/src/modules/Telemetry/PowerTelemetry.cpp
@@ -6,6 +6,7 @@
 #include "Default.h"
 #include "MeshService.h"
 #include "NodeDB.h"
+#include "Power.h"
 #include "PowerFSM.h"
 #include "PowerTelemetry.h"
 #include "RTC.h"
@@ -13,7 +14,6 @@
 #include "TransmitHistory.h"
 #include "graphics/SharedUIDisplay.h"
 #include "main.h"
-#include "power.h"
 #include "sleep.h"
 #include "target_specific.h"
 
diff --git a/src/motion/MotionSensor.h b/src/motion/MotionSensor.h
index c898faf51..717c89a9b 100755
--- a/src/motion/MotionSensor.h
+++ b/src/motion/MotionSensor.h
@@ -9,11 +9,11 @@
 
 #if !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
 
+#include "../Power.h"
 #include "../PowerFSM.h"
 #include "../detect/ScanI2C.h"
 #include "../graphics/Screen.h"
 #include "../graphics/ScreenFonts.h"
-#include "../power.h"
 #include "Wire.h"
 
 // Base class for motion processing
diff --git a/src/platform/nrf52/main-nrf52.cpp b/src/platform/nrf52/main-nrf52.cpp
index 5cf3a4465..f7b3a7d9a 100644
--- a/src/platform/nrf52/main-nrf52.cpp
+++ b/src/platform/nrf52/main-nrf52.cpp
@@ -19,11 +19,11 @@
 // #include <Adafruit_USBD_Device.h>
 #include "HardwareRNG.h"
 #include "NodeDB.h"
+#include "Power.h"
 #include "PowerMon.h"
 #include "error.h"
 #include "main.h"
 #include "meshUtils.h"
-#include "power.h"
 #include <power/PowerHAL.h>
 
 #include "Nrf52SaadcLock.h"
diff --git a/src/platform/nrf54l15/main-nrf54l15.cpp b/src/platform/nrf54l15/main-nrf54l15.cpp
index 82bf666a0..e3e597fc7 100644
--- a/src/platform/nrf54l15/main-nrf54l15.cpp
+++ b/src/platform/nrf54l15/main-nrf54l15.cpp
@@ -15,13 +15,13 @@
 #include <stdio.h>
 
 #include "NodeDB.h"
+#include "Power.h"
 #include "PowerMon.h"
 #include "Router.h"
 #include "error.h"
 #include "main.h"
 #include "mesh/MeshService.h"
 #include "meshUtils.h"
-#include "power.h"
 #include <power/PowerHAL.h>
 
 // ── Watchdog ──────────────────────────────────────────────────────────────
diff --git a/variants/nrf52840/ELECROW-ThinkNode-M6/variant.cpp b/variants/nrf52840/ELECROW-ThinkNode-M6/variant.cpp
index f15a03f4d..c09cee95b 100644
--- a/variants/nrf52840/ELECROW-ThinkNode-M6/variant.cpp
+++ b/variants/nrf52840/ELECROW-ThinkNode-M6/variant.cpp
@@ -19,8 +19,8 @@
 */
 
 #include "variant.h"
+#include "Power.h"
 #include "nrf.h"
-#include "power.h"
 #include "wiring_constants.h"
 #include "wiring_digital.h"