--- a/make/lib/LibCommon.gmk	Tue Sep 12 19:03:39 2017 +0200
+++ b/make/lib/LibCommon.gmk	Tue Sep 12 19:03:56 2017 +0200
@@ -26,11 +26,11 @@
 include NativeCompilation.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, lib/LibCommon.gmk))
+$(eval $(call IncludeCustomExtension, , lib/LibCommon.gmk))
 
 ################################################################################
 
-GLOBAL_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc
+GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc
 
 # Absolute paths to lib files on windows for use in LDFLAGS. Should figure out a more
 # elegant solution to this.
@@ -46,9 +46,9 @@
 # Param 2 - library name
 FindSrcDirsForLib += \
   $(call uniq, $(wildcard \
-      $(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/lib$(strip $2) \
-      $(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/lib$(strip $2) \
-      $(JDK_TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2)))
+      $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/lib$(strip $2) \
+      $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/lib$(strip $2) \
+      $(TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2)))
 
 ################################################################################
 # Find a library
@@ -73,7 +73,7 @@
 ifeq ($(USE_EXTERNAL_LIBZ), true)
   LIBZ := -lz
 else
-  ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib
+  ZLIB_CPPFLAGS := -I$(TOPDIR)/src/java.base/share/native/libzip/zlib
 endif
 
 ###############################################################################