diff --git a/libexec/telnetd/ext.h b/libexec/telnetd/ext.h
index 7b3b6d071f16..6726aab7b261 100644
--- a/libexec/telnetd/ext.h
+++ b/libexec/telnetd/ext.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext.h,v 1.21 2012/01/09 16:36:48 christos Exp $	*/
+/*	$NetBSD: ext.h,v 1.22 2012/01/10 23:39:11 joerg Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -81,7 +81,7 @@ extern void
 	add_slc(char, char, cc_t),
 	check_slc(void),
 	change_slc(int, int, cc_t),
-	cleanup(int),
+	cleanup(int) __dead,
 	clientstat(int, int, int),
 	copy_termbuf(char *, int),
 	deferslc(void),
@@ -91,8 +91,8 @@ extern void
 	dooption(int),
 	dontoption(int),
 	edithost(const char *, const char *),
-	fatal(int, const char *),
-	fatalperror(int, const char *),
+	fatal(int, const char *) __dead,
+	fatalperror(int, const char *) __dead,
 	get_slc_defaults(void),
 	init_env(void),
 	init_termbuf(void),
@@ -120,7 +120,7 @@ extern void
 	sendbrk(void),
 	sendsusp(void),
 	set_termbuf(void),
-	start_login(char *, int, char *),
+	start_login(char *, int, char *) __dead,
 	start_slc(int),
 	startslave(char *, int, char *),
 	suboption(void),
diff --git a/libexec/telnetd/telnetd.c b/libexec/telnetd/telnetd.c
index 7aab61e63ba1..d1c426831e5c 100644
--- a/libexec/telnetd/telnetd.c
+++ b/libexec/telnetd/telnetd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: telnetd.c,v 1.53 2012/01/09 16:36:48 christos Exp $	*/
+/*	$NetBSD: telnetd.c,v 1.54 2012/01/10 23:39:11 joerg Exp $	*/
 
 /*
  * Copyright (C) 1997 and 1998 WIDE Project.
@@ -65,7 +65,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\
 #if 0
 static char sccsid[] = "@(#)telnetd.c	8.4 (Berkeley) 5/30/95";
 #else
-__RCSID("$NetBSD: telnetd.c,v 1.53 2012/01/09 16:36:48 christos Exp $");
+__RCSID("$NetBSD: telnetd.c,v 1.54 2012/01/10 23:39:11 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -121,11 +121,10 @@ int keepalive = 1;
 const char *gettyname = "default";
 char *progname;
 
-int main(int, char *[]);
-void usage(void);
+void usage(void) __dead;
 int getterminaltype(char *, size_t);
 int getent(char *, const char *);
-void doit(struct sockaddr *);
+static void doit(struct sockaddr *) __dead;
 void _gettermname(void);
 int terminaltypeok(char *);
 char *getstr(const char *, char **);
@@ -670,12 +669,12 @@ char *hostname;
 char host_name[MAXHOSTNAMELEN + 1];
 char remote_host_name[MAXHOSTNAMELEN + 1];
 
-extern void telnet(int, int);
+static void telnet(int, int) __dead;
 
 /*
  * Get a pty, scan input lines.
  */
-void
+static void
 doit(struct sockaddr *who)
 {
 	char *host;
@@ -739,7 +738,7 @@ doit(struct sockaddr *who)
  * Main loop.  Select from pty and network, and
  * hand data to telnet receiver finite state machine.
  */
-void
+static void
 telnet(int f, int p)
 {
 	int on = 1;
diff --git a/usr.bin/telnet/externs.h b/usr.bin/telnet/externs.h
index 8c38378b8fa3..6647bfc78655 100644
--- a/usr.bin/telnet/externs.h
+++ b/usr.bin/telnet/externs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: externs.h,v 1.36 2012/01/09 16:08:55 christos Exp $	*/
+/*	$NetBSD: externs.h,v 1.37 2012/01/10 23:39:11 joerg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1990, 1993
@@ -234,7 +234,7 @@ int sourceroute(struct addrinfo *, char *, char **, int *, int*);
 
 /* main.c */
 void tninit(void);
-void usage(void);
+void usage(void) __dead;
 
 /* network.c */
 void init_network(void);
diff --git a/usr.sbin/npf/npfctl/npfctl.h b/usr.sbin/npf/npfctl/npfctl.h
index 1d2137d06514..a20bb0020071 100644
--- a/usr.sbin/npf/npfctl/npfctl.h
+++ b/usr.sbin/npf/npfctl/npfctl.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: npfctl.h,v 1.8 2012/01/08 21:34:21 rmind Exp $	*/
+/*	$NetBSD: npfctl.h,v 1.9 2012/01/10 23:39:32 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@ typedef struct module_arg {
 	npfvar_t *	ma_opts;
 } module_arg_t;
 
-void		yyerror(const char *, ...) __printflike(1, 2);
+void		yyerror(const char *, ...) __printflike(1, 2) __dead;
 void *		zalloc(size_t);
 void *		xrealloc(void *, size_t);
 char *		xstrdup(const char *);
diff --git a/usr.sbin/tprof/tprof.c b/usr.sbin/tprof/tprof.c
index c0d67cdd62ad..28541cadfc64 100644
--- a/usr.sbin/tprof/tprof.c
+++ b/usr.sbin/tprof/tprof.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tprof.c,v 1.4 2009/01/26 05:53:10 yamt Exp $	*/
+/*	$NetBSD: tprof.c,v 1.5 2012/01/10 23:39:33 joerg Exp $	*/
 
 /*-
  * Copyright (c)2008 YAMAMOTO Takashi,
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: tprof.c,v 1.4 2009/01/26 05:53:10 yamt Exp $");
+__RCSID("$NetBSD: tprof.c,v 1.5 2012/01/10 23:39:33 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/ioctl.h>
@@ -53,7 +53,7 @@ __RCSID("$NetBSD: tprof.c,v 1.4 2009/01/26 05:53:10 yamt Exp $");
 int devfd;
 int outfd;
 
-static void
+__dead static void
 usage(void)
 {