diff --git a/pldmd/instance_id.hpp b/common/instance_id.hpp
similarity index 100%
rename from pldmd/instance_id.hpp
rename to common/instance_id.hpp
diff --git a/fw-update/inventory_manager.hpp b/fw-update/inventory_manager.hpp
index ae5030f..fdb6369 100644
--- a/fw-update/inventory_manager.hpp
+++ b/fw-update/inventory_manager.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
+#include "common/instance_id.hpp"
 #include "common/types.hpp"
-#include "pldmd/instance_id.hpp"
 #include "requester/handler.hpp"
 
 #include <libpldm/pldm.h>
diff --git a/fw-update/manager.hpp b/fw-update/manager.hpp
index 46a3285..0608a62 100644
--- a/fw-update/manager.hpp
+++ b/fw-update/manager.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
 #include "activation.hpp"
+#include "common/instance_id.hpp"
 #include "common/types.hpp"
 #include "device_updater.hpp"
 #include "inventory_manager.hpp"
-#include "pldmd/instance_id.hpp"
 #include "requester/handler.hpp"
 #include "update_manager.hpp"
 
diff --git a/fw-update/test/device_updater_test.cpp b/fw-update/test/device_updater_test.cpp
index ba2b16f..ace5e2d 100644
--- a/fw-update/test/device_updater_test.cpp
+++ b/fw-update/test/device_updater_test.cpp
@@ -1,7 +1,7 @@
+#include "common/instance_id.hpp"
 #include "common/utils.hpp"
 #include "fw-update/device_updater.hpp"
 #include "fw-update/package_parser.hpp"
-#include "pldmd/instance_id.hpp"
 #include "requester/handler.hpp"
 
 #include <libpldm/firmware_update.h>
diff --git a/fw-update/update_manager.hpp b/fw-update/update_manager.hpp
index 00ddc0c..07c0ef9 100644
--- a/fw-update/update_manager.hpp
+++ b/fw-update/update_manager.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
+#include "common/instance_id.hpp"
 #include "common/types.hpp"
 #include "device_updater.hpp"
 #include "package_parser.hpp"
-#include "pldmd/instance_id.hpp"
 #include "requester/handler.hpp"
 #include "watch.hpp"
 
diff --git a/host-bmc/dbus_to_event_handler.hpp b/host-bmc/dbus_to_event_handler.hpp
index 87668c2..846f210 100644
--- a/host-bmc/dbus_to_event_handler.hpp
+++ b/host-bmc/dbus_to_event_handler.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
+#include "common/instance_id.hpp"
 #include "libpldmresponder/pdr_utils.hpp"
-#include "pldmd/instance_id.hpp"
 #include "requester/handler.hpp"
 
 #include <libpldm/platform.h>
diff --git a/host-bmc/dbus_to_host_effecters.hpp b/host-bmc/dbus_to_host_effecters.hpp
index 3690ad8..59cbd80 100644
--- a/host-bmc/dbus_to_host_effecters.hpp
+++ b/host-bmc/dbus_to_host_effecters.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "common/instance_id.hpp"
 #include "common/types.hpp"
 #include "common/utils.hpp"
-#include "pldmd/instance_id.hpp"
 #include "requester/handler.hpp"
 
 #include <phosphor-logging/lg2.hpp>
diff --git a/host-bmc/host_pdr_handler.hpp b/host-bmc/host_pdr_handler.hpp
index 1821005..a76cc20 100644
--- a/host-bmc/host_pdr_handler.hpp
+++ b/host-bmc/host_pdr_handler.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
+#include "common/instance_id.hpp"
 #include "common/types.hpp"
 #include "common/utils.hpp"
 #include "libpldmresponder/event_parser.hpp"
 #include "libpldmresponder/pdr_utils.hpp"
-#include "pldmd/instance_id.hpp"
 #include "requester/handler.hpp"
 
 #include <libpldm/base.h>
diff --git a/libpldmresponder/bios.hpp b/libpldmresponder/bios.hpp
index bb075d2..23f1318 100644
--- a/libpldmresponder/bios.hpp
+++ b/libpldmresponder/bios.hpp
@@ -2,8 +2,8 @@
 
 #include "bios_config.hpp"
 #include "bios_table.hpp"
+#include "common/instance_id.hpp"
 #include "pldmd/handler.hpp"
-#include "pldmd/instance_id.hpp"
 #include "requester/handler.hpp"
 
 #include <libpldm/bios.h>
diff --git a/libpldmresponder/bios_config.hpp b/libpldmresponder/bios_config.hpp
index 2bd7c72..d7e4b0c 100644
--- a/libpldmresponder/bios_config.hpp
+++ b/libpldmresponder/bios_config.hpp
@@ -2,8 +2,8 @@
 
 #include "bios_attribute.hpp"
 #include "bios_table.hpp"
+#include "common/instance_id.hpp"
 #include "oem_handler.hpp"
-#include "pldmd/instance_id.hpp"
 #include "requester/handler.hpp"
 
 #include <libpldm/bios_table.h>
diff --git a/libpldmresponder/test/libpldmresponder_base_test.cpp b/libpldmresponder/test/libpldmresponder_base_test.cpp
index 8931f0c..f056ec8 100644
--- a/libpldmresponder/test/libpldmresponder_base_test.cpp
+++ b/libpldmresponder/test/libpldmresponder_base_test.cpp
@@ -1,6 +1,6 @@
+#include "common/instance_id.hpp"
 #include "common/utils.hpp"
 #include "libpldmresponder/base.hpp"
-#include "pldmd/instance_id.hpp"
 #include "test/test_instance_id.hpp"
 
 #include <libpldm/base.h>
diff --git a/oem/ibm/libpldmresponder/platform_oem_ibm.hpp b/oem/ibm/libpldmresponder/platform_oem_ibm.hpp
index 13ec2d5..e728282 100644
--- a/oem/ibm/libpldmresponder/platform_oem_ibm.hpp
+++ b/oem/ibm/libpldmresponder/platform_oem_ibm.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "pldmd/instance_id.hpp"
+#include "common/instance_id.hpp"
 #include "requester/handler.hpp"
 
 #include <vector>
diff --git a/oem/ibm/requester/dbus_to_file_handler.hpp b/oem/ibm/requester/dbus_to_file_handler.hpp
index a2ba166..dbf3406 100644
--- a/oem/ibm/requester/dbus_to_file_handler.hpp
+++ b/oem/ibm/requester/dbus_to_file_handler.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "pldmd/instance_id.hpp"
+#include "common/instance_id.hpp"
 #include "requester/handler.hpp"
 
 #include <libpldm/platform.h>
diff --git a/pldmd/dbus_impl_requester.hpp b/pldmd/dbus_impl_requester.hpp
index 2daaf18..84e861b 100644
--- a/pldmd/dbus_impl_requester.hpp
+++ b/pldmd/dbus_impl_requester.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "instance_id.hpp"
+#include "common/instance_id.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 #include "xyz/openbmc_project/PLDM/Requester/server.hpp"
 
diff --git a/pldmd/pldmd.cpp b/pldmd/pldmd.cpp
index f58540e..da50615 100644
--- a/pldmd/pldmd.cpp
+++ b/pldmd/pldmd.cpp
@@ -1,8 +1,8 @@
 #include "common/flight_recorder.hpp"
+#include "common/instance_id.hpp"
 #include "common/utils.hpp"
 #include "dbus_impl_requester.hpp"
 #include "fw-update/manager.hpp"
-#include "instance_id.hpp"
 #include "invoker.hpp"
 #include "requester/handler.hpp"
 #include "requester/mctp_endpoint_discovery.hpp"
diff --git a/requester/handler.hpp b/requester/handler.hpp
index b03e05d..9e5d8d1 100644
--- a/requester/handler.hpp
+++ b/requester/handler.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
+#include "common/instance_id.hpp"
 #include "common/types.hpp"
-#include "pldmd/instance_id.hpp"
 #include "request.hpp"
 
 #include <libpldm/base.h>
diff --git a/requester/test/handler_test.cpp b/requester/test/handler_test.cpp
index 6251974..17a40fe 100644
--- a/requester/test/handler_test.cpp
+++ b/requester/test/handler_test.cpp
@@ -1,7 +1,7 @@
+#include "common/instance_id.hpp"
 #include "common/types.hpp"
 #include "common/utils.hpp"
 #include "mock_request.hpp"
-#include "pldmd/instance_id.hpp"
 #include "requester/handler.hpp"
 #include "test/test_instance_id.hpp"
 
diff --git a/test/test_instance_id.hpp b/test/test_instance_id.hpp
index 6979e56..bbcd5f1 100644
--- a/test/test_instance_id.hpp
+++ b/test/test_instance_id.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "instance_id.hpp"
+#include "common/instance_id.hpp"
 
 static constexpr uintmax_t pldmMaxInstanceIds = 32;