diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 503ab479b..bac8c65fa 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -4452,11 +4452,11 @@ void linphone_core_set_firewall_policy(LinphoneCore *lc, LinphoneFirewallPolicy
 		lp_config_set_string(lc->config,"net","firewall_policy",policy);
 }
 
-inline LinphoneFirewallPolicy linphone_core_get_firewall_policy(const LinphoneCore *lc) {
+ORTP_INLINE LinphoneFirewallPolicy linphone_core_get_firewall_policy(const LinphoneCore *lc) {
 	return _linphone_core_get_firewall_policy_with_lie(lc, FALSE);
 }
 
-inline LinphoneFirewallPolicy _linphone_core_get_firewall_policy(const LinphoneCore *lc) {
+ORTP_INLINE LinphoneFirewallPolicy _linphone_core_get_firewall_policy(const LinphoneCore *lc) {
 	return _linphone_core_get_firewall_policy_with_lie(lc, TRUE);
 }
 
diff --git a/coreapi/lpconfig.c b/coreapi/lpconfig.c
index a2838d4a4..c1ffea0fc 100644
--- a/coreapi/lpconfig.c
+++ b/coreapi/lpconfig.c
@@ -40,7 +40,11 @@
 #endif /*_WIN32_WCE*/
 
 #ifdef _MSC_VER
+#ifdef WINAPI_FAMILY_PHONE_APP
+#include <stdlib.h>
+#else
 #include <Shlwapi.h>
+#endif
 #else
 #include <libgen.h>
 #endif
@@ -666,9 +670,18 @@ const char* lp_config_get_default_string(const LpConfig *lpconfig, const char *s
 
 static char *_lp_config_dirname(char *path) {
 #ifdef _MSC_VER
+#ifdef WINAPI_FAMILY_PHONE_APP
+	char drive[_MAX_DRIVE];
+	char dir[_MAX_DIR];
+	char fname[_MAX_FNAME];
+	char ext[_MAX_EXT];
+	_splitpath(path, drive, dir, fname, ext);
+	return ms_strdup_printf("%s%s", drive, dir);
+#else
 	char *dir = ms_strdup(path);
 	PathRemoveFileSpec(dir);
 	return dir;
+#endif
 #else
 	char *tmp = ms_strdup(path);
 	char *dir = ms_strdup(dirname(tmp));
diff --git a/mediastreamer2 b/mediastreamer2
index baf0fb51d..26911e569 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit baf0fb51df2149f4672c09a504d95b994f06c153
+Subproject commit 26911e569e80df4fd247490934eebc9ecc50bd31
diff --git a/oRTP b/oRTP
index 45da3ab75..e22d5d8fb 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 45da3ab75d39587189ea95829ee1cb92d61827be
+Subproject commit e22d5d8fbdab342c556ef7eae6acaf025ec9120f