Index: uspace/app/bdsh/compl.c
===================================================================
--- uspace/app/bdsh/compl.c	(revision c718bdada0e16b36b6f0f68df54a3ee343f91e49)
+++ uspace/app/bdsh/compl.c	(revision e0f47f53448ea5824cda6d06a7b34f8d2d74c41e)
@@ -69,7 +69,7 @@
 
 	/** Pointer inside list of directories */
-	const char **path;
+	const char *const *path;
 	/** If not @c NULL, should be freed in the end. */
-	const char **path_list;
+	char **path_list;
 	/** Current open directory */
 	DIR *dir;
@@ -219,5 +219,7 @@
 		cs->path_list[0] = dirname;
 		cs->path_list[1] = NULL;
-		cs->path = cs->path_list;
+		/* The second const ensures that we can't assign a const
+		 * string to the non-const array. */
+		cs->path = (const char *const *) cs->path_list;
 
 	} else if (cs->is_command) {
Index: uspace/app/edit/search_impl.h
===================================================================
--- uspace/app/edit/search_impl.h	(revision c718bdada0e16b36b6f0f68df54a3ee343f91e49)
+++ uspace/app/edit/search_impl.h	(revision e0f47f53448ea5824cda6d06a7b34f8d2d74c41e)
@@ -43,5 +43,5 @@
 	/* Note: This structure is opaque for the user. */
 
-	const wchar_t *pattern;
+	wchar_t *pattern;
 	size_t pattern_length;
 	ssize_t *back_table;
Index: uspace/app/mixerctl/mixerctl.c
===================================================================
--- uspace/app/mixerctl/mixerctl.c	(revision c718bdada0e16b36b6f0f68df54a3ee343f91e49)
+++ uspace/app/mixerctl/mixerctl.c	(revision e0f47f53448ea5824cda6d06a7b34f8d2d74c41e)
@@ -49,5 +49,5 @@
 static void print_levels(async_exch_t *exch)
 {
-	const char* name = NULL;
+	char* name = NULL;
 	unsigned count = 0;
 	errno_t ret = audio_mixer_get_info(exch, &name, &count);
@@ -59,5 +59,5 @@
 
 	for (unsigned i = 0; i < count; ++i) {
-		const char *name = NULL;
+		char *name = NULL;
 		unsigned levels = 0, current = 0;
 		errno_t ret =
Index: uspace/app/wavplay/dplay.c
===================================================================
--- uspace/app/wavplay/dplay.c	(revision c718bdada0e16b36b6f0f68df54a3ee343f91e49)
+++ uspace/app/wavplay/dplay.c	(revision e0f47f53448ea5824cda6d06a7b34f8d2d74c41e)
@@ -353,5 +353,5 @@
 	}
 
-	const char* info = NULL;
+	char* info = NULL;
 	ret = audio_pcm_get_info_str(session, &info);
 	if (ret != EOK) {
Index: uspace/app/wavplay/drec.c
===================================================================
--- uspace/app/wavplay/drec.c	(revision c718bdada0e16b36b6f0f68df54a3ee343f91e49)
+++ uspace/app/wavplay/drec.c	(revision e0f47f53448ea5824cda6d06a7b34f8d2d74c41e)
@@ -195,5 +195,5 @@
 	}
 
-	const char* info = NULL;
+	char* info = NULL;
 	ret = audio_pcm_get_info_str(session, &info);
 	if (ret != EOK) {