diff --git a/nemu/include/debug.h b/nemu/include/debug.h
index 057f8bf..4f3fde5 100644
--- a/nemu/include/debug.h
+++ b/nemu/include/debug.h
@@ -16,7 +16,6 @@
 #ifndef __DEBUG_H__
 #define __DEBUG_H__
 
-#include <common.h>
 #include <stdio.h>
 #include <utils.h>
 
diff --git a/nemu/src/cpu/cpu-exec.c b/nemu/src/cpu/cpu-exec.c
index 72e1265..1e402ab 100644
--- a/nemu/src/cpu/cpu-exec.c
+++ b/nemu/src/cpu/cpu-exec.c
@@ -13,7 +13,7 @@
 * See the Mulan PSL v2 for more details.
 ***************************************************************************************/
 
-#include "utils.h"
+#include <utils.h>
 #include <cpu/cpu.h>
 #include <cpu/decode.h>
 #include <cpu/difftest.h>
diff --git a/nemu/src/isa/riscv32/inst.c b/nemu/src/isa/riscv32/inst.c
index 54b9044..c4d824f 100644
--- a/nemu/src/isa/riscv32/inst.c
+++ b/nemu/src/isa/riscv32/inst.c
@@ -13,12 +13,13 @@
  * See the Mulan PSL v2 for more details.
  ***************************************************************************************/
 
-#include "common.h"
+#include <common.h>
 #include "local-include/reg.h"
 #include <cpu/cpu.h>
 #include <cpu/ifetch.h>
 #include <cpu/decode.h>
 #include <ftrace.h>
+#include <utils.h>
 
 #define R(i) gpr(i)
 #define Mr vaddr_read
diff --git a/nemu/src/monitor/monitor.c b/nemu/src/monitor/monitor.c
index 1920ae4..6755edf 100644
--- a/nemu/src/monitor/monitor.c
+++ b/nemu/src/monitor/monitor.c
@@ -15,6 +15,7 @@
 
 #include <isa.h>
 #include <memory/paddr.h>
+#include <utils.h>
 
 void init_rand();
 void init_log(const char *log_file);
diff --git a/nemu/src/monitor/sdb/addrexp.y b/nemu/src/monitor/sdb/addrexp.y
index 8e7df9a..4094e0b 100644
--- a/nemu/src/monitor/sdb/addrexp.y
+++ b/nemu/src/monitor/sdb/addrexp.y
@@ -7,6 +7,7 @@
 }
 %{
     #include <common.h>
+    #include <utils.h>
     #include <isa.h>
     #include <stdio.h>
     #include <stdlib.h>
diff --git a/nemu/src/utils/ftrace.c b/nemu/src/utils/ftrace.c
index 25f097a..10594c1 100644
--- a/nemu/src/utils/ftrace.c
+++ b/nemu/src/utils/ftrace.c
@@ -1,9 +1,10 @@
-#include "debug.h"
-#include "macro.h"
+#include <debug.h>
+#include <macro.h>
 #include <assert.h>
 #include <common.h>
 #include <elf.h>
 #include <ftrace.h>
+#include <utils.h>
 
 // Put this into another file
 #ifdef CONFIG_FTRACE
diff --git a/nemu/src/utils/log.c b/nemu/src/utils/log.c
index 7939d42..a041a2d 100644
--- a/nemu/src/utils/log.c
+++ b/nemu/src/utils/log.c
@@ -14,6 +14,7 @@
 ***************************************************************************************/
 
 #include <common.h>
+#include <utils.h>
 
 extern uint64_t g_nr_guest_inst;