diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
index ffd2a4ec79..e97c1e287b 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
@@ -71,16 +71,27 @@
 
 [Sources.X64]
   X64/ScanMem64.asm
+  X64/ScanMem64.S
   X64/ScanMem32.asm
+  X64/ScanMem32.S
   X64/ScanMem16.asm
+  X64/ScanMem16.S
   X64/ScanMem8.asm
+  X64/ScanMem8.S
   X64/CompareMem.asm
+  X64/CompareMem.S
   X64/ZeroMem.asm
+  X64/ZeroMem.S
   X64/SetMem64.asm
+  X64/SetMem64.S
   X64/SetMem32.asm
+  X64/SetMem32.S
   X64/SetMem16.asm
+  X64/SetMem16.S
   X64/SetMem.asm
+  X64/SetMem.S
   X64/CopyMem.asm
+  X64/CopyMem.S
   ScanMem64Wrapper.c
   ScanMem32Wrapper.c
   ScanMem16Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf b/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf
index 0144caddb8..aeffe0562e 100644
--- a/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf
+++ b/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf
@@ -71,16 +71,27 @@
 
 [Sources.X64]
   X64/ScanMem64.asm
+  X64/ScanMem64.S
   X64/ScanMem32.asm
+  X64/ScanMem32.S
   X64/ScanMem16.asm
+  X64/ScanMem16.S
   X64/ScanMem8.asm
+  X64/ScanMem8.S
   X64/CompareMem.asm
+  X64/CompareMem.S
   X64/ZeroMem.asm
+  X64/ZeroMem.S
   X64/SetMem64.asm
+  X64/SetMem64.S
   X64/SetMem32.asm
+  X64/SetMem32.S
   X64/SetMem16.asm
+  X64/SetMem16.S
   X64/SetMem.asm
+  X64/SetMem.S
   X64/CopyMem.asm
+  X64/CopyMem.S
   ScanMem64Wrapper.c
   ScanMem32Wrapper.c
   ScanMem16Wrapper.c