diff --git a/attn/attention.cpp b/attn/attention.cpp
index 3fd3f83..28e7dc7 100644
--- a/attn/attention.cpp
+++ b/attn/attention.cpp
@@ -1,5 +1,5 @@
-#include <attention.hpp>
-#include <attn_config.hpp>
+#include <attn/attention.hpp>
+#include <attn/attn_config.hpp>
 
 namespace attn
 {
diff --git a/attn/attn_handler.cpp b/attn/attn_handler.cpp
index 6ea2fdc..e8684c6 100644
--- a/attn/attn_handler.cpp
+++ b/attn/attn_handler.cpp
@@ -1,12 +1,12 @@
 #include <libpdbg.h>
 
 #include <analyzer/analyzer_main.hpp>
-#include <attention.hpp>
-#include <attn_config.hpp>
-#include <attn_handler.hpp>
-#include <attn_logging.hpp>
-#include <bp_handler.hpp>
-#include <ti_handler.hpp>
+#include <attn/attention.hpp>
+#include <attn/attn_config.hpp>
+#include <attn/attn_handler.hpp>
+#include <attn/attn_logging.hpp>
+#include <attn/bp_handler.hpp>
+#include <attn/ti_handler.hpp>
 
 #include <algorithm>
 #include <iomanip>
diff --git a/attn/attn_logging.cpp b/attn/attn_logging.cpp
index e164f66..2d4d4db 100644
--- a/attn/attn_logging.cpp
+++ b/attn/attn_logging.cpp
@@ -1,6 +1,6 @@
 #include <unistd.h>
 
-#include <attn_logging.hpp>
+#include <attn/attn_logging.hpp>
 #include <phosphor-logging/log.hpp>
 
 namespace attn
diff --git a/attn/attn_main.cpp b/attn/attn_main.cpp
index bd3b5c4..0c3f250 100644
--- a/attn/attn_main.cpp
+++ b/attn/attn_main.cpp
@@ -1,4 +1,4 @@
-#include <../attn/attn_monitor.hpp>
+#include <attn/attn_monitor.hpp>
 
 namespace attn
 {
diff --git a/attn/attn_monitor.cpp b/attn/attn_monitor.cpp
index 31766c4..25b35a5 100644
--- a/attn/attn_monitor.cpp
+++ b/attn/attn_monitor.cpp
@@ -1,6 +1,6 @@
-#include <attn_handler.hpp>
-#include <attn_logging.hpp>
-#include <attn_monitor.hpp>
+#include <attn/attn_handler.hpp>
+#include <attn/attn_logging.hpp>
+#include <attn/attn_monitor.hpp>
 
 namespace attn
 {
diff --git a/attn/bp_handler.cpp b/attn/bp_handler.cpp
index 72e03f2..e25a243 100644
--- a/attn/bp_handler.cpp
+++ b/attn/bp_handler.cpp
@@ -1,4 +1,4 @@
-#include <attn_logging.hpp>
+#include <attn/attn_logging.hpp>
 #include <sdbusplus/bus.hpp>
 
 namespace attn
diff --git a/attn/ti_handler.cpp b/attn/ti_handler.cpp
index f1354aa..7e1d14f 100644
--- a/attn/ti_handler.cpp
+++ b/attn/ti_handler.cpp
@@ -1,7 +1,7 @@
-#include <attn_handler.hpp>
-#include <attn_logging.hpp>
+#include <attn/attn_handler.hpp>
+#include <attn/attn_logging.hpp>
+#include <attn/ti_handler.hpp>
 #include <sdbusplus/bus.hpp>
-#include <ti_handler.hpp>
 
 namespace attn
 {