--- a/make/lib/Lib-java.rmi.gmk	Thu Apr 12 14:11:59 2018 +0200
+++ b/make/lib/Lib-java.rmi.gmk	Mon Apr 16 11:48:41 2018 +0200
@@ -29,9 +29,9 @@
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBRMI, \
     NAME := rmi, \
-    SRC := $(TOPDIR)/src/java.rmi/share/native/librmi, \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/java.rmi, \
+    CFLAGS := $(CFLAGS_JDKLIB), \
+    HEADER_FLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.rmi, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljvm, \