59 files changed, 218 insertions, 218 deletions
diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.msa b/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.msa
index 0aa2b7892b..b668faf519 100644
--- a/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.msa
+++ b/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Library Dependencies:BaseLib</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BaseCacheMaintenanceLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>CacheMaintenanceLib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename SupArchList="IA32">x86Cache.c</Filename>
     <Filename SupArchList="X64">x86Cache.c</Filename>
     <Filename SupArchList="EBC">EbcCache.c</Filename>
diff --git a/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa b/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa
index be28cb2a27..2c23184f8f 100644
--- a/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa
+++ b/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa
@@ -8,7 +8,7 @@
     <Abstract>NULL Debug Library for UEFI drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BaseDebugLibNull</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
@@ -38,7 +38,7 @@
       <Keyword>PrintLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>DebugLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
@@ -48,7 +48,7 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
   </Externs>
-  <PcdCoded xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PcdCoded>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdDebugPropertyMask</C_Name>
       <TokenSpaceGuidCName>FIX_ME_PcdDebugPropertyMask</TokenSpaceGuidCName>
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa
index d944fb54f0..620310d329 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BaseIoLibIntrinsic</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>IoLib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename SupArchList="IA32">IoLib.c</Filename>
     <Filename SupArchList="IA32">IoLibMsc.c</Filename>
     <Filename SupArchList="IA32">IoLibGcc.c</Filename>
diff --git a/MdePkg/Library/BaseLib/BaseLib.msa b/MdePkg/Library/BaseLib/BaseLib.msa
index af8dbe3267..d48cfa286a 100644
--- a/MdePkg/Library/BaseLib/BaseLib.msa
+++ b/MdePkg/Library/BaseLib/BaseLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Memory-only library functions with no library constructordestructor</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BaseLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>BaseLib</Keyword>
     </LibraryClass>
@@ -38,7 +38,7 @@
       <Keyword>PcdLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>String.c</Filename>
     <Filename>LinkedList.c</Filename>
     <Filename>Synchronization.c</Filename>
@@ -291,7 +291,7 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
   </Externs>
-  <PcdCoded xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PcdCoded>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdMaximumUnicodeStringLength</C_Name>
       <TokenSpaceGuidCName>FIX_ME_PcdMaximumUnicodeStringLength</TokenSpaceGuidCName>
diff --git a/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.msa b/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.msa
index 6e7e06e72d..3a82a26f06 100644
--- a/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.msa
+++ b/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Memory-only library functions with no library constructor/destructor</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BaseMemoryLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>CopyMem.c</Filename>
     <Filename>MemLibGuid.c</Filename>
     <Filename>MemLibGeneric.c</Filename>
diff --git a/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa b/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa
index 1afa9986d7..1c8c6b06c1 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa
+++ b/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa
@@ -8,7 +8,7 @@
     <Abstract>Memory-only library functions with no library constructor/destructor</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BaseMemoryLibMmx</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>MemLibGuid.c</Filename>
     <Filename>CopyMemWrapper.c</Filename>
     <Filename>SetMemWrapper.c</Filename>
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa
index 72703d45c3..1aad519301 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa
+++ b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa
@@ -8,7 +8,7 @@
     <Abstract>Memory-only library functions with no library constructor/destructor</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BaseMemoryLibRepStr</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename SupArchList="IA32">MemLibGuid.c</Filename>
     <Filename SupArchList="IA32">CopyMemWrapper.c</Filename>
     <Filename SupArchList="IA32">SetMemWrapper.c</Filename>
diff --git a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa
index ca7c6cff0c..7c8798da7e 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa
+++ b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa
@@ -8,7 +8,7 @@
     <Abstract>Memory-only library functions with no library constructor/destructor</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BaseMemoryLibSse2</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename SupArchList="IA32">MemLibGuid.c</Filename>
     <Filename SupArchList="IA32">CopyMemWrapper.c</Filename>
     <Filename SupArchList="IA32">SetMemWrapper.c</Filename>
diff --git a/MdePkg/Library/BasePcdLibNull/BasePcdLibNull.msa b/MdePkg/Library/BasePcdLibNull/BasePcdLibNull.msa
index 03e60b05b3..26d6609b51 100644
--- a/MdePkg/Library/BasePcdLibNull/BasePcdLibNull.msa
+++ b/MdePkg/Library/BasePcdLibNull/BasePcdLibNull.msa
@@ -8,7 +8,7 @@
     <Abstract>NULL PCD Library</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BasePcdLibNull</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PcdLib</Keyword>
     </LibraryClass>
@@ -29,7 +29,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PcdLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.msa b/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.msa
index bd707830db..308bf53239 100644
--- a/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.msa
+++ b/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BasePciCf8Lib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PciCf8Lib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PciLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa b/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
index 341aff1d33..5dc0ec2a18 100644
--- a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
+++ b/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BasePciExpressLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PciExpressLib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PciLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
@@ -42,7 +42,7 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
   </Externs>
-  <PcdCoded xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PcdCoded>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdPciExpressBaseAddress</C_Name>
       <TokenSpaceGuidCName>FIX_ME_PcdPciExpressBaseAddress</TokenSpaceGuidCName>
diff --git a/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.msa b/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.msa
index 75f14cd4f8..b7ee1ef491 100644
--- a/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.msa
+++ b/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BasePciLibCf8</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PciLib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PciLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.msa b/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.msa
index 82142040e7..3123ea3821 100644
--- a/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.msa
+++ b/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BasePciLibPciExpress</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PciLib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PciLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.msa b/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.msa
index f0548c2c5f..1108bf4859 100644
--- a/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.msa
+++ b/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the PEI library.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004 - 2005, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BasePeCoffGetEntryPointLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PeCoffGetEntryPointLib</Keyword>
     </LibraryClass>
@@ -29,7 +29,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PeCoffGetEntryPoint.c</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
index f3091a6aba..45a2ffe761 100644
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the PEI library.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004 - 2005, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BasePeCoffLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PeCoffLib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>BasePeCoff.c</Filename>
     <Filename SupArchList="IA32">Ia32/PeCoffLoaderEx.c</Filename>
     <Filename SupArchList="X64">x64/PeCoffLoaderEx.c</Filename>
diff --git a/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.msa b/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.msa
index 584a5581f0..1fdbd8634f 100644
--- a/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.msa
+++ b/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BasePerformanceLibNull</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PerformanceLib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>PcdLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PerformanceLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
@@ -42,7 +42,7 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
   </Externs>
-  <PcdCoded xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PcdCoded>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
       <TokenSpaceGuidCName>FIX_ME_PcdPerformanceLibraryPropertyMask</TokenSpaceGuidCName>
diff --git a/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa b/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa
index d821d4176f..e6d992f4bb 100644
--- a/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa
+++ b/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BasePostCodeLibDebug</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PostCodeLib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>PcdLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PostCode.c</Filename>
   </SourceFiles>
   <PackageDependencies>
@@ -42,7 +42,7 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
   </Externs>
-  <PcdCoded xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PcdCoded>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdPostCodePropertyMask</C_Name>
       <TokenSpaceGuidCName>FIX_ME_PcdPostCodePropertyMask</TokenSpaceGuidCName>
diff --git a/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.msa b/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.msa
index 5050b3020a..3cb05f5a62 100644
--- a/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.msa
+++ b/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BasePostCodeLibPort80</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PostCodeLib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>IoLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PostCode.c</Filename>
   </SourceFiles>
   <PackageDependencies>
@@ -42,7 +42,7 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
   </Externs>
-  <PcdCoded xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PcdCoded>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdPostCodePropertyMask</C_Name>
       <TokenSpaceGuidCName>FIX_ME_PcdPostCodePropertyMask</TokenSpaceGuidCName>
diff --git a/MdePkg/Library/BasePrintLib/BasePrintLib.msa b/MdePkg/Library/BasePrintLib/BasePrintLib.msa
index 9f7bb1d70c..5ade57b331 100644
--- a/MdePkg/Library/BasePrintLib/BasePrintLib.msa
+++ b/MdePkg/Library/BasePrintLib/BasePrintLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BasePrintLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PrintLib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PrintLib.c</Filename>
     <Filename>PrintLibInternal.c</Filename>
     <Filename>PrintLibInternal.h</Filename>
diff --git a/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.msa b/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.msa
index c98792569e..fbdd058428 100644
--- a/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.msa
+++ b/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BaseReportStatusCodeLibNull</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>ReportStatusCodeLib</Keyword>
     </LibraryClass>
@@ -41,13 +41,13 @@
       <Keyword>IoLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>ReportStatusCodeLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Guids xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>StatusCodeDataTypeDebug</GuidCName>
     </GuidCNames>
@@ -56,7 +56,7 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
   </Externs>
-  <PcdCoded xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PcdCoded>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdReportStatusCodePropertyMask</C_Name>
       <TokenSpaceGuidCName>FIX_ME_PcdReportStatusCodePropertyMask</TokenSpaceGuidCName>
diff --git a/MdePkg/Library/BaseSmbusLib/BaseSmbusLib.msa b/MdePkg/Library/BaseSmbusLib/BaseSmbusLib.msa
index d0479ecbd5..ad7222d8c7 100644
--- a/MdePkg/Library/BaseSmbusLib/BaseSmbusLib.msa
+++ b/MdePkg/Library/BaseSmbusLib/BaseSmbusLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BaseSmbusLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>SmbusLib</Keyword>
     </LibraryClass>
@@ -38,7 +38,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>SmbusLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa b/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa
index f2a0393826..a50bed3754 100644
--- a/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa
+++ b/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BaseTimerLibLocalApic</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>TimerLib</Keyword>
     </LibraryClass>
@@ -35,7 +35,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename SupArchList="IA32">x86TimerLib.c</Filename>
     <Filename SupArchList="X64">x86TimerLib.c</Filename>
     <Filename SupArchList="IPF">Ipf/PalCallStatic.s</Filename>
diff --git a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.msa b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.msa
index 50bee15ccf..fc2cc41f0a 100644
--- a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.msa
+++ b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BaseUefiDecompressLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>UefiDecompressLib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>BaseUefiDecompressLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.msa b/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.msa
index b12283351a..d190adec7c 100644
--- a/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.msa
+++ b/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to the DXE Core</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>DxeCoreEntryPoint</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>DxeCoreEntryPoint</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>BaseLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>DxeCoreEntryPoint.c</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.msa b/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.msa
index 8089ec1535..ddb09e5263 100644
--- a/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.msa
+++ b/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>DxeCoreHobLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>HobLib</Keyword>
     </LibraryClass>
@@ -35,7 +35,7 @@
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>HobLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/MdePkg/Library/DxeHobLib/DxeHobLib.msa b/MdePkg/Library/DxeHobLib/DxeHobLib.msa
index 8756b4959d..bee9116fa6 100644
--- a/MdePkg/Library/DxeHobLib/DxeHobLib.msa
+++ b/MdePkg/Library/DxeHobLib/DxeHobLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>DxeHobLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>HobLib</Keyword>
     </LibraryClass>
@@ -35,18 +35,18 @@
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>HobLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Guids xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>HobList</GuidCName>
     </GuidCNames>
   </Guids>
-  <Externs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
diff --git a/MdePkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.msa b/MdePkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.msa
index 7b17fbbc00..0d95875cc2 100644
--- a/MdePkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.msa
+++ b/MdePkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.msa
@@ -8,7 +8,7 @@
     <Abstract>I/O Library implemented with Framework CPU I/O Protocol</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>DxeIoLibCpuIo</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>IoLib</Keyword>
     </LibraryClass>
@@ -35,19 +35,19 @@
       <Keyword>BaseLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>IoLib.c</Filename>
     <Filename>IoHighLevel.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Protocols xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>CpuIo</ProtocolCName>
     </Protocol>
   </Protocols>
-  <Externs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
diff --git a/MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.msa b/MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.msa
index 851e0b882a..e2bd031305 100644
--- a/MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.msa
+++ b/MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>DxeMemoryAllocationLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>MemoryAllocationLib</Keyword>
     </LibraryClass>
@@ -35,7 +35,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>MemoryAllocationLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.msa b/MdePkg/Library/DxePcdLib/DxePcdLib.msa
index a178463c61..c250fbeb3a 100644
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.msa
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.msa
@@ -8,7 +8,7 @@
     <Abstract>IO Library implemented with Framework CPU IO Protocol</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>DxePcdLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PcdLib</Keyword>
     </LibraryClass>
@@ -32,18 +32,18 @@
       <Keyword>UefiBootServicesTableLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>DxePcdLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Protocols xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>PcdProtocol</ProtocolCName>
     </Protocol>
   </Protocols>
-  <Externs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
diff --git a/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa b/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa
index d3da36bb7d..4ee2fa6cc0 100644
--- a/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa
+++ b/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>DxeReportStatusCodeLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>ReportStatusCodeLib</Keyword>
     </LibraryClass>
@@ -44,18 +44,18 @@
       <Keyword>IoLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>ReportStatusCodeLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Protocols xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>StatusCode</ProtocolCName>
     </Protocol>
   </Protocols>
-  <Guids xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>StatusCodeDataTypeAssert</GuidCName>
     </GuidCNames>
@@ -70,7 +70,7 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
   </Externs>
-  <PcdCoded xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PcdCoded>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdReportStatusCodePropertyMask</C_Name>
       <TokenSpaceGuidCName>FIX_ME_PcdReportStatusCodePropertyMask</TokenSpaceGuidCName>
diff --git a/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.msa b/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.msa
index 036a0c2199..39ab99b9bf 100644
--- a/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.msa
+++ b/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>DxeServicesTableLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>DxeServicesTableLib</Keyword>
     </LibraryClass>
@@ -32,18 +32,18 @@
       <Keyword>UefiLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>DxeServicesTableLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Guids xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>DxeServicesTable</GuidCName>
     </GuidCNames>
   </Guids>
-  <Externs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
diff --git a/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.msa b/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.msa
index 59d3f02dad..6079d5e13c 100644
--- a/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.msa
+++ b/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.msa
@@ -8,7 +8,7 @@
     <Abstract>SmBus Library Instance implemented with SmBus Protocol.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>DxeSmbusLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>SmbusLib</Keyword>
     </LibraryClass>
@@ -35,19 +35,19 @@
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>DxeSmbusLib.c</Filename>
     <Filename>SmbusLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Protocols xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>Smbus</ProtocolCName>
     </Protocol>
   </Protocols>
-  <Externs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
diff --git a/MdePkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.msa b/MdePkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.msa
index 50ba5ab1a3..613b57ad7f 100644
--- a/MdePkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.msa
+++ b/MdePkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFI/DXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>DxeSmmDriverEntryPoint</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>DxeSmmDriverEntryPoint</Keyword>
     </LibraryClass>
@@ -35,13 +35,13 @@
       <Keyword>BaseLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>DriverEntryPoint.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Protocols xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>DevicePath</ProtocolCName>
     </Protocol>
diff --git a/MdePkg/Library/HiiLib/HiiLib.msa b/MdePkg/Library/HiiLib/HiiLib.msa
index 56bc22cb29..27fa8cd764 100644
--- a/MdePkg/Library/HiiLib/HiiLib.msa
+++ b/MdePkg/Library/HiiLib/HiiLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>HiiLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>HiiLib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>MemoryAllocationLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>HiiLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.msa b/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.msa
index f50c32e13c..954adaef87 100644
--- a/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.msa
+++ b/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to the PEI Core</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,12 +21,12 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>PeiCoreEntryPoint</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PeiCoreEntryPoint</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PeiCoreEntryPoint.c</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/MdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa b/MdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa
index 0f30945d80..b0fa724863 100644
--- a/MdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa
+++ b/MdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa
@@ -8,7 +8,7 @@
     <Abstract>Debug Library for PEIMs that send debug messages to ReportStatusCode</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>PeiDxeDebugLibReportStatusCode</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
@@ -38,7 +38,7 @@
       <Keyword>PcdLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>DebugLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
@@ -48,7 +48,7 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
   </Externs>
-  <PcdCoded xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PcdCoded>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdDebugPropertyMask</C_Name>
       <TokenSpaceGuidCName>FIX_ME_PcdDebugPropertyMask</TokenSpaceGuidCName>
diff --git a/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.msa b/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.msa
index 0450723716..2cee208ef9 100644
--- a/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.msa
+++ b/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>PeiDxePostCodeLibReportStatusCode</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PostCodeLib</Keyword>
     </LibraryClass>
@@ -35,7 +35,7 @@
       <Keyword>BaseLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PostCode.c</Filename>
   </SourceFiles>
   <PackageDependencies>
@@ -45,7 +45,7 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
   </Externs>
-  <PcdCoded xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PcdCoded>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdPostCodePropertyMask</C_Name>
       <TokenSpaceGuidCName>FIX_ME_PcdPostCodePropertyMask</TokenSpaceGuidCName>
diff --git a/MdePkg/Library/PeiHobLib/PeiHobLib.msa b/MdePkg/Library/PeiHobLib/PeiHobLib.msa
index e000e0eb20..c44e429cfb 100644
--- a/MdePkg/Library/PeiHobLib/PeiHobLib.msa
+++ b/MdePkg/Library/PeiHobLib/PeiHobLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>PeiHobLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>HobLib</Keyword>
     </LibraryClass>
@@ -35,13 +35,13 @@
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>HobLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Guids xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>HobMemoryAllocModule</GuidCName>
     </GuidCNames>
diff --git a/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.msa b/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.msa
index 8c564be37a..8e70d1c5c7 100644
--- a/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.msa
+++ b/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.msa
@@ -8,7 +8,7 @@
     <Abstract>I/O Library implemented with Framework CPU I/O Protocol</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>PeiIoLibCpuIo</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>IoLib</Keyword>
     </LibraryClass>
@@ -35,7 +35,7 @@
       <Keyword>PeiServicesTablePointerLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>IoLib.c</Filename>
     <Filename>IoHighLevel.c</Filename>
   </SourceFiles>
diff --git a/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.msa b/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.msa
index b860bfa921..148ea09f65 100644
--- a/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.msa
+++ b/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>PeiMemoryAllocationLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>MemoryAllocationLib</Keyword>
     </LibraryClass>
@@ -35,7 +35,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>MemoryAllocationLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.msa b/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.msa
index 4b7f565020..e12db378c2 100644
--- a/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.msa
+++ b/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Memory-only library functions with no library constructor/destructor</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>PeiMemoryLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
@@ -35,7 +35,7 @@
       <Keyword>BaseLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>MemLib.c</Filename>
     <Filename>MemLibGuid.c</Filename>
     <Filename>MemLibGeneric.c</Filename>
diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.msa b/MdePkg/Library/PeiPcdLib/PeiPcdLib.msa
index cc4a80c0f3..8c3c1e73f8 100644
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.msa
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.msa
@@ -8,7 +8,7 @@
     <Abstract>PCD Library Instance implemented with PCD PPI.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>PeiPcdLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PcdLib</Keyword>
     </LibraryClass>
@@ -35,7 +35,7 @@
       <Keyword>PeiServicesTablePointerLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PeiPcdLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa b/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa
index 46d65e8dd2..790db947f1 100644
--- a/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa
+++ b/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>PeiReportStatusCodeLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>ReportStatusCodeLib</Keyword>
     </LibraryClass>
@@ -44,13 +44,13 @@
       <Keyword>IoLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>ReportStatusCodeLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Guids xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>StatusCodeDataTypeDebug</GuidCName>
     </GuidCNames>
@@ -65,7 +65,7 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
   </Externs>
-  <PcdCoded xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PcdCoded>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdReportStatusCodePropertyMask</C_Name>
       <TokenSpaceGuidCName>FIX_ME_PcdReportStatusCodePropertyMask</TokenSpaceGuidCName>
diff --git a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa b/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa
index 849ca057a0..02e7f04fc3 100644
--- a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa
+++ b/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>PeiResourcePublicationLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>ResourcePublicationLib</Keyword>
     </LibraryClass>
@@ -32,7 +32,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PeiResourcePublicationLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.msa b/MdePkg/Library/PeiServicesLib/PeiServicesLib.msa
index 983b919048..fd2f70bfe0 100644
--- a/MdePkg/Library/PeiServicesLib/PeiServicesLib.msa
+++ b/MdePkg/Library/PeiServicesLib/PeiServicesLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>PeiServicesLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PeiServicesLib</Keyword>
     </LibraryClass>
@@ -29,7 +29,7 @@
       <Keyword>PeiServicesTablePointerLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PeiServicesLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.msa b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.msa
index 6b47a3103c..9a4a8a668b 100644
--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.msa
+++ b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>PeiServicesTablePointerLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PeiServicesTablePointerLib</Keyword>
     </LibraryClass>
@@ -29,13 +29,13 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PeiServicesTablePointer.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Externs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
diff --git a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.msa b/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.msa
index 051c572e96..cc04d99f63 100644
--- a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.msa
+++ b/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>PeiServicesTablePointerLibMm7</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PeiServicesTablePointerLib</Keyword>
     </LibraryClass>
@@ -32,13 +32,13 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PeiServicesTablePointer.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Externs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
diff --git a/MdePkg/Library/PeiSmbusLib/PeiSmbusLib.msa b/MdePkg/Library/PeiSmbusLib/PeiSmbusLib.msa
index 57ef6fd9c2..a4a5bc16a0 100644
--- a/MdePkg/Library/PeiSmbusLib/PeiSmbusLib.msa
+++ b/MdePkg/Library/PeiSmbusLib/PeiSmbusLib.msa
@@ -8,7 +8,7 @@
     <Abstract>SmBus Library Instance implemented with SmBus PPI.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>PeiSmbusLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>SmbusLib</Keyword>
     </LibraryClass>
@@ -38,14 +38,14 @@
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PeiSmbusLib.c</Filename>
     <Filename>SmbusLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <PPIs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PPIs>
     <Ppi Usage="ALWAYS_CONSUMED">
       <PpiCName>Smbus</PpiCName>
     </Ppi>
diff --git a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.msa b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.msa
index 59243523c5..4c3f3ee3a7 100644
--- a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.msa
+++ b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to the PEI Core</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>PeimEntryPoint</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>PeimEntryPoint</Keyword>
     </LibraryClass>
@@ -29,7 +29,7 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>PeimEntryPoint.c</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa b/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa
index 6c15ac478f..e5147bbfa9 100644
--- a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa
+++ b/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa
@@ -8,7 +8,7 @@
     <Abstract>UEFI Boot Services Table Library</Abstract>
     <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>UefiBootServicesTableLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>UefiBootServicesTableLib</Keyword>
     </LibraryClass>
@@ -29,13 +29,13 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>UefiBootServicesTableLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Externs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
diff --git a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa
index 55844fe8ee..bf9e6f4b3a 100644
--- a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa
+++ b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa
@@ -8,7 +8,7 @@
     <Abstract>Debug Library for UEFI drivers</Abstract>
     <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>UefiDebugLibConOut</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
@@ -41,7 +41,7 @@
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>DebugLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
@@ -51,7 +51,7 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
   </Externs>
-  <PcdCoded xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PcdCoded>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdDebugPropertyMask</C_Name>
       <TokenSpaceGuidCName>FIX_ME_PcdDebugPropertyMask</TokenSpaceGuidCName>
diff --git a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa
index 4eba69c3e3..b2f90b0b96 100644
--- a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa
+++ b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa
@@ -8,7 +8,7 @@
     <Abstract>Debug Library for UEFI drivers</Abstract>
     <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>UefiDebugLibStdErr</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
@@ -41,7 +41,7 @@
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>DebugLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
@@ -51,7 +51,7 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
   </Externs>
-  <PcdCoded xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PcdCoded>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdDebugPropertyMask</C_Name>
       <TokenSpaceGuidCName>FIX_ME_PcdDebugPropertyMask</TokenSpaceGuidCName>
diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.msa b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.msa
index 1e06dedff9..e40cff672f 100644
--- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.msa
+++ b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.msa
@@ -8,7 +8,7 @@
     <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, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>UefiDevicePathLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>DevicePathLib</Keyword>
     </LibraryClass>
@@ -41,13 +41,13 @@
       <Keyword>BaseLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>UefiDevicePathLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Protocols xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>DevicePath</ProtocolCName>
     </Protocol>
diff --git a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa
index f9e07f3b7d..4c6198612a 100644
--- a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa
+++ b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa
@@ -8,7 +8,7 @@
     <Abstract>Device Path Library</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>UefiDevicePathLibDevicePathProtocol</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>DevicePathLib</Keyword>
     </LibraryClass>
@@ -41,18 +41,18 @@
       <Keyword>UefiBootServicesTableLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>UefiDevicePathLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Protocols xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>DevicePathUtilities</ProtocolCName>
     </Protocol>
   </Protocols>
-  <Externs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
diff --git a/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa b/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa
index aa1f69e086..f5c8813947 100644
--- a/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa
+++ b/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa
@@ -8,7 +8,7 @@
     <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) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>UefiDriverEntryPoint</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>UefiDriverEntryPoint</Keyword>
     </LibraryClass>
@@ -38,13 +38,13 @@
       <Keyword>UefiRuntimeServicesTableLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>DriverEntryPoint.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Protocols xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>LoadedImage</ProtocolCName>
     </Protocol>
diff --git a/MdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.msa b/MdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.msa
index d8ca733e8b..7957d6643c 100644
--- a/MdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.msa
+++ b/MdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.msa
@@ -8,7 +8,7 @@
     <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) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>UefiDriverModelLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>UefiDriverModelLib</Keyword>
     </LibraryClass>
@@ -32,13 +32,13 @@
       <Keyword>UefiBootServicesTableLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>UefiDriverModelLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Protocols xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>DriverBinding</ProtocolCName>
     </Protocol>
@@ -52,7 +52,7 @@
       <ProtocolCName>DriverDiagnostics</ProtocolCName>
     </Protocol>
   </Protocols>
-  <Externs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
diff --git a/MdePkg/Library/UefiLib/UefiLib.msa b/MdePkg/Library/UefiLib/UefiLib.msa
index 3c4352a833..14046cd10b 100644
--- a/MdePkg/Library/UefiLib/UefiLib.msa
+++ b/MdePkg/Library/UefiLib/UefiLib.msa
@@ -8,7 +8,7 @@
     <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) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>UefiLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>UefiLib</Keyword>
     </LibraryClass>
@@ -41,7 +41,7 @@
       <Keyword>MemoryAllocationLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>UefiLib.c</Filename>
     <Filename>Console.c</Filename>
     <Filename>UefiNotTiano.c</Filename>
@@ -49,7 +49,7 @@
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Guids xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>EventLegacyBoot</GuidCName>
     </GuidCNames>
diff --git a/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.msa b/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.msa
index 57393a95b5..cadeec581d 100644
--- a/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.msa
+++ b/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Memory-only library functions with no library constructor/destructor</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>UefiMemoryLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
@@ -35,7 +35,7 @@
       <Keyword>BaseLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>MemLib.c</Filename>
     <Filename>MemLibGuid.c</Filename>
     <Filename>MemLibGeneric.c</Filename>
diff --git a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa b/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa
index a8bd50405d..0e8cc087f5 100644
--- a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa
+++ b/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa
@@ -8,7 +8,7 @@
     <Abstract>UEFI Runtime Services Table Library</Abstract>
     <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+    <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
@@ -21,7 +21,7 @@
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>UefiRuntimeServicesTableLib</OutputFileBasename>
   </ModuleDefinitions>
-  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>UefiRuntimeServicesTableLib</Keyword>
     </LibraryClass>
@@ -29,13 +29,13 @@
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SourceFiles>
     <Filename>UefiRuntimeServicesTableLib.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
-  <Externs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>