diff --git a/lib/libc/net/getifaddrs.3 b/lib/libc/net/getifaddrs.3
index be1e53079a51..b9335881e058 100644
--- a/lib/libc/net/getifaddrs.3
+++ b/lib/libc/net/getifaddrs.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: getifaddrs.3,v 1.14 2013/04/07 23:12:36 wiz Exp $
+.\"	$NetBSD: getifaddrs.3,v 1.15 2016/01/23 00:43:42 dholland Exp $
 .\"	BSDI	getifaddrs.3,v 2.5 2000/02/23 14:51:59 dab Exp
 .\"
 .\" Copyright (c) 1995, 1999
@@ -51,7 +51,7 @@ structure contains at least the following entries:
 .Bd -literal
     struct ifaddrs   *ifa_next;         /* Pointer to next struct */
     char             *ifa_name;         /* Interface name */
-    u_int             ifa_flags;        /* Interface flags */
+    unsigned          ifa_flags;        /* Interface flags */
     struct sockaddr  *ifa_addr;         /* Interface address */
     struct sockaddr  *ifa_netmask;      /* Interface netmask */
     struct sockaddr  *ifa_broadaddr;    /* Interface broadcast address */
diff --git a/lib/libc/string/bm.3 b/lib/libc/string/bm.3
index d5d3c8f077ad..cd4e9fc42730 100644
--- a/lib/libc/string/bm.3
+++ b/lib/libc/string/bm.3
@@ -1,4 +1,4 @@
-.\" $NetBSD: bm.3,v 1.8 2006/10/16 08:48:45 wiz Exp $
+.\" $NetBSD: bm.3,v 1.9 2016/01/23 00:43:42 dholland Exp $
 .\"
 .\" Copyright (c) 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -46,9 +46,9 @@
 .In sys/types.h
 .In bm.h
 .Ft bm_pat *
-.Fn bm_comp "u_char *pattern" "size_t patlen" "u_char freq[256]"
-.Ft u_char *
-.Fn bm_exec "bm_pat *pdesc" "u_char *text" "size_t len"
+.Fn bm_comp "unsigned char *pattern" "size_t patlen" "unsigned char freq[256]"
+.Ft unsigned char *
+.Fn bm_exec "bm_pat *pdesc" "unsigned char *text" "size_t len"
 .Ft void
 .Fn bm_free "bm_pat *pdesc"
 .Sh DESCRIPTION
diff --git a/lib/libkvm/kvm_getlwps.3 b/lib/libkvm/kvm_getlwps.3
index 7c2e20c9f54e..83ad97641f1e 100644
--- a/lib/libkvm/kvm_getlwps.3
+++ b/lib/libkvm/kvm_getlwps.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: kvm_getlwps.3,v 1.6 2009/03/10 23:49:07 joerg Exp $
+.\"	$NetBSD: kvm_getlwps.3,v 1.7 2016/01/23 00:43:43 dholland Exp $
 .\"
 .\"Copyright (c) 2002 The NetBSD Foundation, Inc.
 .\"All rights reserved.
@@ -41,7 +41,7 @@
 .In sys/sysctl.h
 .\" .Fa kvm_t *kd
 .Ft struct kinfo_lwp *
-.Fn kvm_getlwps "kvm_t *kd" "int pid" "u_long procaddr" "int *elemsize" "int *cnt"
+.Fn kvm_getlwps "kvm_t *kd" "int pid" "unsigned long procaddr" "int *elemsize" "int *cnt"
 .Sh DESCRIPTION
 .Fn kvm_getlwps
 returns the set of LWPs belonging to the process specified by
diff --git a/lib/libkvm/kvm_read.3 b/lib/libkvm/kvm_read.3
index 4078ce224b8f..133477a48969 100644
--- a/lib/libkvm/kvm_read.3
+++ b/lib/libkvm/kvm_read.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: kvm_read.3,v 1.8 2003/08/07 16:44:39 agc Exp $
+.\"	$NetBSD: kvm_read.3,v 1.9 2016/01/23 00:43:43 dholland Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -45,9 +45,9 @@
 .Sh SYNOPSIS
 .In kvm.h
 .Ft ssize_t
-.Fn kvm_read "kvm_t *kd" "u_long addr" "void *buf" "size_t nbytes"
+.Fn kvm_read "kvm_t *kd" "unsigned long addr" "void *buf" "size_t nbytes"
 .Ft ssize_t
-.Fn kvm_write "kvm_t *kd" "u_long addr" "const void *buf" "size_t nbytes"
+.Fn kvm_write "kvm_t *kd" "unsigned long addr" "const void *buf" "size_t nbytes"
 .Sh DESCRIPTION
 The
 .Fn kvm_read
diff --git a/lib/libpci/pci.3 b/lib/libpci/pci.3
index 74979a8affbb..6aee79beea7d 100644
--- a/lib/libpci/pci.3
+++ b/lib/libpci/pci.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pci.3,v 1.10 2014/12/16 13:38:36 msaitoh Exp $
+.\"	$NetBSD: pci.3,v 1.11 2016/01/23 00:43:43 dholland Exp $
 .\"
 .\" Copyright 2001 Wasabi Systems, Inc.
 .\" All rights reserved.
@@ -44,23 +44,23 @@
 .Sh SYNOPSIS
 .In pci.h
 .Ft int
-.Fn pcibus_conf_read "int pcifd" "u_int bus" "u_int dev" "u_int func" \
-"u_int reg" "pcireg_t *valp"
+.Fn pcibus_conf_read "int pcifd" "unsigned bus" "unsigned dev" "unsigned func" \
+"unsigned reg" "pcireg_t *valp"
 .Ft int
-.Fn pcibus_conf_write "int pcifd" "u_int bus" "u_int dev" "u_int func" \
-"u_int reg" "pcireg_t val"
+.Fn pcibus_conf_write "int pcifd" "unsigned bus" "unsigned dev" "unsigned func" \
+"unsigned reg" "pcireg_t val"
 .Ft int
-.Fn pcidev_conf_read "int devfd" "u_int reg" "pcireg_t *valp"
+.Fn pcidev_conf_read "int devfd" "unsigned reg" "pcireg_t *valp"
 .Ft int
-.Fn pcidev_conf_write "int devfd" "u_int reg" "pcireg_t val"
+.Fn pcidev_conf_write "int devfd" "unsigned reg" "pcireg_t val"
 .Ft char *
 .Fn pci_findvendor "pcireg_t id_reg"
 .Ft void
 .Fn pci_devinfo "pcireg_t id_reg" "pcireg_t class_reg" "int showclass" "char *devinfo" "size_t len"
 .Ft void
-.Fn pci_conf_print "int pcifd" "u_int bus" "u_int dev" "u_int func"
+.Fn pci_conf_print "int pcifd" "unsigned bus" "unsigned dev" "unsigned func"
 .Ft int
-.Fn pci_drvname "int pcifd" "u_int dev" "u_int func" "char *drvname" "size_t len"
+.Fn pci_drvname "int pcifd" "unsigned dev" "unsigned func" "char *drvname" "size_t len"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/lib/libutil/login_cap.3 b/lib/libutil/login_cap.3
index 9c6e5b7ed2e6..94c9c5f05f17 100644
--- a/lib/libutil/login_cap.3
+++ b/lib/libutil/login_cap.3
@@ -1,4 +1,4 @@
-.\" $NetBSD: login_cap.3,v 1.21 2013/06/23 08:38:41 wiz Exp $
+.\" $NetBSD: login_cap.3,v 1.22 2016/01/23 00:43:43 dholland Exp $
 .\"
 .\" Copyright (c) 1996,1997 Berkeley Software Design, Inc. All rights reserved.
 .\"
@@ -55,7 +55,7 @@
 .Ft login_cap_t *
 .Fn login_getclass "char *class"
 .Ft int
-.Fn login_getcapbool "login_cap_t *lc" "const char *cap" "u_int def"
+.Fn login_getcapbool "login_cap_t *lc" "const char *cap" "unsigned def"
 .Ft quad_t
 .Fn login_getcapnum "login_cap_t *lc" "const char *cap" "quad_t def" "quad_t err"
 .Ft quad_t
@@ -69,9 +69,9 @@
 .Ft void
 .Fn login_close "login_cap_t *lc"
 .Ft int
-.Fn setclasscontext "const char *class" "u_int flags"
+.Fn setclasscontext "const char *class" "unsigned flags"
 .Ft int
-.Fn setusercontext "login_cap_t *lc" "const struct passwd *pwd" "uid_t uid" "u_int flags"
+.Fn setusercontext "login_cap_t *lc" "const struct passwd *pwd" "uid_t uid" "unsigned flags"
 .Sh DESCRIPTION
 The
 .Fn login_getclass