--- a/make/lib/Lib-java.base.gmk	Mon Apr 16 14:51:31 2018 +0200
+++ b/make/lib/Lib-java.base.gmk	Wed Apr 18 14:22:53 2018 +0200
@@ -29,9 +29,7 @@
 $(eval $(call IncludeCustomExtension, lib/Lib-java.base.gmk))
 
 # Prepare the find cache.
-LIB_java.base_SRC_DIRS += $(TOPDIR)/src/java.base/*/native
-
-$(eval $(call FillCacheFind, $(wildcard $(LIB_java.base_SRC_DIRS))))
+$(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/java.base/*/native)))
 
 ################################################################################
 # Create all the core libraries
@@ -47,8 +45,8 @@
     NAME := net, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB), \
-    HEADER_FLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
-        $(LIBJAVA_HEADER_FLAGS), \
+    HEADER_FLAGS := \
+        -I$(call FindHeaderDirForModule, $(MODULE)), \
     DISABLED_WARNINGS_gcc := format-nonliteral, \
     DISABLED_WARNINGS_clang := parentheses-equality constant-logical-operand, \
     DISABLED_WARNINGS_microsoft := 4244 4047 4133 4996, \
@@ -72,21 +70,16 @@
 ################################################################################
 # Create the nio library
 
-BUILD_LIBNIO_EXTRA_HEADERS := \
-    $(call FindSrcDirsForComponent, java.base, libnio/ch) \
-    $(call FindSrcDirsForComponent, java.base, libnio/fs) \
-    #
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBNIO, \
     NAME := nio, \
     OPTIMIZATION := HIGH, \
     WARNINGS_AS_ERRORS_xlc := false, \
     CFLAGS := $(CFLAGS_JDKLIB), \
     HEADER_FLAGS := \
-        -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
-        $(LIBJAVA_HEADER_FLAGS) \
-        $(addprefix -I, $(BUILD_LIBNET_SRC)) \
-        $(addprefix -I, $(BUILD_LIBNIO_EXTRA_HEADERS)), \
+        -I$(call FindHeaderDirForModule, $(MODULE)) \
+        $(addprefix -I, $(call FindSrcDirsForComponent, java.base, libnio/ch)) \
+        $(addprefix -I, $(call FindSrcDirsForComponent, java.base, libnio/fs)) \
+        $(addprefix -I, $(call FindSrcDirsForLib, java.base, net)), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljava -lnet, \
@@ -116,7 +109,7 @@
         NAME := osxsecurity, \
         OPTIMIZATION := LOW, \
         CFLAGS := $(CFLAGS_JDKLIB), \
-        HEADER_FLAGS := $(LIBJAVA_HEADER_FLAGS) \
+        HEADER_FLAGS :=  \
             -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
         DISABLED_WARNINGS_clang := deprecated-declarations, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \