From 44050d53afe3a38812977a3e8f5f2860237a3690 Mon Sep 17 00:00:00 2001
From: jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 7 Jul 2006 09:28:33 +0000
Subject: Obsoleted by new schema and new build tools.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@821 6f19259b-4bc3-4df7-8a09-765794883524
---
 EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.mbd         | 44 ------------------
 EdkNt32Pkg/Dxe/ConPlatform/build.xml               | 47 -------------------
 .../MiscSubclass/MiscSubclassDriver.mbd            | 45 ------------------
 EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/build.xml | 47 -------------------
 EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.mbd         | 54 ----------------------
 EdkNt32Pkg/Dxe/PlatformBds/build.xml               | 47 -------------------
 .../Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.mbd    | 41 ----------------
 EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/build.xml    | 47 -------------------
 .../Dxe/WinNtThunk/Bus/Console/WinNtConsole.mbd    | 41 ----------------
 EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/build.xml    | 47 -------------------
 .../Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.mbd  | 42 -----------------
 EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/build.xml   | 47 -------------------
 .../Bus/SimpleFileSystem/WinNtSimpleFileSystem.mbd | 41 ----------------
 .../Dxe/WinNtThunk/Bus/SimpleFileSystem/build.xml  | 47 -------------------
 EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.mbd     | 41 ----------------
 EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/build.xml        | 47 -------------------
 .../Bus/WinNtBusDriver/WinNtBusDriver.mbd          | 43 -----------------
 .../Dxe/WinNtThunk/Bus/WinNtBusDriver/build.xml    | 47 -------------------
 .../Dxe/WinNtThunk/Chipset/Metronome/Metronome.mbd | 45 ------------------
 .../Dxe/WinNtThunk/Chipset/Metronome/build.xml     | 47 -------------------
 .../Chipset/RealTimeClock/RealTimeClock.mbd        | 45 ------------------
 .../Dxe/WinNtThunk/Chipset/RealTimeClock/build.xml | 47 -------------------
 EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.mbd  | 45 ------------------
 EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/build.xml  | 47 -------------------
 EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.mbd  | 46 ------------------
 EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/build.xml  | 47 -------------------
 EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.mbd              | 46 ------------------
 EdkNt32Pkg/Dxe/WinNtThunk/Cpu/build.xml            | 47 -------------------
 .../Dxe/WinNtThunk/WinNtThunk/WinNtThunk.mbd       | 45 ------------------
 EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/build.xml     | 47 -------------------
 30 files changed, 1369 deletions(-)
 delete mode 100644 EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.mbd
 delete mode 100644 EdkNt32Pkg/Dxe/ConPlatform/build.xml
 delete mode 100644 EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.mbd
 delete mode 100644 EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/build.xml
 delete mode 100644 EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.mbd
 delete mode 100644 EdkNt32Pkg/Dxe/PlatformBds/build.xml
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.mbd
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/build.xml
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.mbd
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/build.xml
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.mbd
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/build.xml
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.mbd
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/build.xml
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.mbd
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/build.xml
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.mbd
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/build.xml
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.mbd
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/build.xml
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.mbd
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/build.xml
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.mbd
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/build.xml
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.mbd
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/build.xml
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.mbd
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/Cpu/build.xml
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.mbd
 delete mode 100644 EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/build.xml

(limited to 'EdkNt32Pkg/Dxe')

diff --git a/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.mbd b/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.mbd
deleted file mode 100644
index aa87078e81..0000000000
--- a/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.mbd
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>ConPlatform</BaseName>
-    <Guid>51ccf399-4fdf-4e55-a45b-e123f84d456a</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-13 17:06</Created>
-    <Modified>2006-03-19 15:17</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>UefiRuntimeServicesTableLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>EdkDxePrintLib</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>UefiDevicePathLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/ConPlatform/build.xml b/EdkNt32Pkg/Dxe/ConPlatform/build.xml
deleted file mode 100644
index 52d84eb934..0000000000
--- a/EdkNt32Pkg/Dxe/ConPlatform/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="ConPlatform"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Dxe\ConPlatform"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="ConPlatform">
-      <GenBuild baseName="ConPlatform" mbdFilename="${MODULE_DIR}\ConPlatform.mbd" msaFilename="${MODULE_DIR}\ConPlatform.msa"/>
-   </target>
-   <target depends="ConPlatform_clean" name="clean"/>
-   <target depends="ConPlatform_cleanall" name="cleanall"/>
-   <target name="ConPlatform_clean">
-      <OutputDirSetup baseName="ConPlatform" mbdFilename="${MODULE_DIR}\ConPlatform.mbd" msaFilename="${MODULE_DIR}\ConPlatform.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\ConPlatform_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\ConPlatform_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="ConPlatform_cleanall">
-      <OutputDirSetup baseName="ConPlatform" mbdFilename="${MODULE_DIR}\ConPlatform.mbd" msaFilename="${MODULE_DIR}\ConPlatform.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\ConPlatform_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\ConPlatform_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**ConPlatform*"/>
-      </delete>
-   </target>
-</project>
\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.mbd b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.mbd
deleted file mode 100644
index 0367c18338..0000000000
--- a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.mbd
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>MiscSubclass</BaseName>
-    <Guid>4A9B9DB8-EC62-4A92-818F-8AA0246D246E</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-13 17:07</Created>
-    <Modified>2006-03-23 13:50</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>HiiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>UefiDevicePathLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/build.xml b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/build.xml
deleted file mode 100644
index 7265194134..0000000000
--- a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="MiscSubclass"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Dxe\Nt32Platform\MiscSubclass"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="MiscSubclass">
-      <GenBuild baseName="MiscSubclass" mbdFilename="${MODULE_DIR}\MiscSubclassDriver.mbd" msaFilename="${MODULE_DIR}\MiscSubclassDriver.msa"/>
-   </target>
-   <target depends="MiscSubclass_clean" name="clean"/>
-   <target depends="MiscSubclass_cleanall" name="cleanall"/>
-   <target name="MiscSubclass_clean">
-      <OutputDirSetup baseName="MiscSubclass" mbdFilename="${MODULE_DIR}\MiscSubclassDriver.mbd" msaFilename="${MODULE_DIR}\MiscSubclassDriver.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\MiscSubclass_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\MiscSubclass_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="MiscSubclass_cleanall">
-      <OutputDirSetup baseName="MiscSubclass" mbdFilename="${MODULE_DIR}\MiscSubclassDriver.mbd" msaFilename="${MODULE_DIR}\MiscSubclassDriver.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\MiscSubclass_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\MiscSubclass_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**MiscSubclass*"/>
-      </delete>
-   </target>
-</project>
\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.mbd b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.mbd
deleted file mode 100644
index 82ffc52bf9..0000000000
--- a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.mbd
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>Bds</BaseName>
-    <Guid>A6F691AC-31C8-4444-854C-E2C1A6950F92</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-13 17:04</Created>
-    <Modified>2006-03-23 14:14</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>UefiRuntimeServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeServicesTableLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>EdkGenericBdsLib</Library>
-    <Library>BasePrintLib</Library>
-    <Library>EdkGraphicsLib</Library>
-    <Library>EdkIfrSupportLib</Library>
-    <Library>HiiLib</Library>
-    <Library>DxeHobLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>UefiDevicePathLib</Library>
-    <Library>BasePerformanceLibNull</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-    <Option>DPX_SOURCE = ${PLATFORM_BDS_FILE_PATH}\Bds.dxs</Option>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/PlatformBds/build.xml b/EdkNt32Pkg/Dxe/PlatformBds/build.xml
deleted file mode 100644
index d30fd98a89..0000000000
--- a/EdkNt32Pkg/Dxe/PlatformBds/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="Bds"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Dxe\PlatformBds"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="Bds">
-      <GenBuild baseName="Bds" mbdFilename="${MODULE_DIR}\PlatformBds.mbd" msaFilename="${MODULE_DIR}\PlatformBds.msa"/>
-   </target>
-   <target depends="Bds_clean" name="clean"/>
-   <target depends="Bds_cleanall" name="cleanall"/>
-   <target name="Bds_clean">
-      <OutputDirSetup baseName="Bds" mbdFilename="${MODULE_DIR}\PlatformBds.mbd" msaFilename="${MODULE_DIR}\PlatformBds.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Bds_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Bds_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Bds_cleanall">
-      <OutputDirSetup baseName="Bds" mbdFilename="${MODULE_DIR}\PlatformBds.mbd" msaFilename="${MODULE_DIR}\PlatformBds.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Bds_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Bds_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Bds*"/>
-      </delete>
-   </target>
-</project>
\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.mbd
deleted file mode 100644
index 5ac3148a6f..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.mbd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>WinNtBlockIo</BaseName>
-    <Guid>F479E147-A125-11d4-BCFC-0080C73C8881</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Modified>2006-03-19 15:17</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>UefiDebugLibStdErr</Library>
-    <Library>BasePrintLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/build.xml
deleted file mode 100644
index b03cad7e05..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="WinNtBlockIo"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Dxe\WinNtThunk\Bus\BlockIo"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="WinNtBlockIo">
-      <GenBuild baseName="WinNtBlockIo" mbdFilename="${MODULE_DIR}\WinNtBlockIo.mbd" msaFilename="${MODULE_DIR}\WinNtBlockIo.msa"/>
-   </target>
-   <target depends="WinNtBlockIo_clean" name="clean"/>
-   <target depends="WinNtBlockIo_cleanall" name="cleanall"/>
-   <target name="WinNtBlockIo_clean">
-      <OutputDirSetup baseName="WinNtBlockIo" mbdFilename="${MODULE_DIR}\WinNtBlockIo.mbd" msaFilename="${MODULE_DIR}\WinNtBlockIo.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtBlockIo_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtBlockIo_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WinNtBlockIo_cleanall">
-      <OutputDirSetup baseName="WinNtBlockIo" mbdFilename="${MODULE_DIR}\WinNtBlockIo.mbd" msaFilename="${MODULE_DIR}\WinNtBlockIo.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtBlockIo_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtBlockIo_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WinNtBlockIo*"/>
-      </delete>
-   </target>
-</project>
\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.mbd
deleted file mode 100644
index 945067077c..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.mbd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>WinNtConsole</BaseName>
-    <Guid>263631d7-5836-4b74-be48-ee22e92ce5d3</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Modified>2006-03-19 15:17</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>UefiDebugLibStdErr</Library>
-    <Library>BasePrintLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/build.xml
deleted file mode 100644
index 9d227c7f0e..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="WinNtConsole"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Dxe\WinNtThunk\Bus\Console"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="WinNtConsole">
-      <GenBuild baseName="WinNtConsole" mbdFilename="${MODULE_DIR}\WinNtConsole.mbd" msaFilename="${MODULE_DIR}\WinNtConsole.msa"/>
-   </target>
-   <target depends="WinNtConsole_clean" name="clean"/>
-   <target depends="WinNtConsole_cleanall" name="cleanall"/>
-   <target name="WinNtConsole_clean">
-      <OutputDirSetup baseName="WinNtConsole" mbdFilename="${MODULE_DIR}\WinNtConsole.mbd" msaFilename="${MODULE_DIR}\WinNtConsole.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtConsole_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtConsole_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WinNtConsole_cleanall">
-      <OutputDirSetup baseName="WinNtConsole" mbdFilename="${MODULE_DIR}\WinNtConsole.mbd" msaFilename="${MODULE_DIR}\WinNtConsole.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtConsole_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtConsole_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WinNtConsole*"/>
-      </delete>
-   </target>
-</project>
\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.mbd
deleted file mode 100644
index 6468fd029c..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.mbd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>WinNtSerialIo</BaseName>
-    <Guid>6B41B553-A649-11d4-BD02-0080C73C8881</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-13 17:02</Created>
-    <Modified>2006-03-19 15:17</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>UefiDebugLibStdErr</Library>
-    <Library>BasePrintLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>UefiDevicePathLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/build.xml
deleted file mode 100644
index 7114d3bae2..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="WinNtSerialIo"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Dxe\WinNtThunk\Bus\SerialIo"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="WinNtSerialIo">
-      <GenBuild baseName="WinNtSerialIo" mbdFilename="${MODULE_DIR}\WinNtSerialIo.mbd" msaFilename="${MODULE_DIR}\WinNtSerialIo.msa"/>
-   </target>
-   <target depends="WinNtSerialIo_clean" name="clean"/>
-   <target depends="WinNtSerialIo_cleanall" name="cleanall"/>
-   <target name="WinNtSerialIo_clean">
-      <OutputDirSetup baseName="WinNtSerialIo" mbdFilename="${MODULE_DIR}\WinNtSerialIo.mbd" msaFilename="${MODULE_DIR}\WinNtSerialIo.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtSerialIo_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtSerialIo_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WinNtSerialIo_cleanall">
-      <OutputDirSetup baseName="WinNtSerialIo" mbdFilename="${MODULE_DIR}\WinNtSerialIo.mbd" msaFilename="${MODULE_DIR}\WinNtSerialIo.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtSerialIo_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtSerialIo_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WinNtSerialIo*"/>
-      </delete>
-   </target>
-</project>
\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.mbd
deleted file mode 100644
index 25aef78949..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.mbd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>WinNtSimpleFileSystem</BaseName>
-    <Guid>9C25E18B-76BA-43da-A132-DBB0997CEFEF</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Modified>2006-03-19 15:17</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>UefiDebugLibStdErr</Library>
-    <Library>BasePrintLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/build.xml
deleted file mode 100644
index fc39519781..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="WinNtSimpleFileSystem"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Dxe\WinNtThunk\Bus\SimpleFileSystem"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="WinNtSimpleFileSystem">
-      <GenBuild baseName="WinNtSimpleFileSystem" mbdFilename="${MODULE_DIR}\WinNtSimpleFileSystem.mbd" msaFilename="${MODULE_DIR}\WinNtSimpleFileSystem.msa"/>
-   </target>
-   <target depends="WinNtSimpleFileSystem_clean" name="clean"/>
-   <target depends="WinNtSimpleFileSystem_cleanall" name="cleanall"/>
-   <target name="WinNtSimpleFileSystem_clean">
-      <OutputDirSetup baseName="WinNtSimpleFileSystem" mbdFilename="${MODULE_DIR}\WinNtSimpleFileSystem.mbd" msaFilename="${MODULE_DIR}\WinNtSimpleFileSystem.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtSimpleFileSystem_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtSimpleFileSystem_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WinNtSimpleFileSystem_cleanall">
-      <OutputDirSetup baseName="WinNtSimpleFileSystem" mbdFilename="${MODULE_DIR}\WinNtSimpleFileSystem.mbd" msaFilename="${MODULE_DIR}\WinNtSimpleFileSystem.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtSimpleFileSystem_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtSimpleFileSystem_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WinNtSimpleFileSystem*"/>
-      </delete>
-   </target>
-</project>
\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.mbd
deleted file mode 100644
index 8981a35741..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.mbd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>WinNtUga</BaseName>
-    <Guid>AB248E8D-ABE1-11d4-BD0D-0080C73C8881</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Modified>2006-03-19 15:17</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>UefiDebugLibStdErr</Library>
-    <Library>BasePrintLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/build.xml
deleted file mode 100644
index 4d5022a84b..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="WinNtUga"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Dxe\WinNtThunk\Bus\Uga"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="WinNtUga">
-      <GenBuild baseName="WinNtUga" mbdFilename="${MODULE_DIR}\WinNtUga.mbd" msaFilename="${MODULE_DIR}\WinNtUga.msa"/>
-   </target>
-   <target depends="WinNtUga_clean" name="clean"/>
-   <target depends="WinNtUga_cleanall" name="cleanall"/>
-   <target name="WinNtUga_clean">
-      <OutputDirSetup baseName="WinNtUga" mbdFilename="${MODULE_DIR}\WinNtUga.mbd" msaFilename="${MODULE_DIR}\WinNtUga.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtUga_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtUga_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WinNtUga_cleanall">
-      <OutputDirSetup baseName="WinNtUga" mbdFilename="${MODULE_DIR}\WinNtUga.mbd" msaFilename="${MODULE_DIR}\WinNtUga.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtUga_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtUga_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WinNtUga*"/>
-      </delete>
-   </target>
-</project>
\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.mbd
deleted file mode 100644
index 5059326ed7..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.mbd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>WinNtBusDriver</BaseName>
-    <Guid>BD7E9A27-D6C5-416a-B245-5F507D95B2BD</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-13 17:02</Created>
-    <Modified>2006-03-19 15:17</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxePcdLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>UefiDevicePathLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/build.xml
deleted file mode 100644
index 93d853bfd1..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="WinNtBusDriver"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Dxe\WinNtThunk\Bus\WinNtBusDriver"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="WinNtBusDriver">
-      <GenBuild baseName="WinNtBusDriver" mbdFilename="${MODULE_DIR}\WinNtBusDriver.mbd" msaFilename="${MODULE_DIR}\WinNtBusDriver.msa"/>
-   </target>
-   <target depends="WinNtBusDriver_clean" name="clean"/>
-   <target depends="WinNtBusDriver_cleanall" name="cleanall"/>
-   <target name="WinNtBusDriver_clean">
-      <OutputDirSetup baseName="WinNtBusDriver" mbdFilename="${MODULE_DIR}\WinNtBusDriver.mbd" msaFilename="${MODULE_DIR}\WinNtBusDriver.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtBusDriver_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtBusDriver_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WinNtBusDriver_cleanall">
-      <OutputDirSetup baseName="WinNtBusDriver" mbdFilename="${MODULE_DIR}\WinNtBusDriver.mbd" msaFilename="${MODULE_DIR}\WinNtBusDriver.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtBusDriver_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtBusDriver_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WinNtBusDriver*"/>
-      </delete>
-   </target>
-</project>
\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.mbd
deleted file mode 100644
index 1e43726ef4..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.mbd
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>Metronome</BaseName>
-    <Guid>154CAB4A-52B5-46CD-99C3-4368ABBACFFD</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Modified>2006-03-19 15:17</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>DxeHobLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeWinNtLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/build.xml
deleted file mode 100644
index 5922fac8f1..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="Metronome"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Dxe\WinNtThunk\Chipset\Metronome"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="Metronome">
-      <GenBuild baseName="Metronome" mbdFilename="${MODULE_DIR}\Metronome.mbd" msaFilename="${MODULE_DIR}\Metronome.msa"/>
-   </target>
-   <target depends="Metronome_clean" name="clean"/>
-   <target depends="Metronome_cleanall" name="cleanall"/>
-   <target name="Metronome_clean">
-      <OutputDirSetup baseName="Metronome" mbdFilename="${MODULE_DIR}\Metronome.mbd" msaFilename="${MODULE_DIR}\Metronome.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Metronome_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Metronome_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Metronome_cleanall">
-      <OutputDirSetup baseName="Metronome" mbdFilename="${MODULE_DIR}\Metronome.mbd" msaFilename="${MODULE_DIR}\Metronome.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Metronome_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Metronome_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Metronome*"/>
-      </delete>
-   </target>
-</project>
\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.mbd
deleted file mode 100644
index 9a824efbb3..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.mbd
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>RealTimeClock</BaseName>
-    <Guid>27F05AF5-1644-4EF4-8944-48C4F75675A0</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Modified>2006-03-19 15:17</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>DxeHobLib</Library>
-    <Library>DxeWinNtLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/build.xml
deleted file mode 100644
index b649e11eb5..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="RealTimeClock"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Dxe\WinNtThunk\Chipset\RealTimeClock"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="RealTimeClock">
-      <GenBuild baseName="RealTimeClock" mbdFilename="${MODULE_DIR}\RealTimeClock.mbd" msaFilename="${MODULE_DIR}\RealTimeClock.msa"/>
-   </target>
-   <target depends="RealTimeClock_clean" name="clean"/>
-   <target depends="RealTimeClock_cleanall" name="cleanall"/>
-   <target name="RealTimeClock_clean">
-      <OutputDirSetup baseName="RealTimeClock" mbdFilename="${MODULE_DIR}\RealTimeClock.mbd" msaFilename="${MODULE_DIR}\RealTimeClock.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\RealTimeClock_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\RealTimeClock_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="RealTimeClock_cleanall">
-      <OutputDirSetup baseName="RealTimeClock" mbdFilename="${MODULE_DIR}\RealTimeClock.mbd" msaFilename="${MODULE_DIR}\RealTimeClock.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\RealTimeClock_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\RealTimeClock_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**RealTimeClock*"/>
-      </delete>
-   </target>
-</project>
\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.mbd
deleted file mode 100644
index 3e61fdd8dc..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.mbd
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>Reset</BaseName>
-    <Guid>BA929954-35B0-4dd3-90CD-9634BD7E1CF1</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Modified>2006-03-19 15:17</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>DxeHobLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeWinNtLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/build.xml
deleted file mode 100644
index f924c6b261..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="Reset"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Dxe\WinNtThunk\Chipset\Reset"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="Reset">
-      <GenBuild baseName="Reset" mbdFilename="${MODULE_DIR}\Reset.mbd" msaFilename="${MODULE_DIR}\Reset.msa"/>
-   </target>
-   <target depends="Reset_clean" name="clean"/>
-   <target depends="Reset_cleanall" name="cleanall"/>
-   <target name="Reset_clean">
-      <OutputDirSetup baseName="Reset" mbdFilename="${MODULE_DIR}\Reset.mbd" msaFilename="${MODULE_DIR}\Reset.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Reset_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Reset_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Reset_cleanall">
-      <OutputDirSetup baseName="Reset" mbdFilename="${MODULE_DIR}\Reset.mbd" msaFilename="${MODULE_DIR}\Reset.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Reset_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Reset_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Reset*"/>
-      </delete>
-   </target>
-</project>
\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.mbd
deleted file mode 100644
index 1c03cfeab5..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.mbd
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>Timer</BaseName>
-    <Guid>C3811036-710B-4E39-8CF1-0AF9BE3A8198</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Modified>2006-03-19 15:17</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeHobLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>HiiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>DxeWinNtLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/build.xml
deleted file mode 100644
index fac1fa4061..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="Timer"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Dxe\WinNtThunk\Chipset\Timer"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="Timer">
-      <GenBuild baseName="Timer" mbdFilename="${MODULE_DIR}\Timer.mbd" msaFilename="${MODULE_DIR}\Timer.msa"/>
-   </target>
-   <target depends="Timer_clean" name="clean"/>
-   <target depends="Timer_cleanall" name="cleanall"/>
-   <target name="Timer_clean">
-      <OutputDirSetup baseName="Timer" mbdFilename="${MODULE_DIR}\Timer.mbd" msaFilename="${MODULE_DIR}\Timer.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Timer_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Timer_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Timer_cleanall">
-      <OutputDirSetup baseName="Timer" mbdFilename="${MODULE_DIR}\Timer.mbd" msaFilename="${MODULE_DIR}\Timer.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Timer_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Timer_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Timer*"/>
-      </delete>
-   </target>
-</project>
\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.mbd
deleted file mode 100644
index 7cc131daff..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.mbd
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>Cpu</BaseName>
-    <Guid>ee993080-5197-4d4e-b63c-f1f7413e33ce</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Modified>2006-03-23 16:17</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiLib</Library>
-    <Library>HiiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-    <Option>C_STD_FLAGS = ${C_STD_FLAGS} /DSTRING_ARRAY_NAME=${BASE_NAME}Strings</Option>
-    <Option>C_STD_FLAGS = ${C_STD_FLAGS} /DSTRING_DEFINES_FILE=\"${BASE_NAME}StrDefs.h\"</Option>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/build.xml
deleted file mode 100644
index 91fe4e49ad..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="Cpu"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Dxe\WinNtThunk\Cpu"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="Cpu">
-      <GenBuild baseName="Cpu" mbdFilename="${MODULE_DIR}\Cpu.mbd" msaFilename="${MODULE_DIR}\Cpu.msa"/>
-   </target>
-   <target depends="Cpu_clean" name="clean"/>
-   <target depends="Cpu_cleanall" name="cleanall"/>
-   <target name="Cpu_clean">
-      <OutputDirSetup baseName="Cpu" mbdFilename="${MODULE_DIR}\Cpu.mbd" msaFilename="${MODULE_DIR}\Cpu.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Cpu_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Cpu_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="Cpu_cleanall">
-      <OutputDirSetup baseName="Cpu" mbdFilename="${MODULE_DIR}\Cpu.mbd" msaFilename="${MODULE_DIR}\Cpu.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\Cpu_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\Cpu_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**Cpu*"/>
-      </delete>
-   </target>
-</project>
\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.mbd b/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.mbd
deleted file mode 100644
index 43add04dbc..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.mbd
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>WinNtThunk</BaseName>
-    <Guid>0C95A916-A006-11d4-BCFA-0080C73C8881</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Modified>2006-03-19 15:17</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>DxeHobLib</Library>
-    <Library>UefiLib</Library>
-    <Library>DxeMemoryLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>
-    <Library>DxeWinNtLib</Library>
-    <Library>DxeMemoryAllocationLib</Library>
-  </Libraries>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleBuildDescription>
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/build.xml b/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/build.xml
deleted file mode 100644
index 938e55f47d..0000000000
--- a/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="WinNtThunk"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Dxe\WinNtThunk\WinNtThunk"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
-   <target name="WinNtThunk">
-      <GenBuild baseName="WinNtThunk" mbdFilename="${MODULE_DIR}\WinNtThunk.mbd" msaFilename="${MODULE_DIR}\WinNtThunk.msa"/>
-   </target>
-   <target depends="WinNtThunk_clean" name="clean"/>
-   <target depends="WinNtThunk_cleanall" name="cleanall"/>
-   <target name="WinNtThunk_clean">
-      <OutputDirSetup baseName="WinNtThunk" mbdFilename="${MODULE_DIR}\WinNtThunk.mbd" msaFilename="${MODULE_DIR}\WinNtThunk.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtThunk_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtThunk_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="WinNtThunk_cleanall">
-      <OutputDirSetup baseName="WinNtThunk" mbdFilename="${MODULE_DIR}\WinNtThunk.mbd" msaFilename="${MODULE_DIR}\WinNtThunk.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}\WinNtThunk_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}\WinNtThunk_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**WinNtThunk*"/>
-      </delete>
-   </target>
-</project>
\ No newline at end of file
-- 
cgit v1.2.3