--- a/make/copy/Copy-java.base.gmk	Mon Oct 30 16:37:53 2017 +0100
+++ b/make/copy/Copy-java.base.gmk	Tue Oct 31 11:55:09 2017 -0400
@@ -42,7 +42,7 @@
 	$(call install-file)
 
 $(INCLUDE_DST_OS_DIR)/%.h: \
-    $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include/%.h
+    $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/include/%.h
 	$(call install-file)
 
 ################################################################################