diff --git a/phosphor-rsyslog-config/main.cpp b/phosphor-rsyslog-config/main.cpp
index 22f7b08..3814751 100644
--- a/phosphor-rsyslog-config/main.cpp
+++ b/phosphor-rsyslog-config/main.cpp
@@ -1,11 +1,11 @@
 #include "config.h"
 
+#include "config_main.h"
+
 #include "server-conf.hpp"
 
 #include <sdbusplus/bus.hpp>
 
-#include "config_main.h"
-
 int main(int /*argc*/, char* /*argv*/[])
 {
     auto bus = sdbusplus::bus::new_default();
diff --git a/phosphor-rsyslog-config/server-conf.cpp b/phosphor-rsyslog-config/server-conf.cpp
index ad12a9e..7aa4cba 100644
--- a/phosphor-rsyslog-config/server-conf.cpp
+++ b/phosphor-rsyslog-config/server-conf.cpp
@@ -3,8 +3,9 @@
 #include "utils.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 
-#include <fstream>
 #include <phosphor-logging/elog.hpp>
+
+#include <fstream>
 #if __has_include("../../usr/include/phosphor-logging/elog-errors.hpp")
 #include "../../usr/include/phosphor-logging/elog-errors.hpp"
 #else
@@ -67,8 +68,8 @@
                 // There is no ':', or no more content after ':', invalid config
                 return {};
             }
-            serverAddress =
-                line.substr(posColonLeft + 1, posColonRight - posColonLeft - 1);
+            serverAddress = line.substr(posColonLeft + 1,
+                                        posColonRight - posColonLeft - 1);
             serverPort = line.substr(posColonRight + 2);
         }
         else
diff --git a/phosphor-rsyslog-config/server-conf.hpp b/phosphor-rsyslog-config/server-conf.hpp
index 5a5781a..57c292c 100644
--- a/phosphor-rsyslog-config/server-conf.hpp
+++ b/phosphor-rsyslog-config/server-conf.hpp
@@ -5,6 +5,7 @@
 #include <phosphor-logging/log.hpp>
 #include <sdbusplus/bus.hpp>
 #include <sdbusplus/server/object.hpp>
+
 #include <string>
 
 namespace phosphor