--- a/make/Main.gmk	Fri Aug 29 13:30:42 2014 +0200
+++ b/make/Main.gmk	Fri Aug 29 10:46:21 2014 -0700
@@ -297,14 +297,10 @@
 ################################################################################
 # Verification targets
 
-# generate modules.xml in the exploded image
-modules-xml:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ModulesXml.gmk gen-modules-xml)
+verify-modules:
+	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f CheckModules.gmk)
 
-verify-modules:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ModulesXml.gmk checkdeps)
-
-ALL_TARGETS += modules-xml verify-modules
+ALL_TARGETS += verify-modules
 
 ################################################################################
 # Install targets
@@ -389,6 +385,8 @@
   # Explicitly add dependencies for special targets
   java.base-java: unpack-sec
 
+  jdk.dev-gendata: java rmic
+
   security-jars: java
 
   nashorn-jar: jdk.scripting.nashorn-java
@@ -421,9 +419,7 @@
 
   test: exploded-image
 
-  modules-xml: build-tools-jdk java
-
-  verify-modules: exploded-image modules-xml
+  verify-modules: exploded-image
 
 endif
 
@@ -460,7 +456,7 @@
 ALL_MODULE_TARGETS := $(sort $(GENSRC_MODULES) $(JAVA_MODULES) \
     $(GENDATA_MODULES) $(LIB_MODULES) $(LAUNCHER_MODULES) $(COPY_MODULES))
 
-exploded-image: $(ALL_MODULE_TARGETS) modules-xml
+exploded-image: $(ALL_MODULE_TARGETS)
 # The old 'jdk' target most closely matches the new exploded-image. Keep an
 # alias for ease of use.
 jdk: exploded-image