Index: kernel/generic/src/console/cmd.c
===================================================================
--- kernel/generic/src/console/cmd.c	(revision 422fd8128e27e3ef94bbda7fc41018488abad2ca)
+++ kernel/generic/src/console/cmd.c	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -514,5 +514,5 @@
 	
 	link_t *cur;
-	count_t len = 0;
+	size_t len = 0;
 	for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
 		cmd_info_t *hlp;
@@ -652,5 +652,5 @@
 	 */
 	
-	count_t i;
+	size_t i;
 	for (i = 0; i < config.cpu_count; i++) {
 		if (!cpus[i].active)
@@ -971,5 +971,5 @@
 int cmd_tests(cmd_arg_t *argv)
 {
-	count_t len = 0;
+	size_t len = 0;
 	test_t *test;
 	for (test = tests; test->name != NULL; test++) {
Index: kernel/generic/src/console/console.c
===================================================================
--- kernel/generic/src/console/console.c	(revision 422fd8128e27e3ef94bbda7fc41018488abad2ca)
+++ kernel/generic/src/console/console.c	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -62,5 +62,5 @@
 static bool klog_inited = false;
 /** First kernel log characters */
-static index_t klog_start = 0;
+static size_t klog_start = 0;
 /** Number of valid kernel log characters */
 static size_t klog_len = 0;
@@ -171,8 +171,8 @@
  *
  */
-count_t gets(indev_t *indev, char *buf, size_t buflen)
+size_t gets(indev_t *indev, char *buf, size_t buflen)
 {
 	size_t offset = 0;
-	count_t count = 0;
+	size_t count = 0;
 	buf[offset] = 0;
 	
@@ -227,5 +227,5 @@
 	if ((klog_stored > 0) && (stdout) && (stdout->op->write)) {
 		/* Print charaters stored in kernel log */
-		index_t i;
+		size_t i;
 		for (i = klog_len - klog_stored; i < klog_len; i++)
 			stdout->op->write(stdout, klog[(klog_start + i) % KLOG_LENGTH], silent);
Index: kernel/generic/src/console/kconsole.c
===================================================================
--- kernel/generic/src/console/kconsole.c	(revision 422fd8128e27e3ef94bbda7fc41018488abad2ca)
+++ kernel/generic/src/console/kconsole.c	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -87,5 +87,5 @@
 
 static wchar_t history[KCONSOLE_HISTORY][MAX_CMDLINE] = {};
-static count_t history_pos = 0;
+static size_t history_pos = 0;
 
 /** Initialize kconsole data structures
@@ -160,7 +160,7 @@
 
 /** Print count times a character */
-static void print_cc(wchar_t ch, count_t count)
-{
-	count_t i;
+static void print_cc(wchar_t ch, size_t count)
+{
+	size_t i;
 	for (i = 0; i < count; i++)
 		putchar(ch);
@@ -170,5 +170,5 @@
 static const char *cmdtab_search_one(const char *name, link_t **startpos)
 {
-	count_t namelen = str_length(name);
+	size_t namelen = str_length(name);
 	
 	spinlock_lock(&cmd_lock);
@@ -206,5 +206,5 @@
 	const char *name = input;
 	
-	count_t found = 0;
+	size_t found = 0;
 	link_t *pos = NULL;
 	const char *hint;
@@ -241,5 +241,5 @@
 	printf("%s> ", prompt);
 	
-	count_t position = 0;
+	size_t position = 0;
 	wchar_t *current = history[history_pos];
 	current[0] = 0;
@@ -281,5 +281,5 @@
 			/* Find the beginning of the word
 			   and copy it to tmp */
-			count_t beg;
+			size_t beg;
 			for (beg = position - 1; (beg > 0) && (!isspace(current[beg]));
 			    beg--);
@@ -314,5 +314,5 @@
 			
 			size_t off = 0;
-			count_t i = 0;
+			size_t i = 0;
 			while ((ch = str_decode(tmp, &off, STR_NO_LIMIT)) != 0) {
 				if (!wstr_linsert(current, ch, position + i, MAX_CMDLINE))
@@ -543,5 +543,5 @@
 		if (str_lcmp(hlp->name, cmdline + start,
 		    max(str_length(hlp->name),
-		    str_nlength(cmdline + start, (count_t) (end - start) - 1))) == 0) {
+		    str_nlength(cmdline + start, (size_t) (end - start) - 1))) == 0) {
 			cmd = hlp;
 			break;
@@ -569,5 +569,5 @@
 	
 	bool error = false;
-	count_t i;
+	size_t i;
 	for (i = 0; i < cmd->argc; i++) {
 		start = end;
@@ -660,5 +660,5 @@
 	while (true) {
 		wchar_t *tmp = clever_readline((char *) prompt, stdin);
-		count_t len = wstr_length(tmp);
+		size_t len = wstr_length(tmp);
 		if (!len)
 			continue;