diff --git a/src/chat/chat-message/chat-message-p.h b/src/chat/chat-message/chat-message-p.h
index 1618639fe..bd60625ed 100644
--- a/src/chat/chat-message/chat-message-p.h
+++ b/src/chat/chat-message/chat-message-p.h
@@ -141,7 +141,7 @@ private:
 	belle_http_request_listener_t *httpListener = nullptr;
 	SalOp *salOp = nullptr;
 	SalCustomHeader *salCustomHeaders = nullptr;
-	unsigned long backgroundTaskId;
+	unsigned long backgroundTaskId = 0;
 	unsigned char currentSendStep = Step::None;
 	bool applyModifiers = true;
 	// Cache for returned values, used for compatibility with previous C API
diff --git a/wrappers/java/jni.mustache b/wrappers/java/jni.mustache
index 044e00fe4..8513e753c 100644
--- a/wrappers/java/jni.mustache
+++ b/wrappers/java/jni.mustache
@@ -36,7 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifdef __ANDROID__
 #include <android/log.h>
-#include <belle-sip/wakelock.h>
 #endif /* __ANDROID__ */
 
 static JavaVM *jvm = NULL;