diff --git a/Gui/Makefile b/Gui/Makefile
index 148e3b76a0..8435035c58 100644
--- a/Gui/Makefile
+++ b/Gui/Makefile
@@ -4,8 +4,6 @@ LIBNAME_MPLAYER = libgui.a
 
 #CFLAGS += -DDEBUG
 
-CFLAGS-$(CONFIG_LIBAVUTIL)   += -I../libavutil
-
 ifeq ($(TARGET_WIN32),yes)
 SRCS_MPLAYER = win32/dialogs.c \
                win32/gui.c \
diff --git a/libaf/Makefile b/libaf/Makefile
index c209296a70..67a269d1a7 100644
--- a/libaf/Makefile
+++ b/libaf/Makefile
@@ -32,9 +32,6 @@ SRCS_COMMON = af.c \
 SRCS_COMMON-$(CONFIG_LIBAVCODEC)    += af_lavcresample.c
 SRCS_COMMON-$(CONFIG_LIBAVCODEC_SO) += af_lavcresample.c
 
-CFLAGS-$(CONFIG_LIBAVUTIL)   += -I../libavutil
-CFLAGS-$(CONFIG_LIBAVCODEC)  += -I../libavcodec
-
 ifeq ($(TARGET_OS),MINGW32)
 CFLAGS += -D_IO_H_
 endif
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 502a3cf987..fac254bacd 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -147,9 +147,6 @@ SRCS_MENCODER-$(TWOLAME)              += ae_twolame.c
 SRCS_MENCODER-$(MP3LAME)              += ae_lame.c
 
 
-CFLAGS-$(CONFIG_LIBAVUTIL)    +=  -I../libavutil
-CFLAGS-$(CONFIG_LIBAVCODEC)   +=  -I../libavcodec
-
 include ../mpcommon.mak
 
 clean::
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index fc6eeb2290..8d1fcf3b0a 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -65,8 +65,4 @@ SRCS_MENCODER = muxer.c \
 SRCS_MENCODER-$(CONFIG_LIBAVFORMAT)     += muxer_lavf.c
 SRCS_MENCODER-$(CONFIG_LIBAVFORMAT_SO)  += muxer_lavf.c
 
-CFLAGS-$(CONFIG_LIBAVUTIL)      += -I../libavutil
-CFLAGS-$(CONFIG_LIBAVCODEC)     += -I../libavcodec
-CFLAGS-$(CONFIG_LIBAVFORMAT)    += -I../libavformat
-
 include ../mpcommon.mak
diff --git a/libvo/Makefile b/libvo/Makefile
index d93dbfc1b2..81f97fe57a 100644
--- a/libvo/Makefile
+++ b/libvo/Makefile
@@ -22,6 +22,4 @@ SRCS_COMMON = aclib.c \
 SRCS_COMMON-$(BITMAP_FONT) +=  font_load.c
 SRCS_COMMON-$(FREETYPE)    +=  font_load_ft.c
 
-CFLAGS-$(CONFIG_LIBAVUTIL) +=  -I../libavutil
-
 include ../mpcommon.mak
diff --git a/mpcommon.mak b/mpcommon.mak
index 4d37c46bbb..a0967ef16e 100644
--- a/mpcommon.mak
+++ b/mpcommon.mak
@@ -6,6 +6,9 @@ OBJS_COMMON    = $(addsuffix .o, $(basename $(SRCS_COMMON)) )
 OBJS_MPLAYER   = $(addsuffix .o, $(basename $(SRCS_MPLAYER)) )
 OBJS_MENCODER  = $(addsuffix .o, $(basename $(SRCS_MENCODER)) )
 
+CFLAGS-$(CONFIG_LIBAVUTIL)      += -I../libavutil
+CFLAGS-$(CONFIG_LIBAVCODEC)     += -I../libavcodec
+CFLAGS-$(CONFIG_LIBAVFORMAT)    += -I../libavformat
 CFLAGS += $(CFLAGS-yes) -I. -I.. $(OPTFLAGS)
 
 LIBS-$(MPLAYER)  += $(LIBNAME_MPLAYER)