diff --git a/dbus/dbusactiveread.hpp b/dbus/dbusactiveread.hpp
index 235f038..37ff9bc 100644
--- a/dbus/dbusactiveread.hpp
+++ b/dbus/dbusactiveread.hpp
@@ -3,8 +3,9 @@
 #include "interfaces.hpp"
 #include "util.hpp"
 
-#include <memory>
 #include <sdbusplus/bus.hpp>
+
+#include <memory>
 #include <string>
 
 /*
@@ -18,8 +19,7 @@
                    const std::string& service, DbusHelperInterface* helper) :
         ReadInterface(),
         _bus(bus), _path(path), _service(service), _helper(helper)
-    {
-    }
+    {}
 
     ReadReturn read(void) override;
 
diff --git a/dbus/dbusconfiguration.cpp b/dbus/dbusconfiguration.cpp
index bfa2a7c..e1ca91c 100644
--- a/dbus/dbusconfiguration.cpp
+++ b/dbus/dbusconfiguration.cpp
@@ -17,16 +17,17 @@
 #include "conf.hpp"
 #include "util.hpp"
 
-#include <algorithm>
 #include <boost/asio/steady_timer.hpp>
+#include <sdbusplus/bus.hpp>
+#include <sdbusplus/bus/match.hpp>
+#include <sdbusplus/exception.hpp>
+
+#include <algorithm>
 #include <chrono>
 #include <functional>
 #include <iostream>
 #include <list>
 #include <regex>
-#include <sdbusplus/bus.hpp>
-#include <sdbusplus/bus/match.hpp>
-#include <sdbusplus/exception.hpp>
 #include <set>
 #include <unordered_map>
 #include <variant>
diff --git a/dbus/dbuspassive.cpp b/dbus/dbuspassive.cpp
index 02d1beb..5cd8ca4 100644
--- a/dbus/dbuspassive.cpp
+++ b/dbus/dbuspassive.cpp
@@ -18,11 +18,12 @@
 #include "dbuspassiveredundancy.hpp"
 #include "util.hpp"
 
+#include <sdbusplus/bus.hpp>
+
 #include <chrono>
 #include <cmath>
 #include <memory>
 #include <mutex>
-#include <sdbusplus/bus.hpp>
 #include <string>
 #include <variant>
 
diff --git a/dbus/dbuspassive.hpp b/dbus/dbuspassive.hpp
index 91733e9..16cf856 100644
--- a/dbus/dbuspassive.hpp
+++ b/dbus/dbuspassive.hpp
@@ -5,15 +5,16 @@
 #include "interfaces.hpp"
 #include "util.hpp"
 
+#include <sdbusplus/bus.hpp>
+#include <sdbusplus/message.hpp>
+#include <sdbusplus/server.hpp>
+
 #include <chrono>
 #include <cmath>
 #include <iostream>
 #include <map>
 #include <memory>
 #include <mutex>
-#include <sdbusplus/bus.hpp>
-#include <sdbusplus/message.hpp>
-#include <sdbusplus/server.hpp>
 #include <set>
 #include <string>
 #include <tuple>
diff --git a/dbus/dbuspassiveredundancy.cpp b/dbus/dbuspassiveredundancy.cpp
index c7a1d0f..11533f2 100644
--- a/dbus/dbuspassiveredundancy.cpp
+++ b/dbus/dbuspassiveredundancy.cpp
@@ -16,9 +16,10 @@
 
 #include "dbuspassiveredundancy.hpp"
 
-#include <iostream>
 #include <sdbusplus/bus.hpp>
 #include <sdbusplus/bus/match.hpp>
+
+#include <iostream>
 #include <set>
 #include <unordered_map>
 #include <variant>
diff --git a/dbus/dbuspassiveredundancy.hpp b/dbus/dbuspassiveredundancy.hpp
index 7330baa..1c5c975 100644
--- a/dbus/dbuspassiveredundancy.hpp
+++ b/dbus/dbuspassiveredundancy.hpp
@@ -18,6 +18,7 @@
 
 #include <sdbusplus/bus.hpp>
 #include <sdbusplus/bus/match.hpp>
+
 #include <set>
 
 /*
diff --git a/dbus/dbuswrite.cpp b/dbus/dbuswrite.cpp
index 76f4ada..2cff7ea 100644
--- a/dbus/dbuswrite.cpp
+++ b/dbus/dbuswrite.cpp
@@ -16,10 +16,11 @@
 
 #include "dbus/dbuswrite.hpp"
 
-#include <iostream>
-#include <memory>
 #include <phosphor-logging/log.hpp>
 #include <sdbusplus/bus.hpp>
+
+#include <iostream>
+#include <memory>
 #include <string>
 #include <variant>
 
diff --git a/dbus/dbuswrite.hpp b/dbus/dbuswrite.hpp
index 757ea9b..b8a6035 100644
--- a/dbus/dbuswrite.hpp
+++ b/dbus/dbuswrite.hpp
@@ -19,8 +19,9 @@
 #include "interfaces.hpp"
 #include "util.hpp"
 
-#include <memory>
 #include <sdbusplus/bus.hpp>
+
+#include <memory>
 #include <string>
 
 class DbusWritePercent : public WriteInterface
@@ -34,8 +35,7 @@
                      const std::string& connectionName) :
         WriteInterface(min, max),
         path(path), connectionName(connectionName)
-    {
-    }
+    {}
 
     void write(double value) override;
 
@@ -56,8 +56,7 @@
               const std::string& connectionName) :
         WriteInterface(min, max),
         path(path), connectionName(connectionName)
-    {
-    }
+    {}
 
     void write(double value) override;
 
diff --git a/dbus/util.cpp b/dbus/util.cpp
index 33e0985..93efc6d 100644
--- a/dbus/util.cpp
+++ b/dbus/util.cpp
@@ -1,8 +1,9 @@
 #include "util.hpp"
 
+#include <phosphor-logging/log.hpp>
+
 #include <cmath>
 #include <iostream>
-#include <phosphor-logging/log.hpp>
 #include <set>
 #include <variant>