diff --git a/libpldmresponder/base.hpp b/libpldmresponder/base.hpp
index 67cf9d9..6e5b653 100644
--- a/libpldmresponder/base.hpp
+++ b/libpldmresponder/base.hpp
@@ -2,7 +2,7 @@
 
 #include "libpldm/base.h"
 
-#include "handler.hpp"
+#include "pldmd/handler.hpp"
 
 #include <stdint.h>
 
diff --git a/libpldmresponder/bios.hpp b/libpldmresponder/bios.hpp
index 269d5a1..f3cf5f9 100644
--- a/libpldmresponder/bios.hpp
+++ b/libpldmresponder/bios.hpp
@@ -7,7 +7,7 @@
 
 #include "bios_config.hpp"
 #include "bios_table.hpp"
-#include "handler.hpp"
+#include "pldmd/handler.hpp"
 
 #include <stdint.h>
 
diff --git a/libpldmresponder/fru.hpp b/libpldmresponder/fru.hpp
index afa6b1c..e23cd48 100644
--- a/libpldmresponder/fru.hpp
+++ b/libpldmresponder/fru.hpp
@@ -6,7 +6,7 @@
 #include "libpldm/pdr.h"
 
 #include "fru_parser.hpp"
-#include "handler.hpp"
+#include "pldmd/handler.hpp"
 
 #include <sdbusplus/message.hpp>
 
diff --git a/libpldmresponder/platform.hpp b/libpldmresponder/platform.hpp
index ccd3ddf..a52c9a8 100644
--- a/libpldmresponder/platform.hpp
+++ b/libpldmresponder/platform.hpp
@@ -6,10 +6,10 @@
 #include "libpldm/states.h"
 
 #include "event_parser.hpp"
-#include "handler.hpp"
 #include "host-bmc/host_pdr_handler.hpp"
 #include "libpldmresponder/pdr.hpp"
 #include "libpldmresponder/pdr_utils.hpp"
+#include "pldmd/handler.hpp"
 #include "utils.hpp"
 
 #include <stdint.h>
diff --git a/libpldmresponder/platform_numeric_effecter.hpp b/libpldmresponder/platform_numeric_effecter.hpp
index 76c2267..9d435b1 100644
--- a/libpldmresponder/platform_numeric_effecter.hpp
+++ b/libpldmresponder/platform_numeric_effecter.hpp
@@ -5,9 +5,9 @@
 #include "libpldm/platform.h"
 #include "libpldm/states.h"
 
-#include "handler.hpp"
 #include "libpldmresponder/pdr.hpp"
 #include "pdr_utils.hpp"
+#include "pldmd/handler.hpp"
 #include "utils.hpp"
 
 #include <math.h>
diff --git a/libpldmresponder/platform_state_effecter.hpp b/libpldmresponder/platform_state_effecter.hpp
index 1f665be..961aa7f 100644
--- a/libpldmresponder/platform_state_effecter.hpp
+++ b/libpldmresponder/platform_state_effecter.hpp
@@ -5,9 +5,9 @@
 #include "libpldm/platform.h"
 #include "libpldm/states.h"
 
-#include "handler.hpp"
 #include "libpldmresponder/pdr.hpp"
 #include "pdr_utils.hpp"
+#include "pldmd/handler.hpp"
 #include "utils.hpp"
 
 #include <cstdint>