diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6ea208546d..985d12176b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-23  David Carlton  <carlton@math.stanford.edu>
+
+	* linespec.c: #include "parser-defs.h".
+	Delete prototype for find_template_name_end.
+	* Makefile.in (linespec.o): Depend on $(parser_defs_h).
+
 2002-10-23  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* NEWS: add recent mi fixes.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index c3fccd3707..5a3a5c6ba4 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1824,7 +1824,7 @@ lin-lwp.o: lin-lwp.c $(defs_h) $(gdb_assert_h) $(gdb_string_h) $(gdb_wait_h) \
 	$(gdbthread_h) $(inferior_h) $(target_h) $(regcache_h) $(gdbcmd_h)
 linespec.o: linespec.c $(defs_h) $(symtab_h) $(frame_h) $(command_h) \
 	$(symfile_h) $(objfiles_h) $(demangle_h) $(value_h) $(completer_h) \
-	$(cp_abi_h) $(source_h)
+	$(cp_abi_h) $(source_h) $(parser_defs_h)
 linux-proc.o: linux-proc.c $(defs_h) $(inferior_h) $(regcache_h) \
 	$(gregset_h) $(gdbcore_h) $(gdbthread_h) $(elf_bfd_h) \
 	$(cli_decode_h) $(gdb_string_h)
diff --git a/gdb/linespec.c b/gdb/linespec.c
index 5631fd3143..bad226e8e2 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -31,11 +31,7 @@
 #include "value.h"
 #include "completer.h"
 #include "cp-abi.h"
-
-/* Prototype for one function in parser-defs.h,
-   instead of including that entire file. */
-
-extern char *find_template_name_end (char *);
+#include "parser-defs.h"
 
 /* We share this one with symtab.c, but it is not exported widely. */