Index: kernel/generic/src/lib/sort.c
===================================================================
--- kernel/generic/src/lib/sort.c	(revision f2d2c7ba676ff1a37b6198b134c840dd09e1d11b)
+++ kernel/generic/src/lib/sort.c	(revision 4a68194df2c9adee6f05acf34c5c51ef658f99d2)
@@ -46,6 +46,6 @@
 #define EBUFSIZE	32
 
-void _qsort(void * data, count_t n, size_t e_size, int (* cmp) (void * a, void * b), void *tmp, void *pivot);
-void _bubblesort(void * data, count_t n, size_t e_size, int (* cmp) (void * a, void * b), void *slot);
+void _qsort(void * data, size_t n, size_t e_size, int (* cmp) (void * a, void * b), void *tmp, void *pivot);
+void _bubblesort(void * data, size_t n, size_t e_size, int (* cmp) (void * a, void * b), void *slot);
 
 /** Quicksort wrapper
@@ -62,5 +62,5 @@
  * 
  */
-void qsort(void * data, count_t n, size_t e_size, int (* cmp) (void * a, void * b))
+void qsort(void * data, size_t n, size_t e_size, int (* cmp) (void * a, void * b))
 {
 	uint8_t buf_tmp[EBUFSIZE];
@@ -94,5 +94,5 @@
  * 
  */
-void _qsort(void * data, count_t n, size_t e_size, int (* cmp) (void * a, void * b), void *tmp, void *pivot)
+void _qsort(void * data, size_t n, size_t e_size, int (* cmp) (void * a, void * b), void *tmp, void *pivot)
 {
 	if (n > 4) {
@@ -134,5 +134,5 @@
  * 
  */
-void bubblesort(void * data, count_t n, size_t e_size, int (* cmp) (void * a, void * b))
+void bubblesort(void * data, size_t n, size_t e_size, int (* cmp) (void * a, void * b))
 {
 	uint8_t buf_slot[EBUFSIZE];
@@ -161,5 +161,5 @@
  * 
  */
-void _bubblesort(void * data, count_t n, size_t e_size, int (* cmp) (void * a, void * b), void *slot)
+void _bubblesort(void * data, size_t n, size_t e_size, int (* cmp) (void * a, void * b), void *slot)
 {
 	bool done = false;
Index: kernel/generic/src/lib/string.c
===================================================================
--- kernel/generic/src/lib/string.c	(revision f2d2c7ba676ff1a37b6198b134c840dd09e1d11b)
+++ kernel/generic/src/lib/string.c	(revision 4a68194df2c9adee6f05acf34c5c51ef658f99d2)
@@ -63,8 +63,8 @@
  *
  *  [wide] string length  number of CHARACTERS in a [wide] string (excluding
- *                        the NULL-terminator), count_t
+ *                        the NULL-terminator), size_t
  *
  *  [wide] string width   number of display cells on a monospace display taken
- *                        by a [wide] string, count_t
+ *                        by a [wide] string, size_t
  *
  *
@@ -76,8 +76,8 @@
  *                            NULL-terminator)
  *
- *  length  l        count_t  number of CHARACTERS in a string (excluding the
+ *  length  l        size_t   number of CHARACTERS in a string (excluding the
  *                            null terminator)
  *
- *  width  w         count_t  number of display cells on a monospace display
+ *  width  w         size_t   number of display cells on a monospace display
  *                            taken by a string
  *
@@ -98,5 +98,5 @@
  *  pointer (char *, wchar_t *)
  *  byte offset (size_t)
- *  character index (count_t)
+ *  character index (size_t)
  *
  */
@@ -310,7 +310,7 @@
  *
  */
-size_t str_lsize(const char *str, count_t max_len)
-{
-	count_t len = 0;
+size_t str_lsize(const char *str, size_t max_len)
+{
+	size_t len = 0;
 	size_t offset = 0;
 	
@@ -338,5 +338,5 @@
  *
  */
-size_t wstr_lsize(const wchar_t *str, count_t max_len)
+size_t wstr_lsize(const wchar_t *str, size_t max_len)
 {
 	return (wstr_nlength(str, max_len * sizeof(wchar_t)) * sizeof(wchar_t));
@@ -350,7 +350,7 @@
  *
  */
-count_t str_length(const char *str)
-{
-	count_t len = 0;
+size_t str_length(const char *str)
+{
+	size_t len = 0;
 	size_t offset = 0;
 	
@@ -368,7 +368,7 @@
  *
  */
-count_t wstr_length(const wchar_t *wstr)
-{
-	count_t len = 0;
+size_t wstr_length(const wchar_t *wstr)
+{
+	size_t len = 0;
 	
 	while (*wstr++ != 0)
@@ -386,7 +386,7 @@
  *
  */
-count_t str_nlength(const char *str, size_t size)
-{
-	count_t len = 0;
+size_t str_nlength(const char *str, size_t size)
+{
+	size_t len = 0;
 	size_t offset = 0;
 	
@@ -405,9 +405,9 @@
  *
  */
-count_t wstr_nlength(const wchar_t *str, size_t size)
-{
-	count_t len = 0;
-	count_t limit = ALIGN_DOWN(size, sizeof(wchar_t));
-	count_t offset = 0;
+size_t wstr_nlength(const wchar_t *str, size_t size)
+{
+	size_t len = 0;
+	size_t limit = ALIGN_DOWN(size, sizeof(wchar_t));
+	size_t offset = 0;
 	
 	while ((offset < limit) && (*str++ != 0)) {
@@ -497,5 +497,5 @@
  *
  */
-int str_lcmp(const char *s1, const char *s2, count_t max_len)
+int str_lcmp(const char *s1, const char *s2, size_t max_len)
 {
 	wchar_t c1 = 0;
@@ -505,5 +505,5 @@
 	size_t off2 = 0;
 	
-	count_t len = 0;
+	size_t len = 0;
 
 	while (true) {
@@ -616,5 +616,5 @@
 	
 	wchar_t ch;
-	count_t src_idx = 0;
+	size_t src_idx = 0;
 	size_t dst_off = 0;
 	
@@ -667,12 +667,12 @@
  *
  */
-bool wstr_linsert(wchar_t *str, wchar_t ch, count_t pos, count_t max_pos)
-{
-	count_t len = wstr_length(str);
+bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos)
+{
+	size_t len = wstr_length(str);
 	
 	if ((pos > len) || (pos + 1 > max_pos))
 		return false;
 	
-	count_t i;
+	size_t i;
 	for (i = len; i + 1 > pos; i--)
 		str[i + 1] = str[i];
@@ -695,12 +695,12 @@
  *
  */
-bool wstr_remove(wchar_t *str, count_t pos)
-{
-	count_t len = wstr_length(str);
+bool wstr_remove(wchar_t *str, size_t pos)
+{
+	size_t len = wstr_length(str);
 	
 	if (pos >= len)
 		return false;
 	
-	count_t i;
+	size_t i;
 	for (i = pos + 1; i <= len; i++)
 		str[i - 1] = str[i];