diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3fb208589f..63b6081730 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 20 12:22:32 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* TODO: Mention ``extern'' and ``STREQ'' cleanups.
+
 2000-11-19  Jim Blandy  <jimb@redhat.com>
 
 	* symtab.c (no_symtab_msg): Remove definition.
diff --git a/gdb/TODO b/gdb/TODO
index 59c6c50c61..8d0785da85 100644
--- a/gdb/TODO
+++ b/gdb/TODO
@@ -517,6 +517,18 @@ SIM_SIGBREAK and have GDB pass back sim_resume (..., SIGBREAK).
 Move remote_remove_hw_breakpoint, remote_insert_hw_breakpoint,
 remote_remove_watchpoint, remote_insert_watchpoint into target vector.
 
+--
+
+Eliminate ``extern'' from C files.
+
+--
+
+Replace ``STREQ()'' et.al. with ``strcmp() == 0'' et.al.
+
+Extreme care is recommeded - perhaps only modify tests that are
+exercised by the testsuite (as determined using some type of code
+coverage analysis).
+
 --
 
 			New Features and Fixes