diff --git a/command/channel_auth.cpp b/command/channel_auth.cpp
index fd1fa5b..e83ad95 100644
--- a/command/channel_auth.cpp
+++ b/command/channel_auth.cpp
@@ -2,18 +2,19 @@
 
 #include <ipmid/api.h>
 
-#include <fstream>
 #include <ipmid/types.hpp>
 #include <ipmid/utils.hpp>
 #include <nlohmann/json.hpp>
 #include <phosphor-logging/elog-errors.hpp>
 #include <phosphor-logging/log.hpp>
-#include <set>
-#include <string>
 #include <user_channel/channel_layer.hpp>
 #include <user_channel/user_layer.hpp>
 #include <xyz/openbmc_project/Common/error.hpp>
 
+#include <fstream>
+#include <set>
+#include <string>
+
 namespace command
 {
 
diff --git a/command/guid.cpp b/command/guid.cpp
index c69f825..26e73e8 100644
--- a/command/guid.cpp
+++ b/command/guid.cpp
@@ -4,6 +4,7 @@
 #include <mapper.h>
 
 #include <phosphor-logging/log.hpp>
+
 #include <sstream>
 #include <string>
 
diff --git a/command/guid.hpp b/command/guid.hpp
index f73e449..04f289a 100644
--- a/command/guid.hpp
+++ b/command/guid.hpp
@@ -2,8 +2,9 @@
 
 #include "comm_module.hpp"
 
-#include <cstddef>
 #include <sdbusplus/bus/match.hpp>
+
+#include <cstddef>
 #include <vector>
 
 namespace command
diff --git a/command/rakp12.cpp b/command/rakp12.cpp
index b8dc17c..bec5c4f 100644
--- a/command/rakp12.cpp
+++ b/command/rakp12.cpp
@@ -7,11 +7,12 @@
 
 #include <openssl/rand.h>
 
+#include <ipmid/types.hpp>
+#include <phosphor-logging/log.hpp>
+
 #include <algorithm>
 #include <cstring>
 #include <iomanip>
-#include <ipmid/types.hpp>
-#include <phosphor-logging/log.hpp>
 
 using namespace phosphor::logging;
 
diff --git a/command/rakp34.cpp b/command/rakp34.cpp
index cfa2363..bee475d 100644
--- a/command/rakp34.cpp
+++ b/command/rakp34.cpp
@@ -6,9 +6,10 @@
 #include "rmcp.hpp"
 #include "sessions_manager.hpp"
 
+#include <phosphor-logging/log.hpp>
+
 #include <algorithm>
 #include <cstring>
-#include <phosphor-logging/log.hpp>
 
 using namespace phosphor::logging;
 
@@ -67,7 +68,6 @@
 std::vector<uint8_t> RAKP34(const std::vector<uint8_t>& inPayload,
                             std::shared_ptr<message::Handler>& handler)
 {
-
     std::vector<uint8_t> outPayload(sizeof(RAKP4response));
     auto request = reinterpret_cast<const RAKP3request*>(inPayload.data());
     auto response = reinterpret_cast<RAKP4response*>(outPayload.data());
diff --git a/command/session_cmds.cpp b/command/session_cmds.cpp
index da34c3c..25e906e 100644
--- a/command/session_cmds.cpp
+++ b/command/session_cmds.cpp
@@ -5,11 +5,12 @@
 
 #include <ipmid/api.h>
 
-#include <chrono>
 #include <ipmid/sessionhelper.hpp>
 #include <ipmid/utils.hpp>
 #include <phosphor-logging/log.hpp>
 
+#include <chrono>
+
 using namespace std::chrono_literals;
 
 namespace command
diff --git a/command/session_cmds.hpp b/command/session_cmds.hpp
index 026b9d8..05c312e 100644
--- a/command/session_cmds.hpp
+++ b/command/session_cmds.hpp
@@ -21,7 +21,6 @@
  */
 struct SetSessionPrivLevelReq
 {
-
 #if BYTE_ORDER == LITTLE_ENDIAN
     uint8_t reqPrivLevel : 4;
     uint8_t reserved : 4;