3 files changed, 3 insertions, 8 deletions
diff --git a/src/input/plugins/CdioParanoiaInputPlugin.cxx b/src/input/plugins/CdioParanoiaInputPlugin.cxx
index f847b35c1..2b45a34aa 100644
--- a/src/input/plugins/CdioParanoiaInputPlugin.cxx
+++ b/src/input/plugins/CdioParanoiaInputPlugin.cxx
@@ -39,7 +39,6 @@
 #include <stddef.h>
 #include <string.h>
 #include <stdlib.h>
-#include <glib.h>
 #include <assert.h>
 
 #ifdef HAVE_CDIO_PARANOIA_PARANOIA_H
@@ -149,7 +148,7 @@ parse_cdio_uri(struct cdio_uri *dest, const char *src, Error &error)
 	const char *slash = strrchr(src, '/');
 	if (slash == nullptr) {
 		/* play the whole CD in the specified drive */
-		g_strlcpy(dest->device, src, sizeof(dest->device));
+		CopyString(dest->device, src, sizeof(dest->device));
 		dest->track = -1;
 		return true;
 	}
diff --git a/src/input/plugins/FfmpegInputPlugin.cxx b/src/input/plugins/FfmpegInputPlugin.cxx
index 669f8d403..701beb313 100644
--- a/src/input/plugins/FfmpegInputPlugin.cxx
+++ b/src/input/plugins/FfmpegInputPlugin.cxx
@@ -22,6 +22,7 @@
 
 #include "config.h"
 #include "FfmpegInputPlugin.hxx"
+#include "lib/ffmpeg/Init.hxx"
 #include "lib/ffmpeg/Domain.hxx"
 #include "lib/ffmpeg/Error.hxx"
 #include "../InputStream.hxx"
@@ -31,7 +32,6 @@
 
 extern "C" {
 #include <libavformat/avio.h>
-#include <libavformat/avformat.h>
 }
 
 struct FfmpegInputStream final : public InputStream {
@@ -75,7 +75,7 @@ static InputPlugin::InitResult
 input_ffmpeg_init(gcc_unused const config_param &param,
 		  Error &error)
 {
-	av_register_all();
+	FfmpegInit();
 
 	/* disable this plugin if there's no registered protocol */
 	if (!input_ffmpeg_supported()) {
diff --git a/src/input/plugins/NfsInputPlugin.cxx b/src/input/plugins/NfsInputPlugin.cxx
index c6c0970b9..c1f7a48ce 100644
--- a/src/input/plugins/NfsInputPlugin.cxx
+++ b/src/input/plugins/NfsInputPlugin.cxx
@@ -28,10 +28,6 @@
 #include "util/StringUtil.hxx"
 #include "util/Error.hxx"
 
-extern "C" {
-#include <nfsc/libnfs.h>
-}
-
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>