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"