diff --git a/src/foundation_pEp_jniadapter_AbstractEngine.cc b/src/foundation_pEp_jniadapter_AbstractEngine.cc
index 40d4e03..2bfb0aa 100644
--- a/src/foundation_pEp_jniadapter_AbstractEngine.cc
+++ b/src/foundation_pEp_jniadapter_AbstractEngine.cc
@@ -4,7 +4,7 @@
 #include <pEp/message_api.h>
 #include <pEp/sync_api.h>
 #include <pEp/Adapter.hh>
-#include <pEp/utils.hh>
+#include <pEp/pEpLog.hh>
 #include "throw_pEp_exception.hh"
 #include "jniutils.hh"
 
diff --git a/src/foundation_pEp_jniadapter__Blob.cc b/src/foundation_pEp_jniadapter__Blob.cc
index 2248708..e677997 100644
--- a/src/foundation_pEp_jniadapter__Blob.cc
+++ b/src/foundation_pEp_jniadapter__Blob.cc
@@ -1,6 +1,6 @@
 #include <pEp/sync_codec.h>
 #include <pEp/distribution_codec.h>
-#include <pEp/utils.hh>
+#include <pEp/pEpLog.hh>
 #include "jniutils.hh"
 #include "throw_pEp_exception.hh"
 #include "foundation_pEp_jniadapter__Blob.h"
diff --git a/src/gen_cpp_Engine.ysl2 b/src/gen_cpp_Engine.ysl2
index 3fb0e1c..eef8111 100644
--- a/src/gen_cpp_Engine.ysl2
+++ b/src/gen_cpp_Engine.ysl2
@@ -13,7 +13,8 @@ tstylesheet {
         #include <pEp/openpgp_compat.h>
         #include <pEp/key_reset.h>
         #include <pEp/Adapter.hh>
-        #include "foundation_pEp_jniadapter_Engine.h"
+        #include <pEp/pEpLog.hh>
+        #include "foundation_pEp_jniadapter_«@name».h"
         #include "throw_pEp_exception.hh"
         #include "jniutils.hh"
 
diff --git a/src/gen_cpp_Message.ysl2 b/src/gen_cpp_Message.ysl2
index 2d301e7..ecefa1e 100644
--- a/src/gen_cpp_Message.ysl2
+++ b/src/gen_cpp_Message.ysl2
@@ -13,7 +13,7 @@ tstylesheet {
         document("foundation_pEp_jniadapter_{$jname}.cc", "text") {
             ||
             #include <pEp/mime.h>
-            #include <pEp/utils.hh>
+            #include <pEp/pEpLog.hh>
             #include "jniutils.hh"
             #include "throw_pEp_exception.hh"
             #include "foundation_pEp_jniadapter_«$jname».h"
diff --git a/src/identity_api.cc b/src/identity_api.cc
index feccf11..eb364d0 100644
--- a/src/identity_api.cc
+++ b/src/identity_api.cc
@@ -1,4 +1,4 @@
-#include <pEp/utils.hh>
+#include <pEp/pEpLog.hh>
 
 extern "C" {
 
diff --git a/src/jniutils.cc b/src/jniutils.cc
index e4d2820..b3eb89a 100644
--- a/src/jniutils.cc
+++ b/src/jniutils.cc
@@ -1,5 +1,5 @@
 #include "jniutils.hh"
-#include <pEp/utils.hh>
+#include <pEp/pEpLog.hh>
 #ifndef __LP64__
 #include <time64.h>
 #define time_t time64_t
diff --git a/test/resources/pep-home/.dontdeleteme b/test/resources/pep-home/.dontdeleteme
new file mode 100644
index 0000000..e69de29