Index: kernel/arch/amd64/src/debugger.c
===================================================================
--- kernel/arch/amd64/src/debugger.c	(revision b6dfc32140378ebf1d3b85d0671c44d44c2e8d9b)
+++ kernel/arch/amd64/src/debugger.c	(revision e2b762ec7955698a156a39c44cbaacd7211758b2)
@@ -36,5 +36,4 @@
 #include <console/kconsole.h>
 #include <console/cmd.h>
-#include <symtab.h>
 #include <print.h>
 #include <panic.h>
@@ -45,4 +44,8 @@
 #include <func.h>
 #include <smp/ipi.h>
+
+#ifdef CONFIG_SYMTAB
+#include <symtab.h>
+#endif
 
 typedef struct  {
@@ -230,6 +233,11 @@
 		}
 	}
+
+#ifdef CONFIG_SYMTAB
 	printf("Reached breakpoint %d:%lx(%s)\n", slot, getip(istate),
 	    get_symtab_entry(getip(istate)));
+#else
+	printf("Reached breakpoint %d:%lx\n", slot, getip(istate));
+#endif
 
 #ifdef CONFIG_KCONSOLE
@@ -356,5 +364,9 @@
 	for (i = 0; i < BKPOINTS_MAX; i++)
 		if (breakpoints[i].address) {
+#ifdef CONFIG_SYMTAB
 			symbol = get_symtab_entry(breakpoints[i].address);
+#else
+			symbol = "n/a";
+#endif
 
 #ifdef __32_BITS__
Index: kernel/arch/amd64/src/interrupt.c
===================================================================
--- kernel/arch/amd64/src/interrupt.c	(revision b6dfc32140378ebf1d3b85d0671c44d44c2e8d9b)
+++ kernel/arch/amd64/src/interrupt.c	(revision e2b762ec7955698a156a39c44cbaacd7211758b2)
@@ -44,5 +44,4 @@
 #include <mm/as.h>
 #include <arch.h>
-#include <symtab.h>
 #include <arch/asm.h>
 #include <proc/scheduler.h>
@@ -54,4 +53,8 @@
 #include <ddi/irq.h>
 
+#ifdef CONFIG_SYMTAB
+#include <symtab.h>
+#endif
+
 /*
  * Interrupt and exception dispatching.
@@ -67,6 +70,10 @@
 /*	uint64_t *x = &istate->stack[0]; */
 
+#ifdef CONFIG_SYMTAB
 	if (!(symbol = get_symtab_entry(istate->rip)))
 		symbol = "";
+#else
+	symbol = "";
+#endif
 
 	printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n", n, __func__);
Index: kernel/arch/ia32/src/interrupt.c
===================================================================
--- kernel/arch/ia32/src/interrupt.c	(revision b6dfc32140378ebf1d3b85d0671c44d44c2e8d9b)
+++ kernel/arch/ia32/src/interrupt.c	(revision e2b762ec7955698a156a39c44cbaacd7211758b2)
@@ -45,5 +45,4 @@
 #include <mm/as.h>
 #include <arch.h>
-#include <symtab.h>
 #include <proc/thread.h>
 #include <proc/task.h>
@@ -54,4 +53,8 @@
 #include <ddi/irq.h>
 
+#ifdef CONFIG_SYMTAB
+#include <symtab.h>
+#endif
+
 /*
  * Interrupt and exception dispatching.
@@ -64,8 +67,13 @@
 void decode_istate(istate_t *istate)
 {
-	char *symbol = get_symtab_entry(istate->eip);
-
+	char *symbol;
+
+#ifdef CONFIG_SYMTAB
+	symbol = get_symtab_entry(istate->eip);
 	if (!symbol)
 		symbol = "";
+#else
+	symbol = "";
+#endif
 
 	if (CPU)
Index: kernel/arch/ia64/src/interrupt.c
===================================================================
--- kernel/arch/ia64/src/interrupt.c	(revision b6dfc32140378ebf1d3b85d0671c44d44c2e8d9b)
+++ kernel/arch/ia64/src/interrupt.c	(revision e2b762ec7955698a156a39c44cbaacd7211758b2)
@@ -39,5 +39,4 @@
 #include <panic.h>
 #include <print.h>
-#include <symtab.h>
 #include <debug.h>
 #include <console/console.h>
@@ -56,4 +55,8 @@
 #include <mm/tlb.h>
 
+#ifdef CONFIG_SYMTAB
+#include <symtab.h>
+#endif
+
 #define VECTORS_64_BUNDLE	20
 #define VECTORS_16_BUNDLE	48
@@ -138,7 +141,11 @@
 	char *ifa, *iipa, *iip;
 
+#ifdef CONFIG_SYMTAB
 	ifa = get_symtab_entry(istate->cr_ifa);
 	iipa = get_symtab_entry(istate->cr_iipa);
 	iip = get_symtab_entry(istate->cr_iip);
+#else
+	ifa = iipa = iip = "n/a";
+#endif
 
 	putchar('\n');
Index: kernel/arch/mips32/src/debugger.c
===================================================================
--- kernel/arch/mips32/src/debugger.c	(revision b6dfc32140378ebf1d3b85d0671c44d44c2e8d9b)
+++ kernel/arch/mips32/src/debugger.c	(revision e2b762ec7955698a156a39c44cbaacd7211758b2)
@@ -38,5 +38,4 @@
 #include <console/kconsole.h>
 #include <console/cmd.h>
-#include <symtab.h>
 #include <print.h>
 #include <panic.h>
@@ -44,4 +43,8 @@
 #include <arch/cp0.h>
 #include <func.h>
+
+#ifdef CONFIG_SYMTAB
+#include <symtab.h>
+#endif
 
 bpinfo_t breakpoints[BKPOINTS_MAX];
@@ -260,5 +263,9 @@
 	for (i = 0; i < BKPOINTS_MAX; i++)
 		if (breakpoints[i].address) {
+#ifdef CONFIG_SYMTAB
 			symbol = get_symtab_entry(breakpoints[i].address);
+#else
+			symbol = "n/a";
+#endif
 			
 			printf("%-2u %-5d %#10zx %-6s %-7s %-8s %s\n", i,
@@ -349,7 +356,12 @@
 			printf("Warning: breakpoint recursion\n");
 		
-		if (!(cur->flags & BKPOINT_FUNCCALL))
+		if (!(cur->flags & BKPOINT_FUNCCALL)) {
+#ifdef CONFIG_SYMTAB
 			printf("***Breakpoint %d: %p in %s.\n", i, fireaddr,
 			    get_symtab_entry(istate->epc));
+#else
+			printf("***Breakpoint %d: %p.\n", i, fireaddr);
+#endif
+		}
 
 		/* Return first instruction back */
@@ -364,6 +376,10 @@
 		cur->flags |= BKPOINT_INPROG;
 	} else {
-		printf("***Breakpoint %p in %s.\n", fireaddr, 
+#ifdef CONFIG_SYMTAB
+		printf("***Breakpoint %p in %s.\n", fireaddr,
 		       get_symtab_entry(fireaddr));
+#else
+		printf("***Breakpoint %p.\n", fireaddr);	
+#endif
 		/* Move on to next instruction */
 		istate->epc += 4;
Index: kernel/arch/mips32/src/exception.c
===================================================================
--- kernel/arch/mips32/src/exception.c	(revision b6dfc32140378ebf1d3b85d0671c44d44c2e8d9b)
+++ kernel/arch/mips32/src/exception.c	(revision e2b762ec7955698a156a39c44cbaacd7211758b2)
@@ -42,5 +42,4 @@
 #include <debug.h>
 #include <proc/thread.h>
-#include <symtab.h>
 #include <print.h>
 #include <interrupt.h>
@@ -48,4 +47,8 @@
 #include <ddi/irq.h>
 #include <arch/debugger.h>
+
+#ifdef CONFIG_SYMTAB
+#include <symtab.h>
+#endif
 
 static char * exctable[] = {
@@ -77,4 +80,5 @@
 	char *rasymbol = "";
 
+#ifdef CONFIG_SYMTAB
 	char *s = get_symtab_entry(istate->epc);
 	if (s)
@@ -83,4 +87,5 @@
 	if (s)
 		rasymbol = s;
+#endif
 	
 	printf("PC: %#x(%s) RA: %#x(%s), SP(%p)\n", istate->epc, pcsymbol, istate->ra, rasymbol, istate->sp);
Index: kernel/arch/mips32/src/mm/tlb.c
===================================================================
--- kernel/arch/mips32/src/mm/tlb.c	(revision b6dfc32140378ebf1d3b85d0671c44d44c2e8d9b)
+++ kernel/arch/mips32/src/mm/tlb.c	(revision e2b762ec7955698a156a39c44cbaacd7211758b2)
@@ -41,5 +41,4 @@
 #include <panic.h>
 #include <arch.h>
-#include <symtab.h>
 #include <synch/mutex.h>
 #include <print.h>
@@ -47,4 +46,8 @@
 #include <align.h>
 #include <interrupt.h>
+
+#ifdef CONFIG_SYMTAB
+#include <symtab.h>
+#endif
 
 static void tlb_refill_fail(istate_t *);
@@ -324,4 +327,5 @@
 	char *sym2 = "";
 
+#ifdef CONFIG_SYMTAB
 	char *s = get_symtab_entry(istate->epc);
 	if (s)
@@ -330,4 +334,5 @@
 	if (s)
 		sym2 = s;
+#endif
 
 	fault_if_from_uspace(istate, "TLB Refill Exception on %p.",
@@ -342,7 +347,10 @@
 	char *symbol = "";
 
+#ifdef CONFIG_SYMTAB
 	char *s = get_symtab_entry(istate->epc);
 	if (s)
 		symbol = s;
+#endif
+
 	fault_if_from_uspace(istate, "TLB Invalid Exception on %p.",
 	    cp0_badvaddr_read());
@@ -355,7 +363,10 @@
 	char *symbol = "";
 
+#ifdef CONFIG_SYMTAB
 	char *s = get_symtab_entry(istate->epc);
 	if (s)
 		symbol = s;
+#endif
+
 	fault_if_from_uspace(istate, "TLB Modified Exception on %p.",
 	    cp0_badvaddr_read());
Index: kernel/arch/ppc32/src/mm/tlb.c
===================================================================
--- kernel/arch/ppc32/src/mm/tlb.c	(revision b6dfc32140378ebf1d3b85d0671c44d44c2e8d9b)
+++ kernel/arch/ppc32/src/mm/tlb.c	(revision e2b762ec7955698a156a39c44cbaacd7211758b2)
@@ -40,7 +40,9 @@
 #include <arch.h>
 #include <print.h>
+#include <macros.h>
+
+#ifdef CONFIG_SYMTAB
 #include <symtab.h>
-#include <macros.h>
-
+#endif
 
 static unsigned int seed = 10;
@@ -122,4 +124,5 @@
 	char *sym2 = "";
 
+#ifdef CONFIG_SYMTAB
 	char *str = get_symtab_entry(istate->pc);
 	if (str)
@@ -128,4 +131,5 @@
 	if (str)
 		sym2 = str;
+#endif
 
 	fault_if_from_uspace(istate,
Index: kernel/arch/sparc64/src/trap/exception.c
===================================================================
--- kernel/arch/sparc64/src/trap/exception.c	(revision b6dfc32140378ebf1d3b85d0671c44d44c2e8d9b)
+++ kernel/arch/sparc64/src/trap/exception.c	(revision e2b762ec7955698a156a39c44cbaacd7211758b2)
@@ -41,12 +41,23 @@
 #include <arch/register.h>
 #include <debug.h>
+#include <print.h>
+
+#ifdef CONFIG_SYMTAB
 #include <symtab.h>
-#include <print.h>
+#endif
 
 void dump_istate(istate_t *istate)
 {
+	char *tpcs, *tnpcs;
+
+#ifdef CONFIG_SYMTAB
+	tpcs = get_symtab_entry(istate->tpc);
+	tnpcs = get_symtab_entry(istate->tnpc);
+#else
+	tpcs = tnpcs = "n/a";
+#endif
 	printf("TSTATE=%#" PRIx64 "\n", istate->tstate);
-	printf("TPC=%#" PRIx64 " (%s)\n", istate->tpc, get_symtab_entry(istate->tpc));
-	printf("TNPC=%#" PRIx64 " (%s)\n", istate->tnpc, get_symtab_entry(istate->tnpc));
+	printf("TPC=%#" PRIx64 " (%s)\n", istate->tpc, tpcs);
+	printf("TNPC=%#" PRIx64 " (%s)\n", istate->tnpc, tnpcs);
 }
 
