remove the unused msa files in MdePkg.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5725 6f19259b-4bc3-4df7-8a09-765794883524
author: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> 2008-08-25 05:00:23 +0000
committer: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> 2008-08-25 05:00:23 +0000
commit: 14bcde689e3e352cbeebbd98d6e5d97a5178acc7 (patch)
tree: acb9f200ebdda39233a22ada0f44712f27006d1a /MdePkg/Library
parent: 7fd9ac0efb0b157fdc710fd2e613a9cfec68c02a (diff)
download: edk2-platforms-14bcde689e3e352cbeebbd98d6e5d97a5178acc7.tar.xz
58 files changed, 0 insertions, 3978 deletions
diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.msa b/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.msa
deleted file mode 100644
index cb156056be..0000000000
--- a/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.msa
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>BaseCacheMaintenanceLib</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>123dd843-57c9-4158-8418-ce68b3944ce7</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Base Cache Maintenance Library</Abstract>
-    <Description>Cache Maintenance Library that uses Base Library services to maintain caches.
-    This library assumes there are no chipset dependencies required to maintain caches.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BaseCacheMaintenanceLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>CacheMaintenanceLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64 IPF">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename SupArchList="IA32">x86Cache.c</Filename>
-    <Filename SupArchList="X64">x86Cache.c</Filename>
-    <Filename SupArchList="EBC">EbcCache.c</Filename>
-    <Filename SupArchList="IPF">IpfCache.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa b/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa
deleted file mode 100644
index d482cf9021..0000000000
--- a/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>BaseDebugLibNull</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>9ba1d976-0624-41a3-8650-28165e8d9ae8</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for NULL Debug Library</Abstract>
-    <Description>Debug Library with empty functions.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BaseDebugLibNull</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DebugLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.msa b/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.msa
deleted file mode 100644
index 618744732e..0000000000
--- a/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.msa
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>BaseDebugLibSerialPort</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>BB83F95F-EDBC-4884-A520-CD42AF388FAE</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Debug Library for UEFI drivers</Abstract>
-    <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DxeDebugLibSerialPort</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PrintLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>SerialPortLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DebugLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdDebugPropertyMask</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the enable/disable of Debug
-                Assert, Debug Print, Debug Code, Clear Memory, Assert
-                Breakpoint and Assert Deadloop.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdDebugClearMemoryValue</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The value used by DebugClearMemory () to fill a certain range
-                of memory.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdDebugPrintErrorLevel</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the kind of debug message
-                output when Debug Print is enabled.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa
deleted file mode 100644
index e974647289..0000000000
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>BaseIoLibIntrinsic</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>926c9cd0-4bb8-479b-9ac4-8a2a23f85307</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Intrinsic Base Io Library</Abstract>
-    <Description>I/O Library that uses compiler intrinsics to perform IN and OUT instructions
-      for IA-32 and x64.  It also performs direct memory access for MMIO services.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BaseIoLibIntrinsic</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>IoLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>IoLibMmioBuffer.c</Filename>
-    <Filename SupArchList="IA32">IoLib.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">IoLibMsc.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">IoLibGcc.c</Filename>
-    <Filename SupArchList="IA32">IoHighLevel.c</Filename>
-    <Filename SupArchList="X64">IoLib.c</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="MSFT">IoLibMsc.c</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">IoLibGcc.c</Filename>
-    <Filename SupArchList="X64">IoHighLevel.c</Filename>
-    <Filename SupArchList="IPF">IoLibIpf.c</Filename>
-    <Filename SupArchList="IPF">IoHighLevel.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED" SupArchList="IPF">
-      <C_Name>PcdIoBlockBaseAddressForIpf</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DefaultValue>0x0ffffc000000</DefaultValue>
-      <HelpText>The base address of IPF IO Block</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
diff --git a/MdePkg/Library/BaseLib/BaseLib.msa b/MdePkg/Library/BaseLib/BaseLib.msa
deleted file mode 100644
index 96b303c8a4..0000000000
--- a/MdePkg/Library/BaseLib/BaseLib.msa
+++ /dev/null
@@ -1,660 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>BaseLib</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>27d67720-ea68-48ae-93da-a3a074c90e30</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Base Library</Abstract>
-    <Description>Base Library implementation.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BaseLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>TimerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>BaseLibInternals.h</Filename>
-    <Filename>String.c</Filename>
-    <Filename>LinkedList.c</Filename>
-    <Filename>Cpu.c</Filename>
-    <Filename>CpuDeadLoop.c</Filename>
-    <Filename>BitField.c</Filename>
-    <Filename>ARShiftU64.c</Filename>
-    <Filename>DivS64x64Remainder.c</Filename>
-    <Filename>DivU64x32.c</Filename>
-    <Filename>DivU64x32Remainder.c</Filename>
-    <Filename>DivU64x64Remainder.c</Filename>
-    <Filename>GetPowerOfTwo32.c</Filename>
-    <Filename>GetPowerOfTwo64.c</Filename>
-    <Filename>HighBitSet32.c</Filename>
-    <Filename>HighBitSet64.c</Filename>
-    <Filename>LowBitSet32.c</Filename>
-    <Filename>LowBitSet64.c</Filename>
-    <Filename>LRotU32.c</Filename>
-    <Filename>LRotU64.c</Filename>
-    <Filename>LShiftU64.c</Filename>
-    <Filename>ModU64x32.c</Filename>
-    <Filename>MultS64x64.c</Filename>
-    <Filename>MultU64x32.c</Filename>
-    <Filename>MultU64x64.c</Filename>
-    <Filename>RRotU32.c</Filename>
-    <Filename>RRotU64.c</Filename>
-    <Filename>RShiftU64.c</Filename>
-    <Filename>SetJump.c</Filename>
-    <Filename>LongJump.c</Filename>
-    <Filename>SwapBytes16.c</Filename>
-    <Filename>SwapBytes32.c</Filename>
-    <Filename>SwapBytes64.c</Filename>
-    <Filename>SwitchStack.c</Filename>
-    <Filename>CheckSum.c</Filename>
-    <Filename SupArchList="IA32 X64 IPF" ToolChainFamily="GCC">SynchronizationGcc.c</Filename>
-    <Filename SupArchList="IA32 X64 IPF" ToolChainFamily="MSFT">SynchronizationMsc.c</Filename>
-    <Filename SupArchList="IA32 X64 IPF" ToolChainFamily="INTEL">Synchronization.c</Filename>
-
-    <Filename SupArchList="IA32">x86DisablePaging32.c</Filename>
-    <Filename SupArchList="IA32">x86DisablePaging64.c</Filename>
-    <Filename SupArchList="IA32">x86EnablePaging32.c</Filename>
-    <Filename SupArchList="IA32">x86EnablePaging64.c</Filename>
-    <Filename SupArchList="IA32">x86FxRestore.c</Filename>
-    <Filename SupArchList="IA32">x86FxSave.c</Filename>
-    <Filename SupArchList="IA32">x86GetInterruptState.c</Filename>
-    <Filename SupArchList="IA32">x86MemoryFence.c</Filename>
-    <Filename SupArchList="IA32">x86Msr.c</Filename>
-    <Filename SupArchList="IA32">x86ReadGdtr.c</Filename>
-    <Filename SupArchList="IA32">x86ReadIdtr.c</Filename>
-    <Filename SupArchList="IA32">x86Thunk.c</Filename>
-    <Filename SupArchList="IA32">x86WriteGdtr.c</Filename>
-    <Filename SupArchList="IA32">x86WriteIdtr.c</Filename>
-    <Filename SupArchList="IA32">Unaligned.c</Filename>
-    <Filename SupArchList="IA32">Ia32/Non-existing.c</Filename>
-    <Filename SupArchList="IA32">Ia32/InternalSwitchStack.c</Filename>
-    <Filename SupArchList="IA32">Ia32/DivS64x64Remainder.c</Filename>
-
-    <!-- GCC assembly code is with .S extension -->
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/LShiftU64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/RShiftU64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ARShiftU64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/LRotU64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/RRotU64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/MultU64x32.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/MultU64x64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/DivU64x32.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ModU64x32.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/DivU64x32Remainder.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/DivU64x64Remainder.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/SwapBytes64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/SetJump.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/LongJump.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuId.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuIdEx.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadEflags.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMsr64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMsr64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadCr0.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadCr2.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadCr3.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadCr4.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteCr0.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteCr2.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteCr3.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteCr4.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr0.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr1.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr2.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr3.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr4.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr5.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr6.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr7.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr0.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr1.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr2.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr3.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr4.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr5.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr6.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr7.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadCs.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDs.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadEs.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadFs.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadGs.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadSs.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadTr.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadGdtr.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteGdtr.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadIdtr.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteIdtr.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadLdtr.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteLdtr.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/FxSave.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/FxRestore.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm0.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm1.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm2.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm3.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm4.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm5.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm6.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm7.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm0.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm1.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm2.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm3.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm4.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm5.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm6.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm7.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadTsc.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadPmc.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/Monitor.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/Mwait.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/EnablePaging32.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/DisablePaging32.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/EnablePaging64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/Wbinvd.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/Invd.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/FlushCacheLine.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/InterlockedIncrement.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/InterlockedDecrement.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/InterlockedCompareExchange32.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/InterlockedCompareExchange64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/EnableInterrupts.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/DisableInterrupts.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/EnableDisableInterrupts.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuSleep.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuPause.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuBreakpoint.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuFlushTlb.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/Thunk16.S</Filename>
-
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuBreakpoint.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuFlushTlb.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuIdEx.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuId.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuPause.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuSleep.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/DisableInterrupts.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/DisablePaging64.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/EnableDisableInterrupts.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/EnableInterrupts.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/EnablePaging64.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/FlushCacheLine.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/FxRestore.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/FxSave.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/InterlockedCompareExchange32.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/InterlockedCompareExchange64.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/InterlockedDecrement.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/InterlockedIncrement.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/Invd.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/LongJump.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/Monitor.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/Mwait.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadCr0.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadCr2.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadCr3.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadCr4.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadCs.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr0.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr1.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr2.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr3.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr4.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr5.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr6.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr7.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDs.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadEflags.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadEs.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadFs.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadGdtr.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadGs.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadIdtr.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadLdtr.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm0.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm1.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm2.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm3.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm4.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm5.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm6.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm7.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMsr64.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadPmc.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadSs.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadTr.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadTsc.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/SetJump.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/SwitchStack.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/Thunk16.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/Wbinvd.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteCr0.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteCr2.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteCr3.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteCr4.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr0.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr1.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr2.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr3.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr4.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr5.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr6.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr7.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteGdtr.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteIdtr.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteLdtr.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm0.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm1.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm2.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm3.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm4.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm5.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm6.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm7.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMsr64.S</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ARShiftU64.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuBreakpoint.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuFlushTlb.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuSleep.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuId.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuIdEx.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuPause.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/DisableInterrupts.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/DisablePaging32.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/DivU64x32.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/DivU64x32Remainder.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/DivU64x64Remainder.c</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/EnableDisableInterrupts.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/EnableInterrupts.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/EnablePaging32.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/EnablePaging64.asm</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/FlushCacheLine.c</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/FxSave.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/FxRestore.c</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/InterlockedIncrement.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/InterlockedDecrement.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/InterlockedCompareExchange32.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/InterlockedCompareExchange64.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/Invd.c</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/LongJump.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/LRotU64.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/LShiftU64.c</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/MultU64x32.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/MultU64x64.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ModU64x32.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/Monitor.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/Mwait.c</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadCr0.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadCr2.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadCr3.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadCr4.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr0.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr1.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr2.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr3.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr4.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr5.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr6.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr7.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadEflags.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm0.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm1.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm2.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm3.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm4.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm5.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm6.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm7.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMsr64.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadCs.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDs.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadEs.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadFs.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadGs.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadSs.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadTr.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadGdtr.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadIdtr.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadLdtr.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadTsc.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadPmc.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/RShiftU64.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/RRotU64.c</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/SetJump.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/SwapBytes64.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/Thunk16.asm</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMsr64.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteCr0.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteCr2.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteCr3.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteCr4.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr0.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr1.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr2.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr3.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr4.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr5.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr6.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr7.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteGdtr.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteIdtr.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteLdtr.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm0.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm1.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm2.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm3.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm4.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm5.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm6.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm7.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/Wbinvd.c</Filename>
-
-    <Filename SupArchList="X64">x86DisablePaging32.c</Filename>
-    <Filename SupArchList="X64">x86DisablePaging64.c</Filename>
-    <Filename SupArchList="X64">x86EnablePaging32.c</Filename>
-    <Filename SupArchList="X64">x86EnablePaging64.c</Filename>
-    <Filename SupArchList="X64">x86FxRestore.c</Filename>
-    <Filename SupArchList="X64">x86FxSave.c</Filename>
-    <Filename SupArchList="X64">x86GetInterruptState.c</Filename>
-    <Filename SupArchList="X64">x86MemoryFence.c</Filename>
-    <Filename SupArchList="X64">x86Msr.c</Filename>
-    <Filename SupArchList="X64">x86ReadGdtr.c</Filename>
-    <Filename SupArchList="X64">x86ReadIdtr.c</Filename>
-    <Filename SupArchList="X64">x86Thunk.c</Filename>
-    <Filename SupArchList="X64">x86WriteGdtr.c</Filename>
-    <Filename SupArchList="X64">x86WriteIdtr.c</Filename>
-    <Filename SupArchList="X64">Unaligned.c</Filename>
-    <Filename SupArchList="X64">Math64.c</Filename>
-    <Filename SupArchList="X64">X64/Non-existing.c</Filename>
-    <Filename SupArchList="X64">X64/SwitchStack.asm</Filename>
-    <Filename SupArchList="X64">X64/SetJump.asm</Filename>
-    <Filename SupArchList="X64">X64/LongJump.asm</Filename>
-    <Filename SupArchList="X64">X64/CpuId.asm</Filename>
-    <Filename SupArchList="X64">X64/CpuIdEx.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadEflags.asm</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/ReadMsr64.c</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/WriteMsr64.c</Filename>
-    <Filename SupArchList="X64">X64/ReadCr0.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadCr2.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadCr3.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadCr4.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteCr0.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteCr2.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteCr3.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteCr4.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDr0.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDr1.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDr2.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDr3.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDr4.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDr5.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDr6.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDr7.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteDr0.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteDr1.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteDr2.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteDr3.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteDr4.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteDr5.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteDr6.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteDr7.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadCs.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDs.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadEs.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadFs.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadGs.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadSs.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadTr.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadGdtr.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteGdtr.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadIdtr.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteIdtr.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadLdtr.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteLdtr.asm</Filename>
-    <Filename SupArchList="X64">X64/FxSave.asm</Filename>
-    <Filename SupArchList="X64">X64/FxRestore.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadMm0.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadMm1.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadMm2.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadMm3.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadMm4.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadMm5.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadMm6.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadMm7.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteMm0.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteMm1.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteMm2.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteMm3.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteMm4.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteMm5.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteMm6.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteMm7.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadTsc.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadPmc.asm</Filename>
-    <Filename SupArchList="X64">X64/Monitor.asm</Filename>
-    <Filename SupArchList="X64">X64/Mwait.asm</Filename>
-    <Filename SupArchList="X64">X64/EnablePaging64.asm</Filename>
-    <Filename SupArchList="X64">X64/DisablePaging64.asm</Filename>
-    <Filename SupArchList="X64">X64/Wbinvd.asm</Filename>
-    <Filename SupArchList="X64">X64/Invd.asm</Filename>
-    <Filename SupArchList="X64">X64/FlushCacheLine.asm</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/InterlockedIncrement.c</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/InterlockedDecrement.c</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/InterlockedCompareExchange32.asm</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/InterlockedCompareExchange64.asm</Filename>
-    <Filename SupArchList="X64">X64/EnableInterrupts.asm</Filename>
-    <Filename SupArchList="X64">X64/DisableInterrupts.asm</Filename>
-    <Filename SupArchList="X64">X64/EnableDisableInterrupts.asm</Filename>
-    <Filename SupArchList="X64">X64/CpuSleep.asm</Filename>
-    <Filename SupArchList="X64">X64/CpuPause.asm</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/CpuBreakpoint.c</Filename>
-    <Filename SupArchList="X64">X64/CpuFlushTlb.asm</Filename>
-    <Filename SupArchList="X64">X64/Thunk16.asm</Filename>
-
-    <Filename SupArchList="IPF">Math64.c</Filename>
-    <Filename SupArchList="IPF">Ipf/asm.h</Filename>
-    <Filename SupArchList="IPF">Ipf/ia_64gen.h</Filename>
-    <Filename SupArchList="IPF">Ipf/PalCallStatic.s</Filename>
-    <Filename SupArchList="IPF">Ipf/setjmp.s</Filename>
-    <Filename SupArchList="IPF">Ipf/longjmp.s</Filename>
-    <Filename SupArchList="IPF">Ipf/SwitchStack.s</Filename>
-    <Filename SupArchList="IPF">Ipf/Unaligned.c</Filename>
-    <Filename SupArchList="IPF">Ipf/CpuBreakpoint.c</Filename>
-    <Filename SupArchList="IPF">Ipf/InterlockedCompareExchange32.s</Filename>
-    <Filename SupArchList="IPF">Ipf/InterlockedCompareExchange64.s</Filename>
-    <Filename SupArchList="IPF">Ipf/Synchronization.c</Filename>
-    <Filename SupArchList="IPF">Ipf/CpuPause.s</Filename>
-    <Filename SupArchList="IPF">Ipf/CpuFlushTlb.s</Filename>
-    <Filename SupArchList="IPF">Ipf/GetInterruptState.s</Filename>
-    <Filename SupArchList="IPF">Ipf/InternalSwitchStack.c</Filename>
-    <Filename SupArchList="IPF">Ipf/FlushCacheRange.s</Filename>
-    <Filename SupArchList="IPF">Ipf/AccessDbr.s</Filename>
-    <Filename SupArchList="IPF">Ipf/AccessEicr.s</Filename>
-    <Filename SupArchList="IPF">Ipf/AccessGcr.s</Filename>
-    <Filename SupArchList="IPF">Ipf/AccessKr.s</Filename>
-    <Filename SupArchList="IPF">Ipf/AccessPmr.s</Filename>
-    <Filename SupArchList="IPF">Ipf/AccessPsr.s</Filename>
-    <Filename SupArchList="IPF">Ipf/AsmPalCall.s</Filename>
-    <Filename SupArchList="IPF">Ipf/ExecFc.s</Filename>
-    <Filename SupArchList="IPF">Ipf/ReadCpuid.s</Filename>
-    <Filename SupArchList="IPF">Ipf/AccessGp.s</Filename>
- 
-    <Filename SupArchList="EBC">Math64.c</Filename>
-    <Filename SupArchList="EBC">Unaligned.c</Filename>
-    <Filename SupArchList="EBC">Ebc/SwitchStack.c</Filename>
-    <Filename SupArchList="EBC">Ebc/SetJumpLongJump.c</Filename>
-    <Filename SupArchList="EBC">Ebc/CpuBreakpoint.c</Filename>
-    <Filename SupArchList="EBC">Ebc/Synchronization.c</Filename>
-    <Filename SupArchList="EBC">Synchronization.c</Filename>
-  </SourceFiles>
-  <NonProcessedFiles>
-    <Filename>Ia32/ARShiftU64.asm</Filename>
-    <Filename>Ia32/CpuBreakpoint.asm</Filename>
-    <Filename>Ia32/CpuFlushTlb.asm</Filename>
-    <Filename>Ia32/CpuId.asm</Filename>
-    <Filename>Ia32/CpuIdEx.asm</Filename>
-    <Filename>Ia32/CpuPause.asm</Filename>
-    <Filename>Ia32/CpuSleep.asm</Filename>
-    <Filename>Ia32/DisableInterrupts.asm</Filename>
-    <Filename>Ia32/DisablePaging32.asm</Filename>
-    <Filename>Ia32/DivU64x32.asm</Filename>
-    <Filename>Ia32/DivU64x32Remainder.asm</Filename>
-    <Filename>Ia32/DivU64x64Remainder.asm</Filename>
-    <Filename>Ia32/EnableDisableInterrupts.asm</Filename>
-    <Filename>Ia32/EnableInterrupts.asm</Filename>
-    <Filename>Ia32/EnablePaging32.asm</Filename>
-    <Filename>Ia32/EnablePaging64.asm</Filename>
-    <Filename>Ia32/FlushCacheLine.asm</Filename>
-    <Filename>Ia32/FxRestore.asm</Filename>
-    <Filename>Ia32/FxSave.asm</Filename>
-    <Filename>Ia32/InterlockedCompareExchange32.asm</Filename>
-    <Filename>Ia32/InterlockedCompareExchange64.asm</Filename>
-    <Filename>Ia32/InterlockedDecrement.asm</Filename>
-    <Filename>Ia32/InterlockedIncrement.asm</Filename>
-    <Filename>Ia32/Invd.asm</Filename>
-    <Filename>Ia32/LongJump.asm</Filename>
-    <Filename>Ia32/LRotU64.asm</Filename>
-    <Filename>Ia32/LShiftU64.asm</Filename>
-    <Filename>Ia32/ModU64x32.asm</Filename>
-    <Filename>Ia32/Monitor.asm</Filename>
-    <Filename>Ia32/MultU64x32.asm</Filename>
-    <Filename>Ia32/MultU64x64.asm</Filename>
-    <Filename>Ia32/Mwait.asm</Filename>
-    <Filename>Ia32/ReadCr0.asm</Filename>
-    <Filename>Ia32/ReadCr2.asm</Filename>
-    <Filename>Ia32/ReadCr3.asm</Filename>
-    <Filename>Ia32/ReadCr4.asm</Filename>
-    <Filename>Ia32/ReadCs.asm</Filename>
-    <Filename>Ia32/ReadDr0.asm</Filename>
-    <Filename>Ia32/ReadDr1.asm</Filename>
-    <Filename>Ia32/ReadDr2.asm</Filename>
-    <Filename>Ia32/ReadDr3.asm</Filename>
-    <Filename>Ia32/ReadDr4.asm</Filename>
-    <Filename>Ia32/ReadDr5.asm</Filename>
-    <Filename>Ia32/ReadDr6.asm</Filename>
-    <Filename>Ia32/ReadDr7.asm</Filename>
-    <Filename>Ia32/ReadDs.asm</Filename>
-    <Filename>Ia32/ReadEflags.asm</Filename>
-    <Filename>Ia32/ReadEs.asm</Filename>
-    <Filename>Ia32/ReadFs.asm</Filename>
-    <Filename>Ia32/ReadGdtr.asm</Filename>
-    <Filename>Ia32/ReadGs.asm</Filename>
-    <Filename>Ia32/ReadIdtr.asm</Filename>
-    <Filename>Ia32/ReadLdtr.asm</Filename>
-    <Filename>Ia32/ReadMm0.asm</Filename>
-    <Filename>Ia32/ReadMm1.asm</Filename>
-    <Filename>Ia32/ReadMm2.asm</Filename>
-    <Filename>Ia32/ReadMm3.asm</Filename>
-    <Filename>Ia32/ReadMm4.asm</Filename>
-    <Filename>Ia32/ReadMm5.asm</Filename>
-    <Filename>Ia32/ReadMm6.asm</Filename>
-    <Filename>Ia32/ReadMm7.asm</Filename>
-    <Filename>Ia32/ReadMsr64.asm</Filename>
-    <Filename>Ia32/ReadPmc.asm</Filename>
-    <Filename>Ia32/ReadSs.asm</Filename>
-    <Filename>Ia32/ReadTr.asm</Filename>
-    <Filename>Ia32/ReadTsc.asm</Filename>
-    <Filename>Ia32/RRotU64.asm</Filename>
-    <Filename>Ia32/RShiftU64.asm</Filename>
-    <Filename>Ia32/SetJump.asm</Filename>
-    <Filename>Ia32/SwapBytes64.asm</Filename>
-    <Filename>Ia32/Thunk16.asm</Filename>
-    <Filename>Ia32/Wbinvd.asm</Filename>
-    <Filename>Ia32/WriteCr0.asm</Filename>
-    <Filename>Ia32/WriteCr2.asm</Filename>
-    <Filename>Ia32/WriteCr3.asm</Filename>
-    <Filename>Ia32/WriteCr4.asm</Filename>
-    <Filename>Ia32/WriteDr0.asm</Filename>
-    <Filename>Ia32/WriteDr1.asm</Filename>
-    <Filename>Ia32/WriteDr2.asm</Filename>
-    <Filename>Ia32/WriteDr3.asm</Filename>
-    <Filename>Ia32/WriteDr4.asm</Filename>
-    <Filename>Ia32/WriteDr5.asm</Filename>
-    <Filename>Ia32/WriteDr6.asm</Filename>
-    <Filename>Ia32/WriteDr7.asm</Filename>
-    <Filename>Ia32/WriteGdtr.asm</Filename>
-    <Filename>Ia32/WriteIdtr.asm</Filename>
-    <Filename>Ia32/WriteLdtr.asm</Filename>
-    <Filename>Ia32/WriteMm0.asm</Filename>
-    <Filename>Ia32/WriteMm1.asm</Filename>
-    <Filename>Ia32/WriteMm2.asm</Filename>
-    <Filename>Ia32/WriteMm3.asm</Filename>
-    <Filename>Ia32/WriteMm4.asm</Filename>
-    <Filename>Ia32/WriteMm5.asm</Filename>
-    <Filename>Ia32/WriteMm6.asm</Filename>
-    <Filename>Ia32/WriteMm7.asm</Filename>
-    <Filename>Ia32/WriteMsr64.asm</Filename>
-  </NonProcessedFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>If PcdMaximumUnicodeStringLength is not zero, the maximum
-                number of characters (not counting the NULL-terminator) in a
-                Unicode string cannot exceed it.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdMaximumAsciiStringLength</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>If PcdMaximumAsciiStringLength is not zero, the maximum number
-                of characters (not counting the NULL-terminator) in an ASCII
-                string cannot exceed it.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdMaximumLinkedListLength</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>If PcdMaximumLinkedListLength is not zero, the maximum number
-                of nodes (not counting the list header) in a linked list
-                cannot exceed it.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdSpinLockTimeout</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>If PcdSpinLockTimeout is not zero, it stands for the timeout
-                value (unit: millisecond) for spin lock.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
diff --git a/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.msa b/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.msa
deleted file mode 100644
index 52fe3bbfba..0000000000
--- a/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.msa
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>BaseMemoryLib</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>fd44e603-002a-4b29-9f5f-529e815b6165</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Base Memory Library</Abstract>
-    <Description>Base Memory Library implementation – no ASM.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BaseMemoryLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>MemLibInternals.h</Filename>
-    <Filename>CopyMem.c</Filename>
-    <Filename>MemLibGuid.c</Filename>
-    <Filename>MemLibGeneric.c</Filename>
-    <Filename>CopyMemWrapper.c</Filename>
-    <Filename>SetMemWrapper.c</Filename>
-    <Filename>SetMem16Wrapper.c</Filename>
-    <Filename>SetMem32Wrapper.c</Filename>
-    <Filename>SetMem64Wrapper.c</Filename>
-    <Filename>CompareMemWrapper.c</Filename>
-    <Filename>ZeroMemWrapper.c</Filename>
-    <Filename>ScanMem8Wrapper.c</Filename>
-    <Filename>ScanMem16Wrapper.c</Filename>
-    <Filename>ScanMem32Wrapper.c</Filename>
-    <Filename>ScanMem64Wrapper.c</Filename>
-    <Filename>SetMem.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa b/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa
deleted file mode 100644
index 8b071c9a0f..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>BaseMemoryLibMmx</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>d458a654-f64c-49db-b8d1-3821306bf1f6</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for MMX Base Memory Library</Abstract>
-    <Description>Base Memory Library that uses MMX registers for high performance.
-      Optimized for use in DXE.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BaseMemoryLibMmx</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>MemLibInternals.h</Filename>
-    <Filename>MemLibGuid.c</Filename>
-    <Filename>CopyMemWrapper.c</Filename>
-    <Filename>SetMemWrapper.c</Filename>
-    <Filename>SetMem16Wrapper.c</Filename>
-    <Filename>SetMem32Wrapper.c</Filename>
-    <Filename>SetMem64Wrapper.c</Filename>
-    <Filename>CompareMemWrapper.c</Filename>
-    <Filename>ZeroMemWrapper.c</Filename>
-    <Filename>ScanMem8Wrapper.c</Filename>
-    <Filename>ScanMem16Wrapper.c</Filename>
-    <Filename>ScanMem32Wrapper.c</Filename>
-    <Filename>ScanMem64Wrapper.c</Filename>
-    <Filename SupArchList="IA32">Ia32/CopyMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ZeroMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem16.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem32.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem64.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/CompareMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem8.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem16.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem32.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem64.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/CopyMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ZeroMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem16.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem32.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem64.S</Filename>
-    <Filename SupArchList="IA32">Ia32/CompareMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem8.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem16.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem32.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem64.S</Filename>
-    <Filename SupArchList="X64">X64/CopyMem.asm</Filename>
-    <Filename SupArchList="X64">X64/SetMem.asm</Filename>
-    <Filename SupArchList="X64">X64/SetMem16.asm</Filename>
-    <Filename SupArchList="X64">X64/SetMem32.asm</Filename>
-    <Filename SupArchList="X64">X64/SetMem64.asm</Filename>
-    <Filename SupArchList="X64">X64/CompareMem.asm</Filename>
-    <Filename SupArchList="X64">X64/ScanMem8.asm</Filename>
-    <Filename SupArchList="X64">X64/ScanMem16.asm</Filename>
-    <Filename SupArchList="X64">X64/ScanMem32.asm</Filename>
-    <Filename SupArchList="X64">X64/ScanMem64.asm</Filename>
-    <Filename SupArchList="X64">X64/ZeroMem.asm</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.msa b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.msa
deleted file mode 100644
index 9772d04c3b..0000000000
--- a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.msa
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>BaseMemoryLibOptDxe</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>02BD55C2-AB1D-4b75-B0FD-9A63AE09B31D</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for RepStr Base Memory Library</Abstract>
-    <Description>Base Memory Library that uses REP string instructions for
-      high performance and small size.  Optimized for use in PEI.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BaseMemoryLibRepStr</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>MemLibInternals.h</Filename>
-    <Filename SupArchList="IA32">MemLibGuid.c</Filename>
-    <Filename SupArchList="IA32">CopyMemWrapper.c</Filename>
-    <Filename SupArchList="IA32">SetMemWrapper.c</Filename>
-    <Filename SupArchList="IA32">SetMem16Wrapper.c</Filename>
-    <Filename SupArchList="IA32">SetMem32Wrapper.c</Filename>
-    <Filename SupArchList="IA32">SetMem64Wrapper.c</Filename>
-    <Filename SupArchList="IA32">CompareMemWrapper.c</Filename>
-    <Filename SupArchList="IA32">ZeroMemWrapper.c</Filename>
-    <Filename SupArchList="IA32">ScanMem8Wrapper.c</Filename>
-    <Filename SupArchList="IA32">ScanMem16Wrapper.c</Filename>
-    <Filename SupArchList="IA32">ScanMem32Wrapper.c</Filename>
-    <Filename SupArchList="IA32">ScanMem64Wrapper.c</Filename>
-    <Filename SupArchList="IA32">Ia32/CopyMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem16.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem32.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem64.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ZeroMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/CompareMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem8.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem16.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem32.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem64.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/CopyMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem16.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem32.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem64.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ZeroMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/CompareMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem8.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem16.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem32.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem64.S</Filename>
-    <Filename SupArchList="X64">MemLibGuid.c</Filename>
-    <Filename SupArchList="X64">CopyMemWrapper.c</Filename>
-    <Filename SupArchList="X64">SetMemWrapper.c</Filename>
-    <Filename SupArchList="X64">SetMem16Wrapper.c</Filename>
-    <Filename SupArchList="X64">SetMem32Wrapper.c</Filename>
-    <Filename SupArchList="X64">SetMem64Wrapper.c</Filename>
-    <Filename SupArchList="X64">CompareMemWrapper.c</Filename>
-    <Filename SupArchList="X64">ZeroMemWrapper.c</Filename>
-    <Filename SupArchList="X64">ScanMem8Wrapper.c</Filename>
-    <Filename SupArchList="X64">ScanMem16Wrapper.c</Filename>
-    <Filename SupArchList="X64">ScanMem32Wrapper.c</Filename>
-    <Filename SupArchList="X64">ScanMem64Wrapper.c</Filename>
-    <Filename SupArchList="X64">x64/CopyMem.asm</Filename>
-    <Filename SupArchList="X64">x64/SetMem.asm</Filename>
-    <Filename SupArchList="X64">x64/SetMem16.asm</Filename>
-    <Filename SupArchList="X64">x64/SetMem32.asm</Filename>
-    <Filename SupArchList="X64">x64/SetMem64.asm</Filename>
-    <Filename SupArchList="X64">x64/ZeroMem.asm</Filename>
-    <Filename SupArchList="X64">x64/CompareMem.asm</Filename>
-    <Filename SupArchList="X64">x64/ScanMem8.asm</Filename>
-    <Filename SupArchList="X64">x64/ScanMem16.asm</Filename>
-    <Filename SupArchList="X64">x64/ScanMem32.asm</Filename>
-    <Filename SupArchList="X64">x64/ScanMem64.asm</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.msa b/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.msa
deleted file mode 100644
index 544f11d5f7..0000000000
--- a/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.msa
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>BaseMemoryLibOptPei</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>D6F43B1B-0F21-462b-B8B7-A033C3EB4261</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for RepStr Base Memory Library</Abstract>
-    <Description>Base Memory Library that uses REP string instructions for
-      high performance and small size.  Optimized for use in PEI.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BaseMemoryLibRepStr</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>MemLibInternals.h</Filename>
-    <Filename SupArchList="IA32">MemLibGuid.c</Filename>
-    <Filename SupArchList="IA32">CopyMemWrapper.c</Filename>
-    <Filename SupArchList="IA32">SetMemWrapper.c</Filename>
-    <Filename SupArchList="IA32">SetMem16Wrapper.c</Filename>
-    <Filename SupArchList="IA32">SetMem32Wrapper.c</Filename>
-    <Filename SupArchList="IA32">SetMem64Wrapper.c</Filename>
-    <Filename SupArchList="IA32">CompareMemWrapper.c</Filename>
-    <Filename SupArchList="IA32">ZeroMemWrapper.c</Filename>
-    <Filename SupArchList="IA32">ScanMem8Wrapper.c</Filename>
-    <Filename SupArchList="IA32">ScanMem16Wrapper.c</Filename>
-    <Filename SupArchList="IA32">ScanMem32Wrapper.c</Filename>
-    <Filename SupArchList="IA32">ScanMem64Wrapper.c</Filename>
-    <Filename SupArchList="IA32">Ia32/CopyMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem16.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem32.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem64.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ZeroMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/CompareMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem8.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem16.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem32.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem64.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/CopyMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem16.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem32.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem64.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ZeroMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/CompareMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem8.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem16.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem32.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem64.S</Filename>
-    <Filename SupArchList="X64">MemLibGuid.c</Filename>
-    <Filename SupArchList="X64">CopyMemWrapper.c</Filename>
-    <Filename SupArchList="X64">SetMemWrapper.c</Filename>
-    <Filename SupArchList="X64">SetMem16Wrapper.c</Filename>
-    <Filename SupArchList="X64">SetMem32Wrapper.c</Filename>
-    <Filename SupArchList="X64">SetMem64Wrapper.c</Filename>
-    <Filename SupArchList="X64">CompareMemWrapper.c</Filename>
-    <Filename SupArchList="X64">ZeroMemWrapper.c</Filename>
-    <Filename SupArchList="X64">ScanMem8Wrapper.c</Filename>
-    <Filename SupArchList="X64">ScanMem16Wrapper.c</Filename>
-    <Filename SupArchList="X64">ScanMem32Wrapper.c</Filename>
-    <Filename SupArchList="X64">ScanMem64Wrapper.c</Filename>
-    <Filename SupArchList="X64">x64/CopyMem.asm</Filename>
-    <Filename SupArchList="X64">x64/SetMem.asm</Filename>
-    <Filename SupArchList="X64">x64/SetMem16.asm</Filename>
-    <Filename SupArchList="X64">x64/SetMem32.asm</Filename>
-    <Filename SupArchList="X64">x64/SetMem64.asm</Filename>
-    <Filename SupArchList="X64">x64/ZeroMem.asm</Filename>
-    <Filename SupArchList="X64">x64/CompareMem.asm</Filename>
-    <Filename SupArchList="X64">x64/ScanMem8.asm</Filename>
-    <Filename SupArchList="X64">x64/ScanMem16.asm</Filename>
-    <Filename SupArchList="X64">x64/ScanMem32.asm</Filename>
-    <Filename SupArchList="X64">x64/ScanMem64.asm</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa
deleted file mode 100644
index 0d98031313..0000000000
--- a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>BaseMemoryLibRepStr</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>e7884bf4-51a1-485b-982a-ff89129983bc</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for RepStr Base Memory Library</Abstract>
-    <Description>Base Memory Library that uses REP string instructions for
-      high performance and small size.  Optimized for use in PEI.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BaseMemoryLibRepStr</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>MemLibInternals.h</Filename>
-    <Filename SupArchList="IA32">MemLibGuid.c</Filename>
-    <Filename SupArchList="IA32">CopyMemWrapper.c</Filename>
-    <Filename SupArchList="IA32">SetMemWrapper.c</Filename>
-    <Filename SupArchList="IA32">SetMem16Wrapper.c</Filename>
-    <Filename SupArchList="IA32">SetMem32Wrapper.c</Filename>
-    <Filename SupArchList="IA32">SetMem64Wrapper.c</Filename>
-    <Filename SupArchList="IA32">CompareMemWrapper.c</Filename>
-    <Filename SupArchList="IA32">ZeroMemWrapper.c</Filename>
-    <Filename SupArchList="IA32">ScanMem8Wrapper.c</Filename>
-    <Filename SupArchList="IA32">ScanMem16Wrapper.c</Filename>
-    <Filename SupArchList="IA32">ScanMem32Wrapper.c</Filename>
-    <Filename SupArchList="IA32">ScanMem64Wrapper.c</Filename>
-    <Filename SupArchList="IA32">Ia32/CopyMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem16.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem32.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem64.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ZeroMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/CompareMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem8.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem16.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem32.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem64.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/CopyMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem16.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem32.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem64.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ZeroMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/CompareMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem8.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem16.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem32.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem64.S</Filename>
-    <Filename SupArchList="X64">MemLibGuid.c</Filename>
-    <Filename SupArchList="X64">CopyMemWrapper.c</Filename>
-    <Filename SupArchList="X64">SetMemWrapper.c</Filename>
-    <Filename SupArchList="X64">SetMem16Wrapper.c</Filename>
-    <Filename SupArchList="X64">SetMem32Wrapper.c</Filename>
-    <Filename SupArchList="X64">SetMem64Wrapper.c</Filename>
-    <Filename SupArchList="X64">CompareMemWrapper.c</Filename>
-    <Filename SupArchList="X64">ZeroMemWrapper.c</Filename>
-    <Filename SupArchList="X64">ScanMem8Wrapper.c</Filename>
-    <Filename SupArchList="X64">ScanMem16Wrapper.c</Filename>
-    <Filename SupArchList="X64">ScanMem32Wrapper.c</Filename>
-    <Filename SupArchList="X64">ScanMem64Wrapper.c</Filename>
-    <Filename SupArchList="X64">x64/CopyMem.asm</Filename>
-    <Filename SupArchList="X64">x64/SetMem.asm</Filename>
-    <Filename SupArchList="X64">x64/SetMem16.asm</Filename>
-    <Filename SupArchList="X64">x64/SetMem32.asm</Filename>
-    <Filename SupArchList="X64">x64/SetMem64.asm</Filename>
-    <Filename SupArchList="X64">x64/ZeroMem.asm</Filename>
-    <Filename SupArchList="X64">x64/CompareMem.asm</Filename>
-    <Filename SupArchList="X64">x64/ScanMem8.asm</Filename>
-    <Filename SupArchList="X64">x64/ScanMem16.asm</Filename>
-    <Filename SupArchList="X64">x64/ScanMem32.asm</Filename>
-    <Filename SupArchList="X64">x64/ScanMem64.asm</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa
deleted file mode 100644
index 5415b3db95..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>BaseMemoryLibSse2</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>65a18235-5096-4032-8c63-214f0249ce8d</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for SSE2 Base Memory Library</Abstract>
-    <Description>Base Memory Library that uses XMM registers for high performance.
-      Optimized for use in DXE.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BaseMemoryLibSse2</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>MemLibInternals.h</Filename>
-    <Filename SupArchList="IA32">MemLibGuid.c</Filename>
-    <Filename SupArchList="IA32">CopyMemWrapper.c</Filename>
-    <Filename SupArchList="IA32">SetMemWrapper.c</Filename>
-    <Filename SupArchList="IA32">SetMem16Wrapper.c</Filename>
-    <Filename SupArchList="IA32">SetMem32Wrapper.c</Filename>
-    <Filename SupArchList="IA32">SetMem64Wrapper.c</Filename>
-    <Filename SupArchList="IA32">CompareMemWrapper.c</Filename>
-    <Filename SupArchList="IA32">ZeroMemWrapper.c</Filename>
-    <Filename SupArchList="IA32">ScanMem8Wrapper.c</Filename>
-    <Filename SupArchList="IA32">ScanMem16Wrapper.c</Filename>
-    <Filename SupArchList="IA32">ScanMem32Wrapper.c</Filename>
-    <Filename SupArchList="IA32">ScanMem64Wrapper.c</Filename>
-    <Filename SupArchList="IA32">Ia32/CopyMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem16.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem32.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem64.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ZeroMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/CompareMem.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem8.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem16.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem32.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem64.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/CopyMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem16.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem32.S</Filename>
-    <Filename SupArchList="IA32">Ia32/SetMem64.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ZeroMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/CompareMem.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem8.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem16.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem32.S</Filename>
-    <Filename SupArchList="IA32">Ia32/ScanMem64.S</Filename>
-    <Filename SupArchList="X64">MemLibGuid.c</Filename>
-    <Filename SupArchList="X64">CopyMemWrapper.c</Filename>
-    <Filename SupArchList="X64">SetMemWrapper.c</Filename>
-    <Filename SupArchList="X64">SetMem16Wrapper.c</Filename>
-    <Filename SupArchList="X64">SetMem32Wrapper.c</Filename>
-    <Filename SupArchList="X64">SetMem64Wrapper.c</Filename>
-    <Filename SupArchList="X64">CompareMemWrapper.c</Filename>
-    <Filename SupArchList="X64">ZeroMemWrapper.c</Filename>
-    <Filename SupArchList="X64">ScanMem8Wrapper.c</Filename>
-    <Filename SupArchList="X64">ScanMem16Wrapper.c</Filename>
-    <Filename SupArchList="X64">ScanMem32Wrapper.c</Filename>
-    <Filename SupArchList="X64">ScanMem64Wrapper.c</Filename>
-    <Filename SupArchList="X64">x64/CopyMem.asm</Filename>
-    <Filename SupArchList="X64">x64/SetMem.asm</Filename>
-    <Filename SupArchList="X64">x64/SetMem16.asm</Filename>
-    <Filename SupArchList="X64">x64/SetMem32.asm</Filename>
-    <Filename SupArchList="X64">x64/SetMem64.asm</Filename>
-    <Filename SupArchList="X64">x64/ZeroMem.asm</Filename>
-    <Filename SupArchList="X64">x64/CompareMem.asm</Filename>
-    <Filename SupArchList="X64">x64/ScanMem8.asm</Filename>
-    <Filename SupArchList="X64">x64/ScanMem16.asm</Filename>
-    <Filename SupArchList="X64">x64/ScanMem32.asm</Filename>
-    <Filename SupArchList="X64">x64/ScanMem64.asm</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
diff --git a/MdePkg/Library/BasePcdLibNull/BasePcdLibNull.msa b/MdePkg/Library/BasePcdLibNull/BasePcdLibNull.msa
deleted file mode 100644
index 4537f602c3..0000000000
--- a/MdePkg/Library/BasePcdLibNull/BasePcdLibNull.msa
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>BasePcdLibNull</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>40096a3a-5c2a-4fbc-aef7-5475dd7ab334</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for NULL PCD Library</Abstract>
-    <Description>PCD Library that only provides access to Feature Flag, Fixed At Build,
-      and Binary Patch typed PCD entries.  Access to Dynamic PCD entries are ignored.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BasePcdLibNull</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PcdLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
diff --git a/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.msa b/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.msa
deleted file mode 100644
index aa6309b269..0000000000
--- a/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.msa
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>BasePciCf8Lib</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>472ab06d-9810-4c00-bb7f-dad1828fc1ab</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Base PCI Cf8 Library.</Abstract>
-    <Description>PCI CF8 Library that uses I/O ports 0xCF8 and 0xCFC to perform PCI Configuration cycles.
-      Layers on top of an I/O Library instance.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BasePciCf8Lib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>PciCf8Lib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>IoLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PciLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa b/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
deleted file mode 100644
index cd46cc6922..0000000000
--- a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>BasePciExpressLib</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>287e50f4-a188-4699-b907-3e4080ca5688</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Base PCI Express Library.</Abstract>
-    <Description>PCI Express Library that uses the 256 MB PCI Express MMIO window to perform
-      PCI Configuration cycles.  Layers on top of an I/O Library instance.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BasePciExpressLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>PciExpressLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>IoLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>    
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PciLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdPciExpressBaseAddress</C_Name>
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The base address of PCI Express MMIO window.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.msa b/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.msa
deleted file mode 100644
index 85edbbabd7..0000000000
--- a/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.msa
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>BasePciLibCf8</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>28bde99c-e8a7-4e3e-9a8a-e66cd64f31c6</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for PCI CF8 Base PCI Library</Abstract>
-    <Description>PCI Library that uses I/O ports 0xCF8 and 0xCFC to perform
-      PCI Configuration cycles.  Layers on top of an I/O Library instance.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BasePciLibCf8</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>PciLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PciCf8Lib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PciLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.msa b/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.msa
deleted file mode 100644
index b39faa8410..0000000000
--- a/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.msa
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>BasePciLibPciExpress</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>8987081e-daeb-44a9-8bef-a195b22d9417</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for PCI Express Base PCI Library.</Abstract>
-    <Description>PCI Library that uses the 256 MB PCI Express MMIO window to perform PCI
-      Configuration cycles.  Layers on top of an I/O Library instance.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BasePciLibPciExpress</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>PciLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PciExpressLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PciLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.msa b/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.msa
deleted file mode 100644
index 5512f6cfbf..0000000000
--- a/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.msa
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>BasePeCoffGetEntryPointLib</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>be490364-73d2-420d-950e-f6450ca75dfb</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file Base PE/Coff Get Entry Point Library</Abstract>
-    <Description>PE/COFF Entry Point Library implementation.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BasePeCoffGetEntryPointLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>PeCoffGetEntryPointLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PeCoffGetEntryPoint.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
deleted file mode 100644
index b3d754d570..0000000000
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>BasePeCoffLib</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>556f5d10-7309-4af4-b80a-8196bd60946f</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Base PE/COFF Library</Abstract>
-    <Description>PE/COFF Loader Library implementation.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BasePeCoffLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>PeCoffLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>BasePeCoff.c</Filename>
-    <Filename>BasePeCoffLibInternals.h</Filename>
-    <Filename SupArchList="IA32">Ia32/PeCoffLoaderEx.c</Filename>
-    <Filename SupArchList="X64">x64/PeCoffLoaderEx.c</Filename>
-    <Filename SupArchList="IPF">Ipf/PeCoffLoaderEx.c</Filename>
-    <Filename SupArchList="EBC">Ebc/PeCoffLoaderEx.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.msa b/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.msa
deleted file mode 100644
index 0026b44e1a..0000000000
--- a/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.msa
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>BasePerformanceLibNull</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>FC120ED3-40E1-46dc-8C9C-AAE3CA139ACF</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for NULL Performance Library</Abstract>
-    <Description>Performance Library that layers on top of the Base Library to measure start
-      and end times using CPU specific timer services if they are available.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BasePerformanceLibNull</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>PerformanceLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PerformanceLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the enable/disable of
-                Performance Measurement.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa b/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa
deleted file mode 100644
index f4095f38dc..0000000000
--- a/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>BasePostCodeLibDebug</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>19e3bbba-beb1-43e8-b32d-9acbb22c7639</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Debug Base Post Code Library.</Abstract>
-    <Description>Post Code Library that layers on top of a Debug Library instance.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BasePostCodeLibDebug</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>PostCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PostCode.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdPostCodePropertyMask</C_Name>
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the enable/disable of Post
-                Code, Post Code Description.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.msa b/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.msa
deleted file mode 100644
index 7677762c55..0000000000
--- a/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.msa
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>BasePostCodeLibPort80</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>b6e9a733-eb75-41b6-b30c-009bcf3801c8</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Port 80 Base Post Code Library.</Abstract>
-    <Description>Post Code Library that writes post code values to I/O port 0x80.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BasePostCodeLibPort80</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>PostCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>IoLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PostCode.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdPostCodePropertyMask</C_Name>
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the enable/disable of Post
-                Code, Post Code Description.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BasePrintLib/BasePrintLib.msa b/MdePkg/Library/BasePrintLib/BasePrintLib.msa
deleted file mode 100644
index 6e6865aa4a..0000000000
--- a/MdePkg/Library/BasePrintLib/BasePrintLib.msa
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>BasePrintLib</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>a86fbfca-0183-4eeb-aa8a-762e3b7da1f3</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Base Print Library.</Abstract>
-    <Description>Print Library implementation.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BasePrintLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>PrintLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PrintLib.c</Filename>
-    <Filename>PrintLibInternal.c</Filename>
-    <Filename>PrintLibInternal.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa b/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa
deleted file mode 100644
index 6861a9faac..0000000000
--- a/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>BaseTimerLibNullTemplate</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>f4731d79-537e-4505-bd52-c03f9b1f6b89</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Timer library NULL template implementaton</Abstract>
-    <Description>A non-functional instance of the Timer Library that can be used as a template
-      for the implementation of a functional timer library instance. This library instance can
-      also be used to test build DXE, Runtime, DXE SAL, and DXE SMM modules that require timer
-      services as well as EBC modules that require timer services</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BaseTimerLibNullTemplate</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>TimerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>TimerLibNull.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.msa b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.msa
deleted file mode 100644
index f8bfc3f754..0000000000
--- a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.msa
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>BaseUefiDecompressLib</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>9ae5147d-b240-467f-a484-b024fdc42ee0</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Base Uefi Decompress Library</Abstract>
-    <Description>UEFI Decompress Library implementation.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BaseUefiDecompressLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>UefiDecompressLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>BaseUefiDecompressLib.c</Filename>
-    <Filename>BaseUefiDecompressLibInternals.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.msa b/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.msa
deleted file mode 100644
index 1de375e020..0000000000
--- a/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.msa
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>DxeCoreHobLib</ModuleName>
-    <ModuleType>DXE_CORE</ModuleType>
-    <GuidValue>882ee1a3-35b2-412c-b8a2-7a8d34a7c390</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Dxe Core Hob Library.</Abstract>
-    <Description>HOB Library implementation for the DXE Core.  Does not have a constructor.
-      Uses gHobList defined in the DXE Core Entry Point Library.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DxeCoreHobLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_CORE">
-      <Keyword>HobLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>HobLib.c</Filename>
-    <Filename>HobLib.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/DxeHobLib/DxeHobLib.msa b/MdePkg/Library/DxeHobLib/DxeHobLib.msa
deleted file mode 100644
index b42203066d..0000000000
--- a/MdePkg/Library/DxeHobLib/DxeHobLib.msa
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>DxeHobLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>f12b59c9-76d0-4661-ad7c-f04d1bef0558</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Dxe Hob Library.</Abstract>
-    <Description>HOB Library implementation that retrieves the HOB List
-      from the System Configuration Table in the EFI System Table.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DxeHobLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>HobLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>HobLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiHobListGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <Constructor>HobLibConstructor</Constructor>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.msa b/MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.msa
deleted file mode 100644
index cb4cd7de94..0000000000
--- a/MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.msa
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>DxeMemoryAllocationLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>4674739d-3195-4fb2-8094-ac1d22d00194</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Dxe Memory Allocation Library</Abstract>
-    <Description>Memory Allocation Library that uses EFI Boot Services to allocate
-      and free memory.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DxeMemoryAllocationLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>MemoryAllocationLib.c</Filename>
-    <Filename>MemoryAllocationLibInternals.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/DxeMemoryLib/DxeMemoryLib.msa b/MdePkg/Library/DxeMemoryLib/DxeMemoryLib.msa
deleted file mode 100644
index 1cd1aed64b..0000000000
--- a/MdePkg/Library/DxeMemoryLib/DxeMemoryLib.msa
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>DxeMemoryLib</ModuleName>
-    <ModuleType>UEFI_DRIVER</ModuleType>
-    <GuidValue>f1bbe03d-2f28-4dee-bec7-d98d7a30c36a</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Dxe Memory Library.</Abstract>
-    <Description>Base Memory Library implementation that uses EFI Boot Services
-      where possible for size reduction.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DxeMemoryLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>MemLibInternals.h</Filename>
-    <Filename>MemLib.c</Filename>
-    <Filename>MemLibGuid.c</Filename>
-    <Filename>MemLibGeneric.c</Filename>
-    <Filename>CopyMemWrapper.c</Filename>
-    <Filename>SetMemWrapper.c</Filename>
-    <Filename>SetMem16Wrapper.c</Filename>
-    <Filename>SetMem32Wrapper.c</Filename>
-    <Filename>SetMem64Wrapper.c</Filename>
-    <Filename>CompareMemWrapper.c</Filename>
-    <Filename>ZeroMemWrapper.c</Filename>
-    <Filename>ScanMem8Wrapper.c</Filename>
-    <Filename>ScanMem16Wrapper.c</Filename>
-    <Filename>ScanMem32Wrapper.c</Filename>
-    <Filename>ScanMem64Wrapper.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.msa b/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.msa
deleted file mode 100644
index 83df67e218..0000000000
--- a/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.msa
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>DxeServicesTableLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>baa1baa3-0a8d-402c-8042-985115fae953</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Dxe Services Table Library.</Abstract>
-    <Description>DXE Services Table Library that retrieves a pointer to the DXE Services
-      Table from the Configuration Table in the EFI System Table.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DxeServicesTableLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>DxeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DxeServicesTableLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiDxeServicesTableGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <Constructor>DxeServicesTableLibConstructor</Constructor>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.msa b/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.msa
deleted file mode 100644
index 87e1da96aa..0000000000
--- a/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.msa
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>DxeSmbusLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>4F369FB1-31A7-423c-960E-B3EFD337894F</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Dxe Smbus Library.</Abstract>
-    <Description>SMBUS Library that layers on top of the SMBUS Protocol.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DxeSmbusLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>SmbusLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>InternalSmbusLib.h</Filename>
-    <Filename>DxeSmbusLib.c</Filename>
-    <Filename>SmbusLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSmbusHcProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <Constructor>SmbusLibConstructor</Constructor>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/HiiLib/HiiLib.msa b/MdePkg/Library/HiiLib/HiiLib.msa
deleted file mode 100644
index feedd2103e..0000000000
--- a/MdePkg/Library/HiiLib/HiiLib.msa
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>HiiLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>3143687A-7C80-404e-B5FE-2D88980E1B1C</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Library instance for HII common routines.</Abstract>
-    <Description>This library instance implements the common HII routines.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>HiiLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>HiiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>HiiLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/IfrSupportLib/IfrSupportLib.msa b/MdePkg/Library/IfrSupportLib/IfrSupportLib.msa
deleted file mode 100644
index dc9d665a14..0000000000
--- a/MdePkg/Library/IfrSupportLib/IfrSupportLib.msa
+++ /dev/null
@@ -1,74 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UefiEfiIfrSupportLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>bf38668e-e231-4baa-99e4-8c0e4c35dca6</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module UefiEfiIfrSupportLib</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation. All rights reserved.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UefiEfiIfrSupportLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>R8Lib.c</Filename>
-    <Filename>R8Lib.h</Filename>
-    <Filename>UefiIfrString.c</Filename>
-    <Filename>UefiIfrOpCodeCreation.c</Filename>
-    <Filename>UefiIfrLibraryInternal.h</Filename>
-    <Filename>UefiIfrForm.c</Filename>
-    <Filename>UefiIfrCommon.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiGlobalVariableGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.msa b/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.msa
deleted file mode 100644
index 2b1bf6ac2e..0000000000
--- a/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.msa
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PeiDxePostCodeLibReportStatusCode</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>e062c52d-78dc-4cc5-b246-b13497a8123c</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Post code library based on report status code library</Abstract>
-    <Description>PostCode Library for PEIMs and DXE drivers that send PostCode to ReportStatusCode</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiDxePostCodeLibReportStatusCode</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER PEIM PEI_CORE UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>PostCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PostCode.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdPostCodePropertyMask</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the enable/disable of Post
-                Code, Post Code Description.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/PeiHobLib/PeiHobLib.msa b/MdePkg/Library/PeiHobLib/PeiHobLib.msa
deleted file mode 100644
index 3a5f65086e..0000000000
--- a/MdePkg/Library/PeiHobLib/PeiHobLib.msa
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PeiHobLib</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>9643128f-ac24-4b3e-b6be-d8849a306153</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Pei Hob Library</Abstract>
-    <Description>HOB Library implementation that uses PEI Services to retrieve the HOB List.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiHobLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="PEIM PEI_CORE">
-      <Keyword>HobLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiServicesLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>HobLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiHobMemoryAllocModuleGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiHobMemoryAllocBspStoreGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiHobMemoryAllocStackGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.msa b/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.msa
deleted file mode 100644
index a458f327c2..0000000000
--- a/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.msa
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PeiIoLibCpuIo</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>b2585b69-fb63-4220-844a-8fbea8bf01af</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Cpu Io Pei Io Library</Abstract>
-    <Description>I/O Library implementation that uses the CPU I/O PPI for I/O
-      and MMIO operations.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiIoLibCpuIo</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="PEIM PEI_CORE">
-      <Keyword>IoLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiServicesTablePointerLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-  	<Filename>IoLibMmioBuffer.c</Filename>
-    <Filename>IoLib.c</Filename>
-    <Filename>IoHighLevel.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.msa b/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.msa
deleted file mode 100644
index 602524b0d3..0000000000
--- a/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.msa
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PeiMemoryAllocationLib</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>b694e0dc-cd4e-4b30-885b-9c164ed3e74a</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Pei Memory Allocation Library</Abstract>
-    <Description>Memory Allocation Library that uses PEI Services to allocate memory.
-      Free operations are ignored.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiMemoryAllocationLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="PEIM PEI_CORE">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiServicesTablePointerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>MemoryAllocationLib.c</Filename>
-    <Filename>MemoryAllocationLibInternals.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.msa b/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.msa
deleted file mode 100644
index 5df4c2733f..0000000000
--- a/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.msa
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PeiMemoryLib</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>3a9759d2-53bc-4eb2-abcd-c93099419063</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Pei Memory Library</Abstract>
-    <Description>Base Memory Library implementation that uses PEI Services
-      where possible for size reduction.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiMemoryLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="PEIM">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiServicesTablePointerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>MemLibInternals.h</Filename>
-    <Filename>MemLib.c</Filename>
-    <Filename>MemLibGuid.c</Filename>
-    <Filename>MemLibGeneric.c</Filename>
-    <Filename>CopyMemWrapper.c</Filename>
-    <Filename>SetMemWrapper.c</Filename>
-    <Filename>SetMem16Wrapper.c</Filename>
-    <Filename>SetMem32Wrapper.c</Filename>
-    <Filename>SetMem64Wrapper.c</Filename>
-    <Filename>CompareMemWrapper.c</Filename>
-    <Filename>ZeroMemWrapper.c</Filename>
-    <Filename>ScanMem8Wrapper.c</Filename>
-    <Filename>ScanMem16Wrapper.c</Filename>
-    <Filename>ScanMem32Wrapper.c</Filename>
-    <Filename>ScanMem64Wrapper.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/PeiPalCallLib/PeiPalCallLib.msa b/MdePkg/Library/PeiPalCallLib/PeiPalCallLib.msa
deleted file mode 100644
index 456019fa1a..0000000000
--- a/MdePkg/Library/PeiPalCallLib/PeiPalCallLib.msa
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PeiPalCallLib</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>B53DC524-6B98-4584-940B-8F1363DEF09E</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Pei PAL call Library</Abstract>
-    <Description>PAL Call Library implementation to wrap the PAL call in PEI.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved.
-      This software and associated documentation (if any) is furnished
-      under a license and may only be used or copied in accordance
-      with the terms of the license. Except as permitted by such
-      license, no part of this software or documentation may be
-      reproduced, stored in a retrieval system, or transmitted in any
-      form or by any means without the express written consent of
-      Intel Corporation.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IPF</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiPalCallLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>PalCallLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiServicesTablePointerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiServicesLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PalCallLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="2604113b-55bb-4337-abf6-24803b0ef369"/>
-  </PackageDependencies>
-  <PPIs>
-    <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>gEfiSecPlatformInformationPpiGuid</PpiCName>
-    </Ppi>
-  </PPIs>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa b/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa
deleted file mode 100644
index 98c5064beb..0000000000
--- a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PeiResourcePublicationLib</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>e8d6390d-e190-4957-9ab6-d47d51b01336</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Pei Resource Publication Library</Abstract>
-    <Description>Resource Publication Library that uses PEI Services to publish system memory.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiResourcePublicationLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="PEIM">
-      <Keyword>ResourcePublicationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiServicesLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PeiResourcePublicationLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.msa b/MdePkg/Library/PeiServicesLib/PeiServicesLib.msa
deleted file mode 100644
index 6232b64188..0000000000
--- a/MdePkg/Library/PeiServicesLib/PeiServicesLib.msa
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PeiServicesLib</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>a804239b-4155-446f-acc8-f0825d74908c</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Pei Services Library.</Abstract>
-    <Description>PEI Services Library implementation.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiServicesLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="PEIM PEI_CORE">
-      <Keyword>PeiServicesLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiServicesTablePointerLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PeiServicesLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.msa b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.msa
deleted file mode 100644
index 6e8480584d..0000000000
--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.msa
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PeiServicesTablePointerLib</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>1c747f6b-0a58-49ae-8ea3-0327a4fa10e3</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Pei Services Table Library</Abstract>
-    <Description>PEI Services Table Library implementation that retrieves a pointer to the
-      PEI Services Table from a global variable.  Not available to modules that execute from
-      read-only memory.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiServicesTablePointerLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="PEIM PEI_CORE">
-      <Keyword>PeiServicesTablePointerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PeiServicesTablePointer.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <Constructor>PeiServicesTablePointerLibConstructor</Constructor>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.msa b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.msa
deleted file mode 100644
index 99c482eb6c..0000000000
--- a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.msa
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PeiServicesTablePointerLibIdt</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>DED3F743-CE2C-4ba6-92A2-FFCE2A6D72D9</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for IPF KR1 Pei Services Table Pointer Library</Abstract>
-    <Description>PEI Services Table Library implementation that retrieves a pointer to the PEI
-      Services Table from the KR1 register on IPF.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiServicesTablePointerLibIdt</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="PEIM PEI_CORE">
-      <Keyword>PeiServicesTablePointerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename SupArchList="IA32 X64">PeiServicesTablePointer.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/AsmPeiSevicesTablePointer.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/AsmPeiSevicesTablePointer.c</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">x64/AsmPeiSevicesTablePointer.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="MSFT">x64/AsmPeiSevicesTablePointer.asm</Filename>
-  </SourceFiles>
-  <NonProcessedFiles>
-    <Filename>Ia32/AsmPeiSevicesTablePointer.Asm</Filename>
-  </NonProcessedFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointerLibKr7.msa b/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointerLibKr7.msa
deleted file mode 100644
index 77f926a80a..0000000000
--- a/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointerLibKr7.msa
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PeiServicesTablePointerLibKr7</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>E0E7D776-E7EB-4e5f-9AA8-54CF3AA64A43</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for IPF KR1 Pei Services Table Pointer Library</Abstract>
-    <Description>PEI Services Table Library implementation that retrieves a pointer to the PEI
-      Services Table from the KR1 register on IPF.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IPF</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiServicesTablePointerLibKr7</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="PEIM PEI_CORE">
-      <Keyword>PeiServicesTablePointerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PeiServicesTablePointer.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.msa b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.msa
deleted file mode 100644
index a39efb9c4e..0000000000
--- a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.msa
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PeiSmbusLib</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>2A1E1C92-AABA-4d62-AC40-F3A4C3387356</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Pei Smbus Library.</Abstract>
-    <Description>SMBUS library that layers on top of the SMBUS PPI.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiSmbusLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="PEIM">
-      <Keyword>SmbusLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiServicesTablePointerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>InternalSmbusLib.h</Filename>
-    <Filename>PeiSmbusLib.c</Filename>
-    <Filename>SmbusLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <PPIs>
-    <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>gEfiPeiSmbusPpi2Guid</PpiCName>
-    </Ppi>
-  </PPIs>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa
deleted file mode 100644
index d6126f74e7..0000000000
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>SecPeiDxeTimerLibCpu</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>b5a05743-9b71-489b-a0ed-a0eb3950d23b</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Timer Library implementation for Boot Timer moudles that require timer services.</Abstract>
-    <Description>Timer Library that uses CPU resources to provide calibrated
-      delays on IA-32 and x64, and uses ITC on IPF. Note: Because CpuLocalApci
-      and ITC could be programmed by OS, it cannot be used by SMM drivers
-      and runtime drivers, ACPI timer is recommended for SMM drivers and RUNTIME
-      drivers.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>SecPeiDxeTimerLibCpu</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="BASE DXE_CORE DXE_DRIVER DXE_SAL_DRIVER PEIM PEI_CORE SEC UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>TimerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">
-      <Keyword>IoLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename SupArchList="IA32">x86TimerLib.c</Filename>
-    <Filename SupArchList="X64">x86TimerLib.c</Filename>
-    <Filename SupArchList="IPF">IpfTimerLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">
-      <C_Name>PcdFSBClock</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>This value is FSB Clock frequency. Its unit is Hz and its default value is 200000000, that means FSB frequency is 200Mhz.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/SerialPortLibNull/SerialPortLibNull.msa b/MdePkg/Library/SerialPortLibNull/SerialPortLibNull.msa
deleted file mode 100644
index 75ecd8353f..0000000000
--- a/MdePkg/Library/SerialPortLibNull/SerialPortLibNull.msa
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>EdkSerialPortLibNull</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>E4541241-8897-411a-91F8-7D7E45837146</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Memory Status Code Library for UEFI drivers</Abstract>
-    <Description>Lib to provide memory journal status code reporting Routines</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>SerialPortLibNull</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>SerialPortLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>SerialPortLibNull.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.msa b/MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.msa
deleted file mode 100644
index 8500f05d89..0000000000
--- a/MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.msa
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UefiApplicationEntryPoint</ModuleName>
-    <ModuleType>UEFI_APPLICATION</ModuleType>
-    <GuidValue>DADE8301-CB29-4fd5-8148-56FD246C5B88</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for the entry point to a EFI Application</Abstract>
-    <Description>Library to abstract entry point to a EFI Application.</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UefiApplicationEntryPoint</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="UEFI_APPLICATION">
-      <Keyword>UefiApplicationEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>ApplicationEntryPoint.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa b/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa
deleted file mode 100644
index fb332b4370..0000000000
--- a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UefiBootServicesTableLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>ff5c7a2c-ab7a-4366-8616-11c6e53247b6</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>UEFI Boot Services Table Library</Abstract>
-    <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UefiBootServicesTableLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>UefiBootServicesTableLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <Constructor>UefiBootServicesTableLibConstructor</Constructor>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa
deleted file mode 100644
index 9acf776d4d..0000000000
--- a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UefiDebugLibConOut</ModuleName>
-    <ModuleType>UEFI_DRIVER</ModuleType>
-    <GuidValue>5cddfaf3-e9a7-4d16-bdce-1e002df475bb</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Debug Library for UEFI drivers</Abstract>
-    <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UefiDebugLibConOut</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PrintLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DebugLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdDebugPropertyMask</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the enable/disable of Debug
-                Assert, Debug Print, Debug Code, Clear Memory, Assert
-                Breakpoint and Assert Deadloop.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdDebugClearMemoryValue</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The value used by DebugClearMemory () to fill a certain range
-                of memory.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdDebugPrintErrorLevel</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the kind of debug message
-                output when Debug Print is enabled.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa
deleted file mode 100644
index b9371c5632..0000000000
--- a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UefiDebugLibStdErr</ModuleName>
-    <ModuleType>UEFI_DRIVER</ModuleType>
-    <GuidValue>b57a1df6-ffdb-4247-a3df-3a562176751a</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Debug Library for UEFI drivers</Abstract>
-    <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UefiDebugLibStdErr</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PrintLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DebugLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdDebugPropertyMask</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the enable/disable of Debug
-                Assert, Debug Print, Debug Code, Clear Memory, Assert
-                Breakpoint and Assert Deadloop.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdDebugClearMemoryValue</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The value used by DebugClearMemory () to fill a certain range
-                of memory.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdDebugPrintErrorLevel</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the kind of debug message
-                output when Debug Print is enabled.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.msa b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.msa
deleted file mode 100644
index b6b94f9df8..0000000000
--- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.msa
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UefiDevicePathLib</ModuleName>
-    <ModuleType>UEFI_DRIVER</ModuleType>
-    <GuidValue>91c1677a-e57f-4191-8b8e-eb7711a716e0</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
-    <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UefiDevicePathLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>UefiDevicePathLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa
deleted file mode 100644
index 6a095e46fd..0000000000
--- a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UefiDevicePathLibDevicePathProtocol</ModuleName>
-    <ModuleType>UEFI_DRIVER</ModuleType>
-    <GuidValue>050EB8C6-C12E-4b86-892B-40985E8B3137</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Uefi Device Path Library via protocol</Abstract>
-    <Description>Device Path Library that layers on top of the UEFI 2.0 Device Path Protocol.
-      This library is not available for EFI 1.10 modules.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UefiDevicePathLibDevicePathProtocol</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>UefiDevicePathLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathUtilitiesProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <Constructor>DevicePathLibConstructor</Constructor>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa b/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa
deleted file mode 100644
index ce63976837..0000000000
--- a/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UefiDriverEntryPoint</ModuleName>
-    <ModuleType>UEFI_DRIVER</ModuleType>
-    <GuidValue>331deb15-454b-48d8-9b74-70d01f3f3556</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
-    <Description>Entry point library to a EFI/DXE driver</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UefiDriverEntryPoint</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER UEFI_DRIVER">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DriverEntryPoint.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/UefiLib/UefiLib.msa b/MdePkg/Library/UefiLib/UefiLib.msa
deleted file mode 100644
index 86caa55e61..0000000000
--- a/MdePkg/Library/UefiLib/UefiLib.msa
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UefiLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>3a004ba5-efe0-4a61-9f1a-267a46ae5ba9</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
-    <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification
-
- Help Port Framework/Tinao code that has conflicts with UEFI 2.0 by hiding the oldconflicts with library functions and supporting implementations of the old
- (EDK/EFI 1.10) and new (EDK II/UEFI 2.0) way. This module is a DXE driver as  it contains DXE enum extensions for EFI event services.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UefiLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PrintLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>UefiLib.c</Filename>
-    <Filename>Console.c</Filename>
-    <Filename>UefiNotTiano.c</Filename>
-    <Filename>UefiLibPrint.c</Filename>
-    <Filename>UefiDriverModel.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDriverBindingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiComponentName2ProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiComponentNameProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDriverConfigurationProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDriverDiagnosticsProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDriverDiagnostics2ProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiEventLegacyBootGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiEventReadyToBootGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>This PCD is used by UefiLib APIs, which are Print, ErrorPrint, AsciiPrint, AsciiErrorPrint. If the length of the formatted Unicode or ASCII string is greater than PcdUefiLibMaxPrintBufferSize, then only the first (PcdUefiLibMaxPrintBufferSize / Sizeof(CHAR16)) Unicode characters or PcdUefiLibMaxPrintBufferSize Ascii characters are sent to the respective console.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdDriverDiagnosticsDisable</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>If this value is set TRUE, autogen will replace Driver Diagnostics Protocol instance with NULL.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdDriverDiagnostics2Disable</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>If this value is set TRUE, autogen will replace Driver Diagnostics2 Protocol instance with NULL.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdComponentNameDisable</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>If this value is set TRUE, autogen will replace Component Name Protocol instance with NULL.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdComponentName2Disable</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>If this value is set TRUE, autogen will replace Component Name2 Protocol instance with NULL.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.msa b/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.msa
deleted file mode 100644
index cf23034cd7..0000000000
--- a/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.msa
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UefiRuntimeLib</ModuleName>
-    <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>
-    <GuidValue>b1ee6c28-54aa-4d17-b705-3e28ccb27b2e</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Runtime driver library</Abstract>
-    <Description>Instance of runtime driver library, Hook VitualAddressChange and 
-      BooterviceExit event and provide runtime service.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>EdkUefiRuntimeLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_RUNTIME_DRIVER DXE_SAL_DRIVER">
-      <Keyword>UefiRuntimeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">
-      <Keyword>EdkDxeSalLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>RuntimeLibInternal.h</Filename>
-    <Filename SupArchList="IA32">Common/RuntimeLib.c</Filename>
-    <Filename SupArchList="IA32">Common/RuntimeService.c</Filename>
-    <Filename SupArchList="X64">Common/RuntimeLib.c</Filename>
-    <Filename SupArchList="X64">Common/RuntimeService.c</Filename>
-    <Filename SupArchList="EBC">Common/RuntimeLib.c</Filename>
-    <Filename SupArchList="EBC">Common/RuntimeService.c</Filename>
-    <Filename SupArchList="IPF">Ipf/RuntimeLib.c</Filename>
-    <Filename SupArchList="IPF">Ipf/RuntimeService.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" SupArchList="IPF"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <Constructor>RuntimeDriverLibConstruct</Constructor>
-      <Destructor>RuntimeDriverLibDeconstruct</Destructor>
-    </Extern>
-    <Extern>
-      <ExitBootServicesCallBack>RuntimeDriverExitBootServices</ExitBootServicesCallBack>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa b/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa
deleted file mode 100644
index 47aafb8bc2..0000000000
--- a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UefiRuntimeServicesTableLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>19cbbb97-ff61-45ff-8c3f-dfa66dd118c8</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>UEFI Runtime Services Table Library</Abstract>
-    <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UefiRuntimeServicesTableLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>UefiRuntimeServicesTableLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <Constructor>UefiRuntimeServicesTableLibConstructor</Constructor>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/UefiScsiLib/EdkScsiLib.msa b/MdePkg/Library/UefiScsiLib/EdkScsiLib.msa
deleted file mode 100644
index 1135e4af27..0000000000
--- a/MdePkg/Library/UefiScsiLib/EdkScsiLib.msa
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>EdkScsiLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>46c9adef-aee6-410c-99e4-240e3af18d8b</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Scsi Dxe Library.</Abstract>
-    <Description>this Libarary implements Scsi command.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>EdkScsiLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>EdkScsiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>ScsiLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00010010</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/MdePkg/Library/UefiUsbLib/UefiUsbLib.msa b/MdePkg/Library/UefiUsbLib/UefiUsbLib.msa
deleted file mode 100644
index 1226226327..0000000000
--- a/MdePkg/Library/UefiUsbLib/UefiUsbLib.msa
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>UefiUsbLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>87eb5df9-722a-4241-ad7f-370d0b3a56d7</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for UsbDxeLib module</Abstract>
-    <Description>This library provides supports for common USB functions.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>UefiUsbLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>UefiUsbLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>hid.h</Filename>
-    <Filename>UsbDxeLib.c</Filename>
-    <Filename>hid.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
author	lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>	2008-08-25 05:00:23 +0000
committer	lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>	2008-08-25 05:00:23 +0000
commit	14bcde689e3e352cbeebbd98d6e5d97a5178acc7 (patch)
tree	acb9f200ebdda39233a22ada0f44712f27006d1a /MdePkg/Library
parent	7fd9ac0efb0b157fdc710fd2e613a9cfec68c02a (diff)
download	edk2-platforms-14bcde689e3e352cbeebbd98d6e5d97a5178acc7.tar.xz