diff --git a/procedures/common/cfam_overrides.cpp b/procedures/common/cfam_overrides.cpp
index ea311f5..40738ac 100644
--- a/procedures/common/cfam_overrides.cpp
+++ b/procedures/common/cfam_overrides.cpp
@@ -3,13 +3,14 @@
 #include "registration.hpp"
 #include "targeting.hpp"
 
-#include <fstream>
-#include <iostream>
 #include <phosphor-logging/elog-errors.hpp>
 #include <phosphor-logging/elog.hpp>
-#include <sstream>
 #include <xyz/openbmc_project/Common/error.hpp>
 
+#include <fstream>
+#include <iostream>
+#include <sstream>
+
 /* File /var/lib/obmc/cfam_overrides requires whitespace-separated parameters
 Pos Address Data Mask with one register write per line. For example:
 0 0x283F 0x12345678 0xF0F0F0F0
diff --git a/procedures/common/cfam_reset.cpp b/procedures/common/cfam_reset.cpp
index 9a09d18..5427381 100644
--- a/procedures/common/cfam_reset.cpp
+++ b/procedures/common/cfam_reset.cpp
@@ -1,10 +1,11 @@
 #include <unistd.h>
 
-#include <chrono>
-#include <fstream>
 #include <gpiod.hpp>
 #include <phosphor-logging/log.hpp>
 #include <registration.hpp>
+
+#include <chrono>
+#include <fstream>
 #include <system_error>
 #include <thread>
 
diff --git a/procedures/common/enter_mpreboot.cpp b/procedures/common/enter_mpreboot.cpp
index 48e6ff3..99e559f 100644
--- a/procedures/common/enter_mpreboot.cpp
+++ b/procedures/common/enter_mpreboot.cpp
@@ -21,6 +21,7 @@
 #include <unistd.h>
 
 #include <phosphor-logging/log.hpp>
+
 #include <system_error>
 #include <vector>
 
diff --git a/procedures/openfsi/scan.cpp b/procedures/openfsi/scan.cpp
index a9583c6..48e00a3 100644
--- a/procedures/openfsi/scan.cpp
+++ b/procedures/openfsi/scan.cpp
@@ -15,12 +15,13 @@
  */
 #include "registration.hpp"
 
-#include <filesystem>
-#include <fstream>
 #include <org/open_power/Proc/FSI/error.hpp>
 #include <phosphor-logging/elog-errors.hpp>
 #include <phosphor-logging/log.hpp>
 
+#include <filesystem>
+#include <fstream>
+
 namespace openpower
 {
 namespace openfsi
diff --git a/procedures/phal/start_host.cpp b/procedures/phal/start_host.cpp
index 21d2d62..b82a584 100644
--- a/procedures/phal/start_host.cpp
+++ b/procedures/phal/start_host.cpp
@@ -1,7 +1,10 @@
-extern "C" {
+extern "C"
+{
 #include <libpdbg.h>
 }
 
+#include "attributes_info.H"
+
 #include "phalerror/phal_error.hpp"
 
 #include <libekb.H>
@@ -10,8 +13,6 @@
 #include <ext_interface.hpp>
 #include <phosphor-logging/log.hpp>
 #include <registration.hpp>
-
-#include "attributes_info.H"
 namespace openpower
 {
 namespace phal