diff --git a/watchdog/watchdog_common.cpp b/watchdog/watchdog_common.cpp
index 4d9acd9..dd7d234 100644
--- a/watchdog/watchdog_common.cpp
+++ b/watchdog/watchdog_common.cpp
@@ -1,7 +1,9 @@
+#include "watchdog_common.hpp"
+
+#include "watchdog_logging.hpp"
+
 #include <phosphor-logging/log.hpp>
 #include <sdbusplus/bus.hpp>
-#include <watchdog_common.hpp>
-#include <watchdog_logging.hpp>
 
 #include <map>
 
diff --git a/watchdog/watchdog_dbus.cpp b/watchdog/watchdog_dbus.cpp
index c3a797d..204aecd 100644
--- a/watchdog/watchdog_dbus.cpp
+++ b/watchdog/watchdog_dbus.cpp
@@ -1,8 +1,10 @@
+#include "watchdog_dbus.hpp"
+
+#include "watchdog_logging.hpp"
+
 #include <unistd.h>
 
 #include <phosphor-logging/lg2.hpp>
-#include <watchdog_dbus.hpp>
-#include <watchdog_logging.hpp>
 
 #include <string>
 #include <vector>
diff --git a/watchdog/watchdog_handler.cpp b/watchdog/watchdog_handler.cpp
index 2a2b245..5f48ac5 100644
--- a/watchdog/watchdog_handler.cpp
+++ b/watchdog/watchdog_handler.cpp
@@ -1,9 +1,11 @@
+#include "watchdog_handler.hpp"
+
+#include "watchdog_dbus.hpp"
+#include "watchdog_logging.hpp"
+
 #include <phosphor-logging/lg2.hpp>
 #include <sdbusplus/bus.hpp>
 #include <sdbusplus/bus/match.hpp>
-#include <watchdog_dbus.hpp>
-#include <watchdog_handler.hpp>
-#include <watchdog_logging.hpp>
 
 namespace watchdog
 {
diff --git a/watchdog/watchdog_logging.cpp b/watchdog/watchdog_logging.cpp
index 50aa0aa..d04c95f 100644
--- a/watchdog/watchdog_logging.cpp
+++ b/watchdog/watchdog_logging.cpp
@@ -1,10 +1,12 @@
+#include "watchdog_logging.hpp"
+
+#include "watchdog_common.hpp"
+#include "watchdog_dbus.hpp"
+#include "watchdog_handler.hpp"
+
 #include <unistd.h>
 
 #include <phosphor-logging/log.hpp>
-#include <watchdog_common.hpp>
-#include <watchdog_dbus.hpp>
-#include <watchdog_handler.hpp>
-#include <watchdog_logging.hpp>
 
 namespace watchdog
 {