diff --git a/build/android/common.mk b/build/android/common.mk
index 704b06045..8772e9003 100644
--- a/build/android/common.mk
+++ b/build/android/common.mk
@@ -81,7 +81,8 @@ LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/../oRTP/include \
 	$(LOCAL_PATH)/../mediastreamer2/include \
 	$(LOCAL_PATH)/../../externals/exosip/include \
-	$(LOCAL_PATH)/../../externals/osip/include 
+	$(LOCAL_PATH)/../../externals/osip/include \
+	$(LOCAL_PATH)/../../../gen
 
 LOCAL_LDLIBS += -llog -ldl
 
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 080c8b009..69f9b3cc4 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -17,6 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 #include <jni.h>
+#include "linphonecore_jni.h"
 #include "linphonecore_utils.h"
 #include <ortp/zrtp.h>