diff --git a/Tools/Source/TianoTools/Common/build.xml b/Tools/Source/TianoTools/Common/build.xml
index b794bd7f14..7802b27827 100644
--- a/Tools/Source/TianoTools/Common/build.xml
+++ b/Tools/Source/TianoTools/Common/build.xml
@@ -39,7 +39,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outfile="${LIB_DIR}/CommonTools"
         outtype="static"
         optimize="speed">
-
+      <compilerarg value="${ExtraArgus}" />
       <compilerarg value="-fPIC" if="x86_64_linux"/>
 
       <includepath path="${PACKAGE_DIR}/Include"/>
diff --git a/Tools/Source/TianoTools/CompressDll/build.xml b/Tools/Source/TianoTools/CompressDll/build.xml
index 1aa5fb6ac8..7af7c8119a 100644
--- a/Tools/Source/TianoTools/CompressDll/build.xml
+++ b/Tools/Source/TianoTools/CompressDll/build.xml
@@ -44,6 +44,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       outfile="${BIN_DIR}/${LibName}"
       outputfileproperty="result"
       >
+      <compilerarg value="${ExtraArgus}" />
       <fileset dir="${LibName}" includes="${LibFileSet}" defaultexcludes="TRUE" excludes="*.xml *.inf"/>
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
diff --git a/Tools/Source/TianoTools/CreateMtFile/build.xml b/Tools/Source/TianoTools/CreateMtFile/build.xml
index 317ccad411..20616d027e 100644
--- a/Tools/Source/TianoTools/CreateMtFile/build.xml
+++ b/Tools/Source/TianoTools/CreateMtFile/build.xml
@@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
         debug="false">
-
+      <compilerarg value="${ExtraArgus}" />
       <fileset dir="${basedir}/${ToolName}" 
         includes="${FileSet}" 
         defaultexcludes="TRUE" 
diff --git a/Tools/Source/TianoTools/EfiRom/build.xml b/Tools/Source/TianoTools/EfiRom/build.xml
index 86e117e4ab..89e43aeb2c 100644
--- a/Tools/Source/TianoTools/EfiRom/build.xml
+++ b/Tools/Source/TianoTools/EfiRom/build.xml
@@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
         debug="false">
-
+      <compilerarg value="${ExtraArgus}" />
       <fileset dir="${basedir}/${ToolName}" 
         includes="${FileSet}" 
         defaultexcludes="TRUE" 
diff --git a/Tools/Source/TianoTools/FlashMap/build.xml b/Tools/Source/TianoTools/FlashMap/build.xml
index dee577a35a..e0e4fcc3a8 100644
--- a/Tools/Source/TianoTools/FlashMap/build.xml
+++ b/Tools/Source/TianoTools/FlashMap/build.xml
@@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
         debug="false">
-
+      <compilerarg value="${ExtraArgus}" />
       <defineset>
         <define name="_malloc" value="malloc"/>
         <define name="_free" value="free"/>
diff --git a/Tools/Source/TianoTools/FwImage/build.xml b/Tools/Source/TianoTools/FwImage/build.xml
index 64340da55a..d7bc76bd16 100644
--- a/Tools/Source/TianoTools/FwImage/build.xml
+++ b/Tools/Source/TianoTools/FwImage/build.xml
@@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
         optimize="speed">
-
+      <compilerarg value="${ExtraArgus}" />
       <fileset dir="${basedir}/${ToolName}" 
         includes="${FileSet}" 
         defaultexcludes="TRUE" 
diff --git a/Tools/Source/TianoTools/GenAcpiTable/build.xml b/Tools/Source/TianoTools/GenAcpiTable/build.xml
index ba7b74b686..cdac147d7b 100644
--- a/Tools/Source/TianoTools/GenAcpiTable/build.xml
+++ b/Tools/Source/TianoTools/GenAcpiTable/build.xml
@@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
         debug="false">
-
+      <compilerarg value="${ExtraArgus}" />
       <fileset dir="${basedir}/${ToolName}" 
         includes="${FileSet}" 
         defaultexcludes="TRUE" 
diff --git a/Tools/Source/TianoTools/GenCapsuleHdr/build.xml b/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
index 30952784bb..f63bd98d3c 100644
--- a/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
+++ b/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
@@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
         debug="false">
-
+      <compilerarg value="${ExtraArgus}" />
       <fileset dir="${basedir}/${ToolName}" 
         includes="${FileSet}" 
         defaultexcludes="TRUE" 
diff --git a/Tools/Source/TianoTools/GenDepex/GenDepex.c b/Tools/Source/TianoTools/GenDepex/GenDepex.c
index 67ffcd2443..3adde2c1fc 100644
--- a/Tools/Source/TianoTools/GenDepex/GenDepex.c
+++ b/Tools/Source/TianoTools/GenDepex/GenDepex.c
@@ -209,7 +209,7 @@ EFI_STATUS
 GenerateDependencyExpression (
   IN     FILE           *InFile,
   IN OUT FILE           *OutFile,
-  IN     UINT8          Padding  OPTIONAL
+  IN     INT8           Padding  OPTIONAL
   )
 /*++
 
diff --git a/Tools/Source/TianoTools/GenDepex/build.xml b/Tools/Source/TianoTools/GenDepex/build.xml
index 3878b4a97f..16ea68a065 100644
--- a/Tools/Source/TianoTools/GenDepex/build.xml
+++ b/Tools/Source/TianoTools/GenDepex/build.xml
@@ -39,7 +39,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outtype="executable"
         debug="false"
         optimize="speed">
-
+      <compilerarg value="${ExtraArgus}" />
       <fileset dir="${basedir}/${ToolName}" 
         includes="${FileSet}" />
 
diff --git a/Tools/Source/TianoTools/GenFfsFile/build.xml b/Tools/Source/TianoTools/GenFfsFile/build.xml
index a6ccc11497..d7fdc8bce9 100644
--- a/Tools/Source/TianoTools/GenFfsFile/build.xml
+++ b/Tools/Source/TianoTools/GenFfsFile/build.xml
@@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
         optimize="speed">
-
+      <compilerarg value="${ExtraArgus}" />
       <fileset dir="${basedir}/${ToolName}" 
         includes="${FileSet}" 
         defaultexcludes="TRUE" 
diff --git a/Tools/Source/TianoTools/GenFvImage/build.xml b/Tools/Source/TianoTools/GenFvImage/build.xml
index 5ba021f4c6..273d80fc4a 100644
--- a/Tools/Source/TianoTools/GenFvImage/build.xml
+++ b/Tools/Source/TianoTools/GenFvImage/build.xml
@@ -80,6 +80,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
         optimize="speed">
+      <compilerarg value="${ExtraArgus}" />      
 
       <defineset>
         <define name="BUILDING_TOOLS"/>
diff --git a/Tools/Source/TianoTools/GenSection/build.xml b/Tools/Source/TianoTools/GenSection/build.xml
index 95987e6077..a5a8403508 100644
--- a/Tools/Source/TianoTools/GenSection/build.xml
+++ b/Tools/Source/TianoTools/GenSection/build.xml
@@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
         optimize="speed">
-
+      <compilerarg value="${ExtraArgus}" />
       <fileset dir="${basedir}/${ToolName}" 
         includes="${FileSet}" 
         defaultexcludes="TRUE" 
diff --git a/Tools/Source/TianoTools/GenTEImage/build.xml b/Tools/Source/TianoTools/GenTEImage/build.xml
index 58dadc12ee..3c5ea036f6 100644
--- a/Tools/Source/TianoTools/GenTEImage/build.xml
+++ b/Tools/Source/TianoTools/GenTEImage/build.xml
@@ -39,6 +39,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
         optimize="speed">
+      <compilerarg value="${ExtraArgus}" />
 
       <fileset dir="${basedir}/${ToolName}" 
         includes="${FileSet}" 
diff --git a/Tools/Source/TianoTools/MakeDeps/build.xml b/Tools/Source/TianoTools/MakeDeps/build.xml
index 3223732d0b..0a57036b9c 100755
--- a/Tools/Source/TianoTools/MakeDeps/build.xml
+++ b/Tools/Source/TianoTools/MakeDeps/build.xml
@@ -38,7 +38,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
         optimize="speed">
-
+      <compilerarg value="${ExtraArgus}" />   
+       
       <fileset dir="${basedir}/${ToolName}" 
         includes="${FileSet}" 
         defaultexcludes="TRUE" 
diff --git a/Tools/Source/TianoTools/PeiRebase/build.xml b/Tools/Source/TianoTools/PeiRebase/build.xml
index e9fb8e5cfb..92bd5c0e40 100644
--- a/Tools/Source/TianoTools/PeiRebase/build.xml
+++ b/Tools/Source/TianoTools/PeiRebase/build.xml
@@ -40,7 +40,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outfile="${BIN_DIR}/${ToolName}_Ia32"
         outtype="executable"
         optimize="speed">
-
+      <compilerarg value="${ExtraArgus}" />
       <fileset dir="${basedir}/${ToolName}" 
         includes="${FileSet}"/>
 
@@ -56,7 +56,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outfile="${BIN_DIR}/${ToolName}_Ipf"
         outtype="executable"
         optimize="speed">
-
+      <compilerarg value="${ExtraArgus}" />
       <fileset dir="${basedir}/${ToolName}" 
         includes="${FileSet}"/>
 
@@ -72,7 +72,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outfile="${BIN_DIR}/${ToolName}_X64"
         outtype="executable"
         optimize="speed">
-
+      <compilerarg value="${ExtraArgus}" />
       <fileset dir="${basedir}/${ToolName}" 
         includes="${FileSet}" />
 
diff --git a/Tools/Source/TianoTools/String/String.c b/Tools/Source/TianoTools/String/String.c
index cdbf29964c..78d0a59fca 100644
--- a/Tools/Source/TianoTools/String/String.c
+++ b/Tools/Source/TianoTools/String/String.c
@@ -24,6 +24,8 @@ Abstract:
 
 #include <Common/UefiBaseTypes.h>
 
+#include <string.h>
+
 #include "CommonLib.h"
 
 /**
diff --git a/Tools/Source/TianoTools/String/build.xml b/Tools/Source/TianoTools/String/build.xml
index f238a8712b..44c617360b 100644
--- a/Tools/Source/TianoTools/String/build.xml
+++ b/Tools/Source/TianoTools/String/build.xml
@@ -62,7 +62,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outtype="static"
         debug="true"
         optimize="speed">
-
+      <compilerarg value="${ExtraArgus}" />
       <compilerarg value="-fshort-wchar" if="gcc"/>
 
       <fileset dir="${basedir}/${LibName}" 
diff --git a/Tools/Source/TianoTools/Strip/Strip.c b/Tools/Source/TianoTools/Strip/Strip.c
index c21c4413e2..bccdffb55a 100644
--- a/Tools/Source/TianoTools/Strip/Strip.c
+++ b/Tools/Source/TianoTools/Strip/Strip.c
@@ -23,6 +23,7 @@ Abstract:
 #include <stdio.h>
 #include <memory.h>
 #include <string.h>
+#include <stdlib.h>
 
 int
 main (
diff --git a/Tools/Source/TianoTools/build.xml b/Tools/Source/TianoTools/build.xml
index d172292809..5d3770ae0f 100644
--- a/Tools/Source/TianoTools/build.xml
+++ b/Tools/Source/TianoTools/build.xml
@@ -94,10 +94,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <isset property="env.TOOL_CHAIN" />
           <then>
             <property name="ToolChain" value="${env.TOOL_CHAIN}"/>
+            <property name="ExtraArgus" value="-Wno-pointer-sign" />
           </then>
           <else>
             <!-- Default Tool Chain is Microsoft Visual Studio -->
             <property name="ToolChain" value="msvc"/>
+            <property name="ExtraArgus" value="" />
           </else>
         </if>
       </then>