diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 561e771be4..6aff604653 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-22  Pedro Alves  <pedro@codesourcery.com>
+
+	* remote.c (compare_sections_command): Don't declare exec_bfd.
+	* tracepoint.c: Include "gdbcore.h".
+	(remote_set_transparent_ranges): Don't declare exec_bfd.
+
 2009-05-21  Pedro Alves  <pedro@codesourcery.com>
 
 	* aix-thread.c (init_aix_thread_ops): Whitespace.
diff --git a/gdb/remote.c b/gdb/remote.c
index 8a1a0d4c14..70a0248812 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -7152,7 +7152,6 @@ compare_sections_command (char *args, int from_tty)
   struct remote_state *rs = get_remote_state ();
   asection *s;
   unsigned long host_crc, target_crc;
-  extern bfd *exec_bfd;
   struct cleanup *old_chain;
   char *tmp;
   char *sectdata;
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index dece79964f..317d1238d3 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -40,6 +40,7 @@
 #include "observer.h"
 #include "user-regs.h"
 #include "valprint.h"
+#include "gdbcore.h"
 
 #include "ax.h"
 #include "ax-gdb.h"
@@ -1247,7 +1248,6 @@ static long target_buf_size;
 static void
 remote_set_transparent_ranges (void)
 {
-  extern bfd *exec_bfd;
   asection *s;
   bfd_size_type size;
   bfd_vma lma;