diff --git a/BUILD b/BUILD
index eb6e7aa..956e69a 100644
--- a/BUILD
+++ b/BUILD
@@ -15,6 +15,38 @@
 load("@crate_index//:defs.bzl", "aliases")
 load("@rules_rust//rust:defs.bzl", "rust_library")
 
+cc_library(
+    name = "ldt_np_adv_ffi",
+    hdrs = ["nearby/presence/ldt_np_adv_ffi/c/include/np_ldt.h"],
+    includes = ["nearby/presence/ldt_np_adv_ffi/c/include"],
+    visibility = ["//visibility:public"],
+    deps = [":ldt_np_adv_ffi_rust"],
+)
+
+cc_library(
+    name = "np_cpp_ffi",
+    srcs = ["nearby/presence/np_cpp_ffi/nearby_protocol.cc"],
+    hdrs = ["nearby/presence/np_cpp_ffi/include/nearby_protocol.h"],
+    copts = [
+        "-Inearby/presence/np_cpp_ffi/include",
+        "-Inearby/presence/np_c_ffi/include/cpp",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":np_c_ffi",
+        "@absl//absl/status",
+        "@absl//absl/status:statusor",
+        "@absl//absl/strings",
+        "@absl//absl/strings:str_format",
+    ],
+)
+
+cc_library(
+    name = "np_c_ffi_types",
+    hdrs = ["nearby/presence/np_c_ffi/include/cpp/np_cpp_ffi_types.h"],
+    visibility = ["//visibility:public"],
+)
+
 cc_binary(
     name = "np_cpp_sample",
     srcs = ["nearby/presence/np_cpp_ffi/sample/main.cc"],
@@ -30,23 +62,6 @@
 )
 
 cc_library(
-    name = "np_cpp_ffi",
-    srcs = ["nearby/presence/np_cpp_ffi/nearby_protocol.cc"],
-    hdrs = ["nearby/presence/np_cpp_ffi/include/nearby_protocol.h"],
-    copts = [
-        "-Inearby/presence/np_cpp_ffi/include",
-        "-Inearby/presence/np_c_ffi/include/cpp",
-    ],
-    deps = [
-        ":np_c_ffi",
-        "@absl//absl/status",
-        "@absl//absl/status:statusor",
-        "@absl//absl/strings",
-        "@absl//absl/strings:str_format",
-    ],
-)
-
-cc_library(
     name = "np_c_ffi",
     hdrs = [
         "nearby/presence/np_c_ffi/include/cpp/np_cpp_ffi_functions.h",
@@ -55,11 +70,6 @@
     deps = [":np_c_ffi_rust"],
 )
 
-cc_library(
-    name = "np_c_ffi_types",
-    hdrs = ["nearby/presence/np_c_ffi/include/cpp/np_cpp_ffi_types.h"],
-)
-
 rust_library(
     name = "np_c_ffi_rust",
     srcs = glob(include = ["nearby/presence/np_c_ffi/src/**/*.rs"]),
@@ -156,13 +166,6 @@
     deps = [":ldt_np_adv_ffi"],
 )
 
-cc_library(
-    name = "ldt_np_adv_ffi",
-    hdrs = ["nearby/presence/ldt_np_adv_ffi/c/include/np_ldt.h"],
-    includes = ["nearby/presence/ldt_np_adv_ffi/c/include"],
-    deps = [":ldt_np_adv_ffi_rust"],
-)
-
 rust_library(
     name = "ldt_np_adv_ffi_rust",
     srcs = glob(["nearby/presence/ldt_np_adv_ffi/src/**/*.rs"]),