diff --git a/buildjdk.sh b/buildjdk.sh
index fb153f9..ebaeb8b 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -14,24 +14,17 @@ export LDFLAGS+=" -L`pwd`/dummy_libs -Wl,--warn-unresolved-symbols"
 # cp -R /usr/include/X11 $ANDROID_INCLUDE/
 # cp -R /usr/include/fontconfig $ANDROID_INCLUDE/
 
-ln -s /usr/include/X11 $ANDROID_INCLUDE/
-ln -s /usr/include/fontconfig $ANDROID_INCLUDE/
-
-# TODO remove after use got client to move them permanent
-mkdir -p openjdk/jdk/src/share/native/common/unicode
-mkdir -p openjdk/jdk/src/share/native/sun/font/layout/unicode
-mv openjdk/jdk/src/share/native/sun/font/layout/unicode/* openjdk/jdk/src/share/native/common/unicode/
+ln -s -f /usr/include/X11 $ANDROID_INCLUDE/
+ln -s -f /usr/include/fontconfig $ANDROID_INCLUDE/
 
 # Create dummy libraries so we won't have to remove them in OpenJDK makefiles
-mkdir dummy_libs
+mkdir -p dummy_libs
 ar cru dummy_libs/libpthread.a
 ar cru dummy_libs/libthread_db.a
 
 cd openjdk
 rm -rf build
 
-rm common/autoconf/generated-configure.sh
-
 #	--with-extra-cxxflags="$CXXFLAGS -Dchar16_t=uint16_t -Dchar32_t=uint32_t" \
 #	--with-extra-cflags="$CPPFLAGS" \
 bash ./configure \