--- a/make/lib/Lib-jdk.management.gmk	Mon Apr 16 14:51:31 2018 +0200
+++ b/make/lib/Lib-jdk.management.gmk	Wed Apr 18 14:22:53 2018 +0200
@@ -49,9 +49,7 @@
     OPTIMIZATION := $(LIBMANAGEMENT_EXT_OPTIMIZATION), \
     CFLAGS := $(CFLAGS_JDKLIB) $(LIBMANAGEMENT_EXT_CFLAGS), \
     HEADER_FLAGS := \
-        -I$(TOPDIR)/src/java.management/share/native/include \
-        -I$(SUPPORT_OUTPUTDIR)/headers/jdk.management \
-        $(LIBJAVA_HEADER_FLAGS), \
+        -I$(call FindHeaderDirForModule, $(MODULE)), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JDKLIB_LIBS), \