diff --git a/com.amd.aparapi.jni/build.xml b/com.amd.aparapi.jni/build.xml
index 752ae83ec9ace9eb3949c9a9dc19a8e5c4c61cfe..c2c82201e6a66d390a4e902424e96cb7dcd72fcd 100644
--- a/com.amd.aparapi.jni/build.xml
+++ b/com.amd.aparapi.jni/build.xml
@@ -12,6 +12,7 @@ First consider editing the properties in build.properties
    <echo>OS Name:    ${os.name}</echo>
    <echo>OS Version: ${os.version}</echo>
    <echo>OS Arch:    ${os.arch}</echo>
+   <echo>Java Ver:   ${java.version}</echo>
 
    <!--<property name="build.compiler" value="javac1.6"/>-->
    <!--  <property name="ant.build.javac.source" value="1.6"/>-->
@@ -643,7 +644,11 @@ First consider editing the properties in build.properties
          <arg value="-fPIC" />
          <!-- <arg value="-fopenmp"/> -->
          <arg value="-DCL_USE_DEPRECATED_OPENCL_1_1_APIS"/>
+         <!-- JDK 6 -->
          <arg value="-I/System/Library/Frameworks/JavaVM.framework/Headers" />
+         <!-- JDK 7u51 without JDK 6 -->
+         <arg value="-I/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/include/" />
+         <arg value="-I/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/include/darwin/" />
          <arg value="-Iinclude" />
          <arg value="-Isrc/cpp" />
          <arg value="-Isrc/cpp/runKernel" />
@@ -795,7 +800,11 @@ First consider editing the properties in build.properties
          <arg value="-g" />
          <arg value="-fPIC" />
          <arg value="-DCL_USE_DEPRECATED_OPENCL_1_1_APIS"/>
+         <!-- JDK 6 -->
          <arg value="-I/System/Library/Frameworks/JavaVM.framework/Headers" />
+         <!-- JDK 7u51 without JDK 6 -->
+         <arg value="-I/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/include/" />
+         <arg value="-I/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/include/darwin/" />
          <arg value="-Iinclude" />
          <arg value="-Isrc/cpp" />
          <arg value="-Isrc/cpp/runKernel" />