--- a/hotspot/src/jdk.aot/share/classes/module-info.java	Sat Jun 17 08:03:09 2017 +0100
+++ b/hotspot/src/jdk.aot/share/classes/module-info.java	Sat Jun 17 11:50:50 2017 -0700
@@ -23,8 +23,15 @@
  * questions.
  */
 
+/**
+ * Defines the Ahead-of-Time (AOT) compiler, <em>{@index jaotc jaotc tool}</em>,
+ * for compiling Java classes into AOT library.
+ *
+ * @moduleGraph
+ * @since 9
+ */
 module jdk.aot {
-    requires jdk.management;
     requires jdk.internal.vm.ci;
     requires jdk.internal.vm.compiler;
+    requires jdk.management;
 }

--- a/hotspot/src/jdk.internal.vm.compiler/share/classes/module-info.java	Sat Jun 17 08:03:09 2017 +0100
+++ b/hotspot/src/jdk.internal.vm.compiler/share/classes/module-info.java	Sat Jun 17 11:50:50 2017 -0700
@@ -26,11 +26,9 @@
 module jdk.internal.vm.compiler {
     requires java.instrument;
     requires java.management;
+    requires jdk.internal.vm.ci;
     requires jdk.management;
-    requires jdk.internal.vm.ci;
-
-    // sun.misc.Unsafe is used
-    requires jdk.unsupported;
+    requires jdk.unsupported;   // sun.misc.Unsafe is used
 
     uses org.graalvm.compiler.code.DisassemblerProvider;
     uses org.graalvm.compiler.core.match.MatchStatementSet;