diff --git a/Makefile b/Makefile
index cb361f74da..c35dfc7329 100644
--- a/Makefile
+++ b/Makefile
@@ -636,8 +636,6 @@ OBJS_COMMON    += $(addsuffix .o, $(basename $(SRCS_COMMON)) )
 OBJS_MENCODER  += $(addsuffix .o, $(basename $(SRCS_MENCODER)) )
 OBJS_MPLAYER   += $(addsuffix .o, $(basename $(SRCS_MPLAYER)) )
 
-CFLAGS += $(CFLAGS-yes) $(OPTFLAGS)
-
 INSTALL_TARGETS-$(MPLAYER)  += install-mplayer  install-mplayer-man
 INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man
 INSTALL_TARGETS-$(GUI)      += install-gui
diff --git a/configure b/configure
index a3f3b5e3e3..a3bc00fe22 100755
--- a/configure
+++ b/configure
@@ -7696,6 +7696,7 @@ WINDRES = $_windres
 INSTALL = $_install
 EXTRA_INC = $_inc_extra
 EXTRAXX_INC = $_inc_extra $_inc_extraxx
+CFLAGS = $CFLAGS \$(EXTRA_INC)
 OPTFLAGS = $CFLAGS \$(EXTRA_INC)
 CFLAG_NO_OMIT_LEAF_FRAME_POINTER = $CFLAG_NO_OMIT_LEAF_FRAME_POINTER
 CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC)