6 files changed, 11 insertions, 25 deletions
diff --git a/src/output/AlsaOutputPlugin.cxx b/src/output/AlsaOutputPlugin.cxx
index 4877d3a46..b5ca511b2 100644
--- a/src/output/AlsaOutputPlugin.cxx
+++ b/src/output/AlsaOutputPlugin.cxx
@@ -27,7 +27,6 @@
 #include "util/Domain.hxx"
 #include "Log.hxx"
 
-#include <glib.h>
 #include <alsa/asoundlib.h>
 
 #include <string>
@@ -118,7 +117,7 @@ struct AlsaOutput {
 	 * It contains silence samples, enough to fill one period (see
 	 * #period_frames).
 	 */
-	void *silence;
+	uint8_t *silence;
 
 	AlsaOutput():mode(0), writei(snd_pcm_writei) {
 	}
@@ -593,8 +592,8 @@ configure_hw:
 	ad->period_frames = alsa_period_size;
 	ad->period_position = 0;
 
-	ad->silence = g_malloc(snd_pcm_frames_to_bytes(ad->pcm,
-						       alsa_period_size));
+	ad->silence = new uint8_t[snd_pcm_frames_to_bytes(ad->pcm,
+							  alsa_period_size)];
 	snd_pcm_format_set_silence(format, ad->silence,
 				   alsa_period_size * channels);
 
@@ -641,7 +640,7 @@ alsa_setup_dsd(AlsaOutput *ad, const AudioFormat audio_format,
 		error.Format(alsa_output_domain,
 			     "Failed to configure DSD-over-USB on ALSA device \"%s\"",
 			     alsa_device(ad));
-		g_free(ad->silence);
+		delete[] ad->silence;
 		return false;
 	}
 
@@ -811,7 +810,7 @@ alsa_close(struct audio_output *ao)
 	AlsaOutput *ad = (AlsaOutput *)ao;
 
 	snd_pcm_close(ad->pcm);
-	g_free(ad->silence);
+	delete[] ad->silence;
 }
 
 static size_t
diff --git a/src/output/FifoOutputPlugin.cxx b/src/output/FifoOutputPlugin.cxx
index aeb9a6a87..7963d8c82 100644
--- a/src/output/FifoOutputPlugin.cxx
+++ b/src/output/FifoOutputPlugin.cxx
@@ -22,7 +22,6 @@
 #include "ConfigError.hxx"
 #include "OutputAPI.hxx"
 #include "Timer.hxx"
-#include "system/fd_util.h"
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileSystem.hxx"
 #include "util/Error.hxx"
@@ -30,10 +29,8 @@
 #include "Log.hxx"
 #include "open.h"
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <string.h>
 #include <unistd.h>
 
 #define FIFO_BUFFER_SIZE 65536 /* pipe capacity on Linux >= 2.6.11 */
diff --git a/src/output/HttpdOutputPlugin.cxx b/src/output/HttpdOutputPlugin.cxx
index 369c06937..8cbc150ad 100644
--- a/src/output/HttpdOutputPlugin.cxx
+++ b/src/output/HttpdOutputPlugin.cxx
@@ -33,8 +33,6 @@
 #include "util/Domain.hxx"
 #include "Log.hxx"
 
-#include <glib.h>
-
 #include <assert.h>
 
 #include <sys/types.h>
@@ -199,9 +197,10 @@ HttpdOutput::OnAccept(int fd, const sockaddr &address,
 
 #ifdef HAVE_LIBWRAP
 	if (address.sa_family != AF_UNIX) {
-		char *hostaddr = sockaddr_to_string(&address, address_length,
-						    IgnoreError());
-		const char *progname = g_get_prgname();
+		const auto hostaddr = sockaddr_to_string(&address,
+							 address_length);
+		// TODO: shall we obtain the program name from argv[0]?
+		const char *progname = "mpd";
 
 		struct request_info req;
 		request_init(&req, RQ_FILE, fd, RQ_DAEMON, progname, 0);
@@ -212,13 +211,10 @@ HttpdOutput::OnAccept(int fd, const sockaddr &address,
 			/* tcp wrappers says no */
 			FormatWarning(httpd_output_domain,
 				      "libwrap refused connection (libwrap=%s) from %s",
-				      progname, hostaddr);
-			g_free(hostaddr);
+				      progname, hostaddr.c_str());
 			close_socket(fd);
 			return;
 		}
-
-		g_free(hostaddr);
 	}
 #else
 	(void)address;
diff --git a/src/output/JackOutputPlugin.cxx b/src/output/JackOutputPlugin.cxx
index 7ed672f95..ef06b5abf 100644
--- a/src/output/JackOutputPlugin.cxx
+++ b/src/output/JackOutputPlugin.cxx
@@ -34,10 +34,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <errno.h>
 
 enum {
 	MAX_PORTS = 16,
diff --git a/src/output/NullOutputPlugin.cxx b/src/output/NullOutputPlugin.cxx
index e2eec9dbc..a901b7d2a 100644
--- a/src/output/NullOutputPlugin.cxx
+++ b/src/output/NullOutputPlugin.cxx
@@ -22,8 +22,6 @@
 #include "OutputAPI.hxx"
 #include "Timer.hxx"
 
-#include <assert.h>
-
 struct NullOutput {
 	struct audio_output base;
 
diff --git a/src/output/PulseOutputPlugin.hxx b/src/output/PulseOutputPlugin.hxx
index 0ed8404bc..69d6c5f99 100644
--- a/src/output/PulseOutputPlugin.hxx
+++ b/src/output/PulseOutputPlugin.hxx
@@ -41,6 +41,6 @@ pulse_output_clear_mixer(PulseOutput *po, PulseMixer *pm);
 
 bool
 pulse_output_set_volume(PulseOutput *po,
-			const struct pa_cvolume *volume, Error &error);
+			const pa_cvolume *volume, Error &error);
 
 #endif