diff --git a/connections/BUILD b/connections/BUILD
index 3c5966d4..c759b732 100644
--- a/connections/BUILD
+++ b/connections/BUILD
@@ -94,9 +94,9 @@ cc_library(
         "//connections/implementation/proto:offline_wire_formats_cc_proto",
         "//internal/interop:authentication_status",
         "//internal/platform:base",
+        "//internal/platform:comm",
         "//internal/platform:logging",
         "//internal/platform:mac_address",
-        "//internal/platform:types",
         "//internal/platform:util",
         "//proto:connections_enums_cc_proto",
         "@com_google_absl//absl/functional:any_invocable",
@@ -123,6 +123,7 @@ cc_test(
         "//connections/implementation:internal_test",
         "//connections/v3:v3_types",
         "//internal/platform:base",
+        "//internal/platform:comm",
         "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep
diff --git a/connections/c/BUILD b/connections/c/BUILD
index b25c23e5..7d74e9bd 100644
--- a/connections/c/BUILD
+++ b/connections/c/BUILD
@@ -56,6 +56,7 @@ cc_library(
         "//internal/flags:flag_reader",
         "//internal/flags:nearby_flags",
         "//internal/platform:base",
+        "//internal/platform:comm",
         "//internal/platform:logging",
         "//internal/platform:mac_address",
         "//internal/platform:types",
diff --git a/connections/implementation/BUILD b/connections/implementation/BUILD
index a1912375..92038756 100644
--- a/connections/implementation/BUILD
+++ b/connections/implementation/BUILD
@@ -584,6 +584,7 @@ cc_test(
         "//connections:core_types",
         "//connections/implementation/proto:offline_wire_formats_cc_proto",
         "//internal/platform:base",
+        "//internal/platform:comm",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep
         "@com_github_protobuf_matchers//protobuf-matchers",
diff --git a/internal/platform/BUILD b/internal/platform/BUILD
index 677206a7..c7d13d0f 100644
--- a/internal/platform/BUILD
+++ b/internal/platform/BUILD
@@ -231,7 +231,6 @@ cc_library(
         "count_down_latch.h",
         "crypto.h",
         "direct_executor.h",
-        "file.h",
         "future.h",
         "lockable.h",
         "monitored_runnable.h",
@@ -335,6 +334,7 @@ cc_library(
         "bluetooth_adapter.h",
         "bluetooth_classic.h",
         "credential_storage_impl.h",
+        "file.h",
         "webrtc.h",
         "wifi.h",
         "wifi_direct.h",
@@ -349,7 +349,7 @@ cc_library(
         "//connections:__subpackages__",
         "//internal/platform/implementation:__subpackages__",
         "//internal/test:__subpackages__",
-        "//third_party/nearby/presence:__subpackages__",
+        "//sharing:__subpackages__",
     ],
     deps = [
         ":base",
@@ -363,6 +363,7 @@ cc_library(
         "//internal/flags:nearby_flags",
         "//internal/platform/implementation:comm",
         "//internal/platform/implementation:platform",
+        "//internal/platform/implementation:types",
         "//internal/platform/implementation:wifi_utils",
         # "//third_party/webrtc/files/stable/webrtc/api:create_peerconnection_factory",  # buildcleaner: keep
         # "//third_party/webrtc/files/stable/webrtc/api:peer_connection_interface",
@@ -608,6 +609,7 @@ cc_test(
     shard_count = 16,
     deps = [
         ":base",
+        ":comm",
         ":connection_info",
         ":logging",
         ":mac_address",
@@ -619,7 +621,6 @@ cc_test(
         "//internal/crypto_cros",
         "//internal/platform/implementation:platform_impl",
         "//internal/platform/implementation:types",
-        "//internal/test",
         "@com_github_protobuf_matchers//protobuf-matchers",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/status",
diff --git a/sharing/BUILD b/sharing/BUILD
index 674ab9f6..2533b34b 100644
--- a/sharing/BUILD
+++ b/sharing/BUILD
@@ -395,6 +395,7 @@ cc_library(
         "//internal/flags:nearby_flags",
         "//internal/network:url",
         "//internal/platform:base",
+        "//internal/platform:comm",
         "//internal/platform:logging",
         "//internal/platform:mac_address",
         "//internal/platform:types",
@@ -999,7 +1000,7 @@ cc_test(
         ":nearby_sharing_service",
         "//connections:core_types",
         "//internal/platform:base",
-        "//internal/platform:types",
+        "//internal/platform:comm",
         "//internal/platform/implementation:platform_impl",
         "@com_github_protobuf_matchers//protobuf-matchers",
         "@com_google_googletest//:gtest_main",