Add some missing declarations to headers. Remove some redundant

declarations elsewhere.  Change linkage of some functions to static.

src/lib/gen/emp_config.c

@@ -52,6 +52,7 @@
 #include "match.h"
 #include "file.h"
 #include "optlist.h"
+#include "tel.h"
 #include "gen.h"		/* parse */
 
 /* for systems without strdup  */
@@ -380,9 +381,6 @@ struct otherfiles {
     char *name;
 };
 
-extern s_char *upfil, *downfil, *disablefil, *banfil, *authfil;
-extern s_char *commfil, *annfil, *telfil, *teldir, *timestampfil;
-
 /* list of other well known files... -maybe tailor these oneday
  * anyway - meantime they are all relative to datadir */
 static struct otherfiles ofiles[] = {

src/lib/gen/io.c

@@ -63,8 +63,6 @@
 
 #include "empthread.h"
 
-extern struct player *player;	/* XXX */
-
 struct iop {
     int fd;
     struct ioqueue *input;