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/main.c

@@ -46,6 +46,7 @@
 #include "update.h"
 #include "common.h"
 #include "optlist.h"
+#include "server.h"
 #include <stdlib.h>
 #if !defined(_WIN32)
 #include <sys/time.h>