diff --git a/gerrit-common/BUILD b/gerrit-common/BUILD
index 23e29b918a..662c3e1a1e 100644
--- a/gerrit-common/BUILD
+++ b/gerrit-common/BUILD
@@ -30,7 +30,7 @@ gwt_module(
         "//lib/jgit/org.eclipse.jgit:jgit",
         "//lib/log:api",
     ],
-    gwt_xml = SRC + "Common.gwt.xml",
+    gwt_xml = SRC + "common/Common.gwt.xml",
     visibility = ["//visibility:public"],
 )
 
diff --git a/gerrit-common/src/main/java/com/google/gerrit/Common.gwt.xml b/gerrit-common/src/main/java/com/google/gerrit/common/Common.gwt.xml
similarity index 92%
rename from gerrit-common/src/main/java/com/google/gerrit/Common.gwt.xml
rename to gerrit-common/src/main/java/com/google/gerrit/common/Common.gwt.xml
index 80bd2cb778..fede66517b 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/Common.gwt.xml
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/Common.gwt.xml
@@ -17,5 +17,7 @@
   <inherits name='com.google.gerrit.reviewdb.ReviewDB' />
   <inherits name='com.google.gwtjsonrpc.GWTJSONRPC'/>
   <inherits name="com.google.gwt.logging.Logging"/>
-  <source path='common' />
+  <source path="">
+    <include name='**/*.java'/>
+  </source>
 </module>
diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/GerritGwtUICommon.gwt.xml b/gerrit-gwtui-common/src/main/java/com/google/gerrit/GerritGwtUICommon.gwt.xml
index c01dea1985..dc478fc5f4 100644
--- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/GerritGwtUICommon.gwt.xml
+++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/GerritGwtUICommon.gwt.xml
@@ -15,7 +15,7 @@
 -->
 <module>
   <inherits name='org.eclipse.jgit.JGit'/>
-  <inherits name='com.google.gerrit.Common'/>
+  <inherits name='com.google.gerrit.common.Common'/>
   <inherits name='com.google.gerrit.extensions.Extensions'/>
   <inherits name='com.google.gerrit.prettify.PrettyFormatter'/>
   <inherits name='com.google.gwtexpui.clippy.Clippy'/>