--- a/make/lib/Lib-java.instrument.gmk	Thu Apr 26 15:52:17 2018 +0200
+++ b/make/lib/Lib-java.instrument.gmk	Thu May 03 14:30:20 2018 +0200
@@ -47,8 +47,7 @@
     CFLAGS := $(LIBINSTRUMENT_CFLAGS_JDKLIB) $(LIBINSTRUMENT_CFLAGS), \
     CFLAGS_debug := -DJPLIS_LOGGING, \
     CFLAGS_release := -DNO_JPLIS_LOGGING, \
-    HEADER_FLAGS := \
-        $(addprefix -I, $(call FindSrcDirsForLib, java.base, jli)), \
+    EXTRA_HEADER_DIRS := $(call FindSrcDirsForLib, java.base, jli), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN) \
         $(LIBINSTRUMENT_LDFLAGS), \