diff --git a/connections/implementation/proto/BUILD b/connections/implementation/proto/BUILD
index d96d4621..823a9ac0 100644
--- a/connections/implementation/proto/BUILD
+++ b/connections/implementation/proto/BUILD
@@ -36,7 +36,7 @@ java_lite_proto_library(
 cc_proto_library(
     name = "offline_wire_formats_cc_proto",
     visibility = [
-        "//third_party/nearby:__subpackages__",
+        "//:__subpackages__",
     ],
     deps = [
         ":offline_wire_formats_proto",
diff --git a/internal/crypto/BUILD b/internal/crypto/BUILD
index 00c85dd1..2fac40c3 100644
--- a/internal/crypto/BUILD
+++ b/internal/crypto/BUILD
@@ -13,7 +13,7 @@ licenses(["notice"])
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-package(default_visibility = ["//third_party/nearby:__subpackages__"])
+package(default_visibility = ["//:__subpackages__"])
 
 licenses(["notice"])
 
diff --git a/internal/proto/BUILD b/internal/proto/BUILD
index 3673e89f..d0d5de54 100644
--- a/internal/proto/BUILD
+++ b/internal/proto/BUILD
@@ -6,7 +6,7 @@ proto_library(
 cc_proto_library(
     name = "device_metadata_cc_proto",
     visibility = [
-        "//third_party/nearby:__subpackages__",
+        "//:__subpackages__",
     ],
     deps = [":device_metadata_proto"],
 )
@@ -20,7 +20,7 @@ proto_library(
 cc_proto_library(
     name = "credential_cc_proto",
     visibility = [
-        "//third_party/nearby:__subpackages__",
+        "//:__subpackages__",
     ],
     deps = [":credential_proto"],
 )
diff --git a/presence/BUILD b/presence/BUILD
index fbb61efa..1defd477 100644
--- a/presence/BUILD
+++ b/presence/BUILD
@@ -13,7 +13,7 @@
 # limitations under the License.
 licenses(["notice"])
 
-package(default_visibility = ["//third_party/nearby:__subpackages__"])
+package(default_visibility = ["//:__subpackages__"])
 
 cc_library(
     name = "presence",
diff --git a/presence/implementation/BUILD b/presence/implementation/BUILD
index aa5f11e9..b0e47719 100644
--- a/presence/implementation/BUILD
+++ b/presence/implementation/BUILD
@@ -57,7 +57,6 @@ cc_library(
         "//internal/proto:credential_cc_proto",
         "//presence:types",
         "//presence/implementation/mediums",
-        "//third_party/tink/cc/subtle",
         "@boringssl//:crypto",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/random",
@@ -70,6 +69,7 @@ cc_library(
         "@com_google_absl//absl/time",
         "@com_google_absl//absl/types:optional",
         "@com_google_absl//absl/types:variant",
+        "@com_google_tink//subtle",
     ],
 )
 
diff --git a/presence/implementation/np_ldt.c b/presence/implementation/np_ldt.c
index f8c24263..d2923dcc 100644
--- a/presence/implementation/np_ldt.c
+++ b/presence/implementation/np_ldt.c
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "third_party/nearby/presence/implementation/np_ldt.h"
+#include "presence/implementation/np_ldt.h"
 
 // Placeholder, empty implementations of LDT utilities. They will be replaced
 // with implementations in Rust.
diff --git a/proto/BUILD b/proto/BUILD
index d9c51bac..30a929cb 100644
--- a/proto/BUILD
+++ b/proto/BUILD
@@ -48,8 +48,8 @@ proto_library(
 cc_proto_library(
     name = "sharing_enums_cc_proto",
     visibility = [
+        "//:__subpackages__",
         "//location/nearby/cpp/sharing:__subpackages__",
-        "//third_party/nearby:__subpackages__",
     ],
     deps = [
         ":sharing_enums_proto",
diff --git a/proto/mediums/BUILD b/proto/mediums/BUILD
index 6fad17ca..a9bcdde1 100644
--- a/proto/mediums/BUILD
+++ b/proto/mediums/BUILD
@@ -58,8 +58,8 @@ proto_library(
 cc_proto_library(
     name = "web_rtc_signaling_frames_cc_proto",
     visibility = [
+        "//:__subpackages__",
         "//location/nearby/connections:__subpackages__",
-        "//third_party/nearby:__subpackages__",
     ],
     deps = [":web_rtc_signaling_frames_proto"],
 )