diff --git a/phalerror/create_pel.cpp b/phalerror/create_pel.cpp
index ac1fff7..e3e6117 100644
--- a/phalerror/create_pel.cpp
+++ b/phalerror/create_pel.cpp
@@ -5,18 +5,19 @@
 #include <libekb.H>
 #include <unistd.h>
 
+#include <phosphor-logging/elog.hpp>
+#include <xyz/openbmc_project/Logging/Create/server.hpp>
+#include <xyz/openbmc_project/Logging/Entry/server.hpp>
+
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <map>
-#include <phosphor-logging/elog.hpp>
 #include <stdexcept>
 #include <string>
 #include <tuple>
 #include <vector>
-#include <xyz/openbmc_project/Logging/Create/server.hpp>
-#include <xyz/openbmc_project/Logging/Entry/server.hpp>
 
 namespace openpower
 {
diff --git a/phalerror/create_pel.hpp b/phalerror/create_pel.hpp
index b365272..0c6ee42 100644
--- a/phalerror/create_pel.hpp
+++ b/phalerror/create_pel.hpp
@@ -2,6 +2,7 @@
 
 #include <nlohmann/json.hpp>
 #include <sdbusplus/bus.hpp>
+
 #include <string>
 #include <vector>
 namespace openpower
diff --git a/phalerror/phal_error.cpp b/phalerror/phal_error.cpp
index 2cd8d5b..5cd8eca 100644
--- a/phalerror/phal_error.cpp
+++ b/phalerror/phal_error.cpp
@@ -1,4 +1,5 @@
-extern "C" {
+extern "C"
+{
 #include <libpdbg.h>
 }
 
@@ -10,14 +11,15 @@
 #include <libekb.H>
 #include <libipl.H>
 
+#include <nlohmann/json.hpp>
+#include <phosphor-logging/elog.hpp>
+
 #include <algorithm>
 #include <cstdlib>
 #include <cstring>
 #include <iomanip>
 #include <list>
 #include <map>
-#include <nlohmann/json.hpp>
-#include <phosphor-logging/elog.hpp>
 #include <sstream>
 #include <string>