edk2/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/(Ia32|X64)/*.S:

  Fix to support building with GCC and ECP's EdkIIGlueLib.

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

96 files changed, 215 insertions, 28 deletions

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ARShiftU64.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ARShiftU64.S
index 5498d2e991..5cc28c204b 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ARShiftU64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ARShiftU64.S
@@ -19,6 +19,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalMathARShiftU64)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuBreakpoint.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuBreakpoint.S
index e82434b670..72427a56e0 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuBreakpoint.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuBreakpoint.S
@@ -20,6 +20,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(CpuBreakpoint)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuId.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuId.S
index 6f41e72227..bb6e54e647 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuId.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuId.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl  ASM_PFX(AsmCpuid)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuIdEx.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuIdEx.S
index 48554cc96b..8d3887f56c 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuIdEx.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuIdEx.S
@@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------
 
+#include <EdkIIGlueBase.h>
+
     .686:
     .code:
 
diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuPause.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuPause.S
index 5fef9c8d5c..249b9f7dae 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuPause.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuPause.S
@@ -20,6 +20,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(CpuPause)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuSleep.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuSleep.S
index ac39e8fcba..6a39a202b8 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuSleep.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuSleep.S
@@ -20,6 +20,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(CpuSleep)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DisableInterrupts.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DisableInterrupts.S
index ea04225fd6..7967309f61 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DisableInterrupts.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DisableInterrupts.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(DisableInterrupts)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DisablePaging32.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DisablePaging32.S
index 7898e8103a..3ffebae0f2 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DisablePaging32.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DisablePaging32.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalX86DisablePaging32)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x32.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x32.S
index b858278e64..44dc92e5bb 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x32.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x32.S
@@ -19,6 +19,8 @@
 #
 #------------------------------------------------------------------------------
 
+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalMathDivU64x32)
 
 #------------------------------------------------------------------------------
diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x32Remainder.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x32Remainder.S
index 974373d284..b50d48e38e 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x32Remainder.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x32Remainder.S
@@ -19,6 +19,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalMathDivRemU64x32)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x64Remainder.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x64Remainder.S
index cac7169d58..1f7200fa68 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x64Remainder.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x64Remainder.S
@@ -20,6 +20,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalMathDivRemU64x32), ASM_PFX(InternalMathDivRemU64x64)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnableDisableInterrupts.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnableDisableInterrupts.S
index c5742aee53..108246bbb5 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnableDisableInterrupts.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnableDisableInterrupts.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(EnableDisableInterrupts)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnableInterrupts.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnableInterrupts.S
index 2d608036f7..7fdfc1615a 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnableInterrupts.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnableInterrupts.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(EnableInterrupts)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnablePaging32.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnablePaging32.S
index df5d67cfac..4b6fe2168a 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnablePaging32.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnablePaging32.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalX86EnablePaging32)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnablePaging64.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnablePaging64.S
index ffa9beb0a1..fc23d27253 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnablePaging64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnablePaging64.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalX86EnablePaging64)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FlushCacheLine.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FlushCacheLine.S
index 07a92619d2..dfadaa6a0e 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FlushCacheLine.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FlushCacheLine.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmFlushCacheLine)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FxRestore.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FxRestore.S
index 9cfa14be0f..bcb704b0bc 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FxRestore.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FxRestore.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalX86FxRestore)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FxSave.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FxSave.S
index 8857a8ec77..3241d9d413 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FxSave.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FxSave.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalX86FxSave)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedCompareExchange32.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedCompareExchange32.S
index a0a6ad9eb0..585f235f65 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedCompareExchange32.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedCompareExchange32.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalSyncCompareExchange32)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedCompareExchange64.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedCompareExchange64.S
index 98a20a5e29..a0d2017a24 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedCompareExchange64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedCompareExchange64.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalSyncCompareExchange64)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedDecrement.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedDecrement.S
index dc8f7215cc..30bf4a2716 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedDecrement.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedDecrement.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalSyncDecrement)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedIncrement.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedIncrement.S
index ecbbc7540c..8f795575b0 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedIncrement.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedIncrement.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalSyncIncrement)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Invd.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Invd.S
index 0a0c1a244a..5c530a9920 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Invd.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Invd.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmInvd)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LRotU64.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LRotU64.S
index 3b866e2700..23bb75bd71 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LRotU64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LRotU64.S
@@ -19,6 +19,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalMathLRotU64)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LShiftU64.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LShiftU64.S
index a4b99eb80a..f574841b8e 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LShiftU64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LShiftU64.S
@@ -19,6 +19,8 @@
 #
 #------------------------------------------------------------------------------
 
+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalMathLShiftU64)
 
 #------------------------------------------------------------------------------
diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LongJump.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LongJump.S
index 0b76896085..424d6f02a7 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LongJump.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LongJump.S
@@ -19,6 +19,8 @@
 #
 #------------------------------------------------------------------------------
 
+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalLongJump)
 
 #------------------------------------------------------------------------------
diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ModU64x32.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ModU64x32.S
index 00dc6a08ab..d7698953de 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ModU64x32.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ModU64x32.S
@@ -19,6 +19,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalMathModU64x32)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Monitor.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Monitor.S
index 6e9284dcd4..96f3a5f426 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Monitor.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Monitor.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmMonitor)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/MultU64x32.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/MultU64x32.S
index b9d1eb8ca7..e1203ccc11 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/MultU64x32.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/MultU64x32.S
@@ -19,6 +19,8 @@
 #
 #------------------------------------------------------------------------------
 
+#include <EdkIIGlueBase.h>
+
     .386:
     .code:
 
diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/MultU64x64.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/MultU64x64.S
index 03523865f6..393392c162 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/MultU64x64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/MultU64x64.S
@@ -19,6 +19,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalMathMultU64x64)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Mwait.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Mwait.S
index 12f6a87511..c8ae29aa60 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Mwait.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Mwait.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmMwait)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/RRotU64.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/RRotU64.S
index 35935639b9..9921ee26ca 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/RRotU64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/RRotU64.S
@@ -19,6 +19,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalMathRRotU64)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/RShiftU64.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/RShiftU64.S
index ca78394e39..dd8c5615bd 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/RShiftU64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/RShiftU64.S
@@ -19,6 +19,8 @@
 #
 #------------------------------------------------------------------------------
 
+#include <EdkIIGlueBase.h>
+
     .686:
     .code:
 
diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr0.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr0.S
index 3433344b7b..04115d2372 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr0.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr0.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadCr0)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr2.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr2.S
index d308895367..e295996abb 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr2.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr2.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadCr2)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr3.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr3.S
index aaec1f01d0..bee92c3472 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr3.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr3.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadCr3)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr4.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr4.S
index 442d359eda..77f0ccb07a 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr4.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr4.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadCr4)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCs.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCs.S
index a3ad69d304..57c6a9b350 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCs.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCs.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadCs)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr0.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr0.S
index d4c61f1484..3590b90c13 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr0.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr0.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadDr0)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr1.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr1.S
index 27c5554257..3567f96eda 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr1.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr1.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadDr1)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr2.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr2.S
index cca84b9efd..257864744c 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr2.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr2.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadDr2)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr3.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr3.S
index 60b0550381..aeba41e709 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr3.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr3.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadDr3)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr4.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr4.S
index 84883df971..35941d2970 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr4.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr4.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadDr4)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr5.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr5.S
index 5abb226b91..2e11f0f840 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr5.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr5.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadDr5)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr6.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr6.S
index 9594851c7e..1122004625 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr6.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr6.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadDr6)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr7.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr7.S
index 4ba13efcb4..c874956b7b 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr7.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr7.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadDr7)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDs.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDs.S
index c3dc8451ad..f81460f82a 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDs.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDs.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadDs)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadEflags.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadEflags.S
index ab5e522739..eb69a20c2a 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadEflags.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadEflags.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadEflags)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadEs.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadEs.S
index 26ed55d9e1..7e3fd243c5 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadEs.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadEs.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadEs)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadFs.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadFs.S
index bd38c6ac10..91c60af5e1 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadFs.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadFs.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadFs)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadGdtr.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadGdtr.S
index 8869164606..f29a4a62bc 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadGdtr.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadGdtr.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalX86ReadGdtr)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadGs.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadGs.S
index 82b396661d..31c49b103d 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadGs.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadGs.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadGs)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadIdtr.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadIdtr.S
index 0e5d32e3d8..8f4ca66136 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadIdtr.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadIdtr.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(InternalX86ReadIdtr)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadLdtr.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadLdtr.S
index addb1757d0..e8cf627e4c 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadLdtr.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadLdtr.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadLdtr)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm0.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm0.S
index f191337f68..a63d1a12eb 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm0.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm0.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadMm0)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm1.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm1.S
index 790541aaeb..062c7dfca0 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm1.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm1.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadMm1)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm2.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm2.S
index 231d62c762..9141ce9993 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm2.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm2.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadMm2)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm3.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm3.S
index 1e1f6dd684..7f6cb364a5 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm3.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm3.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadMm3)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm4.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm4.S
index 5da446befe..0166c95069 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm4.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm4.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadMm4)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm5.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm5.S
index 5528fe1812..42810c06f4 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm5.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm5.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadMm5)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm6.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm6.S
index 5d9bd11269..c12cf9ab8c 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm6.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm6.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadMm6)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm7.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm7.S
index 26866b6a09..13f963fc20 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm7.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm7.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadMm7)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMsr64.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMsr64.S
index 505b7e688b..4674b13cea 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMsr64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMsr64.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadMsr64)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadPmc.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadPmc.S
index 055e99c25a..9307223659 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadPmc.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadPmc.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadPmc)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadSs.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadSs.S
index 4f15248f1a..4eb2124834 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadSs.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadSs.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadSs)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadTr.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadTr.S
index af12dd2f3f..ca1722802d 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadTr.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadTr.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadTr)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadTsc.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadTsc.S
index cab29661ae..f7d170667a 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadTsc.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadTsc.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(AsmReadTsc)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/SetJump.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/SetJump.S
index c8993084ac..ee0b5a824d 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/SetJump.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/SetJump.S
@@ -19,6 +19,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 .globl ASM_PFX(SetJump), ASM_PFX(InternalAssertJumpBuffer)

 

 #------------------------------------------------------------------------------

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/SwapBytes64.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/SwapBytes64.S
index c15ca444f0..d1e48dcfd0 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/SwapBytes64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/SwapBytes64.S
@@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------
 
+#include <EdkIIGlueBase.h>
+
 
 #------------------------------------------------------------------------------
 # UINT64
diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Thunk16.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Thunk16.S
index 5755a3705f..d9f2fc4c1f 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Thunk16.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Thunk16.S
@@ -19,7 +19,7 @@
 #

 #------------------------------------------------------------------------------

 

-#include <Library/BaseLib.h>

+#include <EdkIIGlueBase.h>

 

 .globl ASM_PFX(m16Start), ASM_PFX(m16Size), ASM_PFX(mThunk16Attr), ASM_PFX(m16Gdt), ASM_PFX(m16GdtrBase), ASM_PFX(mTransition)

 .globl ASM_PFX(InternalAsmThunk16)

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Wbinvd.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Wbinvd.S
index b19348dad9..b3cbe5b274 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Wbinvd.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Wbinvd.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # VOID

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr0.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr0.S
index 6bce3a4d50..70062c2417 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr0.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr0.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # UINTN

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr2.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr2.S
index 64d2c1b534..7d5f7386cd 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr2.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr2.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # UINTN

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr3.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr3.S
index 767182ee4e..2a56ea679b 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr3.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr3.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # UINTN

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr4.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr4.S
index dc6828ac91..d7cffe707f 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr4.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr4.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # UINTN

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr0.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr0.S
index c05af0ec1e..2d6f2aaa0f 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr0.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr0.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # UINTN

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr1.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr1.S
index 87031768ac..9dd9a41319 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr1.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr1.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # UINTN

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr2.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr2.S
index ca4e301b93..f8a74fd555 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr2.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr2.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # UINTN

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr3.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr3.S
index ed23db7e90..d025e950c1 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr3.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr3.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # UINTN

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr4.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr4.S
index d17595213a..9872b1c03c 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr4.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr4.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # UINTN

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr5.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr5.S
index 7e3bb94f1f..e80044e471 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr5.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr5.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # UINTN

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr6.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr6.S
index 0827f347bd..a811313905 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr6.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr6.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # UINTN

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr7.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr7.S
index 1f3e916675..3fabde897f 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr7.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr7.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # UINTN

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteGdtr.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteGdtr.S
index 3aedf7dd68..881222d42b 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteGdtr.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteGdtr.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # VOID

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteIdtr.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteIdtr.S
index c3e6ad3353..15c7c79f32 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteIdtr.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteIdtr.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # VOID

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteLdtr.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteLdtr.S
index 8b2cc3c029..9a5e2a4f57 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteLdtr.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteLdtr.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # VOID

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm0.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm0.S
index ef70763e52..cc0a4f48f5 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm0.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm0.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # VOID

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm1.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm1.S
index 74a3d711b5..046bf41a84 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm1.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm1.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # VOID

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm2.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm2.S
index a3c548dcec..0e18923608 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm2.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm2.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # VOID

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm3.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm3.S
index 98b11a5818..ade0380891 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm3.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm3.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # VOID

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm4.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm4.S
index 107c695cf7..abb6eefc96 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm4.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm4.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # VOID

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm5.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm5.S
index be6a6f78b2..43c3862ccc 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm5.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm5.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # VOID

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm6.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm6.S
index 51a8973460..0299f14a8a 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm6.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm6.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # VOID

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm7.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm7.S
index 824bbeae17..a68394298a 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm7.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm7.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # VOID

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMsr64.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMsr64.S
index 5c12c981a9..f0fe4caacf 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMsr64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMsr64.S
@@ -21,6 +21,8 @@
 #

 #------------------------------------------------------------------------------

 

+#include <EdkIIGlueBase.h>

+

 #------------------------------------------------------------------------------

 # UINT64

 # EFIAPI

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/X64/Thunk16.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/X64/Thunk16.S
index 3200a09282..9fddda5ab0 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/X64/Thunk16.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/X64/Thunk16.S
@@ -18,35 +18,34 @@
 #   Real mode thunk
 #
 #------------------------------------------------------------------------------
+#include <EdkIIGlueBase.h>
 
-#include <Library/BaseLib.h>
-
-.globl ASM_PFX(m16Start)

-.globl ASM_PFX(m16Size)

-.globl ASM_PFX(mThunk16Attr)

-.globl ASM_PFX(m16Gdt)

-.globl ASM_PFX(m16GdtrBase)

-.globl ASM_PFX(mTransition)

-.globl ASM_PFX(InternalAsmThunk16)

+.globl ASM_PFX(m16Start)
+.globl ASM_PFX(m16Size)
+.globl ASM_PFX(mThunk16Attr)
+.globl ASM_PFX(m16Gdt)
+.globl ASM_PFX(m16GdtrBase)
+.globl ASM_PFX(mTransition)
+.globl ASM_PFX(InternalAsmThunk16)
 
-# define the structure of IA32_REGS

-.equ  _EDI, 0       #size 4

-.equ  _ESI, 4       #size 4

-.equ  _EBP, 8       #size 4

-.equ  _ESP, 12      #size 4

-.equ  _EBX, 16      #size 4

-.equ  _EDX, 20      #size 4

-.equ  _ECX, 24      #size 4

-.equ  _EAX, 28      #size 4

-.equ  _DS,  32      #size 2

-.equ  _ES,  34      #size 2

-.equ  _FS,  36      #size 2

-.equ  _GS,  38      #size 2

-.equ  _EFLAGS, 40   #size 8

-.equ  _EIP, 48      #size 4

-.equ  _CS, 52       #size 2

-.equ  _SS, 54       #size 2

-.equ  IA32_REGS_SIZE, 56

+# define the structure of IA32_REGS
+.equ  _EDI, 0       #size 4
+.equ  _ESI, 4       #size 4
+.equ  _EBP, 8       #size 4
+.equ  _ESP, 12      #size 4
+.equ  _EBX, 16      #size 4
+.equ  _EDX, 20      #size 4
+.equ  _ECX, 24      #size 4
+.equ  _EAX, 28      #size 4
+.equ  _DS,  32      #size 2
+.equ  _ES,  34      #size 2
+.equ  _FS,  36      #size 2
+.equ  _GS,  38      #size 2
+.equ  _EFLAGS, 40   #size 8
+.equ  _EIP, 48      #size 4
+.equ  _CS, 52       #size 2
+.equ  _SS, 54       #size 2
+.equ  IA32_REGS_SIZE, 56
 
     .data