diff -r 3bef5f8dbd94 -r 679fecf08dd2 modules.xml
--- a/modules.xml	Wed May 27 12:45:29 2015 -0700
+++ b/modules.xml	Wed May 27 13:25:04 2015 -0700
@@ -1523,10 +1523,6 @@
       <name>com.sun.tools.javac</name>
     </export>
     <export>
-      <name>com.sun.tools.classfile</name>
-      <to>jdk.dev</to>
-    </export>
-    <export>
       <name>com.sun.tools.doclint</name>
       <to>jdk.javadoc</to>
     </export>
@@ -1545,6 +1541,7 @@
     <export>
       <name>com.sun.tools.javac.file</name>
       <to>jdk.javadoc</to>
+      <to>jdk.jdeps</to>
     </export>
     <export>
       <name>com.sun.tools.javac.jvm</name>
@@ -1569,6 +1566,7 @@
     <export>
       <name>com.sun.tools.javac.util</name>
       <to>jdk.javadoc</to>
+      <to>jdk.jdeps</to>
     </export>
   </module>
   <module>
@@ -1601,8 +1599,6 @@
   <module>
     <name>jdk.dev</name>
     <depend>java.base</depend>
-    <depend>java.xml</depend>
-    <depend>jdk.compiler</depend>
   </module>
   <module>
     <name>jdk.hotspot.agent</name>
@@ -1672,6 +1668,13 @@
     </export>
   </module>
   <module>
+    <name>jdk.jdeps</name>
+    <depend>java.base</depend>
+    <depend>java.compiler</depend>
+    <depend>java.xml</depend>
+    <depend>jdk.compiler</depend>
+  </module>
+  <module>
     <name>jdk.jdi</name>
     <depend>java.base</depend>
     <depend>jdk.attach</depend>