diff --git a/buildjdk.sh b/buildjdk.sh
index 7704a13..9aa9605 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -12,10 +12,11 @@ export CPPFLAGS+=" -DHEADLESS" # -I$FREETYPE_DIR -I$CUPS_DIR
 
 sudo apt -y install systemtap-sdt-dev gcc-multilib g++-multilib libxtst-dev libasound2-dev libelf-dev libfontconfig1-dev libx11-dev
 
-mkdir -p other_include
+# cp -R /usr/include/X11 $ANDROID_INCLUDE/
+# cp -R /usr/include/fontconfig $ANDROID_INCLUDE/
 
-cp -R /usr/include/X11 other_include/
-cp -R /usr/include/fontconfig other_include/
+ln -s /usr/include/X11 $ANDROID_INCLUDE/
+ln -s /usr/include/fontconfig $ANDROID_INCLUDE/
 
 # Create dummy libraries so we won't have to remove them in OpenJDK makefiles
 mkdir dummy_libs
@@ -35,10 +36,10 @@ bash ./configure \
 	--with-cups-include=$CUPS_DIR \
 	--with-devkit=$ANDROID_DEVKIT \
 	--with-debug-level=release \
-	--with-fontconfig-include=`pwd`/other_include \
+	--with-fontconfig-include=$ANDROID_INCLUDE \
 	--with-freetype-lib=$FREETYPE_DIR/lib \
 	--with-freetype-include=$FREETYPE_DIR/include/freetype2 \
-	--x-includes=`pwd`/other_include \
+	--x-includes=$ANDROID_INCLUDE \
 	--x-libraries=/usr/lib || \
 error_code=$?
 if [ "$error_code" -ne 0 ]; then