diff --git a/jaxb-ri/bundles/xjc/src/main/java/module-info.java b/jaxb-ri/bundles/xjc/src/main/java/module-info.java
index 9a031a5..00ddd49 100644
--- a/jaxb-ri/bundles/xjc/src/main/java/module-info.java
+++ b/jaxb-ri/bundles/xjc/src/main/java/module-info.java
@@ -28,12 +28,13 @@
 
     exports com.sun.tools.xjc;
     exports com.sun.tools.xjc.api;
-    exports com.sun.tools.xjc.generator.bean to com.sun.xml.bind.core, com.sun.xml.bind;
+    exports com.sun.tools.xjc.generator.bean;
     exports com.sun.tools.xjc.model;
     exports com.sun.tools.xjc.model.nav;
     exports com.sun.tools.xjc.outline;
     exports com.sun.tools.xjc.reader;
     exports com.sun.tools.xjc.reader.internalizer;
+    exports com.sun.tools.xjc.reader.xmlschema.bindinfo;
     exports com.sun.tools.xjc.util;
 
     exports com.sun.xml.xsom;
diff --git a/jaxb-ri/xjc/src/main/java/module-info.java b/jaxb-ri/xjc/src/main/java/module-info.java
index 68e1c78..774de1d 100644
--- a/jaxb-ri/xjc/src/main/java/module-info.java
+++ b/jaxb-ri/xjc/src/main/java/module-info.java
@@ -37,11 +37,13 @@
     opens com.sun.tools.xjc.generator.bean to org.glassfish.jaxb.runtime;
 
     exports com.sun.tools.xjc;
+    exports com.sun.tools.xjc.api;
+    exports com.sun.tools.xjc.generator.bean;
     exports com.sun.tools.xjc.model;
     exports com.sun.tools.xjc.outline;
     exports com.sun.tools.xjc.reader;
     exports com.sun.tools.xjc.reader.internalizer;
-    exports com.sun.tools.xjc.api;
+    exports com.sun.tools.xjc.reader.xmlschema.bindinfo;
     exports com.sun.tools.xjc.util;
 
     uses com.sun.tools.xjc.Plugin;