diff --git a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
index 66a74e37a2..34a61b08fd 100644
--- a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
+++ b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
@@ -24,6 +24,8 @@
 #
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
+[Sources.Common]
+  BaseSynchronizationLibInternals.h
 
 [Sources.Ia32]
   Ia32/InterlockedCompareExchange64.c | MSFT 
@@ -45,9 +47,12 @@
   SynchronizationGcc.c  | GCC
 
 [Sources.X64]
-  X64/InterlockedCompareExchange64.asm 
-  X64/InterlockedCompareExchange32.asm 
-
+  X64/InterlockedCompareExchange64.c | MSFT
+  X64/InterlockedCompareExchange32.c | MSFT
+  
+  X64/InterlockedCompareExchange64.asm | INTEL
+  X64/InterlockedCompareExchange32.asm | INTEL
+  
   X64/InterlockedDecrement.c | MSFT 
   X64/InterlockedIncrement.c | MSFT 
   SynchronizationMsc.c | MSFT 
diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index 23b8f2865c..7352aaade7 100644
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -28,6 +28,7 @@
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE
   gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|FALSE
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|FALSE
+  gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport|TRUE
 
 [PcdsFixedAtBuild.common]
   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000
@@ -44,6 +45,7 @@
   gEfiMdePkgTokenSpaceGuid.PcdFSBClock|200000000
   gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|320
   gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x10
+  gEfiMdePkgTokenSpaceGuid.PcdUsbTransferTimeoutValue|3000
 
 [PcdsFixedAtBuild.IPF]
   gEfiMdePkgTokenSpaceGuid.PcdIoBlockBaseAddressForIpf|0x0ffffc000000