diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8f2cb839a1..ce42a296d5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-10  Mark Kettenis  <kettenis@gnu.org>
+
+	* x86-64-tdep.h (amd64fbsd_sigtramp_start, amd64fbsd_sigtramp_end,
+	amd64fbsd_sc_reg_offset): Add extern declarations.
+	* amd64fbsd-nat.c (_initialize_am64fbsd_nat): Remove extern
+	declarations.
+
 2003-08-11  Ben Elliston  <bje@wasabisystems.com>
 
 	* MAINTAINERS (write after approval): Update my mail address.
diff --git a/gdb/amd64fbsd-nat.c b/gdb/amd64fbsd-nat.c
index 7880e58c48..71861d99cc 100644
--- a/gdb/amd64fbsd-nat.c
+++ b/gdb/amd64fbsd-nat.c
@@ -223,7 +223,6 @@ _initialize_am64fbsd_nat (void)
      system header files and sysctl(3) to get at the relevant
      information.  */
 
-  extern int amd64fbsd_sc_reg_offset[];
 #define SC_REG_OFFSET amd64fbsd_sc_reg_offset
 
   /* We only check the program counter, stack pointer and frame
@@ -285,9 +284,6 @@ Please report this to <bug-gdb@gnu.org>.",
     int ps_strings;
     size_t len;
 
-    extern CORE_ADDR amd64fbsd_sigtramp_start;
-    extern CORE_ADDR amd64fbsd_sigtramp_end;
-
     mib[0] = CTL_KERN;
     mib[1] = KERN_PS_STRINGS;
     len = sizeof (ps_strings);
diff --git a/gdb/x86-64-tdep.h b/gdb/x86-64-tdep.h
index 7ad6990f76..608219c578 100644
--- a/gdb/x86-64-tdep.h
+++ b/gdb/x86-64-tdep.h
@@ -60,5 +60,11 @@ void x86_64_supply_fxsave (char *fxsave);
    reserved bits in *FXSAVE.  */
 
 void x86_64_fill_fxsave (char *fxsave, int regnum);
+
+
+/* Variables exported from amd64fbsd-tdep.c.  */
+extern CORE_ADDR amd64fbsd_sigtramp_start;
+extern CORE_ADDR amd64fbsd_sigtramp_end;
+extern int amd64fbsd_sc_reg_offset[];
 
 #endif /* x86-64-tdep.h */