diff --git a/src/flac/main.c b/src/flac/main.c
index f45488d180..62f8d26199 100644
--- a/src/flac/main.c
+++ b/src/flac/main.c
@@ -1132,7 +1132,7 @@ int parse_option(int short_option, const char *long_option, const char *option_a
 			case 'r':
 				{
 					uint32_t i;
-					char * p;
+					const char * p;
 					FLAC__ASSERT(0 != option_argument);
 					p = strchr(option_argument, ',');
 					if(0 == p) {
diff --git a/src/flac/utils.c b/src/flac/utils.c
index a1ce79d201..8b6e3abd7b 100644
--- a/src/flac/utils.c
+++ b/src/flac/utils.c
@@ -475,7 +475,7 @@ FLAC__bool flac__utils_get_channel_mask_tag(const FLAC__StreamMetadata *object,
 {
 	int offset;
 	uint32_t val;
-	char *p;
+	const char *p;
 	FLAC__ASSERT(object);
 	FLAC__ASSERT(object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT);
 	if(0 > (offset = FLAC__metadata_object_vorbiscomment_find_entry_from(object, /*offset=*/0, CHANNEL_MASK_TAG)))
diff --git a/src/share/getopt/getopt.c b/src/share/getopt/getopt.c
index 509c91dd8f..1dd751668a 100644
--- a/src/share/getopt/getopt.c
+++ b/src/share/getopt/getopt.c
@@ -778,7 +778,7 @@ share___getopt_internal (
 
   {
     char c = *nextchar++;
-    char *temp = my_index (optstring, c);
+    const char *temp = my_index (optstring, c);
 
     /* Increment `share__optind' when we start to process its last character.  */
     if (*nextchar == '\0')