diff --git a/pid/builder.cpp b/pid/builder.cpp
index 2787bf0..0ffadf1 100644
--- a/pid/builder.cpp
+++ b/pid/builder.cpp
@@ -22,9 +22,10 @@
 #include "pid/stepwisecontroller.hpp"
 #include "pid/thermalcontroller.hpp"
 
+#include <sdbusplus/bus.hpp>
+
 #include <iostream>
 #include <memory>
-#include <sdbusplus/bus.hpp>
 #include <unordered_map>
 
 static constexpr bool deferSignals = true;
diff --git a/pid/builder.hpp b/pid/builder.hpp
index 2a83f3f..a493a67 100644
--- a/pid/builder.hpp
+++ b/pid/builder.hpp
@@ -3,8 +3,9 @@
 #include "pid/zone.hpp"
 #include "sensors/manager.hpp"
 
-#include <memory>
 #include <sdbusplus/bus.hpp>
+
+#include <memory>
 #include <unordered_map>
 
 std::unordered_map<int64_t, std::unique_ptr<PIDZone>>
diff --git a/pid/buildjson.cpp b/pid/buildjson.cpp
index 5e90c47..9b3937b 100644
--- a/pid/buildjson.cpp
+++ b/pid/buildjson.cpp
@@ -18,8 +18,9 @@
 
 #include "conf.hpp"
 
-#include <map>
 #include <nlohmann/json.hpp>
+
+#include <map>
 #include <tuple>
 
 using json = nlohmann::json;
diff --git a/pid/buildjson.hpp b/pid/buildjson.hpp
index d4e86a7..2ac573a 100644
--- a/pid/buildjson.hpp
+++ b/pid/buildjson.hpp
@@ -2,8 +2,9 @@
 
 #include "conf.hpp"
 
-#include <map>
 #include <nlohmann/json.hpp>
+
+#include <map>
 #include <tuple>
 
 using json = nlohmann::json;
diff --git a/pid/fancontroller.hpp b/pid/fancontroller.hpp
index f3d3f4e..d14aef7 100644
--- a/pid/fancontroller.hpp
+++ b/pid/fancontroller.hpp
@@ -25,8 +25,7 @@
                   ZoneInterface* owner) :
         PIDController(id, owner),
         _inputs(inputs), _direction(FanSpeedDirection::NEUTRAL)
-    {
-    }
+    {}
 
     double inputProc(void) override;
     double setptProc(void) override;
diff --git a/pid/pidcontroller.hpp b/pid/pidcontroller.hpp
index 0b491e7..fd41c09 100644
--- a/pid/pidcontroller.hpp
+++ b/pid/pidcontroller.hpp
@@ -19,12 +19,10 @@
   public:
     PIDController(const std::string& id, ZoneInterface* owner) :
         Controller(), _owner(owner), _setpoint(0), _id(id)
-    {
-    }
+    {}
 
     virtual ~PIDController()
-    {
-    }
+    {}
 
     virtual double inputProc(void) override = 0;
     virtual double setptProc(void) = 0;
diff --git a/pid/pidloop.cpp b/pid/pidloop.cpp
index 56bf8bd..8dc6221 100644
--- a/pid/pidloop.cpp
+++ b/pid/pidloop.cpp
@@ -21,6 +21,7 @@
 #include "sensors/sensor.hpp"
 
 #include <boost/asio/steady_timer.hpp>
+
 #include <chrono>
 #include <map>
 #include <memory>
diff --git a/pid/stepwisecontroller.hpp b/pid/stepwisecontroller.hpp
index 4aa8116..90e2317 100644
--- a/pid/stepwisecontroller.hpp
+++ b/pid/stepwisecontroller.hpp
@@ -23,8 +23,7 @@
                        ZoneInterface* owner) :
         Controller(),
         _owner(owner), _id(id), _inputs(inputs)
-    {
-    }
+    {}
 
     double inputProc(void) override;
 
diff --git a/pid/thermalcontroller.hpp b/pid/thermalcontroller.hpp
index fa5aa4d..74e85ab 100644
--- a/pid/thermalcontroller.hpp
+++ b/pid/thermalcontroller.hpp
@@ -48,8 +48,7 @@
                       const ThermalType& type, ZoneInterface* owner) :
         PIDController(id, owner),
         _inputs(inputs), type(type)
-    {
-    }
+    {}
 
     double inputProc(void) override;
     double setptProc(void) override;
diff --git a/pid/zone.hpp b/pid/zone.hpp
index 3cf4e59..dc2ceb8 100644
--- a/pid/zone.hpp
+++ b/pid/zone.hpp
@@ -7,15 +7,16 @@
 #include "sensors/sensor.hpp"
 #include "tuning.hpp"
 
+#include <sdbusplus/bus.hpp>
+#include <sdbusplus/server.hpp>
+#include <xyz/openbmc_project/Control/Mode/server.hpp>
+
 #include <fstream>
 #include <map>
 #include <memory>
-#include <sdbusplus/bus.hpp>
-#include <sdbusplus/server.hpp>
 #include <set>
 #include <string>
 #include <vector>
-#include <xyz/openbmc_project/Control/Mode/server.hpp>
 
 template <typename... T>
 using ServerObject = typename sdbusplus::server::object::object<T...>;