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 5498d2e..5cc28c2 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 e82434b..72427a5 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 6f41e72..bb6e54e 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 48554cc..8d3887f 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 5fef9c8..249b9f7 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 ac39e8f..6a39a20 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 ea04225..7967309 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 7898e81..3ffebae 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 b858278..44dc92e 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 974373d..b50d48e 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 cac7169..1f7200f 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 c5742ae..108246b 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 2d60803..7fdfc16 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 df5d67c..4b6fe21 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 ffa9beb..fc23d27 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 07a9261..dfadaa6 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 9cfa14b..bcb704b 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 8857a8e..3241d9d 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 a0a6ad9..585f235 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 98a20a5..a0d2017 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 dc8f721..30bf4a2 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 ecbbc75..8f79557 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 0a0c1a2..5c530a9 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 3b866e2..23bb75b 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 a4b99eb..f574841 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 0b76896..424d6f0 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 00dc6a0..d769895 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 6e9284d..96f3a5f 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 b9d1eb8..e1203cc 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 0352386..393392c 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 12f6a87..c8ae29a 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 3593563..9921ee2 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 ca78394..dd8c561 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 3433344..04115d2 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 d308895..e295996 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 aaec1f0..bee92c3 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 442d359..77f0ccb 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 a3ad69d..57c6a9b 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 d4c61f1..3590b90 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 27c5554..3567f96 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 cca84b9..2578647 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 60b0550..aeba41e 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 84883df..35941d2 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 5abb226..2e11f0f 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 9594851..1122004 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 4ba13ef..c874956 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 c3dc845..f81460f 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 ab5e522..eb69a20 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 26ed55d..7e3fd24 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 bd38c6a..91c60af 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 8869164..f29a4a6 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 82b3966..31c49b1 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 0e5d32e..8f4ca66 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 addb175..e8cf627 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 f191337..a63d1a1 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 790541a..062c7df 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 231d62c..9141ce9 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 1e1f6dd..7f6cb36 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 5da446b..0166c95 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 5528fe1..42810c0 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 5d9bd11..c12cf9a 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 26866b6..13f963f 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 505b7e6..4674b13 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 055e99c..9307223 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 4f15248..4eb2124 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 af12dd2..ca17228 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 cab2966..f7d1706 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 c899308..ee0b5a8 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 c15ca44..d1e48dc 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 5755a37..d9f2fc4 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 b19348d..b3cbe5b 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 6bce3a4..70062c2 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 64d2c1b..7d5f738 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 767182e..2a56ea6 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 dc6828a..d7cffe7 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 c05af0e..2d6f2aa 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 8703176..9dd9a41 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 ca4e301..f8a74fd 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 ed23db7..d025e95 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 d175952..9872b1c 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 7e3bb94..e80044e 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 0827f34..a811313 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 1f3e916..3fabde8 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 3aedf7d..881222d 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 c3e6ad3..15c7c79 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 8b2cc3c..9a5e2a4 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 ef70763..cc0a4f4 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 74a3d71..046bf41 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 a3c548d..0e18923 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 98b11a5..ade0380 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 107c695..abb6eef 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 be6a6f7..43c3862 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 51a8973..0299f14 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 824bbea..a683942 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 5c12c98..f0fe4ca 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 3200a09..9fddda5 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