Index: kernel/generic/src/console/cmd.c
===================================================================
--- kernel/generic/src/console/cmd.c	(revision e1b674201c97668fa9f3559cca094e0e1865629a)
+++ kernel/generic/src/console/cmd.c	(revision e535eeb8ca65f325690f9d79d60ea2f3c9e9da35)
@@ -1068,6 +1068,6 @@
 	uint64_t ucycles, kcycles;
 	char usuffix, ksuffix;
-	order(ucycles1 - ucycles0, &ucycles, &usuffix);
-	order(kcycles1 - kcycles0, &kcycles, &ksuffix);
+	order_suffix(ucycles1 - ucycles0, &ucycles, &usuffix);
+	order_suffix(kcycles1 - kcycles0, &kcycles, &ksuffix);
 		
 	printf("Time: %" PRIu64 "%c user cycles, %" PRIu64 "%c kernel cycles\n",
@@ -1130,6 +1130,6 @@
 		
 		data[i] = ucycles1 - ucycles0 + kcycles1 - kcycles0;
-		order(ucycles1 - ucycles0, &ucycles, &usuffix);
-		order(kcycles1 - kcycles0, &kcycles, &ksuffix);
+		order_suffix(ucycles1 - ucycles0, &ucycles, &usuffix);
+		order_suffix(kcycles1 - kcycles0, &kcycles, &ksuffix);
 		printf("OK (%" PRIu64 "%c user cycles, %" PRIu64 "%c kernel cycles)\n",
 				ucycles, usuffix, kcycles, ksuffix);
@@ -1145,5 +1145,5 @@
 		}
 		
-		order(sum / (uint64_t) cnt, &ucycles, &usuffix);
+		order_suffix(sum / (uint64_t) cnt, &ucycles, &usuffix);
 		printf("Average\t\t%" PRIu64 "%c\n", ucycles, usuffix);
 	}
Index: kernel/generic/src/lib/func.c
===================================================================
--- kernel/generic/src/lib/func.c	(revision e1b674201c97668fa9f3559cca094e0e1865629a)
+++ kernel/generic/src/lib/func.c	(revision e535eeb8ca65f325690f9d79d60ea2f3c9e9da35)
@@ -123,31 +123,4 @@
 }
 
-
-void order(const uint64_t val, uint64_t *rv, char *suffix)
-{
-	if (val > 10000000000000000000ULL) {
-		*rv = val / 1000000000000000000ULL;
-		*suffix = 'Z';
-	} else if (val > 1000000000000000000ULL) {
-		*rv = val / 1000000000000000ULL;
-		*suffix = 'E';
-	} else if (val > 1000000000000000ULL) {
-		*rv = val / 1000000000000ULL;
-		*suffix = 'T';
-	} else if (val > 1000000000000ULL) {
-		*rv = val / 1000000000ULL;
-		*suffix = 'G';
-	} else if (val > 1000000000ULL) {
-		*rv = val / 1000000ULL;
-		*suffix = 'M';
-	} else if (val > 1000000ULL) {
-		*rv = val / 1000ULL;
-		*suffix = 'k';
-	} else {
-		*rv = val;
-		*suffix = ' ';
-	}
-}
-
 /** @}
  */
Index: kernel/generic/src/lib/str.c
===================================================================
--- kernel/generic/src/lib/str.c	(revision e1b674201c97668fa9f3559cca094e0e1865629a)
+++ kernel/generic/src/lib/str.c	(revision e535eeb8ca65f325690f9d79d60ea2f3c9e9da35)
@@ -918,4 +918,30 @@
 }
 
+void order_suffix(const uint64_t val, uint64_t *rv, char *suffix)
+{
+	if (val > 10000000000000000000ULL) {
+		*rv = val / 1000000000000000000ULL;
+		*suffix = 'Z';
+	} else if (val > 1000000000000000000ULL) {
+		*rv = val / 1000000000000000ULL;
+		*suffix = 'E';
+	} else if (val > 1000000000000000ULL) {
+		*rv = val / 1000000000000ULL;
+		*suffix = 'T';
+	} else if (val > 1000000000000ULL) {
+		*rv = val / 1000000000ULL;
+		*suffix = 'G';
+	} else if (val > 1000000000ULL) {
+		*rv = val / 1000000ULL;
+		*suffix = 'M';
+	} else if (val > 1000000ULL) {
+		*rv = val / 1000ULL;
+		*suffix = 'k';
+	} else {
+		*rv = val;
+		*suffix = ' ';
+	}
+}
+
 /** @}
  */
Index: kernel/generic/src/proc/task.c
===================================================================
--- kernel/generic/src/proc/task.c	(revision e1b674201c97668fa9f3559cca094e0e1865629a)
+++ kernel/generic/src/proc/task.c	(revision e535eeb8ca65f325690f9d79d60ea2f3c9e9da35)
@@ -432,6 +432,6 @@
 	char usuffix, ksuffix;
 	task_get_accounting(t, &ucycles, &kcycles);
-	order(ucycles, &ucycles, &usuffix);
-	order(kcycles, &kcycles, &ksuffix);
+	order_suffix(ucycles, &ucycles, &usuffix);
+	order_suffix(kcycles, &kcycles, &ksuffix);
 	
 #ifdef __32_BITS__	
Index: kernel/generic/src/proc/thread.c
===================================================================
--- kernel/generic/src/proc/thread.c	(revision e1b674201c97668fa9f3559cca094e0e1865629a)
+++ kernel/generic/src/proc/thread.c	(revision e535eeb8ca65f325690f9d79d60ea2f3c9e9da35)
@@ -50,5 +50,5 @@
 #include <synch/rwlock.h>
 #include <cpu.h>
-#include <func.h>
+#include <str.h>
 #include <context.h>
 #include <adt/avl.h>
@@ -626,6 +626,6 @@
 	uint64_t ucycles, kcycles;
 	char usuffix, ksuffix;
-	order(t->ucycles, &ucycles, &usuffix);
-	order(t->kcycles, &kcycles, &ksuffix);
+	order_suffix(t->ucycles, &ucycles, &usuffix);
+	order_suffix(t->kcycles, &kcycles, &ksuffix);
 
 #ifdef __32_BITS__