diff --git a/src/libFLAC/stream_encoder_framing.c b/src/libFLAC/stream_encoder_framing.c
index 95a701de..d7bd363c 100644
--- a/src/libFLAC/stream_encoder_framing.c
+++ b/src/libFLAC/stream_encoder_framing.c
@@ -107,7 +107,7 @@ FLAC__bool FLAC__add_metadata_block(const FLAC__StreamMetadata *metadata, FLAC__
 		case FLAC__METADATA_TYPE_VORBIS_COMMENT:
 			if(!FLAC__bitbuffer_write_raw_uint32_little_endian(bb, vendor_string_length))
 				return false;
-			if(!FLAC__bitbuffer_write_byte_block(bb, FLAC__VENDOR_STRING, vendor_string_length))
+			if(!FLAC__bitbuffer_write_byte_block(bb, (const FLAC__byte*)FLAC__VENDOR_STRING, vendor_string_length))
 				return false;
 			if(!FLAC__bitbuffer_write_raw_uint32_little_endian(bb, metadata->data.vorbis_comment.num_comments))
 				return false;
diff --git a/src/test_libFLAC++/decoders.cc b/src/test_libFLAC++/decoders.cc
index 48876bea..c19cc25f 100644
--- a/src/test_libFLAC++/decoders.cc
+++ b/src/test_libFLAC++/decoders.cc
@@ -104,7 +104,7 @@ static void init_metadata_blocks_()
 	application2_.data.application.data = 0;
 
 	{
-		const unsigned vendor_string_length = (unsigned)strlen((const char *)FLAC__VENDOR_STRING);
+		const unsigned vendor_string_length = (unsigned)strlen(FLAC__VENDOR_STRING);
 		vorbiscomment_.is_last = true;
 		vorbiscomment_.type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
 		vorbiscomment_.length = (4 + vendor_string_length) + 4 + (4 + 5) + (4 + 0);
diff --git a/src/test_libFLAC++/metadata_manip.cc b/src/test_libFLAC++/metadata_manip.cc
index 47fb1b9f..167f1b3b 100644
--- a/src/test_libFLAC++/metadata_manip.cc
+++ b/src/test_libFLAC++/metadata_manip.cc
@@ -286,7 +286,7 @@ static bool generate_file_()
 	memset(streaminfo.data.stream_info.md5sum, 0, 16);
 
 	{
-		const unsigned vendor_string_length = (unsigned)strlen((const char*)FLAC__VENDOR_STRING);
+		const unsigned vendor_string_length = (unsigned)strlen(FLAC__VENDOR_STRING);
 		vorbiscomment.is_last = false;
 		vorbiscomment.type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
 		vorbiscomment.length = (4 + vendor_string_length) + 4;
diff --git a/src/test_libOggFLAC++/decoders.cc b/src/test_libOggFLAC++/decoders.cc
index ea7a46bf..da11bfdb 100644
--- a/src/test_libOggFLAC++/decoders.cc
+++ b/src/test_libOggFLAC++/decoders.cc
@@ -104,7 +104,7 @@ static void init_metadata_blocks_()
 	application2_.data.application.data = 0;
 
 	{
-		const unsigned vendor_string_length = (unsigned)strlen((const char *)FLAC__VENDOR_STRING);
+		const unsigned vendor_string_length = (unsigned)strlen(FLAC__VENDOR_STRING);
 		vorbiscomment_.is_last = true;
 		vorbiscomment_.type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
 		vorbiscomment_.length = (4 + vendor_string_length) + 4 + (4 + 5) + (4 + 0);