diff --git a/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/BUILD b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/BUILD
index 8b7a78e81c74ae..a354c12b6e506c 100644
--- a/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/BUILD
+++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/BUILD
@@ -1,11 +1,15 @@
 load("@rules_java//java:defs.bzl", "java_library")
 
+package(default_visibility = ["//:__subpackages__"])
+
+licenses(["notice"])
+
 filegroup(
     name = "srcs",
     srcs = glob(["**"]) + [
         "//src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/http:srcs",
     ],
-    visibility = ["//src/tools/remote:__pkg__"],
+    visibility = ["//src:__subpackages__"],
 )
 
 java_library(
@@ -15,9 +19,7 @@ java_library(
     visibility = ["//src/tools/remote:__subpackages__"],
     deps = [
         "//src/main/java/com/google/devtools/build/lib/actions",
-        "//src/main/java/com/google/devtools/build/lib/actions:artifacts",
         "//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity",
-        "//src/main/java/com/google/devtools/build/lib/packages",
         "//src/main/java/com/google/devtools/build/lib/remote",
         "//src/main/java/com/google/devtools/build/lib/remote/common",
         "//src/main/java/com/google/devtools/build/lib/remote/disk",
@@ -25,7 +27,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/remote/util",
         "//src/main/java/com/google/devtools/build/lib/sandbox",
         "//src/main/java/com/google/devtools/build/lib/shell",
-        "//src/main/java/com/google/devtools/build/lib/util",
         "//src/main/java/com/google/devtools/build/lib/util:os",
         "//src/main/java/com/google/devtools/build/lib/util:process",
         "//src/main/java/com/google/devtools/build/lib/util:resource_converter",
@@ -37,6 +38,7 @@ java_library(
         "//src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/http",
         "//third_party:flogger",
         "//third_party:guava",
+        "//third_party:jsr305",
         "//third_party:netty",
         "//third_party/grpc:grpc-jar",
         "//third_party/protobuf:protobuf_java",
diff --git a/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/http/BUILD b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/http/BUILD
index 1eab3b9059891c..52a1d24b237f38 100644
--- a/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/http/BUILD
+++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/http/BUILD
@@ -1,7 +1,11 @@
+package(default_visibility = ["//:__subpackages__"])
+
+licenses(["notice"])
+
 filegroup(
     name = "srcs",
     srcs = glob(["**"]),
-    visibility = ["//src/tools/remote/src/main/java/com/google/devtools/build/remote/worker:__pkg__"],
+    visibility = ["//src:__subpackages__"],
 )
 
 java_library(
diff --git a/src/tools/remote/src/test/java/com/google/devtools/build/remote/worker/BUILD b/src/tools/remote/src/test/java/com/google/devtools/build/remote/worker/BUILD
index ec59e323b9f9ea..a56fe9660d9992 100644
--- a/src/tools/remote/src/test/java/com/google/devtools/build/remote/worker/BUILD
+++ b/src/tools/remote/src/test/java/com/google/devtools/build/remote/worker/BUILD
@@ -3,9 +3,11 @@ package(
     default_visibility = ["//src/tools/remote:__pkg__"],
 )
 
+licenses(["notice"])
+
 filegroup(
     name = "srcs",
     testonly = 0,
     srcs = glob(["**"]),
-    visibility = ["//src/tools/remote:__pkg__"],
+    visibility = ["//src:__subpackages__"],
 )
diff --git a/src/tools/remote/src/test/java/com/google/devtools/build/remote/worker/http/BUILD b/src/tools/remote/src/test/java/com/google/devtools/build/remote/worker/http/BUILD
index b1b10125bc478c..c7605c4b533668 100644
--- a/src/tools/remote/src/test/java/com/google/devtools/build/remote/worker/http/BUILD
+++ b/src/tools/remote/src/test/java/com/google/devtools/build/remote/worker/http/BUILD
@@ -3,11 +3,13 @@ package(
     default_visibility = ["//src/tools/remote:__pkg__"],
 )
 
+licenses(["notice"])
+
 filegroup(
     name = "srcs",
     testonly = 0,
     srcs = glob(["**"]),
-    visibility = ["//src/tools/remote:__pkg__"],
+    visibility = ["//src:__subpackages__"],
 )
 
 java_test(