Index: kernel/generic/src/debug/symtab.c
===================================================================
--- kernel/generic/src/debug/symtab.c	(revision 6c441cf8f35799043d891a3a77032e1b0e49112b)
+++ kernel/generic/src/debug/symtab.c	(revision ac59a390ee5af4975cad98edc90a8e13b417c935)
@@ -37,5 +37,5 @@
 
 #include <symtab.h>
-#include <arch/byteorder.h>
+#include <byteorder.h>
 #include <func.h>
 #include <print.h>
@@ -54,10 +54,10 @@
 	count_t i;
 
-	for (i=1;symbol_table[i].address_le;++i) {
+	for (i = 1; symbol_table[i].address_le; ++i) {
 		if (addr < uint64_t_le2host(symbol_table[i].address_le))
 			break;
 	}
-	if (addr >= uint64_t_le2host(symbol_table[i-1].address_le))
-		return symbol_table[i-1].symbol_name;
+	if (addr >= uint64_t_le2host(symbol_table[i - 1].address_le))
+		return symbol_table[i - 1].symbol_name;
 	return NULL;
 }
@@ -73,8 +73,8 @@
 	unsigned int namelen = strlen(name);
 	char *curname;
-	int i,j;
+	int i, j;
 	int colonoffset = -1;
 
-	for (i=0;name[i];i++)
+	for (i = 0; name[i]; i++)
 		if (name[i] == ':') {
 			colonoffset = i;
@@ -82,8 +82,8 @@
 		}
 
-	for (i=*startpos;symbol_table[i].address_le;++i) {
+	for (i = *startpos; symbol_table[i].address_le; ++i) {
 		/* Find a ':' in name */
 		curname = symbol_table[i].symbol_name;
-		for (j=0; curname[j] && curname[j] != ':'; j++)
+		for (j = 0; curname[j] && curname[j] != ':'; j++)
 			;
 		if (!curname[j])
@@ -95,5 +95,5 @@
 		if (strncmp(curname, name, namelen) == 0) {
 			*startpos = i;
-			return curname+namelen;
+			return curname + namelen;
 		}
 	}
@@ -116,5 +116,5 @@
 
 	i = 0;
-	while ((hint=symtab_search_one(name, &i))) {
+	while ((hint = symtab_search_one(name, &i))) {
 		if (!strlen(hint)) {
 			addr =  uint64_t_le2host(symbol_table[i].address_le);
@@ -152,5 +152,5 @@
 int symtab_compl(char *input)
 {
-	char output[MAX_SYMBOL_NAME+1];
+	char output[MAX_SYMBOL_NAME + 1];
 	int startpos = 0;
 	char *foundtxt;
@@ -173,7 +173,8 @@
 		startpos++;
 		if (!found)
-			strncpy(output, foundtxt, strlen(foundtxt)+1);
+			strncpy(output, foundtxt, strlen(foundtxt) + 1);
 		else {
-			for (i=0; output[i] && foundtxt[i] && output[i]==foundtxt[i]; i++)
+			for (i = 0; output[i] && foundtxt[i] &&
+			     output[i] == foundtxt[i]; i++)
 				;
 			output[i] = '\0';