diff --git a/Tools/CCode/Source/GenFvMap/build.xml b/Tools/CCode/Source/GenFvMap/build.xml
index 0d05b58e87..cf8e34c120 100644
--- a/Tools/CCode/Source/GenFvMap/build.xml
+++ b/Tools/CCode/Source/GenFvMap/build.xml
@@ -54,7 +54,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <compilerarg value="-x" if="gcc"/>
       <compilerarg value="c++" if="gcc"/>
       <compilerarg value="/EHsc" unless="gcc"/>
-      <compilerarg value="/Za" unless="gcc"/>
       
       
       <fileset dir="${basedir}/${ToolName}"
diff --git a/Tools/CCode/Source/build.xml b/Tools/CCode/Source/build.xml
index bdd163a194..528fd7f6e3 100644
--- a/Tools/CCode/Source/build.xml
+++ b/Tools/CCode/Source/build.xml
@@ -253,7 +253,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <target name="Tools" depends="Libraries">
     <subant target="" inheritall="true">
       <fileset dir="${PACKAGE_DIR}" includes="*/build.xml" 
-        excludes="${Libs} GenFvMap/build.xml"/>
+        excludes="${Libs}"/>
     </subant>
   </target>