--- a/make/launcher/Launcher-jdk.accessibility.gmk	Tue Sep 12 19:03:39 2017 +0200
+++ b/make/launcher/Launcher-jdk.accessibility.gmk	Tue Sep 12 19:03:56 2017 +0200
@@ -30,8 +30,8 @@
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
 
-  JABSWITCH_SRC := $(JDK_TOPDIR)/src/jdk.accessibility/windows/native/jabswitch
-  ACCESSBRIDGE_SRC := $(JDK_TOPDIR)/src/jdk.accessibility/windows/native/common
+  JABSWITCH_SRC := $(TOPDIR)/src/jdk.accessibility/windows/native/jabswitch
+  ACCESSBRIDGE_SRC := $(TOPDIR)/src/jdk.accessibility/windows/native/common
 
   $(eval $(call SetupNativeCompilation,BUILD_JABSWITCH, \
       SRC := $(JABSWITCH_SRC), \
@@ -59,7 +59,7 @@
 ################################################################################
 # jaccessinspector
 
-  TOPDIR := $(JDK_TOPDIR)/src/jdk.accessibility/windows/native
+  TOPDIR := $(TOPDIR)/src/jdk.accessibility/windows/native
   TOOLS_CFLAGS := $(addprefix -I, \
       $(TOPDIR)/include/bridge \
       $(TOPDIR)/common \