diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
index fb3e2d2bb6..9dc33a7501 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
@@ -49,14 +49,14 @@
 
 [Sources.Ia32]
   IoHighLevel.c
-  IoLibGcc.c
-  IoLibMsc.c
+#  IoLibGcc.c    || GCC   
+  IoLibMsc.c    #|| MSFT
   IoLib.c
 
 [Sources.X64]
   IoHighLevel.c
-  IoLibGcc.c
-  IoLibMsc.c
+#  IoLibGcc.c    || GCC   
+  IoLibMsc.c    #|| MSFT
   IoLib.c
 
 [Sources.IPF]
diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index a974588eee..facd9acb5b 100644
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -290,9 +290,9 @@
   x86EnablePaging32.c
   x86DisablePaging64.c
   x86DisablePaging32.c
-  Synchronization.c
-  SynchronizationMsc.c
-  SynchronizationGcc.c
+#  SynchronizationMsc.c  #|| INTC
+  SynchronizationMsc.c  #|| MSFT
+#  SynchronizationGcc.c  || GCC
 
 [Sources.X64]
   X64/Thunk16.asm