--- a/make/copy/Copy-jdk.jdwp.agent.gmk	Mon Dec 04 13:13:44 2017 -0800
+++ b/make/copy/Copy-jdk.jdwp.agent.gmk	Mon Dec 04 23:55:52 2017 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,13 +23,7 @@
 # questions.
 #
 
-include CopyCommon.gmk
-
 ################################################################################
+# Include CopyCommon.gmk to get exported header files to be properly copied.
 
-TARGETS := $(INCLUDE_DST_DIR)/jdwpTransport.h
-
-$(INCLUDE_DST_DIR)/%.h: $(TOPDIR)/src/jdk.jdwp.agent/share/native/include/%.h
-	$(call install-file)
-
-################################################################################
+include CopyCommon.gmk