diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk
index d5da59fb..556b7e62 100644
--- a/build-android/jni/Android.mk
+++ b/build-android/jni/Android.mk
@@ -29,13 +29,13 @@ LOCAL_CFLAGS    += -std=c99
 #
 LOCAL_CFLAGS    += -DSQLITE_TEMP_STORE=3
 
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../src \
-                    $(LOCAL_PATH)/../../asn.1 \
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../asn.1 \
                     $(GPGME_INCLUDE_PATH) \
                     $(LIBETPAN_PATH)/include
 LOCAL_C_INCLUDES += $(GPGBUILD)/include
 
-LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/../../src
+$(shell sh $(LOCAL_PATH)/../takeOutHeaderFiles.sh $(LOCAL_PATH)../../)
+LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)../include
 
 ENGINE_SRC_FILES := $(shell find $(LOCAL_PATH)/../../src/ ! -name "*netpgp*" -name "*.c")
 #ENGINE_SRC_FILES := $(wildcard $(LOCAL_PATH)/../../src/*.c)
diff --git a/build-android/takeOutHeaderFiles.sh b/build-android/takeOutHeaderFiles.sh
new file mode 100755
index 00000000..a47e4486
--- /dev/null
+++ b/build-android/takeOutHeaderFiles.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+engine_dir="$1"
+
+mkdir -p "$engine_dir/build-android/include/pEp"
+cd "$engine_dir/src"
+cp *.h "$engine_dir/build-android/include/pEp"
+