From: jsg <jsg@openbsd.org>
Date: Tue, 21 May 2024 05:00:47 +0000 (+0000)
Subject: remove prototypes with no matching function and externs with no var
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ce7279d89b71439c96c854f612f4ac93a461fdc4;p=openbsd

remove prototypes with no matching function and externs with no var
partly checked by millert@
---

diff --git a/bin/csh/extern.h b/bin/csh/extern.h
index cdbe62bbbb2..6a0744f6b44 100644
--- a/bin/csh/extern.h
+++ b/bin/csh/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.31 2018/09/18 17:48:22 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.32 2024/05/21 05:00:47 jsg Exp $	*/
 /*	$NetBSD: extern.h,v 1.8 1996/10/31 23:50:54 christos Exp $	*/
 
 /*-
@@ -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 a/bin/md5/crc.h b/bin/md5/crc.h
index 2000c489c9b..65d2c2ed23c 100644
--- a/bin/md5/crc.h
+++ b/bin/md5/crc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crc.h,v 1.4 2019/01/25 00:19:25 millert Exp $	*/
+/*	$OpenBSD: crc.h,v 1.5 2024/05/21 05:00:47 jsg Exp $	*/
 
 /*
  * Copyright (c) 2004 Todd C. Miller <millert@openbsd.org>
@@ -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 a/bin/mt/mt.h b/bin/mt/mt.h
index da24d3d4923..c677cb5a647 100644
--- a/bin/mt/mt.h
+++ b/bin/mt/mt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mt.h,v 1.3 2003/06/02 23:32:08 millert Exp $	*/
+/*	$OpenBSD: mt.h,v 1.4 2024/05/21 05:00:47 jsg Exp $	*/
 /*	$NetBSD: mt.h,v 1.1 1996/03/05 20:39:36 scottr Exp $	*/
 
 /*-
@@ -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 a/bin/stty/extern.h b/bin/stty/extern.h
index beb5e1c1cc9..e6e8c41fe86 100644
--- a/bin/stty/extern.h
+++ b/bin/stty/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.6 2003/06/02 23:32:09 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.7 2024/05/21 05:00:47 jsg Exp $	*/
 /*	$NetBSD: extern.h,v 1.8 1996/05/07 18:20:06 jtc Exp $	*/
 
 /*-
@@ -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 a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c
index 94fb4b08c66..6f17c4db6d1 100644
--- a/games/fortune/fortune/fortune.c
+++ b/games/fortune/fortune/fortune.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fortune.c,v 1.63 2021/01/03 01:32:13 schwarze Exp $	*/
+/*	$OpenBSD: fortune.c,v 1.64 2024/05/21 05:00:47 jsg Exp $	*/
 /*	$NetBSD: fortune.c,v 1.8 1995/03/23 08:28:40 cgd Exp $	*/
 
 /*-
@@ -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 a/games/hack/hack.h b/games/hack/hack.h
index 9e0e9154cd7..3fa81ebb45a 100644
--- a/games/hack/hack.h
+++ b/games/hack/hack.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hack.h,v 1.14 2023/06/03 15:19:38 op Exp $*/
+/*	$OpenBSD: hack.h,v 1.15 2024/05/21 05:00:47 jsg Exp $*/
 /*	$NetBSD: hack.h,v 1.3 1995/03/23 08:30:21 cgd Exp $*/
 
 /*
@@ -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 a/games/hunt/hunt/display.h b/games/hunt/hunt/display.h
index 08d9ba9041f..19a4d7eff64 100644
--- a/games/hunt/hunt/display.h
+++ b/games/hunt/hunt/display.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: display.h,v 1.3 2003/06/17 00:36:36 pjanzen Exp $	*/
+/*	$OpenBSD: display.h,v 1.4 2024/05/21 05:00:47 jsg Exp $	*/
 /*	David Leonard <d@openbsd.org>, 1999.  Public domain.	*/
 
 void display_open(void);
@@ -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 a/games/phantasia/main.c b/games/phantasia/main.c
index e9f2136b24e..4791f679d5f 100644
--- a/games/phantasia/main.c
+++ b/games/phantasia/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.22 2016/08/27 02:00:10 guenther Exp $	*/
+/*	$OpenBSD: main.c,v 1.23 2024/05/21 05:00:47 jsg Exp $	*/
 /*	$NetBSD: main.c,v 1.3 1995/04/24 12:24:37 cgd Exp $	*/
 
 /*
@@ -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 a/games/phantasia/phantglobs.h b/games/phantasia/phantglobs.h
index 7b0fc5a0472..03fb7916acb 100644
--- a/games/phantasia/phantglobs.h
+++ b/games/phantasia/phantglobs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: phantglobs.h,v 1.7 2016/01/06 14:28:09 mestre Exp $	*/
+/*	$OpenBSD: phantglobs.h,v 1.8 2024/05/21 05:00:47 jsg Exp $	*/
 /*	$NetBSD: phantglobs.h,v 1.3 1995/04/24 12:24:39 cgd Exp $	*/
 
 /*
@@ -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 a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h
index 8c475a61bca..9674ff13472 100644
--- a/libexec/ftpd/extern.h
+++ b/libexec/ftpd/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.24 2024/05/20 01:05:17 jsg Exp $	*/
+/*	$OpenBSD: extern.h,v 1.25 2024/05/21 05:00:47 jsg Exp $	*/
 /*	$NetBSD: extern.h,v 1.2 1995/04/11 02:44:49 cgd Exp $	*/
 
 /*
@@ -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 a/libexec/ld.so/resolve.h b/libexec/ld.so/resolve.h
index 0b3278e6f7a..67f545d5445 100644
--- a/libexec/ld.so/resolve.h
+++ b/libexec/ld.so/resolve.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: resolve.h,v 1.107 2024/01/16 19:07:31 deraadt Exp $ */
+/*	$OpenBSD: resolve.h,v 1.108 2024/05/21 05:00:47 jsg Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -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 a/libexec/mail.local/mail.local.h b/libexec/mail.local/mail.local.h
index bc3137cb683..29b433de9d4 100644
--- a/libexec/mail.local/mail.local.h
+++ b/libexec/mail.local/mail.local.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mail.local.h,v 1.7 2020/02/09 14:59:21 millert Exp $	*/
+/*	$OpenBSD: mail.local.h,v 1.8 2024/05/21 05:00:47 jsg Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -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 a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c
index e62abda5caf..7b2568c1ede 100644
--- a/libexec/rpc.rquotad/rquotad.c
+++ b/libexec/rpc.rquotad/rquotad.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rquotad.c,v 1.25 2023/03/08 04:43:05 guenther Exp $	*/
+/*	$OpenBSD: rquotad.c,v 1.26 2024/05/21 05:00:47 jsg Exp $	*/
 
 /*
  * by Manuel Bouyer (bouyer@ensta.fr). Public domain.
@@ -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 a/sbin/fdisk/cmd.h b/sbin/fdisk/cmd.h
index 1a6b9f98b18..0c63843b99a 100644
--- a/sbin/fdisk/cmd.h
+++ b/sbin/fdisk/cmd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.h,v 1.27 2022/07/10 20:34:31 krw Exp $	*/
+/*	$OpenBSD: cmd.h,v 1.28 2024/05/21 05:00:47 jsg Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -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 a/sbin/fdisk/gpt.c b/sbin/fdisk/gpt.c
index 8e8badfe0b9..55f10d95ae1 100644
--- a/sbin/fdisk/gpt.c
+++ b/sbin/fdisk/gpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gpt.c,v 1.93 2023/06/20 11:52:08 krw Exp $	*/
+/*	$OpenBSD: gpt.c,v 1.94 2024/05/21 05:00:47 jsg Exp $	*/
 /*
  * Copyright (c) 2015 Markus Muller <mmu@grummel.net>
  * Copyright (c) 2015 Kenneth R Westerback <krw@openbsd.org>
@@ -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 a/sbin/fsdb/fsdb.h b/sbin/fsdb/fsdb.h
index eed054adc41..c54031cb75c 100644
--- a/sbin/fsdb/fsdb.h
+++ b/sbin/fsdb/fsdb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsdb.h,v 1.11 2014/08/10 02:38:24 guenther Exp $	*/
+/*	$OpenBSD: fsdb.h,v 1.12 2024/05/21 05:00:47 jsg Exp $	*/
 /*	$NetBSD: fsdb.h,v 1.4 1996/09/28 19:30:36 christos Exp $	*/
 
 /*-
@@ -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 a/sbin/iked/control.c b/sbin/iked/control.c
index d690af946bd..f37d4867e6a 100644
--- a/sbin/iked/control.c
+++ b/sbin/iked/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.38 2024/01/24 10:09:07 tobhe Exp $	*/
+/*	$OpenBSD: control.c,v 1.39 2024/05/21 05:00:47 jsg Exp $	*/
 
 /*
  * Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -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 a/sbin/isakmpd/app.h b/sbin/isakmpd/app.h
index 96a2864e453..0bb0730608e 100644
--- a/sbin/isakmpd/app.h
+++ b/sbin/isakmpd/app.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: app.h,v 1.7 2004/04/15 18:39:25 deraadt Exp $	 */
+/* $OpenBSD: app.h,v 1.8 2024/05/21 05:00:47 jsg Exp $	 */
 /* $EOM: app.h,v 1.4 1999/04/02 00:58:16 niklas Exp $	 */
 
 /*
@@ -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 a/sbin/isakmpd/if.h b/sbin/isakmpd/if.h
index 82d574d96dc..0b555d52b90 100644
--- a/sbin/isakmpd/if.h
+++ b/sbin/isakmpd/if.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.h,v 1.7 2004/04/15 18:39:25 deraadt Exp $	 */
+/* $OpenBSD: if.h,v 1.8 2024/05/21 05:00:47 jsg Exp $	 */
 /* $EOM: if.h,v 1.2 1998/07/07 23:35:58 niklas Exp $	 */
 
 /*
@@ -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 a/sbin/isakmpd/ike_phase_1.h b/sbin/isakmpd/ike_phase_1.h
index 1252664b7e3..a41bf33c7bf 100644
--- a/sbin/isakmpd/ike_phase_1.h
+++ b/sbin/isakmpd/ike_phase_1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ike_phase_1.h,v 1.4 2004/04/15 18:39:25 deraadt Exp $	 */
+/* $OpenBSD: ike_phase_1.h,v 1.5 2024/05/21 05:00:47 jsg Exp $	 */
 
 /*
  * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
@@ -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 a/sbin/isakmpd/message.h b/sbin/isakmpd/message.h
index 822eeb8cd2b..83223de398f 100644
--- a/sbin/isakmpd/message.h
+++ b/sbin/isakmpd/message.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: message.h,v 1.29 2018/01/15 09:54:48 mpi Exp $	 */
+/* $OpenBSD: message.h,v 1.30 2024/05/21 05:00:47 jsg Exp $	 */
 /* $EOM: message.h,v 1.51 2000/10/10 12:36:39 provos Exp $	 */
 
 /*
@@ -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 a/sbin/isakmpd/policy.h b/sbin/isakmpd/policy.h
index ed4b1f530d9..35b206794d2 100644
--- a/sbin/isakmpd/policy.h
+++ b/sbin/isakmpd/policy.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: policy.h,v 1.17 2007/08/05 09:43:09 tom Exp $	 */
+/* $OpenBSD: policy.h,v 1.18 2024/05/21 05:00:47 jsg Exp $	 */
 /* $EOM: policy.h,v 1.12 2000/09/28 12:53:27 niklas Exp $ */
 
 /*
@@ -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 a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c
index 51bc545023d..0ca61b39eb4 100644
--- a/sbin/mountd/mountd.c
+++ b/sbin/mountd/mountd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mountd.c,v 1.91 2023/03/02 16:58:43 millert Exp $	*/
+/*	$OpenBSD: mountd.c,v 1.92 2024/05/21 05:00:47 jsg Exp $	*/
 /*	$NetBSD: mountd.c,v 1.31 1996/02/18 11:57:53 fvdl Exp $	*/
 
 /*
@@ -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 a/sbin/pflogd/pflogd.h b/sbin/pflogd/pflogd.h
index 26633d69ff7..f31b93a8d4f 100644
--- a/sbin/pflogd/pflogd.h
+++ b/sbin/pflogd/pflogd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pflogd.h,v 1.7 2017/09/09 13:02:52 brynet Exp $ */
+/*	$OpenBSD: pflogd.h,v 1.8 2024/05/21 05:00:47 jsg Exp $ */
 
 /*
  * Copyright (c) 2003 Can Erkin Acar
@@ -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 a/sbin/unwind/frontend.c b/sbin/unwind/frontend.c
index bbcd03ebac1..ccbc977eb73 100644
--- a/sbin/unwind/frontend.c
+++ b/sbin/unwind/frontend.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frontend.c,v 1.80 2023/12/14 09:59:27 claudio Exp $	*/
+/*	$OpenBSD: frontend.c,v 1.81 2024/05/21 05:00:48 jsg Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -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 a/sbin/unwind/resolver.c b/sbin/unwind/resolver.c
index 0c9aff8bb2e..5f025443caa 100644
--- a/sbin/unwind/resolver.c
+++ b/sbin/unwind/resolver.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: resolver.c,v 1.165 2024/05/10 15:02:26 florian Exp $	*/
+/*	$OpenBSD: resolver.c,v 1.166 2024/05/21 05:00:48 jsg Exp $	*/
 
 
 /*
@@ -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 a/usr.bin/cvs/diff.h b/usr.bin/cvs/diff.h
index 9c297d51967..8951612d6b2 100644
--- a/usr.bin/cvs/diff.h
+++ b/usr.bin/cvs/diff.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff.h,v 1.22 2010/07/28 21:19:30 nicm Exp $	*/
+/*	$OpenBSD: diff.h,v 1.23 2024/05/21 05:00:48 jsg Exp $	*/
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
  * All rights reserved.
@@ -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 a/usr.bin/cvs/history.c b/usr.bin/cvs/history.c
index d9647b72e44..0e2e7049650 100644
--- a/usr.bin/cvs/history.c
+++ b/usr.bin/cvs/history.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: history.c,v 1.45 2017/07/20 13:39:11 okan Exp $	*/
+/*	$OpenBSD: history.c,v 1.46 2024/05/21 05:00:48 jsg Exp $	*/
 /*
  * Copyright (c) 2007 Joris Vink <joris@openbsd.org>
  *
@@ -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 a/usr.bin/cvs/log.h b/usr.bin/cvs/log.h
index 6ca1520704f..4759b249610 100644
--- a/usr.bin/cvs/log.h
+++ b/usr.bin/cvs/log.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.h,v 1.23 2008/06/10 01:00:34 joris Exp $	*/
+/*	$OpenBSD: log.h,v 1.24 2024/05/21 05:00:48 jsg Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -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 a/usr.bin/cvs/rcs.h b/usr.bin/cvs/rcs.h
index 55d8696c4db..bfd7e1ec4f6 100644
--- a/usr.bin/cvs/rcs.h
+++ b/usr.bin/cvs/rcs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcs.h,v 1.103 2017/08/28 19:33:20 otto Exp $	*/
+/*	$OpenBSD: rcs.h,v 1.104 2024/05/21 05:00:48 jsg Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -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 a/usr.bin/cvs/remote.h b/usr.bin/cvs/remote.h
index 3d67704ee22..e4aae79aba9 100644
--- a/usr.bin/cvs/remote.h
+++ b/usr.bin/cvs/remote.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: remote.h,v 1.38 2017/08/28 19:33:20 otto Exp $	*/
+/*	$OpenBSD: remote.h,v 1.39 2024/05/21 05:00:48 jsg Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  *
@@ -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 a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h
index c032350c558..bfcedb80987 100644
--- a/usr.bin/diff/diff.h
+++ b/usr.bin/diff/diff.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff.h,v 1.34 2020/11/01 18:16:08 jcs Exp $	 */
+/*	$OpenBSD: diff.h,v 1.35 2024/05/21 05:00:48 jsg Exp $	 */
 
 /*
  * Copyright (c) 1991, 1993
@@ -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 a/usr.bin/fstat/fstat.h b/usr.bin/fstat/fstat.h
index 3079fba0681..df638eeab58 100644
--- a/usr.bin/fstat/fstat.h
+++ b/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 a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h
index 892afde13ad..e8a8b3bbbd0 100644
--- a/usr.bin/ftp/extern.h
+++ b/usr.bin/ftp/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.53 2022/09/15 12:47:10 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.54 2024/05/21 05:00:48 jsg Exp $	*/
 /*	$NetBSD: extern.h,v 1.17 1997/08/18 10:20:19 lukem Exp $	*/
 
 /*
@@ -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 a/usr.bin/ftp/stringlist.h b/usr.bin/ftp/stringlist.h
index bb2eaf5ee19..5e9e090a96a 100644
--- a/usr.bin/ftp/stringlist.h
+++ b/usr.bin/ftp/stringlist.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stringlist.h,v 1.8 2019/05/16 12:44:18 florian Exp $	*/
+/*	$OpenBSD: stringlist.h,v 1.9 2024/05/21 05:00:48 jsg Exp $	*/
 /*	$NetBSD: stringlist.h,v 1.2 1997/01/17 06:11:36 lukem Exp $	*/
 
 /*
@@ -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 a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h
index ea8406b8540..c7defe46c2c 100644
--- a/usr.bin/m4/extern.h
+++ b/usr.bin/m4/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.55 2017/06/15 13:48:42 bcallah Exp $	*/
+/*	$OpenBSD: extern.h,v 1.56 2024/05/21 05:00:48 jsg Exp $	*/
 /*	$NetBSD: extern.h,v 1.3 1996/01/13 23:25:24 pk Exp $	*/
 
 /*-
@@ -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 a/usr.bin/mail/extern.h b/usr.bin/mail/extern.h
index 60a1088b83b..95508398058 100644
--- a/usr.bin/mail/extern.h
+++ b/usr.bin/mail/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.29 2018/09/16 02:38:57 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.30 2024/05/21 05:00:48 jsg Exp $	*/
 /*	$NetBSD: extern.h,v 1.7 1997/07/09 05:22:00 mikel Exp $	*/
 
 /*-
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/20/95
- *	$OpenBSD: extern.h,v 1.29 2018/09/16 02:38:57 millert Exp $
+ *	$OpenBSD: extern.h,v 1.30 2024/05/21 05:00:48 jsg Exp $
  */
 
 struct name;
@@ -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 a/usr.bin/make/error.h b/usr.bin/make/error.h
index a9ea1b4bf6b..6a5f83c09f2 100644
--- a/usr.bin/make/error.h
+++ b/usr.bin/make/error.h
@@ -1,6 +1,6 @@
 #ifndef ERROR_H
 #define ERROR_H
-/*	$OpenBSD: error.h,v 1.13 2015/09/27 16:58:16 guenther Exp $ */
+/*	$OpenBSD: error.h,v 1.14 2024/05/21 05:00:48 jsg Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
@@ -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 a/usr.bin/make/init.h b/usr.bin/make/init.h
index 2b9ca15ee25..3720999ce0e 100644
--- a/usr.bin/make/init.h
+++ b/usr.bin/make/init.h
@@ -1,6 +1,6 @@
 #ifndef INIT_H
 #define INIT_H
-/*	$OpenBSD: init.h,v 1.3 2010/07/19 19:46:44 espie Exp $ */
+/*	$OpenBSD: init.h,v 1.4 2024/05/21 05:00:48 jsg Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
@@ -32,6 +32,5 @@
  * modules.
  */
 extern void Init(void);
-extern void End(void);
 
 #endif
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index 3b86c90a1f9..538605ec432 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -1,7 +1,7 @@
 #ifndef _JOB_H_
 #define _JOB_H_
 
-/*	$OpenBSD: job.h,v 1.38 2020/06/03 12:41:39 espie Exp $	*/
+/*	$OpenBSD: job.h,v 1.39 2024/05/21 05:00:48 jsg Exp $	*/
 /*	$NetBSD: job.h,v 1.5 1996/11/06 17:59:10 christos Exp $ */
 
 /*
@@ -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 a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index 9e65e6a3e08..2a6fc595dd3 100644
--- a/usr.bin/make/targ.c
+++ b/usr.bin/make/targ.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: targ.c,v 1.86 2023/09/04 11:35:11 espie Exp $ */
+/*	$OpenBSD: targ.c,v 1.87 2024/05/21 05:00:48 jsg Exp $ */
 /*	$NetBSD: targ.c,v 1.11 1997/02/20 16:51:50 christos Exp $	*/
 
 /*
@@ -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 a/usr.bin/make/targ.h b/usr.bin/make/targ.h
index 2d18fb61e27..5212d025616 100644
--- a/usr.bin/make/targ.h
+++ b/usr.bin/make/targ.h
@@ -1,6 +1,6 @@
 #ifndef TARG_H
 #define TARG_H
-/*	$OpenBSD: targ.h,v 1.15 2020/01/13 15:41:53 espie Exp $ */
+/*	$OpenBSD: targ.h,v 1.16 2024/05/21 05:00:48 jsg Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
@@ -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 a/usr.bin/make/var.h b/usr.bin/make/var.h
index a831b581aec..17eec8ff03a 100644
--- a/usr.bin/make/var.h
+++ b/usr.bin/make/var.h
@@ -1,6 +1,6 @@
 #ifndef VAR_H
 #define VAR_H
-/* $OpenBSD: var.h,v 1.20 2019/12/21 15:31:54 espie Exp $ */
+/* $OpenBSD: var.h,v 1.21 2024/05/21 05:00:48 jsg Exp $ */
 /*
  * Copyright (c) 2001 Marc Espie.
  *
@@ -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 a/usr.bin/mandoc/libmdoc.h b/usr.bin/mandoc/libmdoc.h
index 4cdea3160aa..28a0e8319af 100644
--- a/usr.bin/mandoc/libmdoc.h
+++ b/usr.bin/mandoc/libmdoc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libmdoc.h,v 1.88 2018/12/31 04:55:42 schwarze Exp $ */
+/*	$OpenBSD: libmdoc.h,v 1.89 2024/05/21 05:00:48 jsg Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -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 a/usr.bin/mandoc/tbl_int.h b/usr.bin/mandoc/tbl_int.h
index 299ceaaf792..39276e1af05 100644
--- a/usr.bin/mandoc/tbl_int.h
+++ b/usr.bin/mandoc/tbl_int.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tbl_int.h,v 1.2 2018/12/14 06:33:03 schwarze Exp $ */
+/*	$OpenBSD: tbl_int.h,v 1.3 2024/05/21 05:00:48 jsg Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011,2013,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -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 a/usr.bin/mg/cmode.c b/usr.bin/mg/cmode.c
index 2a2a1090003..26bba76dd5a 100644
--- a/usr.bin/mg/cmode.c
+++ b/usr.bin/mg/cmode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmode.c,v 1.22 2023/04/21 13:39:37 op Exp $ */
+/* $OpenBSD: cmode.c,v 1.23 2024/05/21 05:00:48 jsg Exp $ */
 /*
  * This file is in the public domain.
  *
@@ -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 a/usr.bin/mg/def.h b/usr.bin/mg/def.h
index 65ae2b43c06..403635036ce 100644
--- a/usr.bin/mg/def.h
+++ b/usr.bin/mg/def.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: def.h,v 1.180 2023/04/21 13:39:37 op Exp $	*/
+/*	$OpenBSD: def.h,v 1.181 2024/05/21 05:00:48 jsg Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -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 a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c
index de22013b240..41b25409ed4 100644
--- a/usr.bin/nm/nm.c
+++ b/usr.bin/nm/nm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nm.c,v 1.55 2022/12/04 23:50:49 cheloha Exp $	*/
+/*	$OpenBSD: nm.c,v 1.56 2024/05/21 05:00:48 jsg Exp $	*/
 /*	$NetBSD: nm.c,v 1.7 1996/01/14 23:04:03 pk Exp $	*/
 
 /*
@@ -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 a/usr.bin/openssl/apps.h b/usr.bin/openssl/apps.h
index 1c0a2ebea83..7a59b737e19 100644
--- a/usr.bin/openssl/apps.h
+++ b/usr.bin/openssl/apps.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.h,v 1.36 2024/05/18 08:48:31 jsg Exp $ */
+/* $OpenBSD: apps.h,v 1.37 2024/05/21 05:00:48 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -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 a/usr.bin/rcs/rcs.h b/usr.bin/rcs/rcs.h
index ec672a1306f..6215c566b5d 100644
--- a/usr.bin/rcs/rcs.h
+++ b/usr.bin/rcs/rcs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcs.h,v 1.18 2017/08/29 16:47:33 otto Exp $	*/
+/*	$OpenBSD: rcs.h,v 1.19 2024/05/21 05:00:48 jsg Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -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 a/usr.bin/rdist/defs.h b/usr.bin/rdist/defs.h
index 3b0688e4071..dc7ec1e91fd 100644
--- a/usr.bin/rdist/defs.h
+++ b/usr.bin/rdist/defs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: defs.h,v 1.39 2021/06/22 20:19:28 jmc Exp $	*/
+/*	$OpenBSD: defs.h,v 1.40 2024/05/21 05:00:48 jsg Exp $	*/
 
 #ifndef __DEFS_H__
 #define __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 a/usr.bin/rsync/extern.h b/usr.bin/rsync/extern.h
index 940db81d5db..5bb23aaa486 100644
--- a/usr.bin/rsync/extern.h
+++ b/usr.bin/rsync/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.48 2024/02/27 11:28:30 claudio Exp $ */
+/*	$OpenBSD: extern.h,v 1.49 2024/05/21 05:00:48 jsg Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -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 a/usr.bin/rsync/receiver.c b/usr.bin/rsync/receiver.c
index 2d055f38a3e..256a788b4f0 100644
--- a/usr.bin/rsync/receiver.c
+++ b/usr.bin/rsync/receiver.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: receiver.c,v 1.32 2023/11/27 11:30:49 claudio Exp $ */
+/*	$OpenBSD: receiver.c,v 1.33 2024/05/21 05:00:48 jsg Exp $ */
 
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -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 a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index 08113a5b77d..e22fdfc16ab 100644
--- a/usr.bin/systat/systat.h
+++ b/usr.bin/systat/systat.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: systat.h,v 1.26 2024/05/18 09:02:34 jsg Exp $	*/
+/*	$OpenBSD: systat.h,v 1.27 2024/05/21 05:00:48 jsg Exp $	*/
 /*	$NetBSD: systat.h,v 1.2 1995/01/20 08:52:14 jtc Exp $	*/
 
 /*-
@@ -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 a/usr.bin/telnet/externs.h b/usr.bin/telnet/externs.h
index d5c9858b02d..55d8ac9f65b 100644
--- a/usr.bin/telnet/externs.h
+++ b/usr.bin/telnet/externs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: externs.h,v 1.31 2017/07/07 09:14:26 fcambus Exp $	*/
+/*	$OpenBSD: externs.h,v 1.32 2024/05/21 05:00:48 jsg Exp $	*/
 /* $KTH: externs.h,v 1.16 1997/11/29 02:28:35 joda Exp $ */
 
 /*
@@ -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 a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index 4964be11f83..0b9aaaaeb4c 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: reader.c,v 1.34 2017/05/25 20:11:03 tedu Exp $	 */
+/* $OpenBSD: reader.c,v 1.35 2024/05/21 05:00:48 jsg Exp $	 */
 /* $NetBSD: reader.c,v 1.5 1996/03/19 03:21:43 jtc Exp $	 */
 
 /*
@@ -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 a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index 1dac33b2809..2f0d043d529 100644
--- a/usr.sbin/ac/ac.c
+++ b/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 a/usr.sbin/acme-client/extern.h b/usr.sbin/acme-client/extern.h
index 4b43b6ef4ac..c0277e44fbb 100644
--- a/usr.sbin/acme-client/extern.h
+++ b/usr.sbin/acme-client/extern.h
@@ -1,4 +1,4 @@
-/*	$Id: extern.h,v 1.20 2020/09/14 16:00:17 florian Exp $ */
+/*	$Id: extern.h,v 1.21 2024/05/21 05:00:48 jsg Exp $ */
 /*
  * Copyright (c) 2016 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -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 a/usr.sbin/btrace/btrace.c b/usr.sbin/btrace/btrace.c
index b817d9c924b..a66949cda87 100644
--- a/usr.sbin/btrace/btrace.c
+++ b/usr.sbin/btrace/btrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: btrace.c,v 1.90 2024/03/30 07:41:45 mpi Exp $ */
+/*	$OpenBSD: btrace.c,v 1.91 2024/05/21 05:00:48 jsg Exp $ */
 
 /*
  * Copyright (c) 2019 - 2023 Martin Pieuchot <mpi@openbsd.org>
@@ -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 a/usr.sbin/btrace/btrace.h b/usr.sbin/btrace/btrace.h
index 0e4c26da6cc..846c7f57c3e 100644
--- a/usr.sbin/btrace/btrace.h
+++ b/usr.sbin/btrace/btrace.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: btrace.h,v 1.14 2024/02/27 12:50:33 mpi Exp $ */
+/*	$OpenBSD: btrace.h,v 1.15 2024/05/21 05:00:48 jsg Exp $ */
 
 /*
  * Copyright (c) 2019 - 2020 Martin Pieuchot <mpi@openbsd.org>
@@ -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 a/usr.sbin/config/cmd.h b/usr.sbin/config/cmd.h
index be476743c64..66f1c23a8e5 100644
--- a/usr.sbin/config/cmd.h
+++ b/usr.sbin/config/cmd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.h,v 1.8 2019/08/11 17:08:33 deraadt Exp $	*/
+/*	$OpenBSD: cmd.h,v 1.9 2024/05/21 05:00:48 jsg Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -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 a/usr.sbin/config/sem.h b/usr.sbin/config/sem.h
index 4fbfcd6793a..6780cce2d2f 100644
--- a/usr.sbin/config/sem.h
+++ b/usr.sbin/config/sem.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sem.h,v 1.13 2008/03/24 21:35:03 maja Exp $	*/
+/*	$OpenBSD: sem.h,v 1.14 2024/05/21 05:00:48 jsg Exp $	*/
 /*	$NetBSD: sem.h,v 1.6 1996/11/11 23:40:10 gwr Exp $	*/
 
 /*
@@ -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 a/usr.sbin/dhcpd/dhcpd.h b/usr.sbin/dhcpd/dhcpd.h
index 0903c244ddd..9ec1db663b2 100644
--- a/usr.sbin/dhcpd/dhcpd.h
+++ b/usr.sbin/dhcpd/dhcpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhcpd.h,v 1.68 2020/11/10 16:42:17 krw Exp $ */
+/*	$OpenBSD: dhcpd.h,v 1.69 2024/05/21 05:00:48 jsg Exp $ */
 
 /*
  * Copyright (c) 1995, 1996, 1997, 1998, 1999
@@ -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 a/usr.sbin/dhcrelay/dhcpd.h b/usr.sbin/dhcrelay/dhcpd.h
index 4a7dd50fa61..6071db17522 100644
--- a/usr.sbin/dhcrelay/dhcpd.h
+++ b/usr.sbin/dhcrelay/dhcpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhcpd.h,v 1.23 2017/04/05 14:40:56 reyk Exp $	*/
+/*	$OpenBSD: dhcpd.h,v 1.24 2024/05/21 05:00:48 jsg Exp $	*/
 
 /*
  * Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
@@ -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 a/usr.sbin/dhcrelay6/dhcpd.h b/usr.sbin/dhcrelay6/dhcpd.h
index 41703cc6893..387e28abfcd 100644
--- a/usr.sbin/dhcrelay6/dhcpd.h
+++ b/usr.sbin/dhcrelay6/dhcpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhcpd.h,v 1.1 2017/03/17 14:45:16 rzalamena Exp $	*/
+/*	$OpenBSD: dhcpd.h,v 1.2 2024/05/21 05:00:48 jsg Exp $	*/
 
 /*
  * Copyright (c) 2017 Rafael Zalamena <rzalamena@openbsd.org>
@@ -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 a/usr.sbin/ikectl/ikectl.c b/usr.sbin/ikectl/ikectl.c
index 85bb31d8207..5d496a84db3 100644
--- a/usr.sbin/ikectl/ikectl.c
+++ b/usr.sbin/ikectl/ikectl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ikectl.c,v 1.30 2022/12/04 11:54:31 tobhe Exp $	*/
+/*	$OpenBSD: ikectl.c,v 1.31 2024/05/21 05:00:48 jsg Exp $	*/
 
 /*
  * Copyright (c) 2007-2013 Reyk Floeter <reyk@openbsd.org>
@@ -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 a/usr.sbin/iscsid/iscsid.h b/usr.sbin/iscsid/iscsid.h
index 7fb1dfbdeb8..47d3981e0b3 100644
--- a/usr.sbin/iscsid/iscsid.h
+++ b/usr.sbin/iscsid/iscsid.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iscsid.h,v 1.18 2022/12/28 21:30:16 jmc Exp $ */
+/*	$OpenBSD: iscsid.h,v 1.19 2024/05/21 05:00:48 jsg Exp $ */
 
 /*
  * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org>
@@ -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 a/usr.sbin/ldapd/ldapd.h b/usr.sbin/ldapd/ldapd.h
index 39ed38d6aa8..735369a78a0 100644
--- a/usr.sbin/ldapd/ldapd.h
+++ b/usr.sbin/ldapd/ldapd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldapd.h,v 1.36 2021/12/15 04:00:15 deraadt Exp $ */
+/*	$OpenBSD: ldapd.h,v 1.37 2024/05/21 05:00:48 jsg Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
@@ -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 a/usr.sbin/mrinfo/mrinfo.c b/usr.sbin/mrinfo/mrinfo.c
index 47c51854153..226f7aa9c11 100644
--- a/usr.sbin/mrinfo/mrinfo.c
+++ b/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 a/usr.sbin/ntpd/ntpd.c b/usr.sbin/ntpd/ntpd.c
index 8e6887435d6..7f81bb9be7f 100644
--- a/usr.sbin/ntpd/ntpd.c
+++ b/usr.sbin/ntpd/ntpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntpd.c,v 1.132 2021/07/16 14:36:09 mestre Exp $ */
+/*	$OpenBSD: ntpd.c,v 1.133 2024/05/21 05:00:48 jsg Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -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 a/usr.sbin/ntpd/ntpd.h b/usr.sbin/ntpd/ntpd.h
index 81d0c6c83f6..872d028d0eb 100644
--- a/usr.sbin/ntpd/ntpd.h
+++ b/usr.sbin/ntpd/ntpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntpd.h,v 1.153 2023/12/20 15:36:36 otto Exp $ */
+/*	$OpenBSD: ntpd.h,v 1.154 2024/05/21 05:00:48 jsg Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -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 a/usr.sbin/ospfctl/ospfctl.h b/usr.sbin/ospfctl/ospfctl.h
index 3b1c088e773..2ea92806654 100644
--- a/usr.sbin/ospfctl/ospfctl.h
+++ b/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 a/usr.sbin/rad/rad.c b/usr.sbin/rad/rad.c
index a0c317265b0..036a73e1765 100644
--- a/usr.sbin/rad/rad.c
+++ b/usr.sbin/rad/rad.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rad.c,v 1.30 2024/05/17 06:50:14 florian Exp $	*/
+/*	$OpenBSD: rad.c,v 1.31 2024/05/21 05:00:48 jsg Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -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 a/usr.sbin/radiusd/radiusd_local.h b/usr.sbin/radiusd/radiusd_local.h
index 2704ecc27fd..5cc4b2230d7 100644
--- a/usr.sbin/radiusd/radiusd_local.h
+++ b/usr.sbin/radiusd/radiusd_local.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radiusd_local.h,v 1.6 2023/09/08 05:56:22 yasuoka Exp $	*/
+/*	$OpenBSD: radiusd_local.h,v 1.7 2024/05/21 05:00:48 jsg Exp $	*/
 
 /*
  * Copyright (c) 2013 Internet Initiative Japan Inc.
@@ -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 a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index 2ae2452a8f1..5a49e8cf133 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route6d.c,v 1.100 2020/12/29 19:48:27 benno Exp $	*/
+/*	$OpenBSD: route6d.c,v 1.101 2024/05/21 05:00:48 jsg Exp $	*/
 /*	$KAME: route6d.c,v 1.111 2006/10/25 06:38:13 jinmei Exp $	*/
 
 /*
@@ -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 a/usr.sbin/snmpd/snmpd.h b/usr.sbin/snmpd/snmpd.h
index d8c56edf3b5..bc1b9ff7d6b 100644
--- a/usr.sbin/snmpd/snmpd.h
+++ b/usr.sbin/snmpd/snmpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: snmpd.h,v 1.119 2024/02/06 15:36:11 martijn Exp $	*/
+/*	$OpenBSD: snmpd.h,v 1.120 2024/05/21 05:00:48 jsg Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008, 2012 Reyk Floeter <reyk@openbsd.org>
@@ -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 a/usr.sbin/snmpd/snmpe.c b/usr.sbin/snmpd/snmpe.c
index 055d11724d7..d444c8d9b8a 100644
--- a/usr.sbin/snmpd/snmpe.c
+++ b/usr.sbin/snmpd/snmpe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: snmpe.c,v 1.94 2024/01/16 13:33:13 claudio Exp $	*/
+/*	$OpenBSD: snmpe.c,v 1.95 2024/05/21 05:00:48 jsg Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008, 2012 Reyk Floeter <reyk@openbsd.org>
@@ -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 a/usr.sbin/tcpdump/interface.h b/usr.sbin/tcpdump/interface.h
index 4e055f3eb80..893c78b5bf0 100644
--- a/usr.sbin/tcpdump/interface.h
+++ b/usr.sbin/tcpdump/interface.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: interface.h,v 1.87 2023/02/28 10:04:50 claudio Exp $	*/
+/*	$OpenBSD: interface.h,v 1.88 2024/05/21 05:00:48 jsg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -20,7 +20,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Id: interface.h,v 1.87 2023/02/28 10:04:50 claudio Exp $ (LBL)
+ * @(#) $Id: interface.h,v 1.88 2024/05/21 05:00:48 jsg Exp $ (LBL)
  */
 
 #ifndef 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 a/usr.sbin/tcpdump/print-gre.c b/usr.sbin/tcpdump/print-gre.c
index 96e7a52e50a..1a1c5e49df4 100644
--- a/usr.sbin/tcpdump/print-gre.c
+++ b/usr.sbin/tcpdump/print-gre.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print-gre.c,v 1.34 2020/08/17 07:09:25 dlg Exp $	*/
+/*	$OpenBSD: print-gre.c,v 1.35 2024/05/21 05:00:48 jsg Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -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 a/usr.sbin/tftpd/tftpd.c b/usr.sbin/tftpd/tftpd.c
index 168df85e049..aec254a4550 100644
--- a/usr.sbin/tftpd/tftpd.c
+++ b/usr.sbin/tftpd/tftpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tftpd.c,v 1.50 2022/10/09 23:04:57 kn Exp $	*/
+/*	$OpenBSD: tftpd.c,v 1.51 2024/05/21 05:00:48 jsg Exp $	*/
 
 /*
  * Copyright (c) 2012 David Gwynne <dlg@uq.edu.au>
@@ -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 a/usr.sbin/traceroute/traceroute.h b/usr.sbin/traceroute/traceroute.h
index c148a6c2dd7..35c62e90d46 100644
--- a/usr.sbin/traceroute/traceroute.h
+++ b/usr.sbin/traceroute/traceroute.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: traceroute.h,v 1.7 2021/09/03 09:13:00 florian Exp $	*/
+/*	$OpenBSD: traceroute.h,v 1.8 2024/05/21 05:00:48 jsg Exp $	*/
 /*	$NetBSD: traceroute.c,v 1.10 1995/05/21 15:50:45 mycroft Exp $	*/
 
 /*
@@ -167,7 +167,4 @@ extern char		*hostname;
 
 extern u_int16_t	 srcport;
 
-extern int verbose;
-extern int dump;
-
 extern char *__progname;
diff --git a/usr.sbin/ypldap/ldapclient.c b/usr.sbin/ypldap/ldapclient.c
index 31f29efd1f2..8d10206f7f6 100644
--- a/usr.sbin/ypldap/ldapclient.c
+++ b/usr.sbin/ypldap/ldapclient.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ldapclient.c,v 1.49 2023/07/18 13:06:33 claudio Exp $ */
+/* $OpenBSD: ldapclient.c,v 1.50 2024/05/21 05:00:48 jsg Exp $ */
 
 /*
  * Copyright (c) 2008 Alexander Schrijver <aschrijver@openbsd.org>
@@ -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 a/usr.sbin/ypldap/ypldap.c b/usr.sbin/ypldap/ypldap.c
index 8aa2c2b0077..ab0132f51c8 100644
--- a/usr.sbin/ypldap/ypldap.c
+++ b/usr.sbin/ypldap/ypldap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypldap.c,v 1.24 2023/03/31 03:38:26 jmatthew Exp $ */
+/*	$OpenBSD: ypldap.c,v 1.25 2024/05/21 05:00:48 jsg Exp $ */
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -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 a/usr.sbin/ypserv/revnetgroup/hash.h b/usr.sbin/ypserv/revnetgroup/hash.h
index edfadffec48..3dfc210fa7d 100644
--- a/usr.sbin/ypserv/revnetgroup/hash.h
+++ b/usr.sbin/ypserv/revnetgroup/hash.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hash.h,v 1.3 2013/12/05 14:20:53 jca Exp $ */
+/* $OpenBSD: hash.h,v 1.4 2024/05/21 05:00:48 jsg Exp $ */
 /*
  * Copyright (c) 1995
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -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 a/usr.sbin/ypserv/yppush/yppush.h b/usr.sbin/ypserv/yppush/yppush.h
index aa07f04036f..79fa3e2fe39 100644
--- a/usr.sbin/ypserv/yppush/yppush.h
+++ b/usr.sbin/ypserv/yppush/yppush.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yppush.h,v 1.9 2003/07/15 06:10:46 deraadt Exp $ */
+/*	$OpenBSD: yppush.h,v 1.10 2024/05/21 05:00:48 jsg Exp $ */
 
 /*
  * Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -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 *);