diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 5106533c6..50fdb96d8 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -998,8 +998,6 @@ LinphoneGlobalState linphone_core_get_global_state(const LinphoneCore *lc);
  */
 void linphone_core_refresh_registers(LinphoneCore* lc);	
 
-int parse_hostname_to_addr(const char *server, struct sockaddr_storage *ss, socklen_t *socklen);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/coreapi/private.h b/coreapi/private.h
index 7f6367211..c242f8e8a 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -126,7 +126,7 @@ void linphone_friend_notify(LinphoneFriend *lf, LinphoneOnlineStatus os);
 LinphoneFriend *linphone_find_friend_by_inc_subscribe(MSList *l, SalOp *op);
 LinphoneFriend *linphone_find_friend_by_out_subscribe(MSList *l, SalOp *op);
 
-
+int parse_hostname_to_addr(const char *server, struct sockaddr_storage *ss, socklen_t *socklen);
 int set_lock_file();
 int get_lock_file();
 int remove_lock_file();
diff --git a/mediastreamer2 b/mediastreamer2
index f8564922f..e20761faf 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit f8564922fae5080ebd03d4bf9be591a4a6765840
+Subproject commit e20761faf96aafc7176a35e0168222205e8648a6
diff --git a/oRTP b/oRTP
index e82ae8b67..b0c5530be 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit e82ae8b67af47fcc3ea1f50bb740b7eed9717e7e
+Subproject commit b0c5530bee255033f09011e5aab6d036e00520dc