diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.cpp b/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.cpp
index 09841692..3bfa37cd 100644
--- a/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.cpp
+++ b/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.cpp
@@ -20,6 +20,7 @@
 #include "odk_endian.h"
 #include "odk_structs.h"
 #include "odk_structs_priv.h"
+#include "third_party/absl/types/span.h"
 
 namespace wvodk_test {
 
@@ -670,7 +671,7 @@ OEMCryptoResult ODK_DumpSingleField(const uint8_t* buf,
  */
 OEMCryptoResult ODK_IterFields(ODK_FieldMode mode, uint8_t* buf,
                                const size_t size_in, size_t* size_out,
-                               const std::vector<ODK_Field>& fields) {
+                               absl::Span<const ODK_Field> fields) {
   if (buf == nullptr || size_out == nullptr) {
     return ODK_ERROR_CORE_MESSAGE;
   }
@@ -708,7 +709,7 @@ OEMCryptoResult ODK_IterFields(ODK_FieldMode mode, uint8_t* buf,
 }
 
 std::vector<ODK_Field> ODK_MakeTotalFields(
-    const std::vector<ODK_Field>& extra_fields, ODK_CoreMessage* core_message) {
+    absl::Span<const ODK_Field> extra_fields, ODK_CoreMessage* core_message) {
   std::vector<ODK_Field> total_fields = {
       {ODK_UINT32, &(core_message->message_type), "message_type"},
       {ODK_UINT32, &(core_message->message_length), "message_size"},
diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.h b/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.h
index 6dc26435..744ca51c 100644
--- a/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.h
+++ b/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.h
@@ -11,6 +11,7 @@
 
 #include "odk_structs.h"
 #include "odk_structs_priv.h"
+#include "third_party/absl/types/span.h"
 
 namespace wvodk_test {
 
@@ -115,7 +116,7 @@ OEMCryptoResult ODK_ReadSingleField(const uint8_t* buf, const ODK_Field* field);
 OEMCryptoResult ODK_DumpSingleField(const uint8_t* buf, const ODK_Field* field);
 OEMCryptoResult ODK_IterFields(ODK_FieldMode mode, uint8_t* buf, size_t size_in,
                                size_t* size_out,
-                               const std::vector<ODK_Field>& fields);
+                               absl::Span<const ODK_Field> fields);
 void ODK_ExpectEqualBuf(const void* s1, const void* s2, size_t n,
                         const std::vector<ODK_Field>& fields);
 void ODK_ResetOdkFields(std::vector<ODK_Field>* fields);