diff --git a/src/plugin_common/Makefile.am b/src/plugin_common/Makefile.am
index bd9256ba..4e927810 100644
--- a/src/plugin_common/Makefile.am
+++ b/src/plugin_common/Makefile.am
@@ -12,14 +12,16 @@ noinst_HEADERS = \
 	charset.h \
 	dither.h \
 	id3v1.h \
-	id3v2.h
+	id3v2.h \
+	vorbiscomment.h
 
 libplugin_common_a_SOURCES = \
 	canonical_tag.c \
 	charset.c \
 	dither.c \
 	id3v1.c \
-	id3v2.c
+	id3v2.c \
+	vorbiscomment.c
 
 EXTRA_DIST = \
 	Makefile.lite \
diff --git a/src/plugin_common/Makefile.lite b/src/plugin_common/Makefile.lite
index efc2d638..ec12e5cf 100644
--- a/src/plugin_common/Makefile.lite
+++ b/src/plugin_common/Makefile.lite
@@ -11,7 +11,8 @@ OBJS = \
 	charset.o \
 	dither.o \
 	id3v1.o \
-	id3v2.o
+	id3v2.o \
+	vorbiscomment.o
 
 include ../../build/lib.mk
 
diff --git a/src/plugin_common/Makefile.vc b/src/plugin_common/Makefile.vc
index c3d9b2bb..22060131 100644
--- a/src/plugin_common/Makefile.vc
+++ b/src/plugin_common/Makefile.vc
@@ -13,7 +13,8 @@ C_FILES= \
 	charset.c \
 	dither.c \
 	id3v1.c \
-	id3v2.c
+	id3v2.c \
+	vorbiscomment.c
 
 OBJS= $(C_FILES:.c=.obj)
 
diff --git a/src/plugin_common/all.h b/src/plugin_common/all.h
index def39c08..6a339ee6 100644
--- a/src/plugin_common/all.h
+++ b/src/plugin_common/all.h
@@ -25,5 +25,6 @@
 #include "id3v1.h"
 #include "id3v2.h"
 #include "locale_hack.h"
+#include "vorbiscomment.h"
 
 #endif