diff --git a/src/basic_api.cc b/src/basic_api.cc
index d16553b..a6f4e41 100644
--- a/src/basic_api.cc
+++ b/src/basic_api.cc
@@ -1,6 +1,7 @@
 #include <pEp/keymanagement.h>
 #include <pEp/blacklist.h>
 #include <pEp/Adapter.hh>
+#include <pEp/pEpLog.hh>
 
 #ifndef ANDROID
 #include <string.h>
diff --git a/src/identity_api.cc b/src/identity_api.cc
index eb364d0..eb8521e 100644
--- a/src/identity_api.cc
+++ b/src/identity_api.cc
@@ -1,5 +1,9 @@
+#include <pEp/message_api.h>
 #include <pEp/pEpLog.hh>
 
+#include "jniutils.hh"
+
+
 extern "C" {
 
 JNIEXPORT jint JNICALL Java_foundation_pEp_jniadapter_Identity__1getRating(JNIEnv *env, jobject thiz, jint comm_type)