diff --git a/src/mainapp.cpp b/src/mainapp.cpp
index bd65335..a27cf97 100644
--- a/src/mainapp.cpp
+++ b/src/mainapp.cpp
@@ -17,9 +17,6 @@
 #include "watchdog.hpp"
 
 #include <CLI/CLI.hpp>
-#include <functional>
-#include <iostream>
-#include <optional>
 #include <phosphor-logging/elog-errors.hpp>
 #include <phosphor-logging/elog.hpp>
 #include <phosphor-logging/log.hpp>
@@ -30,9 +27,13 @@
 #include <sdeventplus/source/signal.hpp>
 #include <sdeventplus/utility/sdbus.hpp>
 #include <stdplus/signal.hpp>
-#include <string>
 #include <xyz/openbmc_project/Common/error.hpp>
 
+#include <functional>
+#include <iostream>
+#include <optional>
+#include <string>
+
 using phosphor::watchdog::Watchdog;
 using sdbusplus::xyz::openbmc_project::State::server::convertForMessage;
 
@@ -247,8 +248,8 @@
         // Claim the bus
         bus.request_name(service.c_str());
 
-        auto intCb = [](sdeventplus::source::Signal& s,
-                        const struct signalfd_siginfo*) {
+        auto intCb =
+            [](sdeventplus::source::Signal& s, const struct signalfd_siginfo*) {
             s.get_event().exit(0);
         };
         stdplus::signal::block(SIGINT);
diff --git a/src/watchdog.cpp b/src/watchdog.cpp
index c401022..90a840e 100644
--- a/src/watchdog.cpp
+++ b/src/watchdog.cpp
@@ -1,13 +1,14 @@
 #include "watchdog.hpp"
 
-#include <algorithm>
-#include <chrono>
 #include <phosphor-logging/elog.hpp>
 #include <phosphor-logging/log.hpp>
 #include <sdbusplus/exception.hpp>
-#include <string_view>
 #include <xyz/openbmc_project/Common/error.hpp>
 
+#include <algorithm>
+#include <chrono>
+#include <string_view>
+
 namespace phosphor
 {
 namespace watchdog
diff --git a/src/watchdog.hpp b/src/watchdog.hpp
index a0693ee..da1e05a 100644
--- a/src/watchdog.hpp
+++ b/src/watchdog.hpp
@@ -1,15 +1,16 @@
 #pragma once
 
-#include <functional>
-#include <optional>
 #include <sdbusplus/bus.hpp>
 #include <sdbusplus/server/object.hpp>
 #include <sdeventplus/event.hpp>
 #include <sdeventplus/utility/timer.hpp>
+#include <xyz/openbmc_project/State/Watchdog/server.hpp>
+
+#include <functional>
+#include <optional>
 #include <string_view>
 #include <unordered_map>
 #include <utility>
-#include <xyz/openbmc_project/State/Watchdog/server.hpp>
 
 namespace phosphor
 {