diff --git a/libavformat/aiff.c b/libavformat/aiff.c
index 079e8b930d..41153553cf 100644
--- a/libavformat/aiff.c
+++ b/libavformat/aiff.c
@@ -166,7 +166,7 @@ static unsigned int get_aiff_header(ByteIOContext *pb, AVCodecContext *codec,
     return num_frames;
 }
 
-#ifdef CONFIG_MUXERS
+#ifdef CONFIG_AIFF_MUXER
 typedef struct {
     offset_t form;
     offset_t frames;
@@ -289,7 +289,7 @@ static int aiff_write_trailer(AVFormatContext *s)
 
     return 0;
 }
-#endif //CONFIG_MUXERS
+#endif /* CONFIG_AIFF_MUXER */
 
 static int aiff_probe(AVProbeData *p)
 {
diff --git a/libavformat/amr.c b/libavformat/amr.c
index edf8f8d7d0..1f623512dc 100644
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -30,7 +30,7 @@ Only mono files are supported.
 static const char AMR_header [] = "#!AMR\n";
 static const char AMRWB_header [] = "#!AMR-WB\n";
 
-#ifdef CONFIG_MUXERS
+#ifdef CONFIG_AMR_MUXER
 static int amr_write_header(AVFormatContext *s)
 {
     ByteIOContext *pb = s->pb;
@@ -60,7 +60,7 @@ static int amr_write_packet(AVFormatContext *s, AVPacket *pkt)
     put_flush_packet(s->pb);
     return 0;
 }
-#endif /* CONFIG_MUXERS */
+#endif /* CONFIG_AMR_MUXER */
 
 static int amr_probe(AVProbeData *p)
 {
diff --git a/libavformat/au.c b/libavformat/au.c
index 2fb5fa002c..3dfd31e761 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -47,7 +47,7 @@ static const AVCodecTag codec_au_tags[] = {
     { 0, 0 },
 };
 
-#ifdef CONFIG_MUXERS
+#ifdef CONFIG_AU_MUXER
 /* AUDIO_FILE header */
 static int put_au_header(ByteIOContext *pb, AVCodecContext *enc)
 {
@@ -103,7 +103,7 @@ static int au_write_trailer(AVFormatContext *s)
 
     return 0;
 }
-#endif //CONFIG_MUXERS
+#endif /* CONFIG_AU_MUXER */
 
 static int au_probe(AVProbeData *p)
 {
diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c
index 6d495e3998..7edd7a842b 100644
--- a/libavformat/dvenc.c
+++ b/libavformat/dvenc.c
@@ -359,7 +359,7 @@ void dv_delete_mux(DVMuxContext *c)
         av_fifo_free(&c->audio_data[i]);
 }
 
-#ifdef CONFIG_MUXERS
+#ifdef CONFIG_DV_MUXER
 static int dv_write_header(AVFormatContext *s)
 {
     if (!dv_init_mux(s)) {
@@ -397,9 +397,7 @@ static int dv_write_trailer(struct AVFormatContext *s)
     dv_delete_mux(s->priv_data);
     return 0;
 }
-#endif /* CONFIG_MUXERS */
 
-#ifdef CONFIG_DV_MUXER
 AVOutputFormat dv_muxer = {
     "dv",
     NULL_IF_CONFIG_SMALL("DV video format"),
@@ -412,4 +410,4 @@ AVOutputFormat dv_muxer = {
     dv_write_packet,
     dv_write_trailer,
 };
-#endif
+#endif /* CONFIG_DV_MUXER */
diff --git a/libavformat/img2.c b/libavformat/img2.c
index d3b7200ae9..c146d8a67a 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -303,7 +303,7 @@ static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
     }
 }
 
-#ifdef CONFIG_MUXERS
+#if defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER)
 /******************************************************/
 /* image output */
 
@@ -368,7 +368,7 @@ static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-#endif /* CONFIG_MUXERS */
+#endif /* defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER) */
 
 /* input */
 #ifdef CONFIG_IMAGE2_DEMUXER
diff --git a/libavformat/libnut.c b/libavformat/libnut.c
index 9a7a1b4505..399ef9cbb5 100644
--- a/libavformat/libnut.c
+++ b/libavformat/libnut.c
@@ -44,7 +44,7 @@ static const AVCodecTag nut_tags[] = {
     { 0, 0 },
 };
 
-#ifdef CONFIG_MUXERS
+#ifdef CONFIG_LIBNUT_MUXER
 static int av_write(void * h, size_t len, const uint8_t * buf) {
     ByteIOContext * bc = h;
     put_buffer(bc, buf, len);
@@ -163,7 +163,7 @@ AVOutputFormat libnut_muxer = {
     nut_write_trailer,
     .flags = AVFMT_GLOBALHEADER,
 };
-#endif //CONFIG_MUXERS
+#endif /* CONFIG_LIBNUT_MUXER */
 
 static int nut_probe(AVProbeData *p) {
     if (!memcmp(p->buf, ID_STRING, ID_LENGTH)) return AVPROBE_SCORE_MAX;
diff --git a/libavformat/mmf.c b/libavformat/mmf.c
index 04bf871fa5..d23df63454 100644
--- a/libavformat/mmf.c
+++ b/libavformat/mmf.c
@@ -36,7 +36,7 @@ static int mmf_rate(int code)
     return mmf_rates[code];
 }
 
-#ifdef CONFIG_MUXERS
+#ifdef CONFIG_MMF_MUXER
 static int mmf_rate_code(int rate)
 {
     int i;
@@ -163,7 +163,7 @@ static int mmf_write_trailer(AVFormatContext *s)
     }
     return 0;
 }
-#endif //CONFIG_MUXERS
+#endif /* CONFIG_MMF_MUXER */
 
 static int mmf_probe(AVProbeData *p)
 {
diff --git a/libavformat/mp3.c b/libavformat/mp3.c
index ae63d6c341..efe494402b 100644
--- a/libavformat/mp3.c
+++ b/libavformat/mp3.c
@@ -521,7 +521,7 @@ static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt)
     return ret;
 }
 
-#ifdef CONFIG_MUXERS
+#if defined(CONFIG_MP2_MUXER) || defined(CONFIG_MP3_MUXER)
 static void id3v1_create_tag(AVFormatContext *s, uint8_t *buf)
 {
     int v, i;
@@ -639,7 +639,7 @@ static int mp3_write_trailer(struct AVFormatContext *s)
     }
     return 0;
 }
-#endif //CONFIG_MUXERS
+#endif /* defined(CONFIG_MP2_MUXER) || defined(CONFIG_MP3_MUXER) */
 
 #ifdef CONFIG_MP3_DEMUXER
 AVInputFormat mp3_demuxer = {
diff --git a/libavformat/wav.c b/libavformat/wav.c
index de88b46d55..bc6e31edc7 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -30,7 +30,7 @@ typedef struct {
     int last_duration;
 } WAVContext;
 
-#ifdef CONFIG_MUXERS
+#ifdef CONFIG_WAV_MUXER
 static int wav_write_header(AVFormatContext *s)
 {
     WAVContext *wav = s->priv_data;
@@ -113,7 +113,7 @@ static int wav_write_trailer(AVFormatContext *s)
     }
     return 0;
 }
-#endif //CONFIG_MUXERS
+#endif /* CONFIG_WAV_MUXER */
 
 /* return the size of the found tag */
 /* XXX: > 2GB ? */