Index: generic/src/debug/symtab.c
===================================================================
--- generic/src/debug/symtab.c	(revision b6529aefe60a3a99601ed01142f3ae38056aed50)
+++ generic/src/debug/symtab.c	(revision 0ffa3ef51d117153ad4c8c5fdb3b525ff042ef01)
@@ -51,13 +51,13 @@
  * @return Pointer to respective symbol string on success, NULL otherwise.
  */
-char * get_symtab_entry(__native addr)
+char * get_symtab_entry(unative_t addr)
 {
 	count_t i;
 
 	for (i=1;symbol_table[i].address_le;++i) {
-		if (addr < __u64_le2host(symbol_table[i].address_le))
+		if (addr < uint64_t_le2host(symbol_table[i].address_le))
 			break;
 	}
-	if (addr >= __u64_le2host(symbol_table[i-1].address_le))
+	if (addr >= uint64_t_le2host(symbol_table[i-1].address_le))
 		return symbol_table[i-1].symbol_name;
 	return NULL;
@@ -109,8 +109,8 @@
  * @return 0 - Not found, -1 - Duplicate symbol, other - address of symbol
  */
-__address get_symbol_addr(const char *name)
+uintptr_t get_symbol_addr(const char *name)
 {
 	count_t found = 0;
-	__address addr = NULL;
+	uintptr_t addr = NULL;
 	char *hint;
 	int i;
@@ -119,5 +119,5 @@
 	while ((hint=symtab_search_one(name, &i))) {
 		if (!strlen(hint)) {
-			addr =  __u64_le2host(symbol_table[i].address_le);
+			addr =  uint64_t_le2host(symbol_table[i].address_le);
 			found++;
 		}
@@ -125,5 +125,5 @@
 	}
 	if (found > 1)
-		return ((__address) -1);
+		return ((uintptr_t) -1);
 	return addr;
 }
@@ -133,5 +133,5 @@
 {
 	int i;
-	__address addr;
+	uintptr_t addr;
 	char *realname;
 
@@ -139,7 +139,7 @@
 	i = 0;
 	while (symtab_search_one(name, &i)) {
-		addr =  __u64_le2host(symbol_table[i].address_le);
+		addr =  uint64_t_le2host(symbol_table[i].address_le);
 		realname = symbol_table[i].symbol_name;
-		printf("%.*p: %s\n", sizeof(__address) * 2, addr, realname);
+		printf("%.*p: %s\n", sizeof(uintptr_t) * 2, addr, realname);
 		i++;
 	}