diff --git a/Tools/CCode/Source/Common/build.xml b/Tools/CCode/Source/Common/build.xml
index 902f677d1d..38ae477296 100644
--- a/Tools/CCode/Source/Common/build.xml
+++ b/Tools/CCode/Source/Common/build.xml
@@ -15,8 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Copyright (c) 2006, Intel Corporation
 -->
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="tmp" value="tmp"/>
diff --git a/Tools/CCode/Source/CompressDll/build.xml b/Tools/CCode/Source/CompressDll/build.xml
index 124255b17a..6f591b371b 100644
--- a/Tools/CCode/Source/CompressDll/build.xml
+++ b/Tools/CCode/Source/CompressDll/build.xml
@@ -20,8 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="FileSet" value="CompressDll.c CompressDll.h"/>
   <property name="LibFileSet" value="CompressDll.c DepexParser.h"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
@@ -71,7 +69,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>
 
   <target name="cleanall">
-    <echo message="Removing Object Files and the Executable: ${LibName}${ext_shared}"/>
+    <echo message="Removing Object Files and the Executable: ${LibName}${ext_dynamic}"/>
     <delete failonerror="false" quiet="true" includeEmptyDirs="true">
       <fileset dir="${BUILD_DIR}"/>
       <fileset file="${BIN_DIR}/${LibName}.*"/>
diff --git a/Tools/CCode/Source/CreateMtFile/build.xml b/Tools/CCode/Source/CreateMtFile/build.xml
index b2272244cd..4c08a0fffc 100644
--- a/Tools/CCode/Source/CreateMtFile/build.xml
+++ b/Tools/CCode/Source/CreateMtFile/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="CreateMtFile"/>
   <property name="FileSet" value="*.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/CustomizedCompress/build.xml b/Tools/CCode/Source/CustomizedCompress/build.xml
index 4664a957f0..35bffa4987 100644
--- a/Tools/CCode/Source/CustomizedCompress/build.xml
+++ b/Tools/CCode/Source/CustomizedCompress/build.xml
@@ -15,8 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Copyright (c) 2006, Intel Corporation
 -->
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LibName" value="CustomizedCompress"/>
diff --git a/Tools/CCode/Source/EfiCompress/build.xml b/Tools/CCode/Source/EfiCompress/build.xml
index 94f60558cc..d08e985484 100644
--- a/Tools/CCode/Source/EfiCompress/build.xml
+++ b/Tools/CCode/Source/EfiCompress/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="EfiCompress"/>
   <property name="FileSet" value="*.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/EfiRom/build.xml b/Tools/CCode/Source/EfiRom/build.xml
index acb94a4835..a732950af8 100644
--- a/Tools/CCode/Source/EfiRom/build.xml
+++ b/Tools/CCode/Source/EfiRom/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="EfiRom"/>
   <property name="FileSet" value="*.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/FlashMap/build.xml b/Tools/CCode/Source/FlashMap/build.xml
index 680c1820b0..a3e6547ac1 100644
--- a/Tools/CCode/Source/FlashMap/build.xml
+++ b/Tools/CCode/Source/FlashMap/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="FlashMap"/>
   <property name="FileSet" value="*.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/FwImage/build.xml b/Tools/CCode/Source/FwImage/build.xml
index b52c576c34..42f4b47051 100644
--- a/Tools/CCode/Source/FwImage/build.xml
+++ b/Tools/CCode/Source/FwImage/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="FwImage"/>
   <property name="FileSet" value="fwimage.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/GenAcpiTable/build.xml b/Tools/CCode/Source/GenAcpiTable/build.xml
index 8c8c5eb81f..bf4919cfb9 100644
--- a/Tools/CCode/Source/GenAcpiTable/build.xml
+++ b/Tools/CCode/Source/GenAcpiTable/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenAcpiTable"/>
   <property name="FileSet" value="*.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/GenCRC32Section/build.xml b/Tools/CCode/Source/GenCRC32Section/build.xml
index bbb0f71f5d..788001aa6f 100644
--- a/Tools/CCode/Source/GenCRC32Section/build.xml
+++ b/Tools/CCode/Source/GenCRC32Section/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenCRC32Section"/>
   <property name="FileSet" value="GenCRC32Section.c GenCRC32Section.h"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/GenCapsuleHdr/build.xml b/Tools/CCode/Source/GenCapsuleHdr/build.xml
index 7c43d0a347..a16409ab2e 100644
--- a/Tools/CCode/Source/GenCapsuleHdr/build.xml
+++ b/Tools/CCode/Source/GenCapsuleHdr/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenCapsuleHdr"/>
   <property name="FileSet" value="GenCapsuleHdr.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/GenDepex/build.xml b/Tools/CCode/Source/GenDepex/build.xml
index 568177aa03..18f85ac4d5 100644
--- a/Tools/CCode/Source/GenDepex/build.xml
+++ b/Tools/CCode/Source/GenDepex/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenDepex"/>
   <property name="FileSet" value="DepexParser.c GenDepex.c GenDepex.h"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/GenFfsFile/build.xml b/Tools/CCode/Source/GenFfsFile/build.xml
index b7f8681436..de4d6a6841 100644
--- a/Tools/CCode/Source/GenFfsFile/build.xml
+++ b/Tools/CCode/Source/GenFfsFile/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenFfsFile"/>
   <property name="FileSet" value="GenFfsFile.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/GenFvImage/build.xml b/Tools/CCode/Source/GenFvImage/build.xml
index ae930b053b..398b86291e 100644
--- a/Tools/CCode/Source/GenFvImage/build.xml
+++ b/Tools/CCode/Source/GenFvImage/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenFvImage"/>
   <property name="FileSet" value="GenFvImageLib.c GenFvImageExe.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/GenSection/build.xml b/Tools/CCode/Source/GenSection/build.xml
index 63ffccdf74..2f6baa205b 100644
--- a/Tools/CCode/Source/GenSection/build.xml
+++ b/Tools/CCode/Source/GenSection/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenSection"/>
   <property name="FileSet" value="GenSection.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/GenTEImage/build.xml b/Tools/CCode/Source/GenTEImage/build.xml
index e79f9574a9..da485cf5cc 100644
--- a/Tools/CCode/Source/GenTEImage/build.xml
+++ b/Tools/CCode/Source/GenTEImage/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenTEImage"/>
   <property name="FileSet" value="*.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
 
diff --git a/Tools/CCode/Source/GuidChk/build.xml b/Tools/CCode/Source/GuidChk/build.xml
index aec3ad1e9c..cadd603647 100644
--- a/Tools/CCode/Source/GuidChk/build.xml
+++ b/Tools/CCode/Source/GuidChk/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GuidChk"/>
   <property name="FileSet" value="*.c *.h"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/MakeDeps/build.xml b/Tools/CCode/Source/MakeDeps/build.xml
index 60c34c2dfa..4e272033d2 100755
--- a/Tools/CCode/Source/MakeDeps/build.xml
+++ b/Tools/CCode/Source/MakeDeps/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="MakeDeps"/>
   <property name="FileSet" value="*.c *.h"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/ModifyInf/build.xml b/Tools/CCode/Source/ModifyInf/build.xml
index a695ae0e80..a7a26f49a3 100644
--- a/Tools/CCode/Source/ModifyInf/build.xml
+++ b/Tools/CCode/Source/ModifyInf/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="ModifyInf"/>
   <property name="FileSet" value="ModifyInf.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/Pccts/antlr/build.xml b/Tools/CCode/Source/Pccts/antlr/build.xml
index dfc1455409..5280085847 100644
--- a/Tools/CCode/Source/Pccts/antlr/build.xml
+++ b/Tools/CCode/Source/Pccts/antlr/build.xml
@@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 -->
   <property name="ToolName" value="antlr"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <target name="init">
diff --git a/Tools/CCode/Source/Pccts/build.xml b/Tools/CCode/Source/Pccts/build.xml
index 4f4e0a9e7c..d6ed0749df 100644
--- a/Tools/CCode/Source/Pccts/build.xml
+++ b/Tools/CCode/Source/Pccts/build.xml
@@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="Pccts"/>
 -->
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <target name="init">
diff --git a/Tools/CCode/Source/Pccts/dlg/build.xml b/Tools/CCode/Source/Pccts/dlg/build.xml
index 4195950c7b..3a8a9eec2b 100644
--- a/Tools/CCode/Source/Pccts/dlg/build.xml
+++ b/Tools/CCode/Source/Pccts/dlg/build.xml
@@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 -->
   <property name="ToolName" value="dlg"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="PACKAGE_DIR" value="${WORKSPACE}/Tools"/>
diff --git a/Tools/CCode/Source/PeCoffLoader/build.xml b/Tools/CCode/Source/PeCoffLoader/build.xml
index db37829840..912a545ff5 100644
--- a/Tools/CCode/Source/PeCoffLoader/build.xml
+++ b/Tools/CCode/Source/PeCoffLoader/build.xml
@@ -14,8 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     EDK PeCoffLoader
   Copyright (c) 2006, Intel Corporation
 -->
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LibName" value="PeCoffLoader"/>
diff --git a/Tools/CCode/Source/PeiRebase/build.xml b/Tools/CCode/Source/PeiRebase/build.xml
index 7174441f3f..329a743553 100644
--- a/Tools/CCode/Source/PeiRebase/build.xml
+++ b/Tools/CCode/Source/PeiRebase/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="PeiRebase"/>
   <property name="FileSet" value="*.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/SecApResetVectorFixup/build.xml b/Tools/CCode/Source/SecApResetVectorFixup/build.xml
index f615b2a602..3550dc55a9 100644
--- a/Tools/CCode/Source/SecApResetVectorFixup/build.xml
+++ b/Tools/CCode/Source/SecApResetVectorFixup/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="SecApResetVectorFixup"/>
   <property name="FileSet" value="*.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/SecFixup/build.xml b/Tools/CCode/Source/SecFixup/build.xml
index ebc408ba26..99f78e0b45 100644
--- a/Tools/CCode/Source/SecFixup/build.xml
+++ b/Tools/CCode/Source/SecFixup/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="SecFixup"/>
   <property name="FileSet" value="*.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/SetStamp/build.xml b/Tools/CCode/Source/SetStamp/build.xml
index 9425797c45..5219bd6051 100644
--- a/Tools/CCode/Source/SetStamp/build.xml
+++ b/Tools/CCode/Source/SetStamp/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="SetStamp"/>
   <property name="FileSet" value="SetStamp.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/SplitFile/build.xml b/Tools/CCode/Source/SplitFile/build.xml
index 6fa9b573c3..0666a1f6fc 100644
--- a/Tools/CCode/Source/SplitFile/build.xml
+++ b/Tools/CCode/Source/SplitFile/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="SplitFile"/>
   <property name="FileSet" value="*.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/StrGather/build.xml b/Tools/CCode/Source/StrGather/build.xml
index f01117777a..cac016e485 100644
--- a/Tools/CCode/Source/StrGather/build.xml
+++ b/Tools/CCode/Source/StrGather/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="StrGather"/>
   <property name="FileSet" value="*.c *.h"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/String/build.xml b/Tools/CCode/Source/String/build.xml
index 933cb5c1e4..b42504ea25 100644
--- a/Tools/CCode/Source/String/build.xml
+++ b/Tools/CCode/Source/String/build.xml
@@ -14,8 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     EDK String
   Copyright (c) 2006, Intel Corporation
 -->
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LibName" value="String"/>
diff --git a/Tools/CCode/Source/Strip/build.xml b/Tools/CCode/Source/Strip/build.xml
index 9ead28d16f..6c34d95897 100644
--- a/Tools/CCode/Source/Strip/build.xml
+++ b/Tools/CCode/Source/Strip/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="Strip"/>
   <property name="FileSet" value="*.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/VfrCompile/build.xml b/Tools/CCode/Source/VfrCompile/build.xml
index 247f0d2315..da857dff48 100644
--- a/Tools/CCode/Source/VfrCompile/build.xml
+++ b/Tools/CCode/Source/VfrCompile/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="VfrCompile"/>
   <property name="FileSet" value="*.cpp"/>
   <property name="FileSetPccts" value="ATokenBuffer.cpp DLexerBase.cpp AParser.cpp"/>
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/ZeroDebugData/build.xml b/Tools/CCode/Source/ZeroDebugData/build.xml
index 2a85fc1af2..efdf002d96 100644
--- a/Tools/CCode/Source/ZeroDebugData/build.xml
+++ b/Tools/CCode/Source/ZeroDebugData/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="ZeroDebugData"/>
   <property name="FileSet" value="*.c"/>
 
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
diff --git a/Tools/CCode/Source/build.xml b/Tools/CCode/Source/build.xml
index bbe545606f..f222b4abe6 100644
--- a/Tools/CCode/Source/build.xml
+++ b/Tools/CCode/Source/build.xml
@@ -35,21 +35,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <fileset dir="${env.XMLBEANS_HOME}/lib" includes="*.jar"/>
   </path>
 
-  <taskdef classpathref="classpath" resource="GenBuild.tasks" />
   <taskdef classpathref="classpath" resource="net/sf/antcontrib/antlib.xml" />
 
-  <taskdef classpathref="classpath" resource="cpptasks.tasks"/>
-  <typedef classpathref="classpath" resource="cpptasks.types"/>
 
-  <target name="all" depends="init, Tools">
+  <target name="all" depends="initArch, init, Tools">
     <echo message="The EDK II C Tools build complete!"/>
   </target>
   
   <target name="init">
     <echo message="EDK C Code Tools, build initialization"/>
+    <taskdef classpathref="classpath" resource="GenBuild.tasks" />
+    <taskdef classpathref="classpath" resource="cpptasks.tasks"/>
+    <typedef classpathref="classpath" resource="cpptasks.types"/>
     <mkdir dir="${BIN_DIR}" />
     <mkdir dir="${LIB_DIR}" />
 
+  </target>
+
+  <target name="initArch">
     <condition property="HostArch" value="X64">
       <os arch="amd64"/>
     </condition>
@@ -240,7 +243,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </if>
   </target>
 
-  <target name="Libraries" depends="init">
+  <target name="Libraries" depends="initArch, init">
     <subant target="" inheritall="true">
       <fileset dir="${PACKAGE_DIR}" 
         includes="${Libs}"/>
@@ -254,13 +257,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </subant>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean" depends="initArch">
     <subant target="clean" inheritall="true">
       <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"/>
     </subant>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall" depends="initArch">
     <subant target="cleanall" inheritall="true">
       <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"/>
     </subant>