diff --git a/libwvdrmengine/oemcrypto/odk/include/odk_structs.h b/libwvdrmengine/oemcrypto/odk/include/odk_structs.h
index f18a0c85..b3bf0c50 100644
--- a/libwvdrmengine/oemcrypto/odk/include/odk_structs.h
+++ b/libwvdrmengine/oemcrypto/odk/include/odk_structs.h
@@ -19,7 +19,7 @@ extern "C" {
 #define ODK_MINOR_VERSION 0
 
 /* ODK Version string. Date changed automatically on each release. */
-#define ODK_RELEASE_DATE "ODK v19.0 2024-01-30"
+#define ODK_RELEASE_DATE "ODK v19.0 2024-02-08"
 
 /* The lowest version number for an ODK message. */
 #define ODK_FIRST_VERSION 16
diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_core_message_test.cpp b/libwvdrmengine/oemcrypto/odk/test/odk_core_message_test.cpp
index 20658839..bea78914 100644
--- a/libwvdrmengine/oemcrypto/odk/test/odk_core_message_test.cpp
+++ b/libwvdrmengine/oemcrypto/odk/test/odk_core_message_test.cpp
@@ -13,7 +13,10 @@
 #include "core_message_serialize_proto.h"
 #include "core_message_types.h"
 #include "gtest/gtest.h"
+#include "license_protocol.pb.h"
 #include "odk.h"
+#include "odk_structs.h"
+#include "third_party/absl/log/log.h"
 #include "third_party/absl/strings/escaping.h"
 
 namespace wvodk_test {
diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_golden_v16.cpp b/libwvdrmengine/oemcrypto/odk/test/odk_golden_v16.cpp
index d3375a07..3dcf1f79 100644
--- a/libwvdrmengine/oemcrypto/odk/test/odk_golden_v16.cpp
+++ b/libwvdrmengine/oemcrypto/odk/test/odk_golden_v16.cpp
@@ -6,7 +6,9 @@
 #include <cstring>
 #include <string>
 
+#include "OEMCryptoCENCCommon.h"
 #include "core_message_deserialize.h"
+#include "core_message_features.h"
 #include "core_message_serialize.h"
 #include "core_message_serialize_proto.h"
 #include "core_message_types.h"
diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_golden_v17.cpp b/libwvdrmengine/oemcrypto/odk/test/odk_golden_v17.cpp
index b29bd00b..e1e832ce 100644
--- a/libwvdrmengine/oemcrypto/odk/test/odk_golden_v17.cpp
+++ b/libwvdrmengine/oemcrypto/odk/test/odk_golden_v17.cpp
@@ -6,7 +6,9 @@
 #include <cstring>
 #include <string>
 
+#include "OEMCryptoCENCCommon.h"
 #include "core_message_deserialize.h"
+#include "core_message_features.h"
 #include "core_message_serialize.h"
 #include "core_message_serialize_proto.h"
 #include "core_message_types.h"
diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_golden_v18.cpp b/libwvdrmengine/oemcrypto/odk/test/odk_golden_v18.cpp
index 7674f012..acbd8dc1 100644
--- a/libwvdrmengine/oemcrypto/odk/test/odk_golden_v18.cpp
+++ b/libwvdrmengine/oemcrypto/odk/test/odk_golden_v18.cpp
@@ -6,7 +6,9 @@
 #include <cstring>
 #include <string>
 
+#include "OEMCryptoCENCCommon.h"
 #include "core_message_deserialize.h"
+#include "core_message_features.h"
 #include "core_message_serialize.h"
 #include "core_message_serialize_proto.h"
 #include "core_message_types.h"
diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp b/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp
index 7b22fef3..955741ca 100644
--- a/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp
+++ b/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp
@@ -18,9 +18,11 @@
 #include "core_message_serialize_proto.h"
 #include "core_message_types.h"
 #include "gtest/gtest.h"
+#include "license_protocol.pb.h"
 #include "odk_overflow.h"
 #include "odk_structs.h"
 #include "odk_structs_priv.h"
+#include "odk_target.h"
 #include "odk_test_helper.h"
 
 namespace wvodk_test {
diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.h b/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.h
index 384c6696..5005b94f 100644
--- a/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.h
+++ b/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include "OEMCryptoCENCCommon.h"
 #include "odk_structs.h"
 #include "odk_structs_priv.h"