diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp b/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp
index cf2cd174..31caf251 100644
--- a/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp
+++ b/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp
@@ -22,7 +22,6 @@
 #include "odk_structs.h"
 #include "odk_structs_priv.h"
 #include "odk_test_helper.h"
-#include "third_party/absl/types/span.h"
 
 namespace wvodk_test {
 
@@ -113,7 +112,7 @@ bool CheckCounterInfoIsEqual(ODK_MessageCounterInfo* a, ODK_MessageCounter* b) {
 
 template <typename T, typename F, typename G>
 void ValidateRequest(uint32_t message_type,
-                     absl::Span<const ODK_Field> extra_fields,
+                     const std::vector<ODK_Field>& extra_fields,
                      const F& odk_prepare_func, const G& kdo_parse_func) {
   uint32_t message_size = 0;
   uint16_t api_major_version = ODK_MAJOR_VERSION;
diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.cpp b/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.cpp
index 3bfa37cd..09841692 100644
--- a/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.cpp
+++ b/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.cpp
@@ -20,7 +20,6 @@
 #include "odk_endian.h"
 #include "odk_structs.h"
 #include "odk_structs_priv.h"
-#include "third_party/absl/types/span.h"
 
 namespace wvodk_test {
 
@@ -671,7 +670,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,
-                               absl::Span<const ODK_Field> fields) {
+                               const std::vector<ODK_Field>& fields) {
   if (buf == nullptr || size_out == nullptr) {
     return ODK_ERROR_CORE_MESSAGE;
   }
@@ -709,7 +708,7 @@ OEMCryptoResult ODK_IterFields(ODK_FieldMode mode, uint8_t* buf,
 }
 
 std::vector<ODK_Field> ODK_MakeTotalFields(
-    absl::Span<const ODK_Field> extra_fields, ODK_CoreMessage* core_message) {
+    const std::vector<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 744ca51c..6dc26435 100644
--- a/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.h
+++ b/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.h
@@ -11,7 +11,6 @@
 
 #include "odk_structs.h"
 #include "odk_structs_priv.h"
-#include "third_party/absl/types/span.h"
 
 namespace wvodk_test {
 
@@ -116,7 +115,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,
-                               absl::Span<const ODK_Field> fields);
+                               const std::vector<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);