diff --git a/MdePkg/Library/BaseLib/BaseLib-Gcc.msa b/MdePkg/Library/BaseLib/BaseLib-Gcc.msa
index b477a9f616..8246375b05 100644
--- a/MdePkg/Library/BaseLib/BaseLib-Gcc.msa
+++ b/MdePkg/Library/BaseLib/BaseLib-Gcc.msa
@@ -72,6 +72,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Filename>x86LowLevel.c</Filename>
       <Filename>x86Thunk.c</Filename>
       <Filename>Unaligned.c</Filename>
+      <Filename>LongJump.c</Filename>
       <Filename>Ia32/Non-existing.c</Filename>
       <Filename FileType="GCC_Assembly_Code">Ia32/LShiftU64.s</Filename>
       <Filename FileType="GCC_Assembly_Code">Ia32/RShiftU64.s</Filename>
@@ -177,7 +178,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Filename>x86Thunk.c</Filename>
       <Filename>Unaligned.c</Filename>
       <Filename>Math64.c</Filename>
+      <Filename>LongJump.c</Filename>
       <Filename>x64/Non-existing.c</Filename>
+      <Filename>x64/SwitchStack.c</Filename>
       <Filename>x64/SwitchStack.asm</Filename>
       <Filename>x64/SetJump.asm</Filename>
       <Filename>x64/LongJump.asm</Filename>
@@ -265,8 +268,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Arch>
     <Arch ArchType="IPF">
       <Filename>Math64.c</Filename>
+      <Filename>LongJump.c</Filename>
       <Filename>Ipf/setjmp.s</Filename>
       <Filename>Ipf/SwitchStack.s</Filename>
+      <Filename>x64/SwitchStack.c</Filename>
       <Filename>Ipf/Unaligned.c</Filename>
       <Filename>Ipf/CpuBreakpoint.c</Filename>
       <Filename>Ipf/InterlockedCompareExchange32.s</Filename>
@@ -277,9 +282,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Arch>
     <Arch ArchType="EBC">
       <Filename>Math64.c</Filename>
-      <Filename>SwitchStack.c</Filename>
-      <Filename>SetJumpLongJump.c</Filename>
       <Filename>Unaligned.c</Filename>
+      <Filename>Ebc/SwitchStack.c</Filename>
+      <Filename>Ebc/SetJumpLongJump.c</Filename>
       <Filename>Ebc/CpuBreakpoint.c</Filename>
       <Filename>Ebc/Synchronization.c</Filename>
     </Arch>
diff --git a/MdePkg/Library/BaseLib/BaseLib.msa b/MdePkg/Library/BaseLib/BaseLib.msa
index 0241a50ab1..afcfa754f3 100644
--- a/MdePkg/Library/BaseLib/BaseLib.msa
+++ b/MdePkg/Library/BaseLib/BaseLib.msa
@@ -72,6 +72,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Filename>x86LowLevel.c</Filename>
       <Filename>x86Thunk.c</Filename>
       <Filename>Unaligned.c</Filename>
+      <Filename>LongJump.c</Filename>
       <Filename>Ia32/Non-existing.c</Filename>
       <Filename>Ia32/LShiftU64.asm</Filename>
       <Filename>Ia32/RShiftU64.asm</Filename>
@@ -177,7 +178,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Filename>x86Thunk.c</Filename>
       <Filename>Unaligned.c</Filename>
       <Filename>Math64.c</Filename>
+      <Filename>LongJump.c</Filename>
       <Filename>x64/Non-existing.c</Filename>
+      <Filename>x64/SwitchStack.c</Filename>
       <Filename>x64/SwitchStack.asm</Filename>
       <Filename>x64/SetJump.asm</Filename>
       <Filename>x64/LongJump.asm</Filename>
@@ -265,8 +268,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Arch>
     <Arch ArchType="IPF">
       <Filename>Math64.c</Filename>
+      <Filename>LongJump.c</Filename>
       <Filename>Ipf/PalCallStatic.s</Filename>
       <Filename>Ipf/setjmp.s</Filename>
+      <Filename>x64/SwitchStack.c</Filename>
       <Filename>Ipf/SwitchStack.s</Filename>
       <Filename>Ipf/Unaligned.c</Filename>
       <Filename>Ipf/CpuBreakpoint.c</Filename>
@@ -278,9 +283,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Arch>
     <Arch ArchType="EBC">
       <Filename>Math64.c</Filename>
-      <Filename>SwitchStack.c</Filename>
-      <Filename>SetJumpLongJump.c</Filename>
       <Filename>Unaligned.c</Filename>
+      <Filename>Ebc/SwitchStack.c</Filename>
+      <Filename>Ebc/SetJumpLongJump.c</Filename>
       <Filename>Ebc/CpuBreakpoint.c</Filename>
       <Filename>Ebc/Synchronization.c</Filename>
     </Arch>