--- a/make/lib/Lib-jdk.pack.gmk	Thu Apr 26 15:52:17 2018 +0200
+++ b/make/lib/Lib-jdk.pack.gmk	Thu May 03 14:30:20 2018 +0200
@@ -27,19 +27,15 @@
 
 ################################################################################
 
-LIBUNPACK_SRC := \
-    $(call FindSrcDirsForLib, jdk.pack, unpack) \
-    $(call FindSrcDirsForComponent, jdk.pack, common-unpack) \
-    #
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBUNPACK, \
     NAME := unpack, \
-    SRC := $(LIBUNPACK_SRC), \
+    EXTRA_SRC := $(call FindSrcDirsForComponent, jdk.pack, common-unpack), \
     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
     OPTIMIZATION := LOW, \
     CXXFLAGS := $(CXXFLAGS_JDKLIB) \
         -DNO_ZLIB -DUNPACK_JNI -DFULL, \
     CFLAGS_release := -DPRODUCT, \
+    EXTRA_HEADER_DIRS := $(call FindHeaderDirForModule, java.base), \
     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \