diff --git a/tools/bt.cpp b/tools/bt.cpp
index d1e4dc7..26c333b 100644
--- a/tools/bt.cpp
+++ b/tools/bt.cpp
@@ -1,7 +1,8 @@
 #include "bt.hpp"
 
-#include <cstdint>
 #include <ipmiblob/blob_errors.hpp>
+
+#include <cstdint>
 #include <vector>
 
 namespace host_tool
diff --git a/tools/handler.cpp b/tools/handler.cpp
index dbaa53f..d175e85 100644
--- a/tools/handler.cpp
+++ b/tools/handler.cpp
@@ -22,10 +22,11 @@
 #include "tool_errors.hpp"
 #include "util.hpp"
 
+#include <ipmiblob/blob_errors.hpp>
+
 #include <algorithm>
 #include <cstdint>
 #include <cstring>
-#include <ipmiblob/blob_errors.hpp>
 #include <string>
 #include <vector>
 
@@ -166,8 +167,7 @@
         std::fprintf(stderr, "Closing cleanup blob\n");
     }
     catch (...)
-    {
-    }
+    {}
 
     blob->closeBlob(session);
 }
diff --git a/tools/handler.hpp b/tools/handler.hpp
index a0dae56..5820fba 100644
--- a/tools/handler.hpp
+++ b/tools/handler.hpp
@@ -3,6 +3,7 @@
 #include "interface.hpp"
 
 #include <ipmiblob/blob_interface.hpp>
+
 #include <string>
 
 namespace host_tool
@@ -54,8 +55,7 @@
   public:
     UpdateHandler(ipmiblob::BlobInterface* blob, DataInterface* handler) :
         blob(blob), handler(handler)
-    {
-    }
+    {}
 
     ~UpdateHandler() = default;
 
diff --git a/tools/helper.cpp b/tools/helper.cpp
index 7bce39f..fbb0275 100644
--- a/tools/helper.cpp
+++ b/tools/helper.cpp
@@ -19,8 +19,9 @@
 #include "status.hpp"
 #include "tool_errors.hpp"
 
-#include <chrono>
 #include <ipmiblob/blob_errors.hpp>
+
+#include <chrono>
 #include <thread>
 
 namespace host_tool
diff --git a/tools/helper.hpp b/tools/helper.hpp
index 8004cbf..5580972 100644
--- a/tools/helper.hpp
+++ b/tools/helper.hpp
@@ -1,8 +1,9 @@
 #pragma once
 
-#include <cstdint>
 #include <ipmiblob/blob_interface.hpp>
 
+#include <cstdint>
+
 namespace host_tool
 {
 
diff --git a/tools/io.hpp b/tools/io.hpp
index 8760aec..1476c5c 100644
--- a/tools/io.hpp
+++ b/tools/io.hpp
@@ -44,8 +44,7 @@
   public:
     explicit DevMemDevice(const internal::Sys* sys = &internal::sys_impl) :
         sys(sys)
-    {
-    }
+    {}
 
     ~DevMemDevice() = default;
 
@@ -75,8 +74,7 @@
                           const internal::Sys* sys = &internal::sys_impl) :
         ppcMemPath(ppcMemPath),
         sys(sys)
-    {
-    }
+    {}
 
     ~PpcMemDevice() override;
 
diff --git a/tools/lpc.cpp b/tools/lpc.cpp
index 3616085..cd48844 100644
--- a/tools/lpc.cpp
+++ b/tools/lpc.cpp
@@ -18,10 +18,11 @@
 
 #include "data.hpp"
 
+#include <ipmiblob/blob_errors.hpp>
+
 #include <cerrno>
 #include <cstdint>
 #include <cstring>
-#include <ipmiblob/blob_errors.hpp>
 #include <memory>
 #include <string>
 
diff --git a/tools/lpc.hpp b/tools/lpc.hpp
index 17367bb..1786c94 100644
--- a/tools/lpc.hpp
+++ b/tools/lpc.hpp
@@ -5,9 +5,10 @@
 #include "io.hpp"
 #include "progress.hpp"
 
-#include <cstdint>
 #include <ipmiblob/blob_interface.hpp>
 
+#include <cstdint>
+
 namespace host_tool
 {
 
diff --git a/tools/main.cpp b/tools/main.cpp
index 207fcdd..0e29295 100644
--- a/tools/main.cpp
+++ b/tools/main.cpp
@@ -27,13 +27,14 @@
 /* Use CLI11 argument parser once in openbmc/meta-oe or whatever. */
 #include <getopt.h>
 
+#include <ipmiblob/blob_handler.hpp>
+#include <ipmiblob/ipmi_handler.hpp>
+
 #include <algorithm>
 #include <cstdio>
 #include <cstdlib>
 #include <exception>
 #include <iostream>
-#include <ipmiblob/blob_handler.hpp>
-#include <ipmiblob/ipmi_handler.hpp>
 #include <iterator>
 #include <limits>
 #include <memory>
diff --git a/tools/net.cpp b/tools/net.cpp
index c971cb8..1c7a407 100644
--- a/tools/net.cpp
+++ b/tools/net.cpp
@@ -26,12 +26,13 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
+#include <ipmiblob/blob_errors.hpp>
+#include <stdplus/handle/managed.hpp>
+
 #include <cstdint>
 #include <cstring>
-#include <ipmiblob/blob_errors.hpp>
 #include <memory>
 #include <optional>
-#include <stdplus/handle/managed.hpp>
 #include <string>
 #include <vector>
 
diff --git a/tools/net.hpp b/tools/net.hpp
index ba329df..7578c82 100644
--- a/tools/net.hpp
+++ b/tools/net.hpp
@@ -6,9 +6,10 @@
 
 #include <unistd.h>
 
-#include <cstdint>
 #include <ipmiblob/blob_interface.hpp>
 #include <stdplus/handle/managed.hpp>
+
+#include <cstdint>
 #include <string>
 
 namespace host_tool
diff --git a/tools/p2a.cpp b/tools/p2a.cpp
index 5146c85..9de60f0 100644
--- a/tools/p2a.cpp
+++ b/tools/p2a.cpp
@@ -20,9 +20,10 @@
 #include "flags.hpp"
 #include "pci.hpp"
 
+#include <ipmiblob/blob_errors.hpp>
+
 #include <cstdint>
 #include <cstring>
-#include <ipmiblob/blob_errors.hpp>
 #include <memory>
 #include <string>
 
diff --git a/tools/p2a.hpp b/tools/p2a.hpp
index 84c0952..1d1cb2d 100644
--- a/tools/p2a.hpp
+++ b/tools/p2a.hpp
@@ -6,8 +6,9 @@
 #include "pci.hpp"
 #include "progress.hpp"
 
-#include <cstdint>
 #include <ipmiblob/blob_interface.hpp>
+
+#include <cstdint>
 #include <vector>
 
 constexpr std::size_t aspeedP2aConfig = 0x0f000;
@@ -34,8 +35,7 @@
                    const internal::Sys* sys = &internal::sys_impl) :
         blob(blob),
         io(io), pci(pci), progress(progress), sys(sys)
-    {
-    }
+    {}
 
     bool sendContents(const std::string& input, std::uint16_t session) override;
     ipmi_flash::FirmwareFlags::UpdateFlags supportedType() const override
diff --git a/tools/pci.cpp b/tools/pci.cpp
index b502a34..feb5c60 100644
--- a/tools/pci.cpp
+++ b/tools/pci.cpp
@@ -16,7 +16,8 @@
 
 #include "pci.hpp"
 
-extern "C" {
+extern "C"
+{
 #include <pci/pci.h>
 } // extern "C"
 
diff --git a/tools/pci.hpp b/tools/pci.hpp
index 37cd736..0edc531 100644
--- a/tools/pci.hpp
+++ b/tools/pci.hpp
@@ -1,9 +1,11 @@
 #pragma once
 
-extern "C" {
+extern "C"
+{
 #include <pci/pci.h>
 } // extern "C"
 
+#include <cstdint>
 #include <optional>
 #include <vector>
 
diff --git a/tools/test/tools_bt_unittest.cpp b/tools/test/tools_bt_unittest.cpp
index cca0b34..c764f54 100644
--- a/tools/test/tools_bt_unittest.cpp
+++ b/tools/test/tools_bt_unittest.cpp
@@ -2,9 +2,10 @@
 #include "internal_sys_mock.hpp"
 #include "progress_mock.hpp"
 
-#include <cstring>
 #include <ipmiblob/test/blob_interface_mock.hpp>
 
+#include <cstring>
+
 #include <gtest/gtest.h>
 
 namespace host_tool
diff --git a/tools/test/tools_helper_unittest.cpp b/tools/test/tools_helper_unittest.cpp
index 931c59f..1c5b30d 100644
--- a/tools/test/tools_helper_unittest.cpp
+++ b/tools/test/tools_helper_unittest.cpp
@@ -1,9 +1,10 @@
 #include "helper.hpp"
 #include "status.hpp"
 
-#include <cstdint>
 #include <ipmiblob/test/blob_interface_mock.hpp>
 
+#include <cstdint>
+
 #include <gtest/gtest.h>
 
 namespace host_tool
diff --git a/tools/test/tools_lpc_unittest.cpp b/tools/test/tools_lpc_unittest.cpp
index 9e417ed..7699609 100644
--- a/tools/test/tools_lpc_unittest.cpp
+++ b/tools/test/tools_lpc_unittest.cpp
@@ -3,9 +3,10 @@
 #include "lpc.hpp"
 #include "progress_mock.hpp"
 
-#include <cstring>
 #include <ipmiblob/test/blob_interface_mock.hpp>
 
+#include <cstring>
+
 #include <gtest/gtest.h>
 
 namespace host_tool
diff --git a/tools/test/tools_net_unittest.cpp b/tools/test/tools_net_unittest.cpp
index c5b8419..94678f1 100644
--- a/tools/test/tools_net_unittest.cpp
+++ b/tools/test/tools_net_unittest.cpp
@@ -3,9 +3,10 @@
 #include "net.hpp"
 #include "progress_mock.hpp"
 
-#include <cstring>
 #include <ipmiblob/test/blob_interface_mock.hpp>
 
+#include <cstring>
+
 #include <gtest/gtest.h>
 
 namespace host_tool
diff --git a/tools/test/tools_updater_unittest.cpp b/tools/test/tools_updater_unittest.cpp
index b9f80ad..0e9a217 100644
--- a/tools/test/tools_updater_unittest.cpp
+++ b/tools/test/tools_updater_unittest.cpp
@@ -7,6 +7,7 @@
 #include "util.hpp"
 
 #include <ipmiblob/test/blob_interface_mock.hpp>
+
 #include <string>
 
 #include <gtest/gtest.h>
diff --git a/tools/updater.cpp b/tools/updater.cpp
index 8639edd..87962b9 100644
--- a/tools/updater.cpp
+++ b/tools/updater.cpp
@@ -22,9 +22,10 @@
 #include "tool_errors.hpp"
 #include "util.hpp"
 
+#include <ipmiblob/blob_errors.hpp>
+
 #include <algorithm>
 #include <cstring>
-#include <ipmiblob/blob_errors.hpp>
 #include <memory>
 #include <string>
 #include <thread>
diff --git a/tools/updater.hpp b/tools/updater.hpp
index 4cae534..739d3e9 100644
--- a/tools/updater.hpp
+++ b/tools/updater.hpp
@@ -3,6 +3,7 @@
 #include "handler.hpp"
 
 #include <ipmiblob/blob_interface.hpp>
+
 #include <string>
 
 namespace host_tool