examples/cpp/encode/file/main.cpp | 2 ++
 src/metaflac/options.h            | 2 +-
 src/plugin_xmms/Makefile.am       | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/examples/cpp/encode/file/main.cpp b/examples/cpp/encode/file/main.cpp
index d7fc0eb..97aa85e 100644
--- a/examples/cpp/encode/file/main.cpp
+++ b/examples/cpp/encode/file/main.cpp
@@ -39,6 +39,8 @@
 
 #include <cstring>
 
+#include <cstring>
+
 class OurEncoder: public FLAC::Encoder::File {
 public:
 	OurEncoder(): FLAC::Encoder::File() { }
diff --git a/src/metaflac/options.h b/src/metaflac/options.h
index 7187e65..4be722a 100644
--- a/src/metaflac/options.h
+++ b/src/metaflac/options.h
@@ -119,7 +119,7 @@ typedef struct {
 
 typedef struct {
 	FLAC__MetadataType type;
-	char application_id[4]; /* only relevant if type == FLAC__STREAM_METADATA_TYPE_APPLICATION */
+	char application_id[5]; /* only relevant if type == FLAC__STREAM_METADATA_TYPE_APPLICATION */
 	FLAC__bool filter_application_by_id;
 } Argument_BlockTypeEntry;
 
diff --git a/src/plugin_xmms/Makefile.am b/src/plugin_xmms/Makefile.am
index e80b66a..e44bf2b 100644
--- a/src/plugin_xmms/Makefile.am
+++ b/src/plugin_xmms/Makefile.am
@@ -62,5 +62,6 @@ libxmms_flac_la_LIBADD = \
 	$(top_builddir)/src/libFLAC/libFLAC.la \
 	-L$(top_builddir)/src/libFLAC/.libs \
 	@XMMS_LIBS@ \
+	-lgtk -lgdk -lglib -lm -lpthread \
 	@LIBICONV@
 libxmms_flac_la_LDFLAGS = -module -avoid-version