diff --git a/configure b/configure
index 3b80b565..2e47f34e 100644
--- a/configure
+++ b/configure
@@ -464,7 +464,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL CCAS CCASFLAGS LIBOBJS REMOTE_ONLY_TRUE REMOTE_ONLY_FALSE ARCH_IA64_TRUE ARCH_IA64_FALSE ARCH_HPPA_TRUE ARCH_HPPA_FALSE ARCH_X86_TRUE ARCH_X86_FALSE OS_LINUX_TRUE OS_LINUX_FALSE arch ARCH LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL CCAS CCASFLAGS LIBOBJS REMOTE_ONLY_TRUE REMOTE_ONLY_FALSE ARCH_IA64_TRUE ARCH_IA64_FALSE ARCH_HPPA_TRUE ARCH_HPPA_FALSE ARCH_X86_TRUE ARCH_X86_FALSE OS_LINUX_TRUE OS_LINUX_FALSE OS_HPUX_TRUE OS_HPUX_FALSE arch ARCH LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -8036,6 +8036,65 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
+echo "$as_me:$LINENO: checking for __uc_get_grs in -luca" >&5
+echo $ECHO_N "checking for __uc_get_grs in -luca... $ECHO_C" >&6
+if test "${ac_cv_lib_uca___uc_get_grs+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-luca  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char __uc_get_grs ();
+int
+main ()
+{
+__uc_get_grs ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_uca___uc_get_grs=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_uca___uc_get_grs=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_uca___uc_get_grs" >&5
+echo "${ECHO_T}$ac_cv_lib_uca___uc_get_grs" >&6
+if test $ac_cv_lib_uca___uc_get_grs = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBUCA 1
+_ACEOF
+
+  LIBS="-luca $LIBS"
+
+fi
+
+
 echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
@@ -8180,8 +8239,9 @@ fi
 
 
 
+
 for ac_header in asm/ptrace_offsets.h endian.h execinfo.h ia64intrin.h \
-		 unistd.h
+		 sys/uc_access.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -8862,6 +8922,16 @@ else
 fi
 
 
+
+if expr x$target_os : xhpux >/dev/null; then
+  OS_HPUX_TRUE=
+  OS_HPUX_FALSE='#'
+else
+  OS_HPUX_TRUE='#'
+  OS_HPUX_FALSE=
+fi
+
+
 if test x$target_arch != x$build_arch; then
   CPPFLAGS="${CPPFLAGS} -DUNW_REMOTE_ONLY"
 fi
@@ -9069,6 +9139,13 @@ echo "$as_me: error: conditional \"OS_LINUX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${OS_HPUX_TRUE}" && test -z "${OS_HPUX_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"OS_HPUX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"OS_HPUX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -9657,6 +9734,8 @@ s,@ARCH_X86_TRUE@,$ARCH_X86_TRUE,;t t
 s,@ARCH_X86_FALSE@,$ARCH_X86_FALSE,;t t
 s,@OS_LINUX_TRUE@,$OS_LINUX_TRUE,;t t
 s,@OS_LINUX_FALSE@,$OS_LINUX_FALSE,;t t
+s,@OS_HPUX_TRUE@,$OS_HPUX_TRUE,;t t
+s,@OS_HPUX_FALSE@,$OS_HPUX_FALSE,;t t
 s,@arch@,$arch,;t t
 s,@ARCH@,$ARCH,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
diff --git a/doc/unw_get_fpreg.man b/doc/unw_get_fpreg.man
index 644e5767..5596bfd3 100644
--- a/doc/unw_get_fpreg.man
+++ b/doc/unw_get_fpreg.man
@@ -1,5 +1,5 @@
 '\" t
-.\" Manual page created with latex2man on Mon Mar 31 14:25:05 PST 2003
+.\" Manual page created with latex2man on Wed Apr  2 12:52:29 PST 2003
 .\" NOTE: This file is generated, DO NOT EDIT.
 .de Vb
 .ft CW
@@ -10,7 +10,7 @@
 
 .fi
 ..
-.TH "UNW\\_GET\\_FPREG" "3" "31 March 2003" "Programming Library " "Programming Library "
+.TH "UNW\\_GET\\_FPREG" "3" "02 April 2003" "Programming Library " "Programming Library "
 .SH NAME
 unw_get_fpreg
 \-\- get contents of floating\-point register 
diff --git a/include/config.h.in b/include/config.h.in
index 5a603ff3..8ec36dd8 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -27,6 +27,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `uca' library (-luca). */
+#undef HAVE_LIBUCA
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -51,6 +54,9 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* Define to 1 if you have the <sys/uc_access.h> header file. */
+#undef HAVE_SYS_UC_ACCESS_H
+
 /* Define to 1 if you have the `ttrace' function. */
 #undef HAVE_TTRACE
 
diff --git a/src/Lfind_dynamic_proc_info.c b/src/Lfind_dynamic_proc_info.c
index ae1d499a..bc88e1c5 100644
--- a/src/Lfind_dynamic_proc_info.c
+++ b/src/Lfind_dynamic_proc_info.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gfind_dynamic_proc_info.c"
 #endif
diff --git a/src/Lget_proc_name.c b/src/Lget_proc_name.c
index 4c39ede8..378097b5 100644
--- a/src/Lget_proc_name.c
+++ b/src/Lget_proc_name.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gget_proc_name.c"
 #endif
diff --git a/src/Lput_dynamic_unwind_info.c b/src/Lput_dynamic_unwind_info.c
index b5156468..99597cd5 100644
--- a/src/Lput_dynamic_unwind_info.c
+++ b/src/Lput_dynamic_unwind_info.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gput_dynamic_unwind_info.c"
 #endif
diff --git a/src/hppa/Lget_proc_info-hppa.c b/src/hppa/Lget_proc_info-hppa.c
index e69de29b..0ba99338 100644
--- a/src/hppa/Lget_proc_info-hppa.c
+++ b/src/hppa/Lget_proc_info-hppa.c
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Gget_proc_info-hppa.c"
+#endif
diff --git a/src/hppa/Lget_proc_name-hppa.c b/src/hppa/Lget_proc_name-hppa.c
index e69de29b..096ba1c5 100644
--- a/src/hppa/Lget_proc_name-hppa.c
+++ b/src/hppa/Lget_proc_name-hppa.c
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Gget_proc_name-hppa.c"
+#endif
diff --git a/src/hppa/Lget_reg-hppa.c b/src/hppa/Lget_reg-hppa.c
index e69de29b..cacc41fe 100644
--- a/src/hppa/Lget_reg-hppa.c
+++ b/src/hppa/Lget_reg-hppa.c
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Gget_reg-hppa.c"
+#endif
diff --git a/src/hppa/Linit-hppa.c b/src/hppa/Linit-hppa.c
index e69de29b..80fe4154 100644
--- a/src/hppa/Linit-hppa.c
+++ b/src/hppa/Linit-hppa.c
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Ginit-hppa.c"
+#endif
diff --git a/src/hppa/Linit_local-hppa.c b/src/hppa/Linit_local-hppa.c
index e69de29b..6ca5f043 100644
--- a/src/hppa/Linit_local-hppa.c
+++ b/src/hppa/Linit_local-hppa.c
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Ginit_local-hppa.c"
+#endif
diff --git a/src/hppa/Lregs-hppa.c b/src/hppa/Lregs-hppa.c
index e69de29b..977ad845 100644
--- a/src/hppa/Lregs-hppa.c
+++ b/src/hppa/Lregs-hppa.c
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Gregs-hppa.c"
+#endif
diff --git a/src/hppa/Lstep-hppa.c b/src/hppa/Lstep-hppa.c
index e69de29b..81dcbf96 100644
--- a/src/hppa/Lstep-hppa.c
+++ b/src/hppa/Lstep-hppa.c
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Gstep-hppa.c"
+#endif
diff --git a/src/ia64/Lcreate_addr_space-ia64.c b/src/ia64/Lcreate_addr_space-ia64.c
index 632de656..fe56d3ca 100644
--- a/src/ia64/Lcreate_addr_space-ia64.c
+++ b/src/ia64/Lcreate_addr_space-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gcreate_addr_space-ia64.c"
 #endif
diff --git a/src/ia64/Ldestroy_addr_space-ia64.c b/src/ia64/Ldestroy_addr_space-ia64.c
index e64b129d..d055a5fe 100644
--- a/src/ia64/Ldestroy_addr_space-ia64.c
+++ b/src/ia64/Ldestroy_addr_space-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gdestroy_addr_space-ia64.c"
 #endif
diff --git a/src/ia64/Lget_fpreg-ia64.c b/src/ia64/Lget_fpreg-ia64.c
index 09c2b985..8f9a9085 100644
--- a/src/ia64/Lget_fpreg-ia64.c
+++ b/src/ia64/Lget_fpreg-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gget_fpreg-ia64.c"
 #endif
diff --git a/src/ia64/Lget_proc_info-ia64.c b/src/ia64/Lget_proc_info-ia64.c
index f48eb418..787a5a5f 100644
--- a/src/ia64/Lget_proc_info-ia64.c
+++ b/src/ia64/Lget_proc_info-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gget_proc_info-ia64.c"
 #endif
diff --git a/src/ia64/Lget_proc_name-ia64.c b/src/ia64/Lget_proc_name-ia64.c
index b80931a9..60cbfb1a 100644
--- a/src/ia64/Lget_proc_name-ia64.c
+++ b/src/ia64/Lget_proc_name-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gget_proc_name-ia64.c"
 #endif
diff --git a/src/ia64/Lget_reg-ia64.c b/src/ia64/Lget_reg-ia64.c
index e65c7477..0535526c 100644
--- a/src/ia64/Lget_reg-ia64.c
+++ b/src/ia64/Lget_reg-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gget_reg-ia64.c"
 #endif
diff --git a/src/ia64/Lget_save_loc-ia64.c b/src/ia64/Lget_save_loc-ia64.c
index 2f39b195..1687ea0c 100644
--- a/src/ia64/Lget_save_loc-ia64.c
+++ b/src/ia64/Lget_save_loc-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gget_save_loc-ia64.c"
 #endif
diff --git a/src/ia64/Linit-ia64.c b/src/ia64/Linit-ia64.c
index 6a4b8ab7..6924f3e3 100644
--- a/src/ia64/Linit-ia64.c
+++ b/src/ia64/Linit-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Ginit-ia64.c"
 #endif
diff --git a/src/ia64/Linit_local-ia64.c b/src/ia64/Linit_local-ia64.c
index a3d271d4..e23d6dcf 100644
--- a/src/ia64/Linit_local-ia64.c
+++ b/src/ia64/Linit_local-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Ginit_local-ia64.c"
 #endif
diff --git a/src/ia64/Linit_remote-ia64.c b/src/ia64/Linit_remote-ia64.c
index fe5ce932..ea821c45 100644
--- a/src/ia64/Linit_remote-ia64.c
+++ b/src/ia64/Linit_remote-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Ginit_remote-ia64.c"
 #endif
diff --git a/src/ia64/Lis_signal_frame-ia64.c b/src/ia64/Lis_signal_frame-ia64.c
index 25a73c25..df4911a5 100644
--- a/src/ia64/Lis_signal_frame-ia64.c
+++ b/src/ia64/Lis_signal_frame-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gis_signal_frame-ia64.c"
 #endif
diff --git a/src/ia64/Lparser-ia64.c b/src/ia64/Lparser-ia64.c
index a6d4f497..1f94ef7c 100644
--- a/src/ia64/Lparser-ia64.c
+++ b/src/ia64/Lparser-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gparser-ia64.c"
 #endif
diff --git a/src/ia64/Lregs-ia64.c b/src/ia64/Lregs-ia64.c
index 1fbb43b8..0743f2c3 100644
--- a/src/ia64/Lregs-ia64.c
+++ b/src/ia64/Lregs-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gregs-ia64.c"
 #endif
diff --git a/src/ia64/Lresume-ia64.c b/src/ia64/Lresume-ia64.c
index c55f3281..ad3ecbc6 100644
--- a/src/ia64/Lresume-ia64.c
+++ b/src/ia64/Lresume-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gresume-ia64.c"
 #endif
diff --git a/src/ia64/Lscript-ia64.c b/src/ia64/Lscript-ia64.c
index ec207d1c..c54509cc 100644
--- a/src/ia64/Lscript-ia64.c
+++ b/src/ia64/Lscript-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gscript-ia64.c"
 #endif
diff --git a/src/ia64/Lset_fpreg-ia64.c b/src/ia64/Lset_fpreg-ia64.c
index e9a05db2..5f853e08 100644
--- a/src/ia64/Lset_fpreg-ia64.c
+++ b/src/ia64/Lset_fpreg-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gset_fpreg-ia64.c"
 #endif
diff --git a/src/ia64/Lset_reg-ia64.c b/src/ia64/Lset_reg-ia64.c
index e3bf79b9..c81c062f 100644
--- a/src/ia64/Lset_reg-ia64.c
+++ b/src/ia64/Lset_reg-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gset_reg-ia64.c"
 #endif
diff --git a/src/ia64/Lstep-ia64.c b/src/ia64/Lstep-ia64.c
index 9cea90e5..3c61850f 100644
--- a/src/ia64/Lstep-ia64.c
+++ b/src/ia64/Lstep-ia64.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gstep-ia64.c"
 #endif
diff --git a/src/x86/Lget_proc_info-x86.c b/src/x86/Lget_proc_info-x86.c
index e69de29b..a118758d 100644
--- a/src/x86/Lget_proc_info-x86.c
+++ b/src/x86/Lget_proc_info-x86.c
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Gget_proc_info-x86.c"
+#endif
diff --git a/src/x86/Lget_proc_name-x86.c b/src/x86/Lget_proc_name-x86.c
index e69de29b..73fc3bd8 100644
--- a/src/x86/Lget_proc_name-x86.c
+++ b/src/x86/Lget_proc_name-x86.c
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Gget_proc_name-x86.c"
+#endif
diff --git a/src/x86/Lget_reg-x86.c b/src/x86/Lget_reg-x86.c
index e69de29b..8f9490b9 100644
--- a/src/x86/Lget_reg-x86.c
+++ b/src/x86/Lget_reg-x86.c
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Gget_reg-x86.c"
+#endif
diff --git a/src/x86/Linit-x86.c b/src/x86/Linit-x86.c
index e69de29b..c073efd6 100644
--- a/src/x86/Linit-x86.c
+++ b/src/x86/Linit-x86.c
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Ginit-x86.c"
+#endif
diff --git a/src/x86/Linit_local-x86.c b/src/x86/Linit_local-x86.c
index e69de29b..92e6c8bd 100644
--- a/src/x86/Linit_local-x86.c
+++ b/src/x86/Linit_local-x86.c
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Ginit_local-x86.c"
+#endif
diff --git a/src/x86/Lis_signal_frame-x86.c b/src/x86/Lis_signal_frame-x86.c
index e69de29b..fa45d073 100644
--- a/src/x86/Lis_signal_frame-x86.c
+++ b/src/x86/Lis_signal_frame-x86.c
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Gis_signal_frame-x86.c"
+#endif
diff --git a/src/x86/Lregs-x86.c b/src/x86/Lregs-x86.c
index e69de29b..58e96db3 100644
--- a/src/x86/Lregs-x86.c
+++ b/src/x86/Lregs-x86.c
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Gregs-x86.c"
+#endif
diff --git a/src/x86/Lresume-x86.c b/src/x86/Lresume-x86.c
index e69de29b..4fbfe58a 100644
--- a/src/x86/Lresume-x86.c
+++ b/src/x86/Lresume-x86.c
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Gresume-x86.c"
+#endif
diff --git a/src/x86/Lset_reg-x86.c b/src/x86/Lset_reg-x86.c
index e69de29b..cff26a76 100644
--- a/src/x86/Lset_reg-x86.c
+++ b/src/x86/Lset_reg-x86.c
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Gset_reg-x86.c"
+#endif
diff --git a/src/x86/Lstep-x86.c b/src/x86/Lstep-x86.c
index e69de29b..b55da876 100644
--- a/src/x86/Lstep-x86.c
+++ b/src/x86/Lstep-x86.c
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Gstep-x86.c"
+#endif