6 files changed, 28 insertions, 30 deletions
diff --git a/src/decoder/DecoderList.cxx b/src/decoder/DecoderList.cxx
index 0a31d9eac..7f665fb88 100644
--- a/src/decoder/DecoderList.cxx
+++ b/src/decoder/DecoderList.cxx
@@ -49,10 +49,10 @@
 #include <string.h>
 
 const struct DecoderPlugin *const decoder_plugins[] = {
-#ifdef HAVE_MAD
+#ifdef ENABLE_MAD
 	&mad_decoder_plugin,
 #endif
-#ifdef HAVE_MPG123
+#ifdef ENABLE_MPG123
 	&mpg123_decoder_plugin,
 #endif
 #ifdef HAVE_MP4V2
@@ -61,19 +61,17 @@ const struct DecoderPlugin *const decoder_plugins[] = {
 #ifdef ENABLE_VORBIS_DECODER
 	&vorbis_decoder_plugin,
 #endif
-#if defined(HAVE_FLAC)
+#ifdef ENABLE_FLAC
 	&oggflac_decoder_plugin,
-#endif
-#ifdef HAVE_FLAC
 	&flac_decoder_plugin,
 #endif
-#ifdef HAVE_OPUS
+#ifdef ENABLE_OPUS
 	&opus_decoder_plugin,
 #endif
 #ifdef ENABLE_SNDFILE
 	&sndfile_decoder_plugin,
 #endif
-#ifdef HAVE_AUDIOFILE
+#ifdef ENABLE_AUDIOFILE
 	&audiofile_decoder_plugin,
 #endif
 #ifdef ENABLE_DSD
@@ -86,10 +84,10 @@ const struct DecoderPlugin *const decoder_plugins[] = {
 #ifdef HAVE_MPCDEC
 	&mpcdec_decoder_plugin,
 #endif
-#ifdef HAVE_WAVPACK
+#ifdef ENABLE_WAVPACK
 	&wavpack_decoder_plugin,
 #endif
-#ifdef HAVE_MODPLUG
+#ifdef ENABLE_MODPLUG
 	&modplug_decoder_plugin,
 #endif
 #ifdef ENABLE_MIKMOD_DECODER
@@ -104,10 +102,10 @@ const struct DecoderPlugin *const decoder_plugins[] = {
 #ifdef ENABLE_FLUIDSYNTH
 	&fluidsynth_decoder_plugin,
 #endif
-#ifdef HAVE_ADPLUG
+#ifdef ENABLE_ADPLUG
 	&adplug_decoder_plugin,
 #endif
-#ifdef HAVE_FFMPEG
+#ifdef ENABLE_FFMPEG
 	&ffmpeg_decoder_plugin,
 #endif
 #ifdef HAVE_GME
diff --git a/src/decoder/plugins/DsdLib.cxx b/src/decoder/plugins/DsdLib.cxx
index 8892ed387..13f6bc846 100644
--- a/src/decoder/plugins/DsdLib.cxx
+++ b/src/decoder/plugins/DsdLib.cxx
@@ -32,7 +32,7 @@
 
 #include <string.h>
 
-#ifdef HAVE_ID3TAG
+#ifdef ENABLE_ID3TAG
 #include <id3tag.h>
 #endif
 
@@ -101,7 +101,7 @@ dsdlib_valid_freq(uint32_t samplefreq)
 	}
 }
 
-#ifdef HAVE_ID3TAG
+#ifdef ENABLE_ID3TAG
 void
 dsdlib_tag_id3(InputStream &is,
 	       const struct tag_handler *handler,
diff --git a/src/decoder/plugins/DsdiffDecoderPlugin.cxx b/src/decoder/plugins/DsdiffDecoderPlugin.cxx
index b6c79e11e..33f433330 100644
--- a/src/decoder/plugins/DsdiffDecoderPlugin.cxx
+++ b/src/decoder/plugins/DsdiffDecoderPlugin.cxx
@@ -244,7 +244,7 @@ dsdiff_read_metadata_extra(Decoder *decoder, InputStream &is,
 	/** offset for title tag */
 	offset_type title_offset = 0;
 
-#ifdef HAVE_ID3TAG
+#ifdef ENABLE_ID3TAG
 	offset_type id3_offset = 0;
 #endif
 
@@ -269,7 +269,7 @@ dsdiff_read_metadata_extra(Decoder *decoder, InputStream &is,
 			chunk_size = chunk_header->GetSize();
 			title_offset = is.GetOffset();
 		}
-#ifdef HAVE_ID3TAG
+#ifdef ENABLE_ID3TAG
 		/* 'ID3 ' chunk, offspec. Used by sacdextract */
 		if (chunk_header->id.Equals("ID3 ")) {
 			chunk_size = chunk_header->GetSize();
@@ -283,7 +283,7 @@ dsdiff_read_metadata_extra(Decoder *decoder, InputStream &is,
 
 	/* done processing chunk headers, process tags if any */
 
-#ifdef HAVE_ID3TAG
+#ifdef ENABLE_ID3TAG
 	if (id3_offset != 0) {
 		/* a ID3 tag has preference over the other tags, do not process
 		   other tags if we have one */
diff --git a/src/decoder/plugins/DsfDecoderPlugin.cxx b/src/decoder/plugins/DsfDecoderPlugin.cxx
index 690616d15..b8ae837f7 100644
--- a/src/decoder/plugins/DsfDecoderPlugin.cxx
+++ b/src/decoder/plugins/DsfDecoderPlugin.cxx
@@ -47,7 +47,7 @@ struct DsfMetaData {
 	unsigned sample_rate, channels;
 	bool bitreverse;
 	offset_type n_blocks;
-#ifdef HAVE_ID3TAG
+#ifdef ENABLE_ID3TAG
 	offset_type id3_offset;
 #endif
 };
@@ -111,7 +111,7 @@ dsf_read_metadata(Decoder *decoder, InputStream &is,
 	if (sizeof(dsf_header) != chunk_size)
 		return false;
 
-#ifdef HAVE_ID3TAG
+#ifdef ENABLE_ID3TAG
 	const offset_type metadata_offset = dsf_header.pmeta.Read();
 #endif
 
@@ -174,7 +174,7 @@ dsf_read_metadata(Decoder *decoder, InputStream &is,
 	metadata->n_blocks = data_size / block_size;
 	metadata->channels = channels;
 	metadata->sample_rate = samplefreq;
-#ifdef HAVE_ID3TAG
+#ifdef ENABLE_ID3TAG
 	metadata->id3_offset = metadata_offset;
 #endif
 	/* check bits per sample format, determine if bitreverse is needed */
@@ -352,7 +352,7 @@ dsf_scan_stream(InputStream &is,
 						      audio_format.sample_rate);
 	tag_handler_invoke_duration(handler, handler_ctx, songtime);
 
-#ifdef HAVE_ID3TAG
+#ifdef ENABLE_ID3TAG
 	/* Add available tags from the ID3 tag */
 	dsdlib_tag_id3(is, handler, handler_ctx, metadata.id3_offset);
 #endif
diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx
index de6c9b127..62f31974f 100644
--- a/src/decoder/plugins/MadDecoderPlugin.cxx
+++ b/src/decoder/plugins/MadDecoderPlugin.cxx
@@ -36,7 +36,7 @@
 
 #include <mad.h>
 
-#ifdef HAVE_ID3TAG
+#ifdef ENABLE_ID3TAG
 #include <id3tag.h>
 #endif
 
@@ -251,7 +251,7 @@ MadDecoder::FillBuffer()
 	return true;
 }
 
-#ifdef HAVE_ID3TAG
+#ifdef ENABLE_ID3TAG
 static bool
 parse_id3_replay_gain_info(ReplayGainInfo &rgi,
 			   struct id3_tag *tag)
@@ -285,7 +285,7 @@ parse_id3_replay_gain_info(ReplayGainInfo &rgi,
 }
 #endif
 
-#ifdef HAVE_ID3TAG
+#ifdef ENABLE_ID3TAG
 gcc_pure
 static MixRampInfo
 parse_id3_mixramp(struct id3_tag *tag)
@@ -317,7 +317,7 @@ parse_id3_mixramp(struct id3_tag *tag)
 inline void
 MadDecoder::ParseId3(size_t tagsize, Tag **mpd_tag)
 {
-#ifdef HAVE_ID3TAG
+#ifdef ENABLE_ID3TAG
 	id3_byte_t *allocated = nullptr;
 
 	const id3_length_t count = stream.bufend - stream.this_frame;
@@ -369,7 +369,7 @@ MadDecoder::ParseId3(size_t tagsize, Tag **mpd_tag)
 	id3_tag_delete(id3_tag);
 
 	delete[] allocated;
-#else /* !HAVE_ID3TAG */
+#else /* !ENABLE_ID3TAG */
 	(void)mpd_tag;
 
 	/* This code is enabled when libid3tag is disabled.  Instead
@@ -386,7 +386,7 @@ MadDecoder::ParseId3(size_t tagsize, Tag **mpd_tag)
 #endif
 }
 
-#ifndef HAVE_ID3TAG
+#ifndef ENABLE_ID3TAG
 /**
  * This function emulates libid3tag when it is disabled.  Instead of
  * doing a real analyzation of the frame, it just checks whether the
@@ -402,7 +402,7 @@ id3_tag_query(const void *p0, size_t length)
 		? (p[8] << 7) + p[9] + 10
 		: 0;
 }
-#endif /* !HAVE_ID3TAG */
+#endif /* !ENABLE_ID3TAG */
 
 static enum mp3_action
 RecoverFrameError(struct mad_stream &stream)
diff --git a/src/decoder/plugins/WavpackDecoderPlugin.cxx b/src/decoder/plugins/WavpackDecoderPlugin.cxx
index 67859bbd2..0b41d052e 100644
--- a/src/decoder/plugins/WavpackDecoderPlugin.cxx
+++ b/src/decoder/plugins/WavpackDecoderPlugin.cxx
@@ -28,10 +28,10 @@
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "util/Macros.hxx"
+#include "util/Alloc.hxx"
 #include "Log.hxx"
 
 #include <wavpack/wavpack.h>
-#include <glib.h>
 
 #include <assert.h>
 #include <stdio.h>
@@ -484,10 +484,10 @@ wavpack_open_wvc(Decoder &decoder, const char *uri)
 	if (uri == nullptr)
 		return nullptr;
 
-	char *wvc_url = g_strconcat(uri, "c", nullptr);
+	char *wvc_url = xstrcatdup(uri, "c");
 
 	InputStream *is_wvc = decoder_open_uri(decoder, uri, IgnoreError());
-	g_free(wvc_url);
+	free(wvc_url);
 
 	if (is_wvc == nullptr)
 		return nullptr;