diff --git a/ebean-api/src/main/java9/module-info.java b/ebean-api/src/main/java9/module-info.java
index 56243dbd1..75ff243e2 100644
--- a/ebean-api/src/main/java9/module-info.java
+++ b/ebean-api/src/main/java9/module-info.java
@@ -10,13 +10,13 @@ module io.ebean.api {
 
   requires transitive java.sql;
   requires transitive io.avaje.config;
+  requires transitive io.avaje.lang;
   requires transitive persistence.api;
   requires transitive io.ebean.annotation;
   requires transitive io.ebean.datasource.api;
   requires transitive org.slf4j;
 
   requires static io.ebean.types;
-  requires static io.avaje.jsr305x;
   requires static com.fasterxml.jackson.core;
   requires static javax.servlet.api;
   requires static com.h2database;
@@ -41,6 +41,7 @@ module io.ebean.api {
   exports io.ebean.config.dbplatform.sqlanywhere;
   exports io.ebean.config.dbplatform.sqlite;
   exports io.ebean.config.dbplatform.sqlserver;
+  exports io.ebean.config.dbplatform.yugabyte;
   exports io.ebean.event;
   exports io.ebean.event.readaudit;
   exports io.ebean.event.changelog;
diff --git a/ebean-core/src/main/java9/module-info.java b/ebean-core/src/main/java9/module-info.java
index bc518b421..398a43d87 100644
--- a/ebean-core/src/main/java9/module-info.java
+++ b/ebean-core/src/main/java9/module-info.java
@@ -38,13 +38,13 @@ module io.ebean.core {
   requires static org.postgresql.jdbc;
   requires static joda.time;
 
-  exports io.ebeaninternal.api;
   exports io.ebeaninternal.server.cache;
-  // export these for io.ebean.ddl.generator (but that becomes unnamed module in maven test scope)
-  exports io.ebeaninternal.server.deploy;
-  exports io.ebeaninternal.server.deploy.visitor;
-//  exports io.ebeaninternal.server.deploy to io.ebean.autotune, io.ebean.ddl.generator;
-//  exports io.ebeaninternal.server.deploy.visitor to io.ebean.ddl.generator;
+
+  exports io.ebeaninternal.api to io.ebean.ddl.generator, io.ebean.querybean, io.ebean.autotune, io.ebean.postgis, io.ebean.test;
+  exports io.ebeaninternal.server.deploy to io.ebean.autotune, io.ebean.ddl.generator;
+  exports io.ebeaninternal.server.deploy.id to io.ebean.ddl.generator;
+  exports io.ebeaninternal.server.deploy.meta to io.ebean.ddl.generator;
+  exports io.ebeaninternal.server.deploy.visitor to io.ebean.ddl.generator;
 
   exports io.ebeaninternal.server.el to io.ebean.autotune;
   exports io.ebeaninternal.server.autotune to io.ebean.autotune;