--- a/make/gensrc/Gensrc-jdk.management.agent.gmk	Tue Sep 12 19:03:39 2017 +0200
+++ b/make/gensrc/Gensrc-jdk.management.agent.gmk	Tue Sep 12 19:03:56 2017 +0200
@@ -23,14 +23,14 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 ################################################################################
 
 include GensrcProperties.gmk
 
 $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/jdk.management.agent/share/classes/jdk/internal/agent/resources, \
+    SRC_DIRS := $(TOPDIR)/src/jdk.management.agent/share/classes/jdk/internal/agent/resources, \
     CLASS := ListResourceBundle, \
 ))