diff --git a/.bazelrc b/.bazelrc
index 49bd99a0..0785f8ff 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,4 +1,3 @@
 build --action_env=BAZEL_CXXOPTS=-std=c++17
 # Definition of --config=memcheck
-build:memcheck --strip=never --test_timeout=3600
-build --sandbox_block_path=/usr/local
\ No newline at end of file
+build:memcheck --strip=never --test_timeout=3600
\ No newline at end of file
diff --git a/presence/implementation/BUILD b/presence/implementation/BUILD
index 99554ea6..06c2cfbe 100644
--- a/presence/implementation/BUILD
+++ b/presence/implementation/BUILD
@@ -156,11 +156,11 @@ cc_library(
     ] + select({
         ":norust_or_windows_or_android": [":ldt_stub"],
         ":use_rust_decoder": [
-            "//third_party/beto_core/nearby/presence/ldt_np_adv_ffi",
             "//third_party/beto_core/nearby/presence/np_c_ffi:np_c_ffi_types",
-            "//third_party/beto_core/nearby/presence/np_cpp_ffi",
+            "@beto-core//:ldt_np_adv_ffi",
+            "@beto-core//:np_cpp_ffi",
         ],
-        "//conditions:default": ["//third_party/beto_core/nearby/presence/ldt_np_adv_ffi"],
+        "//conditions:default": ["@beto-core//:ldt_np_adv_ffi"],
     }),
 )
 
diff --git a/presence/implementation/advertisement_decoder_rust_impl.cc b/presence/implementation/advertisement_decoder_rust_impl.cc
index 13474aa0..4fdf31bc 100644
--- a/presence/implementation/advertisement_decoder_rust_impl.cc
+++ b/presence/implementation/advertisement_decoder_rust_impl.cc
@@ -28,8 +28,8 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-#include "third_party/beto-core/src/nearby/presence/np_c_ffi/include/cpp/np_cpp_ffi_types.h"
-#include "third_party/beto-core/src/nearby/presence/np_cpp_ffi/include/nearby_protocol.h"
+#include "third_party/beto_core/nearby/presence/np_c_ffi/include/cpp/np_cpp_ffi_types.h"
+#include "third_party/beto_core/nearby/presence/np_cpp_ffi/include/nearby_protocol.h"
 #include "internal/proto/credential.proto.h"
 #include "presence/data_element.h"
 #include "presence/implementation/action_factory.h"
diff --git a/presence/implementation/advertisement_decoder_rust_impl.h b/presence/implementation/advertisement_decoder_rust_impl.h
index 012c0c22..e7510a6a 100644
--- a/presence/implementation/advertisement_decoder_rust_impl.h
+++ b/presence/implementation/advertisement_decoder_rust_impl.h
@@ -21,8 +21,7 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-#include "third_party/beto-core/src/nearby/presence/np_cpp_ffi/include/nearby_protocol.h"
-#include "internal/proto/credential.pb.h"
+#include "third_party/beto_core/nearby/presence/np_cpp_ffi/include/nearby_protocol.h"
 #include "presence/implementation/advertisement_decoder.h"
 
 namespace nearby {
diff --git a/presence/implementation/ldt.cc b/presence/implementation/ldt.cc
index 8e512fd6..0f1af2cf 100644
--- a/presence/implementation/ldt.cc
+++ b/presence/implementation/ldt.cc
@@ -15,15 +15,16 @@
 #include "presence/implementation/ldt.h"
 
 #include <algorithm>
-#include <optional>
+#include <cstdint>
 #include <string>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-#ifdef USE_RUST_LDT
-#include "third_party/beto-core/src/nearby/presence/ldt_np_adv_ffi/c/include/np_ldt.h"
+
+#if defined(USE_RUST_LDT) || defined(USE_RUST_DECODER)
+#include "third_party/beto_core/nearby/presence/ldt_np_adv_ffi/c/include/np_ldt.h"
 #else
 #include "presence/implementation/np_ldt.h"
 #endif /* USE_RUST_LDT */
diff --git a/presence/implementation/ldt.h b/presence/implementation/ldt.h
index 647d62e7..85b0dc23 100644
--- a/presence/implementation/ldt.h
+++ b/presence/implementation/ldt.h
@@ -20,8 +20,8 @@
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-#ifdef USE_RUST_LDT
-#include "third_party/beto-core/src/nearby/presence/ldt_np_adv_ffi/c/include/np_ldt.h"
+#if defined(USE_RUST_LDT) || defined(USE_RUST_DECODER)
+#include "third_party/beto_core/nearby/presence/ldt_np_adv_ffi/c/include/np_ldt.h"
 #else
 #include "presence/implementation/np_ldt.h"
 #endif /* USE_RUST_LDT */