diff --git a/bmc_state_manager.cpp b/bmc_state_manager.cpp
index bf10c22..26deec9 100644
--- a/bmc_state_manager.cpp
+++ b/bmc_state_manager.cpp
@@ -1,11 +1,15 @@
-#include <cassert>
-#include <phosphor-logging/log.hpp>
-#include <phosphor-logging/elog-errors.hpp>
-#include <sdbusplus/exception.hpp>
-#include <sys/sysinfo.h>
 #include "bmc_state_manager.hpp"
+
 #include "xyz/openbmc_project/Common/error.hpp"
 
+#include <sys/sysinfo.h>
+
+#include <phosphor-logging/elog-errors.hpp>
+#include <phosphor-logging/log.hpp>
+#include <sdbusplus/exception.hpp>
+
+#include <cassert>
+
 namespace phosphor
 {
 namespace state