diff --git a/android/build.gradle b/android/build.gradle
index ca4103b..7107b9d 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -8,7 +8,6 @@ def pEpAppPackageName = hasProperty('pEpAppPackageName') ? pEpAppPackageName : "
 
 def libetpanAndroid = file('external/libetpan/build-android')
 
-def pEpEngineAndroid = new File(new File(pEpEngineSrc), 'build-android')
 def pEpEngineDB = new File(new File(pEpEngineSrc), 'db')
 
 buildscript {
@@ -25,7 +24,7 @@ allprojects {
         jcenter()
     }
 }
-    
+
 apply plugin: 'com.android.library'
 
 android {
@@ -44,7 +43,7 @@ android {
             }
         }
     }
-    
+
     sourceSets {
         main {
 
@@ -90,7 +89,6 @@ android {
 
     ext {
         //FIXME> improve that build to be able to build without the need of unzip deps // Get rid of unziping
-        // pEpEngineZip = new File(pEpEngineAndroid, 'pEpEngine-android-1.zip')
         libEtPanZip = new File(libetpanAndroid, 'libetpan-android-1.zip')
     }
 
@@ -126,20 +124,19 @@ android {
         commandLine 'make', 'clean-assets', 'PEP_PACKAGE_NAME='+pEpAppPackageName
     }
 
-    // unzip some of the dependencies 
+    // unzip some of the dependencies
     task unzipDeps(type: Copy) {
-        //from zipTree(pEpEngineZip)
         from zipTree(libEtPanZip)
         into file("${buildDir}")
     }
 
-    // builds pEpEnginge's system.db 
+    // builds pEpEnginge's system.db
     task buildpEpEngineSystemDB(type:Exec) {
         workingDir pEpEngineDB
         commandLine 'make', 'system.db'
     }
 
-    // copy pEpEnginge's system.db to asset 
+    // copy pEpEnginge's system.db to asset
     task cpDBAssets(type: Copy) {
         from file(new File(pEpEngineDB, 'system.db'))
         into 'assets'
diff --git a/src/gen_cpp_Engine.ysl2 b/src/gen_cpp_Engine.ysl2
index 92128ae..8a12367 100644
--- a/src/gen_cpp_Engine.ysl2
+++ b/src/gen_cpp_Engine.ysl2
@@ -10,9 +10,9 @@ tstylesheet {
     template "interface" document("org_pEp_jniadapter_{@name}.cc", "text")
         ||
         #include <assert.h>
-        #include <pEp/message_api.h>
-        #include <pEp/blacklist.h>
-        #include <pEp/openpgp_compat.h>
+        #include <message_api.h>
+        #include <blacklist.h>
+        #include <openpgp_compat.h>
         #include "org_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 38b651e..19fd93b 100644
--- a/src/gen_cpp_Message.ysl2
+++ b/src/gen_cpp_Message.ysl2
@@ -16,7 +16,7 @@ tstylesheet {
             #include <stdint.h>
             #include <stdlib.h>
             #include <assert.h>
-            #include <pEp/«@name».h>
+            #include <«@name».h>
 
             #include "jniutils.hh"
             #include "org_pEp_jniadapter_«$jname».h"
diff --git a/src/jniutils.hh b/src/jniutils.hh
index f1cd50d..6ef4825 100644
--- a/src/jniutils.hh
+++ b/src/jniutils.hh
@@ -4,9 +4,9 @@
 #include <pthread.h>
 #include <errno.h>
 #include <jni.h>
-#include <pEp/stringpair.h>
-#include <pEp/identity_list.h>
-#include <pEp/bloblist.h>
+#include <stringpair.h>
+#include <identity_list.h>
+#include <bloblist.h>
 
 #if 0 // Enable if log needed
 #include <android/log.h>
diff --git a/src/org_pEp_jniadapter_AbstractEngine.cc b/src/org_pEp_jniadapter_AbstractEngine.cc
index ca423c8..90ac16a 100644
--- a/src/org_pEp_jniadapter_AbstractEngine.cc
+++ b/src/org_pEp_jniadapter_AbstractEngine.cc
@@ -4,9 +4,9 @@
 #include <unistd.h>
 #include <assert.h>
 #include <pthread.h>
-#include <pEp/keymanagement.h>
-#include <pEp/message_api.h>
-#include <pEp/sync.h>
+#include <keymanagement.h>
+#include <message_api.h>
+#include <sync.h>
 
 #include "throw_pEp_exception.hh"
 #include "jniutils.hh"