diff --git a/configure b/configure
index c63d606485..68cad55604 100755
--- a/configure
+++ b/configure
@@ -7409,7 +7409,8 @@ if test "$_largefiles" = yes || freebsd ; then
   fi
 fi
 
-CXXFLAGS="-I.. $CFLAGS -D__STDC_LIMIT_MACROS"
+CFLAGS="-I. -I.. -I../libavutil $CFLAGS"
+CXXFLAGS=" $CFLAGS -D__STDC_LIMIT_MACROS"
 
 cat > $TMPC << EOF
 int main() { return 0; }
diff --git a/mpcommon.mak b/mpcommon.mak
index 222bafc807..eb04bd19f9 100644
--- a/mpcommon.mak
+++ b/mpcommon.mak
@@ -8,7 +8,7 @@ OBJS_MENCODER  = $(addsuffix .o, $(basename $(SRCS_MENCODER)) )
 
 CFLAGS-$(CONFIG_LIBAVCODEC)     += -I../libavcodec
 CFLAGS-$(CONFIG_LIBAVFORMAT)    += -I../libavformat
-CFLAGS += -I. -I.. -I../libavutil $(CFLAGS-yes) $(OPTFLAGS)
+CFLAGS += $(CFLAGS-yes) $(OPTFLAGS)
 
 LIBS-$(MPLAYER)  += $(LIBNAME_MPLAYER)
 LIBS-$(MENCODER) += $(LIBNAME_MENCODER)