diff --git a/build/android/Android.mk b/build/android/Android.mk
index e634d3fa02716687156af5fdfb12995078083f72..c281b241df1daf0b27c85901aeba07c953892783 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -266,5 +266,8 @@ LOCAL_MODULE_FILENAME := liblinphone-$(TARGET_ARCH_ABI)
 
 include $(BUILD_SHARED_LIBRARY)
 
+LOCAL_CPPFLAGS=$(LOCAL_CFLAGS)
+LOCAL_CFLAGS += -Wdeclaration-after-statement
+
 $(call import-module,android/cpufeatures)
 
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 42f9848b2bbc4ad3174f5bcc0d70c6b81f187cd2..241f130cc89645573fce1833811519f638392c7d 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -715,7 +715,6 @@ public:
 	static void infoReceived(LinphoneCore *lc, LinphoneCall*call, const LinphoneInfoMessage *info){
 		JNIEnv *env = 0;
 		jint result = jvm->AttachCurrentThread(&env,NULL);
-		jobject jcall;
 		if (result != 0) {
 			ms_error("cannot attach VM");
 			return;
@@ -4055,7 +4054,7 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneInfoMessageImpl_addHeader(
  * Signature: (JLjava/lang/String;)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneInfoMessageImpl_getHeader(JNIEnv *env, jobject jobj, jlong infoptr, jstring jname){
-	const char *name=name=env->GetStringUTFChars(jname,NULL);
+	const char *name=env->GetStringUTFChars(jname,NULL);
 	const char *ret=linphone_info_message_get_header((LinphoneInfoMessage*)infoptr,name);
 	env->ReleaseStringUTFChars(jname,name);
 	return ret ? env->NewStringUTF(ret) : NULL;
@@ -4727,6 +4726,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceActivityImpl_setDescriptio
 	const char *cdescription = description ? env->GetStringUTFChars(description, NULL) : NULL;
 	linphone_presence_activity_set_description(activity, cdescription);
 	if (cdescription) env->ReleaseStringUTFChars(description, cdescription);
+	return (jint)0;
 }
 
 /*
@@ -4778,6 +4778,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceServiceImpl_setId(JNIEnv *
 	const char *cid = id ? env->GetStringUTFChars(id, NULL) : NULL;
 	linphone_presence_service_set_id(service, cid);
 	if (cid) env->ReleaseStringUTFChars(id, cid);
+	return (jint)0;
 }
 
 /*
@@ -4823,6 +4824,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceServiceImpl_setContact(JNI
 	const char *ccontact = contact ? env->GetStringUTFChars(contact, NULL) : NULL;
 	linphone_presence_service_set_contact(service, ccontact);
 	if (ccontact) env->ReleaseStringUTFChars(contact, ccontact);
+	return (jint)0;
 }
 
 /*
@@ -4913,6 +4915,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresencePersonImpl_setId(JNIEnv *e
 	const char *cid = id ? env->GetStringUTFChars(id, NULL) : NULL;
 	linphone_presence_person_set_id(person, cid);
 	if (cid) env->ReleaseStringUTFChars(id, cid);
+	return (jint)0;
 }
 
 /*
@@ -5085,6 +5088,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceNoteImpl_setContent(JNIEnv
 	const char *ccontent = content ? env->GetStringUTFChars(content, NULL) : NULL;
 	linphone_presence_note_set_content(note, ccontent);
 	if (ccontent) env->ReleaseStringUTFChars(content, ccontent);
+	return (jint)0;
 }
 
 /*
@@ -5108,6 +5112,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceNoteImpl_setLang(JNIEnv *e
 	const char *clang = lang ? env->GetStringUTFChars(lang, NULL) : NULL;
 	linphone_presence_note_set_lang(note, clang);
 	if (clang) env->ReleaseStringUTFChars(lang, clang);
+	return (jint)0;
 }
 
 /*
@@ -5266,7 +5271,6 @@ extern "C" jint Java_org_linphone_core_LinphonePlayerImpl_open(JNIEnv *env, jobj
 }
 
 extern "C" jint Java_org_linphone_core_LinphonePlayerImpl_start(JNIEnv *env, jobject jobj, jlong ptr) {
-	LinphonePlayerData *player_data = (LinphonePlayerData *)((LinphonePlayer *)ptr)->user_data;
 	return (jint)linphone_player_start((LinphonePlayer *)ptr);
 }
 
diff --git a/mediastreamer2 b/mediastreamer2
index 36d8af7faba64c9970e40bf986ae98c3aebcf9c0..8642a0971455f5bd444e2b84c555848d9981aebc 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 36d8af7faba64c9970e40bf986ae98c3aebcf9c0
+Subproject commit 8642a0971455f5bd444e2b84c555848d9981aebc
diff --git a/oRTP b/oRTP
index f1e77dd83f697954e78e024e6c837f32fc70ba5f..90a19604d061d7f23189feb925847e66d366898e 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit f1e77dd83f697954e78e024e6c837f32fc70ba5f
+Subproject commit 90a19604d061d7f23189feb925847e66d366898e