diff --git a/gdb/amd64-nat.c b/gdb/amd64-nat.c
index 9b50f46758..81a87b69e4 100644
--- a/gdb/amd64-nat.c
+++ b/gdb/amd64-nat.c
@@ -26,7 +26,7 @@
 #include "gdb_assert.h"
 
 #include "i386-tdep.h"
-#include "x86-64-tdep.h"
+#include "amd64-tdep.h"
 
 /* The following bits of code help with implementing debugging 32-bit
    code natively on AMD64.  The idea is to define two mappings between
diff --git a/gdb/amd64bsd-nat.c b/gdb/amd64bsd-nat.c
index 96d535a7af..4c7c04a881 100644
--- a/gdb/amd64bsd-nat.c
+++ b/gdb/amd64bsd-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for AMD64 BSD's.
 
-   Copyright 2003 Free Software Foundation, Inc.
+   Copyright 2003, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -31,7 +31,7 @@
 #include <sys/ptrace.h>
 #include <machine/reg.h>
 
-#include "x86-64-tdep.h"
+#include "amd64-tdep.h"
 #include "amd64-nat.h"
 
 
diff --git a/gdb/amd64fbsd-nat.c b/gdb/amd64fbsd-nat.c
index 5f16c95daf..f08373422c 100644
--- a/gdb/amd64fbsd-nat.c
+++ b/gdb/amd64fbsd-nat.c
@@ -44,7 +44,7 @@ typedef struct fpreg fpregset_t;
 #endif
 
 #include "gregset.h"
-#include "x86-64-tdep.h"
+#include "amd64-tdep.h"
 #include "amd64-nat.h"
 
 
diff --git a/gdb/amd64fbsd-tdep.c b/gdb/amd64fbsd-tdep.c
index fb275f6ecd..e4e02abb61 100644
--- a/gdb/amd64fbsd-tdep.c
+++ b/gdb/amd64fbsd-tdep.c
@@ -28,7 +28,7 @@
 
 #include "gdb_string.h"
 
-#include "x86-64-tdep.h"
+#include "amd64-tdep.h"
 #include "solib-svr4.h"
 
 /* Support for signal handlers.  */
diff --git a/gdb/amd64nbsd-nat.c b/gdb/amd64nbsd-nat.c
index da4532e69e..df7ceb9e86 100644
--- a/gdb/amd64nbsd-nat.c
+++ b/gdb/amd64nbsd-nat.c
@@ -23,7 +23,7 @@
 
 #include "gdb_assert.h"
 
-#include "x86-64-tdep.h"
+#include "amd64-tdep.h"
 #include "amd64-nat.h"
 
 /* Mapping between the general-purpose registers in NetBSD/amd64
diff --git a/gdb/amd64nbsd-tdep.c b/gdb/amd64nbsd-tdep.c
index b57274da01..a04e04fa34 100644
--- a/gdb/amd64nbsd-tdep.c
+++ b/gdb/amd64nbsd-tdep.c
@@ -27,7 +27,7 @@
 
 #include "gdb_assert.h"
 
-#include "x86-64-tdep.h"
+#include "amd64-tdep.h"
 #include "nbsd-tdep.h"
 #include "solib-svr4.h"
 
diff --git a/gdb/amd64obsd-nat.c b/gdb/amd64obsd-nat.c
index 5a802d4bbe..e8d92fefa8 100644
--- a/gdb/amd64obsd-nat.c
+++ b/gdb/amd64obsd-nat.c
@@ -23,7 +23,7 @@
 
 #include "gdb_assert.h"
 
-#include "x86-64-tdep.h"
+#include "amd64-tdep.h"
 #include "amd64-nat.h"
 
 /* Mapping between the general-purpose registers in OpenBSD/amd64
diff --git a/gdb/amd64obsd-tdep.c b/gdb/amd64obsd-tdep.c
index cc1a78a399..198c87e4a2 100644
--- a/gdb/amd64obsd-tdep.c
+++ b/gdb/amd64obsd-tdep.c
@@ -29,7 +29,7 @@
 #include "gdb_assert.h"
 #include "gdb_string.h"
 
-#include "x86-64-tdep.h"
+#include "amd64-tdep.h"
 #include "i387-tdep.h"
 #include "solib-svr4.h"