diff --git a/com.amd.aparapi.jni/build.xml b/com.amd.aparapi.jni/build.xml
index 92037cf04f4fa4f48b51fc12341a99fabac5143a..5a5260b032b5a8fb303c8e1285484a0c3bef325d 100644
--- a/com.amd.aparapi.jni/build.xml
+++ b/com.amd.aparapi.jni/build.xml
@@ -14,9 +14,11 @@ First consider editing the properties in build.properties
    <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"/>-->
-   <!-- <property name="ant.build.javac.target" value="1.6"/> -->
+   <!-- Ideally this would be the latest version of Java but not everyone is going to have it installed -->
+   <!-- Additionally we want to avoid "Class not found: javac1.8" errors from old Ant versions (i.e. Eclipse) -->
+   <property name="build.compiler" value="javac1.7"/>
+   <property name="ant.build.javac.source" value="1.7"/>
+   <property name="ant.build.javac.target" value="1.7"/>
 
    <property environment="env" />
    <!-- we need env.PATH for msvc only -->
@@ -646,9 +648,9 @@ First consider editing the properties in build.properties
          <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_12.jdk/Contents/Home/include/" />
-         <arg value="-I/Library/Java/JavaVirtualMachines/jdk1.7.0_12.jdk/Contents/Home/include/darwin/" />
+         <!-- LATEST JDK 7 without JDK 6 -->
+         <arg value="-I/Library/Java/JavaVirtualMachines/jdk1.7.0_67.jdk/Contents/Home/include/" />
+         <arg value="-I/Library/Java/JavaVirtualMachines/jdk1.7.0_67.jdk/Contents/Home/include/darwin/" />
          <arg value="-Iinclude" />
          <arg value="-Isrc/cpp" />
          <arg value="-Isrc/cpp/runKernel" />
diff --git a/com.amd.aparapi/build.xml b/com.amd.aparapi/build.xml
index 6d2c381eb9c2d3a051e9f9b929fdea29f494196d..6dad1277ab5751005e21687d1fba21997ed2c39c 100644
--- a/com.amd.aparapi/build.xml
+++ b/com.amd.aparapi/build.xml
@@ -18,9 +18,11 @@
 	<echo>OS Version: ${os.version}</echo>
 	<echo>OS Arch:    ${os.arch}</echo>
 
-	<!-- <property name="build.compiler" value="javac1.6"/>
-	<property name="ant.build.javac.source" value="1.6"/>
-	<property name="ant.build.javac.target" value="1.6"/> -->
+    <!-- Ideally this would be the latest version of Java but not everyone is going to have it installed -->
+    <!-- Additionally we want to avoid "Class not found: javac1.8" errors from old Ant versions (i.e. Eclipse) -->
+	<property name="build.compiler" value="javac1.7"/>
+	<property name="ant.build.javac.source" value="1.7"/>
+	<property name="ant.build.javac.target" value="1.7"/>
 
 	<available property="findbugs.installed" file="${findbugs.home}"/>
 
@@ -72,8 +74,8 @@
    		  srcdir="${basedir}/src/java"
    		  destdir="${basedir}/classes"
    		  includeantruntime="false">
-                  <!--<compilerarg value="-Xlint"/>
-                         <compilerarg value="-Xlint:-path"/> -->
+          <compilerarg value="-Xlint"/>
+          <compilerarg value="-Xlint:-path"/>
        </javac>
        <jar jarfile="${basedir}/dist/aparapi.jar" basedir="${basedir}/classes">
        		<manifest>