diff --git a/src/Makefile.am b/src/Makefile.am
index 47e47362..52163e4a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,16 @@
 SOVERSION=0:0:0		# See comments at end of file.
 
-if REMOTE_ONLY
-libunwind_la_SOURCES_common = dyn-common.h mempool.c mempool.h
-else
-libunwind_la_SOURCES_common = dyn-common.h dyn-local.c dyn-register.c \
-	mempool.c mempool.h backtrace.c
+libunwind_la_SOURCES_common =					\
+	backtrace.c get_proc_name.c				\
+	dyn-cancel.c dyn-extract.c dyn-local.c dyn-register.c	\
+	dyn-remote.c					 	\
+	mempool.c mempool.h					\
+	Gfind_dynamic_proc_info.c Gput_dynamic_unwind_info.c	\
+	Lfind_dynamic_proc_info.c Lput_dynamic_unwind_info.c
 
+if REMOTE_ONLY
+# Nothing special.
+else
 #
 # This is not ideal, but I know of no other way to install an
 # alias for a library.
@@ -16,32 +21,30 @@ install-exec-hook:
 
 endif
 
-libunwind_la_SOURCES_ia64 = $(libunwind_la_SOURCES_common)		   \
-	ia64/init.h ia64/offsets.h ia64/regs.h ia64/rse.h ia64/script.h	   \
-	ia64/ucontext_i.h ia64/unwind_decoder.h ia64/unwind_i.h		   \
-									   \
-	ia64/__ia64_install_context.S ia64/tables.c			   \
-	ia64/unw_regname.c						   \
-									   \
-	ia64/init.c ia64/parser.c ia64/regs.c ia64/script.c		   \
-	ia64/unw_create_addr_space.c ia64/unw_destroy_addr_space.c	   \
-	ia64/unw_find_dynamic_proc_info.c				   \
-	ia64/unw_set_caching_policy.c ia64/unw_flush_cache.c		   \
-	ia64/unw_get_accessors.c ia64/unw_get_proc_info.c		   \
-	ia64/unw_get_reg.c ia64/unw_get_fpreg.c ia64/unw_get_save_loc.c	   \
-	ia64/unw_is_signal_frame.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_create_addr_space.c ia64/Lunw_destroy_addr_space.c	   \
-	ia64/Lunw_find_dynamic_proc_info.c				   \
-	ia64/Lunw_set_caching_policy.c ia64/Lunw_flush_cache.c		   \
-	ia64/Lunw_get_accessors.c ia64/Lunw_get_proc_info.c		   \
-	ia64/Lunw_get_reg.c ia64/Lunw_get_fpreg.c ia64/Lunw_get_save_loc.c \
-	ia64/Lunw_is_signal_frame.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
+libunwind_la_SOURCES_ia64 = $(libunwind_la_SOURCES_common)		  \
+	ia64/init.h ia64/offsets.h ia64/regs.h ia64/rse.h		  \
+	ia64/ucontext_i.h ia64/unwind_decoder.h ia64/unwind_i.h		  \
+									  \
+	ia64/__ia64_install_context.S ia64/tables.c			  \
+	ia64/unw_regname.c						  \
+									  \
+	ia64/Ginit.c ia64/Gparser.c ia64/Gregs.c ia64/Gscript.c		  \
+	ia64/Gcreate_addr_space.c ia64/Gdestroy_addr_space.c		  \
+	ia64/Gset_caching_policy.c ia64/Gflush_cache.c			  \
+	ia64/Gget_accessors.c ia64/Gget_proc_info.c ia64/Gget_proc_name.c \
+	ia64/Gget_reg.c ia64/Gget_fpreg.c ia64/Gget_save_loc.c		  \
+	ia64/Gis_signal_frame.c						  \
+	ia64/Gresume.c ia64/Gset_reg.c ia64/Gset_fpreg.c		  \
+	ia64/Ginit_local.c ia64/Ginit_remote.c ia64/Gstep.c		  \
+									  \
+	ia64/Linit.c ia64/Lparser.c ia64/Lregs.c ia64/Lscript.c		  \
+	ia64/Lcreate_addr_space.c ia64/Ldestroy_addr_space.c		  \
+	ia64/Lset_caching_policy.c ia64/Lflush_cache.c			  \
+	ia64/Lget_accessors.c ia64/Lget_proc_info.c ia64/Lget_proc_name.c \
+	ia64/Lget_reg.c ia64/Lget_fpreg.c ia64/Lget_save_loc.c		  \
+	ia64/Lis_signal_frame.c						  \
+	ia64/Lresume.c ia64/Lset_reg.c ia64/Lset_fpreg.c		  \
+	ia64/Linit_local.c ia64/Linit_remote.c ia64/Lstep.c
 
 if ARCH_IA64
  lib_LTLIBRARIES = libunwind-ia64.la