diff --git a/lib/panic.c b/panic.c
similarity index 83%
rename from lib/panic.c
rename to panic.c
index cb9465c..fa57c53 100755
--- a/lib/panic.c
+++ b/panic.c
@@ -17,20 +17,21 @@ Panic routine.
 
 =============================================================================*/
 
+#include <common.h>
+#include <cpu.h>
 
-#include "xprintf.h"
+#undef panic
 
 void panic(const char* fmt,  ...) {
-	xputs("panic(): ");
+	printf("panic(): ");
 
 	va_list arp;
+
 	va_start(arp, fmt);
-	xvprintf(fmt, arp);
+	vprintf(fmt, arp);
 	va_end(arp);
 
-	xputc('\n');
+	putchar('\n');
 
-	for (;;) {
-		__asm__ __volatile__ ("nop" :::);
-	}
+	hang_cpu();
 }
\ No newline at end of file