diff --git a/configure.ac b/configure.ac
index 675c4c08f..f584f5b9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -661,7 +661,9 @@ AC_ARG_ENABLE(strict,
 	[strictness=yes]
 )
 
-STRICT_OPTIONS="-Wall -Wdeclaration-after-statement -Wuninitialized"
+STRICT_OPTIONS="-Wall -Wuninitialized"
+STRICT_OPTIONS_CC="-Wdeclaration-after-statement "
+STRICT_OPTIONS_CXX=""
 
 #for clang
 
@@ -688,6 +690,8 @@ if test "$strictness" = "yes" ; then
 fi
 
 AC_SUBST(STRICT_OPTIONS)
+AC_SUBST(STRICT_OPTIONS_CC)
+AC_SUBST(STRICT_OPTIONS_CXX)
 
 top_srcdir=`dirname $0`
 
diff --git a/console/Makefile.am b/console/Makefile.am
index 314f5d612..482948329 100644
--- a/console/Makefile.am
+++ b/console/Makefile.am
@@ -3,12 +3,13 @@
 AM_CPPFLAGS=\
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/coreapi \
-	-I$(top_srcdir)/include 
+	-I$(top_srcdir)/include
 
 COMMON_CFLAGS=\
 	-DIN_LINPHONE \
 	-D_ORTP_SOURCE \
 	$(STRICT_OPTIONS) \
+	$(STRICT_OPTIONS_CC) \
 	$(ORTP_CFLAGS) \
 	$(MEDIASTREAMER_CFLAGS) \
 	$(VIDEO_CFLAGS) \
diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 78bc6d5b1..2897affcf 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -6,7 +6,7 @@ GIT_TAG=`cd $(top_srcdir) && git describe --abbrev=0`
 GITREVISION=`cd $(top_srcdir) && git rev-parse HEAD`
 
 ## This command is used to check if the sources are cloned in a git repo.
-## We can't only depend on the presence of the .git/ directory anymore, 
+## We can't only depend on the presence of the .git/ directory anymore,
 ## because of gits submodule handling.
 ## We now simply issue a git log on configure.ac and if the output is empty (error or file not tracked), then we are not in git.
 GITLOG=$(shell git log -1 --pretty=format:%H $(top_srcdir)/configure.ac)
@@ -67,7 +67,7 @@ liblinphone_la_SOURCES=\
 if BUILD_UPNP
 liblinphone_la_SOURCES+=upnp.c upnp.h
 endif
-	
+
 liblinphone_la_SOURCES+=	bellesip_sal/sal_address_impl.c \
 				bellesip_sal/sal_impl.c bellesip_sal/sal_impl.h \
 				bellesip_sal/sal_op_impl.c \
@@ -82,7 +82,7 @@ liblinphone_la_SOURCES+=	bellesip_sal/sal_address_impl.c \
 				bellesip_sal/sal_op_events.c
 
 if BUILD_WIZARD
-liblinphone_la_SOURCES+=sipwizard.c 
+liblinphone_la_SOURCES+=sipwizard.c
 endif
 
 liblinphone_la_SOURCES+=linphone_tunnel_config.c
@@ -141,8 +141,9 @@ endif
 AM_CPPFLAGS=\
 	-I$(top_srcdir) -I$(top_srcdir)/include -I$(builddir)
 
-AM_CFLAGS=\
-	$(STRICT_OPTIONS)  -DIN_LINPHONE \
+COMMON_CFLAGS=\
+	$(STRICT_OPTIONS) \
+	-DIN_LINPHONE \
 	$(ORTP_CFLAGS) \
 	$(MEDIASTREAMER_CFLAGS) \
 	$(SIPSTACK_CFLAGS) \
@@ -158,15 +159,16 @@ AM_CFLAGS=\
 	$(LDAP_CFLAGS) $(SASL_CFLAGS)
 
 if BUILD_WIZARD
-AM_CFLAGS+= -DBUILD_WIZARD 
+COMMON_CFLAGS+= -DBUILD_WIZARD
 endif
 
-AM_CFLAGS+= -DUSE_BELLESIP
+COMMON_CFLAGS+= -DUSE_BELLESIP
 
-AM_CXXFLAGS=$(AM_CFLAGS)
+AM_CFLAGS=$(COMMON_CFLAGS) $(STRICT_OPTIONS_CC)
+AM_CXXFLAGS=$(COMMON_CFLAGS) $(STRICT_OPTIONS_CXX)
 
 #Make sure that we are in linphone's git tree by doing git log $(top_srcdir)/configure.ac.
-#if it is something known to git, then that will be ok to check the git describe number and make sure it is consistent with 
+#if it is something known to git, then that will be ok to check the git describe number and make sure it is consistent with
 #the PACKAGE_VERSION given in configure.ac
 
 make_gitversion_h:
diff --git a/coreapi/help/Makefile.am b/coreapi/help/Makefile.am
index 84822e51c..479d2b31d 100644
--- a/coreapi/help/Makefile.am
+++ b/coreapi/help/Makefile.am
@@ -1,7 +1,7 @@
 
 EXTRA_DIST=Doxyfile.in doxygen.dox
 
-SOURCES=doxygen.dox $(top_srcdir)/coreapi/help/*.c $(top_srcdir)/coreapi/*.c $(top_srcdir)/coreapi/*.h  
+SOURCES=doxygen.dox $(top_srcdir)/coreapi/help/*.c $(top_srcdir)/coreapi/*.c $(top_srcdir)/coreapi/*.h
 
 
 # html doc
@@ -84,6 +84,7 @@ filetransfer_LDADD=$(helloworld_LDADD)
 AM_CFLAGS=\
 	-I$(top_srcdir)/coreapi \
 	$(STRICT_OPTIONS) \
+	$(STRICT_OPTIONS_CC) \
 	-DIN_LINPHONE \
 	$(ORTP_CFLAGS) \
 	$(MEDIASTREAMER_CFLAGS) \
@@ -98,4 +99,4 @@ AM_CFLAGS=\
 tutodir=$(datadir)/tutorials/linphone
 
 tuto_DATA=$(LINPHONE_TUTOS)
-endif 
+endif
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 0daee4a7d..17653bf07 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -18,7 +18,7 @@ UI_FILES=	about.ui \
 		audio_assistant.ui
 
 PIXMAPS=	\
-		stock_people.png 
+		stock_people.png
 
 LINPHONE_ICO_RC_FILE=linphone.rc
 LINPHONE_ICO_FILE=linphone.ico
@@ -54,7 +54,7 @@ linphone_SOURCES=	\
 			conference.c \
 			config-fetching.c \
 			audio_assistant.c \
-			linphone.h 
+			linphone.h
 if BUILD_WIZARD
 linphone_SOURCES+=	\
 			setupwizard.c
@@ -84,7 +84,7 @@ endif
 AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
 		$(MEDIASTREAMER_CFLAGS) \
 		$(ORTP_CFLAGS) $(BELLESIP_CFLAGS) \
-		$(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(LIBGTKMAC_CFLAGS) $(IPV6_CFLAGS) \
+		$(STRICT_OPTIONS) $(STRICT_OPTIONS_CC) $(LIBGTK_CFLAGS) $(LIBGTKMAC_CFLAGS) $(IPV6_CFLAGS) \
 		$(TUNNEL_CFLAGS) \
 		$(SQLITE3_CFLAGS)
 
diff --git a/mediastreamer2 b/mediastreamer2
index cd672fcb2..6be5e976f 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit cd672fcb217b1f12a62965e463a27af105cf7542
+Subproject commit 6be5e976f12217569da7ad62a44f6ddfe9e9c9d0
diff --git a/oRTP b/oRTP
index a9eed620b..f0e365b16 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit a9eed620b6a5f922c4a63ad47be13b88d912ee60
+Subproject commit f0e365b16cc94cae7a232d44316ad7a9b53c5411
diff --git a/tester/Makefile.am b/tester/Makefile.am
index 0306ea7a4..6e52d21b5 100644
--- a/tester/Makefile.am
+++ b/tester/Makefile.am
@@ -28,7 +28,7 @@ liblinphonetester_la_LDFLAGS= -no-undefined
 liblinphonetester_la_LIBADD= ../coreapi/liblinphone.la $(CUNIT_LIBS)
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/coreapi
-AM_CFLAGS    = $(STRICT_OPTIONS) -DIN_LINPHONE $(ORTP_CFLAGS) $(MEDIASTREAMER_CFLAGS) $(CUNIT_CFLAGS) $(BELLESIP_CFLAGS) $(LIBXML2_CFLAGS) $(SQLITE3_CFLAGS)
+AM_CFLAGS    = $(STRICT_OPTIONS) $(STRICT_OPTIONS_CC) -DIN_LINPHONE $(ORTP_CFLAGS) $(MEDIASTREAMER_CFLAGS) $(CUNIT_CFLAGS) $(BELLESIP_CFLAGS) $(LIBXML2_CFLAGS) $(SQLITE3_CFLAGS)
 
 if !BUILD_IOS
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d993aa591..0515faae2 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,17 +2,18 @@
 
 AM_CPPFLAGS=\
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/coreapi 
+	-I$(top_srcdir)/coreapi
 
 COMMON_CFLAGS=\
 	-DIN_LINPHONE \
 	$(ORTP_CFLAGS) \
 	$(MEDIASTREAMER_CFLAGS) \
 	$(STRICT_OPTIONS) \
-	$(LIBXML2_CFLAGS) 
+	$(STRICT_OPTIONS_CC) \
+	$(LIBXML2_CFLAGS)
 
 #-fpermissive to workaround a g++ bug on macos 32bit SDK.
-AM_CXXFLAGS=$(LIBXML2_CFLAGS) -fpermissive $(STRICT_OPTIONS) 
+AM_CXXFLAGS=$(LIBXML2_CFLAGS) -fpermissive $(STRICT_OPTIONS) $(STRICT_OPTIONS_CXX)
 
 EXTRA_DIST=xml2lpc_jni.cc lpc2xml_jni.cc