edk2/EdkCompatibilityPkg/**

* Changed all '\' to '/' in *.ing and *.dsc
* Fixed inconsistencies in filename case usage that caused the
  build command to fail to parse the dsc/inf files on a system
  with a case-sensitive filesystem.


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

43 files changed, 582 insertions, 580 deletions

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
index a756a0c8ef..9e0b2dfecb 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
@@ -39,18 +39,18 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\Include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../Include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueBaseLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseDebugLibNull/BaseDebugLibNull.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseDebugLibNull/BaseDebugLibNull.inf
index 168c29ea23..792363b042 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseDebugLibNull/BaseDebugLibNull.inf
@@ -36,18 +36,18 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\Include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../Include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueBaseLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
index 4081b2bec2..79ac0bfe25 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
@@ -44,18 +44,18 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueBaseLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf
index a1931699aa..42e167a89b 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf
@@ -321,24 +321,24 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\Include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../Include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [includes.IA32]

-  ..\..\Include\Ia32

+  ../../Include/Ia32

 

 [includes.X64]

-  ..\..\Include\x64

+  ../../Include/x64

 

 

 [libraries.common]

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseMemoryLib/BaseMemoryLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseMemoryLib/BaseMemoryLib.inf
index 829973d458..a0b837835d 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseMemoryLib/BaseMemoryLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseMemoryLib/BaseMemoryLib.inf
@@ -78,18 +78,18 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueBaseLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciCf8Lib/BasePciCf8Lib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciCf8Lib/BasePciCf8Lib.inf
index 071dfc9af1..aed0625c2b 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciCf8Lib/BasePciCf8Lib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciCf8Lib/BasePciCf8Lib.inf
@@ -40,18 +40,18 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

 

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciExpressLib/BasePciExpressLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciExpressLib/BasePciExpressLib.inf
index 6261c5c47c..1b374e19dd 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciExpressLib/BasePciExpressLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciExpressLib/BasePciExpressLib.inf
@@ -40,18 +40,18 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\Include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../Include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

 

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibCf8/BasePciLibCf8.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibCf8/BasePciLibCf8.inf
index d08f7ee3e0..da8769cb42 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibCf8/BasePciLibCf8.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibCf8/BasePciLibCf8.inf
@@ -40,18 +40,18 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueBasePciCf8Lib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
index 0df887f48e..54e29c2953 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
@@ -40,18 +40,18 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueBasePciExpressLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
index e1a3767dd0..82f671deab 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
@@ -40,19 +40,20 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include
 

-  $(EDK_SOURCE)\Foundation\Efi\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

+ 

+  $(EDK_SOURCE)/Foundation/Efi/Include

   

 

 [libraries.common]

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffLib/BasePeCoffLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffLib/BasePeCoffLib.inf
index 85d5722f14..b53d397159 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffLib/BasePeCoffLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffLib/BasePeCoffLib.inf
@@ -27,32 +27,32 @@ COMPONENT_TYPE  = LIBRARY
   BasePeCoff.c

 

 [sources.ia32]

-  Ia32\PeCoffLoaderEx.c

+  Ia32/PeCoffLoaderEx.c

 

 [sources.x64]

-  X64\PeCoffLoaderEx.c

+  x64/PeCoffLoaderEx.c

 

 [sources.ipf]

-  Ipf\PeCoffLoaderEx.c

+  Ipf/PeCoffLoaderEx.c

 

 [sources.ebc]

-  Ebc\PeCoffLoaderEx.c

+  Ebc/PeCoffLoaderEx.c

 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

-  $(EDK_SOURCE)\Foundation\Guid\PeiPeCoffLoader

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

+  $(EDK_SOURCE)/Foundation/Guid/PeiPeCoffLoader

 

 

 [libraries.common]

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
index 0c71b4bdab..ea26735f53 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
@@ -38,19 +38,19 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

-  $(EDK_SOURCE)\Foundation\Guid\PeiPeCoffLoader

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

+  $(EDK_SOURCE)/Foundation/Guid/PeiPeCoffLoader

 

 

 [libraries.common]

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
index 07e21773aa..481d82ea8a 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
@@ -38,19 +38,19 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

-  $(EDK_SOURCE)\Foundation\Guid\PeiPeCoffLoader

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

+  $(EDK_SOURCE)/Foundation/Guid/PeiPeCoffLoader

 

 

 [libraries.common]

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/BasePrintLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/BasePrintLib.inf
index 7d815df709..b141d184d2 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/BasePrintLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/BasePrintLib.inf
@@ -39,19 +39,19 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

-  $(EDK_SOURCE)\Foundation\Guid\PeiPeCoffLoader

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

+  $(EDK_SOURCE)/Foundation/Guid/PeiPeCoffLoader

 

 

 [libraries.common]

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.inf
index c734168451..1cf7cba8cc 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.inf
@@ -26,11 +26,11 @@ COMPONENT_TYPE  = LIBRARY
 [sources.common]

 [sources.ia32]

   x86TimerLib.c

-  Ia32\x86LocalApicTimerInitialize.asm

+  Ia32/x86LocalApicTimerInitialize.asm

 

 [sources.x64]

   x86TimerLib.c

-  X64\x86LocalApicTimerInitialize.asm

+  X64/x86LocalApicTimerInitialize.asm

 

 [sources.ipf]

   Ipf/IpfTimerLib.c

@@ -40,18 +40,18 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueBaseLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
index 62b093a70d..f524946aa6 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
@@ -37,18 +37,18 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueBaseMemoryLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/DxeHobLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/DxeHobLib.inf
index d6989370d3..8b38fba7ac 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/DxeHobLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/DxeHobLib.inf
@@ -37,18 +37,18 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueBaseMemoryLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf
index e069234ab4..a5a3789d6c 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf
@@ -38,18 +38,18 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueBaseLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf
index 0339bae047..cc64a6c024 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf
@@ -37,18 +37,18 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueBaseMemoryLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxePerformanceLib/DxePerformanceLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxePerformanceLib/DxePerformanceLib.inf
index efcb27261d..42db427247 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxePerformanceLib/DxePerformanceLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxePerformanceLib/DxePerformanceLib.inf
@@ -38,18 +38,18 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueBaseLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
index d7a6f2eee3..d8f1c797de 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
@@ -37,21 +37,21 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

-  $(EDK_SOURCE)\Foundation\Framework\Guid\DataHubRecords

-  $(EDK_SOURCE)\Foundation\Framework\Guid\StatusCodeDataTypeId

-  $(EDK_SOURCE)\Foundation\Core\Dxe\ArchProtocol\StatusCode

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

+  $(EDK_SOURCE)/Foundation/Framework/Guid/DataHubRecords

+  $(EDK_SOURCE)/Foundation/Framework/Guid/StatusCodeDataTypeId

+  $(EDK_SOURCE)/Foundation/Core/Dxe/ArchProtocol/StatusCode

 

 [libraries.common]

   EdkIIGlueBaseLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeServicesTableLib/DxeServicesTableLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeServicesTableLib/DxeServicesTableLib.inf
index efcfd31051..0fd4d05c3d 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeServicesTableLib/DxeServicesTableLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeServicesTableLib/DxeServicesTableLib.inf
@@ -37,20 +37,20 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

-  $(EDK_SOURCE)\Foundation\Framework\Guid\DataHubRecords

-  $(EDK_SOURCE)\Foundation\Framework\Guid\StatusCodeDataTypeId

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

+  $(EDK_SOURCE)/Foundation/Framework/Guid/DataHubRecords

+  $(EDK_SOURCE)/Foundation/Framework/Guid/StatusCodeDataTypeId

 

 [libraries.common]

   EdkIIGlueUefiLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeSmbusLib/DxeSmbusLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeSmbusLib/DxeSmbusLib.inf
index cbc2d3ded8..42a57564aa 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeSmbusLib/DxeSmbusLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeSmbusLib/DxeSmbusLib.inf
@@ -38,20 +38,20 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

-  $(EDK_SOURCE)\Foundation\Framework\Guid\DataHubRecords

-  $(EDK_SOURCE)\Foundation\Framework\Guid\StatusCodeDataTypeId

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

+  $(EDK_SOURCE)/Foundation/Framework/Guid/DataHubRecords

+  $(EDK_SOURCE)/Foundation/Framework/Guid/StatusCodeDataTypeId

 

 [libraries.common]

   EdkIIGlueBaseMemoryLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.inf
index 734db91adb..4accc90171 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.inf
@@ -28,38 +28,38 @@ COMPONENT_TYPE  = LIBRARY
 [sources.common]

 

 [sources.ia32]

-  Common\RuntimeLib.c

-  Common\RuntimeService.c

+  Common/RuntimeLib.c

+  Common/RuntimeService.c

 

 [sources.x64]

-  Common\RuntimeLib.c

-  Common\RuntimeService.c

+  Common/RuntimeLib.c

+  Common/RuntimeService.c

 

 [sources.ipf]

-  Ipf\RuntimeLib.c

-  Ipf\RuntimeService.c

+  Ipf/RuntimeLib.c

+  Ipf/RuntimeService.c

 

 [sources.ebc]

-  Common\RuntimeLib.c

-  Common\RuntimeService.c

+  Common/RuntimeLib.c

+  Common/RuntimeService.c

   

 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

-  $(EDK_SOURCE)\Foundation\Framework\Guid\DataHubRecords

-  $(EDK_SOURCE)\Foundation\Framework\Guid\StatusCodeDataTypeId

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

+  $(EDK_SOURCE)/Foundation/Framework/Guid/DataHubRecords

+  $(EDK_SOURCE)/Foundation/Framework/Guid/StatusCodeDataTypeId

 

 [libraries.common]

   EdkIIGlueUefiLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeSalLib/EdkDxeSalLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeSalLib/EdkDxeSalLib.inf
index a9f0b1bb01..d50c798bb6 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeSalLib/EdkDxeSalLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeSalLib/EdkDxeSalLib.inf
@@ -38,20 +38,20 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

-  $(EDK_SOURCE)\Foundation\Framework\Guid\DataHubRecords

-  $(EDK_SOURCE)\Foundation\Framework\Guid\StatusCodeDataTypeId

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

+  $(EDK_SOURCE)/Foundation/Framework/Guid/DataHubRecords

+  $(EDK_SOURCE)/Foundation/Framework/Guid/StatusCodeDataTypeId

 

 [libraries.common]

 

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/HiiLib/HiiLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/HiiLib/HiiLib.inf
index 3d6412b4d1..734353a244 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/HiiLib/HiiLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/HiiLib/HiiLib.inf
@@ -37,20 +37,20 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Framework\Protocol\Hii

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Library\Dxe\EfiIfrSupportLib

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Framework/Protocol/Hii

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Library/Dxe/EfiIfrSupportLib

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueDxeMemoryAllocationLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
index eee03b3e12..ca52f32087 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
@@ -37,20 +37,20 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Framework\Protocol\Hii

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Library\Dxe\EfiIfrSupportLib

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Framework/Protocol/Hii

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Library/Dxe/EfiIfrSupportLib

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueBaseLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf
index b51d73ef8b..a781a11280 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf
@@ -37,20 +37,20 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Framework\Protocol\Hii

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Library\Dxe\EfiIfrSupportLib

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Framework/Protocol/Hii

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Library/Dxe/EfiIfrSupportLib

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

 #

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiHobLib/PeiHobLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiHobLib/PeiHobLib.inf
index a9ce3f6f92..3f216adb9f 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiHobLib/PeiHobLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiHobLib/PeiHobLib.inf
@@ -37,22 +37,22 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Library\Pei\Include

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Include\Pei

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Include\Pei

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Pei\Include

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Library/Pei/Include

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Include/Pei

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Include/Pei

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Pei/Include

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueBaseMemoryLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
index f4ddc17e9b..4005df15b1 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
@@ -40,19 +40,19 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Include\Pei

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Include/Pei

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueBaseMemoryLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiPerformanceLib/PeiPerformanceLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiPerformanceLib/PeiPerformanceLib.inf
index ec0a4b4939..decdd447ba 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiPerformanceLib/PeiPerformanceLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiPerformanceLib/PeiPerformanceLib.inf
@@ -40,21 +40,21 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Include\Pei

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

-  $(EDK_SOURCE)\Foundation\Framework\Guid\DataHubRecords

-  $(EDK_SOURCE)\Foundation\Framework\Guid\StatusCodeDataTypeId

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Include/Pei

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

+  $(EDK_SOURCE)/Foundation/Framework/Guid/DataHubRecords

+  $(EDK_SOURCE)/Foundation/Framework/Guid/StatusCodeDataTypeId

 

 [libraries.common]

   EdkIIGlueBaseLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
index bd737e96f3..32fcccc362 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
@@ -40,21 +40,21 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Include\Pei

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

-  $(EDK_SOURCE)\Foundation\Framework\Guid\DataHubRecords

-  $(EDK_SOURCE)\Foundation\Framework\Guid\StatusCodeDataTypeId

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Include/Pei

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

+  $(EDK_SOURCE)/Foundation/Framework/Guid/DataHubRecords

+  $(EDK_SOURCE)/Foundation/Framework/Guid/StatusCodeDataTypeId

 

 [libraries.common]

   EdkIIGlueBaseLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
index 3d127bdb7c..cd31e5c0e5 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
@@ -37,21 +37,21 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Include\Pei

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Include\Pei

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Pei\Include

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Include/Pei

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Include/Pei

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Pei/Include

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGluePeiServicesLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesLib/PeiServicesLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesLib/PeiServicesLib.inf
index b63bb422e6..1b604d1f74 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesLib/PeiServicesLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesLib/PeiServicesLib.inf
@@ -37,19 +37,19 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Include\Pei

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Include/Pei

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

 #

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
index 548766ef57..2c377964bc 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
@@ -37,19 +37,19 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Include\Pei

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Include/Pei

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

 

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.inf
index d6ab1508d4..13559f56a8 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.inf
@@ -32,19 +32,19 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Include\Pei

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Include/Pei

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueBaseLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf
index 9dc7dea768..e3b97e4f7f 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf
@@ -36,19 +36,19 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Include\Pei

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Include/Pei

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

 

 [libraries.common]

   EdkIIGlueBaseLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiSmbusLib/PeiSmbusLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiSmbusLib/PeiSmbusLib.inf
index 9f106ed3d3..8746348005 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiSmbusLib/PeiSmbusLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiSmbusLib/PeiSmbusLib.inf
@@ -38,21 +38,21 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

-  $(EDK_SOURCE)\Foundation\Framework\Guid\DataHubRecords

-  $(EDK_SOURCE)\Foundation\Framework\Guid\StatusCodeDataTypeId

-  $(EDK_SOURCE)\Foundation\Include\Pei

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

+  $(EDK_SOURCE)/Foundation/Framework/Guid/DataHubRecords

+  $(EDK_SOURCE)/Foundation/Framework/Guid/StatusCodeDataTypeId

+  $(EDK_SOURCE)/Foundation/Include/Pei

 

 [libraries.common]

   EdkIIGlueBaseMemoryLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
index 913f1cee39..dfae90e9ba 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
@@ -37,20 +37,20 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

  

-  $(EDK_SOURCE)\Foundation\Efi\Protocol\DevicePath

+  $(EDK_SOURCE)/Foundation/Efi/Protocol/DevicePath

 

 [libraries.common]

 

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDevicePathLib/UefiDevicePathLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDevicePathLib/UefiDevicePathLib.inf
index 04671cfcf3..5504300d17 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDevicePathLib/UefiDevicePathLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDevicePathLib/UefiDevicePathLib.inf
@@ -37,19 +37,20 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include
 

-  $(EDK_SOURCE)\Foundation\Efi\Protocol\DevicePath

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

+ 

+  $(EDK_SOURCE)/Foundation/Efi/Protocol/DevicePath

 

 [libraries.common]

   EdkIIGlueBaseMemoryLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDriverModelLib/UefiDriverModelLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDriverModelLib/UefiDriverModelLib.inf
index d94c5c8182..97abe712e4 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDriverModelLib/UefiDriverModelLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDriverModelLib/UefiDriverModelLib.inf
@@ -31,19 +31,19 @@ COMPONENT_TYPE  = LIBRARY
 [sources.ipf,sources.x64]

 

 [includes.common]

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Library\EdkIIGlueLib\Include

-  $(EDK_SOURCE)\Foundation\Core

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Include\Pei

-  $(EDK_SOURCE)\Foundation\Library\Pei\Include

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Library/EdkIIGlueLib/Include

+  $(EDK_SOURCE)/Foundation/Core

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Include/Pei

+  $(EDK_SOURCE)/Foundation/Library/Pei/Include

 

 [libraries.common]

   EdkIIGlueUefiBootServicesTableLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiLib.inf
index 91a167afc5..d066ae31ac 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiLib.inf
@@ -39,20 +39,20 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

  

-  $(EDK_SOURCE)\Foundation\Efi\Protocol\DevicePath

+  $(EDK_SOURCE)/Foundation/Efi/Protocol/DevicePath

 

 [libraries.common]

   EdkIIGlueBaseLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
index 8c36b763da..0745147d3f 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
@@ -37,19 +37,19 @@ COMPONENT_TYPE  = LIBRARY
 

 [includes.common]

   .

-  ..\..\Include

-  ..\..\include\Library

-  $(EDK_SOURCE)\Foundation

-  $(EDK_SOURCE)\Foundation\Framework

-  $(EDK_SOURCE)\Foundation\Efi

-  $(EDK_SOURCE)\Foundation\Include

-  $(EDK_SOURCE)\Foundation\Efi\Include

-  $(EDK_SOURCE)\Foundation\Framework\Include

-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard

-  $(EDK_SOURCE)\Foundation\Core\Dxe

-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include

-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include

-  $(EDK_SOURCE)\Foundation\Efi\Protocol\DevicePath

+  ../../Include

+  ../../include/Library

+  $(EDK_SOURCE)/Foundation

+  $(EDK_SOURCE)/Foundation/Framework

+  $(EDK_SOURCE)/Foundation/Efi

+  $(EDK_SOURCE)/Foundation/Include

+  $(EDK_SOURCE)/Foundation/Efi/Include

+  $(EDK_SOURCE)/Foundation/Framework/Include

+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard

+  $(EDK_SOURCE)/Foundation/Core/Dxe

+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include

+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include

+  $(EDK_SOURCE)/Foundation/Efi/Protocol/DevicePath

 

 [libraries.common]