Download raw body.
userland prototype cleanup
remove prototypes with no matching function
extern vars with no matching var
diff --git bin/csh/extern.h bin/csh/extern.h
index cdbe62bbbb2..b13973049e6 100644
--- bin/csh/extern.h
+++ bin/csh/extern.h
@@ -201,7 +201,6 @@ int prefix(Char *, Char *);
Char **saveblk(Char **);
Char *strip(Char *);
Char *quote(Char *);
-char *strspl(char *, char *);
void udvar(Char *);
/*
diff --git bin/md5/crc.h bin/md5/crc.h
index 2000c489c9b..6d3cff4c1ad 100644
--- bin/md5/crc.h
+++ bin/md5/crc.h
@@ -28,4 +28,3 @@ void CKSUM_Init(CKSUM_CTX *);
void CKSUM_Update(CKSUM_CTX *, const u_int8_t *, size_t);
void CKSUM_Final(CKSUM_CTX *);
char *CKSUM_End(CKSUM_CTX *, char *);
-char *CKSUM_Data(const u_int8_t *, size_t, char *);
diff --git bin/mt/mt.h bin/mt/mt.h
index da24d3d4923..8f428a8cde8 100644
--- bin/mt/mt.h
+++ bin/mt/mt.h
@@ -37,8 +37,6 @@ int rmtopen(char *tape, int mode);
int rmtioctl(int command, int count);
struct mtget *rmtstatus(void);
-void interrupt(int signo); /* in case operator bangs on console */
-
/*
* Exit status codes
*/
diff --git bin/stty/extern.h bin/stty/extern.h
index beb5e1c1cc9..f07f85087cc 100644
--- bin/stty/extern.h
+++ bin/stty/extern.h
@@ -34,15 +34,11 @@
extern char *__progname;
-int c_cchars(const void *, const void *);
-int c_modes(const void *, const void *);
int csearch(char ***, struct info *);
-void checkredirect(void);
void gprint(struct termios *, struct winsize *, int);
void gread(struct termios *, char *);
int ksearch(char ***, struct info *);
int msearch(char ***, struct info *);
-void optlist(void);
void print(struct termios *, struct winsize *, int, enum FMT);
void usage(void);
diff --git games/fortune/fortune/fortune.c games/fortune/fortune/fortune.c
index 94fb4b08c66..65f438ce1fd 100644
--- games/fortune/fortune/fortune.c
+++ games/fortune/fortune/fortune.c
@@ -140,7 +140,6 @@ void sum_tbl(STRFILE *, STRFILE *);
__dead void usage(void);
void zero_tbl(STRFILE *);
-char *conv_pat(char *);
int find_matches(void);
void matches_in_list(FILEDESC *);
int maxlen_in_list(FILEDESC *);
diff --git games/hack/hack.h games/hack/hack.h
index 9e0e9154cd7..9a4138dc47b 100644
--- games/hack/hack.h
+++ games/hack/hack.h
@@ -680,7 +680,6 @@ char *getdate(void);
int phase_of_the_moon(void);
int night(void);
int midnight(void);
-void gethdate(char *);
void getlock(void);
#ifdef MAIL
void getmailstatus(void);
diff --git games/hunt/hunt/display.h games/hunt/hunt/display.h
index 08d9ba9041f..5162ea95ba8 100644
--- games/hunt/hunt/display.h
+++ games/hunt/hunt/display.h
@@ -15,5 +15,3 @@ char display_atyx(int, int);
void display_redraw_screen(void);
int display_iskillchar(char);
int display_iserasechar(char);
-
-extern int cur_row, cur_col;
diff --git games/phantasia/main.c games/phantasia/main.c
index e9f2136b24e..577e3b6d449 100644
--- games/phantasia/main.c
+++ games/phantasia/main.c
@@ -1131,7 +1131,7 @@ genchar(int type)
/ MODULES CALLED: signal(), wclear(), noecho(), cbreak(), initscr(),
/ wrefresh()
/
-/ GLOBAL INPUTS: *stdscr, ill_sig()
+/ GLOBAL INPUTS: *stdscr
/
/ GLOBAL OUTPUTS: Windows
/
diff --git games/phantasia/phantglobs.h games/phantasia/phantglobs.h
index 7b0fc5a0472..aecad315d4d 100644
--- games/phantasia/phantglobs.h
+++ games/phantasia/phantglobs.h
@@ -100,7 +100,6 @@ void genchar(int);
int getanswer(char *, bool);
void getstring(char *, int);
void hitmonster(double);
-void ill_sig(int);
double infloat(void);
void initialstate(void);
void initplayer(struct player *);
diff --git libexec/ftpd/extern.h libexec/ftpd/extern.h
index 28e28eb972c..0a0607ec94b 100644
--- libexec/ftpd/extern.h
+++ libexec/ftpd/extern.h
@@ -61,8 +61,6 @@
* @(#)extern.h 8.2 (Berkeley) 4/4/94
*/
-void blkfree(char **);
-char **copyblk(char **);
void cwd(char *);
void delete(const char *);
void dologout(int);
diff --git libexec/ld.so/resolve.h libexec/ld.so/resolve.h
index 0b3278e6f7a..fcf756b3775 100644
--- libexec/ld.so/resolve.h
+++ libexec/ld.so/resolve.h
@@ -322,7 +322,6 @@ void _dl_link_grpsym(elf_object_t *object);
void _dl_cache_grpsym_list_setup(elf_object_t *_object);
void _dl_link_grpref(elf_object_t *load_group, elf_object_t *load_object);
void _dl_link_dlopen(elf_object_t *dep);
-void _dl_unlink_dlopen(elf_object_t *dep);
void _dl_notify_unload_shlib(elf_object_t *object);
void _dl_unload_shlib(elf_object_t *object);
void _dl_unload_dlopen(void);
@@ -333,7 +332,6 @@ int _dl_match_file(struct sod *sodp, const char *name, int namelen);
char *_dl_find_shlib(struct sod *sodp, char **searchpath, int nohints);
void _dl_load_list_free(struct load_list *load_list);
-void _dl_find_immutables(int type, elf_object_t *object, Elf_Ehdr *);
void _dl_push_range_size(struct range_vector *v, vaddr_t start, vsize_t len);
void _dl_apply_immutable(elf_object_t *object);
diff --git libexec/mail.local/mail.local.h libexec/mail.local/mail.local.h
index bc3137cb683..a89c8ce0392 100644
--- libexec/mail.local/mail.local.h
+++ libexec/mail.local/mail.local.h
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-void baditem(char *);
int deliver(int, char *, int);
void merr(int, const char *, ...);
void mwarn(const char *, ...);
diff --git libexec/rpc.rquotad/rquotad.c libexec/rpc.rquotad/rquotad.c
index e62abda5caf..c75bf539d90 100644
--- libexec/rpc.rquotad/rquotad.c
+++ libexec/rpc.rquotad/rquotad.c
@@ -30,7 +30,6 @@
void rquota_service(struct svc_req *request, SVCXPRT *transp);
void sendquota(struct svc_req *request, SVCXPRT *transp);
-void printerr_reply(SVCXPRT *transp);
void initfs(void);
int getfsquota(long id, char *path, struct dqblk *dqblk);
int hasquota(struct fstab *fs, char **qfnamep);
diff --git sbin/fdisk/cmd.h sbin/fdisk/cmd.h
index 1a6b9f98b18..091c353575d 100644
--- sbin/fdisk/cmd.h
+++ sbin/fdisk/cmd.h
@@ -23,7 +23,6 @@
#define CMD_DIRTY 0x0004
int Xreinit(const char *, struct mbr *);
-int Xdisk(const char *, struct mbr *);
int Xmanual(const char *, struct mbr *);
int Xedit(const char *, struct mbr *);
int Xsetpid(const char *, struct mbr *);
diff --git sbin/fdisk/gpt.c sbin/fdisk/gpt.c
index 8e8badfe0b9..939bda1e253 100644
--- sbin/fdisk/gpt.c
+++ sbin/fdisk/gpt.c
@@ -46,7 +46,6 @@ struct gpt_header gh;
struct gpt_partition gp[NGPTPARTITIONS];
const struct gpt_partition * const *sort_gpt(void);
-int lba_start_cmp(const void *e1, const void *e2);
int lba_free(uint64_t *, uint64_t *);
int add_partition(const uint8_t *, const char *, uint64_t);
int find_partition(const uint8_t *);
diff --git sbin/fsdb/fsdb.h sbin/fsdb/fsdb.h
index eed054adc41..1e0a718c190 100644
--- sbin/fsdb/fsdb.h
+++ sbin/fsdb/fsdb.h
@@ -32,7 +32,6 @@
extern int bread(int fd, char *buf, daddr_t blk, long size);
extern void bwrite(int fd, char *buf, daddr_t blk, long size);
-extern void rwerror(char *mesg, daddr_t blk);
extern int reply(char *question);
struct cmdtable {
diff --git sbin/iked/control.c sbin/iked/control.c
index d690af946bd..6f45b1aa298 100644
--- sbin/iked/control.c
+++ sbin/iked/control.c
@@ -44,7 +44,6 @@ struct ctl_conn
*control_connbyfd(int);
void control_close(int, struct control_sock *);
void control_dispatch_imsg(int, short, void *);
-void control_dispatch_parent(int, short, void *);
void control_imsg_forward(struct imsg *);
void control_imsg_forward_peerid(struct imsg *);
void control_run(struct privsep *, struct privsep_proc *, void *);
diff --git sbin/isakmpd/app.h sbin/isakmpd/app.h
index 96a2864e453..51f0a716d26 100644
--- sbin/isakmpd/app.h
+++ sbin/isakmpd/app.h
@@ -35,7 +35,6 @@
extern int app_socket;
extern int app_none;
-extern void app_conf_init_hook(void);
extern void app_handler(void);
extern void app_init(void);
diff --git sbin/isakmpd/if.h sbin/isakmpd/if.h
index 82d574d96dc..afb51420b09 100644
--- sbin/isakmpd/if.h
+++ sbin/isakmpd/if.h
@@ -35,9 +35,7 @@
#include <sys/types.h>
struct ifreq;
-struct ifconf;
extern int if_map(int (*) (char *, struct sockaddr *, void *), void *);
-extern int siocgifconf(struct ifconf *);
#endif /* _IF_H_ */
diff --git sbin/isakmpd/ike_phase_1.h sbin/isakmpd/ike_phase_1.h
index 1252664b7e3..7af20ca8041 100644
--- sbin/isakmpd/ike_phase_1.h
+++ sbin/isakmpd/ike_phase_1.h
@@ -47,7 +47,6 @@ extern int ike_phase_1_responder_send_SA(struct message *);
extern int ike_phase_1_responder_send_ID_AUTH(struct message *);
extern int ike_phase_1_send_AUTH(struct message *);
extern int ike_phase_1_send_ID(struct message *);
-extern int ike_phase_1_send_ID_AUTH(struct message *);
extern int ike_phase_1_send_KE_NONCE(struct message *, size_t);
#endif /* _IKE_PHASE_1_H_ */
diff --git sbin/isakmpd/message.h sbin/isakmpd/message.h
index 822eeb8cd2b..7bbcc0a6ef9 100644
--- sbin/isakmpd/message.h
+++ sbin/isakmpd/message.h
@@ -173,9 +173,6 @@ struct message {
TAILQ_HEAD(msg_head, message);
-/* The number of different ISAKMP payloads supported. */
-extern u_int8_t payload_index_max;
-
extern int message_add_payload(struct message *, u_int8_t, u_int8_t *,
size_t, int);
extern int message_add_sa_payload(struct message *);
@@ -185,7 +182,6 @@ extern u_int8_t *message_copy(struct message *, size_t, size_t *);
extern void message_drop(struct message *, int, struct proto *, int, int);
extern void message_dump_raw(char *, struct message *, int);
extern void message_free(struct message *);
-extern void message_init(void);
extern int message_negotiate_sa(struct message *,
int (*)(struct exchange *, struct sa *, struct sa *));
extern int message_recv(struct message *);
diff --git sbin/isakmpd/policy.h sbin/isakmpd/policy.h
index ed4b1f530d9..017900d1e02 100644
--- sbin/isakmpd/policy.h
+++ sbin/isakmpd/policy.h
@@ -38,10 +38,7 @@
extern int ignore_policy;
extern int policy_asserts_num;
-extern int x509_policy_asserts_num;
-extern int x509_policy_asserts_num_alloc;
extern char **policy_asserts;
-extern char **x509_policy_asserts;
extern struct exchange *policy_exchange;
extern struct sa *policy_sa;
extern struct sa *policy_isakmp_sa;
diff --git sbin/mountd/mountd.c sbin/mountd/mountd.c
index 51bc545023d..b721e9cc466 100644
--- sbin/mountd/mountd.c
+++ sbin/mountd/mountd.c
@@ -181,7 +181,6 @@ void free_host(struct hostlist *);
void new_exportlist(int signo);
void get_exportlist(void);
int get_host(char *, struct grouplist *, struct grouplist *);
-int get_num(char *);
struct hostlist *get_ht(void);
int get_line(void);
void get_mountlist(void);
diff --git sbin/pflogd/pflogd.h sbin/pflogd/pflogd.h
index 26633d69ff7..39348ad3490 100644
--- sbin/pflogd/pflogd.h
+++ sbin/pflogd/pflogd.h
@@ -38,8 +38,6 @@ void priv_init(int, int, char **);
int priv_init_pcap(int);
int priv_set_snaplen(int snaplen);
int priv_open_log(void);
-int priv_move_log(void);
-int priv_pcap_stats(struct pcap_stat *);
int init_pcap(void);
void set_pcap_filter(void);
diff --git sbin/unwind/frontend.c sbin/unwind/frontend.c
index bbcd03ebac1..65144ec1ac1 100644
--- sbin/unwind/frontend.c
+++ sbin/unwind/frontend.c
@@ -144,7 +144,6 @@ void handle_route_message(struct rt_msghdr *,
struct sockaddr **);
void get_rtaddrs(int, struct sockaddr *,
struct sockaddr **);
-void rtmget_default(void);
struct pending_query *find_pending_query(uint64_t);
void parse_trust_anchor(struct trust_anchor_head *, int);
void send_trust_anchors(struct trust_anchor_head *);
diff --git sbin/unwind/resolver.c sbin/unwind/resolver.c
index 0c9aff8bb2e..3b8dd33ddf9 100644
--- sbin/unwind/resolver.c
+++ sbin/unwind/resolver.c
@@ -181,8 +181,6 @@ void show_status(pid_t);
void show_autoconf(pid_t);
void show_mem(pid_t);
void send_resolver_info(struct uw_resolver *, pid_t);
-void send_detailed_resolver_info(struct uw_resolver *,
- pid_t);
void trust_anchor_resolve(void);
void trust_anchor_timo(int, short, void *);
void trust_anchor_resolve_done(struct uw_resolver *, void *,
diff --git usr.bin/cvs/diff.h usr.bin/cvs/diff.h
index 9c297d51967..63ba1b8a3c7 100644
--- usr.bin/cvs/diff.h
+++ usr.bin/cvs/diff.h
@@ -110,13 +110,6 @@ int ed_patch_lines(struct rcs_lines *, struct rcs_lines *);
extern int diff_format;
extern int diff_context;
extern int diff3_conflicts;
-extern int diff_aflag;
-extern int diff_bflag;
-extern int diff_dflag;
-extern int diff_iflag;
-extern int diff_pflag;
-extern int diff_wflag;
-extern char *diff_file;
extern char diffargs[512]; /* XXX */
extern BUF *diffbuf;
extern RCSNUM *diff_rev1;
diff --git usr.bin/cvs/history.c usr.bin/cvs/history.c
index d9647b72e44..f7d9c1fe42c 100644
--- usr.bin/cvs/history.c
+++ usr.bin/cvs/history.c
@@ -29,8 +29,6 @@
#include "cvs.h"
#include "remote.h"
-void cvs_history_local(struct cvs_file *);
-
static void history_compress(char *, const char *);
struct cvs_cmd cvs_cmd_history = {
diff --git usr.bin/cvs/log.h usr.bin/cvs/log.h
index 6ca1520704f..69fc5f95a23 100644
--- usr.bin/cvs/log.h
+++ usr.bin/cvs/log.h
@@ -46,7 +46,6 @@
void cvs_log(u_int, const char *, ...) __attribute__((format(printf, 2, 3)));
void cvs_vlog(u_int, const char *, va_list);
int cvs_printf(const char *, ...) __attribute__((format(printf, 1, 2)));
-int cvs_vprintf(const char *, va_list);
void fatal(const char *, ...) __dead __attribute__((format(printf, 1,2)));
#endif /* LOG_H */
diff --git usr.bin/cvs/rcs.h usr.bin/cvs/rcs.h
index 55d8696c4db..1dd4e4096fb 100644
--- usr.bin/cvs/rcs.h
+++ usr.bin/cvs/rcs.h
@@ -211,7 +211,6 @@ const RCSNUM *rcs_branch_get(RCSFILE *);
int rcs_branch_set(RCSFILE *, const RCSNUM *);
int rcs_access_add(RCSFILE *, const char *);
int rcs_access_remove(RCSFILE *, const char *);
-int rcs_access_check(RCSFILE *, const char *);
struct rcs_delta *rcs_findrev(RCSFILE *, RCSNUM *);
int rcs_sym_add(RCSFILE *, const char *, RCSNUM *);
int rcs_sym_check(const char *);
@@ -229,7 +228,6 @@ void rcs_desc_set(RCSFILE *, const char *);
const char *rcs_comment_lookup(const char *);
const char *rcs_comment_get(RCSFILE *);
void rcs_comment_set(RCSFILE *, const char *);
-BUF *rcs_kwexp_buf(BUF *, RCSFILE *, RCSNUM *);
void rcs_kwexp_set(RCSFILE *, int);
int rcs_kwexp_get(RCSFILE *);
int rcs_rev_add(RCSFILE *, RCSNUM *, const char *, time_t,
@@ -240,7 +238,6 @@ int rcs_rev_remove(RCSFILE *, RCSNUM *);
int rcs_state_set(RCSFILE *, RCSNUM *, const char *);
const char *rcs_state_get(RCSFILE *, RCSNUM *);
int rcs_state_check(const char *);
-RCSNUM *rcs_tag_resolve(RCSFILE *, const char *);
void rcs_write(RCSFILE *);
int rcs_rev_write_stmp(RCSFILE *, RCSNUM *, char *, int);
void rcs_rev_write_fd(RCSFILE *, RCSNUM *, int, int);
@@ -252,8 +249,6 @@ BUF *rcs_rev_getbuf(RCSFILE *, RCSNUM *, int);
void rcs_delta_stats(struct rcs_delta *, int *, int *);
int rcs_kflag_get(const char *);
-void rcs_kflag_usage(void);
-int rcs_kw_expand(RCSFILE *, u_char *, size_t, size_t *);
RCSNUM *rcsnum_alloc(void);
RCSNUM *rcsnum_parse(const char *);
diff --git usr.bin/cvs/remote.h usr.bin/cvs/remote.h
index 3d67704ee22..e35b87f0a0c 100644
--- usr.bin/cvs/remote.h
+++ usr.bin/cvs/remote.h
@@ -49,7 +49,6 @@ extern int server_response;
#define CVS_SERVER_QUESTIONABLE '?'
void cvs_client_connect_to_server(void);
-void cvs_client_disconnect(void);
void cvs_client_send_logmsg(char *);
void cvs_client_send_request(char *, ...)
__attribute__((format(printf, 1, 2)));
diff --git usr.bin/diff/diff.h usr.bin/diff/diff.h
index c032350c558..2315c45acf5 100644
--- usr.bin/diff/diff.h
+++ usr.bin/diff/diff.h
@@ -90,9 +90,6 @@ extern regex_t ignore_re;
char *splice(char *, char *);
int diffreg(char *, char *, int);
-int easprintf(char **, const char *, ...);
-void *emalloc(size_t);
-void *erealloc(void *, size_t);
void diffdir(char *, char *, int);
void print_only(const char *, size_t, const char *);
void print_status(int, char *, char *, char *);
diff --git usr.bin/fstat/fstat.h usr.bin/fstat/fstat.h
index 3079fba0681..df638eeab58 100644
--- usr.bin/fstat/fstat.h
+++ usr.bin/fstat/fstat.h
@@ -40,7 +40,6 @@ extern int cflg;
extern int fsflg;
extern int sflg;
extern int signo;
-extern int error;
extern struct fileargs fileargs;
extern char *__progname;
diff --git usr.bin/ftp/extern.h usr.bin/ftp/extern.h
index 892afde13ad..0e96471ec19 100644
--- usr.bin/ftp/extern.h
+++ usr.bin/ftp/extern.h
@@ -70,7 +70,6 @@ void abortrecv(int);
void alarmtimer(int);
int another(int *, char ***, const char *);
int auto_fetch(int, char **, char *);
-void blkfree(char **);
void cdup(int, char **);
void cmdabort(int);
void cmdscanner(int);
diff --git usr.bin/ftp/stringlist.h usr.bin/ftp/stringlist.h
index bb2eaf5ee19..8b2ffd1618b 100644
--- usr.bin/ftp/stringlist.h
+++ usr.bin/ftp/stringlist.h
@@ -47,7 +47,6 @@ __BEGIN_DECLS
StringList *sl_init(void);
void sl_add(StringList *, char *);
void sl_free(StringList *, int);
-char *sl_find(StringList *, char *);
__END_DECLS
#endif /* _STRINGLIST_H */
diff --git usr.bin/m4/extern.h usr.bin/m4/extern.h
index ea8406b8540..002bcbb4fbf 100644
--- usr.bin/m4/extern.h
+++ usr.bin/m4/extern.h
@@ -93,7 +93,6 @@ extern int exit_code;
/* misc.c */
extern void chrsave(int);
-extern char *compute_prevep(void);
extern void getdiv(int);
extern ptrdiff_t indx(const char *, const char *);
extern void initspaces(void);
diff --git usr.bin/mail/extern.h usr.bin/mail/extern.h
index 60a1088b83b..d365dba2279 100644
--- usr.bin/mail/extern.h
+++ usr.bin/mail/extern.h
@@ -147,7 +147,6 @@ struct ignoretab;
int ignore1(char **, struct ignoretab *, char *);
int ignoresig(int, struct sigaction *, sigset_t *);
int igshow(struct ignoretab *, char *);
-void intr(int);
int inc(void *);
int incfile(void);
int isdate(char *);
@@ -235,7 +234,6 @@ void sreset(void);
pid_t start_command(char *cmd, sigset_t *nset, int infd, int outfd, ...);
pid_t start_commandv(char *, sigset_t *, int, int, __va_list);
int statusput(struct message *, FILE *, char *);
-void stop(int);
int stouch(void *);
int swrite(void *);
void tinit(void);
@@ -247,7 +245,6 @@ int type(void *);
int type1(int *, char *, int, int);
int undeletecmd(void *);
void unmark(int);
-char **unpack(struct name *, struct name *);
int unread(void *);
void unregister_file(FILE *);
int unset(void *);
diff --git usr.bin/make/error.h usr.bin/make/error.h
index a9ea1b4bf6b..9308b6954f6 100644
--- usr.bin/make/error.h
+++ usr.bin/make/error.h
@@ -59,7 +59,4 @@ extern void Finish(void);
extern void Parse_Error(int, const char *, ...)
__attribute__((__format__ (printf, 2, 3)));
extern int fatal_errors;
-/* Needed for fatal errors: we have to know whether we must abort other jobs
- * or not */
-extern bool supervise_jobs;
#endif
diff --git usr.bin/make/init.h usr.bin/make/init.h
index 2b9ca15ee25..ff4b0a91c90 100644
--- usr.bin/make/init.h
+++ usr.bin/make/init.h
@@ -32,6 +32,5 @@
* modules.
*/
extern void Init(void);
-extern void End(void);
#endif
diff --git usr.bin/make/job.h usr.bin/make/job.h
index 3b86c90a1f9..c22e4f16e15 100644
--- usr.bin/make/job.h
+++ usr.bin/make/job.h
@@ -93,7 +93,6 @@ extern void handle_all_signals(void);
extern void determine_expensive_job(Job *);
extern Job *runningJobs, *errorJobs, *availableJobs;
extern void debug_job_printf(const char *, ...);
-extern void handle_one_job(Job *);
extern int check_dying_signal(void);
extern const char *basedirectory;
diff --git usr.bin/make/targ.c usr.bin/make/targ.c
index 9e65e6a3e08..17470a44aec 100644
--- usr.bin/make/targ.c
+++ usr.bin/make/targ.c
@@ -88,11 +88,6 @@
*
* Targ_Precious Return true if the target is precious and
* should not be removed if we are interrupted.
- *
- * Debugging:
- * Targ_PrintGraph Print out the entire graphm all variables
- * and statistics for the directory cache. Should
- * print something for suffixes, too, but...
*/
#include <limits.h>
diff --git usr.bin/make/targ.h usr.bin/make/targ.h
index 2d18fb61e27..7502782d2c9 100644
--- usr.bin/make/targ.h
+++ usr.bin/make/targ.h
@@ -56,7 +56,6 @@ extern bool Targ_Silent(GNode *);
extern bool Targ_Precious(GNode *);
extern void Targ_PrintCmd(void *);
extern void Targ_PrintType(int);
-extern void Targ_PrintGraph(int);
extern bool node_is_real(GNode *);
extern GNode *begin_node, *end_node, *interrupt_node, *DEFAULT;
diff --git usr.bin/make/var.h usr.bin/make/var.h
index a831b581aec..a8a30844590 100644
--- usr.bin/make/var.h
+++ usr.bin/make/var.h
@@ -75,9 +75,6 @@ extern void Var_Deletei(const char *, const char *);
/* SymTable_Init(t);
* Inits the local symtable in a GNode. */
extern void SymTable_Init(SymTable *);
-/* SymTable_destroy(t);
- * Destroys the local symtable in a GNode. */
-extern void SymTable_Destroy(SymTable *);
/* Several ways to parse a variable specification. */
/* value = Var_Parse(varspec, ctxt, undef_is_bad, &length, &freeit);
diff --git usr.bin/mandoc/libmdoc.h usr.bin/mandoc/libmdoc.h
index 4cdea3160aa..845ef8328ed 100644
--- usr.bin/mandoc/libmdoc.h
+++ usr.bin/mandoc/libmdoc.h
@@ -75,7 +75,6 @@ void mdoc_tail_alloc(struct roff_man *, int, int,
struct roff_node *mdoc_endbody_alloc(struct roff_man *, int, int,
enum roff_tok, struct roff_node *);
void mdoc_state(struct roff_man *, struct roff_node *);
-const char *mdoc_a2arch(const char *);
const char *mdoc_a2att(const char *);
enum roff_sec mdoc_a2sec(const char *);
const char *mdoc_a2st(const char *);
diff --git usr.bin/mandoc/tbl_int.h usr.bin/mandoc/tbl_int.h
index 299ceaaf792..e15e8dd1bf4 100644
--- usr.bin/mandoc/tbl_int.h
+++ usr.bin/mandoc/tbl_int.h
@@ -44,4 +44,3 @@ void tbl_option(struct tbl_node *, int, const char *, int *);
void tbl_layout(struct tbl_node *, int, const char *, int);
void tbl_data(struct tbl_node *, int, const char *, int);
void tbl_cdata(struct tbl_node *, int, const char *, int);
-void tbl_reset(struct tbl_node *);
diff --git usr.bin/mg/cmode.c usr.bin/mg/cmode.c
index 2a2a1090003..032c7408dcf 100644
--- usr.bin/mg/cmode.c
+++ usr.bin/mg/cmode.c
@@ -35,7 +35,6 @@ static struct line *findnonblank(struct line *);
static int isnonblank(const struct line *, int);
void cmode_init(void);
-int cc_comment(int, int);
/* Keymaps */
diff --git usr.bin/mg/def.h usr.bin/mg/def.h
index 65ae2b43c06..b6fe0e60c33 100644
--- usr.bin/mg/def.h
+++ usr.bin/mg/def.h
@@ -754,7 +754,6 @@ extern int curgoal;
extern int startrow;
extern int epresf;
extern int sgarbf;
-extern int mode;
extern int nrow;
extern int ncol;
extern int ttrow;
diff --git usr.bin/nm/nm.c usr.bin/nm/nm.c
index de22013b240..d84037c1067 100644
--- usr.bin/nm/nm.c
+++ usr.bin/nm/nm.c
@@ -84,7 +84,6 @@ int rev;
int fname(const void *, const void *);
int rname(const void *, const void *);
int value(const void *, const void *);
-char *otherstring(struct xnlist *);
int (*sfunc)(const void *, const void *) = fname;
char typeletter(struct xnlist *);
int mmbr_name(struct ar_hdr *, char **, int, int *, FILE *);
diff --git usr.bin/openssl/apps.h usr.bin/openssl/apps.h
index 1c0a2ebea83..5f30d9dbc46 100644
--- usr.bin/openssl/apps.h
+++ usr.bin/openssl/apps.h
@@ -149,7 +149,6 @@ int ui_read(UI *ui, UI_STRING *uis);
int ui_write(UI *ui, UI_STRING *uis);
int ui_close(UI *ui);
-int should_retry(int i);
int str2fmt(char *s);
void program_name(char *in, char *out, int size);
#ifdef HEADER_X509_H
diff --git usr.bin/rcs/rcs.h usr.bin/rcs/rcs.h
index ec672a1306f..558ca9d6eed 100644
--- usr.bin/rcs/rcs.h
+++ usr.bin/rcs/rcs.h
@@ -223,7 +223,6 @@ int rcs_head_set(RCSFILE *, RCSNUM *);
const RCSNUM *rcs_branch_get(RCSFILE *);
int rcs_access_add(RCSFILE *, const char *);
int rcs_access_remove(RCSFILE *, const char *);
-int rcs_access_check(RCSFILE *, const char *);
struct rcs_delta *rcs_findrev(RCSFILE *, RCSNUM *);
int rcs_sym_add(RCSFILE *, const char *, RCSNUM *);
int rcs_sym_remove(RCSFILE *, const char *);
@@ -251,8 +250,6 @@ void rcs_write(RCSFILE *);
void rcs_delta_stats(struct rcs_delta *, int *, int *);
int rcs_kflag_get(const char *);
-void rcs_kflag_usage(void);
-int rcs_kw_expand(RCSFILE *, u_char *, size_t, size_t *);
RCSNUM *rcsnum_alloc(void);
RCSNUM *rcsnum_parse(const char *);
diff --git usr.bin/rdist/defs.h usr.bin/rdist/defs.h
index 3b0688e4071..1362e33743f 100644
--- usr.bin/rdist/defs.h
+++ usr.bin/rdist/defs.h
@@ -184,7 +184,6 @@ ssize_t xwrite(int, void *, size_t);
int init(int, char **, char **);
void finish(void);
void lostconn(void);
-void coredump(void);
void sighandler(int);
int sendcmd(char, const char *, ...) __attribute__((__format__ (printf, 2, 3)));
int remline(u_char *, int, int);
@@ -193,8 +192,6 @@ char *getusername(uid_t, char *, opt_t);
char *getgroupname(gid_t, char *, opt_t);
int response(void);
char *exptilde(char *, char *, size_t);
-int becomeuser(void);
-int becomeroot(void);
int setfiletime(char *, time_t, time_t);
char *getversion(void);
void runcommand(char *);
diff --git usr.bin/rsync/extern.h usr.bin/rsync/extern.h
index 940db81d5db..d7fe2016b37 100644
--- usr.bin/rsync/extern.h
+++ usr.bin/rsync/extern.h
@@ -301,8 +301,6 @@ extern int verbose;
void rsync_log(int, const char *, ...)
__attribute__((format(printf, 2, 3)));
-void rsync_warnx1(const char *, ...)
- __attribute__((format(printf, 1, 2)));
void rsync_warn(int, const char *, ...)
__attribute__((format(printf, 2, 3)));
void rsync_warnx(const char *, ...)
@@ -316,7 +314,6 @@ void rsync_errx1(const char *, ...)
int flist_del(struct sess *, int, const struct flist *, size_t);
int flist_gen(struct sess *, size_t, char **, struct flist **, size_t *);
-int flist_gen_local(struct sess *, const char *, struct flist **, size_t *);
void flist_free(struct flist *, size_t);
int flist_recv(struct sess *, int, struct flist **, size_t *);
int flist_send(struct sess *, int, int, const struct flist *, size_t);
diff --git usr.bin/rsync/receiver.c usr.bin/rsync/receiver.c
index 2d055f38a3e..6924e1912f6 100644
--- usr.bin/rsync/receiver.c
+++ usr.bin/rsync/receiver.c
@@ -281,7 +281,7 @@ rsync_receiver(struct sess *sess, int fdin, int fdout, const char *root)
if (sess->opts->del &&
sess->opts->recursive &&
!flist_gen_dels(sess, root, &dfl, &dflsz, fl, flsz)) {
- ERRX1("flist_gen_local");
+ ERRX1("rsync_receiver");
goto out;
}
diff --git usr.bin/systat/systat.h usr.bin/systat/systat.h
index 08113a5b77d..cf499797250 100644
--- usr.bin/systat/systat.h
+++ usr.bin/systat/systat.h
@@ -52,13 +52,10 @@ extern char **dr_name;
extern char hostname[];
extern double avenrun[3];
extern kvm_t *kd;
-extern long ntext;
extern int *dk_select;
extern int dk_ndrive;
extern int hz;
extern double naptime;
-extern size_t nhosts;
-extern size_t nports;
extern int protos;
extern int verbose;
extern int nflag;
diff --git usr.bin/telnet/externs.h usr.bin/telnet/externs.h
index d5c9858b02d..ce27eb2b88b 100644
--- usr.bin/telnet/externs.h
+++ usr.bin/telnet/externs.h
@@ -66,8 +66,7 @@ extern int
resettermname,
linemode,
kludgelinemode,
- want_status_response,
- debug; /* Debug level */
+ want_status_response;
extern cc_t escape; /* Escape to command mode */
extern cc_t rlogin; /* Rlogin mode escape character */
@@ -79,10 +78,6 @@ extern char
*prompt; /* Prompt for command. */
extern char
- doopt[],
- dont[],
- will[],
- wont[],
will_wont_resp[],
do_dont_resp[],
options[], /* All the little options */
diff --git usr.bin/yacc/reader.c usr.bin/yacc/reader.c
index 4964be11f83..c52955e42c3 100644
--- usr.bin/yacc/reader.c
+++ usr.bin/yacc/reader.c
@@ -84,7 +84,6 @@ char *get_tag(void);
void declare_tokens(int);
void declare_types(void);
void declare_start(void);
-void handle_expect(void);
void read_declarations(void);
void initialize_grammar(void);
void expand_items(void);
diff --git usr.sbin/ac/ac.c usr.sbin/ac/ac.c
index 1dac33b2809..2f0d043d529 100644
--- usr.sbin/ac/ac.c
+++ usr.sbin/ac/ac.c
@@ -89,7 +89,6 @@ int do_tty(char *);
FILE *file(char *);
struct utmp_list *log_in(struct utmp_list *, struct utmp *);
struct utmp_list *log_out(struct utmp_list *, struct utmp *);
-int on_console(struct utmp_list *);
void show(char *, time_t);
void show_today(struct user_list *, struct utmp_list *,
time_t);
diff --git usr.sbin/acme-client/extern.h usr.sbin/acme-client/extern.h
index 4b43b6ef4ac..3356df3f1a6 100644
--- usr.sbin/acme-client/extern.h
+++ usr.sbin/acme-client/extern.h
@@ -241,7 +241,6 @@ int checkexit_ext(int *, pid_t, enum comp);
* Base64 and URL encoding.
* Returns a buffer or NULL on allocation error.
*/
-size_t base64buf(char *, const char *, size_t);
size_t base64len(size_t);
char *base64buf_url(const char *, size_t);
diff --git usr.sbin/btrace/btrace.c usr.sbin/btrace/btrace.c
index b817d9c924b..2f215d4ccce 100644
--- usr.sbin/btrace/btrace.c
+++ usr.sbin/btrace/btrace.c
@@ -80,7 +80,6 @@ void rule_printmaps(struct bt_rule *);
* Language builtins & functions.
*/
uint64_t builtin_nsecs(struct dt_evt *);
-const char *builtin_kstack(struct dt_evt *);
const char *builtin_arg(struct dt_evt *, enum bt_argtype);
struct bt_arg *fn_str(struct bt_arg *, struct dt_evt *, char *);
int stmt_eval(struct bt_stmt *, struct dt_evt *);
diff --git usr.sbin/btrace/btrace.h usr.sbin/btrace/btrace.h
index 0e4c26da6cc..5dbbe18c09e 100644
--- usr.sbin/btrace/btrace.h
+++ usr.sbin/btrace/btrace.h
@@ -38,7 +38,6 @@ unsigned long dt_get_offset(pid_t);
/* ksyms.c */
struct syms;
struct syms *kelf_open(const char *);
-void kelf_offset(struct syms *, unsigned long);
void kelf_close(struct syms *);
int kelf_snprintsym(struct syms *, char *, size_t,
unsigned long, unsigned long);
diff --git usr.sbin/config/cmd.h usr.sbin/config/cmd.h
index be476743c64..23e4157e5fb 100644
--- usr.sbin/config/cmd.h
+++ usr.sbin/config/cmd.h
@@ -66,7 +66,6 @@ int Xlist(cmd_t *);
int Xshow(cmd_t *);
int Xexit(cmd_t *);
int Xquit(cmd_t *);
-int Xtimezone(cmd_t *);
int Xnkmempg(cmd_t *);
#endif /* _CMD_H */
diff --git usr.sbin/config/sem.h usr.sbin/config/sem.h
index 4fbfcd6793a..695ffca20f0 100644
--- usr.sbin/config/sem.h
+++ usr.sbin/config/sem.h
@@ -58,7 +58,6 @@ void setconf(struct nvlist **, const char *, struct nvlist *);
void adddev(const char *, const char *, struct nvlist *, int, int);
void enabledev(const char *, const char *);
void addpseudo(const char *name, int number, int disable);
-const char *ref(const char *name);
const char *starref(const char *name);
const char *wildref(const char *name);
diff --git usr.sbin/dhcpd/dhcpd.h usr.sbin/dhcpd/dhcpd.h
index 0903c244ddd..f591df87902 100644
--- usr.sbin/dhcpd/dhcpd.h
+++ usr.sbin/dhcpd/dhcpd.h
@@ -325,7 +325,6 @@ extern char *path_dhcpd_conf;
extern char *path_dhcpd_db;
int main(int, char *[]);
-void cleanup(void);
void lease_pinged(struct iaddr, u_int8_t *, int);
void lease_ping_timeout(void *);
void periodic_scan(void *);
@@ -333,8 +332,6 @@ void periodic_scan(void *);
/* conflex.c */
extern int lexline, lexchar;
extern char *token_line, *tlname;
-extern char comments[4096];
-extern int comment_index;
extern int eol_token;
void new_parse(char *);
diff --git usr.sbin/dhcrelay/dhcpd.h usr.sbin/dhcrelay/dhcpd.h
index 4a7dd50fa61..08bf1c7852b 100644
--- usr.sbin/dhcrelay/dhcpd.h
+++ usr.sbin/dhcrelay/dhcpd.h
@@ -140,12 +140,6 @@ struct server_list {
/* External definitions... */
-/* errwarn.c */
-void error(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
-int warning(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
-int note(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
-int debug(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
-
/* bpf.c */
int if_register_bpf(struct interface_info *);
void if_register_send(struct interface_info *);
diff --git usr.sbin/dhcrelay6/dhcpd.h usr.sbin/dhcrelay6/dhcpd.h
index 41703cc6893..83794948883 100644
--- usr.sbin/dhcrelay6/dhcpd.h
+++ usr.sbin/dhcrelay6/dhcpd.h
@@ -151,7 +151,6 @@ void setup_iflist(void);
struct interface_info *iflist_getbyname(const char *);
struct interface_info *iflist_getbyindex(unsigned int);
struct interface_info *iflist_getbyaddr6(struct in6_addr *);
-int if_hasaddress(struct interface_info *);
struct interface_info *register_interface(const char *,
void (*)(struct protocol *));
void dispatch(void);
diff --git usr.sbin/ikectl/ikectl.c usr.sbin/ikectl/ikectl.c
index 85bb31d8207..27067ae21c9 100644
--- usr.sbin/ikectl/ikectl.c
+++ usr.sbin/ikectl/ikectl.c
@@ -45,7 +45,6 @@ struct imsgname {
};
struct imsgname *monitor_lookup(uint8_t);
-void monitor_id(struct imsg *);
int monitor(struct imsg *);
int show_string(struct imsg *);
diff --git usr.sbin/iscsid/iscsid.h usr.sbin/iscsid/iscsid.h
index 7fb1dfbdeb8..09727ef04cc 100644
--- usr.sbin/iscsid/iscsid.h
+++ usr.sbin/iscsid/iscsid.h
@@ -349,7 +349,6 @@ void session_config(struct session *, struct session_config *);
void session_task_issue(struct session *, struct task *);
void session_logout_issue(struct session *, struct task *);
void session_schedule(struct session *);
-void session_task_login(struct connection *);
void session_fsm(struct session *, enum s_event, struct connection *,
unsigned int);
diff --git usr.sbin/ldapd/ldapd.h usr.sbin/ldapd/ldapd.h
index 39ed38d6aa8..2009f2f7ae8 100644
--- usr.sbin/ldapd/ldapd.h
+++ usr.sbin/ldapd/ldapd.h
@@ -336,12 +336,6 @@ enum ldapd_process {
extern struct ldapd_stats stats;
extern struct ldapd_config *conf;
-void imsg_event_add(struct imsgev *iev);
-int imsg_compose_event(struct imsgev *iev, u_int16_t type,
- u_int32_t peerid, pid_t pid, int fd, void *data,
- u_int16_t datalen);
-int imsg_event_handle(struct imsgev *iev, short event);
-
/* conn.c */
extern struct conn_list conn_list;
struct conn *conn_by_fd(int fd);
@@ -376,7 +370,6 @@ int namespace_reopen_data(struct namespace *ns);
int namespace_reopen_indx(struct namespace *ns);
int namespace_set_data_fd(struct namespace *ns, int fd);
int namespace_set_indx_fd(struct namespace *ns, int fd);
-struct namespace *namespace_init(const char *suffix, const char *dir);
void namespace_close(struct namespace *ns);
void namespace_remove(struct namespace *ns);
struct ber_element *namespace_get(struct namespace *ns, char *dn);
@@ -435,7 +428,6 @@ char *ldap_now(void);
void control_init(struct control_sock *);
void control_listen(struct control_sock *);
void control_accept(int, short, void *);
-void control_dispatch_imsg(int, short, void *);
void control_cleanup(struct control_sock *);
int control_close_any(struct control_sock *);
diff --git usr.sbin/mrinfo/mrinfo.c usr.sbin/mrinfo/mrinfo.c
index 47c51854153..226f7aa9c11 100644
--- usr.sbin/mrinfo/mrinfo.c
+++ usr.sbin/mrinfo/mrinfo.c
@@ -99,7 +99,6 @@ vifi_t numvifs; /* to keep loader happy */
char *inet_name(u_int32_t addr);
void ask(u_int32_t dst);
void ask2(u_int32_t dst);
-u_int32_t host_addr(char *name);
void usage(void);
char *
diff --git usr.sbin/ntpd/ntpd.c usr.sbin/ntpd/ntpd.c
index 8e6887435d6..8a80e91146a 100644
--- usr.sbin/ntpd/ntpd.c
+++ usr.sbin/ntpd/ntpd.c
@@ -46,7 +46,6 @@ int auto_preconditions(const struct ntpd_conf *);
int main(int, char *[]);
void check_child(void);
int dispatch_imsg(struct ntpd_conf *, int, char **);
-int dispatch_imsg_ctl(struct ntpd_conf *);
void reset_adjtime(void);
int ntpd_adjtime(double);
void ntpd_adjfreq(double, int);
diff --git usr.sbin/ntpd/ntpd.h usr.sbin/ntpd/ntpd.h
index 81d0c6c83f6..fd05192735c 100644
--- usr.sbin/ntpd/ntpd.h
+++ usr.sbin/ntpd/ntpd.h
@@ -364,7 +364,6 @@ int ntp_sendmsg(int, struct sockaddr *, struct ntp_msg *);
/* server.c */
int setup_listeners(struct servent *, struct ntpd_conf *, u_int *);
-int ntp_reply(int, struct sockaddr *, struct ntp_msg *, int);
int server_dispatch(int, struct ntpd_conf *);
/* client.c */
diff --git usr.sbin/ospfctl/ospfctl.h usr.sbin/ospfctl/ospfctl.h
index 3b1c088e773..2ea92806654 100644
--- usr.sbin/ospfctl/ospfctl.h
+++ usr.sbin/ospfctl/ospfctl.h
@@ -34,7 +34,7 @@ struct output {
void (*tail)(void);
};
-extern const struct output show_output, json_output;
+extern const struct output show_output;
#define EOL0(flag) ((flag & F_CTL_SSV) ? ';' : '\n')
diff --git usr.sbin/rad/rad.c usr.sbin/rad/rad.c
index a0c317265b0..ec8a571e0e0 100644
--- usr.sbin/rad/rad.c
+++ usr.sbin/rad/rad.c
@@ -74,8 +74,6 @@ static int main_imsg_send_config(struct rad_conf *);
int main_reload(void);
int main_sendboth(enum imsg_type, void *, uint16_t);
-void in6_prefixlen2mask(struct in6_addr *, int len);
-
struct rad_conf *main_conf;
static struct imsgev *iev_frontend;
static struct imsgev *iev_engine;
diff --git usr.sbin/radiusd/radiusd_local.h usr.sbin/radiusd/radiusd_local.h
index 2704ecc27fd..7712f618ef7 100644
--- usr.sbin/radiusd/radiusd_local.h
+++ usr.sbin/radiusd/radiusd_local.h
@@ -157,9 +157,6 @@ struct radius_query {
((_m)->fd >= 0 && \
((_m)->capabilities & RADIUSD_MODULE_CAP_RESDECO) != 0)
-extern struct radiusd_module mod_standard;
-extern struct radiusd_module mod_radius;
-
int parse_config(const char *, struct radiusd *);
void radiusd_conf_init(struct radiusd *);
@@ -169,7 +166,6 @@ struct radiusd_module *radiusd_module_load(struct radiusd *, const char *,
void radiusd_module_unload(struct radiusd_module *);
void radiusd_access_request_answer(struct radius_query *);
-int radiusd_access_request_fixup(struct radius_query *);
void radiusd_access_request_aborted(struct radius_query *);
void radius_attr_hide(const char *, const char *, const u_char *,
u_char *, int);
diff --git usr.sbin/route6d/route6d.c usr.sbin/route6d/route6d.c
index 2ae2452a8f1..756a2a4b62a 100644
--- usr.sbin/route6d/route6d.c
+++ usr.sbin/route6d/route6d.c
@@ -191,7 +191,6 @@ void riprecv(void);
void ripsend(struct ifc *, struct sockaddr_in6 *, int);
int out_filter(struct riprt *, struct ifc *);
void init(void);
-void sockopt(struct ifc *);
void ifconfig(void);
void ifconfig1(const char *, const struct sockaddr *, struct ifc *, int);
void rtrecv(void);
diff --git usr.sbin/snmpd/snmpd.h usr.sbin/snmpd/snmpd.h
index d8c56edf3b5..5e3c3b16352 100644
--- usr.sbin/snmpd/snmpd.h
+++ usr.sbin/snmpd/snmpd.h
@@ -456,7 +456,6 @@ RB_PROTOTYPE(snmp_messages, snmp_message, sm_entry, snmp_messagecmp)
/* trap.c */
void trap_init(void);
-int trap_imsg(struct imsgev *, pid_t);
int trap_send(struct ber_oid *, struct ber_element *);
/* smi.c */
diff --git usr.sbin/snmpd/snmpe.c usr.sbin/snmpd/snmpe.c
index 055d11724d7..55cd3035736 100644
--- usr.sbin/snmpd/snmpe.c
+++ usr.sbin/snmpd/snmpe.c
@@ -48,7 +48,6 @@ int snmpe_dispatch_parent(int, struct privsep_proc *, struct imsg *);
int snmpe_parse(struct snmp_message *);
void snmpe_tryparse(int, struct snmp_message *);
int snmpe_parsevarbinds(struct snmp_message *);
-void snmpe_sig_handler(int sig, short, void *);
int snmpe_bind(struct address *);
void snmpe_recvmsg(int fd, short, void *);
void snmpe_readcb(int fd, short, void *);
diff --git usr.sbin/tcpdump/interface.h usr.sbin/tcpdump/interface.h
index 4e055f3eb80..f4142ef422f 100644
--- usr.sbin/tcpdump/interface.h
+++ usr.sbin/tcpdump/interface.h
@@ -166,8 +166,6 @@ extern void safeputs(const char *);
extern void safeputchar(int);
extern void printb(char *, unsigned short, char *);
-extern void wrapup(int);
-
extern __dead void error(const char *, ...)
__attribute__((__format__ (printf, 1, 2)));
extern void warning(const char *, ...)
@@ -200,12 +198,9 @@ extern void bgp_print(const u_char *, int);
extern void decnet_print(const u_char *, u_int, u_int);
extern void default_print(const u_char *, u_int);
extern void dvmrp_print(const u_char *, u_int);
-extern void egp_print(const u_char *, u_int, const u_char *);
extern void enc_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
extern void pflog_if_print(u_char *, const struct pcap_pkthdr *,
const u_char *);
-extern void pflog_old_if_print(u_char *, const struct pcap_pkthdr *,
- const u_char *);
extern void pfsync_if_print(u_char *, const struct pcap_pkthdr *,
const u_char *);
extern void pfsync_ip_print(const u_char *, u_int, const u_char *);
diff --git usr.sbin/tcpdump/print-gre.c usr.sbin/tcpdump/print-gre.c
index 96e7a52e50a..90c868f0924 100644
--- usr.sbin/tcpdump/print-gre.c
+++ usr.sbin/tcpdump/print-gre.c
@@ -84,7 +84,6 @@ void gre_print_1(const u_char *, u_int);
void gre_print_pptp(const u_char *, u_int, uint16_t);
void gre_print_eoip(const u_char *, u_int, uint16_t);
void gre_print_erspan(uint16_t, const u_char *, u_int);
-void gre_print_erspan3(const u_char *, u_int);
void gre_sre_print(u_int16_t, u_int8_t, u_int8_t, const u_char *, u_int);
void gre_sre_ip_print(u_int8_t, u_int8_t, const u_char *, u_int);
void gre_sre_asn_print(u_int8_t, u_int8_t, const u_char *, u_int);
diff --git usr.sbin/tftpd/tftpd.c usr.sbin/tftpd/tftpd.c
index 168df85e049..fc52db42e1e 100644
--- usr.sbin/tftpd/tftpd.c
+++ usr.sbin/tftpd/tftpd.c
@@ -166,7 +166,6 @@ void tftpd_events(void);
void tftpd_recv(int, short, void *);
int retry(struct tftp_client *);
int tftp_flush(struct tftp_client *);
-void tftp_end(struct tftp_client *);
void tftp(struct tftp_client *, struct tftphdr *, size_t);
void tftp_open(struct tftp_client *, const char *);
diff --git usr.sbin/traceroute/traceroute.h usr.sbin/traceroute/traceroute.h
index c148a6c2dd7..335fcabd38e 100644
--- usr.sbin/traceroute/traceroute.h
+++ usr.sbin/traceroute/traceroute.h
@@ -167,7 +167,4 @@ extern char *hostname;
extern u_int16_t srcport;
-extern int verbose;
-extern int dump;
-
extern char *__progname;
diff --git usr.sbin/ypldap/ldapclient.c usr.sbin/ypldap/ldapclient.c
index 31f29efd1f2..dc2b0d8d235 100644
--- usr.sbin/ypldap/ldapclient.c
+++ usr.sbin/ypldap/ldapclient.c
@@ -46,7 +46,6 @@ void client_sig_handler(int, short, void *);
void client_dispatch_dns(int, short, void *);
void client_dispatch_parent(int, short, void *);
void client_shutdown(void);
-void client_connect(int, short, void *);
void client_configure(struct env *);
void client_periodic_update(int, short, void *);
int client_build_req(struct idm *, struct idm_req *, struct aldap_message *,
diff --git usr.sbin/ypldap/ypldap.c usr.sbin/ypldap/ypldap.c
index 8aa2c2b0077..8852aa391b9 100644
--- usr.sbin/ypldap/ypldap.c
+++ usr.sbin/ypldap/ypldap.c
@@ -51,7 +51,6 @@ void main_trash_update(struct env *);
void main_end_update(struct env *);
int main_create_user_groups(struct env *);
void purge_config(struct env *);
-void reconfigure(struct env *);
int pipe_main2client[2];
diff --git usr.sbin/ypserv/revnetgroup/hash.h usr.sbin/ypserv/revnetgroup/hash.h
index edfadffec48..9a29b0284f1 100644
--- usr.sbin/ypserv/revnetgroup/hash.h
+++ usr.sbin/ypserv/revnetgroup/hash.h
@@ -60,7 +60,6 @@ struct group_entry {
#define LINSIZ 1024 * 10
-extern void store( struct group_entry ** , char *, char * );
extern void mstore( struct member_entry ** , char *, char *, char * );
extern void ngstore( struct group_entry **, char *, char * );
extern char *lookup( struct group_entry **, char * );
diff --git usr.sbin/ypserv/yppush/yppush.h usr.sbin/ypserv/yppush/yppush.h
index aa07f04036f..2a20f8d1c6a 100644
--- usr.sbin/ypserv/yppush/yppush.h
+++ usr.sbin/ypserv/yppush/yppush.h
@@ -39,7 +39,6 @@
__BEGIN_DECLS
bool_t xdr_yppush_status(XDR *, yppush_status *);
bool_t xdr_yppushresp_xfr(XDR *, yppushresp_xfr *);
-void * yppushproc_null_1(void *, CLIENT *);
void * yppushproc_null_1_svc(void *, struct svc_req *);
char * yppush_err_string(enum yppush_status y);
void yppush_xfrrespprog_1(struct svc_req *, SVCXPRT *);
userland prototype cleanup