diff --git a/libwvdrmengine/cdm/core/include/key_session.h b/libwvdrmengine/cdm/core/include/key_session.h
index de30a1ee..773b0712 100644
--- a/libwvdrmengine/cdm/core/include/key_session.h
+++ b/libwvdrmengine/cdm/core/include/key_session.h
@@ -5,7 +5,11 @@
 #ifndef WVCDM_CORE_KEY_SESSION_H_
 #define WVCDM_CORE_KEY_SESSION_H_
 
+#include <vector>
+
 #include "metrics_collections.h"
+#include "OEMCryptoCENC.h"
+#include "wv_cdm_types.h"
 
 namespace wvcdm {
 
diff --git a/libwvdrmengine/cdm/core/src/client_identification.cpp b/libwvdrmengine/cdm/core/src/client_identification.cpp
index 150ff0aa..6901400f 100644
--- a/libwvdrmengine/cdm/core/src/client_identification.cpp
+++ b/libwvdrmengine/cdm/core/src/client_identification.cpp
@@ -4,6 +4,8 @@
 
 #include "client_identification.h"
 
+#include <sstream>
+
 #include "crypto_session.h"
 #include "license_protocol.pb.h"
 #include "log.h"
diff --git a/libwvdrmengine/cdm/core/src/entitlement_key_session.cpp b/libwvdrmengine/cdm/core/src/entitlement_key_session.cpp
index 6d52dad6..cd8650ae 100644
--- a/libwvdrmengine/cdm/core/src/entitlement_key_session.cpp
+++ b/libwvdrmengine/cdm/core/src/entitlement_key_session.cpp
@@ -5,6 +5,7 @@
 #include "entitlement_key_session.h"
 
 #include "crypto_key.h"
+#include "log.h"
 
 namespace wvcdm {
 EntitlementKeySession::EntitlementKeySession(CryptoSessionId oec_session_id,