diff --git a/ChangeLog b/ChangeLog
index 9c6e0d8496..62587eb819 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-03-21  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* configure.ac:
+	Check if the compiler supports do { } while (0) macros. This fixes
+	a warning when compiling with g++ 4.3, resulting in a build failure
+	because of -Werror.
+
+	* ext/mpeg2enc/gstmpeg2encpicturereader.cc:
+	* ext/mplex/gstmplex.cc:
+	Include <string.h> for memcpy and friends to fix the build with
+	gcc 4.3.
+
+	* tests/check/Makefile.am:
+	Remove trailing backslash.
+
 2008-03-20  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* gst/selector/gstinputselector.c:
diff --git a/common b/common
index 170f8e91ad..9a358e5cc3 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 170f8e91adc7157f6e708ffa58ca22d10e4e45da
+Subproject commit 9a358e5cc3977fd6121f12dd25a358081fd77041
diff --git a/configure.ac b/configure.ac
index 10372ef1f2..2d8f9310e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,9 @@ AS_PROG_OBJC
 dnl check if the compiler supports '-c' and '-o' options
 AM_PROG_CC_C_O
 
+dnl check if the compiler supports do while(0) macros
+AG_GST_CHECK_DOWHILE_MACROS
+
 AC_PATH_PROG(VALGRIND_PATH, valgrind, no)
 AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno")
 
diff --git a/ext/mpeg2enc/gstmpeg2encpicturereader.cc b/ext/mpeg2enc/gstmpeg2encpicturereader.cc
index 5bd09dd7ff..77e38440a9 100644
--- a/ext/mpeg2enc/gstmpeg2encpicturereader.cc
+++ b/ext/mpeg2enc/gstmpeg2encpicturereader.cc
@@ -24,6 +24,7 @@
 #endif
 
 #include <encoderparams.hh>
+#include <string.h>
 
 #include "gstmpeg2enc.hh"
 #include "gstmpeg2encpicturereader.hh"
diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc
index 536882352e..e9535fe86b 100644
--- a/ext/mplex/gstmplex.cc
+++ b/ext/mplex/gstmplex.cc
@@ -55,6 +55,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "gstmplex.hh"
 #include "gstmplexoutputstream.hh"
 #include "gstmplexibitstream.hh"
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index abaf230079..d8724c65d5 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -71,7 +71,7 @@ VALGRIND_TESTS_DISABLE = \
 check_PROGRAMS = \
 	generic/states \
 	$(check_mpeg2enc)  \
-	$(check_mplex)     \ 
+	$(check_mplex)     \
 	$(check_neon)      \
 	$(check_soup)      \
 	$(check_timidity)  \