--- old/make/copy/Copy-java.base.gmk	2017-10-26 15:10:04.151829453 -0400
+++ new/make/copy/Copy-java.base.gmk	2017-10-26 15:10:03.725303927 -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)
 
 ################################################################################