diff --git a/cfg-common-opts.h b/cfg-common-opts.h
index 0726e17739..77b96ae5c9 100644
--- a/cfg-common-opts.h
+++ b/cfg-common-opts.h
@@ -257,7 +257,7 @@
 #ifdef CONFIG_LIBAVFORMAT
         {"lavfdopts",  lavfdopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #endif
-#ifdef HAVE_XVID4
+#ifdef CONFIG_XVID4
 	{"xvidopts", xvid_dec_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #endif
 	{"codecs-file", &codecs_file, CONF_TYPE_STRING, 0, 0, 0, NULL},
diff --git a/cfg-mencoder.h b/cfg-mencoder.h
index 4974597f22..d4509c4711 100644
--- a/cfg-mencoder.h
+++ b/cfg-mencoder.h
@@ -52,13 +52,13 @@ const m_option_t ovc_conf[]={
 	"   vfw      - VfW DLLs, read DOCS/HTML/en/encoding-guide.html.\n"
 	"   qtvideo  - QuickTime DLLs, currently only SVQ1/3 are supported.\n"
 #endif
-#ifdef HAVE_LIBDV095
+#ifdef CONFIG_LIBDV095
 	"   libdv    - DV encoding with libdv v0.9.5\n"
 #endif
-#ifdef HAVE_XVID4
+#ifdef CONFIG_XVID4
 	"   xvid     - XviD encoding\n"
 #endif
-#ifdef HAVE_X264
+#ifdef CONFIG_X264
 	"   x264     - H.264 encoding\n"
 #endif
 	"\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
@@ -68,47 +68,47 @@ const m_option_t ovc_conf[]={
 const m_option_t oac_conf[]={
 	{"copy", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_COPY, NULL},
 	{"pcm", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_PCM, NULL},
-#ifdef HAVE_MP3LAME
+#ifdef CONFIG_MP3LAME
 	{"mp3lame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_VBRMP3, NULL},
 #else
 	{"mp3lame", "MPlayer was compiled without libmp3lame support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* HAVE_MP3LAME */
+#endif /* CONFIG_MP3LAME */
 #ifdef CONFIG_LIBAVCODEC
 	{"lavc", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_LAVC, NULL},
 #else
 	{"lavc", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif /* CONFIG_LIBAVCODEC */
-#ifdef HAVE_TOOLAME
+#ifdef CONFIG_TOOLAME
 	{"toolame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_TOOLAME, NULL},
 #else
 	{"toolame", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* HAVE_TOOLAME */
-#ifdef HAVE_TWOLAME
+#endif /* CONFIG_TOOLAME */
+#ifdef CONFIG_TWOLAME
 	{"twolame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_TWOLAME, NULL},
 #else
 	{"twolame", "MPlayer was compiled without libtwolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* HAVE_TWOLAME */
-#ifdef HAVE_FAAC
+#endif /* CONFIG_TWOLAME */
+#ifdef CONFIG_FAAC
 	{"faac", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_FAAC, NULL},
 #else
 	{"faac", "MPlayer was compiled without libfaac. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* HAVE_FAAC */
+#endif /* CONFIG_FAAC */
 	{"help", "\nAvailable codecs:\n"
 	"   copy     - frame copy, without re-encoding (useful for AC3)\n"
 	"   pcm      - uncompressed PCM audio\n"
-#ifdef HAVE_MP3LAME
+#ifdef CONFIG_MP3LAME
 	"   mp3lame  - cbr/abr/vbr MP3 using libmp3lame\n"
 #endif
 #ifdef CONFIG_LIBAVCODEC
 	"   lavc     - FFmpeg audio encoder (MP2, AC3, ...)\n"
 #endif
-#ifdef HAVE_TOOLAME
+#ifdef CONFIG_TOOLAME
 	"   toolame  - Toolame MP2 audio encoder\n"
 #endif
-#ifdef HAVE_TWOLAME
+#ifdef CONFIG_TWOLAME
 	"   twolame  - Twolame MP2 audio encoder\n"
 #endif
-#ifdef HAVE_FAAC
+#ifdef CONFIG_FAAC
 	"   faac     - FAAC AAC audio encoder\n"
 #endif
 	"\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
@@ -217,7 +217,7 @@ const m_option_t mencoder_opts[]={
 	// info header strings
 	{"info", info_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 
-#ifdef HAVE_MP3LAME
+#ifdef CONFIG_MP3LAME
 	{"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #endif
 #ifdef CONFIG_LIBAVCODEC
@@ -225,28 +225,28 @@ const m_option_t mencoder_opts[]={
 #else
 	{"lavcopts", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif /* CONFIG_LIBAVCODEC */
-#ifdef HAVE_TOOLAME
+#ifdef CONFIG_TOOLAME
 	{"toolameopts", toolameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #else
 	{"toolameopts", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* HAVE_TOOLAME */
-#ifdef HAVE_TWOLAME
+#endif /* CONFIG_TOOLAME */
+#ifdef CONFIG_TWOLAME
 	{"twolameopts", twolameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #else
 	{"twolameopts", "MPlayer was compiled without libtwolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* HAVE_TWOLAME */
-#ifdef HAVE_FAAC
+#endif /* CONFIG_TWOLAME */
+#ifdef CONFIG_FAAC
 	{"faacopts", faacopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #else
 	{"faacopts", "MPlayer was compiled without libfaac. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* HAVE_FAAC */
+#endif /* CONFIG_FAAC */
 #ifdef CONFIG_WIN32DLL
 	{"xvfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #endif
-#ifdef HAVE_XVID4
+#ifdef CONFIG_XVID4
 	{"xvidencopts", xvidencopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #endif
-#if defined(HAVE_X264)
+#if defined(CONFIG_X264)
 	{"x264encopts", &x264enc_set_param, CONF_TYPE_FUNC_PARAM, CONF_GLOBAL, 0, 0, NULL},
 #endif
 
diff --git a/configure b/configure
index 2bd6c80bb3..766b9cd2e6 100755
--- a/configure
+++ b/configure
@@ -5849,11 +5849,11 @@ EOF
   cc_check -ltwolame $_ld_lm && _twolame=yes
 fi
 if test "$_twolame" = yes ; then
-  _def_twolame='#define HAVE_TWOLAME 1'
+  _def_twolame='#define CONFIG_TWOLAME 1'
   _libs_mencoder="$_libs_mencoder -ltwolame"
   _codecmodules="twolame $_codecmodules"
 else
-  _def_twolame='#undef HAVE_TWOLAME'
+  _def_twolame='#undef CONFIG_TWOLAME'
   _nocodecmodules="twolame $_nocodecmodules"
 fi
 echores "$_twolame"
@@ -5872,11 +5872,11 @@ EOF
 fi
 fi
 if test "$_toolame" = yes ; then
-  _def_toolame='#define HAVE_TOOLAME 1'
+  _def_toolame='#define CONFIG_TOOLAME 1'
   _libs_mencoder="$_libs_mencoder -ltoolame"
   _codecmodules="toolame $_codecmodules"
 else
-  _def_toolame='#undef HAVE_TOOLAME'
+  _def_toolame='#undef CONFIG_TOOLAME'
   _nocodecmodules="toolame $_nocodecmodules"
 fi
 if test "$_toolamedir" ; then
@@ -5905,7 +5905,7 @@ EOF
 fi
 if test "$_tremor_internal" = yes ; then
   _vorbis=yes
-  _def_vorbis='#define HAVE_OGGVORBIS 1'
+  _def_vorbis='#define CONFIG_OGGVORBIS 1'
   _def_tremor='#define TREMOR 1'
   _codecmodules="tremor(internal) $_codecmodules"
   _res_comment="internal Tremor"
@@ -5915,14 +5915,14 @@ if test "$_tremor_internal" = yes ; then
   fi
 elif test "$_tremor_external" = yes ; then
   _vorbis=yes
-  _def_vorbis='#define HAVE_OGGVORBIS 1'
+  _def_vorbis='#define CONFIG_OGGVORBIS 1'
   _def_tremor='#define TREMOR 1'
   _codecmodules="tremor(external) $_codecmodules"
   _res_comment="external Tremor"
   _ld_extra="$_ld_extra -logg -lvorbisidec"
 elif test "$_libvorbis" = yes ; then
   _vorbis=yes
-  _def_vorbis='#define HAVE_OGGVORBIS 1'
+  _def_vorbis='#define CONFIG_OGGVORBIS 1'
   _codecmodules="libvorbis $_codecmodules"
   _res_comment="libvorbis"
   _ld_extra="$_ld_extra -lvorbis -logg"
@@ -5942,11 +5942,11 @@ EOF
   cc_check -lspeex $_ld_lm && _speex=yes
 fi
 if test "$_speex" = yes ; then
-  _def_speex='#define HAVE_SPEEX 1'
+  _def_speex='#define CONFIG_SPEEX 1'
   _ld_extra="$_ld_extra -lspeex"
   _codecmodules="speex $_codecmodules"
 else
-  _def_speex='#undef HAVE_SPEEX'
+  _def_speex='#undef CONFIG_SPEEX'
   _nocodecmodules="speex $_nocodecmodules"
 fi
 echores "$_speex"
@@ -5999,13 +5999,13 @@ EOF
   fi
 fi
 if test "$_theora" = yes ; then
-  _def_theora='#define HAVE_OGGTHEORA 1'
+  _def_theora='#define CONFIG_OGGTHEORA 1'
   _codecmodules="libtheora $_codecmodules"
   # when --enable-theora is forced, we'd better provide a probably sane
   # $_ld_theora than nothing
   test -z "$_ld_theora" && _ld_extra="$_ld_extra -ltheora -logg"
 else
-  _def_theora='#undef HAVE_OGGTHEORA'
+  _def_theora='#undef CONFIG_OGGTHEORA'
   _nocodecmodules="libtheora $_nocodecmodules"
 fi
 echores "$_theora"
@@ -6090,11 +6090,11 @@ EOF
   cc_check -lmpcdec $_ld_lm && _musepack=yes
 fi
 if test "$_musepack" = yes ; then
-  _def_musepack='#define HAVE_MUSEPACK 1'
+  _def_musepack='#define CONFIG_MUSEPACK 1'
   _ld_extra="$_ld_extra -lmpcdec"
   _codecmodules="musepack $_codecmodules"
 else
-  _def_musepack='#undef HAVE_MUSEPACK'
+  _def_musepack='#undef CONFIG_MUSEPACK'
   _nocodecmodules="musepack $_nocodecmodules"
 fi
 echores "$_musepack"
@@ -6113,7 +6113,7 @@ EOF
   done
 fi
 if test "$_faac" = yes ; then
-  _def_faac="#define HAVE_FAAC 1"
+  _def_faac="#define CONFIG_FAAC 1"
   test "$_faac_lavc" = auto && _faac_lavc=yes
   if test "$_faac_lavc" = yes ; then
     _def_faac_lavc="#define CONFIG_LIBFAAC 1"
@@ -6123,7 +6123,7 @@ if test "$_faac" = yes ; then
   _codecmodules="faac $_codecmodules"
 else
   _faac_lavc=no
-  _def_faac="#undef HAVE_FAAC"
+  _def_faac="#undef CONFIG_FAAC"
   _def_faac_lavc="#undef CONFIG_LIBFAAC"
   _nocodecmodules="faac $_nocodecmodules"
 fi
@@ -6178,10 +6178,10 @@ else
 fi
 
 if test "$_faad" = yes ; then
-  _def_faad='#define HAVE_FAAD 1'
+  _def_faad='#define CONFIG_FAAD 1'
   _codecmodules="faad2 $_codecmodules"
 else
-  _def_faad='#undef HAVE_FAAD'
+  _def_faad='#undef CONFIG_FAAD'
   _nocodecmodules="faad2 $_nocodecmodules"
 fi
 echores "$_faad"
@@ -6603,11 +6603,11 @@ EOF
   cc_check -ldv $_ld_pthread $_ld_lm && _libdv=yes
 fi
 if test "$_libdv" = yes ; then
-  _def_libdv='#define HAVE_LIBDV095 1'
+  _def_libdv='#define CONFIG_LIBDV095 1'
   _ld_extra="$_ld_extra -ldv"
   _codecmodules="libdv $_codecmodules"
 else
-  _def_libdv='#undef HAVE_LIBDV095'
+  _def_libdv='#undef CONFIG_LIBDV095'
   _nocodecmodules="libdv $_nocodecmodules"
 fi
 echores "$_libdv"
@@ -6626,10 +6626,10 @@ EOF
 fi
 
 if test "$_xvid" = yes ; then
-  _def_xvid='#define HAVE_XVID4 1'
+  _def_xvid='#define CONFIG_XVID4 1'
   _codecmodules="xvid $_codecmodules"
 else
-  _def_xvid='#undef HAVE_XVID4'
+  _def_xvid='#undef CONFIG_XVID4'
   _nocodecmodules="xvid $_nocodecmodules"
 fi
 echores "$_xvid"
@@ -6669,7 +6669,7 @@ EOF
 fi
 
 if test "$_x264" = yes ; then
-  _def_x264='#define HAVE_X264 1'
+  _def_x264='#define CONFIG_X264 1'
   _codecmodules="x264 $_codecmodules"
   test "$_x264_lavc" = auto && _x264_lavc=yes
   if test "$_x264_lavc" = yes ; then
@@ -6679,7 +6679,7 @@ if test "$_x264" = yes ; then
   fi
 else
   _x264_lavc=no
-  _def_x264='#undef HAVE_X264'
+  _def_x264='#undef CONFIG_X264'
   _def_x264_lavc='#undef CONFIG_LIBX264'
   _nocodecmodules="x264 $_nocodecmodules"
 fi
@@ -6774,10 +6774,10 @@ EOF
 fi
 
 if test "$_libnut" = yes ; then
-  _def_libnut='#define HAVE_LIBNUT 1'
+  _def_libnut='#define CONFIG_LIBNUT 1'
   _ld_extra="$_ld_extra -lnut"
 else
-  _def_libnut='#undef HAVE_LIBNUT'
+  _def_libnut='#undef CONFIG_LIBNUT'
 fi
 echores "$_libnut"
 
@@ -6812,8 +6812,8 @@ echores "$_zr"
 if test "$_mencoder" != no ; then
 
 echocheck "libmp3lame (for mencoder)"
-_def_mp3lame_preset='#undef HAVE_MP3LAME_PRESET'
-_def_mp3lame_preset_medium='#undef HAVE_MP3LAME_PRESET_MEDIUM'
+_def_mp3lame_preset='#undef CONFIG_MP3LAME_PRESET'
+_def_mp3lame_preset_medium='#undef CONFIG_MP3LAME_PRESET_MEDIUM'
 if test "$_mp3lame" = auto ; then
   _mp3lame=no
   cat > $TMPC <<EOF
@@ -6825,19 +6825,19 @@ EOF
   cc_check -lmp3lame $_ld_lm && tmp_run && _mp3lame=yes
 fi
 if test "$_mp3lame" = yes ; then
-  _def_mp3lame="#define HAVE_MP3LAME"
+  _def_mp3lame="#define CONFIG_MP3LAME"
   _ld_mp3lame=-lmp3lame
   _libs_mencoder="$_libs_mencoder $_ld_mp3lame"
   cat > $TMPC << EOF
 #include <lame/lame.h>
 int main(void) { lame_set_preset(NULL, STANDARD_FAST); return 0; }
 EOF
-  cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset="#define HAVE_MP3LAME_PRESET"
+  cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset="#define CONFIG_MP3LAME_PRESET"
   cat > $TMPC << EOF
 #include <lame/lame.h>
 int main(void) { lame_set_preset(NULL, MEDIUM_FAST); return 0; }
 EOF
-  cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset_medium="#define HAVE_MP3LAME_PRESET_MEDIUM"
+  cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset_medium="#define CONFIG_MP3LAME_PRESET_MEDIUM"
   test "$_mp3lame_lavc" = auto && _mp3lame_lavc=yes
   if test "$_mp3lame_lavc" = yes ; then
     _def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 1"
@@ -6846,7 +6846,7 @@ EOF
   fi
 else
   _mp3lame_lavc=no
-  _def_mp3lame='#undef HAVE_MP3LAME'
+  _def_mp3lame='#undef CONFIG_MP3LAME'
   _def_mp3lame_lavc="#undef CONFIG_LIBMP3LAME"
 fi
 _res_comment="in libavcodec: $_mp3lame_lavc"
diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c
index e553aa1ac3..11d6f350fe 100644
--- a/libmpcodecs/ad.c
+++ b/libmpcodecs/ad.c
@@ -73,13 +73,13 @@ ad_functions_t* mpcodecs_ad_drivers[] =
 #ifdef CONFIG_QTX_CODECS
   &mpcodecs_ad_qtaudio,
 #endif
-#ifdef HAVE_FAAD
+#ifdef CONFIG_FAAD
   &mpcodecs_ad_faad,
 #endif
-#ifdef HAVE_OGGVORBIS
+#ifdef CONFIG_OGGVORBIS
   &mpcodecs_ad_libvorbis,
 #endif
-#ifdef HAVE_SPEEX
+#ifdef CONFIG_SPEEX
   &mpcodecs_ad_speex,
 #endif
 #ifdef CONFIG_LIBMAD
@@ -88,10 +88,10 @@ ad_functions_t* mpcodecs_ad_drivers[] =
 #ifdef CONFIG_REALCODECS
   &mpcodecs_ad_realaud,
 #endif
-#ifdef HAVE_LIBDV095
+#ifdef CONFIG_LIBDV095
   &mpcodecs_ad_libdv,
 #endif
-#ifdef HAVE_MUSEPACK
+#ifdef CONFIG_MUSEPACK
   &mpcodecs_ad_libmusepack,
 #endif
 #ifdef CONFIG_LIBDCA
diff --git a/libmpcodecs/ae.c b/libmpcodecs/ae.c
index f671f294dc..5e7b76b4e9 100644
--- a/libmpcodecs/ae.c
+++ b/libmpcodecs/ae.c
@@ -14,11 +14,11 @@
 
 #include "ae_pcm.h"
 
-#ifdef HAVE_TOOLAME
+#ifdef CONFIG_TOOLAME
 #include "ae_toolame.h"
 #endif
 
-#ifdef HAVE_MP3LAME
+#ifdef CONFIG_MP3LAME
 #include "ae_lame.h"
 #endif
 
@@ -26,11 +26,11 @@
 #include "ae_lavc.h"
 #endif
 
-#ifdef HAVE_FAAC
+#ifdef CONFIG_FAAC
 #include "ae_faac.h"
 #endif
 
-#ifdef HAVE_TWOLAME
+#ifdef CONFIG_TWOLAME
 #include "ae_twolame.h"
 #endif
 
@@ -50,7 +50,7 @@ audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params
 		case ACODEC_PCM:
 			ris = mpae_init_pcm(encoder);
 			break;
-#ifdef HAVE_TOOLAME
+#ifdef CONFIG_TOOLAME
 		case ACODEC_TOOLAME:
 			ris = mpae_init_toolame(encoder);
 			break;
@@ -60,17 +60,17 @@ audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params
 			ris = mpae_init_lavc(encoder);
 			break;
 #endif
-#ifdef HAVE_MP3LAME
+#ifdef CONFIG_MP3LAME
 		case ACODEC_VBRMP3:
 			ris = mpae_init_lame(encoder);
 			break;
 #endif
-#ifdef HAVE_FAAC
+#ifdef CONFIG_FAAC
 		case ACODEC_FAAC:
 			ris = mpae_init_faac(encoder);
 			break;
 #endif
-#ifdef HAVE_TWOLAME
+#ifdef CONFIG_TWOLAME
 		case ACODEC_TWOLAME:
 			ris = mpae_init_twolame(encoder);
 			break;
diff --git a/libmpcodecs/ae_lame.c b/libmpcodecs/ae_lame.c
index 80242dd351..c539d6ba6d 100644
--- a/libmpcodecs/ae_lame.c
+++ b/libmpcodecs/ae_lame.c
@@ -33,7 +33,7 @@ static int lame_param_free_format = 0; //disabled
 static int lame_param_br_min = 0; //not specified
 static int lame_param_br_max = 0; //not specified
 
-#ifdef HAVE_MP3LAME_PRESET
+#ifdef CONFIG_MP3LAME_PRESET
 int lame_param_fast=0; // unset
 static char* lame_param_preset=NULL; // unset
 static int  lame_presets_set( lame_t gfp, int fast, int cbr, const char* preset_name );
@@ -57,7 +57,7 @@ m_option_t lameopts_conf[]={
 	{"free", &lame_param_free_format, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"br_min", &lame_param_br_min, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL},
 	{"br_max", &lame_param_br_max, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL},
-#ifdef HAVE_MP3LAME_PRESET
+#ifdef CONFIG_MP3LAME_PRESET
 	{"fast", &lame_param_fast, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"preset", &lame_param_preset, CONF_TYPE_STRING, 0, 0, 0, NULL},
 #else
@@ -178,7 +178,7 @@ int mpae_init_lame(audio_encoder_t *encoder)
     }
     if(lame_param_lowpassfreq>=-1) lame_set_lowpassfreq(lame,lame_param_lowpassfreq);
     if(lame_param_highpassfreq>=-1) lame_set_highpassfreq(lame,lame_param_highpassfreq);
-#ifdef HAVE_MP3LAME_PRESET
+#ifdef CONFIG_MP3LAME_PRESET
     if(lame_param_preset != NULL) {
         mp_msg(MSGT_MENCODER, MSGL_V, MSGTR_LamePresetEquals,lame_param_preset);
         if(lame_presets_set(lame,lame_param_fast, (lame_param_vbr==0), lame_param_preset) < 0)
@@ -202,7 +202,7 @@ int mpae_init_lame(audio_encoder_t *encoder)
     return 1;
 }
 
-#ifdef HAVE_MP3LAME_PRESET
+#ifdef CONFIG_MP3LAME_PRESET
 /* lame_presets_set 
    taken out of presets_set in lame-3.93.1/frontend/parse.c and modified */
 static int  lame_presets_set( lame_t gfp, int fast, int cbr, const char* preset_name )
@@ -253,7 +253,7 @@ static int  lame_presets_set( lame_t gfp, int fast, int cbr, const char* preset_
         preset_name = "256";
     }
 
-#ifdef HAVE_MP3LAME_PRESET_MEDIUM
+#ifdef CONFIG_MP3LAME_PRESET_MEDIUM
     if (strcmp(preset_name, "medium") == 0) {
         if (fast > 0)
            lame_set_preset(gfp, MEDIUM_FAST);
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index a880989529..eaacf06f59 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -58,7 +58,7 @@ vd_functions_t* mpcodecs_vd_drivers[] = {
 #ifdef CONFIG_LIBAVCODEC
         &mpcodecs_vd_ffmpeg,
 #endif
-#ifdef HAVE_OGGTHEORA
+#ifdef CONFIG_OGGTHEORA
 	&mpcodecs_vd_theora,
 #endif
 #ifdef CONFIG_WIN32DLL
@@ -92,10 +92,10 @@ vd_functions_t* mpcodecs_vd_drivers[] = {
 #ifdef CONFIG_REALCODECS
 	&mpcodecs_vd_realvid,
 #endif
-#ifdef HAVE_XVID4
+#ifdef CONFIG_XVID4
 	&mpcodecs_vd_xvid,
 #endif
-#ifdef HAVE_LIBDV095
+#ifdef CONFIG_LIBDV095
 	&mpcodecs_vd_libdv,
 #endif
 #ifdef CONFIG_QTX_CODECS
diff --git a/libmpcodecs/ve.c b/libmpcodecs/ve.c
index fe1cb7c7e5..dd7f650ba8 100644
--- a/libmpcodecs/ve.c
+++ b/libmpcodecs/ve.c
@@ -32,17 +32,17 @@ static vf_info_t* encoder_list[]={
     &ve_info_qtvideo,
 #endif
 #endif
-#ifdef HAVE_LIBDV095
+#ifdef CONFIG_LIBDV095
     &ve_info_libdv,
 #endif
     &ve_info_raw,
-#ifdef HAVE_XVID4
+#ifdef CONFIG_XVID4
     &ve_info_xvid,
 #endif
 #ifdef CONFIG_LIBLZO
     &ve_info_nuv,
 #endif
-#ifdef HAVE_X264
+#ifdef CONFIG_X264
     &ve_info_x264,
 #endif
     /* Please do not add any new encoders here. If you want to implement a new
diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c
index afd20d6e02..a688f3b125 100644
--- a/libmpdemux/demux_avi.c
+++ b/libmpdemux/demux_avi.c
@@ -828,7 +828,7 @@ static demuxer_t* demux_open_hack_avi(demuxer_t *demuxer)
    if(!demuxer) return NULL; // failed to open
    sh_a = demuxer->audio->sh;
    if(demuxer->audio->id != -2 && sh_a) {
-#ifdef HAVE_OGGVORBIS
+#ifdef CONFIG_OGGVORBIS
     // support for Ogg-in-AVI:
     if(sh_a->format == 0xFFFE)
       demuxer = init_avi_with_ogg(demuxer);
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index 761d332e75..3c5a38bf82 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -27,7 +27,7 @@
 #include <vorbis/codec.h>
 #endif
 
-#ifdef HAVE_OGGTHEORA
+#ifdef CONFIG_OGGTHEORA
 #include <theora/theora.h>
 extern int _ilog (unsigned int); /* defined in many places in theora/lib/ */
 #endif
@@ -38,7 +38,7 @@ extern int _ilog (unsigned int); /* defined in many places in theora/lib/ */
  * without using theora_granule_time with the theora_state of the stream.
  * This is duplicated in `vd_theora.c'; put this in a common header?
  */
-#ifdef HAVE_OGGTHEORA
+#ifdef CONFIG_OGGTHEORA
 typedef struct theora_struct_st {
     theora_state st;
     theora_comment cc;
@@ -266,7 +266,7 @@ static unsigned char* demux_ogg_read_packet(ogg_stream_t* os,ogg_packet* pack,fl
     }
   } else if (os->speex) {
     // whole packet (default)
-# ifdef HAVE_OGGTHEORA
+# ifdef CONFIG_OGGTHEORA
   } else if (os->theora) {
      /* we pass complete packets to theora, mustn't strip the header! */
      os->lastsize = 1;
@@ -292,7 +292,7 @@ static unsigned char* demux_ogg_read_packet(ogg_stream_t* os,ogg_packet* pack,fl
 	pack->granulepos = os->lastpos;
 	*pts = (double)os->lastpos / (double)os->samplerate;
      }
-#endif /* HAVE_OGGTHEORA */
+#endif /* CONFIG_OGGTHEORA */
   } else if (os->flac) {
      /* we pass complete packets to flac, mustn't strip the header! */
      if (os->flac == 2 && pack->packet[0] != 0xff)
@@ -838,7 +838,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
       mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (Speex), -aid %d\n",ogg_d->num_sub,n_audio-1);
 
       // check for Theora
-#   ifdef HAVE_OGGTHEORA
+#   ifdef CONFIG_OGGTHEORA
     } else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) {
 	int errorCode = 0;
 	theora_info inf;
@@ -884,7 +884,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
 	}
 	theora_comment_clear(&cc);
 	theora_info_clear(&inf);
-#   endif /* HAVE_OGGTHEORA */
+#   endif /* CONFIG_OGGTHEORA */
     } else if (pack.bytes >= 4 && !strncmp (&pack.packet[0], "fLaC", 4)) {
 	sh_a = new_sh_audio_aid(demuxer,ogg_d->num_sub, n_audio);
 	sh_a->format =  mmioFOURCC('f', 'L', 'a', 'C');
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 8d5eb86ab4..2b96119ca0 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -113,7 +113,7 @@ const demuxer_desc_t *const demuxer_list[] = {
 #ifdef HAVE_GIF
     &demuxer_desc_gif,
 #endif
-#ifdef HAVE_OGGVORBIS
+#ifdef CONFIG_OGGVORBIS
     &demuxer_desc_ogg,
 #endif
 #ifdef CONFIG_WIN32DLL
@@ -142,11 +142,11 @@ const demuxer_desc_t *const demuxer_list[] = {
 #ifdef MUSEPACK
     &demuxer_desc_mpc,
 #endif
-#ifdef HAVE_LIBDV095
+#ifdef CONFIG_LIBDV095
     &demuxer_desc_rawdv,
 #endif
     &demuxer_desc_aac,
-#ifdef HAVE_LIBNUT
+#ifdef CONFIG_LIBNUT
     &demuxer_desc_nut,
 #endif
 #ifdef HAVE_XMMS
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index da198f1e37..eb9503fd22 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -389,7 +389,7 @@ char* demux_info_get(demuxer_t *demuxer, const char *opt);
 int demux_info_print(demuxer_t *demuxer);
 int demux_control(demuxer_t *demuxer, int cmd, void *arg);
 
-#ifdef HAVE_OGGVORBIS
+#ifdef CONFIG_OGGVORBIS
 /* Found in demux_ogg.c */
 int demux_ogg_num_subs(demuxer_t *demuxer);
 int demux_ogg_sub_id(demuxer_t *demuxer, int index);