--- old/./modules.xml	2015-05-26 22:32:35.367877528 -0700
+++ new/./modules.xml	2015-05-26 22:32:35.295877526 -0700
@@ -1526,13 +1526,6 @@
       <name>com.sun.tools.javah</name>
     </export>
     <export>
-      <name>com.sun.tools.javap</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>
@@ -1551,6 +1544,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>
@@ -1575,6 +1569,7 @@
     <export>
       <name>com.sun.tools.javac.util</name>
       <to>jdk.javadoc</to>
+      <to>jdk.jdeps</to>
     </export>
   </module>
   <module>
@@ -1607,8 +1602,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>
@@ -1678,6 +1671,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>