diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c b/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c
index eaeca2ad4f..9a0de96a15 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c
@@ -361,7 +361,7 @@ Returns:
   PCI_RESOURCE_NODE               PMem32Pool;
   PCI_RESOURCE_NODE               Mem64Pool;
   PCI_RESOURCE_NODE               PMem64Pool;
-  REPORT_STATUS_CODE_LIBRARY_DEVICE_HANDLE_EXTENDED_DATA  ExtendedData;
+  EFI_DEVICE_HANDLE_EXTENDED_DATA_PAYLOAD  ExtendedData;
 
   //
   // Initialize resource pool
@@ -743,8 +743,8 @@ Returns:
   PCI_RESOURCE_NODE                     Mem64Pool;
   PCI_RESOURCE_NODE                     PMem64Pool;
   BOOLEAN                               ReAllocate;
-  REPORT_STATUS_CODE_LIBRARY_DEVICE_HANDLE_EXTENDED_DATA        HandleExtendedData;
-  REPORT_STATUS_CODE_LIBRARY_RESOURCE_ALLOC_FAILURE_ERROR_DATA  AllocFailExtendedData;
+  EFI_DEVICE_HANDLE_EXTENDED_DATA_PAYLOAD        HandleExtendedData;
+  EFI_RESOURCE_ALLOC_FAILURE_ERROR_DATA_PAYLOAD  AllocFailExtendedData;
 
   //
   // Reallocate flag
diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h b/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h
index 956d9b2795..a788916cbd 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h
@@ -29,6 +29,7 @@ Revision History
 //
 #include <PiDxe.h>
 #include <Common/FrameworkStatusCode.h>
+#include <Common/FrameworkStatusCodeDataTypeId.h>
 //
 // The protocols, PPI and GUID defintions for this module
 //