diff --git a/arch/arm64/kernel/cpu.c b/arch/arm64/kernel/cpu.c
index 71c7abc6..c9cbe9f5 100644
--- a/arch/arm64/kernel/cpu.c
+++ b/arch/arm64/kernel/cpu.c
@@ -1,6 +1,5 @@
 /* cpu.c COPYRIGHT FUJITSU LIMITED 2015-2018 */
 #include <ihk/cpu.h>
-#include <ihk/debug.h>
 #include <ihk/mm.h>
 #include <types.h>
 #include <errno.h>
@@ -30,7 +29,7 @@
 #include <debug-monitors.h>
 #include <sysreg.h>
 #include <cpufeature.h>
-#include <debug.h>
+#include <ihk/debug.h>
 #include <hwcap.h>
 #include <virt.h>
 
diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c
index e630d2d8..f64fea06 100644
--- a/arch/arm64/kernel/debug-monitors.c
+++ b/arch/arm64/kernel/debug-monitors.c
@@ -2,7 +2,6 @@
 #include <cputype.h>
 #include <irqflags.h>
 #include <ihk/context.h>
-#include <ihk/debug.h>
 #include <signal.h>
 #include <errno.h>
 #include <debug-monitors.h>
diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index 92c5b441..37358ef0 100644
--- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@ -9,7 +9,7 @@
 #include <prctl.h>
 #include <cpufeature.h>
 #include <kmalloc.h>
-#include <debug.h>
+#include <ihk/debug.h>
 #include <process.h>
 #include <bitmap.h>
 
diff --git a/arch/arm64/kernel/include/traps.h b/arch/arm64/kernel/include/traps.h
index 563d788c..a39543af 100644
--- a/arch/arm64/kernel/include/traps.h
+++ b/arch/arm64/kernel/include/traps.h
@@ -4,6 +4,7 @@
 #define __ASM_TRAP_H
 
 #include <types.h>
+#include <arch-lock.h>
 
 struct pt_regs;
 
diff --git a/arch/arm64/kernel/irq-gic-v2.c b/arch/arm64/kernel/irq-gic-v2.c
index d9162cb2..9a57a037 100644
--- a/arch/arm64/kernel/irq-gic-v2.c
+++ b/arch/arm64/kernel/irq-gic-v2.c
@@ -7,7 +7,7 @@
 #include <memory.h>
 #include <affinity.h>
 #include <syscall.h>
-#include <debug.h>
+#include <ihk/debug.h>
 #include <arch-timer.h>
 #include <cls.h>
 
diff --git a/arch/arm64/kernel/irq-gic-v3.c b/arch/arm64/kernel/irq-gic-v3.c
index 452cb27f..4fa17fad 100644
--- a/arch/arm64/kernel/irq-gic-v3.c
+++ b/arch/arm64/kernel/irq-gic-v3.c
@@ -6,7 +6,7 @@
 #include <cputype.h>
 #include <process.h>
 #include <syscall.h>
-#include <debug.h>
+#include <ihk/debug.h>
 #include <arch-timer.h>
 #include <cls.h>
 
diff --git a/arch/arm64/kernel/memory.c b/arch/arm64/kernel/memory.c
index 2361c6f8..fa5fc304 100644
--- a/arch/arm64/kernel/memory.c
+++ b/arch/arm64/kernel/memory.c
@@ -1,6 +1,5 @@
 /* memory.c COPYRIGHT FUJITSU LIMITED 2015-2018 */
 #include <ihk/cpu.h>
-#include <ihk/debug.h>
 #include <ihk/mm.h>
 #include <types.h>
 #include <memory.h>
@@ -14,7 +13,7 @@
 #include <context.h>
 #include <kmalloc.h>
 #include <vdso.h>
-#include <debug.h>
+#include <ihk/debug.h>
 #include <rusage_private.h>
 #include <cputype.h>
 
diff --git a/arch/arm64/kernel/perfctr_armv8pmu.c b/arch/arm64/kernel/perfctr_armv8pmu.c
index 3ce970ed..03321b3d 100644
--- a/arch/arm64/kernel/perfctr_armv8pmu.c
+++ b/arch/arm64/kernel/perfctr_armv8pmu.c
@@ -4,7 +4,6 @@
 #include <ihk/perfctr.h>
 #include <errno.h>
 #include <ihk/debug.h>
-#include <debug.h>
 #include <sysreg.h>
 #include <virt.h>
 #include <bitops.h>
diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c
index 810de294..0de1e13a 100644
--- a/arch/arm64/kernel/psci.c
+++ b/arch/arm64/kernel/psci.c
@@ -18,10 +18,9 @@
 #include <psci.h>
 #include <errno.h>
 #include <ihk/types.h>
-#include <ihk/debug.h>
 #include <compiler.h>
 #include <lwk/compiler.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 //#define DEBUG_PRINT_PSCI
 
diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c
index 82048def..95422326 100644
--- a/arch/arm64/kernel/ptrace.c
+++ b/arch/arm64/kernel/ptrace.c
@@ -11,8 +11,8 @@
 #include <hwcap.h>
 #include <string.h>
 #include <thread_info.h>
-#include <debug.h>
 #include <ptrace.h>
+#include <ihk/debug.h>
 
 //#define DEBUG_PRINT_SC
 
diff --git a/arch/arm64/kernel/syscall.c b/arch/arm64/kernel/syscall.c
index 41621f40..9d7f5afa 100644
--- a/arch/arm64/kernel/syscall.c
+++ b/arch/arm64/kernel/syscall.c
@@ -15,7 +15,7 @@
 #include <limits.h>
 #include <uio.h>
 #include <syscall.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 void terminate_mcexec(int, int);
 extern void ptrace_report_signal(struct thread *thread, int sig);
diff --git a/arch/arm64/kernel/timer.c b/arch/arm64/kernel/timer.c
index 8f24412a..47a7e6ba 100644
--- a/arch/arm64/kernel/timer.c
+++ b/arch/arm64/kernel/timer.c
@@ -8,7 +8,7 @@
 #include <cputype.h>
 #include <irq.h>
 #include <arch-timer.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 //#define DEBUG_PRINT_TIMER
 
diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
index d48b689f..a629a548 100644
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
@@ -11,10 +11,9 @@
 #include <process.h>
 #include <string.h>
 #include <syscall.h>
-#include <ihk/debug.h>
 #include <ikc/queue.h>
 #include <vdso.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 //#define DEBUG_PRINT_VDSO
 
diff --git a/arch/x86_64/kernel/cpu.c b/arch/x86_64/kernel/cpu.c
index 95879c4c..abe7f4c1 100644
--- a/arch/x86_64/kernel/cpu.c
+++ b/arch/x86_64/kernel/cpu.c
@@ -16,7 +16,6 @@
  */
 
 #include <ihk/cpu.h>
-#include <ihk/debug.h>
 #include <ihk/mm.h>
 #include <types.h>
 #include <errno.h>
@@ -32,7 +31,7 @@
 #include <prctl.h>
 #include <page.h>
 #include <kmalloc.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 #define LAPIC_ID            0x020
 #define LAPIC_TIMER         0x320
diff --git a/arch/x86_64/kernel/memory.c b/arch/x86_64/kernel/memory.c
index 8db9043e..4f720a3b 100644
--- a/arch/x86_64/kernel/memory.c
+++ b/arch/x86_64/kernel/memory.c
@@ -14,7 +14,6 @@
  */
 
 #include <ihk/cpu.h>
-#include <ihk/debug.h>
 #include <ihk/mm.h>
 #include <types.h>
 #include <memory.h>
@@ -26,7 +25,7 @@
 #include <cls.h>
 #include <kmalloc.h>
 #include <rusage_private.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 //#define DEBUG
 
diff --git a/arch/x86_64/kernel/perfctr.c b/arch/x86_64/kernel/perfctr.c
index a9828704..e69af8ce 100644
--- a/arch/x86_64/kernel/perfctr.c
+++ b/arch/x86_64/kernel/perfctr.c
@@ -12,12 +12,11 @@
 #include <march.h>
 #include <errno.h>
 #include <cls.h>
-#include <ihk/debug.h>
 #include <ihk/cpu.h>
 #include <registers.h>
 #include <mc_perf_event.h>
 #include <config.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 extern unsigned int *x86_march_perfmap;
 extern int running_on_kvm(void);
diff --git a/arch/x86_64/kernel/syscall.c b/arch/x86_64/kernel/syscall.c
index 5846b420..e8a4b964 100644
--- a/arch/x86_64/kernel/syscall.c
+++ b/arch/x86_64/kernel/syscall.c
@@ -16,7 +16,6 @@
  */
 
 #include <ihk/cpu.h>
-#include <ihk/debug.h>
 #include <cls.h>
 #include <cpulocal.h>
 #include <syscall.h>
@@ -32,7 +31,7 @@
 #include <page.h>
 #include <limits.h>
 #include <syscall.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 void terminate_mcexec(int, int);
 extern long do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact);
diff --git a/ihk b/ihk
index 7828636f..9d63ef81 160000
--- a/ihk
+++ b/ihk
@@ -1 +1 @@
-Subproject commit 7828636f98787d543411499ae0133a56e40d46a7
+Subproject commit 9d63ef81c740749142cf95829fc4bb96eae329dc
diff --git a/kernel/ap.c b/kernel/ap.c
index 8609449b..926d1a73 100644
--- a/kernel/ap.c
+++ b/kernel/ap.c
@@ -21,7 +21,6 @@
 #include <kmsg.h>
 #include <ihk/cpu.h>
 #include <ihk/mm.h>
-#include <ihk/debug.h>
 #include <process.h>
 #include <init.h>
 #include <march.h>
@@ -29,7 +28,7 @@
 #include <time.h>
 #include <syscall.h>
 #include <rusage_private.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 //#define DEBUG_PRINT_AP
 
diff --git a/kernel/debug.c b/kernel/debug.c
index aecd165c..93a16368 100644
--- a/kernel/debug.c
+++ b/kernel/debug.c
@@ -13,13 +13,13 @@
 #include <stdarg.h>
 #include <string.h>
 #include <kmsg.h>
+#include <ihk/ihk_debug.h>
 #include <ihk/cpu.h>
-#include <ihk/debug.h>
 #include <ihk/lock.h>
 #include <ihk/monitor.h>
 #include <errno.h>
 #include <sysfs.h>
-#include <debug.h>
+#include <ihk/debug.h>
 #include <limits.h>
 
 struct ihk_kmsg_buf *kmsg_buf;
diff --git a/kernel/devobj.c b/kernel/devobj.c
index 7898a725..aa060d05 100644
--- a/kernel/devobj.c
+++ b/kernel/devobj.c
@@ -11,32 +11,16 @@
  * HISTORY:
  */
 
-#if 0
-#include <ihk/cpu.h>
-#endif
-#include <ihk/debug.h>
 #include <ihk/lock.h>
-#if 0
-#include <ihk/mm.h>
-#include <ihk/types.h>
-#include <cls.h>
-#include <errno.h>
-#endif
 #include <kmalloc.h>
-#if 0
-#include <kmsg.h>
-#endif
 #include <memobj.h>
-#if 0
-#include <memory.h>
-#endif
 #include <page.h>	/* for allocate_pages() */
 #include <pager.h>
 #include <string.h>
 #include <syscall.h>
 #include <process.h>
 #include <rusage_private.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 //#define DEBUG_PRINT_DEVOBJ
 
diff --git a/kernel/fileobj.c b/kernel/fileobj.c
index ec4a6734..ed6dd1df 100644
--- a/kernel/fileobj.c
+++ b/kernel/fileobj.c
@@ -12,7 +12,6 @@
  */
 
 #include <ihk/cpu.h>
-#include <ihk/debug.h>
 #include <ihk/lock.h>
 #include <ihk/mm.h>
 #include <ihk/types.h>
@@ -27,7 +26,7 @@
 #include <string.h>
 #include <syscall.h>
 #include <rusage_private.h>
-#include <debug.h>
+#include <ihk/debug.h>
 #include <mman.h>
 
 //#define DEBUG_PRINT_FILEOBJ
diff --git a/kernel/futex.c b/kernel/futex.c
index 6a7eb1fe..c6581168 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -70,7 +70,7 @@
 #include <cls.h>
 #include <kmsg.h>
 #include <timer.h>
-#include <debug.h>
+#include <ihk/debug.h>
 #include <syscall.h>
 
 //#define DEBUG_PRINT_FUTEX
diff --git a/kernel/host.c b/kernel/host.c
index 85e22006..4bca5be3 100644
--- a/kernel/host.c
+++ b/kernel/host.c
@@ -21,7 +21,6 @@
 #include <kmsg.h>
 #include <ihk/cpu.h>
 #include <ihk/mm.h>
-#include <ihk/debug.h>
 #include <ihk/ikc.h>
 #include <ikc/master.h>
 #include <cls.h>
@@ -34,7 +33,7 @@
 #include <sysfs.h>
 #include <ihk/perfctr.h>
 #include <rusage_private.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 //#define DEBUG_PRINT_HOST
 
diff --git a/kernel/hugefileobj.c b/kernel/hugefileobj.c
index 2684888e..dc98084a 100644
--- a/kernel/hugefileobj.c
+++ b/kernel/hugefileobj.c
@@ -3,7 +3,7 @@
 #include <kmsg.h>
 #include <kmalloc.h>
 #include <string.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 #if DEBUG_HUGEFILEOBJ
 #undef DDEBUG_DEFAULT
diff --git a/kernel/include/debug.h b/kernel/include/debug.h
deleted file mode 100644
index 6c471ab9..00000000
--- a/kernel/include/debug.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef DEBUG_H
-#define DEBUG_H
-
-#include "lwk/compiler.h"
-
-void panic(const char *);
-
-/* when someone has a lot of time, add attribute __printf(1, 2) to kprintf */
-int kprintf(const char *format, ...);
-
-struct ddebug {
-	const char *file;
-	const char *func;
-	const char *fmt;
-	unsigned int line:24;
-	unsigned int flags:8;
-} __aligned(8);
-
-#define DDEBUG_NONE  0x0
-#define DDEBUG_PRINT 0x1
-
-#define DDEBUG_DEFAULT DDEBUG_NONE
-
-#define DDEBUG_SYMBOL()                                  \
-	static struct ddebug __aligned(8)                \
-	__attribute__((section("__verbose"))) ddebug = { \
-		.file = __FILE__,                        \
-		.func = __func__,                        \
-		.line = __LINE__,                        \
-		.flags = DDEBUG_DEFAULT,                 \
-	}
-
-#define DDEBUG_TEST ddebug.flags
-
-
-
-#define dkprintf(fmt, args...)        \
-do {                                  \
-	DDEBUG_SYMBOL();              \
-	if (DDEBUG_TEST)              \
-		kprintf(fmt, ##args); \
-} while (0)
-#define ekprintf(fmt, args...) kprintf(fmt, ##args)
-
-#define BUG_ON(condition) do {                         \
-	if (condition) {                               \
-		kprintf("PANIC: %s: %s(line:%d)\n",    \
-			__FILE__, __func__, __LINE__); \
-		panic("");                             \
-	}                                              \
-} while (0)
-#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
-
-#endif
diff --git a/kernel/include/kmalloc.h b/kernel/include/kmalloc.h
index 384d87fe..9b89395c 100644
--- a/kernel/include/kmalloc.h
+++ b/kernel/include/kmalloc.h
@@ -15,7 +15,7 @@
 
 #include "ihk/mm.h"
 #include "cls.h"
-#include "debug.h"
+#include <ihk/debug.h>
 
 #define kmalloc(size, flag) ({\
 void *r = _kmalloc(size, flag, __FILE__, __LINE__);\
diff --git a/kernel/include/rusage_private.h b/kernel/include/rusage_private.h
index 9d4a6a91..c7e84472 100644
--- a/kernel/include/rusage_private.h
+++ b/kernel/include/rusage_private.h
@@ -9,7 +9,7 @@
 #include <memobj.h>
 #include <rusage.h>
 #include <ihk/ihk_monitor.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 #ifdef ENABLE_RUSAGE
 
diff --git a/kernel/include/xpmem_private.h b/kernel/include/xpmem_private.h
index 0d9acb70..60a98dc0 100644
--- a/kernel/include/xpmem_private.h
+++ b/kernel/include/xpmem_private.h
@@ -26,7 +26,7 @@
 
 #include <mc_xpmem.h>
 #include <xpmem.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 #define XPMEM_CURRENT_VERSION           0x00026003
 
diff --git a/kernel/init.c b/kernel/init.c
index e0da49d2..9ee3b425 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -23,7 +23,6 @@
 #include <kmalloc.h>
 #include <ihk/cpu.h>
 #include <ihk/mm.h>
-#include <ihk/debug.h>
 #include <ihk/dma.h>
 #include <ihk/perfctr.h>
 #include <process.h>
@@ -32,7 +31,7 @@
 #include <syscall.h>
 #include <sysfs.h>
 #include <ihk/monitor.h>
-#include <debug.h>
+#include <ihk/debug.h>
 #include <rusage.h>
 
 //#define IOCTL_FUNC_EXTENSION
diff --git a/kernel/listeners.c b/kernel/listeners.c
index 345f0655..43804775 100644
--- a/kernel/listeners.c
+++ b/kernel/listeners.c
@@ -15,11 +15,10 @@
 #include <kmsg.h>
 #include <ihk/cpu.h>
 #include <ihk/mm.h>
-#include <ihk/debug.h>
 #include <ihk/ikc.h>
 #include <ikc/master.h>
 #include <arch/cpu.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 //#define DEBUG_LISTENERS
 
diff --git a/kernel/mem.c b/kernel/mem.c
index 717b147f..c154769a 100644
--- a/kernel/mem.c
+++ b/kernel/mem.c
@@ -23,7 +23,6 @@
 #include <kmalloc.h>
 #include <string.h>
 #include <ihk/cpu.h>
-#include <ihk/debug.h>
 #include <ihk/lock.h>
 #include <ihk/mm.h>
 #include <ihk/page_alloc.h>
@@ -44,7 +43,7 @@
 #include <process.h>
 #include <limits.h>
 #include <sysfs.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 //#define DEBUG_PRINT_MEM
 
diff --git a/kernel/pager.c b/kernel/pager.c
index 6b3c6ffb..83b17e86 100644
--- a/kernel/pager.c
+++ b/kernel/pager.c
@@ -14,7 +14,6 @@
 #include <ihk/cpu.h>
 #include <cpulocal.h>
 #include <ihk/mm.h>
-#include <ihk/debug.h>
 #include <ihk/ikc.h>
 #include <errno.h>
 #include <cls.h>
@@ -22,7 +21,7 @@
 #include <kmalloc.h>
 #include <process.h>
 #include <swapfmt.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 #define O_RDONLY	00000000
 #define O_WRONLY	00000001
diff --git a/kernel/process.c b/kernel/process.c
index 02a9a2b2..ca60ae34 100644
--- a/kernel/process.c
+++ b/kernel/process.c
@@ -26,7 +26,6 @@
 #include <errno.h>
 #include <kmalloc.h>
 #include <cls.h>
-#include <ihk/debug.h>
 #include <page.h>
 #include <cpulocal.h>
 #include <auxvec.h>
@@ -36,7 +35,7 @@
 #include <xpmem.h>
 #include <rusage_private.h>
 #include <ihk/monitor.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 //#define DEBUG_PRINT_PROCESS
 
diff --git a/kernel/profile.c b/kernel/profile.c
index 4f3e66fb..e105e8b3 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -17,7 +17,6 @@
 #include <ihk/cpu.h>
 #include <cpulocal.h>
 #include <ihk/mm.h>
-#include <ihk/debug.h>
 #include <ihk/ikc.h>
 #include <errno.h>
 #include <cls.h>
@@ -39,7 +38,7 @@
 #include <limits.h>
 #include <march.h>
 #include <process.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 extern char *syscall_name[];
 
diff --git a/kernel/shmobj.c b/kernel/shmobj.c
index 8be3f788..1abc7b5a 100644
--- a/kernel/shmobj.c
+++ b/kernel/shmobj.c
@@ -11,7 +11,6 @@
  */
 
 #include <ihk/atomic.h>
-#include <ihk/debug.h>
 #include <ihk/lock.h>
 #include <ihk/mm.h>
 #include <errno.h>
@@ -23,7 +22,7 @@
 #include <shm.h>
 #include <string.h>
 #include <rusage_private.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 
 static LIST_HEAD(shmobj_list_head);
diff --git a/kernel/syscall.c b/kernel/syscall.c
index dd7a5b00..cbb40e37 100644
--- a/kernel/syscall.c
+++ b/kernel/syscall.c
@@ -28,7 +28,6 @@
 #include <ihk/cpu.h>
 #include <cpulocal.h>
 #include <ihk/mm.h>
-#include <ihk/debug.h>
 #include <ihk/ikc.h>
 #include <errno.h>
 #include <cls.h>
@@ -59,7 +58,7 @@
 #include <rusage_private.h>
 #include <ihk/monitor.h>
 #include <profile.h>
-#include <debug.h>
+#include <ihk/debug.h>
 #include "../executer/include/uti.h"
 
 /* Headers taken from kitten LWK */
diff --git a/kernel/sysfs.c b/kernel/sysfs.c
index 670d4294..b0cfebbc 100644
--- a/kernel/sysfs.c
+++ b/kernel/sysfs.c
@@ -23,7 +23,7 @@
 #include <sysfs.h>
 #include <sysfs_msg.h>
 #include <vsprintf.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 static size_t sysfs_data_bufsize;
 static void *sysfs_data_buf;
diff --git a/kernel/timer.c b/kernel/timer.c
index 1871ad43..6dd727c2 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -14,7 +14,6 @@
 #include <ihk/cpu.h>
 #include <cpulocal.h>
 #include <ihk/mm.h>
-#include <ihk/debug.h>
 #include <ihk/ikc.h>
 #include <errno.h>
 #include <cls.h>
@@ -32,7 +31,7 @@
 #include <futex.h>
 #include <bitops.h>
 #include <timer.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 //#define DEBUG_PRINT_TIMER
 
diff --git a/kernel/zeroobj.c b/kernel/zeroobj.c
index c937ba5b..da6f3ddf 100644
--- a/kernel/zeroobj.c
+++ b/kernel/zeroobj.c
@@ -11,7 +11,6 @@
  */
 
 #include <ihk/atomic.h>
-#include <ihk/debug.h>
 #include <ihk/lock.h>
 #include <ihk/mm.h>
 #include <errno.h>
@@ -21,7 +20,7 @@
 #include <memory.h>
 #include <page.h>
 #include <string.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 struct zeroobj {
 	struct memobj		memobj;		/* must be first */
diff --git a/lib/bitmap.c b/lib/bitmap.c
index f059e771..500a512e 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -11,7 +11,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include <bitmap.h>
-#include <debug.h>
+#include <ihk/debug.h>
 
 #define EXPORT_SYMBOL(x)
 
diff --git a/lib/include/ihk/debug.h b/lib/include/ihk/debug.h
index 73716601..27a64dc3 100644
--- a/lib/include/ihk/debug.h
+++ b/lib/include/ihk/debug.h
@@ -1,43 +1,65 @@
-/* debug.h COPYRIGHT FUJITSU LIMITED 2015-2016 */
-/**
- * \file debug.h
- *  License details are found in the file LICENSE.
- * \brief
- *  Declare types and functions to print debug message (kmsg).
- * \author Taku Shimosawa  <shimosawa@is.s.u-tokyo.ac.jp> \par
- *      Copyright (C) 2011 - 2012  Taku Shimosawa
- */
-/*
- * HISTORY
- */
-
 #ifndef IHK_DEBUG_H
 #define IHK_DEBUG_H
 
-#include <arch-lock.h>
-#include <ihk/memconst.h>
-#include <ihk/ihk_debug.h>
+#include "lwk/compiler.h"
 
-#ifdef POSTK_DEBUG_ARCH_DEP_9 /* want to add a static assertion */
+void panic(const char *);
+
+/* when someone has a lot of time, add attribute __printf(1, 2) to kprintf */
+int kprintf(const char *format, ...);
+unsigned long kprintf_lock(void);
+void kprintf_unlock(unsigned long irqflags);
+int __kprintf(const char *format, ...);
+
+struct ddebug {
+	const char *file;
+	const char *func;
+	const char *fmt;
+	unsigned int line:24;
+	unsigned int flags:8;
+} __aligned(8);
+
+#define DDEBUG_NONE  0x0
+#define DDEBUG_PRINT 0x1
+
+#define DDEBUG_DEFAULT DDEBUG_NONE
+
+#define DDEBUG_SYMBOL()                                  \
+	static struct ddebug __aligned(8)                \
+	__attribute__((section("__verbose"))) ddebug = { \
+		.file = __FILE__,                        \
+		.func = __func__,                        \
+		.line = __LINE__,                        \
+		.flags = DDEBUG_DEFAULT,                 \
+	}
+
+#define DDEBUG_TEST ddebug.flags
+
+
+
+#define dkprintf(fmt, args...)        \
+do {                                  \
+	DDEBUG_SYMBOL();              \
+	if (DDEBUG_TEST)              \
+		kprintf(fmt, ##args); \
+} while (0)
+#define ekprintf(fmt, args...) kprintf(fmt, ##args)
+
+#define BUG_ON(condition) do {                         \
+	if (condition) {                               \
+		kprintf("PANIC: %s: %s(line:%d)\n",    \
+			__FILE__, __func__, __LINE__); \
+		panic("");                             \
+	}                                              \
+} while (0)
 
-/* Force a compilation error if condition is false */
 #define STATIC_ASSERT(cond) _STATIC_ASSERT(cond, __LINE__)
 #define _STATIC_ASSERT(cond, line) __STATIC_ASSERT(cond, line)
 #define __STATIC_ASSERT(cond, line)			\
 	static void __static_assert_ ## line (void) {	\
 		STATIC_ASSERT_LOCAL(cond);		\
 	}
-
-/* Force a compilation error if condition is false */
 #define STATIC_ASSERT_LOCAL(cond) ((void)sizeof(struct { int:-!!!(cond); }))
 
-#endif /* POSTK_DEBUG_ARCH_DEP_9 */
-
-extern int kprintf(const char *format, ...);
-extern unsigned long kprintf_lock(void);
-extern void kprintf_unlock(unsigned long irqflags);
-extern int __kprintf(const char *format, ...);
-
-extern void panic(const char *msg);
 
 #endif
diff --git a/lib/page_alloc.c b/lib/page_alloc.c
index e3b89d90..48333335 100644
--- a/lib/page_alloc.c
+++ b/lib/page_alloc.c
@@ -23,9 +23,8 @@
 //#define DEBUG_PRINT_PAGE_ALLOC
 
 #ifdef DEBUG_PRINT_PAGE_ALLOC
-#define dkprintf kprintf
-#else
-#define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0)
+#undef DDEBUG_DEFAULT
+#define DDEBUG_DEFAULT DDEBUG_PRINT
 #endif
 
 void free_pages(void *, int npages);