--- a/make/lib/Lib-jdk.jdi.gmk	Fri May 04 00:23:32 2018 +0200
+++ b/make/lib/Lib-jdk.jdi.gmk	Fri May 04 00:50:29 2018 +0200
@@ -34,8 +34,8 @@
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP, \
       EXTRA_HEADER_DIRS := \
-          $(call FindSrcDirsForComponent, jdk.jdwp.agent, include) \
-          $(call FindSrcDirsForComponent, jdk.jdwp.agent, libjdwp/export), \
+          jdk.jdwp.agent:include \
+          jdk.jdwp.agent:libjdwp/export, \
       LDFLAGS := $(LDFLAGS_JDKLIB), \
       LIBS := $(JDKLIB_LIBS), \
   ))