MdeModulePkg: Remove redundant library classes and GUIDs

Some redundant library classes and GUIDs
have been removed in inf, .c and .h files.
https://bugzilla.tianocore.org/show_bug.cgi?id=1044
https://bugzilla.tianocore.org/show_bug.cgi?id=1045
https://bugzilla.tianocore.org/show_bug.cgi?id=1047
https://bugzilla.tianocore.org/show_bug.cgi?id=1049
https://bugzilla.tianocore.org/show_bug.cgi?id=1051
https://bugzilla.tianocore.org/show_bug.cgi?id=1052
https://bugzilla.tianocore.org/show_bug.cgi?id=1053
https://bugzilla.tianocore.org/show_bug.cgi?id=1054
https://bugzilla.tianocore.org/show_bug.cgi?id=1055
https://bugzilla.tianocore.org/show_bug.cgi?id=1056
https://bugzilla.tianocore.org/show_bug.cgi?id=1017
https://bugzilla.tianocore.org/show_bug.cgi?id=1035
https://bugzilla.tianocore.org/show_bug.cgi?id=1033
https://bugzilla.tianocore.org/show_bug.cgi?id=1012
https://bugzilla.tianocore.org/show_bug.cgi?id=1011
https://bugzilla.tianocore.org/show_bug.cgi?id=1062

v2:
1. Correct copyright year.
2. Fix alignment issue in AcpiPlatformDxe.inf.
3. Add DevicePathLib which is removed before in I2cHostDxe.inf.
4. Update NvmExpressPei.inf, NvmExpressPei.h, IScsiDxe.inf,
   IScsiDxe.inf, IScsiDxe.h, DxeMain.inf, DxeMain.h, PiSmmCore.inf
   and PiSmmCore.h for https://bugzilla.tianocore.org/show_bug.cgi?id=1062.

v3:
1. Add https://bugzilla.tianocore.org/show_bug.cgi?id=1062 to the
   link list.
2. Remove DevicePathLib from I2cHostDxe.inf.
3. Update NvmExpressPei.inf, NvmExpressPei.h, UfsPciHcDxe.inf,
   UfsPciHcDxe.h, I2cHostDxe.inf, AtaBusDxe.inf, IScsiDxe.inf,
   IScsiDxe.h, DxeMain.inf, DxeMain.h, PiSmmCore.inf and PiSmmCore.h
   for https://bugzilla.tianocore.org/show_bug.cgi?id=1062.
   (Forget to add UfsPciHcDxe.inf, UfsPciHcDxe.h, AtaBusDxe.inf,
   and I2cHostDxe.inf previously.)

Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei <shenglei.zhang@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

32 files changed, 1 insertions, 40 deletions

diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
index 894da2f2d9..4d907242f3 100644
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
+++ b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
@@ -23,7 +23,6 @@
 #include <Library/PrintLib.h>

 #include <Library/BmpSupportLib.h>

 #include <Protocol/GraphicsOutput.h>

-#include <Guid/GlobalVariable.h>

 #include <Guid/CapsuleReport.h>

 #include <Guid/SystemResourceTable.h>

 #include <Guid/FmpCapsule.h>

diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
index 3a67c6b909..d1b11318bb 100644
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
+++ b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
@@ -40,7 +40,6 @@
   MdeModulePkg/MdeModulePkg.dec

 

 [Guids]

-  gEfiGlobalVariableGuid                 ## CONSUMES   ## GUID

   gEfiCapsuleReportGuid                  ## CONSUMES   ## GUID

   gEfiFmpCapsuleGuid                     ## CONSUMES   ## GUID

   gWindowsUxCapsuleGuid                  ## CONSUMES   ## GUID

diff --git a/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.c b/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.c
index 96e9977aad..a77164b436 100644
--- a/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.c
+++ b/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.c
@@ -22,7 +22,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/PrintLib.h>

 #include <Library/UefiLib.h>

 #include <Library/DevicePathLib.h>

-#include <Library/PeCoffGetEntryPointLib.h>

 #include <Library/DxeServicesLib.h>

 #include <Protocol/SmmCommunication.h>

 #include <Guid/PiSmmCommunicationRegionTable.h>

diff --git a/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.inf b/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.inf
index 73cc052cc3..cc189fd480 100644
--- a/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.inf
+++ b/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.inf
@@ -42,7 +42,6 @@
   UefiLib

   PrintLib

   DevicePathLib

-  PeCoffGetEntryPointLib

   DxeServicesLib

 

 [Protocols]

diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
index 4aab75bab7..d067df0400 100644
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
@@ -60,7 +60,6 @@
   ReportStatusCodeLib

 

 [Guids]

-  gEfiDiskInfoIdeInterfaceGuid                  ## SOMETIMES_PRODUCES ## UNDEFINED

   gEfiDiskInfoAhciInterfaceGuid                 ## SOMETIMES_PRODUCES ## UNDEFINED

 

 [Protocols]

diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.inf b/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.inf
index 2fb1085c6d..c9b87eb50c 100644
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.inf
+++ b/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.inf
@@ -36,7 +36,6 @@
 [LibraryClasses]

   BaseMemoryLib

   DebugLib

-  DevicePathLib

   MemoryAllocationLib

   UefiBootServicesTableLib

   UefiDriverEntryPoint

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.h b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.h
index 5e6f66892f..0bd62c2459 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.h
+++ b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.h
@@ -33,7 +33,6 @@
 #include <Library/MemoryAllocationLib.h>

 #include <Library/BaseMemoryLib.h>

 #include <Library/IoLib.h>

-#include <Library/PciLib.h>

 #include <Library/TimerLib.h>

 

 //

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf
index 8b2523a39c..9591572fec 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf
+++ b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf
@@ -50,7 +50,6 @@
   MemoryAllocationLib

   BaseMemoryLib

   IoLib

-  PciLib

   TimerLib

   PeimEntryPoint

 

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h
index 55eb3a5a80..f9eebdd5a8 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h
@@ -44,7 +44,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/DevicePathLib.h>

 #include <Library/PcdLib.h>

-#include <Library/PeCoffLib.h>

 

 #include <IndustryStandard/Pci.h>

 #include <IndustryStandard/PeImage.h>

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
index a21dd2b5ed..faf68c7d90 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
@@ -78,7 +78,6 @@
   BaseLib

   UefiDriverEntryPoint

   DebugLib

-  PeCoffLib

 

 [Protocols]

   gEfiPciHotPlugRequestProtocolGuid               ## SOMETIMES_PRODUCES

diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h
index a2e61d6128..5a83be968f 100644
--- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h
+++ b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h
@@ -32,7 +32,6 @@
 #include <Library/BaseLib.h>

 #include <Library/DebugLib.h>

 #include <Library/UefiLib.h>

-#include <Library/DevicePathLib.h>

 #include <Library/MemoryAllocationLib.h>

 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/UefiDriverEntryPoint.h>

diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.inf b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.inf
index 525235635a..900fa01698 100644
--- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.inf
+++ b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.inf
@@ -42,7 +42,6 @@
 [LibraryClasses]

   BaseLib

   DebugLib

-  DevicePathLib

   UefiDriverEntryPoint

   UefiBootServicesTableLib

   UefiLib

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index 7ec82388a3..6c7013cad0 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -89,7 +89,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/DevicePathLib.h>

 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/ReportStatusCodeLib.h>

-#include <Library/TimerLib.h>

 #include <Library/DxeServicesLib.h>

 #include <Library/DebugAgentLib.h>

 #include <Library/CpuExceptionHandlerLib.h>

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index 68fa0a01d9..69065d1305 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -97,7 +97,6 @@
   UefiBootServicesTableLib

   DevicePathLib

   ReportStatusCodeLib

-  TimerLib

   DxeServicesLib

   DebugAgentLib

   CpuExceptionHandlerLib

@@ -163,7 +162,6 @@
   gEfiHiiPackageListProtocolGuid                ## SOMETIMES_PRODUCES

   gEfiEbcProtocolGuid                           ## SOMETIMES_CONSUMES

   gEfiSmmBase2ProtocolGuid                      ## SOMETIMES_CONSUMES

-  gEfiBlockIoProtocolGuid                       ## SOMETIMES_CONSUMES

 

   # Arch Protocols

   gEfiBdsArchProtocolGuid                       ## CONSUMES

diff --git a/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c b/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c
index 2f7e490af1..4cd219c88e 100644
--- a/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c
+++ b/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c
@@ -44,7 +44,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Guid/PropertiesTable.h>

 

 #include <Protocol/FirmwareVolume2.h>

-#include <Protocol/BlockIo.h>

 #include <Protocol/SimpleFileSystem.h>

 

 #include "DxeMain.h"

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
index 2d3447e338..cbc27e717d 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
@@ -58,7 +58,6 @@
 #include <Library/PcdLib.h>

 #include <Library/SmmCorePlatformHookLib.h>

 #include <Library/PerformanceLib.h>

-#include <Library/TimerLib.h>

 #include <Library/HobLib.h>

 #include <Library/SmmMemLib.h>

 

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
index a2ff773a74..f3ece22121 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
@@ -63,10 +63,8 @@
   PcdLib

   SmmCorePlatformHookLib

   PerformanceLib

-  TimerLib

   HobLib

   SmmMemLib

-  DxeServicesLib

 

 [Protocols]

   gEfiDxeSmmReadyToLockProtocolGuid             ## UNDEFINED # SmiHandlerRegister

@@ -90,7 +88,6 @@
   gEfiSmmGpiDispatch2ProtocolGuid               ## SOMETIMES_CONSUMES

   gEfiSmmIoTrapDispatch2ProtocolGuid            ## SOMETIMES_CONSUMES

   gEfiSmmUsbDispatch2ProtocolGuid               ## SOMETIMES_CONSUMES

-  gEfiSmmCpuProtocolGuid                        ## SOMETIMES_CONSUMES

   gEdkiiSmmMemoryAttributeProtocolGuid          ## CONSUMES

   gEfiSmmSxDispatch2ProtocolGuid                ## SOMETIMES_CONSUMES

 

diff --git a/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c b/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c
index f41353a6b8..f1db65fc29 100644
--- a/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c
+++ b/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c
@@ -23,7 +23,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiLib.h>

 #include <Library/DevicePathLib.h>

 #include <Library/PeCoffGetEntryPointLib.h>

-#include <Library/DxeServicesLib.h>

 #include <Protocol/LoadedImage.h>

 #include <Protocol/SmmAccess2.h>

 #include <Protocol/SmmReadyToLock.h>

diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
index f4860cdc0b..f01a6c858a 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
+++ b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
@@ -36,15 +36,14 @@
 

 [LibraryClasses]

   UefiLib

-  DxeServicesLib

   PcdLib

-  BaseMemoryLib

   DebugLib

   UefiBootServicesTableLib

   UefiDriverEntryPoint

 

 [Protocols]

   gEfiAcpiTableProtocolGuid                     ## CONSUMES

+  gEfiFirmwareVolume2ProtocolGuid               ## CONSUMES

 

 [Pcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiTableStorageFile    ## CONSUMES

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
index 3d8e83250e..d286a48db2 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
@@ -25,8 +25,6 @@
 

 #include <Guid/Acpi.h>

 #include <Guid/FirmwarePerformance.h>

-#include <Guid/EventGroup.h>

-#include <Guid/EventLegacyBios.h>

 

 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/UefiRuntimeServicesTableLib.h>

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
index 843cda7021..983ce41b48 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
@@ -61,8 +61,6 @@
 

 [Guids]

   gEfiEventExitBootServicesGuid                 ## CONSUMES             ## Event

-  gEfiEventReadyToBootGuid                      ## CONSUMES             ## Event

-  gEfiEventLegacyBootGuid                       ## SOMETIMES_CONSUMES   ## Event

   ## SOMETIMES_CONSUMES   ## HOB

   ## SOMETIMES_CONSUMES   ## Variable:L"FirmwarePerformance"

   ## PRODUCES             ## Variable:L"FirmwarePerformance"

diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
index a4184212bb..36ed80cc79 100644
--- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
+++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
@@ -42,7 +42,6 @@
 

 [LibraryClasses]

   UefiBootServicesTableLib

-  MemoryAllocationLib

   UefiDriverEntryPoint

   BaseMemoryLib

   BaseLib

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf b/MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf
index 4554eb485d..10a6b2c06e 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf
@@ -106,8 +106,6 @@
 

 [Guids]

   gEfiFileInfoGuid                              ## SOMETIMES_CONSUMES ## GUID

-  gEfiFileSystemInfoGuid                        ## SOMETIMES_CONSUMES ## GUID

-  gEfiFileSystemVolumeLabelInfoIdGuid           ## SOMETIMES_CONSUMES ## GUID

   gEfiDebugImageInfoTableGuid                   ## SOMETIMES_CONSUMES ## GUID

 

 [Depex]

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
index d452b2bb2e..c8d8768abd 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
@@ -29,8 +29,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/SimpleFileSystem.h>

 #include <Protocol/DebuggerConfiguration.h>

 #include <Guid/FileInfo.h>

-#include <Guid/FileSystemInfo.h>

-#include <Guid/FileSystemVolumeLabelInfo.h>

 #include <Guid/DebugImageInfoTable.h>

 

 typedef UINTN EFI_DEBUG_STATUS;

diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
index 5eb7ef924a..7f2499b33d 100644
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
+++ b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
@@ -49,7 +49,6 @@
   DxeServicesTableLib

   UefiBootServicesTableLib

   UefiRuntimeServicesTableLib

-  PrintLib

 

 [Guids]

   gEfiSystemResourceTableGuid             ## PRODUCES             ## SystemTable

diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h b/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h
index e0e9673c70..e6372458b9 100644
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h
+++ b/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h
@@ -28,7 +28,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/DebugLib.h>

 #include <Library/CapsuleLib.h>

-#include <Library/PrintLib.h>

 

 #include <Protocol/FirmwareManagement.h>

 #include <Protocol/EsrtManagement.h>

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
index dce39681d1..c6e7262cea 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
@@ -108,7 +108,6 @@
   gEfiIfrTianoGuid                              ## SOMETIMES_PRODUCES ## UNDEFINED

   gEfiAcpiTableGuid                             ## SOMETIMES_CONSUMES ## SystemTable

   gEfiAcpi10TableGuid                           ## SOMETIMES_CONSUMES ## SystemTable

-  gEfiAcpi20TableGuid                           ## SOMETIMES_CONSUMES ## SystemTable

   ## SOMETIMES_PRODUCES ## Variable:L"iSCSIDeviceList"

   ## SOMETIMES_CONSUMES ## Variable:L"iSCSIDeviceList"

   ## SOMETIMES_CONSUMES ## UNDEFINED # HiiIsConfigHdrMatch   mVendorStorageName

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
index 082199c1b7..8a5ee2149e 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
@@ -26,7 +26,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiRuntimeServicesTableLib.h>

 

 #include <Guid/EventGroup.h>

-#include <Guid/Acpi.h>

 

 #include "IScsiCommon.h"

 #include "IScsiDriver.h"

diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h
index 1848a92872..8529de675c 100644
--- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h
+++ b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h
@@ -27,7 +27,6 @@
 #include <Library/BaseLib.h>

 #include <Library/DebugLib.h>

 #include <Library/UefiLib.h>

-#include <Library/IoLib.h>

 #include <Library/UefiDriverEntryPoint.h>

 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/UefiRuntimeLib.h>

diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
index da9e8e118b..2b9eabd85d 100644
--- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
@@ -43,7 +43,6 @@
   UefiRuntimeLib

   UefiBootServicesTableLib

   UefiDriverEntryPoint

-  IoLib

   UefiLib

   DebugLib

   BaseLib

diff --git a/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.c b/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.c
index 3ad264b117..7d0baf8d92 100644
--- a/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.c
+++ b/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.c
@@ -26,7 +26,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/MemoryAllocationLib.h>

 #include <Library/DebugLib.h>

 #include <Library/UefiLib.h>

-#include <Library/PcdLib.h>

 #include <Guid/PiSmmCommunicationRegionTable.h>

 

 #define DEFAULT_COMMON_PI_SMM_COMMUNIATION_REGION_PAGES  4

diff --git a/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf b/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf
index 84a2318173..cc0f136c2b 100644
--- a/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf
+++ b/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf
@@ -50,7 +50,6 @@
   MemoryAllocationLib

   HobLib

   DebugLib

-  PcdLib

 

 [Guids]

   gEdkiiPiSmmCommunicationRegionTableGuid     ## PRODUCES   ## SystemTable