diff --git a/Makefile.in b/Makefile.in
index b9e86724..15fd32c7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,7 +55,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/include/config.h
 CONFIG_CLEAN_FILES = include/libunwind-common.h include/libunwind.h \
-	include/tdep.h
+	include/tdep
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -235,19 +235,20 @@ include_HEADERS_common = $(include_HEADERS_tdep)		\
 nodist_include_HEADERS = include/libunwind-common.h
 SUBDIRS = src tests doc
 EXTRA_DIST = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h	\
-	include/internal.h include/mempool.h				\
+	include/libunwind_i.h include/mempool.h				\
 	include/remote.h						\
 	include/libunwind-common.h.in					\
-	include/libunwind-ia64.h include/tdep-ia64.h			\
-	include/ia64/jmpbuf.h include/ia64/rse.h include/ia64/script.h	\
-	include/libunwind-hppa.h include/tdep-hppa.h			\
-	include/hppa/jmpbuf.h include/hppa/dwarf-config.h		\
-	include/libunwind-x86.h include/tdep-x86.h			\
-	include/x86/jmpbuf.h include/x86/dwarf-config.h			\
-	include/libunwind-x86_64.h include/tdep-x86_64.h		\
-	include/x86_64/jmpbuf.h include/x86_64/dwarf-config.h
+	include/libunwind-ia64.h include/tdep-ia64/libunwind_i.h	\
+	include/tdep-ia64/jmpbuf.h include/tdep-ia64/rse.h 		\
+	include/tdep-ia64/script.h					\
+	include/libunwind-hppa.h include/tdep-hppa/libunwind_i.h	\
+	include/tdep-hppa/jmpbuf.h include/tdep-hppa/dwarf-config.h	\
+	include/libunwind-x86.h include/tdep-x86/libunwind_i.h		\
+	include/tdep-x86/jmpbuf.h include/tdep-x86/dwarf-config.h	\
+	include/libunwind-x86_64.h include/tdep-x86_64/libunwind_i.h	\
+	include/tdep-x86_64/jmpbuf.h include/tdep-x86_64/dwarf-config.h
 
-DISTCLEANFILES = include/libunwind.h include/tdep.h
+DISTCLEANFILES = include/libunwind.h include/tdep
 all: all-recursive
 
 .SUFFIXES:
@@ -483,7 +484,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/config $(distdir)/doc $(distdir)/include $(distdir)/include/hppa $(distdir)/include/ia64 $(distdir)/include/x86 $(distdir)/include/x86_64 $(distdir)/tests
+	$(mkdir_p) $(distdir)/config $(distdir)/doc $(distdir)/include $(distdir)/include/tdep-hppa $(distdir)/include/tdep-ia64 $(distdir)/include/tdep-x86 $(distdir)/include/tdep-x86_64 $(distdir)/tests
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/configure b/configure
index 9e8e0dd2..e286821f 100644
--- a/configure
+++ b/configure
@@ -20727,7 +20727,7 @@ fi
 if test x$target_arch != x$build_arch; then
   CPPFLAGS="${CPPFLAGS} -DUNW_REMOTE_ONLY"
 fi
-                    ac_config_links="$ac_config_links include/libunwind.h:include/libunwind-$target_arch.h include/tdep.h:include/tdep-$target_arch.h"
+                    ac_config_links="$ac_config_links include/libunwind.h:include/libunwind-$target_arch.h include/tdep:include/tdep-$target_arch"
 
 
 # Check whether --enable-debug or --disable-debug was given.
@@ -21518,7 +21518,7 @@ do
   "doc/common.tex" ) CONFIG_FILES="$CONFIG_FILES doc/common.tex" ;;
   "include/libunwind-common.h" ) CONFIG_FILES="$CONFIG_FILES include/libunwind-common.h" ;;
   "include/libunwind.h" ) CONFIG_LINKS="$CONFIG_LINKS include/libunwind.h:include/libunwind-$target_arch.h" ;;
-  "include/tdep.h" ) CONFIG_LINKS="$CONFIG_LINKS include/tdep.h:include/tdep-$target_arch.h" ;;
+  "include/tdep" ) CONFIG_LINKS="$CONFIG_LINKS include/tdep:include/tdep-$target_arch" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff --git a/src/Makefile.in b/src/Makefile.in
index 5bef4211..32291c10 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -770,7 +770,7 @@ lib_LIBRARIES = $(LIBRARIES_cdep)
 lib_LTLIBRARIES = $(lib_LTLIBRARIES_cdep) $(lib_LTLIBRARIES_arch) \
 		  $(lib_LTLIBRARIES_cdep_setjmp)
 
-AM_CPPFLAGS = -I$(top_srcdir)/include/$(arch) -I$(top_srcdir)/include -I.
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/tdep-$(arch) -I.
 AM_CCASFLAGS = $(AM_CPPFLAGS)
 EXTRA_DIST = elfxx.h elfxx.c unwind/unwind-internal.h	\
 		$(libunwind_la_SOURCES_hppa)			\