removed unnecessary name space declarations in some top level elements

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@700 6f19259b-4bc3-4df7-8a09-765794883524
author: jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524> 2006-06-30 20:31:48 +0000
committer: jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524> 2006-06-30 20:31:48 +0000
commit: 5b2a7957d9215b45e87de228b69b89aa21fafd3e (patch)
tree: 253c29aaee33ab3c0bd9d15c929f12481bd5e120 /MdePkg
parent: ff34e632aaca5f91bf677c6835e574009019368a (diff)
download: edk2-5b2a7957d9215b45e87de228b69b89aa21fafd3e.zip
edk2-5b2a7957d9215b45e87de228b69b89aa21fafd3e.tar.gz
edk2-5b2a7957d9215b45e87de228b69b89aa21fafd3e.tar.bz2
62 files changed, 229 insertions, 229 deletions
diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.msa b/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.msa
index 0aa2b78..b668faf 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 be28cb2..2c23184 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 d944fb5..620310d 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 af8dbe3..d48cfa2 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 6e7e06e..3a82a26 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 1afa998..1c8c6b0 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 72703d4..1aad519 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 ca7c6cf..7c8798d 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 03e60b0..26d6609 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 bd70783..308bf53 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 341aff1..5dc0ec2 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 75f14cd..b7ee1ef 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 8214204..3123ea3 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 f0548c2..1108bf4 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 f3091a6..45a2ffe 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 584a558..1fdbd86 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 d821d41..e6d992f 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 5050b30..3cb05f5 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 9f7bb1d..5ade57b 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 c987925..fbdd058 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 d0479ec..ad7222d 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 f2a0393..a50bed3 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 50bee15..fc2cc41 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 b122833..d190ade 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 8089ec1..ddb09e5 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 8756b49..bee9116 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 7b17fbb..0d95875 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 851e0b8..e2bd031 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 a178463..c250fbe 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 d3da36b..4ee2fa6 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 036a0c2..39ab99b 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 59d3f02..6079d5e 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 50ba5ab..613b57a 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 56bc22c..27fa8cd 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 f50c32e..954adae 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 0f30945..b0fa724 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 0450723..2cee208 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 e000e0e..c44e429 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 8c564be..8e70d1c 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 b860bfa..148ea09 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 4b7f565..e12db37 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 cc4a80c..8c3c1e7 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 46d65e8..790db94 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 849ca05..02e7f04 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 983b919..fd2f70b 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 6b47a31..9a4a8a6 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 051c572..cc04d99 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 57ef6fd..a4a5bc1 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 5924352..4c3f3ee 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 6c15ac4..e5147bb 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 55844fe..bf9e6f4 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 4eba69c..b2f90b0 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 1e06ded..e40cff6 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 f9e07f3..4c61986 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 aa1f69e..f5c8813 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 d8ca733..7957d66 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 3c4352a..14046cd 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 57393a9..cadeec5 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 a8bd504..0e8cc08 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>
diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd
index cba224b..db46ce4 100644
--- a/MdePkg/MdePkg-All-Archs.fpd
+++ b/MdePkg/MdePkg-All-Archs.fpd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PlatformSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <PlatformHeader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PlatformHeader>
     <PlatformName>MdePkgAll</PlatformName>
     <GuidValue>0fe7dd3e-0969-48c3-8cd2-de9a190088e2</GuidValue>
     <Version>0.3</Version>
@@ -16,16 +16,16 @@
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </PlatformHeader>
-  <PlatformDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PlatformDefinitions>
     <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
     <BuildTargets>DEBUG</BuildTargets>
     <IntermediateDirectories>UNIFIED</IntermediateDirectories>
     <OutputDirectory/>
   </PlatformDefinitions>
-  <Flash xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Flash>
     <FlashDefinitionFile>dummy.fdf</FlashDefinitionFile>
   </Flash>
-  <FrameworkModules xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <FrameworkModules>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30">
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
@@ -2543,7 +2543,7 @@
       </ModuleSaBuildOptions>
     </ModuleSA>
   </FrameworkModules>
-  <BuildOptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <BuildOptions>
     <Options>
       <!-- MSFT tool chain options definition : IA32 -->
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="CC">
diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index 6066003..9d2aaac 100644
--- a/MdePkg/MdePkg.fpd
+++ b/MdePkg/MdePkg.fpd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PlatformSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <PlatformHeader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PlatformHeader>
     <PlatformName>MdePkg</PlatformName>
     <GuidValue>1123e1a9-4d9b-499f-843c-b2297ff61a11</GuidValue>
     <Version>0.3</Version>
@@ -16,16 +16,16 @@
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </PlatformHeader>
-  <PlatformDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <PlatformDefinitions>
     <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
     <BuildTargets>DEBUG</BuildTargets>
     <IntermediateDirectories>UNIFIED</IntermediateDirectories>
     <OutputDirectory/>
   </PlatformDefinitions>
-  <Flash xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Flash>
     <FlashDefinitionFile>dummy.fdf</FlashDefinitionFile>
   </Flash>
-  <FrameworkModules xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <FrameworkModules>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30">
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
@@ -815,7 +815,7 @@
       </ModuleSaBuildOptions>
     </ModuleSA>
   </FrameworkModules>
-  <BuildOptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <BuildOptions>
     <!-- UserDefiendAntTasks -->
     <Options>
       <!-- MSFT tool chain options definition : IA32 -->
diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 964ced5..d0d306a 100644
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<PackageSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
   <SpdHeader>
     <PackageName>MdePkg</PackageName>
     <GuidValue>5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec</GuidValue>
author	jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>	2006-06-30 20:31:48 +0000
committer	jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>	2006-06-30 20:31:48 +0000
commit	5b2a7957d9215b45e87de228b69b89aa21fafd3e (patch)
tree	253c29aaee33ab3c0bd9d15c929f12481bd5e120 /MdePkg
parent	ff34e632aaca5f91bf677c6835e574009019368a (diff)
download	edk2-5b2a7957d9215b45e87de228b69b89aa21fafd3e.zip edk2-5b2a7957d9215b45e87de228b69b89aa21fafd3e.tar.gz edk2-5b2a7957d9215b45e87de228b69b89aa21fafd3e.tar.bz2