diff --git a/libwvdrmengine/oemcrypto/include/level3_file_system.h b/libwvdrmengine/oemcrypto/include/level3_file_system.h
index 232fbf8e..8f8fbc39 100644
--- a/libwvdrmengine/oemcrypto/include/level3_file_system.h
+++ b/libwvdrmengine/oemcrypto/include/level3_file_system.h
@@ -12,6 +12,7 @@
 #define LEVEL3_FILE_SYSTEM_H_
 
 #include <stdlib.h>
+#include "platform.h"
 
 namespace wvoec3 {
 
diff --git a/libwvdrmengine/oemcrypto/odk/src/odk_assert.h b/libwvdrmengine/oemcrypto/odk/src/odk_assert.h
index 0517818b..e0de19df 100644
--- a/libwvdrmengine/oemcrypto/odk/src/odk_assert.h
+++ b/libwvdrmengine/oemcrypto/odk/src/odk_assert.h
@@ -9,7 +9,7 @@
 extern "C" {
 #endif
 
-#if (__STDC_VERSION__ >= 201112L)
+#if defined(_MSC_VER) || (__STDC_VERSION__ >= 201112L)
 #include <assert.h>
 #define odk_static_assert static_assert
 #else