13 files changed, 37 insertions, 111 deletions
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
index 8e02b63279..1965c3cba8 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
@@ -22,18 +22,12 @@ Abstract:
 #ifndef  _CAPSULE_RUNTIME_H_
 #define  _CAPSULE_RUNTIME_H_
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/Capsule.h>
 #include <Guid/CapsuleVendor.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/DxeServicesTableLib.h>
 #include <Library/UefiRuntimeLib.h>
diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
index 58a1629cd5..283abf96ac 100644
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
+++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
@@ -20,21 +20,15 @@ Abstract:
 #ifndef __DEBUGPORT_H__
 #define __DEBUGPORT_H__
 
-//
-// The package level header files this module uses
-//
+
 #include <Uefi.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/DevicePath.h>
 #include <Protocol/ComponentName.h>
 #include <Protocol/DriverBinding.h>
 #include <Protocol/SerialIo.h>
 #include <Protocol/DebugPort.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/UefiLib.h>
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/plDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/plDebugSupport.h
index 98b4df007c..044572fb24 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/plDebugSupport.h
+++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/plDebugSupport.h
@@ -15,18 +15,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _PLDEBUG_SUPPORT_H
 #define _PLDEBUG_SUPPORT_H
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/DebugSupport.h>
 #include <Protocol/LoadedImage.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/BaseMemoryLib.h>
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/ipf/plDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/ipf/plDebugSupport.h
index ddd11e6069..8fdf147457 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/ipf/plDebugSupport.h
+++ b/MdeModulePkg/Universal/DebugSupportDxe/ipf/plDebugSupport.h
@@ -15,18 +15,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _PLDEBUG_SUPPORT_H
 #define _PLDEBUG_SUPPORT_H
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/DebugSupport.h>
 #include <Protocol/LoadedImage.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/BaseMemoryLib.h>
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/x64/plDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/x64/plDebugSupport.h
index 0f4e2778e6..ca92d07b24 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/x64/plDebugSupport.h
+++ b/MdeModulePkg/Universal/DebugSupportDxe/x64/plDebugSupport.h
@@ -15,18 +15,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _PLDEBUG_SUPPORT_H
 #define _PLDEBUG_SUPPORT_H
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/DebugSupport.h>
 #include <Protocol/LoadedImage.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/BaseMemoryLib.h>
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h
index 1163d7a722..cdab4090c7 100644
--- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h
+++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h
@@ -25,18 +25,12 @@ Revision History
 #define _UNICODE_COLLATION_ENG_H
 
 
-//
-// The package level header files this module uses
-//
+
 #include <Uefi.h>
 
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/UnicodeCollation.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/UefiBootServicesTableLib.h>
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcInt.h b/MdeModulePkg/Universal/EbcDxe/EbcInt.h
index d1631f8e9b..a62b121531 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcInt.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcInt.h
@@ -23,18 +23,12 @@ Abstract:
 #ifndef _EBC_INT_H_
 #define _EBC_INT_H_
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/DebugSupport.h>
 #include <Protocol/Ebc.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/BaseLib.h>
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
diff --git a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h
index 8bc122dbd3..bc28dcef08 100644
--- a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h
+++ b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h
@@ -29,20 +29,14 @@ Abstract:
 #ifndef _EFI_FAULT_TOLERANT_WRITE_LITE_H_
 #define _EFI_FAULT_TOLERANT_WRITE_LITE_H_
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/PciRootBridgeIo.h>
 #include <Guid/SystemNvDataGuid.h>
 #include <Protocol/FaultTolerantWriteLite.h>
 #include <Protocol/FirmwareVolumeBlock.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/PcdLib.h>
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
index 4b04381812..bfa9101e54 100644
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
+++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
@@ -21,18 +21,12 @@ Abstract:
 #ifndef _NULL_MEMORY_TEST_H
 #define _NULL_MEMORY_TEST_H
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
 
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/GenericMemoryTest.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/DxeServicesTableLib.h>
diff --git a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.h b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.h
index c1ef509f77..42af27249f 100644
--- a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.h
+++ b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.h
@@ -22,17 +22,11 @@ Abstract:
 #ifndef _MONOTONIC_COUNTER_DRIVER_H_
 #define _MONOTONIC_COUNTER_DRIVER_H_
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/MonotonicCounter.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/BaseLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/UefiRuntimeLib.h>
diff --git a/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h b/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h
index 55ed7c3700..35ed2a8052 100644
--- a/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h
+++ b/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h
@@ -26,17 +26,11 @@ Revision History
 #ifndef _RTC_H_
 #define _RTC_H_
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/RealTimeClock.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/BaseLib.h>
 #include <Library/DebugLib.h>
 #include <Library/UefiLib.h>
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
index 1e445c564b..8fa70ab14a 100644
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
@@ -23,18 +23,12 @@ Abstract:
 //
 // Statements that include other header files
 //
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/VariableWrite.h>
 #include <Protocol/Variable.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/BaseMemoryLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/DebugLib.h>
diff --git a/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.h b/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.h
index 2c8c33a8cb..fd2d7c52e5 100644
--- a/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.h
+++ b/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.h
@@ -25,9 +25,7 @@ Revision History
 #define _WATCHDOG_TIMER_H_
 
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>