diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c
index b86f994c2191..c7dc72c1a831 100644
--- a/usr.sbin/apmd/apmd.c
+++ b/usr.sbin/apmd/apmd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: apmd.c,v 1.23 2002/09/18 21:06:39 mycroft Exp $	*/
+/*	$NetBSD: apmd.c,v 1.24 2002/09/23 03:36:03 itojun Exp $	*/
 
 /*-
  * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/wait.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <machine/apmvar.h>
 #include <err.h>
 #include "pathnames.h"
diff --git a/usr.sbin/map-mbone/mapper.c b/usr.sbin/map-mbone/mapper.c
index ba9c6f065bf2..6707ec31b024 100644
--- a/usr.sbin/map-mbone/mapper.c
+++ b/usr.sbin/map-mbone/mapper.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mapper.c,v 1.12 2002/09/19 03:31:19 mycroft Exp $	*/
+/*	$NetBSD: mapper.c,v 1.13 2002/09/23 03:36:04 itojun Exp $	*/
 
 /* Mapper for connections between MRouteD multicast routers.
  * Written by Pavel Curtis <Pavel@PARC.Xerox.Com>
@@ -37,7 +37,7 @@
 #include <string.h>
 #include <netdb.h>
 #include <sys/time.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include "defs.h"
 #include <arpa/inet.h>
 #include <stdarg.h>
diff --git a/usr.sbin/mld6query/mld6.c b/usr.sbin/mld6query/mld6.c
index f8dbc31a8081..a77e3e63fe36 100644
--- a/usr.sbin/mld6query/mld6.c
+++ b/usr.sbin/mld6query/mld6.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mld6.c,v 1.7 2002/09/19 16:45:58 mycroft Exp $	*/
+/*	$NetBSD: mld6.c,v 1.8 2002/09/23 03:36:04 itojun Exp $	*/
 /*	$KAME: mld6.c,v 1.9 2000/12/04 06:29:37 itojun Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <unistd.h>
 #include <signal.h>
 
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index 7cc5677d0ad6..6e788b700ae8 100644
--- a/usr.sbin/moused/moused.c
+++ b/usr.sbin/moused/moused.c
@@ -1,4 +1,4 @@
-/* $NetBSD: moused.c,v 1.9 2002/09/20 19:49:59 mycroft Exp $ */
+/* $NetBSD: moused.c,v 1.10 2002/09/23 03:36:04 itojun Exp $ */
 /**
  ** Copyright (c) 1995 Michael Smith, All rights reserved.
  **
@@ -48,7 +48,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: moused.c,v 1.9 2002/09/20 19:49:59 mycroft Exp $");
+__RCSID("$NetBSD: moused.c,v 1.10 2002/09/23 03:36:04 itojun Exp $");
 #endif /* not lint */
 
 #include <ctype.h>
@@ -72,7 +72,7 @@ __RCSID("$NetBSD: moused.c,v 1.9 2002/09/20 19:49:59 mycroft Exp $");
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <unistd.h>
 
 #define MAX_CLICKTHRESHOLD	2000	/* 2 seconds */
diff --git a/usr.sbin/mrinfo/mrinfo.c b/usr.sbin/mrinfo/mrinfo.c
index cae011ebb3d1..4882f32f410f 100644
--- a/usr.sbin/mrinfo/mrinfo.c
+++ b/usr.sbin/mrinfo/mrinfo.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mrinfo.c,v 1.16 2002/09/19 16:45:59 mycroft Exp $	*/
+/*	$NetBSD: mrinfo.c,v 1.17 2002/09/23 03:36:04 itojun Exp $	*/
 
 /*
  * This tool requests configuration info from a multicast router
@@ -80,14 +80,14 @@
 static char rcsid[] =
     "@(#) Header: mrinfo.c,v 1.6 93/04/08 15:14:16 van Exp (LBL)";
 #else
-__RCSID("$NetBSD: mrinfo.c,v 1.16 2002/09/19 16:45:59 mycroft Exp $");
+__RCSID("$NetBSD: mrinfo.c,v 1.17 2002/09/23 03:36:04 itojun Exp $");
 #endif
 #endif
 
 #include <string.h>
 #include <netdb.h>
 #include <sys/time.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include "defs.h"
 #include <arpa/inet.h>
 #include <stdarg.h>
diff --git a/usr.sbin/mtrace/mtrace.c b/usr.sbin/mtrace/mtrace.c
index 40c1b098f242..fb67cab7bbf0 100644
--- a/usr.sbin/mtrace/mtrace.c
+++ b/usr.sbin/mtrace/mtrace.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mtrace.c,v 1.24 2002/09/19 16:45:59 mycroft Exp $	*/
+/*	$NetBSD: mtrace.c,v 1.25 2002/09/23 03:36:05 itojun Exp $	*/
 
 /*
  * mtrace.c
@@ -52,13 +52,13 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mtrace.c,v 1.24 2002/09/19 16:45:59 mycroft Exp $");
+__RCSID("$NetBSD: mtrace.c,v 1.25 2002/09/23 03:36:05 itojun Exp $");
 #endif
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <ctype.h>
diff --git a/usr.sbin/nfsd/nfsd.c b/usr.sbin/nfsd/nfsd.c
index 69abb82397e8..4a9e153ba9b4 100644
--- a/usr.sbin/nfsd/nfsd.c
+++ b/usr.sbin/nfsd/nfsd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfsd.c,v 1.38 2002/09/20 19:48:58 mycroft Exp $	*/
+/*	$NetBSD: nfsd.c,v 1.39 2002/09/23 03:36:05 itojun Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)nfsd.c	8.9 (Berkeley) 3/29/95";
 #else
-__RCSID("$NetBSD: nfsd.c,v 1.38 2002/09/20 19:48:58 mycroft Exp $");
+__RCSID("$NetBSD: nfsd.c,v 1.39 2002/09/23 03:36:05 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -59,7 +59,7 @@ __RCSID("$NetBSD: nfsd.c,v 1.38 2002/09/20 19:48:58 mycroft Exp $");
 #include <sys/mount.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 #include <rpc/rpc.h>
 #include <rpc/pmap_clnt.h>
diff --git a/usr.sbin/rbootd/rbootd.c b/usr.sbin/rbootd/rbootd.c
index 21a333ba6902..8d7cae6112c1 100644
--- a/usr.sbin/rbootd/rbootd.c
+++ b/usr.sbin/rbootd/rbootd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rbootd.c,v 1.16 2002/09/19 03:04:13 mycroft Exp $	*/
+/*	$NetBSD: rbootd.c,v 1.17 2002/09/23 03:36:05 itojun Exp $	*/
 
 /*
  * Copyright (c) 1988, 1992 The University of Utah and the Center
@@ -57,13 +57,13 @@ __COPYRIGHT(
 #if 0
 static char sccsid[] = "@(#)rbootd.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: rbootd.c,v 1.16 2002/09/19 03:04:13 mycroft Exp $");
+__RCSID("$NetBSD: rbootd.c,v 1.17 2002/09/23 03:36:05 itojun Exp $");
 #endif
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
diff --git a/usr.sbin/rpcbind/rpcb_svc_com.c b/usr.sbin/rpcbind/rpcb_svc_com.c
index 056d9515f9ba..2ebb9141a273 100644
--- a/usr.sbin/rpcbind/rpcb_svc_com.c
+++ b/usr.sbin/rpcbind/rpcb_svc_com.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpcb_svc_com.c,v 1.6 2000/08/03 00:07:22 fvdl Exp $	*/
+/*	$NetBSD: rpcb_svc_com.c,v 1.7 2002/09/23 03:36:05 itojun Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -42,7 +42,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
-#include <sys/poll.h>
 #include <sys/socket.h>
 #include <rpc/rpc.h>
 #include <rpc/rpcb_prot.h>
@@ -51,6 +50,7 @@
 #include <syslog.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <poll.h>
 #ifdef PORTMAP
 #include <netinet/in.h>
 #include <rpc/pmap_prot.h>
diff --git a/usr.sbin/rpcbind/util.c b/usr.sbin/rpcbind/util.c
index 2a1bc7f2b255..7ab8cac04300 100644
--- a/usr.sbin/rpcbind/util.c
+++ b/usr.sbin/rpcbind/util.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.c,v 1.7 2001/04/30 00:36:08 fvdl Exp $	*/
+/*	$NetBSD: util.c,v 1.8 2002/09/23 03:36:06 itojun Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <ifaddrs.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <rpc/rpc.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c
index 93d61244baff..c17fddcdba9a 100644
--- a/usr.sbin/rtadvd/rtadvd.c
+++ b/usr.sbin/rtadvd/rtadvd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtadvd.c,v 1.24 2002/09/20 19:51:34 mycroft Exp $	*/
+/*	$NetBSD: rtadvd.c,v 1.25 2002/09/23 03:36:06 itojun Exp $	*/
 /*	$KAME: rtadvd.c,v 1.74 2002/09/08 01:25:17 itojun Exp $	*/
 
 /*
@@ -35,7 +35,6 @@
 #include <sys/uio.h>
 #include <sys/time.h>
 #include <sys/queue.h>
-#include <sys/poll.h>
 
 #include <net/if.h>
 #include <net/route.h>
@@ -57,6 +56,7 @@
 #include <stdlib.h>
 #include <syslog.h>
 #include <util.h>
+#include <poll.h>
 
 #include "rtadvd.h"
 #include "rrenum.h"
diff --git a/usr.sbin/sushi/run.c b/usr.sbin/sushi/run.c
index 2a26f816f6db..ecb5f6ae21a6 100644
--- a/usr.sbin/sushi/run.c
+++ b/usr.sbin/sushi/run.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: run.c,v 1.7 2002/09/19 00:45:47 mycroft Exp $       */
+/*      $NetBSD: run.c,v 1.8 2002/09/23 03:36:06 itojun Exp $       */
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -48,12 +48,12 @@
 #include <termios.h>
 #include <util.h>
 #include <err.h>
+#include <poll.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/param.h>
-#include <sys/poll.h>
 
 #include "sushi.h"
 #include "run.h"