diff -r a6cb200daa5d -r 2b67c11c0db6 make/lib/Lib-java.desktop.gmk
--- a/make/lib/Lib-java.desktop.gmk	Thu Apr 26 15:52:17 2018 +0200
+++ b/make/lib/Lib-java.desktop.gmk	Thu May 03 14:30:20 2018 +0200
@@ -118,8 +118,7 @@
       NAME := osx, \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB), \
-      HEADER_FLAGS := \
-          $(addprefix -I, $(call FindSrcDirsForLib, java.desktop, osxapp)), \
+      EXTRA_HEADER_DIRS := $(call FindSrcDirsForLib, java.desktop, osxapp), \
       DISABLED_WARNINGS_clang := deprecated-declarations, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.desktop \