diff --git a/nemu/include/common.h b/nemu/include/common.h
index 3197dd6..08a46e5 100644
--- a/nemu/include/common.h
+++ b/nemu/include/common.h
@@ -17,7 +17,6 @@
 #define __COMMON_H__
 
 #include <stdint.h>
-#include <inttypes.h>
 #include <stdbool.h>
 #include <string.h>
 
diff --git a/nemu/include/debug.h b/nemu/include/debug.h
index 4f3fde5..d9a604d 100644
--- a/nemu/include/debug.h
+++ b/nemu/include/debug.h
@@ -17,8 +17,12 @@
 #define __DEBUG_H__
 
 #include <stdio.h>
+#include <types.h>
+#include <macro.h>
 #include <utils.h>
 
+IFDEF(CONFIG_ITRACE, void log_itrace_print());
+
 #define Trace(format, ...) \
     _Log("[TRACE] " format "\n", ## __VA_ARGS__)
 
diff --git a/nemu/include/types.h b/nemu/include/types.h
index d034049..364f2ed 100644
--- a/nemu/include/types.h
+++ b/nemu/include/types.h
@@ -1,5 +1,7 @@
 #ifndef __TYPES_H__
 #define __TYPES_H__
+#include <inttypes.h>
+#include <macro.h>
 #if CONFIG_MBASE + CONFIG_MSIZE > 0x100000000ul
 #define PMEM64 1
 #endif
diff --git a/nemu/include/utils.h b/nemu/include/utils.h
index 59bc9df..f974584 100644
--- a/nemu/include/utils.h
+++ b/nemu/include/utils.h
@@ -16,7 +16,7 @@
 #ifndef __UTILS_H__
 #define __UTILS_H__
 
-#include <common.h>
+#include <types.h>
 
 // ----------- state -----------
 
@@ -74,7 +74,4 @@ uint64_t get_time();
   } while (0)
 
 
-IFDEF(CONFIG_ITRACE, void log_itrace_print());
-
-
 #endif
diff --git a/nemu/src/utils/ftrace.c b/nemu/src/utils/ftrace.c
index 10594c1..ec668c0 100644
--- a/nemu/src/utils/ftrace.c
+++ b/nemu/src/utils/ftrace.c
@@ -1,5 +1,3 @@
-#include <debug.h>
-#include <macro.h>
 #include <assert.h>
 #include <common.h>
 #include <elf.h>