--- a/make/common/JdkNativeCompilation.gmk	Mon Apr 16 14:51:31 2018 +0200
+++ b/make/common/JdkNativeCompilation.gmk	Wed Apr 18 14:22:53 2018 +0200
@@ -48,6 +48,9 @@
       $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/$(strip $2) \
       $(TOPDIR)/src/$(strip $1)/share/native/$(strip $2)))
 
+FindHeaderDirForModule = \
+  $(wildcard $(SUPPORT_OUTPUTDIR)/headers/$(strip $1))
+
 # Setup make rules for creating a native shared library with suitable defaults
 # for the OpenJDK project.
 #