60 files changed, 170 insertions, 510 deletions
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h
index 352aca9..8a17e60 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h
@@ -24,14 +24,10 @@ Revision History:
 #ifndef _EFI_ISA_BUS_H
 #define _EFI_ISA_BUS_H
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
 #include <FrameworkDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/PciIo.h>
 #include <Protocol/ComponentName.h>
 #include <Protocol/IsaIo.h>
@@ -40,9 +36,7 @@ Revision History:
 #include <Protocol/DriverBinding.h>
 #include <Protocol/GenericMemoryTest.h>
 #include <Guid/StatusCodeDataTypeId.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/UefiLib.h>
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h
index f60b146..45377a7 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h
@@ -27,15 +27,11 @@ Revision History:
 
 #include <PiDxe.h>
 #include <FrameworkPei.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/BlockIo.h>
 #include <Protocol/IsaIo.h>
 #include <Protocol/DevicePath.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/TimerLib.h>
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h
index 6bef39b..ac35b90 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h
@@ -25,20 +25,14 @@ Revision History:
 #ifndef _SERIAL_H
 #define _SERIAL_H
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
 #include <FrameworkPei.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/IsaIo.h>
 #include <Protocol/SerialIo.h>
 #include <Protocol/DevicePath.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/BaseLib.h>
diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.h
index 13fa1b5..87c8304 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.h
@@ -16,21 +16,15 @@
 #define _IDE_BUS_H
 
 
-//
-// The package level header files this module uses
-//
+
 #include <FrameworkDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/IdeControllerInit.h>
 #include <Protocol/BlockIo.h>
 #include <Protocol/PciIo.h>
 #include <Protocol/DiskInfo.h>
 #include <Protocol/DevicePath.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/BaseLib.h>
diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.h
index b2149a2..80cb829 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.h
@@ -24,14 +24,10 @@ Revision History
 #ifndef _EFI_PCI_BUS_H
 #define _EFI_PCI_BUS_H
 
-//
-// The package level header files this module uses
-//
+
 #include <FrameworkDxe.h>
 
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/LoadedImage.h>
 #include <Protocol/PciHostBridgeResourceAllocation.h>
 #include <Protocol/PciIo.h>
@@ -45,9 +41,7 @@ Revision History
 #include <Guid/PciOptionRomTable.h>
 #include <Protocol/BusSpecificDriverOverride.h>
 #include <Protocol/UgaIo.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/BaseLib.h>
diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
index 713da98..903de3f 100644
--- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
+++ b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
@@ -17,13 +17,9 @@
 #ifndef __BASE_UEFI_TIANO_CUSTOM_DECOMPRESS_LIB_INTERNALS_H__
 #define __BASE_UEFI_TIANO_CUSTOM_DECOMPRESS_LIB_INTERNALS_H__
 
-//
-// The package level header files this module uses
-//
+
 #include <Base.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/UefiDecompressLib.h>
 #include <Library/CustomDecompressLib.h>
 #include <Library/DebugLib.h>
diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h b/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h
index 44e3940..f2bf0e1 100644
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h
@@ -16,13 +16,9 @@
 #define __COMMON_HEADER_H_
 
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/SimpleTextOut.h>
 #include <Protocol/OEMBadging.h>
 #include <Protocol/ConsoleControl.h>
@@ -32,9 +28,7 @@
 #include <Protocol/HiiFramework.h>
 
 #include <Guid/Bmp.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/GraphicsLib.h>
 #include <Library/PrintLib.h>
 #include <Library/BaseLib.h>
diff --git a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/IncompatiblePciDeviceList.h b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/IncompatiblePciDeviceList.h
index d43918d..9f1794c 100644
--- a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/IncompatiblePciDeviceList.h
+++ b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/IncompatiblePciDeviceList.h
@@ -15,13 +15,9 @@ Intel Corporation.
 #ifndef _EFI_INCOMPATIBLE_PCI_DEVICE_LIST_H
 #define _EFI_INCOMPATIBLE_PCI_DEVICE_LIST_H
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/PciIncompatibleDeviceSupportLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/DebugLib.h>
diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h
index aed4a84..7e46574 100644
--- a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h
+++ b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h
@@ -25,17 +25,13 @@ Revision History
 
 #include <PiDxe.h>
 #include <FrameworkDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/SimpleTextIn.h>
 #include <Protocol/SimpleTextOut.h>
 #include <Protocol/PciIo.h>
 #include <Protocol/VgaMiniPort.h>
 #include <Protocol/DevicePath.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/BaseLib.h>
diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h
index 8f90e99..b60c18e 100644
--- a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h
+++ b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h
@@ -22,17 +22,11 @@ Abstract:
 #ifndef _DATA_HUB_H_
 #define _DATA_HUB_H_
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/DataHub.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/UefiLib.h>
diff --git a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
index ad610fe..52edef6 100644
--- a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
+++ b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
@@ -20,21 +20,15 @@ Abstract:
 
 --*/
 
-//
-// The package level header files this module uses
-//
+
 #include <FrameworkDxe.h>
 
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Guid/DataHubStatusCodeRecord.h>
 #include <Guid/StatusCodeDataTypeId.h>
 #include <Protocol/DataHub.h>
 #include <Protocol/SimpleTextOut.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/BaseMemoryLib.h>
diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h
index c02c244..8c19d1c 100644
--- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h
+++ b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h
@@ -24,18 +24,12 @@ Revision History
 #define _DRIVER_SAMPLE_H
 
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/FormCallbackFramework.h>
 #include <Protocol/HiiFramework.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UefiRuntimeServicesTableLib.h>
 #include <Library/DebugLib.h>
diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h
index b35dc17..0fae13f 100644
--- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h
+++ b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h
@@ -23,19 +23,13 @@ Abstract:
 #ifndef _HIIDATABASE_H
 #define _HIIDATABASE_H
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Guid/GlobalVariable.h>
 #include <Protocol/FormCallbackFramework.h>
 #include <Protocol/HiiFramework.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/BaseLib.h>
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h
index cca053b..f91b404 100644
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -23,20 +23,14 @@ Revision History
 #ifndef _SETUP_H
 #define _SETUP_H
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/FormCallbackFramework.h>
 #include <Protocol/FormBrowserFramework.h>
 #include <Protocol/HiiFramework.h>
 #include <Protocol/Print.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/BaseLib.h>
 #include <Library/DebugLib.h>
 #include <Library/BaseMemoryLib.h>
diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
index 8f92a7d..197ca4e 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
@@ -14,22 +14,16 @@
 #ifndef __DXE_STATUS_CODE_H__
 #define __DXE_STATUS_CODE_H__
 
-//
-// The package level header files this module uses
-//
+
 #include <FrameworkDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Guid/DataHubStatusCodeRecord.h>
 #include <Protocol/DataHub.h>
 #include <Protocol/SerialIo.h>
 #include <Guid/MemoryStatusCodeRecord.h>
 #include <Protocol/StatusCode.h>
 #include <Guid/StatusCodeDataTypeId.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h
index 4867505..cd2b10c 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h
@@ -19,19 +19,13 @@
 #define __PEI_STATUS_CODE_H__
 
 
-//
-// The package level header files this module uses
-//
+
 #include <FrameworkPei.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Guid/MemoryStatusCodeRecord.h>
 #include <Guid/StatusCodeDataTypeId.h>
 #include <Ppi/StatusCode.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h
index e0e5424..0a0e143 100644
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h
@@ -17,20 +17,14 @@
 #ifndef _DXE_CPUIO_LIB_INTERNAL_H_
 #define _DXE_CPUIO_LIB_INTERNAL_H_
 
-//
-// The package level header files this module uses
-//
+
 #include <FrameworkDxe.h>
 
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/CpuIo.h>
 #include <Protocol/PciRootBridgeIo.h>
 
-//
-// The Library classes this module consumes
-//
+
 #include <Library/IoLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/DebugLib.h>
diff --git a/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c b/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
index 728703a..be87369 100644
--- a/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
+++ b/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
@@ -12,18 +12,12 @@
 
 **/
 
-//
-// The package level header files this module uses
-//
+
 #include <FrameworkDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Guid/StatusCodeDataTypeId.h>
 #include <Protocol/StatusCode.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/ReportStatusCodeLib.h>
 #include <Library/DebugLib.h>
 #include <Library/UefiBootServicesTableLib.h>
diff --git a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
index 5e0e009..4283c84 100644
--- a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
+++ b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
@@ -12,19 +12,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
-//
-// The package level header files this module uses
-//
+
 #include <FrameworkSmm.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/LoadedImage.h>
 #include <Protocol/SmmBase.h>
 #include <Protocol/DevicePath.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DxeSmmDriverEntryPoint.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/DebugLib.h>
diff --git a/IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.c b/IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.c
index 86c8daf..354215a 100644
--- a/IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.c
+++ b/IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.c
@@ -14,16 +14,10 @@
 
 **/
 
-//
-// The package level header files this module uses
-//
+
 #include <FrameworkDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-//
-// The Library classes this module consumes
-//
+
+
 #include <Library/HiiLibFramework.h>
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>
diff --git a/IntelFrameworkPkg/Library/IfrSupportLibFramework/CommonHeader.h b/IntelFrameworkPkg/Library/IfrSupportLibFramework/CommonHeader.h
index c575777..064b2ce 100644
--- a/IntelFrameworkPkg/Library/IfrSupportLibFramework/CommonHeader.h
+++ b/IntelFrameworkPkg/Library/IfrSupportLibFramework/CommonHeader.h
@@ -16,18 +16,12 @@
 #define __COMMON_HEADER_H_
 
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Guid/GlobalVariable.h>
 #include <Protocol/HiiFramework.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/IfrSupportLibFramework.h>
 #include <Library/DebugLib.h>
 #include <Library/BaseLib.h>
diff --git a/IntelFrameworkPkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c b/IntelFrameworkPkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
index 1c1ead2..4bacdd1 100644
--- a/IntelFrameworkPkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
+++ b/IntelFrameworkPkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
@@ -13,17 +13,11 @@
 **/
 
 
-//
-// The package level header files this module uses
-//
+
 #include <FrameworkPei.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Guid/StatusCodeDataTypeId.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
diff --git a/IntelFrameworkPkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/IntelFrameworkPkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
index b16f091..5b6f69e 100644
--- a/IntelFrameworkPkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/IntelFrameworkPkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
@@ -12,17 +12,11 @@
 
 **/
 
-//
-// The package level header files this module uses
-//
+
 #include <FrameworkPei.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Guid/StatusCodeDataTypeId.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/ReportStatusCodeLib.h>
 #include <Library/DebugLib.h>
 #include <Library/BaseLib.h>
diff --git a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h
index 794c6ee..3821dac 100644
--- a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h
+++ b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h
@@ -16,18 +16,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __INTERNAL_SMBUS_LIB_H
 #define __INTERNAL_SMBUS_LIB_H
 
-//
-// The package level header files this module uses
-//
+
 #include <PiPei.h>
 #include <FrameworkPei.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Ppi/Smbus.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/SmbusLib.h>
 #include <Library/DebugLib.h>
 #include <Library/PeiServicesTablePointerLib.h>
diff --git a/IntelFrameworkPkg/Library/UefiLibFramework/UefiLibFramework.h b/IntelFrameworkPkg/Library/UefiLibFramework/UefiLibFramework.h
index 9d91611..f15b432 100644
--- a/IntelFrameworkPkg/Library/UefiLibFramework/UefiLibFramework.h
+++ b/IntelFrameworkPkg/Library/UefiLibFramework/UefiLibFramework.h
@@ -18,19 +18,13 @@
 #ifndef _UEFI_LIB_FRAMEWORK_H_
 #define _UEFI_LIB_FRAMEWORK_H_
 
-//
-// The package level header files this module uses
-//
+
 #include <FrameworkDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Guid/EventGroup.h>
 #include <Guid/EventLegacyBios.h>
 #include <Guid/FrameworkDevicePath.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/UefiLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/BaseLib.h>
diff --git a/MdeModulePkg/Bus/Pci/AtapiPassThruDxe/AtapiPassThru.h b/MdeModulePkg/Bus/Pci/AtapiPassThruDxe/AtapiPassThru.h
index 49b97a8..d61c27b 100644
--- a/MdeModulePkg/Bus/Pci/AtapiPassThruDxe/AtapiPassThru.h
+++ b/MdeModulePkg/Bus/Pci/AtapiPassThruDxe/AtapiPassThru.h
@@ -16,18 +16,12 @@
 #define _APT_H
 
 
-//
-// The package level header files this module uses
-//
+
 #include <Uefi.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/ScsiPassThru.h>
 #include <Protocol/PciIo.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/BaseLib.h>
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
index 2b0e4c9..2398b15 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
@@ -23,18 +23,12 @@ Revision History
 #ifndef _EFI_EHCI_H_
 #define _EFI_EHCI_H_
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/Usb2HostController.h>
 #include <Protocol/PciIo.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/UefiDriverEntryPoint.h>
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
index 5a810a3..27d7497 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
@@ -25,19 +25,13 @@ Revision History
 #ifndef _UHCI_H
 #define _UHCI_H
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/Usb2HostController.h>
 #include <Protocol/UsbHostController.h>
 #include <Protocol/PciIo.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/UefiDriverEntryPoint.h>
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c
index 1a99c70..9c604ad 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c
@@ -17,23 +17,17 @@ Abstract:
 
 --*/
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
 
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/ScsiPassThru.h>
 #include <Protocol/ScsiPassThruExt.h>
 #include <Protocol/ScsiIo.h>
 #include <Protocol/ComponentName.h>
 #include <Protocol/DriverBinding.h>
 #include <Protocol/DevicePath.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/UefiLib.h>
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
index 7633fd4..1b895cb 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
@@ -19,23 +19,17 @@ Abstract:
 Revision History
 --*/
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
 
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/ScsiPassThru.h>
 #include <Protocol/ScsiPassThruExt.h>
 #include <Protocol/ScsiIo.h>
 #include <Protocol/ComponentName.h>
 #include <Protocol/DriverBinding.h>
 #include <Protocol/DevicePath.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/UefiLib.h>
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
index 24adbe9..334aae5 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
@@ -17,21 +17,15 @@ Abstract:
 
 --*/
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
 
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/ScsiIo.h>
 #include <Protocol/ComponentName.h>
 #include <Protocol/BlockIo.h>
 #include <Protocol/DriverBinding.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/UefiLib.h>
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index e85f99b..0ecbd50 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -16,21 +16,15 @@ Module Name:
 Abstract:
 
 --*/
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
 
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/ScsiIo.h>
 #include <Protocol/ComponentName.h>
 #include <Protocol/BlockIo.h>
 #include <Protocol/DriverBinding.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/UefiLib.h>
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c
index da97372..8ca860d 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c
@@ -18,14 +18,10 @@ Abstract:
 
 **/
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
 
-//
-// The Library classes this module consumes
-//
+
 #include <Library/UefiLib.h>
 
 
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.h
index 7407a36..09ae445 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.h
@@ -24,20 +24,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _EFI_USB_BUS_H_
 #define _EFI_USB_BUS_H_
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/Usb2HostController.h>
 #include <Protocol/UsbHostController.h>
 #include <Protocol/UsbIo.h>
 #include <Protocol/DevicePath.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/UefiDriverEntryPoint.h>
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.h b/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.h
index e93a866..ee0b06c 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.h
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.h
@@ -22,20 +22,14 @@ Revision History
 #ifndef _USB_KB_H
 #define _USB_KB_H
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/SimpleTextIn.h>
 #include <Guid/HotPlugDevice.h>
 #include <Protocol/UsbIo.h>
 #include <Protocol/DevicePath.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/ReportStatusCodeLib.h>
 #include <Library/BaseMemoryLib.h>
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c
index bd0f939..f278e3b 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c
@@ -17,14 +17,10 @@ Abstract:
 
 --*/
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
 
-//
-// The Library classes this module consumes
-//
+
 #include <Library/UefiLib.h>
 
 //
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
index 8fcbed7..77dcbb7 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
@@ -31,18 +31,12 @@ Revision History
 #ifndef _EFI_USBMASS_H_
 #define _EFI_USBMASS_H_
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/BlockIo.h>
 #include <Protocol/UsbIo.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DebugLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/UefiDriverEntryPoint.h>
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.h b/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.h
index 73cccb0..7a9649f 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.h
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.h
@@ -21,19 +21,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _USB_MOUSE_H
 #define _USB_MOUSE_H
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/SimplePointer.h>
 #include <Protocol/UsbIo.h>
 #include <Protocol/DevicePath.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/ReportStatusCodeLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/UefiDriverEntryPoint.h>
diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index fb7c82f..1edc84f 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -23,14 +23,10 @@ Revision History
 #define _DXE_MAIN_H_
 
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
 #include <FrameworkPei.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/LoadedImage.h>
 #include <Protocol/GuidedSectionExtraction.h>
 #include <Protocol/SectionExtraction.h>
@@ -74,9 +70,7 @@ Revision History
 #include <Protocol/BusSpecificDriverOverride.h>
 #include <Protocol/Performance.h>
 #include <Guid/StatusCodeDataTypeId.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/DxeCoreEntryPoint.h>
 #include <Library/DebugLib.h>
 #include <Library/UefiLib.h>
diff --git a/MdeModulePkg/Core/RuntimeDxe/Crc32.c b/MdeModulePkg/Core/RuntimeDxe/Crc32.c
index 910738e..f2c8f02 100644
--- a/MdeModulePkg/Core/RuntimeDxe/Crc32.c
+++ b/MdeModulePkg/Core/RuntimeDxe/Crc32.c
@@ -26,9 +26,7 @@ Revision History:
 
 --*/
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
 
 UINT32  mCrcTable[256];
diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
index bc1a67e..62a0a55 100644
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
+++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
@@ -19,18 +19,12 @@ Abstract:
 
 --*/
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/Performance.h>
 #include <Guid/PeiPerformanceHob.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/PerformanceLib.h>
 #include <Library/DebugLib.h>
 #include <Library/HobLib.h>
diff --git a/MdeModulePkg/Library/DxePeCoffLoaderFromHobLib/PeCoff.c b/MdeModulePkg/Library/DxePeCoffLoaderFromHobLib/PeCoff.c
index c1a4309..44ec3ca 100644
--- a/MdeModulePkg/Library/DxePeCoffLoaderFromHobLib/PeCoff.c
+++ b/MdeModulePkg/Library/DxePeCoffLoaderFromHobLib/PeCoff.c
@@ -17,17 +17,11 @@ Abstract:
   
 --*/
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Guid/PeiPeCoffLoader.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/PeCoffLoaderLib.h>
 #include <Library/HobLib.h>
 
diff --git a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
index fbfba26..ac2ce4e 100644
--- a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
+++ b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
@@ -19,17 +19,11 @@ Abstract:
 
 --*/
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/Performance.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/PerformanceLib.h>
 #include <Library/DebugLib.h>
 #include <Library/UefiBootServicesTableLib.h>
diff --git a/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c b/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c
index 7dbbcb7..5d781eb 100644
--- a/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c
+++ b/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c
@@ -21,17 +21,11 @@ Abstract:
 
 
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/Print.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/PrintLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 
diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.h b/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.h
index 0f17932..9ef0885 100644
--- a/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.h
+++ b/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.h
@@ -12,18 +12,12 @@ http://opensource.org/licenses/bsd-license.php
 #ifndef __FVB_H__
 #define __FVB_H__
 
-//
-// The package level header files this module uses
-//
+
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Protocol/FirmwareVolumeBlock.h>
 #include <Protocol/FvbExtension.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/FvbServiceLib.h>
 #include <Library/UefiLib.h>
 #include <Library/BaseLib.h>
diff --git a/MdeModulePkg/Library/PeiDxePeCoffLoaderLib/PeCoffLoader.c b/MdeModulePkg/Library/PeiDxePeCoffLoaderLib/PeCoffLoader.c
index 783e875..c8f6b87 100644
--- a/MdeModulePkg/Library/PeiDxePeCoffLoaderLib/PeCoffLoader.c
+++ b/MdeModulePkg/Library/PeiDxePeCoffLoaderLib/PeCoffLoader.c
@@ -20,17 +20,11 @@ Abstract:
 
 --*/
 
-//
-// The package level header files this module uses
-//
+
 #include <PiPei.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Guid/PeiPeCoffLoader.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/PeCoffLib.h>
 
 #include <IndustryStandard/PeImage.h>
diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
index aa23184..3bfd486 100644
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
+++ b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
@@ -19,17 +19,11 @@ Abstract:
 
 --*/
 
-//
-// The package level header files this module uses
-//
+
 #include <PiPei.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
+
 #include <Guid/PeiPerformanceHob.h>
-//
-// The Library classes this module consumes
-//
+
 #include <Library/PerformanceLib.h>
 #include <Library/DebugLib.h>
 #include <Library/HobLib.h>
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
index 8e02b63..1965c3c 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 58a1629..283abf9 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 98b4df0..044572f 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 ddd11e6..8fdf147 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 0f4e277..ca92d07 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 1163d7a..cdab409 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 d1631f8..a62b121 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 8bc122d..bc28dce 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 4b04381..bfa9101 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 c1ef509..42af272 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 55ed7c3..35ed2a8 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 1e445c5..8fa70ab 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 2c8c33a..fd2d7c5 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>