--- a/modules.xml	Tue May 26 10:43:56 2015 +0200
+++ b/modules.xml	Wed May 27 12:45:29 2015 -0700
@@ -1523,12 +1523,6 @@
       <name>com.sun.tools.javac</name>
     </export>
     <export>
-      <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>