Removed CommonHeader.h generated file from the MdePkg.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2922 6f19259b-4bc3-4df7-8a09-765794883524
author: AJFISH <AJFISH@6f19259b-4bc3-4df7-8a09-765794883524> 2007-06-29 23:22:13 +0000
committer: AJFISH <AJFISH@6f19259b-4bc3-4df7-8a09-765794883524> 2007-06-29 23:22:13 +0000
commit: f734a10ab104f1072f94cab66a5489e0fd8fce8a (patch)
tree: b2e02ec5bc4bdf9a21166d50f57365e602c07310 /MdePkg
parent: bd0aee7629debf78fffc656f62bd01af3acc0464 (diff)
download: edk2-platforms-f734a10ab104f1072f94cab66a5489e0fd8fce8a.tar.xz
272 files changed, 325 insertions, 782 deletions
diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf b/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
index 1a0aa72977..156fa86c02 100644
--- a/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
+++ b/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
@@ -43,9 +43,6 @@
 #
 ################################################################################
 
-[Sources.common]
-  CommonHeader.h
-
 [Sources.Ia32]
   x86Cache.c
 
diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/CommonHeader.h b/MdePkg/Library/BaseCacheMaintenanceLib/CommonHeader.h
deleted file mode 100644
index d0df949fab..0000000000
--- a/MdePkg/Library/BaseCacheMaintenanceLib/CommonHeader.h
+++ /dev/null
@@ -1,33 +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) 2007 - 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 <Base.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-//
-// The Library classes this module consumes
-//
-#include <Library/CacheMaintenanceLib.h>
-#include <Library/BaseLib.h>
-#include <Library/DebugLib.h>
-
-#endif
diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/EbcCache.c b/MdePkg/Library/BaseCacheMaintenanceLib/EbcCache.c
index 45d44db067..ccb5010fd0 100644
--- a/MdePkg/Library/BaseCacheMaintenanceLib/EbcCache.c
+++ b/MdePkg/Library/BaseCacheMaintenanceLib/EbcCache.c
@@ -15,7 +15,8 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <Base.h>
+#include <Library/DebugLib.h>
 
 /**
   Invalidates the entire instruction cache in cache coherency domain of the
diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/IpfCache.c b/MdePkg/Library/BaseCacheMaintenanceLib/IpfCache.c
index e714eae02b..8461d68ee2 100644
--- a/MdePkg/Library/BaseCacheMaintenanceLib/IpfCache.c
+++ b/MdePkg/Library/BaseCacheMaintenanceLib/IpfCache.c
@@ -16,7 +16,9 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <Base.h>
+#include <Library/BaseLib.h>
+#include <Library/DebugLib.h>
 
 /**
   Invalidates the entire instruction cache in cache coherency domain of the
diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/x86Cache.c b/MdePkg/Library/BaseCacheMaintenanceLib/x86Cache.c
index 276e763309..9cb5589297 100644
--- a/MdePkg/Library/BaseCacheMaintenanceLib/x86Cache.c
+++ b/MdePkg/Library/BaseCacheMaintenanceLib/x86Cache.c
@@ -17,7 +17,9 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <Base.h>
+#include <Library/BaseLib.h>
+#include <Library/DebugLib.h>
 
 //
 // This size must be at or below the smallest cache size possible among all
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
index 736947e12a..157cb4986c 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
@@ -45,7 +45,7 @@
 
 [Sources.common]
   IoLibMmioBuffer.c
-  CommonHeader.h
+  BaseIoLibIntrinsicInternal.h
 
 [Sources.Ia32]
   IoHighLevel.c
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/CommonHeader.h b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicInternal.h
index 56858d1825..56858d1825 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/CommonHeader.h
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicInternal.h
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
index d9702c9f57..82c2493110 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include "BaseIoLibIntrinsicInternal.h"
 
 /**
   Reads an 8-bit I/O port, performs a bitwise inclusive OR, and writes the
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c
index bbd12959f6..1654d3eac4 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include "BaseIoLibIntrinsicInternal.h"
 
 /**
   Reads a 64-bit I/O port.
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
index c6cf5f72cc..3706a4bfe4 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include "BaseIoLibIntrinsicInternal.h"
 
 /**
   Reads an 8-bit MMIO register.
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
index 27d21c1879..fd2264c50d 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include "BaseIoLibIntrinsicInternal.h"
 
 #define MAP_PORT_BASE_TO_MEM(_Port) \
     ((((_Port) & 0xfffc) << 10) | ((_Port) & 0x0fff))
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
index 8befbf8d17..4569a166e7 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include "BaseIoLibIntrinsicInternal.h"
 
 /**
   Copy data from MMIO region to system memory by using 8-bit access.
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
index 35854c6ccd..4f95b4ef15 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
@@ -25,7 +25,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include "BaseIoLibIntrinsicInternal.h"
 
 //
 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics
diff --git a/MdePkg/Library/BaseLib/ARShiftU64.c b/MdePkg/Library/BaseLib/ARShiftU64.c
index d9105c67fb..67e49e8482 100644
--- a/MdePkg/Library/BaseLib/ARShiftU64.c
+++ b/MdePkg/Library/BaseLib/ARShiftU64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index 57ae81bebd..23052a5028 100644
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -77,7 +77,6 @@
   LinkedList.c
   String.c
   BaseLibInternals.h
-  CommonHeader.h
 
 [Sources.Ia32]
   Ia32/Wbinvd.c
diff --git a/MdePkg/Library/BaseLib/BaseLibInternals.h b/MdePkg/Library/BaseLib/BaseLibInternals.h
index b3952ec16b..51f3c96cb8 100644
--- a/MdePkg/Library/BaseLib/BaseLibInternals.h
+++ b/MdePkg/Library/BaseLib/BaseLibInternals.h
@@ -15,10 +15,13 @@
 #ifndef __BASE_LIB_INTERNALS__
 #define __BASE_LIB_INTERNALS__
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <Base.h>
+#include <Library/BaseLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/DebugLib.h>
+#include <Library/TimerLib.h>
+#include <Library/PcdLib.h>
+
 
 #define QUIENT_MAX_UINTN_DIVIDED_BY_10      ((UINTN) -1 / 10)
 #define REMINDER_MAX_UINTN_DIVIDED_BY_10    ((UINTN) -1 % 10)
diff --git a/MdePkg/Library/BaseLib/BitField.c b/MdePkg/Library/BaseLib/BitField.c
index 9c9981e314..2f0e2c3b4f 100644
--- a/MdePkg/Library/BaseLib/BitField.c
+++ b/MdePkg/Library/BaseLib/BitField.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/CheckSum.c b/MdePkg/Library/BaseLib/CheckSum.c
index 61d74a41bb..a902620b56 100644
--- a/MdePkg/Library/BaseLib/CheckSum.c
+++ b/MdePkg/Library/BaseLib/CheckSum.c
@@ -18,7 +18,8 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
+
 
 /**
   Calculate the sum of all elements in a buffer in unit of UINT8. 
diff --git a/MdePkg/Library/BaseLib/CommonHeader.h b/MdePkg/Library/BaseLib/CommonHeader.h
deleted file mode 100644
index 07c57bd27e..0000000000
--- a/MdePkg/Library/BaseLib/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) 2007 - 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 <Base.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-//
-// The Library classes this module consumes
-//
-#include <Library/BaseLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/DebugLib.h>
-#include <Library/TimerLib.h>
-#include <Library/PcdLib.h>
-
-#endif
diff --git a/MdePkg/Library/BaseLib/Cpu.c b/MdePkg/Library/BaseLib/Cpu.c
index d8564c04d4..4203afdfb3 100644
--- a/MdePkg/Library/BaseLib/Cpu.c
+++ b/MdePkg/Library/BaseLib/Cpu.c
@@ -17,7 +17,8 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
+
 
 /**
   Disables CPU interrupts and returns the interrupt state prior to the disable
diff --git a/MdePkg/Library/BaseLib/CpuDeadLoop.c b/MdePkg/Library/BaseLib/CpuDeadLoop.c
index 01810d1713..a40a6467e8 100644
--- a/MdePkg/Library/BaseLib/CpuDeadLoop.c
+++ b/MdePkg/Library/BaseLib/CpuDeadLoop.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 /**
   Executes an infinite loop.
diff --git a/MdePkg/Library/BaseLib/DivS64x64Remainder.c b/MdePkg/Library/BaseLib/DivS64x64Remainder.c
index d8e2a81e4c..20b6d76084 100644
--- a/MdePkg/Library/BaseLib/DivS64x64Remainder.c
+++ b/MdePkg/Library/BaseLib/DivS64x64Remainder.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/DivU64x32.c b/MdePkg/Library/BaseLib/DivU64x32.c
index a599b87816..424b066e32 100644
--- a/MdePkg/Library/BaseLib/DivU64x32.c
+++ b/MdePkg/Library/BaseLib/DivU64x32.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/DivU64x32Remainder.c b/MdePkg/Library/BaseLib/DivU64x32Remainder.c
index 524a800fdf..08785c32e3 100644
--- a/MdePkg/Library/BaseLib/DivU64x32Remainder.c
+++ b/MdePkg/Library/BaseLib/DivU64x32Remainder.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/DivU64x64Remainder.c b/MdePkg/Library/BaseLib/DivU64x64Remainder.c
index 49e80b4e11..acc2d48619 100644
--- a/MdePkg/Library/BaseLib/DivU64x64Remainder.c
+++ b/MdePkg/Library/BaseLib/DivU64x64Remainder.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/GetPowerOfTwo32.c b/MdePkg/Library/BaseLib/GetPowerOfTwo32.c
index dcfdc4bdd4..19b00dd760 100644
--- a/MdePkg/Library/BaseLib/GetPowerOfTwo32.c
+++ b/MdePkg/Library/BaseLib/GetPowerOfTwo32.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/GetPowerOfTwo64.c b/MdePkg/Library/BaseLib/GetPowerOfTwo64.c
index 57d9c0a00b..3cdcecc021 100644
--- a/MdePkg/Library/BaseLib/GetPowerOfTwo64.c
+++ b/MdePkg/Library/BaseLib/GetPowerOfTwo64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/HighBitSet32.c b/MdePkg/Library/BaseLib/HighBitSet32.c
index 46811fb840..af2a1e99f5 100644
--- a/MdePkg/Library/BaseLib/HighBitSet32.c
+++ b/MdePkg/Library/BaseLib/HighBitSet32.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/HighBitSet64.c b/MdePkg/Library/BaseLib/HighBitSet64.c
index e9319877cb..e4d95d65e1 100644
--- a/MdePkg/Library/BaseLib/HighBitSet64.c
+++ b/MdePkg/Library/BaseLib/HighBitSet64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ARShiftU64.c b/MdePkg/Library/BaseLib/Ia32/ARShiftU64.c
index 4e1f715ab2..fb5f4282bb 100644
--- a/MdePkg/Library/BaseLib/Ia32/ARShiftU64.c
+++ b/MdePkg/Library/BaseLib/Ia32/ARShiftU64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.c b/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.c
index 71bb896c82..35d0fc9c23 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 //
 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.c b/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.c
index 2660deb096..e785095d7a 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuId.c b/MdePkg/Library/BaseLib/Ia32/CpuId.c
index d1893aebbe..73f12bcaee 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuId.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuId.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT32
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c
index 99e2edb428..2c1eca670e 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT32
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuPause.c b/MdePkg/Library/BaseLib/Ia32/CpuPause.c
index 7750ee417e..ee7c96736b 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuPause.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuPause.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuSleep.c b/MdePkg/Library/BaseLib/Ia32/CpuSleep.c
index 59753747ee..690f9b3598 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuSleep.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuSleep.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.c b/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.c
index f1ef0f1706..60c1169a57 100644
--- a/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.c
+++ b/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c b/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c
index d3c77183eb..d462c01ff3 100644
--- a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c
+++ b/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c
@@ -15,7 +15,9 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
+
+#if _MSC_EXTENSIONS
 
 __declspec (naked)
 VOID
@@ -49,3 +51,4 @@ InternalX86DisablePaging32 (
   }
 }
 
+#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c b/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
index da3afbf95c..5c5f270c4c 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
+++ b/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "../BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x32.c b/MdePkg/Library/BaseLib/Ia32/DivU64x32.c
index d680c29c41..0ec3c6319b 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x32.c
+++ b/MdePkg/Library/BaseLib/Ia32/DivU64x32.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.c b/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.c
index a9c54a7e19..54da1e9ab0 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.c
+++ b/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.c b/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.c
index 29413b25b2..46ef12b204 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.c
+++ b/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.c
@@ -16,7 +16,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.c b/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.c
index 7194ca2536..39118728f0 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.c
+++ b/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.c b/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.c
index ada4100cf6..cb4ee2e3ad 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.c
+++ b/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c b/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c
index e4765a7f28..3cb290c516 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c
+++ b/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c
@@ -15,7 +15,9 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
+
+#if _MSC_EXTENSIONS
 
 __declspec (naked)
 VOID
@@ -49,3 +51,4 @@ InternalX86EnablePaging32 (
   }
 }
 
+#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm b/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm
index d54c27e719..3755c0585b 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm
+++ b/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c b/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
index 5071a39bb2..1c7cc0f33f 100644
--- a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
+++ b/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID *
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/FxRestore.c b/MdePkg/Library/BaseLib/Ia32/FxRestore.c
index e95fb67b43..1314da4194 100644
--- a/MdePkg/Library/BaseLib/Ia32/FxRestore.c
+++ b/MdePkg/Library/BaseLib/Ia32/FxRestore.c
@@ -15,7 +15,8 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/FxSave.c b/MdePkg/Library/BaseLib/Ia32/FxSave.c
index 721de5368b..44aaee0090 100644
--- a/MdePkg/Library/BaseLib/Ia32/FxSave.c
+++ b/MdePkg/Library/BaseLib/Ia32/FxSave.c
@@ -15,7 +15,8 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.c b/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.c
index d584a900d3..ec60f97344 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.c
+++ b/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT32
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.c b/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.c
index a0d0ba89e1..6bdbedad1f 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.c
+++ b/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.c b/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.c
index afa9a15f60..c7ace7ad54 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.c
+++ b/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT32
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.c b/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.c
index 82fa86f0cd..f34f4748eb 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.c
+++ b/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT32
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c b/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
index 2fb0710cc6..2bd46a0ffb 100644
--- a/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
+++ b/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
@@ -17,7 +17,8 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
+
 
 /**
   Transfers control to a function starting with a new stack.
diff --git a/MdePkg/Library/BaseLib/Ia32/Invd.c b/MdePkg/Library/BaseLib/Ia32/Invd.c
index 47f651342d..0206e6d44b 100644
--- a/MdePkg/Library/BaseLib/Ia32/Invd.c
+++ b/MdePkg/Library/BaseLib/Ia32/Invd.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/LRotU64.c b/MdePkg/Library/BaseLib/Ia32/LRotU64.c
index 48a6a6bb68..9a5deea70d 100644
--- a/MdePkg/Library/BaseLib/Ia32/LRotU64.c
+++ b/MdePkg/Library/BaseLib/Ia32/LRotU64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/LShiftU64.c b/MdePkg/Library/BaseLib/Ia32/LShiftU64.c
index 766b33b097..4324bfb53b 100644
--- a/MdePkg/Library/BaseLib/Ia32/LShiftU64.c
+++ b/MdePkg/Library/BaseLib/Ia32/LShiftU64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/LongJump.c b/MdePkg/Library/BaseLib/Ia32/LongJump.c
index 3186da522f..f0408b83fa 100644
--- a/MdePkg/Library/BaseLib/Ia32/LongJump.c
+++ b/MdePkg/Library/BaseLib/Ia32/LongJump.c
@@ -15,7 +15,8 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
+
 
 __declspec (naked)
 VOID
diff --git a/MdePkg/Library/BaseLib/Ia32/ModU64x32.c b/MdePkg/Library/BaseLib/Ia32/ModU64x32.c
index 4337f8cbbb..59ed50433a 100644
--- a/MdePkg/Library/BaseLib/Ia32/ModU64x32.c
+++ b/MdePkg/Library/BaseLib/Ia32/ModU64x32.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT32
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/Monitor.c b/MdePkg/Library/BaseLib/Ia32/Monitor.c
index a1b3f7b2df..469aa6d7fa 100644
--- a/MdePkg/Library/BaseLib/Ia32/Monitor.c
+++ b/MdePkg/Library/BaseLib/Ia32/Monitor.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x32.c b/MdePkg/Library/BaseLib/Ia32/MultU64x32.c
index 8eecb14b8c..db911cadb2 100644
--- a/MdePkg/Library/BaseLib/Ia32/MultU64x32.c
+++ b/MdePkg/Library/BaseLib/Ia32/MultU64x32.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x64.c b/MdePkg/Library/BaseLib/Ia32/MultU64x64.c
index 52e553de1a..ddafff47ae 100644
--- a/MdePkg/Library/BaseLib/Ia32/MultU64x64.c
+++ b/MdePkg/Library/BaseLib/Ia32/MultU64x64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/Mwait.c b/MdePkg/Library/BaseLib/Ia32/Mwait.c
index 9ced4c9297..0629afe295 100644
--- a/MdePkg/Library/BaseLib/Ia32/Mwait.c
+++ b/MdePkg/Library/BaseLib/Ia32/Mwait.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/Non-existing.c b/MdePkg/Library/BaseLib/Ia32/Non-existing.c
index 0343455b47..b1a8dae738 100644
--- a/MdePkg/Library/BaseLib/Ia32/Non-existing.c
+++ b/MdePkg/Library/BaseLib/Ia32/Non-existing.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "../BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/Ia32/RRotU64.c b/MdePkg/Library/BaseLib/Ia32/RRotU64.c
index 6b48222c57..31274aac2c 100644
--- a/MdePkg/Library/BaseLib/Ia32/RRotU64.c
+++ b/MdePkg/Library/BaseLib/Ia32/RRotU64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/RShiftU64.c b/MdePkg/Library/BaseLib/Ia32/RShiftU64.c
index 7480ebd639..a6b957bacc 100644
--- a/MdePkg/Library/BaseLib/Ia32/RShiftU64.c
+++ b/MdePkg/Library/BaseLib/Ia32/RShiftU64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr0.c b/MdePkg/Library/BaseLib/Ia32/ReadCr0.c
index d220e8ed5d..8c6ab3527f 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr0.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr0.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr2.c b/MdePkg/Library/BaseLib/Ia32/ReadCr2.c
index 9ef4d44c6e..1c682b3899 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr2.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr2.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr3.c b/MdePkg/Library/BaseLib/Ia32/ReadCr3.c
index 04efb497e6..39ad5e4f2f 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr3.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr3.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr4.c b/MdePkg/Library/BaseLib/Ia32/ReadCr4.c
index 9f24fce50d..71ffa9b72d 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr4.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr4.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCs.c b/MdePkg/Library/BaseLib/Ia32/ReadCs.c
index 52b9a7ffa0..cd9bad54e7 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCs.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT16
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr0.c b/MdePkg/Library/BaseLib/Ia32/ReadDr0.c
index b8ba6535a2..7c6f0c629a 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr0.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr0.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr1.c b/MdePkg/Library/BaseLib/Ia32/ReadDr1.c
index 8820256e08..573f658864 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr1.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr1.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr2.c b/MdePkg/Library/BaseLib/Ia32/ReadDr2.c
index 30f8da6911..6685d775f7 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr2.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr2.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr3.c b/MdePkg/Library/BaseLib/Ia32/ReadDr3.c
index 5858419512..e8a4bcc6bb 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr3.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr3.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr4.c b/MdePkg/Library/BaseLib/Ia32/ReadDr4.c
index df081aaf65..9ec23218d4 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr4.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr4.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr5.c b/MdePkg/Library/BaseLib/Ia32/ReadDr5.c
index d26d1eab41..3470524b22 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr5.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr5.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr6.c b/MdePkg/Library/BaseLib/Ia32/ReadDr6.c
index 732334d24f..debeecb24f 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr6.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr6.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr7.c b/MdePkg/Library/BaseLib/Ia32/ReadDr7.c
index b61d674da2..da7a120d70 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr7.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr7.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDs.c b/MdePkg/Library/BaseLib/Ia32/ReadDs.c
index ce12d0c940..91294896e0 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDs.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT16
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadEflags.c b/MdePkg/Library/BaseLib/Ia32/ReadEflags.c
index 0600c66b25..ca5d19c5ac 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadEflags.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadEflags.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadEs.c b/MdePkg/Library/BaseLib/Ia32/ReadEs.c
index d7780b7771..8f73b99e6b 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadEs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadEs.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT16
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadFs.c b/MdePkg/Library/BaseLib/Ia32/ReadFs.c
index 193e9078bc..848d15581b 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadFs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadFs.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT16
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c b/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c
index 3b35d26297..1bff03c7d6 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c
@@ -15,7 +15,8 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadGs.c b/MdePkg/Library/BaseLib/Ia32/ReadGs.c
index 01c191d504..df495a0ff9 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadGs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadGs.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT16
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c b/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c
index 0e3c25ab62..0cfbd63ff4 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c
@@ -15,7 +15,8 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c b/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c
index df9a2b97cf..813c08442e 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT16
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm0.c b/MdePkg/Library/BaseLib/Ia32/ReadMm0.c
index 8c74545e2a..279e657edf 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm0.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm0.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm1.c b/MdePkg/Library/BaseLib/Ia32/ReadMm1.c
index c6721c8d35..b46a44c8de 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm1.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm1.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm2.c b/MdePkg/Library/BaseLib/Ia32/ReadMm2.c
index 35c0a2ade1..1e4905f20e 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm2.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm2.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm3.c b/MdePkg/Library/BaseLib/Ia32/ReadMm3.c
index fabc524c4b..f742a9f6aa 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm3.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm3.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm4.c b/MdePkg/Library/BaseLib/Ia32/ReadMm4.c
index 42fa902e00..5b9920bf5b 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm4.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm4.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm5.c b/MdePkg/Library/BaseLib/Ia32/ReadMm5.c
index c6b35f109e..6b5d5df5b7 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm5.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm5.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm6.c b/MdePkg/Library/BaseLib/Ia32/ReadMm6.c
index 123a0def3d..c0b1b51195 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm6.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm6.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm7.c b/MdePkg/Library/BaseLib/Ia32/ReadMm7.c
index 5c8d87f49b..af98994636 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm7.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm7.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c b/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c
index 94aa2c8e80..d93b9cd6e4 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadPmc.c b/MdePkg/Library/BaseLib/Ia32/ReadPmc.c
index 2bba18815f..761fa6bf4e 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadPmc.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadPmc.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadSs.c b/MdePkg/Library/BaseLib/Ia32/ReadSs.c
index b65e1acefe..002b20cbba 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadSs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadSs.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT16
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadTr.c b/MdePkg/Library/BaseLib/Ia32/ReadTr.c
index ce192bcd3a..0069811f46 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadTr.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadTr.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT16
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadTsc.c b/MdePkg/Library/BaseLib/Ia32/ReadTsc.c
index 2e169317a1..3946ffc792 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadTsc.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadTsc.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/SetJump.c b/MdePkg/Library/BaseLib/Ia32/SetJump.c
index b96ec3a8ff..5d8692a619 100644
--- a/MdePkg/Library/BaseLib/Ia32/SetJump.c
+++ b/MdePkg/Library/BaseLib/Ia32/SetJump.c
@@ -15,7 +15,8 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/SwapBytes64.c b/MdePkg/Library/BaseLib/Ia32/SwapBytes64.c
index 9979b684f1..714fd8acdc 100644
--- a/MdePkg/Library/BaseLib/Ia32/SwapBytes64.c
+++ b/MdePkg/Library/BaseLib/Ia32/SwapBytes64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/Thunk16.asm b/MdePkg/Library/BaseLib/Ia32/Thunk16.asm
index 13ff466550..2a3f21794e 100644
--- a/MdePkg/Library/BaseLib/Ia32/Thunk16.asm
+++ b/MdePkg/Library/BaseLib/Ia32/Thunk16.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseLib/Ia32/Wbinvd.c b/MdePkg/Library/BaseLib/Ia32/Wbinvd.c
index 60e72139f5..fa9c8b13a0 100644
--- a/MdePkg/Library/BaseLib/Ia32/Wbinvd.c
+++ b/MdePkg/Library/BaseLib/Ia32/Wbinvd.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr0.c b/MdePkg/Library/BaseLib/Ia32/WriteCr0.c
index 9993d47de6..4f2406c67e 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr0.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr0.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr2.c b/MdePkg/Library/BaseLib/Ia32/WriteCr2.c
index dcbd3458fc..8c5d617d53 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr2.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr2.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr3.c b/MdePkg/Library/BaseLib/Ia32/WriteCr3.c
index 0a1d21e100..7bcf537a7d 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr3.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr3.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr4.c b/MdePkg/Library/BaseLib/Ia32/WriteCr4.c
index dcd557712e..04e7b00491 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr4.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr4.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr0.c b/MdePkg/Library/BaseLib/Ia32/WriteDr0.c
index 0de464765a..0e9da73bf8 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr0.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr0.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr1.c b/MdePkg/Library/BaseLib/Ia32/WriteDr1.c
index b6634e20b2..f9d1c2b5fb 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr1.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr1.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr2.c b/MdePkg/Library/BaseLib/Ia32/WriteDr2.c
index 2d366497f7..61f0979bf1 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr2.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr2.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr3.c b/MdePkg/Library/BaseLib/Ia32/WriteDr3.c
index ffba939e16..b39c7a4f9d 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr3.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr3.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr4.c b/MdePkg/Library/BaseLib/Ia32/WriteDr4.c
index adc9005eac..c2503c26a8 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr4.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr4.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr5.c b/MdePkg/Library/BaseLib/Ia32/WriteDr5.c
index 0798d25265..dbc6dc90d6 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr5.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr5.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr6.c b/MdePkg/Library/BaseLib/Ia32/WriteDr6.c
index dcf5e3a9bf..1da2a0fec4 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr6.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr6.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr7.c b/MdePkg/Library/BaseLib/Ia32/WriteDr7.c
index e53eccb3e9..22d28636fa 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr7.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr7.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINTN
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c b/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c
index 0664908e16..bc599e0945 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c
@@ -15,7 +15,8 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c b/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c
index f6422412c0..b92dfbdfb9 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c b/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c
index e8ca5756b6..600f015b35 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm0.c b/MdePkg/Library/BaseLib/Ia32/WriteMm0.c
index b59335e42d..c9789315b1 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm0.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm0.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm1.c b/MdePkg/Library/BaseLib/Ia32/WriteMm1.c
index 39bfa6d4b9..8a9900bede 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm1.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm1.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm2.c b/MdePkg/Library/BaseLib/Ia32/WriteMm2.c
index f9972076b1..fb2196963c 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm2.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm2.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm3.c b/MdePkg/Library/BaseLib/Ia32/WriteMm3.c
index 39a401fd3b..d788f3be8c 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm3.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm3.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm4.c b/MdePkg/Library/BaseLib/Ia32/WriteMm4.c
index 1c31d6beb7..7b0160d2a9 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm4.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm4.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm5.c b/MdePkg/Library/BaseLib/Ia32/WriteMm5.c
index 48e2eb29c7..0dd02b706f 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm5.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm5.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm6.c b/MdePkg/Library/BaseLib/Ia32/WriteMm6.c
index 7a038a47db..de081405e1 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm6.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm6.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm7.c b/MdePkg/Library/BaseLib/Ia32/WriteMm7.c
index 044f68cec1..0bb8d205a9 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm7.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm7.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 VOID
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c b/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c
index 1e909d1f72..06cf910c48 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 UINT64
 EFIAPI
diff --git a/MdePkg/Library/BaseLib/LRotU32.c b/MdePkg/Library/BaseLib/LRotU32.c
index ad1714d51e..2998c83dc6 100644
--- a/MdePkg/Library/BaseLib/LRotU32.c
+++ b/MdePkg/Library/BaseLib/LRotU32.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/LRotU64.c b/MdePkg/Library/BaseLib/LRotU64.c
index 65269a973b..d0ec658863 100644
--- a/MdePkg/Library/BaseLib/LRotU64.c
+++ b/MdePkg/Library/BaseLib/LRotU64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/LShiftU64.c b/MdePkg/Library/BaseLib/LShiftU64.c
index 8142cafe25..9686c2aa98 100644
--- a/MdePkg/Library/BaseLib/LShiftU64.c
+++ b/MdePkg/Library/BaseLib/LShiftU64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/LinkedList.c b/MdePkg/Library/BaseLib/LinkedList.c
index 3cbc0447a0..7bdff758a3 100644
--- a/MdePkg/Library/BaseLib/LinkedList.c
+++ b/MdePkg/Library/BaseLib/LinkedList.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/LongJump.c b/MdePkg/Library/BaseLib/LongJump.c
index e39bc32a3c..6a819e34cf 100644
--- a/MdePkg/Library/BaseLib/LongJump.c
+++ b/MdePkg/Library/BaseLib/LongJump.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/LowBitSet32.c b/MdePkg/Library/BaseLib/LowBitSet32.c
index dde3ad1860..a598a1f71f 100644
--- a/MdePkg/Library/BaseLib/LowBitSet32.c
+++ b/MdePkg/Library/BaseLib/LowBitSet32.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/LowBitSet64.c b/MdePkg/Library/BaseLib/LowBitSet64.c
index bef8390d74..762d94522e 100644
--- a/MdePkg/Library/BaseLib/LowBitSet64.c
+++ b/MdePkg/Library/BaseLib/LowBitSet64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/Math64.c b/MdePkg/Library/BaseLib/Math64.c
index 60f363ec1e..cd71015161 100644
--- a/MdePkg/Library/BaseLib/Math64.c
+++ b/MdePkg/Library/BaseLib/Math64.c
@@ -18,7 +18,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/ModU64x32.c b/MdePkg/Library/BaseLib/ModU64x32.c
index e6c05707be..94da1b565a 100644
--- a/MdePkg/Library/BaseLib/ModU64x32.c
+++ b/MdePkg/Library/BaseLib/ModU64x32.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/MultS64x64.c b/MdePkg/Library/BaseLib/MultS64x64.c
index 33d2570568..1ccef44a84 100644
--- a/MdePkg/Library/BaseLib/MultS64x64.c
+++ b/MdePkg/Library/BaseLib/MultS64x64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/MultU64x32.c b/MdePkg/Library/BaseLib/MultU64x32.c
index 947d4d2276..28eca84c75 100644
--- a/MdePkg/Library/BaseLib/MultU64x32.c
+++ b/MdePkg/Library/BaseLib/MultU64x32.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/MultU64x64.c b/MdePkg/Library/BaseLib/MultU64x64.c
index 7f6ece12ea..0f99892bd8 100644
--- a/MdePkg/Library/BaseLib/MultU64x64.c
+++ b/MdePkg/Library/BaseLib/MultU64x64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/RRotU32.c b/MdePkg/Library/BaseLib/RRotU32.c
index ba66b3540c..b7acced743 100644
--- a/MdePkg/Library/BaseLib/RRotU32.c
+++ b/MdePkg/Library/BaseLib/RRotU32.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/RRotU64.c b/MdePkg/Library/BaseLib/RRotU64.c
index b144c18d4a..34b71befbf 100644
--- a/MdePkg/Library/BaseLib/RRotU64.c
+++ b/MdePkg/Library/BaseLib/RRotU64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/RShiftU64.c b/MdePkg/Library/BaseLib/RShiftU64.c
index 3320acf275..9f433d0fb1 100644
--- a/MdePkg/Library/BaseLib/RShiftU64.c
+++ b/MdePkg/Library/BaseLib/RShiftU64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/SetJump.c b/MdePkg/Library/BaseLib/SetJump.c
index 92208f60c7..cdbe9688b7 100644
--- a/MdePkg/Library/BaseLib/SetJump.c
+++ b/MdePkg/Library/BaseLib/SetJump.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c
index a0d7fac8c3..1c8fc227ea 100644
--- a/MdePkg/Library/BaseLib/String.c
+++ b/MdePkg/Library/BaseLib/String.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/SwapBytes16.c b/MdePkg/Library/BaseLib/SwapBytes16.c
index 3709f43f38..b757d79a44 100644
--- a/MdePkg/Library/BaseLib/SwapBytes16.c
+++ b/MdePkg/Library/BaseLib/SwapBytes16.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/SwapBytes32.c b/MdePkg/Library/BaseLib/SwapBytes32.c
index 1b1fe78fc2..ee8a60bb4c 100644
--- a/MdePkg/Library/BaseLib/SwapBytes32.c
+++ b/MdePkg/Library/BaseLib/SwapBytes32.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/SwapBytes64.c b/MdePkg/Library/BaseLib/SwapBytes64.c
index eaffbebcc6..224553af80 100644
--- a/MdePkg/Library/BaseLib/SwapBytes64.c
+++ b/MdePkg/Library/BaseLib/SwapBytes64.c
@@ -15,7 +15,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/SwitchStack.c b/MdePkg/Library/BaseLib/SwitchStack.c
index 39aec86391..b2df9f9148 100644
--- a/MdePkg/Library/BaseLib/SwitchStack.c
+++ b/MdePkg/Library/BaseLib/SwitchStack.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include <BaseLibInternals.h>
 
diff --git a/MdePkg/Library/BaseLib/Synchronization.c b/MdePkg/Library/BaseLib/Synchronization.c
index 30dabfbc20..ffed7f7170 100644
--- a/MdePkg/Library/BaseLib/Synchronization.c
+++ b/MdePkg/Library/BaseLib/Synchronization.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/SynchronizationGcc.c b/MdePkg/Library/BaseLib/SynchronizationGcc.c
index 85a3531967..beb41d58d0 100644
--- a/MdePkg/Library/BaseLib/SynchronizationGcc.c
+++ b/MdePkg/Library/BaseLib/SynchronizationGcc.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/SynchronizationMsc.c b/MdePkg/Library/BaseLib/SynchronizationMsc.c
index 29f1717b4a..3621468344 100644
--- a/MdePkg/Library/BaseLib/SynchronizationMsc.c
+++ b/MdePkg/Library/BaseLib/SynchronizationMsc.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/Unaligned.c b/MdePkg/Library/BaseLib/Unaligned.c
index fef8343e94..935e169300 100644
--- a/MdePkg/Library/BaseLib/Unaligned.c
+++ b/MdePkg/Library/BaseLib/Unaligned.c
@@ -17,7 +17,8 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
+
 
 /**
   Reads a 16-bit value from memory that may be unaligned.
diff --git a/MdePkg/Library/BaseLib/x86DisablePaging32.c b/MdePkg/Library/BaseLib/x86DisablePaging32.c
index 9e72141de6..9e5b905d7f 100644
--- a/MdePkg/Library/BaseLib/x86DisablePaging32.c
+++ b/MdePkg/Library/BaseLib/x86DisablePaging32.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/x86DisablePaging64.c b/MdePkg/Library/BaseLib/x86DisablePaging64.c
index 527950e038..12b9628473 100644
--- a/MdePkg/Library/BaseLib/x86DisablePaging64.c
+++ b/MdePkg/Library/BaseLib/x86DisablePaging64.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/x86EnablePaging32.c b/MdePkg/Library/BaseLib/x86EnablePaging32.c
index 9efacb45e5..b2b49aa9db 100644
--- a/MdePkg/Library/BaseLib/x86EnablePaging32.c
+++ b/MdePkg/Library/BaseLib/x86EnablePaging32.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/x86EnablePaging64.c b/MdePkg/Library/BaseLib/x86EnablePaging64.c
index 75647d7d3e..8f7dc5fa86 100644
--- a/MdePkg/Library/BaseLib/x86EnablePaging64.c
+++ b/MdePkg/Library/BaseLib/x86EnablePaging64.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/x86FxRestore.c b/MdePkg/Library/BaseLib/x86FxRestore.c
index c3f76d4629..148980831c 100644
--- a/MdePkg/Library/BaseLib/x86FxRestore.c
+++ b/MdePkg/Library/BaseLib/x86FxRestore.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/x86FxSave.c b/MdePkg/Library/BaseLib/x86FxSave.c
index 2ccbe4894b..2c4f54a9a4 100644
--- a/MdePkg/Library/BaseLib/x86FxSave.c
+++ b/MdePkg/Library/BaseLib/x86FxSave.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/x86GetInterruptState.c b/MdePkg/Library/BaseLib/x86GetInterruptState.c
index fd108e1c8d..08efb6755a 100644
--- a/MdePkg/Library/BaseLib/x86GetInterruptState.c
+++ b/MdePkg/Library/BaseLib/x86GetInterruptState.c
@@ -17,7 +17,8 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
+
 
 /**
   Retrieves the current CPU interrupt state.
diff --git a/MdePkg/Library/BaseLib/x86MemoryFence.c b/MdePkg/Library/BaseLib/x86MemoryFence.c
index 4c824d2794..e8f06e8f11 100644
--- a/MdePkg/Library/BaseLib/x86MemoryFence.c
+++ b/MdePkg/Library/BaseLib/x86MemoryFence.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 /**
   Used to serialize load and store operations.
diff --git a/MdePkg/Library/BaseLib/x86Msr.c b/MdePkg/Library/BaseLib/x86Msr.c
index a9ad2425ae..1af72ba1a3 100644
--- a/MdePkg/Library/BaseLib/x86Msr.c
+++ b/MdePkg/Library/BaseLib/x86Msr.c
@@ -17,7 +17,8 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
+
 
 /**
   Returns the lower 32-bits of a Machine Specific Register(MSR).
diff --git a/MdePkg/Library/BaseLib/x86ReadGdtr.c b/MdePkg/Library/BaseLib/x86ReadGdtr.c
index c1b75d1397..139eeb781d 100644
--- a/MdePkg/Library/BaseLib/x86ReadGdtr.c
+++ b/MdePkg/Library/BaseLib/x86ReadGdtr.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/x86ReadIdtr.c b/MdePkg/Library/BaseLib/x86ReadIdtr.c
index c5a0d652fe..3d1bb6cf89 100644
--- a/MdePkg/Library/BaseLib/x86ReadIdtr.c
+++ b/MdePkg/Library/BaseLib/x86ReadIdtr.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/x86Thunk.c b/MdePkg/Library/BaseLib/x86Thunk.c
index 44b452ceb2..4d8a7bd8aa 100644
--- a/MdePkg/Library/BaseLib/x86Thunk.c
+++ b/MdePkg/Library/BaseLib/x86Thunk.c
@@ -17,7 +17,8 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <BaseLibInternals.h>
+
 
 //
 // Byte packed structure for a segment descriptor in a GDT/LDT
diff --git a/MdePkg/Library/BaseLib/x86WriteGdtr.c b/MdePkg/Library/BaseLib/x86WriteGdtr.c
index 20982ae88c..b32f7daf55 100644
--- a/MdePkg/Library/BaseLib/x86WriteGdtr.c
+++ b/MdePkg/Library/BaseLib/x86WriteGdtr.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseLib/x86WriteIdtr.c b/MdePkg/Library/BaseLib/x86WriteIdtr.c
index 3188aa275f..f673e46a5a 100644
--- a/MdePkg/Library/BaseLib/x86WriteIdtr.c
+++ b/MdePkg/Library/BaseLib/x86WriteIdtr.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BaseLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf b/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
index cc2e633c93..36d22136f9 100644
--- a/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
+++ b/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
@@ -59,7 +59,6 @@
   MemLibGuid.c
   CopyMem.c
   MemLibInternals.h
-  CommonHeader.h
 
 
 ################################################################################
diff --git a/MdePkg/Library/BaseMemoryLib/CommonHeader.h b/MdePkg/Library/BaseMemoryLib/CommonHeader.h
deleted file mode 100644
index 68b4d9483b..0000000000
--- a/MdePkg/Library/BaseMemoryLib/CommonHeader.h
+++ /dev/null
@@ -1,33 +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) 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 <Base.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-//
-// The Library classes this module consumes
-//
-#include <Library/BaseMemoryLib.h>
-#include <Library/BaseLib.h>
-#include <Library/DebugLib.h>
-
-#endif
diff --git a/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
index b816af7489..b6f852cdf1 100644
--- a/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLib/CopyMem.c b/MdePkg/Library/BaseMemoryLib/CopyMem.c
index df5258c93e..1519ceb37b 100644
--- a/MdePkg/Library/BaseMemoryLib/CopyMem.c
+++ b/MdePkg/Library/BaseMemoryLib/CopyMem.c
@@ -20,7 +20,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
index b0449b19b5..f7956e731b 100644
--- a/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c b/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c
index 93d5f805e2..2c07d93e8b 100644
--- a/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c
+++ b/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c
@@ -23,7 +23,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c b/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
index 6e9682d523..31db8aa461 100644
--- a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
@@ -26,7 +26,8 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include <MemLibInternals.h>
+
 
 /**
   Copies a source GUID to a destination GUID.
diff --git a/MdePkg/Library/BaseMemoryLib/MemLibInternals.h b/MdePkg/Library/BaseMemoryLib/MemLibInternals.h
index e7efe40228..cd27acb938 100644
--- a/MdePkg/Library/BaseMemoryLib/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLib/MemLibInternals.h
@@ -23,10 +23,11 @@
 #ifndef __MEM_LIB_INTERNALS__
 #define __MEM_LIB_INTERNALS__
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <Base.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/BaseLib.h>
+#include <Library/DebugLib.h>
+
 
 /**
   Copy Length bytes from Source to Destination.
diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
index f0ca471844..7f58a41810 100644
--- a/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
index 7a0ebcd78f..cb02d605f2 100644
--- a/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
index dd1a82fef2..8b12579426 100644
--- a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
index 685563e379..5393f7bc48 100644
--- a/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLib/SetMem.c b/MdePkg/Library/BaseMemoryLib/SetMem.c
index 3378a23795..0ad994c104 100644
--- a/MdePkg/Library/BaseMemoryLib/SetMem.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem.c
@@ -20,7 +20,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
index 5e58eb9f74..da5f5c370b 100644
--- a/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
index f4927f7d9a..83514b0b5a 100644
--- a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
index e84556343a..cf12111a6a 100644
--- a/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
index 84a7d62ea9..c97a45df28 100644
--- a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
index 886c9343b8..21c70d36aa 100644
--- a/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
index ef907f3ab3..8ad16c2b76 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
+++ b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
@@ -45,7 +45,6 @@
 
 [Sources.common]
   MemLibInternals.h
-  CommonHeader.h
 
 [Sources.Ia32]
   Ia32/ScanMem64.S
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/CommonHeader.h b/MdePkg/Library/BaseMemoryLibRepStr/CommonHeader.h
deleted file mode 100644
index 68b4d9483b..0000000000
--- a/MdePkg/Library/BaseMemoryLibRepStr/CommonHeader.h
+++ /dev/null
@@ -1,33 +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) 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 <Base.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-//
-// The Library classes this module consumes
-//
-#include <Library/BaseMemoryLib.h>
-#include <Library/BaseLib.h>
-#include <Library/DebugLib.h>
-
-#endif
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
index b816af7489..b6f852cdf1 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c
index b0449b19b5..f7956e731b 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm
index dabd337a7c..2509e40bd8 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.asm
index 08f3676705..8b4366e976 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm
index a6d03306f3..6b5c81f556 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm
index 46a80111d7..cb0feed6be 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm
index c19ed989ed..ee0deddc61 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm
index def2690d1a..97d201abb5 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.asm
index d88d1fd105..b48cffc1ee 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem16.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem16.asm
index 414ed7cae6..1319614d51 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem16.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem32.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem32.asm
index 020bb795cf..34f4b8e5d7 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem32.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem64.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem64.asm
index c9a51ae701..3aa24ef7e4 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem64.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ZeroMem.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ZeroMem.asm
index 26137f771e..fe569250ae 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ZeroMem.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ZeroMem.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
index 2434358017..5abb5997e0 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include "MemLibInternals.h"
 
 /**
   Copies a source GUID to a destination GUID.
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h b/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h
index 663a758f29..ceddbbe7a0 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h
@@ -23,10 +23,11 @@
 #ifndef __MEM_LIB_INTERNALS__
 #define __MEM_LIB_INTERNALS__
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <Base.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/BaseLib.h>
+#include <Library/DebugLib.h>
+
 
 /**
   Copy Length bytes from Source to Destination.
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
index f0ca471844..7f58a41810 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
index 7a0ebcd78f..cb02d605f2 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
index dd1a82fef2..8b12579426 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
index 685563e379..5393f7bc48 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c
index 5e58eb9f74..da5f5c370b 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c
index f4927f7d9a..83514b0b5a 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
index e84556343a..cf12111a6a 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
index 84a7d62ea9..c97a45df28 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c
index 886c9343b8..21c70d36aa 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
index 5c29c4c6bd..eabf41864a 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
+++ b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
@@ -45,7 +45,6 @@
 
 [Sources.common]
   MemLibInternals.h
-  CommonHeader.h
 
 [Sources.Ia32]
   Ia32/ScanMem64.S
diff --git a/MdePkg/Library/BaseMemoryLibSse2/CommonHeader.h b/MdePkg/Library/BaseMemoryLibSse2/CommonHeader.h
deleted file mode 100644
index 68b4d9483b..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/CommonHeader.h
+++ /dev/null
@@ -1,33 +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) 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 <Base.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-//
-// The Library classes this module consumes
-//
-#include <Library/BaseMemoryLib.h>
-#include <Library/BaseLib.h>
-#include <Library/DebugLib.h>
-
-#endif
diff --git a/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
index b816af7489..b6f852cdf1 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
index b0449b19b5..f7956e731b 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
index dabd337a7c..2509e40bd8 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm
index d8b80dba03..034918af2f 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
index a6d03306f3..6b5c81f556 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
index 46a80111d7..cb0feed6be 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
index c19ed989ed..ee0deddc61 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
index def2690d1a..97d201abb5 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm
index f41d19cc82..ab89482d6f 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm
index 93ce0af5b1..75abe18b1d 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm
index 3aea7b1581..c12af90e79 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
index 8f1ebe4cdb..17f0eb4bea 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm
index 2f06ee1961..294e8ce041 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm
@@ -1,7 +1,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 ;------------------------------------------------------------------------------
 ;
diff --git a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
index 2434358017..5abb5997e0 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include "MemLibInternals.h"
 
 /**
   Copies a source GUID to a destination GUID.
diff --git a/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h b/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h
index 663a758f29..ceddbbe7a0 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h
@@ -23,10 +23,11 @@
 #ifndef __MEM_LIB_INTERNALS__
 #define __MEM_LIB_INTERNALS__
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <Base.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/BaseLib.h>
+#include <Library/DebugLib.h>
+
 
 /**
   Copy Length bytes from Source to Destination.
diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
index f0ca471844..7f58a41810 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
index 7a0ebcd78f..cb02d605f2 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
index dd1a82fef2..8b12579426 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
index 685563e379..5393f7bc48 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
index 5e58eb9f74..da5f5c370b 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
index f4927f7d9a..83514b0b5a 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
index e84556343a..cf12111a6a 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
index 84a7d62ea9..c97a45df28 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
index 886c9343b8..21c70d36aa 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
@@ -26,7 +26,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "MemLibInternals.h"
 
diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
index 67a821a465..bcd92bfcd0 100644
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
@@ -20,7 +20,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "BasePeCoffLibInternals.h"
 
diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
index 7ef65c1e52..8305d4325a 100644
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
@@ -45,7 +45,6 @@
 [Sources.common]
   BasePeCoffLibInternals.h
   BasePeCoff.c
-  CommonHeader.h
 
 [Sources.Ia32]
   Ia32/PeCoffLoaderEx.c
diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h b/MdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h
index bf9e18bef4..039f34e888 100644
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h
@@ -17,10 +17,13 @@
 #ifndef __BASE_PECOFF_LIB_INTERNALS__
 #define __BASE_PECOFF_LIB_INTERNALS__
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <Base.h>
+#include <Library/PeCoffLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/DebugLib.h>
+#include <IndustryStandard/PeImage.h>
+
+
 
 /**
   Performs an Itanium-based specific relocation fixup and is a no-op on other
diff --git a/MdePkg/Library/BasePeCoffLib/CommonHeader.h b/MdePkg/Library/BasePeCoffLib/CommonHeader.h
deleted file mode 100644
index cdbe44b533..0000000000
--- a/MdePkg/Library/BasePeCoffLib/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, 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 <Base.h>
-//
-// The Library classes this module consumes
-//
-#include <Library/PeCoffLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/DebugLib.h>
-
-#include <IndustryStandard/PeImage.h>
-
-#endif
diff --git a/MdePkg/Library/BasePeCoffLib/Ebc/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/Ebc/PeCoffLoaderEx.c
index d52fcdd480..217545436c 100644
--- a/MdePkg/Library/BasePeCoffLib/Ebc/PeCoffLoaderEx.c
+++ b/MdePkg/Library/BasePeCoffLib/Ebc/PeCoffLoaderEx.c
@@ -14,13 +14,7 @@
 
 **/
 
-
-
-
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include "BasePeCoffLibInternals.h"
 
 /**
   Performs an EBC specific relocation fixup.
diff --git a/MdePkg/Library/BasePeCoffLib/Ia32/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/Ia32/PeCoffLoaderEx.c
index 9630285011..4f8e461147 100644
--- a/MdePkg/Library/BasePeCoffLib/Ia32/PeCoffLoaderEx.c
+++ b/MdePkg/Library/BasePeCoffLib/Ia32/PeCoffLoaderEx.c
@@ -14,15 +14,9 @@
 
 **/
 
+#include "BasePeCoffLibInternals.h"
 
 
-
-
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 /**
   Performs an IA-32 specific relocation fixup.
 
diff --git a/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c
index c0821181e1..065aec42ac 100644
--- a/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c
+++ b/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c
@@ -14,11 +14,6 @@
 
 **/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "BasePeCoffLibInternals.h"
 
 
diff --git a/MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c
index da7cf3d4a8..3126ca8c2b 100644
--- a/MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c
+++ b/MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c
@@ -12,10 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include "BasePeCoffLibInternals.h"
 
 /**
   Performs an x64 specific relocation fixup.
diff --git a/MdePkg/Library/BasePrintLib/BasePrintLib.inf b/MdePkg/Library/BasePrintLib/BasePrintLib.inf
index 8abdfd7895..d978addcd0 100644
--- a/MdePkg/Library/BasePrintLib/BasePrintLib.inf
+++ b/MdePkg/Library/BasePrintLib/BasePrintLib.inf
@@ -46,7 +46,6 @@
   PrintLibInternal.h
   PrintLibInternal.c
   PrintLib.c
-  CommonHeader.h
 
 
 ################################################################################
diff --git a/MdePkg/Library/BasePrintLib/CommonHeader.h b/MdePkg/Library/BasePrintLib/CommonHeader.h
deleted file mode 100644
index c6d7f4136e..0000000000
--- a/MdePkg/Library/BasePrintLib/CommonHeader.h
+++ /dev/null
@@ -1,33 +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) 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 <Base.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-//
-// The Library classes this module consumes
-//
-#include <Library/PrintLib.h>
-#include <Library/BaseLib.h>
-#include <Library/DebugLib.h>
-
-#endif
diff --git a/MdePkg/Library/BasePrintLib/PrintLib.c b/MdePkg/Library/BasePrintLib/PrintLib.c
index 764e3847a2..4c08ff98dc 100644
--- a/MdePkg/Library/BasePrintLib/PrintLib.c
+++ b/MdePkg/Library/BasePrintLib/PrintLib.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "PrintLibInternal.h"
 
diff --git a/MdePkg/Library/BasePrintLib/PrintLibInternal.c b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
index 72c05e4dc5..fec8db8983 100644
--- a/MdePkg/Library/BasePrintLib/PrintLibInternal.c
+++ b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+
 
 #include "PrintLibInternal.h"
 
diff --git a/MdePkg/Library/BasePrintLib/PrintLibInternal.h b/MdePkg/Library/BasePrintLib/PrintLibInternal.h
index 3a1003beea..62e51838e3 100644
--- a/MdePkg/Library/BasePrintLib/PrintLibInternal.h
+++ b/MdePkg/Library/BasePrintLib/PrintLibInternal.h
@@ -15,10 +15,11 @@
 #ifndef __PRINT_LIB_INTERNAL_H
 #define __PRINT_LIB_INTERNAL_H
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <Base.h>
+#include <Library/PrintLib.h>
+#include <Library/BaseLib.h>
+#include <Library/DebugLib.h>
+
 
 //
 // Print primitives
diff --git a/MdePkg/Library/DxeMemoryAllocationLib/CommonHeader.h b/MdePkg/Library/DxeMemoryAllocationLib/CommonHeader.h
deleted file mode 100644
index ef4a5b8d0e..0000000000
--- a/MdePkg/Library/DxeMemoryAllocationLib/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) 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>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-//
-// The Library classes this module consumes
-//
-#include <Library/MemoryAllocationLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/DebugLib.h>
-
-#endif
diff --git a/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLibInternals.h b/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLibInternals.h
index 2a28844eb2..c4f27f1a5a 100644
--- a/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLibInternals.h
+++ b/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLibInternals.h
@@ -15,6 +15,13 @@
 #ifndef __DXE_MEMORY_ALLOCATION_LIB_INTERNALS_H__
 #define __DXE_MEMORY_ALLOCATION_LIB_INTERNALS_H__
 
+#include <PiDxe.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/DebugLib.h>
+
+
 /**
   Allocates one or more 4KB pages of a certain memory type.
 
diff --git a/MdePkg/Library/DxeServicesTableLib/CommonHeader.h b/MdePkg/Library/DxeServicesTableLib/CommonHeader.h
deleted file mode 100644
index e922174083..0000000000
--- a/MdePkg/Library/DxeServicesTableLib/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) 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>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-#include <Guid/DxeServices.h>
-//
-// The Library classes this module consumes
-//
-#include <Library/DxeServicesTableLib.h>
-#include <Library/DebugLib.h>
-#include <Library/UefiLib.h>
-
-#endif
diff --git a/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.c b/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.c
index 5aea46e084..b4faf976f6 100644
--- a/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.c
+++ b/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.c
@@ -14,21 +14,13 @@
 
 **/
 
-//
-// The package level header files this module uses
-//
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
 #include <Guid/DxeServices.h>
-//
-// The Library classes this module consumes
-//
 #include <Library/DxeServicesTableLib.h>
 #include <Library/DebugLib.h>
 #include <Library/UefiLib.h>
 
+
 //
 // Cache copy of the DXE Services Table
 //
diff --git a/MdePkg/Library/PeiServicesTablePointerLib/CommonHeader.h b/MdePkg/Library/PeiServicesTablePointerLib/CommonHeader.h
deleted file mode 100644
index 4a688670fd..0000000000
--- a/MdePkg/Library/PeiServicesTablePointerLib/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) 2007 - 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
-//
-//
-// The Library classes this module consumes
-//
-#include <Library/PeiServicesTablePointerLib.h>
-#include <Library/DebugLib.h>
-
-#endif
diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
index c923f601d8..9dea0476d9 100644
--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
@@ -14,21 +14,11 @@
 
 **/
 
-
-
-//
-// The package level header files this module uses
-//
 #include <PiPei.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-//
-// The Library classes this module consumes
-//
 #include <Library/PeiServicesTablePointerLib.h>
 #include <Library/DebugLib.h>
 
+
 static EFI_PEI_SERVICES  **gPeiServices;
 
 /**
diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/CommonHeader.h b/MdePkg/Library/SecPeiDxeTimerLibCpu/CommonHeader.h
deleted file mode 100644
index 7d1af9c790..0000000000
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/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) 2007 - 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 <Base.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-//
-// The Library classes this module consumes
-//
-#include <Library/TimerLib.h>
-#include <Library/BaseLib.h>
-#include <Library/IoLib.h>
-#include <Library/DebugLib.h>
-#include <Library/PcdLib.h>
-
-#endif
diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c b/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c
index 2acdab3d2a..42c8511dde 100644
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c
@@ -14,14 +14,14 @@
 
 **/
 
+#include <Base.h>
+#include <Library/TimerLib.h>
+#include <Library/BaseLib.h>
+#include <Library/IoLib.h>
+#include <Library/DebugLib.h>
+#include <Library/PcdLib.h>
 
 
-
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 /**
   Performs a delay measured as number of ticks.
 
diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
index 9fbceafebb..774a2dd3b1 100644
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
@@ -46,8 +46,6 @@
 #
 ################################################################################
 
-[Sources.common]
-  CommonHeader.h
 
 [Sources.Ia32]
   x86TimerLib.c
diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c b/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c
index 24ee2e7d73..1b65858f12 100644
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c
@@ -14,10 +14,13 @@
 
 **/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <Base.h>
+#include <Library/TimerLib.h>
+#include <Library/BaseLib.h>
+#include <Library/IoLib.h>
+#include <Library/DebugLib.h>
+#include <Library/PcdLib.h>
+
 
 //
 // The following array is used in calculating the frequency of local APIC
diff --git a/MdePkg/Library/UefiApplicationEntryPoint/ApplicationEntryPoint.c b/MdePkg/Library/UefiApplicationEntryPoint/ApplicationEntryPoint.c
index d56a088804..3f45977aeb 100644
--- a/MdePkg/Library/UefiApplicationEntryPoint/ApplicationEntryPoint.c
+++ b/MdePkg/Library/UefiApplicationEntryPoint/ApplicationEntryPoint.c
@@ -12,19 +12,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
-//
-// The package level header files this module uses
-//
 #include <Uefi.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-//
-// The Library classes this module consumes
-//
 #include <Library/UefiApplicationEntryPoint.h>
 #include <Library/UefiBootServicesTableLib.h>
 
+
 /**
   Enrty point to UEFI application.
 
diff --git a/MdePkg/Library/UefiApplicationEntryPoint/CommonHeader.h b/MdePkg/Library/UefiApplicationEntryPoint/CommonHeader.h
deleted file mode 100644
index ffc077db55..0000000000
--- a/MdePkg/Library/UefiApplicationEntryPoint/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) 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 <Uefi.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-//
-// The Library classes this module consumes
-//
-#include <Library/UefiApplicationEntryPoint.h>
-#include <Library/UefiBootServicesTableLib.h>
-
-#endif
diff --git a/MdePkg/Library/UefiLib/Console.c b/MdePkg/Library/UefiLib/Console.c
index b82af08ffc..b549e7e018 100644
--- a/MdePkg/Library/UefiLib/Console.c
+++ b/MdePkg/Library/UefiLib/Console.c
@@ -19,7 +19,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include "UefiLibInternal.h"
 
 typedef struct {
   CHAR16  WChar;
diff --git a/MdePkg/Library/UefiLib/UefiDriverModel.c b/MdePkg/Library/UefiLib/UefiDriverModel.c
index 582ad6acdd..0a72d263ad 100644
--- a/MdePkg/Library/UefiLib/UefiDriverModel.c
+++ b/MdePkg/Library/UefiLib/UefiDriverModel.c
@@ -16,7 +16,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include "UefiLibInternal.h"
 
 /**
   Intialize a driver by installing the Driver Binding Protocol onto the
diff --git a/MdePkg/Library/UefiLib/UefiLib.c b/MdePkg/Library/UefiLib/UefiLib.c
index f4eb3eb43b..a2d93d5f89 100644
--- a/MdePkg/Library/UefiLib/UefiLib.c
+++ b/MdePkg/Library/UefiLib/UefiLib.c
@@ -17,7 +17,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include "UefiLibInternal.h"
 
 /**
   Compare whether two names of languages are identical.
diff --git a/MdePkg/Library/UefiLib/UefiLib.inf b/MdePkg/Library/UefiLib/UefiLib.inf
index 6f6d034d52..732b73b9d1 100644
--- a/MdePkg/Library/UefiLib/UefiLib.inf
+++ b/MdePkg/Library/UefiLib/UefiLib.inf
@@ -51,7 +51,7 @@
   UefiDriverModel.c
   Console.c
   UefiLib.c
-  CommonHeader.h
+  UefiLibInternal.h
 
 
 ################################################################################
diff --git a/MdePkg/Library/UefiLib/CommonHeader.h b/MdePkg/Library/UefiLib/UefiLibInternal.h
index ad028a769a..82ba4c439e 100644
--- a/MdePkg/Library/UefiLib/CommonHeader.h
+++ b/MdePkg/Library/UefiLib/UefiLibInternal.h
@@ -1,9 +1,7 @@
 /**@file
-  Common header file shared by all source files.
+  Internal include file for UefiLib.
 
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.
-
-  Copyright (c) 2007, Intel Corporation.
+  Copyright (c) 2007, Intel Corporation.<BR>
   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
@@ -12,30 +10,19 @@
    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
-#ifndef __COMMON_HEADER_H_
-#define __COMMON_HEADER_H_
+#ifndef __UEFI_LIB_INTERNAL_H_
+#define __UEFI_LIB_INTERNAL_H_
 
 
-//
-// The package level header files this module uses
-//
 #include <PiDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
 #include <Protocol/DriverBinding.h>
 #include <Protocol/ComponentName.h>
 #include <Protocol/ComponentName2.h>
 #include <Protocol/DriverConfiguration.h>
 #include <Protocol/DriverDiagnostics.h>
 #include <Protocol/DriverDiagnostics2.h>
-
-
 #include <Guid/EventGroup.h>
 #include <Guid/EventLegacyBios.h>
-//
-// The Library classes this module consumes
-//
 #include <Library/UefiLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/BaseLib.h>
diff --git a/MdePkg/Library/UefiLib/UefiLibPrint.c b/MdePkg/Library/UefiLib/UefiLibPrint.c
index f4453e4cd8..de3e68ea2f 100644
--- a/MdePkg/Library/UefiLib/UefiLibPrint.c
+++ b/MdePkg/Library/UefiLib/UefiLibPrint.c
@@ -16,7 +16,7 @@
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include "UefiLibInternal.h"
 
 /**
   Internal function which prints a formatted Unicode string to the console output device
diff --git a/MdePkg/Library/UefiLib/UefiNotTiano.c b/MdePkg/Library/UefiLib/UefiNotTiano.c
index 9eba9ddf48..f51a16cb7e 100644
--- a/MdePkg/Library/UefiLib/UefiNotTiano.c
+++ b/MdePkg/Library/UefiLib/UefiNotTiano.c
@@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include "UefiLibInternal.h"
 
 /**
   An empty function to pass error checking of CreateEventEx ().
diff --git a/MdePkg/Library/UefiRuntimeLib/CommonHeader.h b/MdePkg/Library/UefiRuntimeLib/CommonHeader.h
deleted file mode 100644
index 186872814d..0000000000
--- a/MdePkg/Library/UefiRuntimeLib/CommonHeader.h
+++ /dev/null
@@ -1,33 +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>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-//
-// The Library classes this module consumes
-//
-#include <Library/UefiRuntimeLib.h>
-#include <Library/DebugLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-
-#endif
diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h b/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
index 568f42921e..e9b4c9d764 100644
--- a/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
+++ b/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
@@ -15,10 +15,10 @@
 #ifndef __RUNTIMELIBINTERNAL_H__
 #define __RUNTIMELIBINTERNAL_H__
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <PiDxe.h>
+#include <Library/UefiRuntimeLib.h>
+#include <Library/DebugLib.h>
+#include <Library/UefiBootServicesTableLib.h>
 
 extern EFI_RUNTIME_SERVICES   *mRT;
 
diff --git a/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf b/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
index d26fc8b0ea..e90d5da488 100644
--- a/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
+++ b/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
@@ -47,7 +47,6 @@
 
 [Sources.common]
   RuntimeLibInternal.h
-  CommonHeader.h
 
 [Sources.Ia32]
   RuntimeService.c
author	AJFISH <AJFISH@6f19259b-4bc3-4df7-8a09-765794883524>	2007-06-29 23:22:13 +0000
committer	AJFISH <AJFISH@6f19259b-4bc3-4df7-8a09-765794883524>	2007-06-29 23:22:13 +0000
commit	f734a10ab104f1072f94cab66a5489e0fd8fce8a (patch)
tree	b2e02ec5bc4bdf9a21166d50f57365e602c07310 /MdePkg
parent	bd0aee7629debf78fffc656f62bd01af3acc0464 (diff)
download	edk2-platforms-f734a10ab104f1072f94cab66a5489e0fd8fce8a.tar.xz