diff --git a/coreapi/call_log.c b/coreapi/call_log.c
index 36e69341a..dd9baa5b7 100644
--- a/coreapi/call_log.c
+++ b/coreapi/call_log.c
@@ -17,13 +17,10 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#define _GNU_SOURCE
+#define _XOPEN_SOURCE 700 /*required for strptime of GNU libc*/
 
-#include "linphonecore.h"
+#include <time.h>
 #include "private.h"
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
 
 /*******************************************************************************
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index d88fc6974..1dc887bed 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -17,8 +17,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#define _GNU_SOURCE
-
 #include "linphonecore.h"
 #include "sipsetup.h"
 #include "lpconfig.h"
@@ -41,7 +39,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
 #include "liblinphone_gitversion.h"
 #else
 #ifndef LIBLINPHONE_GIT_VERSION
diff --git a/mediastreamer2 b/mediastreamer2
index 72e45852e..3c16405c5 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 72e45852e9f52c4acdabed4810d94db44eb8fa61
+Subproject commit 3c16405c515e5f49ef39400f7b8593c52fb90e0d