--- a/make/lib/Lib-java.security.jgss.gmk	Mon Apr 16 14:51:31 2018 +0200
+++ b/make/lib/Lib-java.security.jgss.gmk	Wed Apr 18 14:22:53 2018 +0200
@@ -31,8 +31,8 @@
     NAME := j2gss, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB), \
-    HEADER_FLAGS := $(LIBJAVA_HEADER_FLAGS) \
-        -I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \
+    HEADER_FLAGS := \
+        -I$(call FindHeaderDirForModule, $(MODULE)), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(LIBDL), \