diff --git a/include/dwarf_i.h b/include/dwarf_i.h
index d9c5a619..c75e7b6a 100644
--- a/include/dwarf_i.h
+++ b/include/dwarf_i.h
@@ -7,7 +7,8 @@
    files are compiled with inlining disabled.  */
 
 #include "dwarf.h"
-#include "tdep.h"
+#include "libunwind_i.h"
+#include "mempool.h"
 
 #ifndef dwarf_to_unw_regnum
 # define dwarf_to_unw_regnum_map	UNW_OBJ (dwarf_to_unw_regnum_map)
@@ -19,6 +20,9 @@
     (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
 #endif
 
+extern struct mempool dwarf_reg_state_pool;
+extern struct mempool dwarf_cie_info_pool;
+
 #ifdef UNW_LOCAL_ONLY
 
 /* In the local-only case, we can let the compiler directly access