From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 27 Jul 2007 03:52:06 +0000 (+0000)
Subject: Remove CommonHeader.h for BdsPlatformDxe driver in Nt32Pkg.
X-Git-Tag: edk2-stable201903~22487
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=40f18da12b2f04f42cae34a7f33db6a595f4dcd7

Remove CommonHeader.h for BdsPlatformDxe driver in Nt32Pkg.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3474 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c b/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c
index 79f75f68a5..50af22f047 100644
--- a/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c
+++ b/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c
@@ -20,11 +20,6 @@ Abstract:
 
 --*/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/Bds.h"
 #include "BdsPlatform.h"
 #include "Generic/BdsString.h"
diff --git a/Nt32Pkg/PlatformBdsDxe/BdsPlatform.h b/Nt32Pkg/PlatformBdsDxe/BdsPlatform.h
index b5ab5418d3..ff4ee6bccc 100644
--- a/Nt32Pkg/PlatformBdsDxe/BdsPlatform.h
+++ b/Nt32Pkg/PlatformBdsDxe/BdsPlatform.h
@@ -22,10 +22,61 @@ Abstract:
 #ifndef _BDS_PLATFORM_H
 #define _BDS_PLATFORM_H
 
+#include <PiDxe.h>
+#include <Common/MaxBbsEntries.h>
+#include <Protocol/FormCallbackFramework.h>
+#include <Protocol/DevicePath.h>
+#include <Protocol/LoadFile.h>
+#include <Protocol/CpuIo.h>
+#include <Protocol/Bds.h>
+#include <Protocol/DataHub.h>
+#include <Protocol/FormBrowserFramework.h>
+#include <Protocol/UgaDraw.h>
+#include <Protocol/BlockIo.h>
+#include <Protocol/ConsoleControl.h>
+#include <Protocol/GenericMemoryTest.h>
+#include <Protocol/GraphicsOutput.h>
+#include <Protocol/SimpleFileSystem.h>
+#include <Protocol/HiiFramework.h>
+#include <Protocol/SerialIo.h>
+#include <Protocol/LegacyBios.h>
+#include <Protocol/Performance.h>
+#include <Guid/PcAnsi.h>
+#include <Guid/DataHubRecords.h>
+#include <Guid/Bmp.h>
+#include <Guid/FileInfo.h>
+#include <Guid/BootState.h>
+#include <Guid/FileSystemVolumeLabelInfo.h>
+#include <Guid/GenericPlatformVariable.h>
+#include <Guid/GlobalVariable.h>
+
+#include <Library/DebugLib.h>
+#include <Library/UefiLib.h>
+#include <Library/UefiDriverEntryPoint.h>
+#include <Library/BaseLib.h>
+#include <Library/GraphicsLib.h>
+#include <Library/DxeServicesTableLib.h>
+#include <Library/PerformanceLib.h>
+#include <Library/PrintLib.h>
+#include <Library/IfrSupportLibFramework.h>
+#include <Library/ReportStatusCodeLib.h>
+#include <Library/HobLib.h>
+#include <Library/EdkGenericBdsLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiRuntimeServicesTableLib.h>
+#include <Library/DevicePathLib.h>
+#include <Library/HiiLibFramework.h>
+#include <Library/PeCoffLib.h>
+#include <Library/PcdLib.h>
+
 //
-// Include common header file for this module.
+// The rest of the includes
 //
-#include "CommonHeader.h"
+#include <Common/FirmwareRevision.h>
+
+extern UINT8 PlatformBdsStrings[];
 
 #include "IndustryStandard/Pci22.h"
 
diff --git a/Nt32Pkg/PlatformBdsDxe/CommonHeader.h b/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
deleted file mode 100644
index 8f9a6d63ca..0000000000
--- a/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/**@file
-  Common header file shared by all source files.
-
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.
-
-  Copyright (c) 2006 - 2007, Intel Corporation
-  All rights reserved. This program and the accompanying materials
-   are licensed and made available under the terms and conditions of the BSD License
-   which accompanies this distribution. The full text of the license may be found at
-   http://opensource.org/licenses/bsd-license.php
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-**/
-
-#ifndef __COMMON_HEADER_H_
-#define __COMMON_HEADER_H_
-
-#include <PiDxe.h>
-#include <Common/MaxBbsEntries.h>
-#include <Protocol/FormCallbackFramework.h>
-#include <Protocol/DevicePath.h>
-#include <Protocol/LoadFile.h>
-#include <Protocol/CpuIo.h>
-#include <Protocol/Bds.h>
-#include <Protocol/DataHub.h>
-#include <Protocol/FormBrowserFramework.h>
-#include <Protocol/UgaDraw.h>
-#include <Protocol/BlockIo.h>
-#include <Protocol/ConsoleControl.h>
-#include <Protocol/GenericMemoryTest.h>
-#include <Protocol/GraphicsOutput.h>
-#include <Protocol/SimpleFileSystem.h>
-#include <Protocol/HiiFramework.h>
-#include <Protocol/SerialIo.h>
-#include <Protocol/LegacyBios.h>
-#include <Protocol/Performance.h>
-#include <Guid/PcAnsi.h>
-#include <Guid/DataHubRecords.h>
-#include <Guid/Bmp.h>
-#include <Guid/FileInfo.h>
-#include <Guid/BootState.h>
-#include <Guid/FileSystemVolumeLabelInfo.h>
-#include <Guid/GenericPlatformVariable.h>
-#include <Guid/GlobalVariable.h>
-
-#include <Library/DebugLib.h>
-#include <Library/UefiLib.h>
-#include <Library/UefiDriverEntryPoint.h>
-#include <Library/BaseLib.h>
-#include <Library/GraphicsLib.h>
-#include <Library/DxeServicesTableLib.h>
-#include <Library/PerformanceLib.h>
-#include <Library/PrintLib.h>
-#include <Library/IfrSupportLibFramework.h>
-#include <Library/ReportStatusCodeLib.h>
-#include <Library/HobLib.h>
-#include <Library/EdkGenericBdsLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/UefiRuntimeServicesTableLib.h>
-#include <Library/DevicePathLib.h>
-#include <Library/HiiLibFramework.h>
-#include <Library/PeCoffLib.h>
-#include <Library/PcdLib.h>
-
-//
-// The rest of the includes
-//
-#include <Common/FirmwareRevision.h>
-
-extern UINT8 PlatformBdsStrings[];
-
-#endif
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h b/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h
index bbd655647a..dfb63d5c65 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h
@@ -24,10 +24,55 @@ Revision History
 #ifndef _BDS_H
 #define _BDS_H
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <PiDxe.h>
+#include <Common/MaxBbsEntries.h>
+#include <Protocol/FormCallbackFramework.h>
+#include <Protocol/DevicePath.h>
+#include <Protocol/LoadFile.h>
+#include <Protocol/CpuIo.h>
+#include <Protocol/Bds.h>
+#include <Protocol/DataHub.h>
+#include <Protocol/FormBrowserFramework.h>
+#include <Protocol/UgaDraw.h>
+#include <Protocol/BlockIo.h>
+#include <Protocol/ConsoleControl.h>
+#include <Protocol/GenericMemoryTest.h>
+#include <Protocol/GraphicsOutput.h>
+#include <Protocol/SimpleFileSystem.h>
+#include <Protocol/HiiFramework.h>
+#include <Protocol/SerialIo.h>
+#include <Protocol/LegacyBios.h>
+#include <Protocol/Performance.h>
+#include <Guid/PcAnsi.h>
+#include <Guid/DataHubRecords.h>
+#include <Guid/Bmp.h>
+#include <Guid/FileInfo.h>
+#include <Guid/BootState.h>
+#include <Guid/FileSystemVolumeLabelInfo.h>
+#include <Guid/GenericPlatformVariable.h>
+#include <Guid/GlobalVariable.h>
+
+#include <Library/DebugLib.h>
+#include <Library/UefiLib.h>
+#include <Library/UefiDriverEntryPoint.h>
+#include <Library/BaseLib.h>
+#include <Library/GraphicsLib.h>
+#include <Library/DxeServicesTableLib.h>
+#include <Library/PerformanceLib.h>
+#include <Library/PrintLib.h>
+#include <Library/IfrSupportLibFramework.h>
+#include <Library/ReportStatusCodeLib.h>
+#include <Library/HobLib.h>
+#include <Library/EdkGenericBdsLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiRuntimeServicesTableLib.h>
+#include <Library/DevicePathLib.h>
+#include <Library/HiiLibFramework.h>
+#include <Library/PeCoffLib.h>
+#include <Library/PcdLib.h>
+
 
 //
 // Bds AP Context data
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BdsEntry.c b/Nt32Pkg/PlatformBdsDxe/Generic/BdsEntry.c
index d2dab38e3a..6979db006c 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BdsEntry.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BdsEntry.c
@@ -19,11 +19,6 @@ Abstract:
 
 --*/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Bds.h"
 #include "BdsPlatform.h"
 #include "FrontPage.h"
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.c
index bc4de6cb9c..37c0475ba7 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.c
@@ -21,11 +21,6 @@ Abstract:
 
 --*/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "BBSsupport.h"
 
 EFI_DEVICE_PATH_PROTOCOL  EndDevicePath[] = {
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.h b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.h
index 685c66a4ee..663fd0a098 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.h
@@ -24,11 +24,6 @@ Revision History
 #ifndef _EFI_BDS_BBS_SUPPORT_H
 #define _EFI_BDS_BBS_SUPPORT_H
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/BootMaint/BootMaint.h"
 
 #if   defined (MDE_CPU_IA32)
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BmLib.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BmLib.c
index 9c21407d1e..8804b141ae 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BmLib.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BmLib.c
@@ -19,11 +19,6 @@ AgBStract:
 
 --*/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "BootMaint.h"
 
 EFI_STATUS
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c
index 9054f134d6..51570f20b9 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c
@@ -19,11 +19,6 @@ Abstract:
 
 --*/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/Bds.h"
 #include "BootMaint.h"
 #include "formguid.h"
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h
index 3596be18f4..5b21fabbc0 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h
@@ -22,11 +22,7 @@ Revision History
 #ifndef _BOOT_MAINT_H
 #define _BOOT_MAINT_H
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
+#include "Generic/Bds.h"
 #include "Generic/BootMaint/BBSsupport.h"
 
 //
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootOption.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootOption.c
index c9d8bef4eb..b5afc7c7fe 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootOption.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootOption.c
@@ -24,11 +24,6 @@ Revision History
 
 --*/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "BootMaint.h"
 #include "BBSsupport.h"
 
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/ConsoleOption.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/ConsoleOption.c
index d30792d15b..7a62765fcd 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/ConsoleOption.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/ConsoleOption.c
@@ -21,11 +21,6 @@ Revision History
 
 --*/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "BootMaint.h"
 
 EFI_DEVICE_PATH_PROTOCOL  *
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Data.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Data.c
index bab6de6722..4b169c9822 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Data.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Data.c
@@ -21,11 +21,6 @@ Revision History
 
 --*/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "BootMaint.h"
 
 EFI_HII_UPDATE_DATA *UpdateData;
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FileExplorer.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FileExplorer.c
index 4d21995612..db835cf534 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FileExplorer.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FileExplorer.c
@@ -19,11 +19,6 @@ AgBStract:
 
 --*/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/Bds.h"
 #include "BootMaint.h"
 #include "BdsPlatform.h"
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/UpdatePage.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/UpdatePage.c
index c03538d0b6..435b0753d4 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/UpdatePage.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/UpdatePage.c
@@ -12,11 +12,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/Bds.h"
 #include "BootMaint.h"
 #include "BdsPlatform.h"
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Variable.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Variable.c
index e1c7e58f68..cac68a16b0 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Variable.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Variable.c
@@ -19,11 +19,6 @@ Abstract:
 
 --*/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/Bds.h"
 #include "BootMaint.h"
 #include "bdsplatform.h"
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c
index cfe4ee4d7a..14209b87d5 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c
@@ -18,10 +18,6 @@ Abstract:
   The platform boot manager reference implement
 
 --*/
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
 
 #include "BootManager.h"
 
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h
index 641e39dec2..fd9b5a1f34 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h
@@ -24,11 +24,6 @@ Revision History
 #ifndef _EFI_BOOT_MANAGER_H
 #define _EFI_BOOT_MANAGER_H
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/Bds.h"
 #include "BdsPlatform.h"
 #include "Generic/BdsString.h"
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/Capsules.c b/Nt32Pkg/PlatformBdsDxe/Generic/Capsules.c
index 7fea4552b7..d56545266b 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/Capsules.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/Capsules.c
@@ -19,12 +19,7 @@ Abstract:
 
 --*/
 
-
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
+#include "Bds.h"
 #include <Guid/FlashMapHob.h>
 
 VOID
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c
index 9cfb82db11..f990350781 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c
@@ -18,10 +18,7 @@ Abstract:
   The platform device manager reference implement
 
 --*/
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+
 #include "DeviceManager.h"
 
 STATIC UINT16                     mTokenCount;
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.h b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.h
index d7238dfc53..dd6d935e45 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.h
@@ -24,11 +24,6 @@ Revision History
 #ifndef _DEVICE_MANAGER_H
 #define _DEVICE_MANAGER_H
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/FrontPage.h"
 
 #define EFI_NON_DEVICE_CLASS              0x00  // Useful when you do not want something in the Device Manager
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c
index 9b8a805e46..93b27c5ed4 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c
@@ -18,12 +18,6 @@ Abstract:
   FrontPage routines to handle the callbacks and browser calls
 
 --*/
-
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Bds.h"
 #include "BdsPlatform.h"
 #include "FrontPage.h"
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.h b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.h
index 7e17cb4314..0f673f0956 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.h
@@ -24,11 +24,6 @@ Revision History
 #ifndef _FRONT_PAGE_H
 #define _FRONT_PAGE_H
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/DeviceMngr/DeviceManager.h"
 #include "Generic/BootMaint/BootMaint.h"
 #include "Generic/BootMngr/BootManager.h"
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/Language.c b/Nt32Pkg/PlatformBdsDxe/Generic/Language.c
index c8e73a21bc..53657fe4d0 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/Language.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/Language.c
@@ -20,12 +20,7 @@ Abstract:
 Revision History
 
 --*/
-
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
+#include "Bds.h"
 #include "BdsString.h"
 #include "Language.h"
 
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/Language.h b/Nt32Pkg/PlatformBdsDxe/Generic/Language.h
index c5af97d823..a32e94e4e6 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/Language.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/Language.h
@@ -24,10 +24,6 @@ Revision History
 #ifndef _LANGUAGE_H
 #define _LANGUAGE_H
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
 
 #define ISO_639_2_ENTRY_SIZE  3
 
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c b/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c
index 21bfe05e03..0ed4207cd8 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c
@@ -19,11 +19,6 @@ Abstract:
 
 --*/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "bds.h"
 #include "BdsPlatform.h"
 #include "BdsString.h"
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/String.c b/Nt32Pkg/PlatformBdsDxe/Generic/String.c
index cbb35d027b..f84b348d96 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/String.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/String.c
@@ -21,11 +21,6 @@ Revision History
 
 --*/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Bds.h"
 #include "BdsString.h"
 #include "Language.h"
diff --git a/Nt32Pkg/PlatformBdsDxe/PlatformData.c b/Nt32Pkg/PlatformBdsDxe/PlatformData.c
index 175c569f6c..e67de004b8 100644
--- a/Nt32Pkg/PlatformBdsDxe/PlatformData.c
+++ b/Nt32Pkg/PlatformBdsDxe/PlatformData.c
@@ -20,11 +20,6 @@ Abstract:
 
 --*/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/Bds.h"
 #include "BdsPlatform.h"
 #include <Protocol/WinNtThunk.h>