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
author: jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> 2008-03-17 22:01:12 +0000
committer: jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> 2008-03-17 22:01:12 +0000
commit: e84217e7cfe0b1b160d4b870045f7df7b888c4a5 (patch)
tree: ca66809e220d98a168d93c3b7a4cf263bc8a79bb
parent: 99ea19948a9df7425169dd899fb0c8eaafefaa00 (diff)
download: edk2-platforms-e84217e7cfe0b1b160d4b870045f7df7b888c4a5.tar.xz
82 files changed, 1630 insertions, 1628 deletions
diff --git a/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc b/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc
index 5502fd2b75..c54e4673c8 100644
--- a/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc
+++ b/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc
@@ -50,102 +50,102 @@
 [Components.Common]
 
 # All Libraries Instances listed in Alphabetic Order
-  EdkCompatibilityPkg\Foundation\Core\Dxe\ArchProtocol\ArchProtocolLib.inf
-  EdkCompatibilityPkg\Foundation\Efi\Guid\EfiGuidLib.inf
-  EdkCompatibilityPkg\Foundation\Efi\Protocol\EfiProtocolLib.inf
-  EdkCompatibilityPkg\Foundation\Framework\Guid\EdkFrameworkGuidLib.inf
-  EdkCompatibilityPkg\Foundation\Framework\Ppi\EdkFrameworkPpiLib.inf
-  EdkCompatibilityPkg\Foundation\Framework\Protocol\EdkFrameworkProtocolLib.inf
-  EdkCompatibilityPkg\Foundation\Guid\EdkGuidLib.inf
+  EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/ArchProtocolLib.inf
+  EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf
+  EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiProtocolLib.inf
+  EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.inf
+  EdkCompatibilityPkg/Foundation/Framework/Ppi/EdkFrameworkPpiLib.inf
+  EdkCompatibilityPkg/Foundation/Framework/Protocol/EdkFrameworkProtocolLib.inf
+  EdkCompatibilityPkg/Foundation/Guid/EdkGuidLib.inf
 
   #
   # BugBug: Can't pass IPF build. Will investigate and add back later.
   #
-#  EdkCompatibilityPkg\Foundation\Library\CompilerStub\CompilerStubLib.inf
-  EdkCompatibilityPkg\Foundation\Library\CustomizedDecompress\CustomizedDecompress.inf
-  EdkCompatibilityPkg\Foundation\Library\Dxe\EfiDriverLib\EfiDriverLib.inf
-  EdkCompatibilityPkg\Foundation\Library\Dxe\EfiIfrSupportLib\EfiIfrSupportLib.inf
-  EdkCompatibilityPkg\Foundation\Library\Dxe\EfiScriptLib\EfiScriptLib.inf
-  EdkCompatibilityPkg\Foundation\Library\Dxe\EfiUiLib\EfiUiLib.inf
-  EdkCompatibilityPkg\Foundation\Library\Dxe\Graphics\Graphics.inf
-  EdkCompatibilityPkg\Foundation\Library\Dxe\GraphicsLite\Graphics.inf
-  EdkCompatibilityPkg\Foundation\Library\Dxe\Hob\HobLib.inf
-  EdkCompatibilityPkg\Foundation\Library\Dxe\Print\PrintLib.inf
-  EdkCompatibilityPkg\Foundation\Library\Dxe\PrintLite\PrintLib.inf
-  EdkCompatibilityPkg\Foundation\Library\Dxe\UefiEfiIfrSupportLib\UefiEfiIfrSupportLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BaseCacheMaintenanceLib\BaseCacheMaintenanceLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BaseDebugLibNull\BaseDebugLibNull.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BaseIoLibIntrinsic\BaseIoLibIntrinsic.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BaseLib\BaseLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BaseMemoryLib\BaseMemoryLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePciCf8Lib\BasePciCf8Lib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePciExpressLib\BasePciExpressLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePciLibCf8\BasePciLibCf8.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePciLibPciExpress\BasePciLibPciExpress.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePeCoffGetEntryPointLib\BasePeCoffGetEntryPointLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePeCoffLib\BasePeCoffLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePostCodeLibDebug\BasePostCodeLibDebug.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePostCodeLibPort80\BasePostCodeLibPort80.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePrintLib\BasePrintLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BaseTimerLibLocalApic\BaseTimerLibLocalApic.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BaseUefiDecompressLib\BaseUefiDecompressLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\DxeHobLib\DxeHobLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\DxeIoLibCpuIo\DxeIoLibCpuIo.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\DxeMemoryAllocationLib\DxeMemoryAllocationLib.inf
+#  EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf
+  EdkCompatibilityPkg/Foundation/Library/CustomizedDecompress/CustomizedDecompress.inf
+  EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf
+  EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/EfiIfrSupportLib.inf
+  EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.inf
+  EdkCompatibilityPkg/Foundation/Library/Dxe/EfiUiLib/EfiUiLib.inf
+  EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.inf
+  EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.inf
+  EdkCompatibilityPkg/Foundation/Library/Dxe/Hob/HobLib.inf
+  EdkCompatibilityPkg/Foundation/Library/Dxe/Print/PrintLib.inf
+  EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/PrintLib.inf
+  EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiEfiIfrSupportLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseMemoryLib/BaseMemoryLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciCf8Lib/BasePciCf8Lib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciExpressLib/BasePciExpressLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibCf8/BasePciLibCf8.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffLib/BasePeCoffLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/BasePrintLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/DxeHobLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf
 
   #
   # BugBug: Can't pass IPF build. Will investigate and add back later.
   #
-# EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\DxePerformanceLib\DxePerformanceLib.inf
+# EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxePerformanceLib/DxePerformanceLib.inf
 
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\DxeReportStatusCodeLib\DxeReportStatusCodeLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\DxeServicesTableLib\DxeServicesTableLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\DxeSmbusLib\DxeSmbusLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\EdkDxeRuntimeDriverLib\EdkDxeRuntimeDriverLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\HiiLib\HiiLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiDxeDebugLibReportStatusCode\PeiDxeDebugLibReportStatusCode.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiDxePostCodeLibReportStatusCode\PeiDxePostCodeLibReportStatusCode.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiHobLib\PeiHobLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiMemoryAllocationLib\PeiMemoryAllocationLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeServicesTableLib/DxeServicesTableLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeSmbusLib/DxeSmbusLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/HiiLib/HiiLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiHobLib/PeiHobLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
   #
   # BugBug: Can't pass IPF build. Will investigate and add back later.
   #
-# EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiPerformanceLib\PeiPerformanceLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiReportStatusCodeLib\PeiReportStatusCodeLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiResourcePublicationLib\PeiResourcePublicationLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiServicesLib\PeiServicesLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiServicesTablePointerLib\PeiServicesTablePointerLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiSmbusLib\PeiSmbusLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\UefiBootServicesTableLib\UefiBootServicesTableLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\UefiDevicePathLib\UefiDevicePathLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\UefiDriverModelLib\UefiDriverModelLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\UefiLib\UefiLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\UefiRuntimeServicesTableLib\UefiRuntimeServicesTableLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EfiCommonLib\EfiCommonLib.inf
-  EdkCompatibilityPkg\Foundation\Library\Pei\Hob\PeiHobLib.inf
-  EdkCompatibilityPkg\Foundation\Library\Pei\PeiLib\PeiLib.inf
-  EdkCompatibilityPkg\Foundation\Library\RuntimeDxe\EfiRuntimeLib\EfiRuntimeLib.inf
-  EdkCompatibilityPkg\Foundation\Library\Thunk16\Thunk16Lib.inf
-  EdkCompatibilityPkg\Foundation\Ppi\EdkPpiLib.inf
-  EdkCompatibilityPkg\Foundation\Protocol\EdkProtocolLib.inf
-  EdkCompatibilityPkg\Sample\Platform\Generic\MonoStatusCode\Library\Pei\MemoryStatusCode\MemoryStatusCode.inf
-  EdkCompatibilityPkg\Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\BsDataHubStatusCode\BsDataHubStatusCode.inf
-  EdkCompatibilityPkg\Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\BsSerialStatusCode\BsSerialStatusCode.inf
-  EdkCompatibilityPkg\Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\RtLedStatusCode\RtLedStatusCode.inf
-  EdkCompatibilityPkg\Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\RtMemoryStatusCode\RtMemoryStatusCode.inf
-  EdkCompatibilityPkg\Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\RtPlatformStatusCode\Nt32\RtPlatformStatusCode.inf
-  EdkCompatibilityPkg\Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\RtPort80StatusCode\RtPort80StatusCode.inf
-  EdkCompatibilityPkg\Sample\Platform\Nt32\Ppi\EdkNt32PpiLib.inf
-  EdkCompatibilityPkg\Sample\Platform\Nt32\Protocol\EdkNt32ProtocolLib.inf
+# EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiPerformanceLib/PeiPerformanceLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesLib/PeiServicesLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiSmbusLib/PeiSmbusLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDevicePathLib/UefiDevicePathLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDriverModelLib/UefiDriverModelLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
+  EdkCompatibilityPkg/Foundation/Library/Pei/Hob/PeiHobLib.inf
+  EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.inf
+  EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib.inf
+  EdkCompatibilityPkg/Foundation/Library/Thunk16/Thunk16Lib.inf
+  EdkCompatibilityPkg/Foundation/Ppi/EdkPpiLib.inf
+  EdkCompatibilityPkg/Foundation/Protocol/EdkProtocolLib.inf
+  EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/MemoryStatusCode/MemoryStatusCode.inf
+  EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsDataHubStatusCode/BsDataHubStatusCode.inf
+  EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsSerialStatusCode/BsSerialStatusCode.inf
+  EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtLedStatusCode/RtLedStatusCode.inf
+  EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtMemoryStatusCode/RtMemoryStatusCode.inf
+  EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtPlatformStatusCode/Nt32/RtPlatformStatusCode.inf
+  EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtPort80StatusCode/RtPort80StatusCode.inf
+  EdkCompatibilityPkg/Sample/Platform/Nt32/Ppi/EdkNt32PpiLib.inf
+  EdkCompatibilityPkg/Sample/Platform/Nt32/Protocol/EdkNt32ProtocolLib.inf
 
 [Components.IA32,Components.X64]
-  EdkCompatibilityPkg\Foundation\Cpu\Pentium\CpuIA32Lib\CpuIA32Lib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiServicesTablePointerLibMm7\PeiServicesTablePointerLibMm7.inf
-  EdkCompatibilityPkg\Sample\Library\Dxe\WinNt\WinNtLib.inf
+  EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf
+  EdkCompatibilityPkg/Sample/Library/Dxe/WinNt/WinNtLib.inf
 
 
 [Components.IPF]
-  EdkCompatibilityPkg\Foundation\Cpu\Itanium\CpuIa64Lib\CpuIA64Lib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\EdkDxeSalLib\EdkDxeSalLib.inf
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiServicesTablePointerLibKr1\PeiServicesTablePointerLibKr1.inf
+  EdkCompatibilityPkg/Foundation/Cpu/Itanium/CpuIa64Lib/CpuIA64Lib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeSalLib/EdkDxeSalLib.inf
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.inf
 
diff --git a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/ArchProtocolLib.inf b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/ArchProtocolLib.inf
index 84b0afd2c6..947f3f7b73 100644
--- a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/ArchProtocolLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/ArchProtocolLib.inf
@@ -24,42 +24,42 @@ BASE_NAME      = ArchProtocolLib
 COMPONENT_TYPE = LIBRARY
 
 [sources.common]
-  Bds\Bds.c
-  Bds\Bds.h
-  Capsule\Capsule.c
-  Capsule\Capsule.h
-  Cpu\Cpu.c
-  Cpu\Cpu.h
-  Metronome\Metronome.c
-  Metronome\Metronome.h
-  MonotonicCounter\MonotonicCounter.c
-  MonotonicCounter\MonotonicCounter.h
-  RealTimeClock\RealTimeClock.c
-  RealTimeClock\RealTimeClock.h
-  Reset\Reset.c
-  Reset\Reset.h
-  Runtime\Runtime.c
-  Runtime\Runtime.h
-  Security\Security.c
-  Security\Security.h
-  StatusCode\StatusCode.c
-  StatusCode\StatusCode.h
-  Timer\Timer.c
-  Timer\Timer.h
-  Variable\Variable.c
-  Variable\Variable.h
-  VariableWrite\VariableWrite.c
-  VariableWrite\VariableWrite.h
-  WatchdogTimer\WatchdogTimer.c
-  WatchdogTimer\WatchdogTimer.h
+  Bds/Bds.c
+  Bds/Bds.h
+  Capsule/Capsule.c
+  Capsule/Capsule.h
+  Cpu/Cpu.c
+  Cpu/Cpu.h
+  Metronome/Metronome.c
+  Metronome/Metronome.h
+  MonotonicCounter/MonotonicCounter.c
+  MonotonicCounter/MonotonicCounter.h
+  RealTimeClock/RealTimeClock.c
+  RealTimeClock/RealTimeClock.h
+  Reset/Reset.c
+  Reset/Reset.h
+  Runtime/Runtime.c
+  Runtime/Runtime.h
+  Security/Security.c
+  Security/Security.h
+  StatusCode/StatusCode.c
+  StatusCode/StatusCode.h
+  Timer/Timer.c
+  Timer/Timer.h
+  Variable/Variable.c
+  Variable/Variable.h
+  VariableWrite/VariableWrite.c
+  VariableWrite/VariableWrite.h
+  WatchdogTimer/WatchdogTimer.c
+  WatchdogTimer/WatchdogTimer.h
 
 [includes.common]
-  $(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/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
 
 [nmake.common]
diff --git a/EdkCompatibilityPkg/Foundation/Cpu/Itanium/CpuIa64Lib/CpuIA64Lib.inf b/EdkCompatibilityPkg/Foundation/Cpu/Itanium/CpuIa64Lib/CpuIA64Lib.inf
index 62a3c49b0e..79daf9beb6 100644
--- a/EdkCompatibilityPkg/Foundation/Cpu/Itanium/CpuIa64Lib/CpuIA64Lib.inf
+++ b/EdkCompatibilityPkg/Foundation/Cpu/Itanium/CpuIa64Lib/CpuIA64Lib.inf
@@ -26,12 +26,12 @@ COMPONENT_TYPE  = LIBRARY
 [sources.common]
 
 [sources.ipf]
-  Ipf\CpuIA64.s
+  Ipf/CpuIa64.s
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation\Efi
+  $(EDK_SOURCE)/Foundation/Efi
   .
-  $(EDK_SOURCE)\Foundation\Cpu\Itanium\Include
-  $(EDK_SOURCE)\Foundation\include
+  $(EDK_SOURCE)/Foundation/Cpu/Itanium/Include
+  $(EDK_SOURCE)/Foundation/include
 
 [nmake.common]
diff --git a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib.inf b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib.inf
index 09a464b941..e6494bf943 100644
--- a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib.inf
+++ b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib.inf
@@ -27,16 +27,16 @@ COMPONENT_TYPE  = LIBRARY
   EfiCpuVersion.c
 
 [sources.ia32]
-  Ia32\CpuIA32.c
+  IA32/CpuIA32.c
 
 [sources.x64]
-  x64\Cpu.asm
+  x64/Cpu.asm
 [includes.common]
-  $(EDK_SOURCE)\Foundation\Efi
-  $(EDK_SOURCE)\Foundation\Efi\Include
-  $(EDK_SOURCE)\Foundation\Framework\Include
+  $(EDK_SOURCE)/Foundation/Efi
+  $(EDK_SOURCE)/Foundation/Efi/Include
+  $(EDK_SOURCE)/Foundation/Framework/Include
   .
-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include
-  $(EDK_SOURCE)\Foundation\Include
+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include
+  $(EDK_SOURCE)/Foundation/Include
 
 [nmake.common]
diff --git a/EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf b/EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf
index cd43d9d6a5..affab1155c 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf
@@ -24,36 +24,36 @@ BASE_NAME=   EfiGuidLib
 COMPONENT_TYPE=   LIBRARY
 
 [includes.common]
-  $(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\Include\Pei
-  $(EDK_SOURCE)\Foundation\Library\Pei\Include
+  $(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/Include/Pei
+  $(EDK_SOURCE)/Foundation/Library/Pei/Include
 
 [nmake.common]
 
 [sources.common]
-  Acpi\Acpi.h
-  Acpi\Acpi.c
-  DebugImageInfoTable\DebugImageInfoTable.h
-  DebugImageInfoTable\DebugImageInfoTable.c
-  EventGroup\EventGroup.h
-  EventGroup\EventGroup.c
-  GlobalVariable\GlobalVariable.h
-  GlobalVariable\GlobalVariable.c
-  Gpt\Gpt.h
-  Gpt\Gpt.c
-  HardwareErrorVariable\HardwareErrorVariable.h
-  HardwareErrorVariable\HardwareErrorVariable.c
-  Mps\Mps.h
-  Mps\Mps.c
-  PcAnsi\PcAnsi.h
-  PcAnsi\PcAnsi.c
-  SmBios\SmBios.h
-  SmBios\SmBios.c
+  Acpi/Acpi.h
+  Acpi/Acpi.c
+  DebugImageInfoTable/DebugImageInfoTable.h
+  DebugImageInfoTable/DebugImageInfoTable.c
+  EventGroup/EventGroup.h
+  EventGroup/EventGroup.c
+  GlobalVariable/GlobalVariable.h
+  GlobalVariable/GlobalVariable.c
+  Gpt/Gpt.h
+  Gpt/Gpt.c
+  HardwareErrorVariable/HardwareErrorVariable.h
+  HardwareErrorVariable/HardwareErrorVariable.c
+  Mps/Mps.h
+  Mps/Mps.c
+  PcAnsi/PcAnsi.h
+  PcAnsi/PcAnsi.c
+  SmBios/SmBios.h
+  SmBios/SmBios.c
 [sources.ipf]
-  SalSystemTable\SalSystemTable.h
-  SalSystemTable\SalSystemTable.c
+  SalSystemTable/SalSystemTable.h
+  SalSystemTable/SalSystemTable.c
diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiProtocolLib.inf b/EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiProtocolLib.inf
index 2de56acdb1..24f7212d17 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiProtocolLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiProtocolLib.inf
@@ -24,153 +24,153 @@ BASE_NAME=   EfiProtocolLib
 COMPONENT_TYPE=   LIBRARY
 
 [includes.common]
-  $(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\Include\Pei
-  $(EDK_SOURCE)\Foundation\Library\Pei\Include
-  $(EDK_SOURCE)\Foundation\Core\Dxe
-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include
+  $(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/Include/Pei
+  $(EDK_SOURCE)/Foundation/Library/Pei/Include
+  $(EDK_SOURCE)/Foundation/Core/Dxe
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
 
 [nmake.common]
 
 [sources.common]
-  AbsolutePointer\AbsolutePointer.h
-  AbsolutePointer\AbsolutePointer.c
-  AcpiTable\AcpiTable.h
-  AcpiTable\AcpiTable.c
-  Arp\Arp.h
-  Arp\Arp.c
-  Bis\Bis.h
-  Bis\Bis.c
-  BlockIo\BlockIo.h
-  BlockIo\BlockIo.c
-  BusSpecificDriverOverride\BusSpecificDriverOverride.h
-  BusSpecificDriverOverride\BusSpecificDriverOverride.c
-  ComponentName\ComponentName.h
-  ComponentName\ComponentName.c
-  ComponentName2\ComponentName2.h
-  ComponentName2\ComponentName2.c
-  DebugPort\DebugPort.h
-  DebugPort\DebugPort.c
-  DebugSupport\DebugSupport.h
-  DebugSupport\DebugSupport.c
-  Decompress\Decompress.h
-  Decompress\Decompress.c
-  DeviceIo\DeviceIo.h
-  DeviceIo\DeviceIo.c
-  DevicePath\DevicePath.h
-  DevicePath\DevicePath.c
-  DevicePathFromText\DevicePathFromText.h
-  DevicePathFromText\DevicePathFromText.c
-  DevicePathToText\DevicePathToText.h
-  DevicePathToText\DevicePathToText.c
-  DevicePathUtilities\DevicePathUtilities.h
-  DevicePathUtilities\DevicePathUtilities.c
-  Dhcp4\Dhcp4.h
-  Dhcp4\Dhcp4.c
-  DiskIo\DiskIo.h
-  DiskIo\DiskIo.c
-  DriverBinding\DriverBinding.h
-  DriverBinding\DriverBinding.c
-  DriverConfiguration\DriverConfiguration.h
-  DriverConfiguration\DriverConfiguration.c
-  DriverDiagnostics\DriverDiagnostics.h
-  DriverDiagnostics\DriverDiagnostics.c
-  Ebc\Ebc.h
-  Ebc\Ebc.c
-  EdidActive\EdidActive.h
-  EdidActive\EdidActive.c
-  EdidDiscovered\EdidDiscovered.h
-  EdidDiscovered\EdidDiscovered.c
-  EdidOverride\EdidOverride.h
-  EdidOverride\EdidOverride.c
-  EfiNetworkInterfaceIdentifier\EfiNetworkInterfaceIdentifier.h
-  EfiNetworkInterfaceIdentifier\EfiNetworkInterfaceIdentifier.c
-  FileInfo\FileInfo.h
-  FileInfo\FileInfo.c
-  FileSystemInfo\FileSystemInfo.h
-  FileSystemInfo\FileSystemInfo.c
-  FileSystemVolumeLabelInfo\FileSystemVolumeLabelInfo.h
-  FileSystemVolumeLabelInfo\FileSystemVolumeLabelInfo.c
-  FormBrowser2\FormBrowser2.h
-  FormBrowser2\FormBrowser2.c
-  GraphicsOutput\GraphicsOutput.h
-  GraphicsOutput\GraphicsOutput.c
-  HiiConfigAccess\HiiConfigAccess.h
-  HiiConfigAccess\HiiConfigAccess.c
-  HiiConfigRouting\HiiConfigRouting.h
-  HiiConfigRouting\HiiConfigRouting.c
-  HiiDatabase\HiiDatabase.h
-  HiiDatabase\HiiDatabase.c
-  HiiFont\HiiFont.h
-  HiiFont\HiiFont.c
-  HiiImage\HiiImage.h
-  HiiImage\HiiImage.c
-  HiiString\HiiString.h
-  HiiString\HiiString.c  
-  Ip4\Ip4.h
-  Ip4\Ip4.c
-  Ip4Config\Ip4Config.h
-  Ip4Config\Ip4Config.c
-  LoadedImage\LoadedImage.h
-  LoadedImage\LoadedImage.c
-  LoadFile\LoadFile.h
-  LoadFile\LoadFile.c
-  ManagedNetwork\ManagedNetwork.h
-  ManagedNetwork\ManagedNetwork.c
-  Mtftp4\Mtftp4.h
-  Mtftp4\Mtftp4.c
-  PciIo\PciIo.h
-  PciIo\PciIo.c
-  PciRootBridgeIo\PciRootBridgeIo.h
-  PciRootBridgeIo\PciRootBridgeIo.c
-  PlatformDriverOverride\PlatformDriverOverride.h
-  PlatformDriverOverride\PlatformDriverOverride.c
-  PxeBaseCode\PxeBaseCode.h
-  PxeBaseCode\PxeBaseCode.c
-  PxeBaseCodeCallBack\PxeBaseCodeCallBack.h
-  PxeBaseCodeCallBack\PxeBaseCodeCallBack.c
-  ScsiPassThru\ScsiPassThru.h
-  ScsiPassThru\ScsiPassThru.c
-  SerialIo\SerialIo.h
-  SerialIo\SerialIo.c
-  SimpleFileSystem\SimpleFileSystem.h
-  SimpleFileSystem\SimpleFileSystem.c
-  SimpleNetwork\SimpleNetwork.h
-  SimpleNetwork\SimpleNetwork.c
-  SimplePointer\SimplePointer.h
-  SimplePointer\SimplePointer.c
-  SimpleTextIn\SimpleTextIn.h
-  SimpleTextIn\SimpleTextIn.c
-  SimpleTextInputEx\SimpleTextInputEx.h
-  SimpleTextInputEx\SimpleTextInputEx.c  
-  SimpleTextOut\SimpleTextOut.h
-  SimpleTextOut\SimpleTextOut.c
-  Udp4\Udp4.h
-  Udp4\Udp4.c
-  UgaDraw\UgaDraw.h
-  UgaDraw\UgaDraw.c
-  UgaIo\UgaIo.h
-  UgaIo\UgaIo.c
-  UnicodeCollation\UnicodeCollation.h
-  UnicodeCollation\UnicodeCollation.c
-  UsbHostController\UsbHostController.h
-  UsbHostController\UsbHostController.c
-  UsbIo\UsbIo.h
-  UsbIo\UsbIo.c
-  Hash\Hash.h
-  Hash\Hash.c
-  ServiceBinding\ServiceBinding.h
-  ScsiPassThruExt\ScsiPassThruExt.h
-  ScsiPassThruExt\ScsiPassThruExt.c
-  ScsiIo\ScsiIo.h
-  ScsiIo\ScsiIo.c
-  TapeIo\TapeIo.h
-  TapeIo\TapeIo.c
-  Tcp4\Tcp4.h
-  Tcp4\Tcp4.c
-  IScsiInitiatorName\IScsiInitiatorName.h
-  IScsiInitiatorName\IScsiInitiatorName.c
-\ No newline at end of file
+  AbsolutePointer/AbsolutePointer.h
+  AbsolutePointer/AbsolutePointer.c
+  AcpiTable/AcpiTable.h
+  AcpiTable/AcpiTable.c
+  Arp/Arp.h
+  Arp/Arp.c
+  Bis/Bis.h
+  Bis/Bis.c
+  BlockIo/BlockIo.h
+  BlockIo/BlockIo.c
+  BusSpecificDriverOverride/BusSpecificDriverOverride.h
+  BusSpecificDriverOverride/BusSpecificDriverOverride.c
+  ComponentName/ComponentName.h
+  ComponentName/ComponentName.c
+  ComponentName2/ComponentName2.h
+  ComponentName2/ComponentName2.c
+  DebugPort/DebugPort.h
+  DebugPort/DebugPort.c
+  DebugSupport/DebugSupport.h
+  DebugSupport/DebugSupport.c
+  Decompress/Decompress.h
+  Decompress/Decompress.c
+  DeviceIo/DeviceIo.h
+  DeviceIo/DeviceIo.c
+  DevicePath/DevicePath.h
+  DevicePath/DevicePath.c
+  DevicePathFromText/DevicePathFromText.h
+  DevicePathFromText/DevicePathFromText.c
+  DevicePathToText/DevicePathToText.h
+  DevicePathToText/DevicePathToText.c
+  DevicePathUtilities/DevicePathUtilities.h
+  DevicePathUtilities/DevicePathUtilities.c
+  Dhcp4/Dhcp4.h
+  Dhcp4/Dhcp4.c
+  DiskIo/DiskIo.h
+  DiskIo/DiskIo.c
+  DriverBinding/DriverBinding.h
+  DriverBinding/DriverBinding.c
+  DriverConfiguration/DriverConfiguration.h
+  DriverConfiguration/DriverConfiguration.c
+  DriverDiagnostics/DriverDiagnostics.h
+  DriverDiagnostics/DriverDiagnostics.c
+  Ebc/Ebc.h
+  Ebc/Ebc.c
+  EdidActive/EdidActive.h
+  EdidActive/EdidActive.c
+  EdidDiscovered/EdidDiscovered.h
+  EdidDiscovered/EdidDiscovered.c
+  EdidOverride/EdidOverride.h
+  EdidOverride/EdidOverride.c
+  EfiNetworkInterfaceIdentifier/EfiNetworkInterfaceIdentifier.h
+  EfiNetworkInterfaceIdentifier/EfiNetworkInterfaceIdentifier.c
+  FileInfo/FileInfo.h
+  FileInfo/FileInfo.c
+  FileSystemInfo/FileSystemInfo.h
+  FileSystemInfo/FileSystemInfo.c
+  FileSystemVolumeLabelInfo/FileSystemVolumeLabelInfo.h
+  FileSystemVolumeLabelInfo/FileSystemVolumeLabelInfo.c
+  FormBrowser2/FormBrowser2.h
+  FormBrowser2/FormBrowser2.c
+  GraphicsOutput/GraphicsOutput.h
+  GraphicsOutput/GraphicsOutput.c
+  HiiConfigAccess/HiiConfigAccess.h
+  HiiConfigAccess/HiiConfigAccess.c
+  HiiConfigRouting/HiiConfigRouting.h
+  HiiConfigRouting/HiiConfigRouting.c
+  HiiDatabase/HiiDatabase.h
+  HiiDatabase/HiiDatabase.c
+  HiiFont/HiiFont.h
+  HiiFont/HiiFont.c
+  HiiImage/HiiImage.h
+  HiiImage/HiiImage.c
+  HiiString/HiiString.h
+  HiiString/HiiString.c  
+  Ip4/Ip4.h
+  Ip4/Ip4.c
+  Ip4Config/Ip4Config.h
+  Ip4Config/Ip4Config.c
+  LoadedImage/LoadedImage.h
+  LoadedImage/LoadedImage.c
+  LoadFile/LoadFile.h
+  LoadFile/LoadFile.c
+  ManagedNetwork/ManagedNetwork.h
+  ManagedNetwork/ManagedNetwork.c
+  Mtftp4/Mtftp4.h
+  Mtftp4/Mtftp4.c
+  PciIo/PciIo.h
+  PciIo/PciIo.c
+  PciRootBridgeIo/PciRootBridgeIo.h
+  PciRootBridgeIo/PciRootBridgeIo.c
+  PlatformDriverOverride/PlatformDriverOverride.h
+  PlatformDriverOverride/PlatformDriverOverride.c
+  PxeBaseCode/PxeBaseCode.h
+  PxeBaseCode/PxeBaseCode.c
+  PxeBaseCodeCallBack/PxeBaseCodeCallBack.h
+  PxeBaseCodeCallBack/PxeBaseCodeCallBack.c
+  ScsiPassThru/ScsiPassThru.h
+  ScsiPassThru/ScsiPassThru.c
+  SerialIo/SerialIo.h
+  SerialIo/SerialIo.c
+  SimpleFileSystem/SimpleFileSystem.h
+  SimpleFileSystem/SimpleFileSystem.c
+  SimpleNetwork/SimpleNetwork.h
+  SimpleNetwork/SimpleNetwork.c
+  SimplePointer/SimplePointer.h
+  SimplePointer/SimplePointer.c
+  SimpleTextIn/SimpleTextIn.h
+  SimpleTextIn/SimpleTextIn.c
+  SimpleTextInputEx/SimpleTextInputEx.h
+  SimpleTextInputEx/SimpleTextInputEx.c  
+  SimpleTextOut/SimpleTextOut.h
+  SimpleTextOut/SimpleTextOut.c
+  Udp4/Udp4.h
+  Udp4/Udp4.c
+  UgaDraw/UgaDraw.h
+  UgaDraw/UgaDraw.c
+  UgaIo/UgaIo.h
+  UgaIo/UgaIo.c
+  UnicodeCollation/UnicodeCollation.h
+  UnicodeCollation/UnicodeCollation.c
+  UsbHostController/UsbHostController.h
+  UsbHostController/UsbHostController.c
+  UsbIo/UsbIo.h
+  UsbIo/UsbIo.c
+  Hash/Hash.h
+  Hash/Hash.c
+  ServiceBinding/ServiceBinding.h
+  ScsiPassThruExt/ScsiPassThruExt.h
+  ScsiPassThruExt/ScsiPassThruExt.c
+  ScsiIo/ScsiIo.h
+  ScsiIo/ScsiIo.c
+  TapeIo/TapeIo.h
+  TapeIo/TapeIo.c
+  Tcp4/Tcp4.h
+  Tcp4/Tcp4.c
+  IScsiInitiatorName/IScsiInitiatorName.h
+  IScsiInitiatorName/IScsiInitiatorName.c
+\ No newline at end of file
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.inf b/EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.inf
index f3c2b74602..fe6937be0b 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.inf
@@ -24,40 +24,40 @@ BASE_NAME=   EdkFrameworkGuidLib
 COMPONENT_TYPE=   LIBRARY
 
 [includes.common]
-  $(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\Include\Pei
-  $(EDK_SOURCE)\Foundation\Library\Pei\Include
+  $(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/Include/Pei
+  $(EDK_SOURCE)/Foundation/Library/Pei/Include
   
 [nmake.common]
 
 [sources.common]
-  AcpiTableStorage\AcpiTableStorage.h
-  AcpiTableStorage\AcpiTableStorage.c
-  Apriori\Apriori.h
-  Apriori\Apriori.c
-  DataHubRecords\DataHubRecords.h
-  DataHubRecords\DataHubRecords.c  
-  DxeServices\DxeServices.h
-  DxeServices\DxeServices.c
-  FirmwareFileSystem\FirmwareFileSystem.h
-  FirmwareFileSystem\FirmwareFileSystem.c
-  Hob\Hob.h
-  Hob\Hob.c
-  MemoryAllocationHob\MemoryAllocationHob.c
-  MemoryAllocationHob\MemoryAllocationHob.h
-  SmramMemoryReserve\SmramMemoryReserve.h
-  SmramMemoryReserve\SmramMemoryReserve.c
-  StatusCodeDataTypeId\StatusCodeDataTypeId.h
-  StatusCodeDataTypeId\StatusCodeDataTypeId.c
-  FrameworkDevicePath\FrameworkDevicePath.h
-  FrameworkDevicePath\FrameworkDevicePath.c
-  FirmwareFileSystem2\FirmwareFileSystem2.h
-  FirmwareFileSystem2\FirmwareFileSystem2.c
-  PeiApriori\PeiApriori.h
-  PeiApriori\PeiApriori.c
+  AcpiTableStorage/AcpiTableStorage.h
+  AcpiTableStorage/AcpiTableStorage.c
+  Apriori/Apriori.h
+  Apriori/Apriori.c
+  DataHubRecords/DataHubRecords.h
+  DataHubRecords/DataHubRecords.c  
+  DxeServices/DxeServices.h
+  DxeServices/DxeServices.c
+  FirmwareFileSystem/FirmwareFileSystem.h
+  FirmwareFileSystem/FirmwareFileSystem.c
+  Hob/Hob.h
+  Hob/Hob.c
+  MemoryAllocationHob/MemoryAllocationHob.c
+  MemoryAllocationHob/MemoryAllocationHob.h
+  SmramMemoryReserve/SmramMemoryReserve.h
+  SmramMemoryReserve/SmramMemoryReserve.c
+  StatusCodeDataTypeId/StatusCodeDataTypeId.h
+  StatusCodeDataTypeId/StatusCodeDataTypeId.c
+  FrameworkDevicePath/FrameworkDevicePath.h
+  FrameworkDevicePath/FrameworkDevicePath.c
+  FirmwareFileSystem2/FirmwareFileSystem2.h
+  FirmwareFileSystem2/FirmwareFileSystem2.c
+  PeiApriori/PeiApriori.h
+  PeiApriori/PeiApriori.c
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/EdkFrameworkPpiLib.inf b/EdkCompatibilityPkg/Foundation/Framework/Ppi/EdkFrameworkPpiLib.inf
index f39c93ccc8..438bbffbf3 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/EdkFrameworkPpiLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/EdkFrameworkPpiLib.inf
@@ -24,79 +24,79 @@ BASE_NAME=   EdkFrameworkPpiLib
 COMPONENT_TYPE=   LIBRARY
 
 [includes.common]
-  $(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\Include\Pei
-  $(EDK_SOURCE)\Foundation\Library\Pei\Include
-  $(EDK_SOURCE)\Foundation\Core\Dxe
-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include
+  $(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/Include/Pei
+  $(EDK_SOURCE)/Foundation/Library/Pei/Include
+  $(EDK_SOURCE)/Foundation/Core/Dxe
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
 
 [nmake.common]
 
 [sources.common]
-    BlockIo\BlockIo.h
-    BlockIo\BlockIo.c
-    BootInRecoveryMode\BootInRecoveryMode.h
-    BootInRecoveryMode\BootInRecoveryMode.c
-    BootMode\BootMode.h
-    BootMode\BootMode.c
-    BootScriptExecuter\BootScriptExecuter.h
-    BootScriptExecuter\BootScriptExecuter.c    
-    CpuIo\CpuIo.h
-    CpuIo\CpuIo.c
-    DeviceRecoveryModule\DeviceRecoveryModule.h
-    DeviceRecoveryModule\DeviceRecoveryModule.c    
-    DxeIpl\DxeIpl.h
-    DxeIpl\DxeIpl.c
-    EndOfPeiSignal\EndOfPeiSignal.h
-    EndOfPeiSignal\EndOfPeiSignal.c
-    FindFv\FindFv.h
-    FindFv\FindFv.c
-    LoadFile\LoadFile.h
-    LoadFile\LoadFile.c
-    MemoryDiscovered\MemoryDiscovered.h
-    MemoryDiscovered\MemoryDiscovered.c
-    PciCfg\PciCfg.h
-    PciCfg\PciCfg.c
-    PciCfg2\PciCfg2.h
-    PciCfg2\PciCfg2.c
-    RecoveryModule\RecoveryModule.h
-    RecoveryModule\RecoveryModule.c
-    Reset\Reset.h
-    Reset\Reset.c
-    S3Resume\S3Resume.h
-    S3Resume\S3Resume.c
-    SecPlatformInformation\SecPlatformInformation.h
-    SecPlatformInformation\SecPlatformInformation.c
-    SectionExtraction\SectionExtraction.h
-    SectionExtraction\SectionExtraction.c
-    Security\Security.h
-    Security\Security.c
-    Smbus\Smbus.h
-    Smbus\Smbus.c
-    Smbus2\Smbus2.h
-    Smbus2\Smbus2.c
-    Stall\Stall.h
-    Stall\Stall.c
-    StatusCode\StatusCode.h
-    StatusCode\StatusCode.c
-    Variable\Variable.h
-    Variable\Variable.c
-    Variable2\Variable2.h
-    Variable2\Variable2.c
-    Decompress\Decompress.h
-    Decompress\Decompress.c
-    FirmwareVolumeInfo\FirmwareVolumeInfo.h
-    FirmwareVolumeInfo\FirmwareVolumeInfo.c
-    LoadFile2\LoadFile2.h
-    LoadFile2\LoadFile2.c
-    Security2\Security2.h
-    Security2\Security2.c
-    FirmwareVolume\FirmwareVolume.h
-    FirmwareVolume\FirmwareVolume.c
-    GuidedSectionExtraction\GuidedSectionExtraction.h
-    GuidedSectionExtraction\GuidedSectionExtraction.c
+    BlockIo/BlockIo.h
+    BlockIo/BlockIo.c
+    BootInRecoveryMode/BootInRecoveryMode.h
+    BootInRecoveryMode/BootInRecoveryMode.c
+    BootMode/BootMode.h
+    BootMode/BootMode.c
+    BootScriptExecuter/BootScriptExecuter.h
+    BootScriptExecuter/BootScriptExecuter.c    
+    CpuIo/CpuIo.h
+    CpuIo/CpuIo.c
+    DeviceRecoveryModule/DeviceRecoveryModule.h
+    DeviceRecoveryModule/DeviceRecoveryModule.c    
+    DxeIpl/DxeIpl.h
+    DxeIpl/DxeIpl.c
+    EndOfPeiSignal/EndOfPeiSignal.h
+    EndOfPeiSignal/EndOfPeiSignal.c
+    FindFv/FindFv.h
+    FindFv/FindFv.c
+    LoadFile/LoadFile.h
+    LoadFile/LoadFile.c
+    MemoryDiscovered/MemoryDiscovered.h
+    MemoryDiscovered/MemoryDiscovered.c
+    PciCfg/PciCfg.h
+    PciCfg/PciCfg.c
+    PciCfg2/PciCfg2.h
+    PciCfg2/PciCfg2.c
+    RecoveryModule/RecoveryModule.h
+    RecoveryModule/RecoveryModule.c
+    Reset/Reset.h
+    Reset/Reset.c
+    S3Resume/S3Resume.h
+    S3Resume/S3Resume.c
+    SecPlatformInformation/SecPlatformInformation.h
+    SecPlatformInformation/SecPlatformInformation.c
+    SectionExtraction/SectionExtraction.h
+    SectionExtraction/SectionExtraction.c
+    Security/Security.h
+    Security/Security.c
+    Smbus/Smbus.h
+    Smbus/Smbus.c
+    Smbus2/Smbus2.h
+    Smbus2/Smbus2.c
+    Stall/Stall.h
+    Stall/Stall.c
+    StatusCode/StatusCode.h
+    StatusCode/StatusCode.c
+    Variable/Variable.h
+    Variable/Variable.c
+    Variable2/Variable2.h
+    Variable2/Variable2.c
+    Decompress/Decompress.h
+    Decompress/Decompress.c
+    FirmwareVolumeInfo/FirmwareVolumeInfo.h
+    FirmwareVolumeInfo/FirmwareVolumeInfo.c
+    LoadFile2/LoadFile2.h
+    LoadFile2/LoadFile2.c
+    Security2/Security2.h
+    Security2/Security2.c
+    FirmwareVolume/FirmwareVolume.h
+    FirmwareVolume/FirmwareVolume.c
+    GuidedSectionExtraction/GuidedSectionExtraction.h
+    GuidedSectionExtraction/GuidedSectionExtraction.c
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/EdkFrameworkProtocolLib.inf b/EdkCompatibilityPkg/Foundation/Framework/Protocol/EdkFrameworkProtocolLib.inf
index 8950b77116..43fa06498a 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/EdkFrameworkProtocolLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/EdkFrameworkProtocolLib.inf
@@ -24,93 +24,93 @@ BASE_NAME=   EdkFrameworkProtocolLib
 COMPONENT_TYPE=   LIBRARY
 
 [includes.common]
-  $(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\Include\Pei
-  $(EDK_SOURCE)\Foundation\Library\Pei\Include
-  $(EDK_SOURCE)\Foundation\Core\Dxe
-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include
+  $(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/Include/Pei
+  $(EDK_SOURCE)/Foundation/Library/Pei/Include
+  $(EDK_SOURCE)/Foundation/Core/Dxe
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
 
 [nmake.common]
 
 [sources.common]
-  AcpiS3Save\AcpiS3Save.h
-  AcpiS3Save\AcpiS3Save.c
-  AcpiSupport\AcpiSupport.h
-  AcpiSupport\AcpiSupport.c
-  BootScriptSave\BootScriptSave.h
-  BootScriptSave\BootScriptSave.c
-  CpuIo\CpuIo.h
-  CpuIo\CpuIo.c
-  DataHub\DataHub.h
-  DataHub\DataHub.c
-  FirmwareVolume\FirmwareVolume.h
-  FirmwareVolume\FirmwareVolume.c
-  FirmwareVolume2\FirmwareVolume2.h
-  FirmwareVolume2\FirmwareVolume2.c
-  FirmwareVolumeBlock\FirmwareVolumeBlock.h
-  FirmwareVolumeBlock\FirmwareVolumeBlock.c
-  FormBrowser\FormBrowser.h
-  FormBrowser\FormBrowser.c
-  FormCallback\FormCallback.h
-  FormCallback\FormCallback.c
-  Hii\Hii.h
-  Hii\Hii.c
-  IdeControllerInit\IdeControllerInit.h
-  IdeControllerInit\IdeControllerInit.c
-  IncompatiblePciDeviceSupport\IncompatiblePciDeviceSupport.h
-  IncompatiblePciDeviceSupport\IncompatiblePciDeviceSupport.c
-  Legacy8259\Legacy8259.h
-  Legacy8259\Legacy8259.c
-  LegacyBios\LegacyBios.h
-  LegacyBios\LegacyBios.c
-  LegacyBiosPlatform\LegacyBiosPlatform.h
-  LegacyBiosPlatform\LegacyBiosPlatform.c
-  LegacyInterrupt\LegacyInterrupt.h
-  LegacyInterrupt\LegacyInterrupt.c
-  LegacyRegion\LegacyRegion.h
-  LegacyRegion\LegacyRegion.c
-  PciHostBridgeResourceAllocation\PciHostBridgeResourceAllocation.h
-  PciHostBridgeResourceAllocation\PciHostBridgeResourceAllocation.c
-  PciHotPlugInit\PciHotPlugInit.h
-  PciHotPlugInit\PciHotPlugInit.c
-  PciPlatform\PciPlatform.h
-  PciPlatform\PciPlatform.c
-  SectionExtraction\SectionExtraction.h
-  SectionExtraction\SectionExtraction.c
-  SecurityPolicy\SecurityPolicy.h
-  SecurityPolicy\SecurityPolicy.c
-  Smbus\Smbus.h
-  Smbus\Smbus.c
+  AcpiS3Save/AcpiS3Save.h
+  AcpiS3Save/AcpiS3Save.c
+  AcpiSupport/AcpiSupport.h
+  AcpiSupport/AcpiSupport.c
+  BootScriptSave/BootScriptSave.h
+  BootScriptSave/BootScriptSave.c
+  CpuIo/CpuIo.h
+  CpuIo/CpuIo.c
+  DataHub/DataHub.h
+  DataHub/DataHub.c
+  FirmwareVolume/FirmwareVolume.h
+  FirmwareVolume/FirmwareVolume.c
+  FirmwareVolume2/FirmwareVolume2.h
+  FirmwareVolume2/FirmwareVolume2.c
+  FirmwareVolumeBlock/FirmwareVolumeBlock.h
+  FirmwareVolumeBlock/FirmwareVolumeBlock.c
+  FormBrowser/FormBrowser.h
+  FormBrowser/FormBrowser.c
+  FormCallback/FormCallback.h
+  FormCallback/FormCallback.c
+  Hii/Hii.h
+  Hii/Hii.c
+  IdeControllerInit/IdeControllerInit.h
+  IdeControllerInit/IdeControllerInit.c
+  IncompatiblePciDeviceSupport/IncompatiblePciDeviceSupport.h
+  IncompatiblePciDeviceSupport/IncompatiblePciDeviceSupport.c
+  Legacy8259/Legacy8259.h
+  Legacy8259/Legacy8259.c
+  LegacyBios/LegacyBios.h
+  LegacyBios/LegacyBios.c
+  LegacyBiosPlatform/LegacyBiosPlatform.h
+  LegacyBiosPlatform/LegacyBiosPlatform.c
+  LegacyInterrupt/LegacyInterrupt.h
+  LegacyInterrupt/LegacyInterrupt.c
+  LegacyRegion/LegacyRegion.h
+  LegacyRegion/LegacyRegion.c
+  PciHostBridgeResourceAllocation/PciHostBridgeResourceAllocation.h
+  PciHostBridgeResourceAllocation/PciHostBridgeResourceAllocation.c
+  PciHotPlugInit/PciHotPlugInit.h
+  PciHotPlugInit/PciHotPlugInit.c
+  PciPlatform/PciPlatform.h
+  PciPlatform/PciPlatform.c
+  SectionExtraction/SectionExtraction.h
+  SectionExtraction/SectionExtraction.c
+  SecurityPolicy/SecurityPolicy.h
+  SecurityPolicy/SecurityPolicy.c
+  Smbus/Smbus.h
+  Smbus/Smbus.c
 
 [sources.ia32,sources.x64]
-  SmmAccess\SmmAccess.h
-  SmmAccess\SmmAccess.c
-  SmmBase\SmmBase.h
-  SmmBase\SmmBase.c
-  SmmControl\SmmControl.h
-  SmmControl\SmmControl.c
-  SmmCpuState\SmmCpuState.h
-  SmmCpuState\SmmCpuState.c
-  SmmGpiDispatch\SmmGpiDispatch.h
-  SmmGpiDispatch\SmmGpiDispatch.c
-  SmmIchnDispatch\SmmIchnDispatch.h
-  SmmIchnDispatch\SmmIchnDispatch.c
-  SmmPeriodicTimerDispatch\SmmPeriodicTimerDispatch.h
-  SmmPeriodicTimerDispatch\SmmPeriodicTimerDispatch.c
-  SmmPowerButtonDispatch\SmmPowerButtonDispatch.h
-  SmmPowerButtonDispatch\SmmPowerButtonDispatch.c
-  SmmStandbyButtonDispatch\SmmStandbyButtonDispatch.h
-  SmmStandbyButtonDispatch\SmmStandbyButtonDispatch.c
-  SmmStatusCode\SmmStatusCode.h
-  SmmStatusCode\SmmStatusCode.c
-  SmmSwDispatch\SmmSwDispatch.h
-  SmmSwDispatch\SmmSwDispatch.c
-  SmmSxDispatch\SmmSxDispatch.h
-  SmmSxDispatch\SmmSxDispatch.c
-  SmmUsbDispatch\SmmUsbDispatch.h
-  SmmUsbDispatch\SmmUsbDispatch.c  
-\ No newline at end of file
+  SmmAccess/SmmAccess.h
+  SmmAccess/SmmAccess.c
+  SmmBase/SmmBase.h
+  SmmBase/SmmBase.c
+  SmmControl/SmmControl.h
+  SmmControl/SmmControl.c
+  SmmCpuState/SmmCpuState.h
+  SmmCpuState/SmmCpuState.c
+  SmmGpiDispatch/SmmGpiDispatch.h
+  SmmGpiDispatch/SmmGpiDispatch.c
+  SmmIchnDispatch/SmmIchnDispatch.h
+  SmmIchnDispatch/SmmIchnDispatch.c
+  SmmPeriodicTimerDispatch/SmmPeriodicTimerDispatch.h
+  SmmPeriodicTimerDispatch/SmmPeriodicTimerDispatch.c
+  SmmPowerButtonDispatch/SmmPowerButtonDispatch.h
+  SmmPowerButtonDispatch/SmmPowerButtonDispatch.c
+  SmmStandbyButtonDispatch/SmmStandbyButtonDispatch.h
+  SmmStandbyButtonDispatch/SmmStandbyButtonDispatch.c
+  SmmStatusCode/SmmStatusCode.h
+  SmmStatusCode/SmmStatusCode.c
+  SmmSwDispatch/SmmSwDispatch.h
+  SmmSwDispatch/SmmSwDispatch.c
+  SmmSxDispatch/SmmSxDispatch.h
+  SmmSxDispatch/SmmSxDispatch.c
+  SmmUsbDispatch/SmmUsbDispatch.h
+  SmmUsbDispatch/SmmUsbDispatch.c  
+\ No newline at end of file
diff --git a/EdkCompatibilityPkg/Foundation/Guid/EdkGuidLib.inf b/EdkCompatibilityPkg/Foundation/Guid/EdkGuidLib.inf
index c9465c50ec..9f47d5124b 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/EdkGuidLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Guid/EdkGuidLib.inf
@@ -23,76 +23,76 @@ BASE_NAME=   EdkGuidLib
 COMPONENT_TYPE=   LIBRARY
 
 [includes.common]
-  $(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
+  $(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)
-  $(EDK_SOURCE)\Foundation\Core\Dxe
-  $(EDK_SOURCE)\Foundation\Include\Pei
-  $(EDK_SOURCE)\Foundation\Library\Pei\Include
+  $(EDK_SOURCE)/Foundation/Core/Dxe
+  $(EDK_SOURCE)/Foundation/Include/Pei
+  $(EDK_SOURCE)/Foundation/Library/Pei/Include
     
 [nmake.common]
 
 [sources.common]
-  AcpiDescription\AcpiDescription.h
-  AcpiDescription\AcpiDescription.c
-  AlternateFvBlock\AlternateFvBlock.h
-  AlternateFvBlock\AlternateFvBlock.c
-  Bmp\Bmp.h
-  Bmp\Bmp.c
-  BootState\BootState.h
-  BootState\BootState.c
-  Capsule\Capsule.h
-  Capsule\Capsule.c
-  CompatibleMemoryTested\CompatibleMemoryTested.h
-  CompatibleMemoryTested\CompatibleMemoryTested.c
-  ConsoleInDevice\ConsoleInDevice.h
-  ConsoleInDevice\ConsoleInDevice.c
-  ConsoleOutDevice\ConsoleOutDevice.h
-  ConsoleOutDevice\ConsoleOutDevice.c
-  EfiShell\EfiShell.h
-  EfiShell\EfiShell.c
-  FlashMapHob\FlashMapHob.h
-  FlashMapHob\FlashMapHob.c
-  HotPlugDevice\HotPlugDevice.h
-  HotPlugDevice\HotPlugDevice.c
-  IoBaseHob\IoBaseHob.h
-  IoBaseHob\IoBaseHob.c
-  MemoryTypeInformation\MemoryTypeInformation.h
-  MemoryTypeInformation\MemoryTypeInformation.c
-  PciHotPlugDevice\PciHotPlugDevice.h
-  PciHotPlugDevice\PciHotPlugDevice.c
-  PciOptionRomTable\PciOptionRomTable.h
-  PciOptionRomTable\PciOptionRomTable.c
-  PciExpressBaseAddress\PciExpressBaseAddress.h
-  PciExpressBaseAddress\PciExpressBaseAddress.c
-  PeiFlushInstructionCache\PeiFlushInstructionCache.h
-  PeiFlushInstructionCache\PeiFlushInstructionCache.c
-  PeiPeCoffLoader\PeiPeCoffLoader.h
-  PeiPeCoffLoader\PeiPeCoffLoader.c
-  PeiPerformanceHob\PeiPerformanceHob.h
-  PeiPerformanceHob\PeiPerformanceHob.c
-  PeiTransferControl\PeiTransferControl.h
-  PeiTransferControl\PeiTransferControl.c
-  PrimaryConsoleInDevice\PrimaryConsoleInDevice.h
-  PrimaryConsoleInDevice\PrimaryConsoleInDevice.c
-  PrimaryConsoleOutDevice\PrimaryConsoleOutDevice.h
-  PrimaryConsoleOutDevice\PrimaryConsoleOutDevice.c
-  PrimaryStandardErrorDevice\PrimaryStandardErrorDevice.h
-  PrimaryStandardErrorDevice\PrimaryStandardErrorDevice.c
-  StandardErrorDevice\StandardErrorDevice.h
-  StandardErrorDevice\StandardErrorDevice.c
-  StatusCode\StatusCode.h
-  StatusCode\StatusCode.c
-  StatusCodeCallerId\StatusCodeCallerId.h
-  StatusCodeCallerId\StatusCodeCallerId.c
-  SystemNvDataGuid\SystemNvDataGuid.h
-  SystemNvDataGuid\SystemNvDataGuid.c
-  EventLegacyBios\EventLegacyBios.h
-  EventLegacyBios\EventLegacyBios.c
-  GenericVariable\GenericVariable.h
-  GenericVariable\GenericVariable.c
-\ No newline at end of file
+  AcpiDescription/AcpiDescription.h
+  AcpiDescription/AcpiDescription.c
+  AlternateFvBlock/AlternateFvBlock.h
+  AlternateFvBlock/AlternateFvBlock.c
+  Bmp/Bmp.h
+  Bmp/Bmp.c
+  BootState/BootState.h
+  BootState/BootState.c
+  Capsule/Capsule.h
+  Capsule/Capsule.c
+  CompatibleMemoryTested/CompatibleMemoryTested.h
+  CompatibleMemoryTested/CompatibleMemoryTested.c
+  ConsoleInDevice/ConsoleInDevice.h
+  ConsoleInDevice/ConsoleInDevice.c
+  ConsoleOutDevice/ConsoleOutDevice.h
+  ConsoleOutDevice/ConsoleOutDevice.c
+  EfiShell/EfiShell.h
+  EfiShell/EfiShell.c
+  FlashMapHob/FlashMapHob.h
+  FlashMapHob/FlashMapHob.c
+  HotPlugDevice/HotPlugDevice.h
+  HotPlugDevice/HotPlugDevice.c
+  IoBaseHob/IoBaseHob.h
+  IoBaseHob/IoBaseHob.c
+  MemoryTypeInformation/MemoryTypeInformation.h
+  MemoryTypeInformation/MemoryTypeInformation.c
+  PciHotPlugDevice/PciHotPlugDevice.h
+  PciHotPlugDevice/PciHotPlugDevice.c
+  PciOptionRomTable/PciOptionRomTable.h
+  PciOptionRomTable/PciOptionRomTable.c
+  PciExpressBaseAddress/PciExpressBaseAddress.h
+  PciExpressBaseAddress/PciExpressBaseAddress.c
+  PeiFlushInstructionCache/PeiFlushInstructionCache.h
+  PeiFlushInstructionCache/PeiFlushInstructionCache.c
+  PeiPeCoffLoader/PeiPeCoffLoader.h
+  PeiPeCoffLoader/PeiPeCoffLoader.c
+  PeiPerformanceHob/PeiPerformanceHob.h
+  PeiPerformanceHob/PeiPerformanceHob.c
+  PeiTransferControl/PeiTransferControl.h
+  PeiTransferControl/PeiTransferControl.c
+  PrimaryConsoleInDevice/PrimaryConsoleInDevice.h
+  PrimaryConsoleInDevice/PrimaryConsoleInDevice.c
+  PrimaryConsoleOutDevice/PrimaryConsoleOutDevice.h
+  PrimaryConsoleOutDevice/PrimaryConsoleOutDevice.c
+  PrimaryStandardErrorDevice/PrimaryStandardErrorDevice.h
+  PrimaryStandardErrorDevice/PrimaryStandardErrorDevice.c
+  StandardErrorDevice/StandardErrorDevice.h
+  StandardErrorDevice/StandardErrorDevice.c
+  StatusCode/StatusCode.h
+  StatusCode/StatusCode.c
+  StatusCodeCallerId/StatusCodeCallerId.h
+  StatusCodeCallerId/StatusCodeCallerId.c
+  SystemNvDataGuid/SystemNvDataGuid.h
+  SystemNvDataGuid/SystemNvDataGuid.c
+  EventLegacyBios/EventLegacyBios.h
+  EventLegacyBios/EventLegacyBios.c
+  GenericVariable/GenericVariable.h
+  GenericVariable/GenericVariable.c
+\ No newline at end of file
diff --git a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf
index aeb80b8e7e..d1ebfc9441 100644
--- a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf
@@ -26,36 +26,36 @@ COMPONENT_TYPE  = LIBRARY
 [sources.common] 
 
 [sources.ia32]
-  Ia32\memcpyRep1.asm
-  Ia32\memsetRep4.asm
-#  Ia32\memcpy.asm
-#  Ia32\memset.asm
+  Ia32/memcpyRep1.asm
+  Ia32/memsetRep4.asm
+#  Ia32/memcpy.asm
+#  Ia32/memset.asm
   
 [sources.x64]  
-  x64\memcpyRep1.asm
-  x64\memsetRep4.asm
-#  x64\memcpy.asm
-#  x64\memset.asm
+  x64/memcpyRep1.asm
+  x64/memsetRep4.asm
+#  x64/memcpy.asm
+#  x64/memset.asm
   
 [sources.Ipf]  
   memcpy.c
   memset.c
   
 [includes.common]
-  $(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
+  $(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)
-  $(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\Ppi\CpuIo
-  $(EDK_SOURCE)\Foundation\Framework
+  $(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/Ppi/CpuIo
+  $(EDK_SOURCE)/Foundation/Framework
 
 [libraries.common]
 
diff --git a/EdkCompatibilityPkg/Foundation/Library/CustomizedDecompress/CustomizedDecompress.inf b/EdkCompatibilityPkg/Foundation/Library/CustomizedDecompress/CustomizedDecompress.inf
index 151a4736a9..f00d1ef61f 100644
--- a/EdkCompatibilityPkg/Foundation/Library/CustomizedDecompress/CustomizedDecompress.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/CustomizedDecompress/CustomizedDecompress.inf
@@ -29,11 +29,11 @@ COMPONENT_TYPE    = LIBRARY
 
 [includes.common]
   .
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Include
-  $(EDK_SOURCE)\Foundation\Efi
-  $(EDK_SOURCE)\Foundation\Efi\Include
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation\Framework\Include
+  $(EDK_SOURCE)/Foundation
+  $(EDK_SOURCE)/Foundation/Include
+  $(EDK_SOURCE)/Foundation/Efi
+  $(EDK_SOURCE)/Foundation/Efi/Include
+  $(EDK_SOURCE)/Foundation/Framework
+  $(EDK_SOURCE)/Foundation/Framework/Include
 
 [nmake.common]
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf
index 32425744aa..66e84f5742 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf
@@ -41,31 +41,31 @@ COMPONENT_TYPE  = LIBRARY
   ReportStatusCode.c
   GetImage.c
 
-  ..\hob\hob.c
+  ../Hob/Hob.c
 
 [sources.ia32]
-  ia32\PerformancePrimitives.c
+  ia32/PerformancePrimitives.c
 
 [sources.x64]
-  x64\PerformancePrimitives.c
+  x64/PerformancePrimitives.c
 
 [sources.ipf]
-  ipf\PerformancePrimitives.s
+  Ipf/PerformancePrimitives.s
 
 [sources.ebc]
-  Ebc\PerformancePrimitives.c
+  Ebc/PerformancePrimitives.c
 
 [includes.common]
-  $(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
+  $(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]
   EdkGuidLib
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/EfiIfrSupportLib.inf b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/EfiIfrSupportLib.inf
index a4cc0aea81..f28a03c9b6 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/EfiIfrSupportLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/EfiIfrSupportLib.inf
@@ -31,17 +31,17 @@ COMPONENT_TYPE      = LIBRARY
   IfrVariable.c
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation\Efi
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation
+  $(EDK_SOURCE)/Foundation/Efi
+  $(EDK_SOURCE)/Foundation/Framework
+  $(EDK_SOURCE)/Foundation
   .
-  $(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\EfiDriverLib
+  $(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/EfiDriverLib
 
 [libraries.common]
   EfiGuidLib
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.inf b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.inf
index 645e04694e..b4f8b788b3 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.inf
@@ -28,17 +28,17 @@ COMPONENT_TYPE      = LIBRARY
 
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation\Efi
-  $(EFI_SOURCE)\Framework
+  $(EDK_SOURCE)/Foundation/Framework
+  $(EDK_SOURCE)/Foundation/Efi
+  $(EFI_SOURCE)/Framework
   .
-  $(EDK_SOURCE)\Foundation\Include
-  $(EDK_SOURCE)\Foundation\Efi\Include
-  $(EDK_SOURCE)\Foundation\Framework\Include
-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard
-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include
+  $(EDK_SOURCE)/Foundation/Include
+  $(EDK_SOURCE)/Foundation/Efi/Include
+  $(EDK_SOURCE)/Foundation/Framework/Include
+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
   $(EFI_SOURCE)
-  $(EDK_SOURCE)\Foundation\Core\Dxe
+  $(EDK_SOURCE)/Foundation/Core/Dxe
 
 [libraries.common]
   EdkFrameworkProtocolLib
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiUiLib/EfiUiLib.inf b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiUiLib/EfiUiLib.inf
index 87af7f77a0..d84f53f01d 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiUiLib/EfiUiLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiUiLib/EfiUiLib.inf
@@ -28,15 +28,15 @@ COMPONENT_TYPE      = LIBRARY
 
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation\Efi
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation\Include
-  $(EDK_SOURCE)\Foundation\Efi\Include
-  $(EDK_SOURCE)\Foundation\Framework\Include
-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard
-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include
-  $(EDK_SOURCE)\Foundation\Core\Dxe
+  $(EDK_SOURCE)/Foundation/Efi
+  $(EDK_SOURCE)/Foundation
+  $(EDK_SOURCE)/Foundation/Framework
+  $(EDK_SOURCE)/Foundation/Include
+  $(EDK_SOURCE)/Foundation/Efi/Include
+  $(EDK_SOURCE)/Foundation/Framework/Include
+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
+  $(EDK_SOURCE)/Foundation/Core/Dxe
 
 [libraries.common]
 
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.inf b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.inf
index 2e0cd207f7..96ef643b6f 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.inf
@@ -27,22 +27,22 @@ COMPONENT_TYPE      = LIBRARY
   Graphics.c
   Print.c
   Print.h
-  Unicode\PrintWidth.h
-  Unicode\Sprint.c
+  Unicode/PrintWidth.h
+  Unicode/Sprint.c
 
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Efi
+  $(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\Dxe\Include
-  $(EDK_SOURCE)\Foundation\Library\Dxe\Graphics\Unicode
-  $(EDK_SOURCE)\Foundation\Core\Dxe
+  $(EDK_SOURCE)/Foundation/Include
+  $(EDK_SOURCE)/Foundation/Efi/Include
+  $(EDK_SOURCE)/Foundation/Framework/Include
+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Graphics/Unicode
+  $(EDK_SOURCE)/Foundation/Core/Dxe
 
 [libraries.common]
   EfiDriverLib
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.inf b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.inf
index 02df84a020..216f503a35 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.inf
@@ -27,22 +27,22 @@ COMPONENT_TYPE      = LIBRARY
   Graphics.c
   Print.c
   Print.h
-  Unicode\PrintWidth.h
-  Unicode\Sprint.c
+  Unicode/PrintWidth.h
+  Unicode/Sprint.c
 
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Efi
+  $(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\Dxe\Include
-  $(EDK_SOURCE)\Foundation\Library\Dxe\Graphics\Unicode
-  $(EDK_SOURCE)\Foundation\Core\Dxe
+  $(EDK_SOURCE)/Foundation/Include
+  $(EDK_SOURCE)/Foundation/Efi/Include
+  $(EDK_SOURCE)/Foundation/Framework/Include
+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Graphics/Unicode
+  $(EDK_SOURCE)/Foundation/Core/Dxe
 
 [libraries.common]
   EfiDriverLib
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Hob/HobLib.inf b/EdkCompatibilityPkg/Foundation/Library/Dxe/Hob/HobLib.inf
index 6f34527a9c..d444872130 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Hob/HobLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Hob/HobLib.inf
@@ -28,16 +28,16 @@ COMPONENT_TYPE      = LIBRARY
 
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation\Efi
+  $(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\Library\Dxe\Include
-  $(EDK_SOURCE)\Foundation\Core\Dxe
+  $(EDK_SOURCE)/Foundation/Include
+  $(EDK_SOURCE)/Foundation/Efi/Include
+  $(EDK_SOURCE)/Foundation/Framework/Include
+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
+  $(EDK_SOURCE)/Foundation/Core/Dxe
 
 [libraries.common]
   EdkGuidLib
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/PrintLib.inf b/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/PrintLib.inf
index e5c6f373f6..17fa0744d7 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/PrintLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/PrintLib.inf
@@ -28,21 +28,21 @@ COMPONENT_TYPE      = LIBRARY
   Print.c
   Print.h
   StdErr.c
-  Unicode\PrintWidth.h
-  Unicode\SPrint.c
+  Unicode/PrintWidth.h
+  Unicode/SPrint.c
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation\Efi
+  $(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\Library\Dxe\Include
-  $(EDK_SOURCE)\Foundation\Library\Dxe\Print\Unicode
-  $(EDK_SOURCE)\Foundation\Core\Dxe
+  $(EDK_SOURCE)/Foundation/Include
+  $(EDK_SOURCE)/Foundation/Efi/Include
+  $(EDK_SOURCE)/Foundation/Framework/Include
+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Print/Unicode
+  $(EDK_SOURCE)/Foundation/Core/Dxe
 
 [libraries.common]
 
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/PrintLib.inf b/EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/PrintLib.inf
index 6f791230b4..0a694e2594 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/PrintLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/PrintLib.inf
@@ -28,21 +28,21 @@ COMPONENT_TYPE      = LIBRARY
   Print.c
   Print.h
   StdErr.c
-  Unicode\PrintWidth.h
-  Unicode\SPrint.c
+  Unicode/PrintWidth.h
+  Unicode/SPrint.c
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation\Efi
+  $(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\Library\Dxe\Include
-  $(EDK_SOURCE)\Foundation\Library\Dxe\Print\Unicode
-  $(EDK_SOURCE)\Foundation\Core\Dxe
+  $(EDK_SOURCE)/Foundation/Include
+  $(EDK_SOURCE)/Foundation/Efi/Include
+  $(EDK_SOURCE)/Foundation/Framework/Include
+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Print/Unicode
+  $(EDK_SOURCE)/Foundation/Core/Dxe
 
 [libraries.common]
   EdkProtocolLib
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiEfiIfrSupportLib.inf b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiEfiIfrSupportLib.inf
index f5e66c1511..14e1c15fb7 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiEfiIfrSupportLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiEfiIfrSupportLib.inf
@@ -31,17 +31,17 @@ COMPONENT_TYPE      = LIBRARY
   UefiIfrLibrary.h
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation\Efi
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation
+  $(EDK_SOURCE)/Foundation/Efi
+  $(EDK_SOURCE)/Foundation/Framework
+  $(EDK_SOURCE)/Foundation
   .
-  $(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\EfiDriverLib
+  $(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/EfiDriverLib
 
 [libraries.common]
   EfiGuidLib
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]
 
diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
index b736eca9be..8c7d88c7f0 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
@@ -33,19 +33,19 @@ COMPONENT_TYPE  = LIBRARY
   LinkedList.c
 
 [sources.ia32]
-  Ia32\EfiCopyMemRep1.c
-  Ia32\EfiSetMemRep4.c
-  Ia32\EfiZeroMemRep4.c
-#  Ia32\EfiCopyMem.c
-#  Ia32\EfiSetMem.c
-#  Ia32\EfiZeroMem.c
-  Ia32\LShiftU64.c
-  Ia32\RShiftU64.c
-  Ia32\MultU64x32.c
-  Ia32\DivU64x32.c
-  Ia32\Power10U64.c
-  Ia32\Log2.c
-  Ia32\GetPowerOfTwo.c
+  Ia32/EfiCopyMemRep1.c
+  Ia32/EfiSetMemRep4.c
+  Ia32/EfiZeroMemRep4.c
+#  Ia32/EfiCopyMem.c
+#  Ia32/EfiSetMem.c
+#  Ia32/EfiZeroMem.c
+  Ia32/LShiftU64.c
+  Ia32/RShiftU64.c
+  Ia32/MultU64x32.c
+  Ia32/DivU64x32.c
+  Ia32/Power10U64.c
+  Ia32/Log2.c
+  Ia32/GetPowerOfTwo.c
 
 [sources.ipf]
   EfiCopyMem.c
@@ -60,29 +60,29 @@ COMPONENT_TYPE  = LIBRARY
   Math.c
   
 [sources.x64]
-  x64\EfiCopyMemRep1.asm
-  x64\EfiSetMemRep4.asm
-  x64\EfiZeroMemRep4.asm
-#  x64\EfiCopyMem.asm
-#  x64\EfiSetMem.asm
-#  x64\EfiZeroMem.asm
+  x64/EfiCopyMemRep1.asm
+  x64/EfiSetMemRep4.asm
+  x64/EfiZeroMemRep4.asm
+#  x64/EfiCopyMem.asm
+#  x64/EfiSetMem.asm
+#  x64/EfiZeroMem.asm
   Math.c
 
 [includes.common]
-  $(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
+  $(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)
-  $(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\Ppi\CpuIo
-  $(EDK_SOURCE)\Foundation\Framework
+  $(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/Ppi/CpuIo
+  $(EDK_SOURCE)/Foundation/Framework
   
 [libraries.common]
   EdkFrameworkGuidLib
diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/Hob/PeiHobLib.inf b/EdkCompatibilityPkg/Foundation/Library/Pei/Hob/PeiHobLib.inf
index 6efd3ecd11..fc04f572f1 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Pei/Hob/PeiHobLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/Hob/PeiHobLib.inf
@@ -33,17 +33,17 @@ COMPONENT_TYPE    = LIBRARY
 [libraries.common]
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Efi
+  $(EDK_SOURCE)/Foundation
+  $(EDK_SOURCE)/Foundation/Efi
   .
-  $(EDK_SOURCE)\Foundation\Core\Dxe
-  $(EDK_SOURCE)\Foundation\Include
-  $(EDK_SOURCE)\Foundation\Efi\Include
-  $(EDK_SOURCE)\Foundation\Framework\Include
-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard
-  $(EDK_SOURCE)\Foundation\Include\Pei
-  $(EDK_SOURCE)\Foundation\Library\Pei\Include
-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include
-  $(EDK_SOURCE)\Foundation\Framework
+  $(EDK_SOURCE)/Foundation/Core/Dxe
+  $(EDK_SOURCE)/Foundation/Include
+  $(EDK_SOURCE)/Foundation/Efi/Include
+  $(EDK_SOURCE)/Foundation/Framework/Include
+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+  $(EDK_SOURCE)/Foundation/Include/Pei
+  $(EDK_SOURCE)/Foundation/Library/Pei/Include
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
+  $(EDK_SOURCE)/Foundation/Framework
 
 [nmake.common]
diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.inf b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.inf
index b5168416a9..603465ebe7 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.inf
@@ -28,49 +28,49 @@ COMPONENT_TYPE    = LIBRARY
   PeCoffLoader.c
   Decompress.c
   Debug.c
-  Hob\Hob.c
-  perf.c
-  print\print.c
-  print\print.h
+  Hob/Hob.c
+  Perf.c
+  Print/Print.c
+  Print/Print.h
   FindFv.c
 
 [sources.ia32]
-#  ia32\Math.c
-  ia32\PeCoffLoaderEx.c
-  ia32\PeCoffLoaderEx.h
-  ia32\PerformancePrimitives.c
-  ia32\Processor.c
-  ia32\ProcessorAsms.Asm
-  ia32\SupportItpDebug.asm
-  ia32\efijump.h
-  ia32\ReadIdt.asm
-  ia32\WriteIdt.asm
-  ia32\PeiServicePointer.c
+#  ia32/Math.c
+  ia32/PeCoffLoaderEx.c
+  ia32/PeCoffLoaderEx.h
+  ia32/PerformancePrimitives.c
+  ia32/Processor.c
+  ia32/ProcessorAsms.Asm
+  ia32/SupportItpDebug.asm
+  ia32/EfiJump.h
+  ia32/ReadIdt.asm
+  ia32/WriteIdt.asm
+  ia32/PeiServicePointer.c
 
 [sources.x64]
-  x64\PeCoffLoaderEx.c
-  x64\PeCoffLoaderEx.h
-  x64\PerformancePrimitives.c
-  x64\Processor.c
-  x64\ProcessorAsms.Asm
-  x64\SupportItpDebug.asm
-  x64\efijump.h
-  x64\PeiServicePointer.c
+  x64/PeCoffLoaderEx.c
+  x64/PeCoffLoaderEx.h
+  x64/PerformancePrimitives.c
+  x64/Processor.c
+  x64/ProcessorAsms.Asm
+  x64/SupportItpDebug.asm
+  x64/EfiJump.h
+  x64/PeiServicePointer.c
 
 [sources.ipf]
-#  ipf\Math.c
-  ipf\PeCoffLoaderEx.c
-  ipf\PeCoffLoaderEx.h
-  ipf\PerformancePrimitives.s
-  ipf\Processor.c
-  ipf\EfiJump.h
-  ipf\SetJmp.s
-  ipf\Asm.h
-  ipf\PioFlush.s
-  ipf\SwitchStack.s
-  ipf\Ia_64Gen.h
-  ipf\HwAccess.s
-  ipf\PeiServicePointer.c
+#  Ipf/Math.c
+  Ipf/PeCoffLoaderEx.c
+  Ipf/PeCoffLoaderEx.h
+  Ipf/PerformancePrimitives.s
+  Ipf/Processor.c
+  Ipf/EfiJump.h
+  Ipf/SetJmp.s
+  Ipf/Asm.h
+  Ipf/PioFlush.s
+  Ipf/SwitchStack.s
+  Ipf/Ia_64Gen.h
+  Ipf/HwAccess.s
+  Ipf/PeiServicePointer.c
   
   
 [libraries.common]
@@ -84,21 +84,21 @@ COMPONENT_TYPE    = LIBRARY
   CpuIA32Lib
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation\Efi
+  $(EDK_SOURCE)/Foundation
+  $(EDK_SOURCE)/Foundation/Framework
+  $(EDK_SOURCE)/Foundation/Efi
   .
-  $(EDK_SOURCE)\Foundation\Core\Dxe
-  $(EDK_SOURCE)\Foundation\Include
-  $(EDK_SOURCE)\Foundation\Efi\Include
-  $(EDK_SOURCE)\Foundation\Framework\Include
-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard
-  $(EDK_SOURCE)\Foundation\Include\Pei
-  $(EDK_SOURCE)\Foundation\Library\Pei\Include
-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include
-  $(EDK_SOURCE)\Foundation\Cpu\Pentium\Include
+  $(EDK_SOURCE)/Foundation/Core/Dxe
+  $(EDK_SOURCE)/Foundation/Include
+  $(EDK_SOURCE)/Foundation/Efi/Include
+  $(EDK_SOURCE)/Foundation/Framework/Include
+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+  $(EDK_SOURCE)/Foundation/Include/Pei
+  $(EDK_SOURCE)/Foundation/Library/Pei/Include
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include
 
 [includes.ia32.Nt32]
-  $(EDK_SOURCE)\Sample\Platform\Nt32
+  $(EDK_SOURCE)/Sample/Platform/Nt32
 
 [nmake.common]
diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib.inf b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib.inf
index 9411f0009c..66132b6939 100644
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib.inf
@@ -32,40 +32,40 @@ COMPONENT_TYPE  = LIBRARY
   RtDevicePath.c
 
 [sources.ia32]
-  Ia32\RuntimeLib.c
-  Ia32\IoLib.c
-  Ia32\Lock.c
-  Ia32\PlatformIoLib.c
-  Ia32\Fvb.c
+  ia32/RuntimeLib.c
+  ia32/IoLib.c
+  ia32/Lock.c
+  ia32/PlatformIoLib.c
+  ia32/Fvb.c
 
 [sources.x64]
-  x64\RuntimeLib.c
-  x64\IoLib.c
-  x64\Lock.c
-  x64\PlatformIoLib.c
-  x64\Fvb.c
-  x64\RuntimeLibAsm.asm
+  x64/RuntimeLib.c
+  x64/IoLib.c
+  x64/Lock.c
+  x64/PlatformIoLib.c
+  x64/Fvb.c
+  x64/RuntimeLibAsm.asm
 
 [sources.ipf]
-  Ipf\RuntimeLib.c
-  Ipf\Lock.c
-  Ipf\Fvb.c
-  Ipf\EsalLib.s
-  Ipf\IpfCpuCache.s
+  Ipf/RuntimeLib.c
+  Ipf/Lock.c
+  Ipf/Fvb.c
+  Ipf/EsalLib.s
+  Ipf/IpfCpuCache.s
 
 [sources.ebc]
-  Ebc\RuntimeLib.c
+  Ebc/RuntimeLib.c
 
 [includes.common]
-  $(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
+  $(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
 
 [libraries.common]
   EdkGuidLib
diff --git a/EdkCompatibilityPkg/Foundation/Library/Thunk16/Thunk16Lib.inf b/EdkCompatibilityPkg/Foundation/Library/Thunk16/Thunk16Lib.inf
index 5134caf080..edc87eb365 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Thunk16/Thunk16Lib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/Thunk16/Thunk16Lib.inf
@@ -25,23 +25,23 @@ COMPONENT_TYPE       = LIBRARY
   x86Thunk.c
 
 [sources.ia32]
-  Ia32\Thunk16.asm
-  Ia32\Fx.asm
+  Ia32/Thunk16.asm
+  Ia32/Fx.asm
 
 [sources.x64]
-  X64\Thunk16.asm
-  X64\Fx.asm
+  X64/Thunk16.asm
+  X64/Fx.asm
 
 [includes.common]
   .
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation\Efi
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Include
-  $(EDK_SOURCE)\Foundation\Efi\Include
-  $(EDK_SOURCE)\Foundation\Framework\Include
-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard
-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include
+  $(EDK_SOURCE)/Foundation/Framework
+  $(EDK_SOURCE)/Foundation/Efi
+  $(EDK_SOURCE)/Foundation
+  $(EDK_SOURCE)/Foundation/Include
+  $(EDK_SOURCE)/Foundation/Efi/Include
+  $(EDK_SOURCE)/Foundation/Framework/Include
+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
 
 [libraries.common]
 
diff --git a/EdkCompatibilityPkg/Foundation/Ppi/EdkPpiLib.inf b/EdkCompatibilityPkg/Foundation/Ppi/EdkPpiLib.inf
index 1fc4350bc0..c533d591f7 100644
--- a/EdkCompatibilityPkg/Foundation/Ppi/EdkPpiLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Ppi/EdkPpiLib.inf
@@ -24,28 +24,28 @@ BASE_NAME=   EdkPpiLib
 COMPONENT_TYPE=   LIBRARY
 
 [includes.common]
-  $(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\Include\Pei
-  $(EDK_SOURCE)\Foundation\Library\Pei\Include
-  $(EDK_SOURCE)\Foundation\Core\Dxe
-  $(EDK_SOURCE)\Foundation\Library\Dxe\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/Include/Pei
+  $(EDK_SOURCE)/Foundation/Library/Pei/Include
+  $(EDK_SOURCE)/Foundation/Core/Dxe
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
+  $(EDK_SOURCE)/Foundation/Framework
 
 [nmake.common]
 
 [sources.common]
-    BaseMemoryTest\BaseMemoryTest.h
-    BaseMemoryTest\BaseMemoryTest.c
-    FlashMap\FlashMap.h
-    FlashMap\FlashMap.c
-    PeiInMemory\PeiInMemory.h
-    PeiInMemory\PeiInMemory.c
-    StatusCodeMemory\StatusCodeMemory.h
-    StatusCodeMemory\StatusCodeMemory.c
-    OperatorPresence\OperatorPresence.h
-    OperatorPresence\OperatorPresence.c
+    BaseMemoryTest/BaseMemoryTest.h
+    BaseMemoryTest/BaseMemoryTest.c
+    FlashMap/FlashMap.h
+    FlashMap/FlashMap.c
+    PeiInMemory/PeiInMemory.h
+    PeiInMemory/PeiInMemory.c
+    StatusCodeMemory/StatusCodeMemory.h
+    StatusCodeMemory/StatusCodeMemory.c
+    OperatorPresence/OperatorPresence.h
+    OperatorPresence/OperatorPresence.c
diff --git a/EdkCompatibilityPkg/Foundation/Protocol/EdkProtocolLib.inf b/EdkCompatibilityPkg/Foundation/Protocol/EdkProtocolLib.inf
index a627454d8d..f911ba13d2 100644
--- a/EdkCompatibilityPkg/Foundation/Protocol/EdkProtocolLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Protocol/EdkProtocolLib.inf
@@ -24,90 +24,90 @@ BASE_NAME=   EdkProtocolLib
 COMPONENT_TYPE=   LIBRARY
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Efi
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation\Include
-  $(EDK_SOURCE)\Foundation\Efi\Include
-  $(EDK_SOURCE)\Foundation\Framework\Include
-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard
-  $(EDK_SOURCE)\Foundation\Include\Pei
-  $(EDK_SOURCE)\Foundation\Library\Pei\Include
-  $(EDK_SOURCE)\Foundation\Core\Dxe
-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include
+  $(EDK_SOURCE)/Foundation
+  $(EDK_SOURCE)/Foundation/Efi
+  $(EDK_SOURCE)/Foundation/Framework
+  $(EDK_SOURCE)/Foundation/Include
+  $(EDK_SOURCE)/Foundation/Efi/Include
+  $(EDK_SOURCE)/Foundation/Framework/Include
+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+  $(EDK_SOURCE)/Foundation/Include/Pei
+  $(EDK_SOURCE)/Foundation/Library/Pei/Include
+  $(EDK_SOURCE)/Foundation/Core/Dxe
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
 
 [nmake.common]
 
 [sources.common]
-  ConsoleControl\ConsoleControl.h
-  ConsoleControl\ConsoleControl.c
-  CustomizedDecompress\CustomizedDecompress.c
-  CustomizedDecompress\CustomizedDecompress.h
-  DebugAssert\DebugAssert.h
-  DebugAssert\DebugAssert.c
-  DebugMask\DebugMask.h
-  DebugMask\DebugMask.c
-  DebugSerialIo\DebugSerialIo.h
-  DebugSerialIo\DebugSerialIo.c
-  DiskInfo\DiskInfo.h
-  DiskInfo\DiskInfo.c
-  Dpc\Dpc.h
-  Dpc\Dpc.c
-  EfiOemBadging\EfiOemBadging.h
-  EfiOemBadging\EfiOemBadging.c
-  FaultTolerantWriteLite\FaultTolerantWriteLite.h
-  FaultTolerantWriteLite\FaultTolerantWriteLite.c
-  FirmwareVolumeDispatch\FirmwareVolumeDispatch.h
-  FirmwareVolumeDispatch\FirmwareVolumeDispatch.c
-  FvbExtension\FvbExtension.h
-  FvbExtension\FvbExtension.c
-  GenericMemoryTest\GenericMemoryTest.h
-  GenericMemoryTest\GenericMemoryTest.c
-  GuidedSectionExtraction\GuidedSectionExtraction.h
-  GuidedSectionExtraction\GuidedSectionExtraction.c
-  IsaAcpi\IsaAcpi.h
-  IsaAcpi\IsaAcpi.c
-  IsaIo\IsaIo.h
-  IsaIo\IsaIo.c
-  LegacyBiosThunk\LegacyBiosThunk.h
-  LegacyBiosThunk\LegacyBiosThunk.c
-  LoadPe32Image\LoadPe32Image.h
-  LoadPe32Image\LoadPe32Image.c
-  NicIp4Config\NicIp4Config.h
-  NicIp4Config\NicIp4Config.c
-  PciHotPlugRequest\PciHotPlugRequest.h
-  PciHotPlugRequest\PciHotPlugRequest.c
-  Performance\Performance.h
-  Performance\Performance.c
-  PlatformMemTest\PlatformMemTest.h
-  PlatformMemTest\PlatformMemTest.c
-  Print\Print.h
-  Print\Print.c
-  PxeDhcp4\PxeDhcp4.h
-  PxeDhcp4\PxeDhcp4.c
-  PxeDhcp4Callback\PxeDhcp4Callback.h
-  PxeDhcp4Callback\PxeDhcp4Callback.c
-  Tcp\Tcp.h
-  Tcp\Tcp.c
-  TianoDecompress\TianoDecompress.h
-  TianoDecompress\TianoDecompress.c
-  UgaSplash\UgaSplash.h
-  UgaSplash\UgaSplash.c
-  UsbAtapi\UsbAtapi.h
-  UsbAtapi\UsbAtapi.c
-  VariableStore\VariableStore.h
-  VariableStore\VariableStore.c
-  VirtualMemoryAccess\VirtualMemoryAccess.h
-  VirtualMemoryAccess\VirtualMemoryAccess.c
-  TcgService\TcgService.h
-  TcgService\TcgService.c
-  Ps2Policy\Ps2Policy.h
-  Ps2Policy\Ps2Policy.c
-  VgaMiniPort\VgaMiniPort.h
-  VgaMiniPort\VgaMiniPort.c
+  ConsoleControl/ConsoleControl.h
+  ConsoleControl/ConsoleControl.c
+  CustomizedDecompress/CustomizedDecompress.c
+  CustomizedDecompress/CustomizedDecompress.h
+  DebugAssert/DebugAssert.h
+  DebugAssert/DebugAssert.c
+  DebugMask/DebugMask.h
+  DebugMask/DebugMask.c
+  DebugSerialIo/DebugSerialIo.h
+  DebugSerialIo/DebugSerialIo.c
+  DiskInfo/DiskInfo.h
+  DiskInfo/DiskInfo.c
+  Dpc/Dpc.h
+  Dpc/Dpc.c
+  EfiOemBadging/EfiOemBadging.h
+  EfiOemBadging/EfiOemBadging.c
+  FaultTolerantWriteLite/FaultTolerantWriteLite.h
+  FaultTolerantWriteLite/FaultTolerantWriteLite.c
+  FirmwareVolumeDispatch/FirmwareVolumeDispatch.h
+  FirmwareVolumeDispatch/FirmwareVolumeDispatch.c
+  FvbExtension/FvbExtension.h
+  FvbExtension/FvbExtension.c
+  GenericMemoryTest/GenericMemoryTest.h
+  GenericMemoryTest/GenericMemoryTest.c
+  GuidedSectionExtraction/GuidedSectionExtraction.h
+  GuidedSectionExtraction/GuidedSectionExtraction.c
+  IsaAcpi/IsaAcpi.h
+  IsaAcpi/IsaAcpi.c
+  IsaIo/IsaIo.h
+  IsaIo/IsaIo.c
+  LegacyBiosThunk/LegacyBiosThunk.h
+  LegacyBiosThunk/LegacyBiosThunk.c
+  LoadPe32Image/LoadPe32Image.h
+  LoadPe32Image/LoadPe32Image.c
+  NicIp4Config/NicIp4Config.h
+  NicIp4Config/NicIp4Config.c
+  PciHotPlugRequest/PciHotPlugRequest.h
+  PciHotPlugRequest/PciHotPlugRequest.c
+  Performance/Performance.h
+  Performance/Performance.c
+  PlatformMemTest/PlatformMemTest.h
+  PlatformMemTest/PlatformMemTest.c
+  Print/Print.h
+  Print/Print.c
+  PxeDhcp4/PxeDhcp4.h
+  PxeDhcp4/PxeDhcp4.c
+  PxeDhcp4CallBack/PxeDhcp4CallBack.h
+  PxeDhcp4CallBack/PxeDhcp4CallBack.c
+  Tcp/Tcp.h
+  Tcp/Tcp.c
+  TianoDecompress/TianoDecompress.h
+  TianoDecompress/TianoDecompress.c
+  UgaSplash/UgaSplash.h
+  UgaSplash/UgaSplash.c
+  UsbAtapi/UsbAtapi.h
+  UsbAtapi/UsbAtapi.c
+  VariableStore/VariableStore.h
+  VariableStore/VariableStore.c
+  VirtualMemoryAccess/VirtualMemoryAccess.h
+  VirtualMemoryAccess/VirtualMemoryAccess.c
+  TcgService/TcgService.h
+  TcgService/TcgService.c
+  Ps2Policy/Ps2Policy.h
+  Ps2Policy/Ps2Policy.c
+  VgaMiniPort/VgaMiniPort.h
+  VgaMiniPort/VgaMiniPort.c
 
 [sources.ipf]
-  ExtendedSalBootService\ExtendedSalBootService.c
-  ExtendedSalBootService\ExtendedSalBootService.h
-  ExtendedSalGuid\ExtendedSalGuid.c
-  ExtendedSalGuid\ExtendedSalGuid.h
+  ExtendedSalBootService/ExtendedSalBootService.c
+  ExtendedSalBootService/ExtendedSalBootService.h
+  ExtendedSalGuid/ExtendedSalGuid.c
+  ExtendedSalGuid/ExtendedSalGuid.h
diff --git a/EdkCompatibilityPkg/Sample/Library/Dxe/WinNt/WinNtLib.inf b/EdkCompatibilityPkg/Sample/Library/Dxe/WinNt/WinNtLib.inf
index bbadcb9ec2..4d405f8a61 100644
--- a/EdkCompatibilityPkg/Sample/Library/Dxe/WinNt/WinNtLib.inf
+++ b/EdkCompatibilityPkg/Sample/Library/Dxe/WinNt/WinNtLib.inf
@@ -31,18 +31,18 @@ COMPONENT_TYPE    = LIBRARY
   EdkNt32ProtocolLib
 
 [includes.common]
-  $(EDK_SOURCE)\Sample\Platform\Nt32
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Include
-  $(EDK_SOURCE)\Foundation\Efi
+  $(EDK_SOURCE)/Sample/Platform/Nt32
+  $(EDK_SOURCE)/Foundation/Framework
+  $(EDK_SOURCE)/Foundation
+  $(EDK_SOURCE)/Foundation/Include
+  $(EDK_SOURCE)/Foundation/Efi
   .
-  $(EDK_SOURCE)\Foundation\Efi\Include
-  $(EDK_SOURCE)\Foundation\Framework\Include
-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard
-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include
-  $(EDK_SOURCE)\Foundation\Core\Dxe
-  $(EDK_SOURCE)\Sample\Include
+  $(EDK_SOURCE)/Foundation/Efi/Include
+  $(EDK_SOURCE)/Foundation/Framework/Include
+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
+  $(EDK_SOURCE)/Foundation/Core/Dxe
+  $(EDK_SOURCE)/Sample/Include
 
 
 [nmake.common]
diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/MemoryStatusCode/MemoryStatusCode.inf b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/MemoryStatusCode/MemoryStatusCode.inf
index 2bcf285e56..bf740c3848 100644
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/MemoryStatusCode/MemoryStatusCode.inf
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/MemoryStatusCode/MemoryStatusCode.inf
@@ -28,20 +28,20 @@ COMPONENT_TYPE       = LIBRARY
   MemoryStatusCode.h
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation\Efi
+  $(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\Include\Pei
-  $(EDK_SOURCE)\Foundation\Library\Pei\Include
-  $(EDK_SOURCE)\Sample\Platform\Generic\MonoStatusCode\Pei
-  $(EDK_SOURCE)\Sample\Platform\Generic\MonoStatusCode\Library\Pei\Include
+  $(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/Include/Pei
+  $(EDK_SOURCE)/Foundation/Library/Pei/Include
+  $(EDK_SOURCE)/Sample/Platform/Generic/MonoStatusCode/Pei
+  $(EDK_SOURCE)/Sample/Platform/Generic/MonoStatusCode/Library/Pei/Include
 
 [libraries.common]
   EdkPpiLib
diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsDataHubStatusCode/BsDataHubStatusCode.inf b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsDataHubStatusCode/BsDataHubStatusCode.inf
index b5a1ba9bea..140eb60e27 100644
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsDataHubStatusCode/BsDataHubStatusCode.inf
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsDataHubStatusCode/BsDataHubStatusCode.inf
@@ -28,16 +28,16 @@ COMPONENT_TYPE       = LIBRARY
   BsDataHubStatusCode.h
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation\Efi
+  $(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/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
 
 [libraries.common]
   PrintLib
diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsSerialStatusCode/BsSerialStatusCode.inf b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsSerialStatusCode/BsSerialStatusCode.inf
index a1b60e0592..5584f15cd3 100644
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsSerialStatusCode/BsSerialStatusCode.inf
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsSerialStatusCode/BsSerialStatusCode.inf
@@ -28,19 +28,19 @@ COMPONENT_TYPE       = LIBRARY
   BsSerialStatusCode.h
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Efi
+  $(EDK_SOURCE)/Foundation/Framework
+  $(EDK_SOURCE)/Foundation
+  $(EDK_SOURCE)/Foundation/Efi
   .
-  ..\Include
-  $(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\Include\Pei
-  $(EDK_SOURCE)\Foundation\Library\Pei\Include
+  ../Include
+  $(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/Include/Pei
+  $(EDK_SOURCE)/Foundation/Library/Pei/Include
 
 [libraries.common]
 
diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtLedStatusCode/RtLedStatusCode.inf b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtLedStatusCode/RtLedStatusCode.inf
index 2c1aac69c9..5db69848d2 100644
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtLedStatusCode/RtLedStatusCode.inf
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtLedStatusCode/RtLedStatusCode.inf
@@ -28,16 +28,16 @@ COMPONENT_TYPE       = LIBRARY
   RtLedStatusCode.h
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation\Efi
+  $(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/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
 
 [libraries.common]
 
diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtMemoryStatusCode/RtMemoryStatusCode.inf b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtMemoryStatusCode/RtMemoryStatusCode.inf
index 67b8879459..5c9fc155f4 100644
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtMemoryStatusCode/RtMemoryStatusCode.inf
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtMemoryStatusCode/RtMemoryStatusCode.inf
@@ -28,19 +28,19 @@ COMPONENT_TYPE       = LIBRARY
   RtMemoryStatusCode.h
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation\Efi
+  $(EDK_SOURCE)/Foundation
+  $(EDK_SOURCE)/Foundation/Framework
+  $(EDK_SOURCE)/Foundation/Efi
   .
-  ..\Include
-  $(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\Include\Pei
-  $(EDK_SOURCE)\Foundation\Library\Pei\Include
+  ../Include
+  $(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/Include/Pei
+  $(EDK_SOURCE)/Foundation/Library/Pei/Include
 
 
 [libraries.common]
diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtPlatformStatusCode/Nt32/RtPlatformStatusCode.inf b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtPlatformStatusCode/Nt32/RtPlatformStatusCode.inf
index a76c09c5ca..0311647746 100644
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtPlatformStatusCode/Nt32/RtPlatformStatusCode.inf
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtPlatformStatusCode/Nt32/RtPlatformStatusCode.inf
@@ -27,17 +27,17 @@ COMPONENT_TYPE       = LIBRARY
   RtPlatformStatusCode.c
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Efi
+  $(EDK_SOURCE)/Foundation/Framework
+  $(EDK_SOURCE)/Foundation
+  $(EDK_SOURCE)/Foundation/Efi
   .
-  ..\..\Include
-  $(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
+  ../../Include
+  $(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
 
 [libraries.common]
   HobLib
diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtPort80StatusCode/RtPort80StatusCode.inf b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtPort80StatusCode/RtPort80StatusCode.inf
index ddd10f3485..2e34516cc4 100644
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtPort80StatusCode/RtPort80StatusCode.inf
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtPort80StatusCode/RtPort80StatusCode.inf
@@ -28,16 +28,16 @@ COMPONENT_TYPE       = LIBRARY
   RtPort80StatusCode.h
 
 [includes.common]
-  $(EDK_SOURCE)\Foundation
-  $(EDK_SOURCE)\Foundation\Framework
-  $(EDK_SOURCE)\Foundation\Efi
+  $(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/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
 
 [libraries.common]
 
diff --git a/EdkCompatibilityPkg/Sample/Platform/Nt32/Ppi/EdkNt32PpiLib.inf b/EdkCompatibilityPkg/Sample/Platform/Nt32/Ppi/EdkNt32PpiLib.inf
index 79bba0b2db..54d7ee6c39 100644
--- a/EdkCompatibilityPkg/Sample/Platform/Nt32/Ppi/EdkNt32PpiLib.inf
+++ b/EdkCompatibilityPkg/Sample/Platform/Nt32/Ppi/EdkNt32PpiLib.inf
@@ -25,29 +25,29 @@ BASE_NAME=   EdkNt32PpiLib
 COMPONENT_TYPE=   LIBRARY
 
 [includes.common]
-  $(EDK_SOURCE)\Sample\Platform\Nt32
-  $(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\Include\Pei
-  $(EDK_SOURCE)\Foundation\Library\Pei\Include
-  $(EDK_SOURCE)\Foundation\Core\Dxe
-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include
-  $(EDK_SOURCE)\Foundation\Framework 
+  $(EDK_SOURCE)/Sample/Platform/Nt32
+  $(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/Include/Pei
+  $(EDK_SOURCE)/Foundation/Library/Pei/Include
+  $(EDK_SOURCE)/Foundation/Core/Dxe
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
+  $(EDK_SOURCE)/Foundation/Framework 
                                    
 [nmake.common]
 C_STD_INCLUDE=
 
 [sources.common]
-    NtAutoscan\NtAutoscan.h
-    NtAutoscan\NtAutoscan.c
-    NtFwh\NtFwh.h
-    NtFwh\NtFwh.c
-    NtLoadAsDll\NtLoadAsDll.h
-    NtLoadAsDll\NtLoadAsDll.c
-    NtPeiLoadFile\NtPeiLoadFile.h
-    NtPeiLoadFile\NtPeiLoadFile.c
-    NtThunk\NtThunk.h
-    NtThunk\NtThunk.c
+    NtAutoscan/NtAutoscan.h
+    NtAutoscan/NtAutoscan.c
+    NtFwh/NtFwh.h
+    NtFwh/NtFwh.c
+    NtLoadAsDll/NtLoadAsDll.h
+    NtLoadAsDll/NtLoadAsDll.c
+    NtPeiLoadFile/NtPeiLoadFile.h
+    NtPeiLoadFile/NtPeiLoadFile.c
+    NtThunk/NtThunk.h
+    NtThunk/NtThunk.c
diff --git a/EdkCompatibilityPkg/Sample/Platform/Nt32/Protocol/EdkNt32ProtocolLib.inf b/EdkCompatibilityPkg/Sample/Platform/Nt32/Protocol/EdkNt32ProtocolLib.inf
index 1abff26c06..fda2407f6f 100644
--- a/EdkCompatibilityPkg/Sample/Platform/Nt32/Protocol/EdkNt32ProtocolLib.inf
+++ b/EdkCompatibilityPkg/Sample/Platform/Nt32/Protocol/EdkNt32ProtocolLib.inf
@@ -24,23 +24,23 @@ BASE_NAME=   EdkNt32ProtocolLib
 COMPONENT_TYPE=   LIBRARY
 
 [includes.common]
-  $(EDK_SOURCE)\Sample\Platform\Nt32
-  $(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\Include\Pei
-  $(EDK_SOURCE)\Foundation\Library\Pei\Include
-  $(EDK_SOURCE)\Foundation\Core\Dxe
-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include
-  $(EDK_SOURCE)\Sample\Include
+  $(EDK_SOURCE)/Sample/Platform/Nt32
+  $(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/Include/Pei
+  $(EDK_SOURCE)/Foundation/Library/Pei/Include
+  $(EDK_SOURCE)/Foundation/Core/Dxe
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
+  $(EDK_SOURCE)/Sample/Include
 
 [nmake.common]
 C_STD_INCLUDE=
 
 [sources.common]
-    WinNtIo\WinNtIo.h
-    WinNtIo\WinNtIo.c
-    WinNtThunk\WinNtThunk.h
-    WinNtThunk\WinNtThunk.c
+    WinNtIo/WinNtIo.h
+    WinNtIo/WinNtIo.c
+    WinNtThunk/WinNtThunk.h
+    WinNtThunk/WinNtThunk.c
author	jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>	2008-03-17 22:01:12 +0000
committer	jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>	2008-03-17 22:01:12 +0000
commit	e84217e7cfe0b1b160d4b870045f7df7b888c4a5 (patch)
tree	ca66809e220d98a168d93c3b7a4cf263bc8a79bb
parent	99ea19948a9df7425169dd899fb0c8eaafefaa00 (diff)
download	edk2-platforms-e84217e7cfe0b1b160d4b870045f7df7b888c4a5.tar.xz