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
2007-06-29 23:22:13 +00:00
parent bd0aee7629
commit f734a10ab1
272 changed files with 325 additions and 782 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"
+

 ;------------------------------------------------------------------------------
 ;
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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.
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>

 ;------------------------------------------------------------------------------
 ;
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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