Index: kernel/generic/include/console/chardev.h
===================================================================
--- kernel/generic/include/console/chardev.h	(revision 44b7783bb8246582bf48efb729a4de0c3085483b)
+++ kernel/generic/include/console/chardev.h	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
@@ -58,9 +58,9 @@
 	SPINLOCK_DECLARE(lock);
 	wchar_t buffer[INDEV_BUFLEN];
-	count_t counter;
+	size_t counter;
 	
 	/** Implementation of indev operations. */
 	indev_operations_t *op;
-	index_t index;
+	size_t index;
 	void *data;
 } indev_t;
Index: kernel/generic/include/console/console.h
===================================================================
--- kernel/generic/include/console/console.h	(revision 44b7783bb8246582bf48efb729a4de0c3085483b)
+++ kernel/generic/include/console/console.h	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
@@ -50,5 +50,5 @@
 
 extern wchar_t getc(indev_t *indev);
-extern count_t gets(indev_t *indev, char *buf, size_t buflen);
+extern size_t gets(indev_t *indev, char *buf, size_t buflen);
 extern unative_t sys_klog(int fd, const void *buf, size_t size);
 
Index: kernel/generic/include/console/kconsole.h
===================================================================
--- kernel/generic/include/console/kconsole.h	(revision 44b7783bb8246582bf48efb729a4de0c3085483b)
+++ kernel/generic/include/console/kconsole.h	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
@@ -78,5 +78,5 @@
 	int (* func)(cmd_arg_t *);
 	/** Number of arguments. */
-	count_t argc;
+	size_t argc;
 	/** Argument vector. */
 	cmd_arg_t *argv;