Index: uspace/app/bdsh/cmds/builtin_cmds.c
===================================================================
--- uspace/app/bdsh/cmds/builtin_cmds.c	(revision 552823e1d25affb3bd94ac1424382bfcf05e3c39)
+++ uspace/app/bdsh/cmds/builtin_cmds.c	(revision 7afb4a53710d7b78f26a51c1825abc447de3ea5b)
@@ -50,5 +50,5 @@
 
 	for (cmd = builtins; cmd->name != NULL; cmd++, i++) {
-		if (!strcmp(cmd->name, command))
+		if (!str_cmp(cmd->name, command))
 			return i;
 	}
@@ -65,5 +65,5 @@
 
 	for(i=0; builtin_aliases[i] != NULL; i+=2) {
-		if (!strcmp(builtin_aliases[i], command))
+		if (!str_cmp(builtin_aliases[i], command))
 			return 1;
 	}
@@ -80,5 +80,5 @@
 
 	for(i=0; builtin_aliases[i] != NULL; i++) {
-		if (!strcmp(builtin_aliases[i], command))
+		if (!str_cmp(builtin_aliases[i], command))
 			return (char *)builtin_aliases[++i];
 		i++;
Index: uspace/app/bdsh/cmds/mod_cmds.c
===================================================================
--- uspace/app/bdsh/cmds/mod_cmds.c	(revision 552823e1d25affb3bd94ac1424382bfcf05e3c39)
+++ uspace/app/bdsh/cmds/mod_cmds.c	(revision 7afb4a53710d7b78f26a51c1825abc447de3ea5b)
@@ -65,5 +65,5 @@
 
 	for (mod = modules; mod->name != NULL; mod++, i++) {
-		if (!strcmp(mod->name, command))
+		if (!str_cmp(mod->name, command))
 			return i;
 	}
@@ -82,5 +82,5 @@
 
 	for(i=0; mod_aliases[i] != NULL; i+=2) {
-		if (!strcmp(mod_aliases[i], command))
+		if (!str_cmp(mod_aliases[i], command))
 			return 1;
 	}
@@ -98,5 +98,5 @@
 
 	for(i=0; mod_aliases[i] != NULL; i++) {
-		if (!strcmp(mod_aliases[i], command))
+		if (!str_cmp(mod_aliases[i], command))
 			return (char *)mod_aliases[++i];
 		i++;
Index: uspace/app/bdsh/cmds/modules/help/help.c
===================================================================
--- uspace/app/bdsh/cmds/modules/help/help.c	(revision 552823e1d25affb3bd94ac1424382bfcf05e3c39)
+++ uspace/app/bdsh/cmds/modules/help/help.c	(revision 7afb4a53710d7b78f26a51c1825abc447de3ea5b)
@@ -108,5 +108,5 @@
 
 	if (argc == 3) {
-		if (!strcmp("extended", argv[2]))
+		if (!str_cmp("extended", argv[2]))
 			level = HELP_LONG;
 		else
Index: uspace/app/bdsh/cmds/modules/mkdir/mkdir.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision 552823e1d25affb3bd94ac1424382bfcf05e3c39)
+++ uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision 7afb4a53710d7b78f26a51c1825abc447de3ea5b)
@@ -150,5 +150,5 @@
 		/* Sometimes make or scripts conjoin odd paths. Account for something
 		 * like this: ../../foo/bar/../foo/foofoo/./bar */
-		if (!strcmp(dirs[i], "..") || !strcmp(dirs[i], ".")) {
+		if (!str_cmp(dirs[i], "..") || !str_cmp(dirs[i], ".")) {
 			if (0 != (chdir(dirs[i]))) {
 				cli_error(CL_EFAIL, "%s: impossible path: %s",
Index: uspace/app/bdsh/cmds/modules/rm/rm.c
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm.c	(revision 552823e1d25affb3bd94ac1424382bfcf05e3c39)
+++ uspace/app/bdsh/cmds/modules/rm/rm.c	(revision 7afb4a53710d7b78f26a51c1825abc447de3ea5b)
@@ -217,5 +217,5 @@
 	i = optind;
 	while (NULL != argv[i]) {
-		len = strlen(argv[i]) + 2;
+		len = str_size(argv[i]) + 2;
 		buff = (char *) realloc(buff, len);
 		if (buff == NULL) {
Index: uspace/app/bdsh/exec.c
===================================================================
--- uspace/app/bdsh/exec.c	(revision 552823e1d25affb3bd94ac1424382bfcf05e3c39)
+++ uspace/app/bdsh/exec.c	(revision 7afb4a53710d7b78f26a51c1825abc447de3ea5b)
@@ -72,5 +72,5 @@
 	char *path[PATH_MAX];
 	int n = 0, i = 0;
-	size_t x = strlen(cmd) + 2;
+	size_t x = str_size(cmd) + 2;
 
 	found = (char *)malloc(PATH_MAX);
@@ -86,5 +86,5 @@
 	path[n] = strtok(path_tok, PATH_DELIM);
 	while (NULL != path[n]) {
-		if ((strlen(path[n]) + x ) > PATH_MAX) {
+		if ((str_size(path[n]) + x ) > PATH_MAX) {
 			cli_error(CL_ENOTSUP,
 				"Segment %d of path is too large, search ends at segment %d",
Index: uspace/app/bdsh/input.c
===================================================================
--- uspace/app/bdsh/input.c	(revision 552823e1d25affb3bd94ac1424382bfcf05e3c39)
+++ uspace/app/bdsh/input.c	(revision 7afb4a53710d7b78f26a51c1825abc447de3ea5b)
@@ -147,5 +147,4 @@
 {
 	char line[INPUT_MAX];
-	size_t len = 0;
 
 	console_set_style(STYLE_EMPHASIS);
@@ -154,7 +153,6 @@
 
 	read_line(line, INPUT_MAX);
-	len = strlen(line);
 	/* Make sure we don't have rubbish or a C/R happy user */
-	if (len == 0 || line[0] == '\n')
+	if (str_cmp(line, "") == 0 || str_cmp(line, "\n") == 0)
 		return;
 	usr->line = strdup(line);
Index: uspace/app/tester/devmap/devmap1.c
===================================================================
--- uspace/app/tester/devmap/devmap1.c	(revision 552823e1d25affb3bd94ac1424382bfcf05e3c39)
+++ uspace/app/tester/devmap/devmap1.c	(revision 7afb4a53710d7b78f26a51c1825abc447de3ea5b)
@@ -141,5 +141,5 @@
 	req = async_send_2(phone, DEVMAP_DRIVER_REGISTER, 0, 0, &answer);
 
-	retval = ipc_data_write_start(phone, (char *)name, strlen(name) + 1); 
+	retval = ipc_data_write_start(phone, (char *)name, str_size(name) + 1); 
 
 	if (retval != EOK) {
@@ -174,5 +174,5 @@
 	    &answer);
 
-	retval = ipc_data_write_start(driver_phone, name, strlen(name) + 1); 
+	retval = ipc_data_write_start(driver_phone, name, str_size(name) + 1);
 
 	if (retval != EOK) {
@@ -216,5 +216,5 @@
 
 	retval = ipc_data_write_start(driver_phone, (char *)name,
-	    strlen(name) + 1); 
+	    str_size(name) + 1);
 
 	if (retval != EOK) {
Index: uspace/app/tetris/scores.c
===================================================================
--- uspace/app/tetris/scores.c	(revision 552823e1d25affb3bd94ac1424382bfcf05e3c39)
+++ uspace/app/tetris/scores.c	(revision 7afb4a53710d7b78f26a51c1825abc447de3ea5b)
@@ -290,5 +290,5 @@
 /* 	me = thisuser(); */
 /* 	for (i = 0, sp = &scores[0]; i < nscores; i++, sp++) { */
-/* 		if (sp->hs_level != level || strcmp(sp->hs_name, me) != 0) */
+/* 		if (sp->hs_level != level || str_cmp(sp->hs_name, me) != 0) */
 /* 			continue; */
 /* 		if (score > sp->hs_score) { */
@@ -418,5 +418,5 @@
 /* 		 *\/ */
 /* 		for (j = 0, pu = count; j < numnames; j++, pu++) */
-/* 			if (strcmp(sp->hs_name, pu->name) == 0) */
+/* 			if (str_cmp(sp->hs_name, pu->name) == 0) */
 /* 				break; */
 /* 		if (j == numnames) { */
@@ -555,5 +555,5 @@
 /* 		    sp->hs_level == level && */
 /* 		    sp->hs_score == score && */
-/* 		    strcmp(sp->hs_name, me) == 0) { */
+/* 		    str_cmp(sp->hs_name, me) == 0) { */
 /* 			putpad(SOstr); */
 /* 			highlight = 1; */
Index: uspace/app/tetris/screen.c
===================================================================
--- uspace/app/tetris/screen.c	(revision 552823e1d25affb3bd94ac1424382bfcf05e3c39)
+++ uspace/app/tetris/screen.c	(revision 7afb4a53710d7b78f26a51c1825abc447de3ea5b)
@@ -281,5 +281,5 @@
 {
 	
-	int l = strlen(s);
+	int l = str_size(s);
 	
 	moveto(Rows - 2, ((Cols - l) >> 1) - 1);
Index: uspace/app/tetris/tetris.c
===================================================================
--- uspace/app/tetris/tetris.c	(revision 552823e1d25affb3bd94ac1424382bfcf05e3c39)
+++ uspace/app/tetris/tetris.c	(revision 7afb4a53710d7b78f26a51c1825abc447de3ea5b)
@@ -278,5 +278,5 @@
 /* 			break; */
 /* 		case 'k': */
-/* 			if (strlen(keys = optarg) != 6) */
+/* 			if (str_size(keys = optarg) != 6) */
 /* 				usage(); */
 /* 			break; */