3 files changed, 5 insertions, 68 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