diff --git a/sensors/buildjson.cpp b/sensors/buildjson.cpp
index 482173d..7e5e29a 100644
--- a/sensors/buildjson.cpp
+++ b/sensors/buildjson.cpp
@@ -19,9 +19,10 @@
 #include "conf.hpp"
 #include "sensors/sensor.hpp"
 
-#include <cstdio>
 #include <nlohmann/json.hpp>
 
+#include <cstdio>
+
 using json = nlohmann::json;
 
 namespace conf
diff --git a/sensors/buildjson.hpp b/sensors/buildjson.hpp
index 0a38b93..979cd87 100644
--- a/sensors/buildjson.hpp
+++ b/sensors/buildjson.hpp
@@ -2,8 +2,9 @@
 
 #include "conf.hpp"
 
-#include <map>
 #include <nlohmann/json.hpp>
+
+#include <map>
 #include <string>
 
 using json = nlohmann::json;
diff --git a/sensors/host.hpp b/sensors/host.hpp
index 82b1747..7983e8a 100644
--- a/sensors/host.hpp
+++ b/sensors/host.hpp
@@ -2,13 +2,14 @@
 
 #include "sensor.hpp"
 
-#include <memory>
-#include <mutex>
 #include <sdbusplus/bus.hpp>
 #include <sdbusplus/server.hpp>
-#include <type_traits>
 #include <xyz/openbmc_project/Sensor/Value/server.hpp>
 
+#include <memory>
+#include <mutex>
+#include <type_traits>
+
 template <typename... T>
 using ServerObject = typename sdbusplus::server::object::object<T...>;
 
@@ -45,8 +46,7 @@
                sdbusplus::bus::bus& bus, const char* objPath, bool defer) :
         Sensor(name, timeout),
         ValueObject(bus, objPath, defer)
-    {
-    }
+    {}
 
     ValueType value(ValueType value) override;
 
diff --git a/sensors/manager.hpp b/sensors/manager.hpp
index 411b302..740ef00 100644
--- a/sensors/manager.hpp
+++ b/sensors/manager.hpp
@@ -2,10 +2,11 @@
 
 #include "sensors/sensor.hpp"
 
-#include <map>
-#include <memory>
 #include <sdbusplus/bus.hpp>
 #include <sdbusplus/server.hpp>
+
+#include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/sensors/pluggable.hpp b/sensors/pluggable.hpp
index 396a49c..756b5cb 100644
--- a/sensors/pluggable.hpp
+++ b/sensors/pluggable.hpp
@@ -3,8 +3,9 @@
 #include "interfaces.hpp"
 #include "sensor.hpp"
 
-#include <memory>
 #include <sdbusplus/bus.hpp>
+
+#include <memory>
 #include <string>
 
 /*
@@ -18,8 +19,7 @@
                     std::unique_ptr<WriteInterface> writer) :
         Sensor(name, timeout),
         _reader(std::move(reader)), _writer(std::move(writer))
-    {
-    }
+    {}
 
     ReadReturn read(void) override;
     void write(double value) override;
diff --git a/sensors/sensor.hpp b/sensors/sensor.hpp
index 2dbfa30..a447ae0 100644
--- a/sensors/sensor.hpp
+++ b/sensors/sensor.hpp
@@ -27,12 +27,10 @@
 
     Sensor(const std::string& name, int64_t timeout) :
         _name(name), _timeout(timeout)
-    {
-    }
+    {}
 
     virtual ~Sensor()
-    {
-    }
+    {}
 
     virtual ReadReturn read(void) = 0;
     virtual void write(double value) = 0;