diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumerator.c b/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumerator.c
index e7a05a2ec9..84fd9753c6 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumerator.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumerator.c
@@ -1011,7 +1011,7 @@ Returns:
   UINTN                                 DevIndex;
   UINTN                                 ResType;
   EFI_STATUS                            Status;
-  REPORT_STATUS_CODE_LIBRARY_RESOURCE_ALLOC_FAILURE_ERROR_DATA AllocFailExtendedData;
+  EFI_RESOURCE_ALLOC_FAILURE_ERROR_DATA_PAYLOAD AllocFailExtendedData;
 
   PciResNode = NULL;
   ZeroMem (RemovedPciDev, 5 * sizeof (PCI_IO_DEVICE *));
diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h b/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h
index a788916cbd..f295e1946e 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h
@@ -66,28 +66,6 @@ Revision History
 #include <IndustryStandard/Acpi.h>
 #include "ComponentName.h"
 
-///
-/// Device handle Extended Data. Used for many
-/// errors and progress codes to point to the device.
-///
-typedef struct {
-  EFI_HANDLE            Handle;
-} REPORT_STATUS_CODE_LIBRARY_DEVICE_HANDLE_EXTENDED_DATA;
-
-///
-/// Resource Allocation Failure Extended Error Data
-///
-typedef struct {
-  UINT32                             Bar;
-  UINT16                             DevicePathSize;
-  UINT16                             ReqResSize;
-  UINT16                             AllocResSize;
-  UINT8                              *DevicePath;
-  UINT8                              *ReqRes;
-  UINT8                              *AllocRes;
-} REPORT_STATUS_CODE_LIBRARY_RESOURCE_ALLOC_FAILURE_ERROR_DATA;
-
-
 //
 // Driver Produced Protocol Prototypes
 //