--- old/./modules.xml	2015-05-23 09:49:41.291356982 -0700
+++ new/./modules.xml	2015-05-23 09:49:41.223356981 -0700
@@ -1509,6 +1509,7 @@
   <module>
     <name>jdk.compiler</name>
     <depend>java.base</depend>
+    <depend>java.xml</depend>
     <depend re-exports="true">java.compiler</depend>
     <export>
       <name>com.sun.source.doctree</name>
@@ -1529,10 +1530,6 @@
       <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>
@@ -1607,8 +1604,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>