diff --git a/libwvdrmengine/oemcrypto/odk/src/odk_overflow.h b/libwvdrmengine/oemcrypto/odk/src/odk_overflow.h
index 3fcb32cc..b1e03ee5 100644
--- a/libwvdrmengine/oemcrypto/odk/src/odk_overflow.h
+++ b/libwvdrmengine/oemcrypto/odk/src/odk_overflow.h
@@ -12,20 +12,9 @@
 extern "C" {
 #endif
 
-#ifndef __has_builtin
-#  define __has_builtin(x) 0
-#endif
-
-#if (defined(__GNUC__) && __GNUC__ >= 5) || \
-    __has_builtin(__builtin_add_overflow)
-#  define odk_sub_overflow_u64 __builtin_sub_overflow
-#  define odk_add_overflow_u64 __builtin_add_overflow
-#  define odk_add_overflow_ux __builtin_add_overflow
-#else
 int odk_sub_overflow_u64(uint64_t a, uint64_t b, uint64_t* c);
 int odk_add_overflow_u64(uint64_t a, uint64_t b, uint64_t* c);
 int odk_add_overflow_ux(size_t a, size_t b, size_t* c);
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/libwvdrmengine/oemcrypto/odk/src/odk_serialize.c b/libwvdrmengine/oemcrypto/odk/src/odk_serialize.c
index e0500505..efd94755 100644
--- a/libwvdrmengine/oemcrypto/odk/src/odk_serialize.c
+++ b/libwvdrmengine/oemcrypto/odk/src/odk_serialize.c
@@ -151,7 +151,7 @@ static void Unpack_ODK_ParsedLicense(Message* msg, ODK_ParsedLicense* obj) {
   Unpack_OEMCrypto_Substring(msg, &obj->enc_mac_keys);
   Unpack_OEMCrypto_Substring(msg, &obj->pst);
   Unpack_OEMCrypto_Substring(msg, &obj->srm_restriction_data);
-  obj->license_type = Unpack_enum(msg);
+  obj->license_type = (OEMCrypto_LicenseType)Unpack_enum(msg);
   Unpack_bool(msg, &obj->nonce_required);
   Unpack_ODK_TimerLimits(msg, &obj->timer_limits);
   Unpack_uint32_t(msg, &obj->key_array_length);
@@ -167,7 +167,7 @@ static void Unpack_ODK_ParsedLicense(Message* msg, ODK_ParsedLicense* obj) {
 
 static void Unpack_ODK_ParsedProvisioning(Message* msg,
                                           ODK_ParsedProvisioning* obj) {
-  obj->key_type = Unpack_enum(msg);
+  obj->key_type = (OEMCrypto_PrivateKeyType)Unpack_enum(msg);
   Unpack_OEMCrypto_Substring(msg, &obj->enc_private_key);
   Unpack_OEMCrypto_Substring(msg, &obj->enc_private_key_iv);
   Unpack_OEMCrypto_Substring(msg, &obj->encrypted_message_key);
diff --git a/libwvdrmengine/oemcrypto/odk/src/odk_util.c b/libwvdrmengine/oemcrypto/odk/src/odk_util.c
index d1024262..ff85a9c2 100644
--- a/libwvdrmengine/oemcrypto/odk/src/odk_util.c
+++ b/libwvdrmengine/oemcrypto/odk/src/odk_util.c
@@ -14,8 +14,8 @@ int crypto_memcmp(const void* in_a, const void* in_b, size_t len) {
     return -1;
   }
 
-  const uint8_t* a = in_a;
-  const uint8_t* b = in_b;
+  const uint8_t* a = (const uint8_t*)in_a;
+  const uint8_t* b = (const uint8_t*)in_b;
   uint8_t x = 0;
 
   for (size_t i = 0; i < len; i++) {