--- a/make/lib/CoreLibraries.gmk	Mon Apr 16 14:51:31 2018 +0200
+++ b/make/lib/CoreLibraries.gmk	Wed Apr 18 14:22:53 2018 +0200
@@ -133,8 +133,8 @@
     System.c_CFLAGS := $(VERSION_CFLAGS), \
     jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \
     HEADER_FLAGS := \
-        -I$(TOPDIR)/src/java.base/share/native/libfdlibm \
-        -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
+        -I$(call FindHeaderDirForModule, $(MODULE)) \
+        $(addprefix -I, $(call FindSrcDirsForLib, java.base, fdlibm)), \
     WARNINGS_AS_ERRORS_xlc := false, \
     DISABLED_WARNINGS_gcc := unused-result, \
     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
@@ -180,9 +180,7 @@
         $(LIBZ_CFLAGS), \
     CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
     HEADER_FLAGS := \
-        -I$(TOPDIR)/src/java.base/share/native/libjava \
-        -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
-        -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
+        -I$(call FindHeaderDirForModule, $(MODULE)), \
     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -201,11 +199,9 @@
     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB), \
+    CXXFLAGS := $(CXXFLAGS_JDKLIB), \
     HEADER_FLAGS := \
-        -I$(TOPDIR)/src/java.base/share/native/libjava \
-        -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
-        -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
-    CXXFLAGS := $(CXXFLAGS_JDKLIB), \
+        -I$(call FindHeaderDirForModule, $(MODULE)), \
     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
     CFLAGS_unix := -UDEBUG, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \