diff --git a/src/foundation_pEp_jniadapter_AbstractEngine.cc b/src/foundation_pEp_jniadapter_AbstractEngine.cc
index 51754d3..73aa615 100644
--- a/src/foundation_pEp_jniadapter_AbstractEngine.cc
+++ b/src/foundation_pEp_jniadapter_AbstractEngine.cc
@@ -7,7 +7,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 9669c0a..730a957 100644
--- a/src/foundation_pEp_jniadapter__Blob.cc
+++ b/src/foundation_pEp_jniadapter__Blob.cc
@@ -1,7 +1,7 @@
 #include <pEp/bloblist.h>
 #include <pEp/sync_codec.h>
 #include <pEp/distribution_codec.h>
-#include <pEp/utils.hh>
+#include <pEp/pEpLog.hh>
 #include <iostream>
 #include <cstring>
 #include <cassert>
diff --git a/src/gen_cpp_Engine.ysl2 b/src/gen_cpp_Engine.ysl2
index 4881b7b..76bb6d2 100644
--- a/src/gen_cpp_Engine.ysl2
+++ b/src/gen_cpp_Engine.ysl2
@@ -15,7 +15,7 @@ tstylesheet {
         #include <pEp/openpgp_compat.h>
         #include <pEp/key_reset.h>
         #include <pEp/Adapter.hh>
-        #include <pEp/utils.hh>
+        #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 d73497a..5296207 100644
--- a/src/gen_cpp_Message.ysl2
+++ b/src/gen_cpp_Message.ysl2
@@ -19,7 +19,7 @@ tstylesheet {
             #include <assert.h>
             #include <pEp/«@name».h>
             #include <pEp/mime.h>
-            #include <pEp/utils.hh>
+            #include <pEp/pEpLog.hh>
 
             #include "jniutils.hh"
             #include "throw_pEp_exception.hh"
diff --git a/src/identity_api.cc b/src/identity_api.cc
index e11d4ab..e2450f3 100644
--- a/src/identity_api.cc
+++ b/src/identity_api.cc
@@ -1,5 +1,5 @@
 #include <pEp/message_api.h>
-#include <pEp/utils.hh>
+#include <pEp/pEpLog.hh>
 #include "jniutils.hh"
 
 
diff --git a/test/resources/pep-home/.dontdeleteme b/test/resources/pep-home/.dontdeleteme
new file mode 100644
index 0000000..e69de29