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>