diff -r 6b4c8cffb90e -r 2c5f2779c3d1 langtools/src/jdk.javadoc/share/classes/module-info.java
--- a/langtools/src/jdk.javadoc/share/classes/module-info.java	Sat Jun 17 08:02:55 2017 +0100
+++ b/langtools/src/jdk.javadoc/share/classes/module-info.java	Sat Jun 17 11:50:45 2017 -0700
@@ -58,9 +58,10 @@
  * @since 9
  */
 module jdk.javadoc {
+    requires java.xml;
+
     requires transitive java.compiler;
     requires transitive jdk.compiler;
-    requires java.xml;
 
     exports com.sun.javadoc;
     exports com.sun.tools.doclets;
@@ -69,13 +70,13 @@
 
     exports jdk.javadoc.doclet;
 
-    provides java.util.spi.ToolProvider
-        with jdk.javadoc.internal.tool.JavadocToolProvider;
+    provides java.util.spi.ToolProvider with
+        jdk.javadoc.internal.tool.JavadocToolProvider;
 
-    provides javax.tools.DocumentationTool
-        with jdk.javadoc.internal.api.JavadocTool;
+    provides javax.tools.DocumentationTool with
+        jdk.javadoc.internal.api.JavadocTool;
 
-    provides javax.tools.Tool
-        with jdk.javadoc.internal.api.JavadocTool;
+    provides javax.tools.Tool with
+        jdk.javadoc.internal.api.JavadocTool;
 }