Re: [edk2] [PATCH] MdeModulePkg: Remove redundant library classes and GUIDs

2018-08-08 Thread Zeng, Star
Hi Shenglei,

The code updates are good. I have two minor comments.
1. Please update copyright year to 2018 in some files. For example:
Copyright (c) 2017
->
Copyright (c) 2017 - 2018

2.  Make the new line aligned with old line. For example: the "## CONSUMES" is 
not aligned.

   gEfiAcpiTableProtocolGuid ## CONSUMES
+  gEfiFirmwareVolume2ProtocolGuid ## CONSUMES

With that handled, Reviewed-by: Star Zeng .


Thanks,
Star
-Original Message-
From: Zhang, Shenglei 
Sent: Friday, August 3, 2018 4:19 PM
To: edk2-devel@lists.01.org
Cc: Zeng, Star ; Dong, Eric 
Subject: [PATCH] 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

Cc: Star Zeng 
Cc: Eric Dong 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei 
---
 MdeModulePkg/Application/CapsuleApp/CapsuleApp.c   | 1 -
 MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf | 1 -
 .../Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.c  | 1 -
 .../SmiHandlerProfileInfo/SmiHandlerProfileInfo.inf| 1 -
 MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf   | 1 -
 MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.inf | 1 -
 MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h| 1 -
 MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf   | 1 -
 MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h | 1 -
 MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.inf   | 1 -
 MdeModulePkg/Core/Dxe/DxeMain.inf  | 1 -
 MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c  | 1 -
 MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf  | 1 -
 MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c| 1 -
 .../Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf | 3 +--
 .../FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c   | 2 --
 .../FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf | 2 --  
MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf  | 1 -
 MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf  | 2 --
 MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h  | 2 --
 MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf | 1 -
 MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h  | 1 -
 MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h | 1 -
 .../Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf  | 1 -
 .../SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.c  | 1 -
 .../SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf| 1 -
 26 files changed, 1 insertion(+), 31 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 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
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/SmiHandlerProfileIn
+++ fo.c
@@ -22,7 +22,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER 
EXPRESS OR IMPLIED.
 #include 
 #include 
 #include 
-#include 
 #include 
 

[edk2] [PATCH] MdeModulePkg: Remove redundant library classes and GUIDs

2018-08-03 Thread shenglei
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

Cc: Star Zeng 
Cc: Eric Dong 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei 
---
 MdeModulePkg/Application/CapsuleApp/CapsuleApp.c   | 1 -
 MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf | 1 -
 .../Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.c  | 1 -
 .../SmiHandlerProfileInfo/SmiHandlerProfileInfo.inf| 1 -
 MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf   | 1 -
 MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.inf | 1 -
 MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h| 1 -
 MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf   | 1 -
 MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h | 1 -
 MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.inf   | 1 -
 MdeModulePkg/Core/Dxe/DxeMain.inf  | 1 -
 MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c  | 1 -
 MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf  | 1 -
 MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c| 1 -
 .../Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf | 3 +--
 .../FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c   | 2 --
 .../FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf | 2 --
 MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf  | 1 -
 MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf  | 2 --
 MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h  | 2 --
 MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf | 1 -
 MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h  | 1 -
 MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h | 1 -
 .../Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf  | 1 -
 .../SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.c  | 1 -
 .../SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf| 1 -
 26 files changed, 1 insertion(+), 31 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 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
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 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
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
+++ 

Re: [edk2] [PATCH] MdeModulePkg: Remove redundant library classes and GUIDs

2018-08-02 Thread Zeng, Star
Shenglei,

I suggest merging this patch with 
https://lists.01.org/pipermail/edk2-devel/2018-August/027883.html to one patch.


Thanks,
Star
-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of shenglei
Sent: Thursday, August 2, 2018 4:45 PM
To: edk2-devel@lists.01.org
Cc: Dong, Eric ; Zeng, Star 
Subject: [edk2] [PATCH] 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

Cc: Star Zeng 
Cc: Eric Dong 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei 
---
 MdeModulePkg/Application/CapsuleApp/CapsuleApp.c   | 1 -
 MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf | 1 -
 .../Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.c  | 1 -
 .../SmiHandlerProfileInfo/SmiHandlerProfileInfo.inf| 1 -
 MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.inf | 1 -
 MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h | 1 -
 MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.inf   | 1 -
 .../Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf | 3 +--
 .../FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c   | 2 --
 .../FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf | 2 --
 MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf  | 2 --
 MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h  | 2 --
 MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf | 1 -
 MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h  | 1 -
 MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h | 1 -
 .../Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf  | 1 -
 .../SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.c  | 1 -
 .../SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf| 1 -
 18 files changed, 1 insertion(+), 23 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 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
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/SmiHandlerProfileIn
+++ fo.c
@@ -22,7 +22,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER 
EXPRESS OR IMPLIED.
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
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/SmiHandlerProfileIn
+++ fo.inf
@@ -42,7 +42,6 @@
   UefiLib
   PrintLib
   DevicePathLib
-  PeCoffGetEntryPointLib
   DxeServicesLib
 
 [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/UfsPciHcDxe/UfsPciHcDxe.h 
b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h
index a2e61d6128..5a83be968f 100644
--- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe

[edk2] [PATCH] MdeModulePkg: Remove redundant library classes and GUIDs

2018-08-02 Thread shenglei
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

Cc: Star Zeng 
Cc: Eric Dong 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei 
---
 MdeModulePkg/Application/CapsuleApp/CapsuleApp.c   | 1 -
 MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf | 1 -
 .../Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.c  | 1 -
 .../SmiHandlerProfileInfo/SmiHandlerProfileInfo.inf| 1 -
 MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.inf | 1 -
 MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h | 1 -
 MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.inf   | 1 -
 .../Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf | 3 +--
 .../FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c   | 2 --
 .../FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf | 2 --
 MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf  | 2 --
 MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h  | 2 --
 MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf | 1 -
 MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h  | 1 -
 MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h | 1 -
 .../Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf  | 1 -
 .../SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.c  | 1 -
 .../SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf| 1 -
 18 files changed, 1 insertion(+), 23 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 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
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 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
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/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/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 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
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 @@