diff --git a/jxgrabkey/JXGrabKey/C++/nbproject/Makefile-Debug.mk b/jxgrabkey/JXGrabKey/C++/nbproject/Makefile-Debug.mk

index 5dc6791..20f75f1 100644

--- a/jxgrabkey/JXGrabKey/C++/nbproject/Makefile-Debug.mk

+++ b/jxgrabkey/JXGrabKey/C++/nbproject/Makefile-Debug.mk

@@ -53,7 +53,7 @@ dist/Debug/${PLATFORM}/libJXGrabKey.so: ${OBJECTFILES}

 ${OBJECTDIR}/src/JXGrabKey.o: src/JXGrabKey.cpp 

 	${MKDIR} -p ${OBJECTDIR}/src

-	$(COMPILE.cc) -O2 -I/usr/lib/jvm/default-java/include -I/usr/lib/jvm/default-java/include/linux -fPIC  -o ${OBJECTDIR}/src/JXGrabKey.o src/JXGrabKey.cpp

+	$(COMPILE.cc) -O2 -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -fPIC  -o ${OBJECTDIR}/src/JXGrabKey.o src/JXGrabKey.cpp

 # Subprojects

 .build-subprojects:

diff --git a/jxgrabkey/JXGrabKey/C++/nbproject/Makefile-Release.mk b/jxgrabkey/JXGrabKey/C++/nbproject/Makefile-Release.mk

index bfe00ae..64e0124 100644

--- a/jxgrabkey/JXGrabKey/C++/nbproject/Makefile-Release.mk

+++ b/jxgrabkey/JXGrabKey/C++/nbproject/Makefile-Release.mk

@@ -53,7 +53,7 @@ dist/Release/${PLATFORM}/libJXGrabKey.so: ${OBJECTFILES}

 ${OBJECTDIR}/src/JXGrabKey.o: src/JXGrabKey.cpp 

 	${MKDIR} -p ${OBJECTDIR}/src

-	$(COMPILE.cc) -O2 -s -I/usr/lib/jvm/default-java/include -I/usr/lib/jvm/default-java/include/linux -fPIC  -o ${OBJECTDIR}/src/JXGrabKey.o src/JXGrabKey.cpp

+	$(COMPILE.cc) -O2 -s -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -fPIC  -o ${OBJECTDIR}/src/JXGrabKey.o src/JXGrabKey.cpp

 # Subprojects

 .build-subprojects:

diff --git a/jxgrabkey/JXGrabKey/C++/nbproject/configurations.xml b/jxgrabkey/JXGrabKey/C++/nbproject/configurations.xml

index b05ea36..2c15202 100644

--- a/jxgrabkey/JXGrabKey/C++/nbproject/configurations.xml

+++ b/jxgrabkey/JXGrabKey/C++/nbproject/configurations.xml

@@ -32,15 +32,15 @@

       <compileType>

         <cCompilerTool>

           <includeDirectories>

-            <directoryPath>/usr/lib/jvm/default-java/include</directoryPath>

-            <directoryPath>/usr/lib/jvm/default-java/include/linux</directoryPath>

+            <directoryPath>/usr/lib/jvm/java/include</directoryPath>

+            <directoryPath>/usr/lib/jvm/java/include/linux</directoryPath>

           </includeDirectories>

         </cCompilerTool>

         <ccCompilerTool>

           <developmentMode>5</developmentMode>

           <includeDirectories>

-            <directoryPath>/usr/lib/jvm/default-java/include</directoryPath>

-            <directoryPath>/usr/lib/jvm/default-java/include/linux</directoryPath>

+            <directoryPath>/usr/lib/jvm/java/include</directoryPath>

+            <directoryPath>/usr/lib/jvm/java/include/linux</directoryPath>

           </includeDirectories>

         </ccCompilerTool>

         <linkerTool>

@@ -67,16 +67,16 @@

         <cCompilerTool>

           <developmentMode>5</developmentMode>

           <includeDirectories>

-            <directoryPath>/usr/lib/jvm/default-java/include</directoryPath>

-            <directoryPath>/usr/lib/jvm/default-java/include/linux</directoryPath>

+            <directoryPath>/usr/lib/jvm/java/include</directoryPath>

+            <directoryPath>/usr/lib/jvm/java/include/linux</directoryPath>

           </includeDirectories>

         </cCompilerTool>

         <ccCompilerTool>

           <developmentMode>5</developmentMode>

           <stripSymbols>true</stripSymbols>

           <includeDirectories>

-            <directoryPath>/usr/lib/jvm/default-java/include</directoryPath>

-            <directoryPath>/usr/lib/jvm/default-java/include/linux</directoryPath>

+            <directoryPath>/usr/lib/jvm/java/include</directoryPath>

+            <directoryPath>/usr/lib/jvm/java/include/linux</directoryPath>

           </includeDirectories>

         </ccCompilerTool>

         <fortranCompilerTool>