summaryrefslogtreecommitdiff
path: root/Nt32Pkg/Library
diff options
context:
space:
mode:
authorAJFISH <AJFISH@6f19259b-4bc3-4df7-8a09-765794883524>2007-07-10 17:16:14 +0000
committerAJFISH <AJFISH@6f19259b-4bc3-4df7-8a09-765794883524>2007-07-10 17:16:14 +0000
commitf25695723bfe21bf664589ae086a0c472d7fec80 (patch)
treed5ebe0fcc7651f0239ae57de9025915df538ba7a /Nt32Pkg/Library
parent859b72fa7e3ff1cf1d7476a3446af4ebbb5fe3e6 (diff)
downloadedk2-platforms-f25695723bfe21bf664589ae086a0c472d7fec80.tar.xz
Removed CommonHeader.h from NT32Pkg. Did not fix BDS as it will get re-written
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3181 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'Nt32Pkg/Library')
-rw-r--r--Nt32Pkg/Library/DxeWinNtLib/CommonHeader.h34
-rw-r--r--Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf29
-rw-r--r--Nt32Pkg/Library/DxeWinNtLib/WinNtLib.c10
-rw-r--r--Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c6
-rw-r--r--Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c5
-rw-r--r--Nt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c5
-rw-r--r--Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c6
-rw-r--r--Nt32Pkg/Library/EdkGenericBdsLib/DevicePath.c5
-rw-r--r--Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf45
-rw-r--r--Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h96
-rw-r--r--Nt32Pkg/Library/EdkGenericBdsLib/Performance.c7
-rw-r--r--Nt32Pkg/Library/EdkGenericBdsLib/Performance.h60
-rw-r--r--Nt32Pkg/Library/Nt32PeCoffLoaderLib/CommonHeader.h32
-rw-r--r--Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c8
-rw-r--r--Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf27
-rw-r--r--Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/CommonHeader.h35
-rw-r--r--Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf36
-rw-r--r--Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c10
18 files changed, 118 insertions, 338 deletions
diff --git a/Nt32Pkg/Library/DxeWinNtLib/CommonHeader.h b/Nt32Pkg/Library/DxeWinNtLib/CommonHeader.h
deleted file mode 100644
index c6f575f742..0000000000
--- a/Nt32Pkg/Library/DxeWinNtLib/CommonHeader.h
+++ /dev/null
@@ -1,34 +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_
-
-
-//
-// The package level header files this module uses
-//
-#include <PiDxe.h>
-#include <WinNtDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-//
-// The Library classes this module consumes
-//
-#include <Library/WinNtLib.h>
-#include <Library/DebugLib.h>
-#include <Library/HobLib.h>
-
-#endif
diff --git a/Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf b/Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf
index dc22accf00..1e487349b9 100644
--- a/Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf
+++ b/Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf
@@ -13,12 +13,6 @@
#
#
#**/
-
-################################################################################
-#
-# Defines Section - statements that will be processed to create a Makefile.
-#
-################################################################################
[Defines]
INF_VERSION = 0x00010005
BASE_NAME = DxeWinNtLib
@@ -39,36 +33,13 @@
# HOB Guid C Name: gEfiWinNtThunkProtocolGuid Hob Type: GUID_EXTENSION
#
-################################################################################
-#
-# Sources Section - list of files that are required for the build to succeed.
-#
-################################################################################
-
[Sources.common]
WinNtLib.c
- CommonHeader.h
-
-
-################################################################################
-#
-# Package Dependency Section - list of Package files that are required for
-# this module.
-#
-################################################################################
[Packages]
MdePkg/MdePkg.dec
Nt32Pkg/Nt32Pkg.dec
-
-################################################################################
-#
-# Library Class Section - list of Library Classes that are required for
-# this module.
-#
-################################################################################
-
[LibraryClasses]
HobLib
DebugLib
diff --git a/Nt32Pkg/Library/DxeWinNtLib/WinNtLib.c b/Nt32Pkg/Library/DxeWinNtLib/WinNtLib.c
index ef04eca44b..77efbb6a87 100644
--- a/Nt32Pkg/Library/DxeWinNtLib/WinNtLib.c
+++ b/Nt32Pkg/Library/DxeWinNtLib/WinNtLib.c
@@ -19,13 +19,13 @@ Abstract:
--*/
+#include <PiDxe.h>
+#include <WinNtDxe.h>
+#include <Library/WinNtLib.h>
+#include <Library/DebugLib.h>
+#include <Library/HobLib.h>
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
EFI_WIN_NT_THUNK_PROTOCOL *gWinNt;
EFI_STATUS
diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
index de11d2eacf..78b2e99661 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
@@ -19,12 +19,8 @@ Abstract:
option.
--*/
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-#include "Performance.h"
+#include <EdkGenericBdsLibInternal.h>
BOOLEAN mEnumBootDevice = FALSE;
diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c
index cb51488795..6362c20b70 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c
@@ -19,10 +19,7 @@ Abstract:
--*/
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <EdkGenericBdsLibInternal.h>
VOID
BdsLibConnectAll (
diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c
index 7a88792d72..4dedf1d7ff 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c
@@ -19,10 +19,7 @@ Abstract:
--*/
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <EdkGenericBdsLibInternal.h>
BOOLEAN
IsNvNeed (
diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
index 819e926290..13ec89f501 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
@@ -19,10 +19,8 @@ Abstract:
--*/
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <EdkGenericBdsLibInternal.h>
+
#define MAX_STRING_LEN 200
static BOOLEAN mFeaturerSwitch = TRUE;
diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/DevicePath.c b/Nt32Pkg/Library/EdkGenericBdsLib/DevicePath.c
index d971705ae6..70ad40e8c9 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/DevicePath.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/DevicePath.c
@@ -20,10 +20,7 @@ Abstract:
--*/
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <EdkGenericBdsLibInternal.h>
EFI_GUID mEfiWinNtThunkProtocolGuid = EFI_WIN_NT_THUNK_PROTOCOL_GUID;
EFI_GUID mEfiWinNtUgaGuid = EFI_WIN_NT_UGA_GUID;
diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
index ba2e38b9c3..ca25796624 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
@@ -17,11 +17,6 @@
#
#**/
-################################################################################
-#
-# Defines Section - statements that will be processed to create a Makefile.
-#
-################################################################################
[Defines]
INF_VERSION = 0x00010005
BASE_NAME = EdkGenericBdsLib
@@ -39,29 +34,14 @@
# VALID_ARCHITECTURES = IA32
#
-################################################################################
-#
-# Sources Section - list of files that are required for the build to succeed.
-#
-################################################################################
-
[Sources.common]
BdsMisc.c
Performance.c
- Performance.h
DevicePath.c
BdsConnect.c
BdsConsole.c
BdsBoot.c
- CommonHeader.h
-
-
-################################################################################
-#
-# Package Dependency Section - list of Package files that are required for
-# this module.
-#
-################################################################################
+ EdkGenericBdsLib.h
[Packages]
MdePkg/MdePkg.dec
@@ -69,14 +49,6 @@
IntelFrameworkPkg/IntelFrameworkPkg.dec
Nt32Pkg/Nt32Pkg.dec
-
-################################################################################
-#
-# Library Class Section - list of Library Classes that are required for
-# this module.
-#
-################################################################################
-
[LibraryClasses]
PeCoffLib
PerformanceLib
@@ -92,26 +64,11 @@
UefiLib
BaseLib
-
-################################################################################
-#
-# Guid C Name Section - list of Guids that this module uses or produces.
-#
-################################################################################
-
[Guids]
gEfiGlobalVariableGuid # ALWAYS_CONSUMED
gEfiGenericPlatformVariableGuid # ALWAYS_CONSUMED
gEfiShellFileGuid # ALWAYS_CONSUMED
-
-################################################################################
-#
-# Protocol C Name Section - list of Protocol and Protocol Notify C Names
-# that this module uses or produces.
-#
-################################################################################
-
[Protocols]
gEfiSimpleFileSystemProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
gEfiLoadFileProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h
new file mode 100644
index 0000000000..9d07a5c88b
--- /dev/null
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h
@@ -0,0 +1,96 @@
+/**@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 __EDK_GENERIC_BDS_LIB_INTERNAL_H_
+#define __EDK_GENERIC_BDS_LIB_INTERNAL_H_
+
+
+//
+// The package level header files this module uses
+//
+#include <PiDxe.h>
+#include <WinNtDxe.h>
+//
+// The protocols, PPI and GUID defintions for this module
+//
+#include <Protocol/Cpu.h>
+#include <Protocol/SimpleTextIn.h>
+#include <Protocol/SimpleTextOut.h>
+#include <Protocol/LoadedImage.h>
+#include <Guid/GenericPlatformVariable.h>
+#include <Guid/ShellFile.h>
+#include <Protocol/SimpleFileSystem.h>
+#include <Protocol/BlockIo.h>
+#include <Protocol/SimpleNetwork.h>
+#include <Protocol/AcpiS3Save.h>
+#include <Guid/GlobalVariable.h>
+#include <Protocol/FormBrowserFramework.h>
+#include <Protocol/LegacyBios.h>
+#include <Protocol/DriverBinding.h>
+#include <Protocol/LoadFile.h>
+#include <Protocol/DevicePath.h>
+#include <Protocol/FirmwareVolume.h>
+#include <Protocol/Performance.h>
+#include <Protocol/WinNtIo.h>
+#include <Guid/PcAnsi.h>
+
+//
+// The Library classes this module consumes
+//
+#include <Library/EdkGenericBdsLib.h>
+#include <Library/BaseLib.h>
+#include <Library/UefiLib.h>
+#include <Library/DxeServicesTableLib.h>
+#include <Library/DebugLib.h>
+#include <Library/PrintLib.h>
+#include <Library/HobLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiRuntimeServicesTableLib.h>
+#include <Library/DevicePathLib.h>
+#include <Library/PerformanceLib.h>
+#include <Library/PeCoffLib.h>
+
+#define PERF_TOKEN_LENGTH 28
+#define PERF_PEI_ENTRY_MAX_NUM 50
+
+typedef struct {
+ CHAR8 Token[PERF_TOKEN_LENGTH];
+ UINT32 Duration;
+} PERF_DATA;
+
+typedef struct {
+ UINT64 BootToOs;
+ UINT64 S3Resume;
+ UINT32 S3EntryNum;
+ PERF_DATA S3Entry[PERF_PEI_ENTRY_MAX_NUM];
+ UINT64 CpuFreq;
+ UINT64 BDSRaw;
+ UINT32 Count;
+ UINT32 Signiture;
+} PERF_HEADER;
+
+VOID
+WriteBootToOsPerformanceData (
+ VOID
+ );
+
+VOID
+ClearDebugRegisters (
+ VOID
+ );
+
+
+#endif
diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/Performance.c b/Nt32Pkg/Library/EdkGenericBdsLib/Performance.c
index e3013ebbb1..7d581b45f0 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/Performance.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/Performance.c
@@ -21,12 +21,7 @@ Abstract:
--*/
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
-#include "Performance.h"
+#include <EdkGenericBdsLibInternal.h>
STATIC
diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/Performance.h b/Nt32Pkg/Library/EdkGenericBdsLib/Performance.h
deleted file mode 100644
index cc05d28ae6..0000000000
--- a/Nt32Pkg/Library/EdkGenericBdsLib/Performance.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*++
-
-Copyright (c) 2006, 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.
-
-Module Name:
-
- Performance.h
-
-Abstract:
-
- This file included the performance relete function header and
- definition.
-
---*/
-
-#ifndef _PERF_H_
-#define _PERF_H_
-
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
-#define PERF_TOKEN_LENGTH 28
-#define PERF_PEI_ENTRY_MAX_NUM 50
-
-typedef struct {
- CHAR8 Token[PERF_TOKEN_LENGTH];
- UINT32 Duration;
-} PERF_DATA;
-
-typedef struct {
- UINT64 BootToOs;
- UINT64 S3Resume;
- UINT32 S3EntryNum;
- PERF_DATA S3Entry[PERF_PEI_ENTRY_MAX_NUM];
- UINT64 CpuFreq;
- UINT64 BDSRaw;
- UINT32 Count;
- UINT32 Signiture;
-} PERF_HEADER;
-
-VOID
-WriteBootToOsPerformanceData (
- VOID
- );
-
-VOID
-ClearDebugRegisters (
- VOID
- );
-
-#endif
diff --git a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/CommonHeader.h b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/CommonHeader.h
deleted file mode 100644
index 98046089bf..0000000000
--- a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/CommonHeader.h
+++ /dev/null
@@ -1,32 +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_
-
-
-//
-// 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/PeCoffLoaderLib.h>
-
-#endif
diff --git a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c
index 6d273f47e6..8eaa2aba43 100644
--- a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c
+++ b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c
@@ -20,13 +20,11 @@ Abstract:
--*/
+#include <PiPei.h>
+#include <Guid/PeiPeCoffLoader.h>
+#include <Library/PeCoffLoaderLib.h>
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
EFI_PEI_PE_COFF_LOADER_PROTOCOL *mPeiEfiPeiPeCoffLoader;
EFI_STATUS
diff --git a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf
index a24b544d23..e4d384ae82 100644
--- a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf
+++ b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf
@@ -14,11 +14,6 @@
#
#**/
-################################################################################
-#
-# Defines Section - statements that will be processed to create a Makefile.
-#
-################################################################################
[Defines]
INF_VERSION = 0x00010005
BASE_NAME = Nt32PeCoffLoaderLib
@@ -37,35 +32,13 @@
# VALID_ARCHITECTURES = IA32
#
-################################################################################
-#
-# Sources Section - list of files that are required for the build to succeed.
-#
-################################################################################
-
[Sources.common]
Nt32PeCoffLoader.c
- CommonHeader.h
-
-################################################################################
-#
-# Package Dependency Section - list of Package files that are required for
-# this module.
-#
-################################################################################
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
-
-################################################################################
-#
-# PPI C Name Section - list of PPI and PPI Notify C Names that this module
-# uses or produces.
-#
-################################################################################
-
[Ppis]
gEfiPeiPeCoffLoaderGuid # PPI ALWAYS_CONSUMED
diff --git a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/CommonHeader.h b/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/CommonHeader.h
deleted file mode 100644
index 16f63752f2..0000000000
--- a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/CommonHeader.h
+++ /dev/null
@@ -1,35 +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_
-
-
-//
-// The package level header files this module uses
-//
-#include <PiPei.h>
-#include <IndustryStandard/PeImage.h>
-#include <WinNtPeim.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-#include <Ppi/NtPeiLoadFile.h>
-//
-// The Library classes this module consumes
-//
-#include <Library/PeCoffGetEntryPointLib.h>
-#include <Library/PeiServicesLib.h>
-
-#endif
diff --git a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf b/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf
index d7fd32c352..705aa2fa86 100644
--- a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf
+++ b/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf
@@ -14,11 +14,6 @@
#
#**/
-################################################################################
-#
-# Defines Section - statements that will be processed to create a Makefile.
-#
-################################################################################
[Defines]
INF_VERSION = 0x00010005
BASE_NAME = EdkNt32PeiPeCoffGetEntryPointLib
@@ -36,47 +31,16 @@
# VALID_ARCHITECTURES = IA32
#
-################################################################################
-#
-# Sources Section - list of files that are required for the build to succeed.
-#
-################################################################################
-
[Sources.common]
PeCoffGetEntryPoint.c
- CommonHeader.h
-
-
-################################################################################
-#
-# Package Dependency Section - list of Package files that are required for
-# this module.
-#
-################################################################################
[Packages]
MdePkg/MdePkg.dec
Nt32Pkg/Nt32Pkg.dec
-
-################################################################################
-#
-# Library Class Section - list of Library Classes that are required for
-# this module.
-#
-################################################################################
-
[LibraryClasses]
PeiServicesLib
-
-################################################################################
-#
-# PPI C Name Section - list of PPI and PPI Notify C Names that this module
-# uses or produces.
-#
-################################################################################
-
[Ppis]
gNtPeiLoadFilePpiGuid # PPI ALWAYS_CONSUMED
diff --git a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c b/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
index fd8f739a85..4f3c505cdd 100644
--- a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
+++ b/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
@@ -21,11 +21,13 @@ Revision History
--*/
+#include <PiPei.h>
+#include <IndustryStandard/PeImage.h>
+#include <WinNtPeim.h>
+#include <Ppi/NtPeiLoadFile.h>
+#include <Library/PeCoffGetEntryPointLib.h>
+#include <Library/PeiServicesLib.h>
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
RETURN_STATUS
EFIAPI