diff --git a/src/Makefile.am b/src/Makefile.am
index 5a5151c7..9157f52e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,22 +1,24 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include
+
 lib_LTLIBRARIES = libunwind.la
 
 libunwind_la_SOURCES_common = backtrace.c
 
 if ARCH_IA64
-libunwind_la_SOURCES = $(libunwind_la_SOURCES_common)			\
-	ia64/init.h ia64/offsets.h ia64/rse.h ia64/script.h		\
-	ia64/ucontext_i.h ia64/unwind_i.h ia64/unwind_decoder.h		\
-									\
-	ia64/__ia64_install_context.S ia64/shared.c ia64/tables-glibc.c	\
-									\
-	ia64/init.c ia64/parser.c ia64/regs.c ia64/script.c		\
-	ia64/unw_get_reg.c ia64/unw_get_fpreg.c ia64/unw_resume.c	\
-	ia64/unw_set_reg.c ia64/unw_set_fpreg.c				\
-	ia64/unw_init_local.c ia64/unw_init_remote.c ia64/unw_step.c	\
-									\
-	ia64/Linit.c ia64/Lparser.c ia64/Lregs.c ia64/Lscript.c		\
-	ia64/Lunw_get_reg.c ia64/Lunw_get_fpreg.c ia64/Lunw_resume.c	\
-	ia64/Lunw_set_reg.c ia64/Lunw_set_fpreg.c			\
+libunwind_la_SOURCES = $(libunwind_la_SOURCES_common)			   \
+	ia64/init.h ia64/offsets.h ia64/rse.h ia64/script.h		   \
+	ia64/ucontext_i.h ia64/unwind_i.h ia64/unwind_decoder.h		   \
+									   \
+	ia64/__ia64_install_context.S ia64/shared.c ia64/tables-glibc.c	   \
+									   \
+	ia64/init.c ia64/parser.c ia64/regs.c ia64/script.c		   \
+	ia64/unw_get_reg.c ia64/unw_get_fpreg.c ia64/unw_get_save_loc.c	   \
+	ia64/unw_resume.c ia64/unw_set_reg.c ia64/unw_set_fpreg.c	   \
+	ia64/unw_init_local.c ia64/unw_init_remote.c ia64/unw_step.c	   \
+									   \
+	ia64/Linit.c ia64/Lparser.c ia64/Lregs.c ia64/Lscript.c		   \
+	ia64/Lunw_get_reg.c ia64/Lunw_get_fpreg.c ia64/Lunw_get_save_loc.c \
+	ia64/Lunw_resume.c ia64/Lunw_set_reg.c ia64/Lunw_set_fpreg.c	   \
 	ia64/Lunw_init_local.c ia64/Lunw_init_remote.c ia64/Lunw_step.c
 else
 if ARCH_x86