diff --git a/configure b/configure
index 369552c110..84e1f3a6a0 100755
--- a/configure
+++ b/configure
@@ -7409,6 +7409,8 @@ if test "$_largefiles" = yes || freebsd ; then
   fi
 fi
 
+CXXFLAGS="-I.. $CFLAGS -D__STDC_LIMIT_MACROS"
+
 if cc_check -Wdeclaration-after-statement ; then
   CFLAGS="-Wdeclaration-after-statement $CFLAGS"
 fi
@@ -7478,8 +7480,9 @@ RANLIB = $_ranlib
 LDCONFIG = $_ldconfig
 INSTALL = $_install
 EXTRA_INC = $_inc_extra
-EXTRAXX_INC = $_inc_extraxx
+EXTRAXX_INC = $_inc_extra $_inc_extraxx
 OPTFLAGS = $CFLAGS \$(EXTRA_INC)
+CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC)
 INSTALLSTRIP = $_install_strip
 CHARSET = $_charset
 HELP_FILE = $_mp_help
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index b973c76abf..fc6eeb2290 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -69,6 +69,4 @@ CFLAGS-$(CONFIG_LIBAVUTIL)      += -I../libavutil
 CFLAGS-$(CONFIG_LIBAVCODEC)     += -I../libavcodec
 CFLAGS-$(CONFIG_LIBAVFORMAT)    += -I../libavformat
 
-CXXFLAGS  = $(subst -Wdeclaration-after-statement,,$(CFLAGS)) -D__STDC_LIMIT_MACROS $(EXTRAXX_INC)
-
 include ../mpcommon.mak