--- old/jdk/make/copy/Copy-jdk.accessibility.gmk	2016-10-18 12:09:18.053959400 -0500
+++ new/jdk/make/copy/Copy-jdk.accessibility.gmk	2016-10-18 12:09:17.071903300 -0500
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2104, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2104, 2016, 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,18 +23,19 @@
 # questions.
 #
 
-include CopyCommon.gmk
+JAVAACCESSBRIDGE_DST_OS_DIR := $(SUPPORT_OUTPUTDIR)/modules_javaaccessbridge/jdk.accessibility/
 
 ################################################################################
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
-  TARGETS += $(INCLUDE_DST_OS_DIR)/bridge/AccessBridgeCallbacks.h \
-      $(INCLUDE_DST_OS_DIR)/bridge/AccessBridgeCalls.h \
-      $(INCLUDE_DST_OS_DIR)/bridge/AccessBridgePackages.h \
-      $(INCLUDE_DST_OS_DIR)/bridge/AccessBridgeCalls.c
+  TARGETS += $(JAVAACCESSBRIDGE_DST_OS_DIR)/AccessBridgeCallbacks.h \
+      $(JAVAACCESSBRIDGE_DST_OS_DIR)/AccessBridgeCalls.h \
+      $(JAVAACCESSBRIDGE_DST_OS_DIR)/AccessBridgeDebug.h \
+      $(JAVAACCESSBRIDGE_DST_OS_DIR)/AccessBridgePackages.h \
+      $(JAVAACCESSBRIDGE_DST_OS_DIR)/AccessBridgeCalls.c
 
-  $(INCLUDE_DST_OS_DIR)/bridge/%: \
-      $(JDK_TOPDIR)/src/jdk.accessibility/windows/native/include/bridge/%
+  $(JAVAACCESSBRIDGE_DST_OS_DIR)/%: \
+      $(JDK_TOPDIR)/src/jdk.accessibility/windows/native/javaaccessbridge/%
 		$(install-file)
 
 endif