diff --git a/gerrit-gwtexpui/BUILD b/gerrit-gwtexpui/BUILD
index d74fc8bb6a..610a10bb6f 100644
--- a/gerrit-gwtexpui/BUILD
+++ b/gerrit-gwtexpui/BUILD
@@ -16,7 +16,7 @@ gwt_module(
   deps = [
     ':SafeHtml',
     ':UserAgent',
-    '//lib/gwt:user',
+    '//lib/gwt:user-neverlink',
   ],
   visibility = ['//visibility:public'],
   data = [
diff --git a/gerrit-gwtui-common/BUILD b/gerrit-gwtui-common/BUILD
index c6ad882017..ac31856a0f 100644
--- a/gerrit-gwtui-common/BUILD
+++ b/gerrit-gwtui-common/BUILD
@@ -10,7 +10,7 @@ EXPORTED_DEPS = [
   '//gerrit-gwtexpui:SafeHtml',
   '//gerrit-gwtexpui:UserAgent',
 ]
-DEPS = ['//lib/gwt:user']
+DEPS = ['//lib/gwt:user-neverlink']
 SRC = 'src/main/java/com/google/gerrit/'
 
 gwt_module(
diff --git a/gerrit-plugin-gwtui/BUILD b/gerrit-plugin-gwtui/BUILD
index 18bc038402..01d9385681 100644
--- a/gerrit-plugin-gwtui/BUILD
+++ b/gerrit-plugin-gwtui/BUILD
@@ -18,7 +18,21 @@ java_library2(
   srcs = SRCS,
   resources = glob(['src/main/**/*']),
   exported_deps = ['//gerrit-gwtui-common:client-lib'],
-  deps = DEPS + ['//lib/gwt:dev'],
+  deps = DEPS + [
+    '//gerrit-common:libclient-src.jar',
+    '//gerrit-extension-api:libclient-src.jar',
+    '//gerrit-gwtexpui:libClippy-src.jar',
+    '//gerrit-gwtexpui:libGlobalKey-src.jar',
+    '//gerrit-gwtexpui:libProgress-src.jar',
+    '//gerrit-gwtexpui:libSafeHtml-src.jar',
+    '//gerrit-gwtexpui:libUserAgent-src.jar',
+    '//gerrit-gwtui-common:libclient-src.jar',
+    '//gerrit-patch-jgit:libclient-src.jar',
+    '//gerrit-patch-jgit:libEdit-src.jar',
+    '//gerrit-prettify:libclient-src.jar',
+    '//gerrit-reviewdb:libclient-src.jar',
+    '//lib/gwt:dev-neverlink',
+  ],
 )
 
 java_library2(
diff --git a/gerrit-prettify/BUILD b/gerrit-prettify/BUILD
index b8d4dd603c..c21a6f4375 100644
--- a/gerrit-prettify/BUILD
+++ b/gerrit-prettify/BUILD
@@ -8,7 +8,7 @@ gwt_module(
     SRC + 'common/**/*.java',
   ]),
   gwt_xml = SRC + 'PrettyFormatter.gwt.xml',
-  deps = ['//lib/gwt:user'],
+  deps = ['//lib/gwt:user-neverlink'],
   exported_deps = [
     '//gerrit-extension-api:client',
     '//gerrit-gwtexpui:SafeHtml',
diff --git a/lib/gwt/BUILD b/lib/gwt/BUILD
index da6f8eb790..116f86c3c9 100644
--- a/lib/gwt/BUILD
+++ b/lib/gwt/BUILD
@@ -22,6 +22,14 @@ java_library(
   data = ['//lib:LICENSE-Apache2.0'],
 )
 
+java_library(
+  name = 'dev-neverlink',
+  exports = ['@dev//jar'],
+  visibility = ['//visibility:public'],
+  neverlink = 1,
+  data = ['//lib:LICENSE-Apache2.0'],
+)
+
 java_library(
   name = 'javax-validation_src',
   exports = ['@javax_validation//src'],