Index: configure
===================================================================
--- configure	(Revision 22614)
+++ configure	(Arbeitskopie)
@@ -6080,7 +6080,7 @@
                  $_livelibdir/UsageEnvironment/libUsageEnvironment.a \
                  $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
                  $_ld_extra  -lstdc++" \
-      _inc_extra="$_inc_extra -I$_livelibdir/liveMedia/include \
+      _inc_extraxx="-I$_livelibdir/liveMedia/include \
                   -I$_livelibdir/UsageEnvironment/include \
                   -I$_livelibdir/BasicUsageEnvironment/include \
                   -I$_livelibdir/groupsock/include" && \
@@ -7454,6 +7454,7 @@
 LDCONFIG = $_ldconfig
 INSTALL = $_install
 EXTRA_INC = $_inc_extra
+EXTRAXX_INC = $_inc_extraxx
 OPTFLAGS = $CFLAGS \$(EXTRA_INC)
 INSTALLSTRIP = $_install_strip
 CHARSET = $_charset
Index: libmpdemux/Makefile
===================================================================
--- libmpdemux/Makefile	(Revision 22614)
+++ libmpdemux/Makefile	(Arbeitskopie)
@@ -71,6 +71,6 @@
 CFLAGS-$(CONFIG_LIBAVCODEC)     += -I../libavcodec
 CFLAGS-$(CONFIG_LIBAVFORMAT)    += -I../libavformat
 
-CXXFLAGS  = $(subst -Wdeclaration-after-statement,,$(CFLAGS)) -D__STDC_LIMIT_MACROS
+CXXFLAGS  = $(subst -Wdeclaration-after-statement,,$(CFLAGS)) -D__STDC_LIMIT_MACROS $(EXTRAXX_INC)
 
 include ../mpcommon.mak