diff -r 1b154e6d8bb2 -r e9a717e79a59 make/lib/Lib-jdk.pack.gmk
--- a/make/lib/Lib-jdk.pack.gmk	Fri May 04 00:50:29 2018 +0200
+++ b/make/lib/Lib-jdk.pack.gmk	Fri May 04 00:52:25 2018 +0200
@@ -35,7 +35,7 @@
     CXXFLAGS := $(CXXFLAGS_JDKLIB) \
         -DNO_ZLIB -DUNPACK_JNI -DFULL, \
     CFLAGS_release := -DPRODUCT, \
-    EXTRA_HEADER_DIRS := $(call FindHeaderDirForModule, java.base), \
+    EXTRA_HEADER_DIRS := $(call GetJavaHeaderDir, java.base), \
     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \