diff --git a/src/test_libFLAC++/Makefile.am b/src/test_libFLAC++/Makefile.am
index f43772dd..25234947 100644
--- a/src/test_libFLAC++/Makefile.am
+++ b/src/test_libFLAC++/Makefile.am
@@ -38,7 +38,9 @@ test_libFLAC___SOURCES = \
 	metadata.cpp \
 	metadata_manip.cpp \
 	metadata_object.cpp \
+	metadata_utils.c \
 	decoders.h \
 	encoders.h \
 	file_utils.h \
-	metadata.h
+	metadata.h \
+	metadata_utils.h
diff --git a/src/test_libFLAC++/Makefile.lite b/src/test_libFLAC++/Makefile.lite
index 45ffbbb2..a2a3de8f 100644
--- a/src/test_libFLAC++/Makefile.lite
+++ b/src/test_libFLAC++/Makefile.lite
@@ -24,10 +24,12 @@ topdir = ../..
 PROGRAM_NAME = test_libFLAC++
 INCLUDES     = -I$(topdir)/include
 LIBS         = -lgrabbag -lgain_analysis -lFLAC++ -lFLAC -lm
+SRCS_C = \
+	file_utils.c \
+	metadata_utils.c
 SRCS_CPP = \
 	decoders.cpp \
 	encoders.cpp \
-	file_utils.cpp \
 	main.cpp \
 	metadata.cpp \
 	metadata_manip.cpp \
diff --git a/src/test_libFLAC++/Makefile.vc b/src/test_libFLAC++/Makefile.vc
index 6273b1c6..9b097ba6 100644
--- a/src/test_libFLAC++/Makefile.vc
+++ b/src/test_libFLAC++/Makefile.vc
@@ -36,7 +36,8 @@ SUFFIXES = .cpp
 !endif
 
 C_FILES= \
-	file_utils.c
+	file_utils.c \
+	metadata_utils.c
 
 CPP_FILES= \
 	decoders.cpp \
diff --git a/src/test_libFLAC++/test_libFLAC++.dsp b/src/test_libFLAC++/test_libFLAC++.dsp
index 1bef26ec..c0eb37d5 100644
--- a/src/test_libFLAC++/test_libFLAC++.dsp
+++ b/src/test_libFLAC++/test_libFLAC++.dsp
@@ -115,6 +115,10 @@ SOURCE=.\metadata_manip.cpp
 
 SOURCE=.\metadata_object.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=.\metadata_utils.cpp
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -135,6 +139,10 @@ SOURCE=.\file_utils.h
 
 SOURCE=.\metadata.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\metadata_utils.h
+# End Source File
 # End Group
 # Begin Source File
 
diff --git a/src/test_libOggFLAC++/Makefile.am b/src/test_libOggFLAC++/Makefile.am
index dc9b91e8..48e48c18 100644
--- a/src/test_libOggFLAC++/Makefile.am
+++ b/src/test_libOggFLAC++/Makefile.am
@@ -37,6 +37,8 @@ test_libOggFLAC___SOURCES = \
 	encoders.cpp \
 	file_utils.c \
 	main.cpp \
+	metadata_utils.c \
 	decoders.h \
 	encoders.h \
-	file_utils.h
+	file_utils.h \
+	metadata_utils.h
diff --git a/src/test_libOggFLAC++/Makefile.lite b/src/test_libOggFLAC++/Makefile.lite
index 58ed8594..66f87ff4 100644
--- a/src/test_libOggFLAC++/Makefile.lite
+++ b/src/test_libOggFLAC++/Makefile.lite
@@ -25,10 +25,12 @@ PROGRAM_NAME = test_libOggFLAC++
 #@@@ TODO: conditionalize ogg lib path and -logg
 INCLUDES     = -I$(topdir)/include
 LIBS         = -lgrabbag -lgain_analysis -lOggFLAC++ -lOggFLAC -lFLAC -L$(HOME)/local/lib -logg -lm
+SRCS_C = \
+	file_utils.c \
+	metadata_utils.c
 SRCS_CPP = \
 	decoders.cpp \
 	encoders.cpp \
-	file_utils.cpp \
 	main.cpp
 
 include $(topdir)/build/exe.mk
diff --git a/src/test_libOggFLAC++/Makefile.vc b/src/test_libOggFLAC++/Makefile.vc
index 6ceb4350..c162dbb6 100644
--- a/src/test_libOggFLAC++/Makefile.vc
+++ b/src/test_libOggFLAC++/Makefile.vc
@@ -36,7 +36,8 @@ SUFFIXES = .cpp
 !endif
 
 C_FILES= \
-	file_utils.c
+	file_utils.c \
+	metadata_utils.c
 
 CPP_FILES= \
 	decoders.cpp \
diff --git a/src/test_libOggFLAC++/test_libOggFLAC++.dsp b/src/test_libOggFLAC++/test_libOggFLAC++.dsp
index 01e36c3b..90937ba8 100644
--- a/src/test_libOggFLAC++/test_libOggFLAC++.dsp
+++ b/src/test_libOggFLAC++/test_libOggFLAC++.dsp
@@ -103,6 +103,10 @@ SOURCE=.\file_utils.c
 
 SOURCE=.\main.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=.\metadata_utils.c
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -119,6 +123,10 @@ SOURCE=.\encoders.h
 
 SOURCE=.\file_utils.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\metadata_utils.h
+# End Source File
 # End Group
 # Begin Source File