diff --git a/system/gd/fuzz/helpers.cc b/system/gd/fuzz/helpers.cc
index 9f86e54..3c77b4d 100644
--- a/system/gd/fuzz/helpers.cc
+++ b/system/gd/fuzz/helpers.cc
@@ -37,5 +37,9 @@
   return result;
 }
 
+std::vector<uint8_t> GetArbitraryBytes(FuzzedDataProvider* fdp) {
+  return fdp->ConsumeBytes<uint8_t>(fdp->ConsumeIntegral<size_t>());
+}
+
 }  // namespace fuzz
 }  // namespace bluetooth
diff --git a/system/gd/fuzz/helpers.h b/system/gd/fuzz/helpers.h
index f6e42ca..435af03 100644
--- a/system/gd/fuzz/helpers.h
+++ b/system/gd/fuzz/helpers.h
@@ -20,11 +20,15 @@
 #include <vector>
 #include "os/handler.h"
 
+#include <fuzzer/FuzzedDataProvider.h>
+
 namespace bluetooth {
 namespace fuzz {
 
 std::vector<std::vector<uint8_t>> SplitInput(const uint8_t* data, size_t size, const uint8_t* separator,
                                              size_t separatorSize);
 
+std::vector<uint8_t> GetArbitraryBytes(FuzzedDataProvider* fdp);
+
 }  // namespace fuzz
 }  // namespace bluetooth
diff --git a/system/gd/hci/fuzz/hci_layer_fuzz_test.cc b/system/gd/hci/fuzz/hci_layer_fuzz_test.cc
index aa35190..8f3e56a 100644
--- a/system/gd/hci/fuzz/hci_layer_fuzz_test.cc
+++ b/system/gd/hci/fuzz/hci_layer_fuzz_test.cc
@@ -16,6 +16,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+#include "fuzz/helpers.h"
 #include "hal/fuzz/fuzz_hci_hal.h"
 #include "hci/fuzz/hci_layer_fuzz_client.h"
 #include "hci/hci_layer.h"
@@ -26,6 +27,7 @@
 #include <fuzzer/FuzzedDataProvider.h>
 
 using bluetooth::TestModuleRegistry;
+using bluetooth::fuzz::GetArbitraryBytes;
 using bluetooth::hal::HciHal;
 using bluetooth::hal::fuzz::FuzzHciHal;
 using bluetooth::hci::fuzz::HciLayerFuzzClient;
@@ -33,10 +35,6 @@
 using bluetooth::os::fuzz::fake_timerfd_cap_at;
 using bluetooth::os::fuzz::fake_timerfd_reset;
 
-static std::vector<uint8_t> GetArbitraryBytes(FuzzedDataProvider* fdp) {
-  return fdp->ConsumeBytes<uint8_t>(fdp->ConsumeIntegral<size_t>());
-}
-
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   FuzzedDataProvider dataProvider(data, size);
   fake_timerfd_cap_at(1999);  // prevent command timeouts