diff --git a/include/libunwind-hppa.h b/include/libunwind-hppa.h
index c2f00f17..75fb14c1 100644
--- a/include/libunwind-hppa.h
+++ b/include/libunwind-hppa.h
@@ -43,7 +43,13 @@ extern "C" {
    want to err on making it rather too big than too small.  */
 #define UNW_TDEP_CURSOR_LEN	127
 
-typedef uint64_t unw_tdep_word_t;
+typedef uint64_t unw_word_t;
+
+typedef struct
+  {
+    /* no PA-RISC-specific auxiliary proc-info */
+  }
+unw_tdep_proc_info_t;
 
 typedef enum
   {
@@ -85,6 +91,7 @@ typedef ucontext_t unw_tdep_context_t;
 /* XXX fixme: */
 #define unw_tdep_is_fpreg(r)		((unsigned) ((r) - UNW_HPPA_FR) < 128)
 
+#include "libunwind-dynamic.h"
 #include "libunwind-common.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
diff --git a/include/libunwind-ia64.h b/include/libunwind-ia64.h
index 17c0636d..13a72253 100644
--- a/include/libunwind-ia64.h
+++ b/include/libunwind-ia64.h
@@ -66,7 +66,7 @@ extern "C" {
 
 #define UNW_PI_FLAG_IA64_RBS_SWITCH	(1 << UNW_PI_FLAG_IA64_RBS_SWITCH_BIT)
 
-typedef uint64_t unw_tdep_word_t;
+typedef uint64_t unw_word_t;
 
 /* On IA-64, we want to access the contents of floating-point
    registers as a pair of "words", but to ensure 16-byte alignment, we
@@ -74,11 +74,17 @@ typedef uint64_t unw_tdep_word_t;
    Right Thing on all known IA-64 platforms, including HP-UX.  */
 typedef union
   {
-    struct { unw_tdep_word_t bits[2]; } raw;
+    struct { unw_word_t bits[2]; } raw;
     long double dummy;	/* dummy to force 16-byte alignment */
   }
 unw_tdep_fpreg_t;
 
+typedef struct
+  {
+    /* no ia64-specific auxiliary proc-info */
+  }
+unw_tdep_proc_info_t;
+
 typedef enum
   {
     /* Note: general registers are excepted to start with index 0.
@@ -149,6 +155,7 @@ typedef ucontext_t unw_tdep_context_t;
 
 #define unw_tdep_is_fpreg(r)		((unsigned) ((r) - UNW_IA64_FR) < 128)
 
+#include "libunwind-dynamic.h"
 #include "libunwind-common.h"
 
 /* This is a helper routine to search an ia64 unwind table.  If the