diff --git a/Tools/Source/TianoTools/CompressDll/build.xml b/Tools/Source/TianoTools/CompressDll/build.xml
index 2ef3849340..5df343c035 100644
--- a/Tools/Source/TianoTools/CompressDll/build.xml
+++ b/Tools/Source/TianoTools/CompressDll/build.xml
@@ -72,7 +72,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </if>
   </target>
   
-  <target name="Lib" depends="init" unless="gcc">
+  <target name="Lib" depends="init">
     <cc name="${ToolChain}" 
       objdir="${BUILD_DIR}" 
       outtype="shared" 
@@ -85,7 +85,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
       <includepath path="${env.JAVA_HOME}/include"/>
-      <includepath path="${env.JAVA_HOME}/include/win32"/>
+      <includepath path="${env.JAVA_HOME}/include/win32" if="windows"/>
+      <includepath path="${env.JAVA_HOME}/include/linux" if="linux"/>
       <libset dir="${LIB_DIR}" libs="CommonTools"/>
       <syslibset libs="kernel32" unless="gcc"/>
     </cc>
diff --git a/Tools/Source/TianoTools/build.xml b/Tools/Source/TianoTools/build.xml
index 6d4d75b629..d5446f138d 100644
--- a/Tools/Source/TianoTools/build.xml
+++ b/Tools/Source/TianoTools/build.xml
@@ -75,6 +75,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </then>
     </if>
 
+    <condition property="linux" value="true">
+      <os name="Linux"/>
+    </condition>
+    
+    <condition property="windows" value="true">
+      <os family="Windows"/>
+    </condition>
+    
+    <condition property="OSX" value="true">
+      <os family="Mac"/>
+    </condition>
+    
   </target>
   
   <target name="Libraries">