Don't declare things in more than one place. Move some declarations

between headers.  Code is now fully prototyped and compiles cleanly
with gcc -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs
-Wredundant-decls.  Closes #723788.

src/lib/update/anno.c

@@ -42,6 +42,7 @@
 #include <unistd.h>
 #endif
 #include "update.h"
+#include "optlist.h"
 #include "common.h"
 
 void