diff --git a/power-supply/average.hpp b/power-supply/average.hpp
index 5fdf0b8..bbbda54 100644
--- a/power-supply/average.hpp
+++ b/power-supply/average.hpp
@@ -1,7 +1,8 @@
 #pragma once
-#include <functional>
 #include <org/open_power/Sensor/Aggregation/History/Average/server.hpp>
 
+#include <functional>
+
 namespace phosphor
 {
 namespace power
diff --git a/power-supply/main.cpp b/power-supply/main.cpp
index ccb56e7..00dae73 100644
--- a/power-supply/main.cpp
+++ b/power-supply/main.cpp
@@ -19,10 +19,11 @@
 #include "device_monitor.hpp"
 #include "power_supply.hpp"
 
-#include <iostream>
 #include <phosphor-logging/log.hpp>
 #include <sdeventplus/event.hpp>
 
+#include <iostream>
+
 using namespace phosphor::power;
 using namespace phosphor::logging;
 
diff --git a/power-supply/maximum.hpp b/power-supply/maximum.hpp
index 68d3d03..2056510 100644
--- a/power-supply/maximum.hpp
+++ b/power-supply/maximum.hpp
@@ -1,7 +1,8 @@
 #pragma once
-#include <functional>
 #include <org/open_power/Sensor/Aggregation/History/Maximum/server.hpp>
 
+#include <functional>
+
 namespace phosphor
 {
 namespace power
diff --git a/power-supply/power_supply.cpp b/power-supply/power_supply.cpp
index 981435f..c10fdf7 100644
--- a/power-supply/power_supply.cpp
+++ b/power-supply/power_supply.cpp
@@ -24,12 +24,13 @@
 #include "types.hpp"
 #include "utility.hpp"
 
-#include <functional>
 #include <org/open_power/Witherspoon/Fault/error.hpp>
 #include <phosphor-logging/log.hpp>
 #include <xyz/openbmc_project/Common/Device/error.hpp>
 #include <xyz/openbmc_project/Software/Version/server.hpp>
 
+#include <functional>
+
 namespace phosphor
 {
 namespace power
diff --git a/power-supply/record_manager.cpp b/power-supply/record_manager.cpp
index 3ff655b..53e8fe3 100644
--- a/power-supply/record_manager.cpp
+++ b/power-supply/record_manager.cpp
@@ -17,9 +17,10 @@
 
 #include <math.h>
 
-#include <chrono>
 #include <phosphor-logging/log.hpp>
 
+#include <chrono>
+
 namespace phosphor
 {
 namespace power