./modules.xml

@@ -1507,10 +1507,11 @@
     <depend>java.base</depend>
   </module>
   <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>
     </export>
     <export>

@@ -1527,14 +1528,10 @@
     </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>
     <export>
       <name>com.sun.tools.javac.api</name>

@@ -1605,12 +1602,10 @@
     <depend>java.scripting</depend>
   </module>
   <module>
     <name>jdk.dev</name>
     <depend>java.base</depend>
-    <depend>java.xml</depend>
-    <depend>jdk.compiler</depend>
   </module>
   <module>
     <name>jdk.hotspot.agent</name>
     <depend>java.base</depend>
     <depend>java.datatransfer</depend>