diff --git a/src/mi/Gdyn-extract.c b/src/mi/Gdyn-extract.c
index 31559832..5258839f 100644
--- a/src/mi/Gdyn-extract.c
+++ b/src/mi/Gdyn-extract.c
@@ -1,5 +1,5 @@
 /* libunwind - a platform-independent unwind library
-   Copyright (C) 2001-2002 Hewlett-Packard Co
+   Copyright (C) 2001-2002, 2005 Hewlett-Packard Co
 	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
 This file is part of libunwind.
@@ -23,8 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "internal.h"
-#include "tdep.h"
+#include "libunwind_i.h"
 
 HIDDEN int
 unwi_extract_dynamic_proc_info (unw_addr_space_t as, unw_word_t ip,
diff --git a/src/mi/Gdyn-remote.c b/src/mi/Gdyn-remote.c
index 6a6252d0..917a11de 100644
--- a/src/mi/Gdyn-remote.c
+++ b/src/mi/Gdyn-remote.c
@@ -1,5 +1,5 @@
 /* libunwind - a platform-independent unwind library
-   Copyright (C) 2001-2002 Hewlett-Packard Co
+   Copyright (C) 2001-2002, 2005 Hewlett-Packard Co
 	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
 This file is part of libunwind.
@@ -25,9 +25,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 #include <stdlib.h>
 
-#include "internal.h"
+#include "libunwind_i.h"
 #include "remote.h"
-#include "tdep.h"
 
 static void
 free_regions (unw_dyn_region_info_t *region)
diff --git a/src/mi/Gfind_dynamic_proc_info.c b/src/mi/Gfind_dynamic_proc_info.c
index 5df946a9..24c72ed7 100644
--- a/src/mi/Gfind_dynamic_proc_info.c
+++ b/src/mi/Gfind_dynamic_proc_info.c
@@ -1,5 +1,5 @@
 /* libunwind - a platform-independent unwind library
-   Copyright (C) 2001-2002 Hewlett-Packard Co
+   Copyright (C) 2001-2002, 2005 Hewlett-Packard Co
 	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
 This file is part of libunwind.
@@ -23,10 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include <stdio.h>
-
-#include "internal.h"
-#include "tdep.h"
+#include "libunwind_i.h"
 
 #ifdef UNW_REMOTE_ONLY
 
diff --git a/src/mi/Gget_proc_info_by_ip.c b/src/mi/Gget_proc_info_by_ip.c
index d8b436e3..4c9de770 100644
--- a/src/mi/Gget_proc_info_by_ip.c
+++ b/src/mi/Gget_proc_info_by_ip.c
@@ -1,5 +1,5 @@
 /* libunwind - a platform-independent unwind library
-   Copyright (C) 2003 Hewlett-Packard Co
+   Copyright (C) 2003, 2005 Hewlett-Packard Co
 	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
 This file is part of libunwind.
@@ -23,10 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include <libunwind.h>
-
-#include "internal.h"
-#include "tdep.h"
+#include "libunwind_i.h"
 
 PROTECTED int
 unw_get_proc_info_by_ip (unw_addr_space_t as, unw_word_t ip,
diff --git a/src/mi/init.c b/src/mi/init.c
index 9d9e6019..4bf97c48 100644
--- a/src/mi/init.c
+++ b/src/mi/init.c
@@ -23,11 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include <assert.h>
-#include <stdlib.h>
-
-#include "internal.h"
-#include "tdep.h"
+#include "libunwind_i.h"
 
 HIDDEN intrmask_t unwi_full_mask;
 
diff --git a/src/os-hpux.c b/src/os-hpux.c
index cb6852d1..586ace2e 100644
--- a/src/os-hpux.c
+++ b/src/os-hpux.c
@@ -1,5 +1,5 @@
 /* libunwind - a platform-independent unwind library
-   Copyright (C) 2003-2004 Hewlett-Packard Co
+   Copyright (C) 2003-2005 Hewlett-Packard Co
 	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
 This file is part of libunwind.
@@ -28,8 +28,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #include <dlfcn.h>
 #include <unistd.h>
 
-#include "internal.h"
-#include "tdep.h"
+#include "libunwind_i.h"
 
 #include "elf64.h"
 
diff --git a/src/os-linux.c b/src/os-linux.c
index 4395e356..ae37d8f8 100644
--- a/src/os-linux.c
+++ b/src/os-linux.c
@@ -1,5 +1,5 @@
 /* libunwind - a platform-independent unwind library
-   Copyright (C) 2003-2004 Hewlett-Packard Co
+   Copyright (C) 2003-2005 Hewlett-Packard Co
 	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
 This file is part of libunwind.
@@ -28,8 +28,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #include <limits.h>
 #include <stdio.h>
 
-#include "internal.h"
-#include "tdep.h"
+#include "libunwind_i.h"
 #include "os-linux.h"
 
 PROTECTED int
diff --git a/src/ptrace/_UPT_internal.h b/src/ptrace/_UPT_internal.h
index 7da9bf04..0577097a 100644
--- a/src/ptrace/_UPT_internal.h
+++ b/src/ptrace/_UPT_internal.h
@@ -1,5 +1,5 @@
 /* libunwind - a platform-independent unwind library
-   Copyright (C) 2003 Hewlett-Packard Co
+   Copyright (C) 2003, 2005 Hewlett-Packard Co
 	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
 This file is part of libunwind.
@@ -34,8 +34,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 #include <sys/ptrace.h>
 
-#include "internal.h"
-#include "tdep.h"
+#include "libunwind_i.h"
 
 struct UPT_info
   {
diff --git a/src/unwind/unwind-internal.h b/src/unwind/unwind-internal.h
index 348be00d..4db2eda6 100644
--- a/src/unwind/unwind-internal.h
+++ b/src/unwind/unwind-internal.h
@@ -1,5 +1,5 @@
 /* libunwind - a platform-independent unwind library
-   Copyright (C) 2003 Hewlett-Packard Co
+   Copyright (C) 2003, 2005 Hewlett-Packard Co
 	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
 This file is part of libunwind.
@@ -32,8 +32,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #include <stdlib.h>
 #include <libunwind.h>
 
-#include "internal.h"
-#include "tdep.h"
+#include "libunwind_i.h"
 
 /* The version of the _Unwind_*() interface implemented by this code.  */
 #define _U_VERSION	1
diff --git a/src/x86/unwind_i.h b/src/x86/unwind_i.h
index 637e0eb6..63477191 100644
--- a/src/x86/unwind_i.h
+++ b/src/x86/unwind_i.h
@@ -31,8 +31,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 #include <libunwind-x86.h>
 
-#include "internal.h"
-#include "tdep.h"
+#include "libunwind_i.h"
 
 /* DWARF column numbers: */
 #define EAX	0
diff --git a/src/x86_64/unwind_i.h b/src/x86_64/unwind_i.h
index a749174e..af779bb2 100644
--- a/src/x86_64/unwind_i.h
+++ b/src/x86_64/unwind_i.h
@@ -1,5 +1,5 @@
 /* libunwind - a platform-independent unwind library
-   Copyright (C) 2002 Hewlett-Packard Co
+   Copyright (C) 2002, 2005 Hewlett-Packard Co
 	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
    Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
@@ -33,8 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 #include <libunwind-x86_64.h>
 
-#include "internal.h"
-#include "tdep.h"
+#include "libunwind_i.h"
 #include <sys/ucontext.h>
 
 /* DWARF column numbers for x86_64: */