From: deraadt <deraadt@openbsd.org>
Date: Tue, 20 Jan 2015 18:22:20 +0000 (+0000)
Subject: Adjust <sys/param.h> comments regarding use of use of MAXFRAG, or
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=78eb0b7e750a8abce6d5bf75f3980c4936ee0c1c;p=openbsd

Adjust <sys/param.h> comments regarding use of use of MAXFRAG, or
delete <sys/param.h> if now possible
ok guenther
---

diff --git a/bin/df/ffs_df.c b/bin/df/ffs_df.c
index d1fa39d6c2f..4e92a2a417c 100644
--- a/bin/df/ffs_df.c
+++ b/bin/df/ffs_df.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_df.c,v 1.15 2015/01/16 06:39:31 deraadt Exp $	*/
+/*	$OpenBSD: ffs_df.c,v 1.16 2015/01/20 18:22:20 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993, 1994
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG */
+#include <sys/types.h>
 #include <sys/mount.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
index 9f56ba8d215..8815c5e7f7d 100644
--- a/lib/libc/gen/disklabel.c
+++ b/lib/libc/gen/disklabel.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG DEV_BSIZE */
+#include <sys/param.h>	/* DEV_BSIZE */
 #include <sys/types.h>
 #define DKTYPENAMES
 #include <sys/disklabel.h>
diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c
index 42a506848bd..e7c06ab8b78 100644
--- a/sbin/badsect/badsect.c
+++ b/sbin/badsect/badsect.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: badsect.c,v 1.25 2015/01/16 06:39:56 deraadt Exp $	*/
+/*	$OpenBSD: badsect.c,v 1.26 2015/01/20 18:22:20 deraadt Exp $	*/
 /*	$NetBSD: badsect.c,v 1.10 1995/03/18 14:54:28 cgd Exp $	*/
 
 /*
@@ -40,7 +40,7 @@
  * this program can be used if the driver for the file system in question
  * does not support bad block forwarding.
  */
-#include <sys/param.h>	/* MAXFRAG MAXBSIZE DEV_BSIZE isclr */
+#include <sys/param.h>	/* MAXBSIZE DEV_BSIZE isclr */
 #include <sys/stat.h>
 
 #include <ufs/ffs/fs.h>
diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c
index 70653535014..766a78e81bb 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clri.c,v 1.14 2015/01/16 06:39:56 deraadt Exp $	*/
+/*	$OpenBSD: clri.c,v 1.15 2015/01/20 18:22:20 deraadt Exp $	*/
 /*	$NetBSD: clri.c,v 1.19 2005/01/20 15:50:47 xtraeme Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG MAXBSIZE DEV_BSIZE */
+#include <sys/param.h>	/* MAXBSIZE DEV_BSIZE */
 
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 5bbc14804cf..6cb97847bb6 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.c,v 1.197 2015/01/16 06:39:57 deraadt Exp $	*/
+/*	$OpenBSD: disklabel.c,v 1.198 2015/01/20 18:22:20 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG DEV_BSIZE */
+#include <sys/param.h>	/* DEV_BSIZE */
 #include <sys/ioctl.h>
 #include <sys/dkio.h>
 #include <sys/stat.h>
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c
index ea34c2ea6ef..0ef37d5b7cd 100644
--- a/sbin/disklabel/editor.c
+++ b/sbin/disklabel/editor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: editor.c,v 1.290 2015/01/16 20:21:40 miod Exp $	*/
+/*	$OpenBSD: editor.c,v 1.291 2015/01/20 18:22:20 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>	/* MAXBSIZE DEV_BSIZE MAXFRAG */
+#include <sys/param.h>	/* MAXBSIZE DEV_BSIZE */
 #include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/stat.h>
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 65101a9f38a..f3b78e1a39e 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.53 2015/01/16 06:39:57 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.54 2015/01/20 18:22:20 deraadt Exp $	*/
 /*	$NetBSD: main.c,v 1.14 1997/06/05 11:13:24 lukem Exp $	*/
 
 /*-
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG MAXBSIZE DEV_BSIZE roundup */
+#include <sys/param.h>	/* MAXBSIZE DEV_BSIZE roundup */
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/time.h>
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index ddecaecda36..79280df84e7 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tape.c,v 1.41 2015/01/16 06:39:57 deraadt Exp $	*/
+/*	$OpenBSD: tape.c,v 1.42 2015/01/20 18:22:20 deraadt Exp $	*/
 /*	$NetBSD: tape.c,v 1.11 1997/06/05 11:13:26 lukem Exp $	*/
 
 /*-
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG MAXBSIZE DEV_BSIZE */
+#include <sys/param.h>	/* MAXBSIZE DEV_BSIZE */
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/wait.h>
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 3a49a7aae7a..5240d4b7ffd 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: traverse.c,v 1.37 2015/01/16 06:39:57 deraadt Exp $	*/
+/*	$OpenBSD: traverse.c,v 1.38 2015/01/20 18:22:20 deraadt Exp $	*/
 /*	$NetBSD: traverse.c,v 1.17 1997/06/05 11:13:27 lukem Exp $	*/
 
 /*-
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG MAXBSIZE DEV_BSIZE dbtob */
+#include <sys/param.h>	/* MAXBSIZE DEV_BSIZE dbtob */
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/disklabel.h>
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index f7cdb38768e..894290a559b 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dumpfs.c,v 1.31 2015/01/16 06:39:57 deraadt Exp $	*/
+/*	$OpenBSD: dumpfs.c,v 1.32 2015/01/20 18:22:21 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* DEV_BSIZE MAXFRAG MAXBSIZE isset */
+#include <sys/param.h>	/* DEV_BSIZE MAXBSIZE isset */
 #include <sys/time.h>
 
 #include <ufs/ufs/dinode.h>
diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c
index afbbd3a128f..a3d1244fd64 100644
--- a/sbin/fsck_ffs/dir.c
+++ b/sbin/fsck_ffs/dir.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dir.c,v 1.31 2015/01/16 06:39:57 deraadt Exp $	*/
+/*	$OpenBSD: dir.c,v 1.32 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: dir.c,v 1.20 1996/09/27 22:45:11 christos Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG DEV_BSIZE roundup btodb */
+#include <sys/param.h>	/* DEV_BSIZE roundup btodb */
 #include <sys/time.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index 13a8be66561..187de3522cc 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inode.c,v 1.45 2015/01/16 06:39:57 deraadt Exp $	*/
+/*	$OpenBSD: inode.c,v 1.46 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: inode.c,v 1.23 1996/10/11 20:15:47 thorpej Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG setbit btodb */
+#include <sys/param.h>	/* setbit btodb */
 #include <sys/time.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index 9aa65d429b5..60ba2e06736 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.42 2015/01/16 06:39:57 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.43 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: main.c,v 1.22 1996/10/11 20:15:48 thorpej Exp $	*/
 
 /*
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG */
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <sys/mount.h>
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index e8d5c3e5a86..75666a8026c 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pass1.c,v 1.41 2015/01/16 06:39:57 deraadt Exp $	*/
+/*	$OpenBSD: pass1.c,v 1.42 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: pass1.c,v 1.16 1996/09/27 22:45:15 christos Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG MIN setbit btodb isset */
+#include <sys/param.h>	/* MIN setbit btodb isset */
 #include <sys/time.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c
index 442695d3f20..1bf4e166f48 100644
--- a/sbin/fsck_ffs/pass1b.c
+++ b/sbin/fsck_ffs/pass1b.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pass1b.c,v 1.20 2015/01/16 06:39:57 deraadt Exp $	*/
+/*	$OpenBSD: pass1b.c,v 1.21 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: pass1b.c,v 1.10 1996/09/23 16:18:37 christos Exp $	*/
 
 /*
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG */
 #include <sys/time.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c
index 02d150cd8b8..0d244c957a0 100644
--- a/sbin/fsck_ffs/pass2.c
+++ b/sbin/fsck_ffs/pass2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pass2.c,v 1.36 2015/01/16 06:39:57 deraadt Exp $	*/
+/*	$OpenBSD: pass2.c,v 1.37 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: pass2.c,v 1.17 1996/09/27 22:45:15 christos Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG DEV_BSIZE roundup */
+#include <sys/param.h>	/* DEV_BSIZE roundup */
 #include <sys/time.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c
index ba04d7d0568..8d5a78aa8a5 100644
--- a/sbin/fsck_ffs/pass3.c
+++ b/sbin/fsck_ffs/pass3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pass3.c,v 1.17 2015/01/16 06:39:57 deraadt Exp $	*/
+/*	$OpenBSD: pass3.c,v 1.18 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: pass3.c,v 1.8 1995/03/18 14:55:54 cgd Exp $	*/
 
 /*
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG */
 #include <sys/time.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c
index 91645762537..ad433cf160b 100644
--- a/sbin/fsck_ffs/pass4.c
+++ b/sbin/fsck_ffs/pass4.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pass4.c,v 1.23 2015/01/16 06:39:57 deraadt Exp $	*/
+/*	$OpenBSD: pass4.c,v 1.24 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: pass4.c,v 1.11 1996/09/27 22:45:17 christos Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG isset clrbit */
+#include <sys/param.h>	/* isset clrbit */
 #include <sys/time.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c
index edb08644eba..cdce86c0b6b 100644
--- a/sbin/fsck_ffs/pass5.c
+++ b/sbin/fsck_ffs/pass5.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pass5.c,v 1.47 2015/01/16 06:39:57 deraadt Exp $	*/
+/*	$OpenBSD: pass5.c,v 1.48 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: pass5.c,v 1.16 1996/09/27 22:45:18 christos Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG MAXBSIZE roundup setbit */
+#include <sys/param.h>	/* MAXBSIZE roundup setbit */
 #include <sys/time.h>
 #include <sys/lock.h>
 #include <sys/ucred.h>
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index 91bfb782368..45b8ff5c91a 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setup.c,v 1.56 2015/01/16 06:39:57 deraadt Exp $	*/
+/*	$OpenBSD: setup.c,v 1.57 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: setup.c,v 1.27 1996/09/27 22:45:19 christos Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG MAXBSIZE DEV_BSIZE roundup */
+#include <sys/param.h>	/* MAXBSIZE DEV_BSIZE roundup */
 #define DKTYPENAMES
 #include <sys/time.h>
 #include <ufs/ufs/dinode.h>
diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index 913f5aea581..354c9e8d1a5 100644
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: utilities.c,v 1.48 2015/01/16 06:39:57 deraadt Exp $	*/
+/*	$OpenBSD: utilities.c,v 1.49 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: utilities.c,v 1.18 1996/09/27 22:45:20 christos Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG DEV_BSIZE isset setbit clrbit */
+#include <sys/param.h>	/* DEV_BSIZE isset setbit clrbit */
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <ufs/ufs/dinode.h>
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index d3063bafc61..ef0e3570ac9 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsdb.c,v 1.28 2015/01/16 06:39:58 deraadt Exp $	*/
+/*	$OpenBSD: fsdb.c,v 1.29 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: fsdb.c,v 1.7 1997/01/11 06:50:53 lukem Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG */
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/mount.h>
diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c
index 1efdf03bd2e..eebe7e2cf72 100644
--- a/sbin/fsdb/fsdbutil.c
+++ b/sbin/fsdb/fsdbutil.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsdbutil.c,v 1.16 2015/01/16 06:39:58 deraadt Exp $	*/
+/*	$OpenBSD: fsdbutil.c,v 1.17 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: fsdbutil.c,v 1.5 1996/09/28 19:30:37 christos Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG */
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/mount.h>
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index 66355f1ff16..12806b86c36 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsirand.c,v 1.31 2015/01/16 06:39:58 deraadt Exp $	*/
+/*	$OpenBSD: fsirand.c,v 1.32 2015/01/20 18:22:21 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>	/* MAXFRAG DEV_BSIZE */
+#include <sys/param.h>	/* DEV_BSIZE */
 #include <sys/disklabel.h>
 #include <sys/ioctl.h>
 #include <sys/dkio.h>
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index c0b41bfb325..67e7ed7afa6 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: growfs.c,v 1.37 2015/01/16 06:39:58 deraadt Exp $	*/
+/*	$OpenBSD: growfs.c,v 1.38 2015/01/20 18:22:21 deraadt Exp $	*/
 /*
  * Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
  * Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
@@ -42,7 +42,7 @@
  */
 
 /* ********************************************************** INCLUDES ***** */
-#include <sys/param.h>	/* DEV_BSIZE MAXFRAG MAXBSIZE setbit isset isclr clrbit */
+#include <sys/param.h>	/* DEV_BSIZE MAXBSIZE setbit isset isclr clrbit */
 #include <sys/types.h>
 #include <sys/disklabel.h>
 #include <sys/ioctl.h>
diff --git a/sbin/ncheck_ffs/ncheck_ffs.c b/sbin/ncheck_ffs/ncheck_ffs.c
index cb483f99485..36c5f07dc07 100644
--- a/sbin/ncheck_ffs/ncheck_ffs.c
+++ b/sbin/ncheck_ffs/ncheck_ffs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncheck_ffs.c,v 1.48 2015/01/16 06:39:59 deraadt Exp $	*/
+/*	$OpenBSD: ncheck_ffs.c,v 1.49 2015/01/20 18:22:21 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
@@ -54,7 +54,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG MAXBSIZE DEV_BSIZE */
+#include <sys/param.h>	/* MAXBSIZE DEV_BSIZE */
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 7e065c5c2f4..9235ae37bab 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkfs.c,v 1.88 2015/01/18 04:48:24 deraadt Exp $	*/
+/*	$OpenBSD: mkfs.c,v 1.89 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: mkfs.c,v 1.25 1995/06/18 21:35:38 cgd Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG MAXBSIZE DEV_BSIZE roundup btodb setbit */
+#include <sys/param.h>	/* MAXBSIZE DEV_BSIZE roundup btodb setbit */
 #include <sys/signal.h>
 #include <sys/time.h>
 #include <sys/disklabel.h>
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 78b5fa12ae7..1921d5a0083 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: newfs.c,v 1.98 2015/01/16 06:40:00 deraadt Exp $	*/
+/*	$OpenBSD: newfs.c,v 1.99 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG DEV_BSIZE MAXBSIZE */
+#include <sys/param.h>	/* DEV_BSIZE MAXBSIZE */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 018fcb0bcbd..2f8d4ee3aab 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quotacheck.c,v 1.35 2015/01/16 06:40:00 deraadt Exp $	*/
+/*	$OpenBSD: quotacheck.c,v 1.36 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: quotacheck.c,v 1.12 1996/03/30 22:34:25 mark Exp $	*/
 
 /*
@@ -36,7 +36,7 @@
 /*
  * Fix up / report on disk quotas & usage
  */
-#include <sys/param.h>	/* MAXFRAG DEV_BSIZE MAXBSIZE */
+#include <sys/param.h>	/* DEV_BSIZE MAXBSIZE */
 #include <sys/stat.h>
 #include <sys/wait.h>
 
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index 8c8aa10c698..ba63b8dad80 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dirs.c,v 1.39 2015/01/16 06:40:00 deraadt Exp $	*/
+/*	$OpenBSD: dirs.c,v 1.40 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: dirs.c,v 1.26 1997/07/01 05:37:49 lukem Exp $	*/
 
 /*
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG */
 #include <sys/stat.h>
 #include <sys/time.h>
 
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index a46a60bb360..dcabc3a57d2 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: interactive.c,v 1.29 2015/01/16 06:40:00 deraadt Exp $	*/
+/*	$OpenBSD: interactive.c,v 1.30 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: interactive.c,v 1.10 1997/03/19 08:42:52 lukem Exp $	*/
 
 /*
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG */
 #include <sys/time.h>
 #include <sys/stat.h>
 
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 5c0f46c5265..284c4ba94f0 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.22 2015/01/16 06:40:00 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.23 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: main.c,v 1.13 1997/07/01 05:37:51 lukem Exp $	*/
 
 /*
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG */
 #include <sys/stat.h>
 #include <sys/time.h>
 
diff --git a/sbin/scan_ffs/scan_ffs.c b/sbin/scan_ffs/scan_ffs.c
index a4e85d9840b..0352246d755 100644
--- a/sbin/scan_ffs/scan_ffs.c
+++ b/sbin/scan_ffs/scan_ffs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scan_ffs.c,v 1.18 2015/01/16 06:40:00 deraadt Exp $	*/
+/*	$OpenBSD: scan_ffs.c,v 1.19 2015/01/20 18:22:21 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1998 Niklas Hallqvist, Tobias Weingartner
@@ -25,7 +25,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG */
 #include <sys/types.h>
 #include <sys/fcntl.h>
 #include <ufs/ffs/fs.h>
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index 7cd601ff751..7da733a7b3e 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tunefs.c,v 1.35 2015/01/16 06:40:01 deraadt Exp $	*/
+/*	$OpenBSD: tunefs.c,v 1.36 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: tunefs.c,v 1.33 2005/01/19 20:46:16 xtraeme Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
 /*
  * tunefs: change layout parameters to an existing file system.
  */
-#include <sys/param.h>	/* DEV_BSIZE MAXBSIZE MAXFRAG */
+#include <sys/param.h>	/* DEV_BSIZE MAXBSIZE */
 
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
diff --git a/usr.sbin/installboot/i386_installboot.c b/usr.sbin/installboot/i386_installboot.c
index c612f54f1b7..f484bdadd52 100644
--- a/usr.sbin/installboot/i386_installboot.c
+++ b/usr.sbin/installboot/i386_installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i386_installboot.c,v 1.7 2015/01/16 00:05:12 deraadt Exp $	*/
+/*	$OpenBSD: i386_installboot.c,v 1.8 2015/01/20 18:22:21 deraadt Exp $	*/
 /*	$NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
 
 /*
@@ -37,7 +37,7 @@
 
 #define ELFSIZE 32
 
-#include <sys/param.h>	/* DEV_BSIZE MAXFRAG */
+#include <sys/param.h>	/* DEV_BSIZE */
 #include <sys/types.h>
 #include <sys/disklabel.h>
 #include <sys/dkio.h>
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c
index 588b6334de2..d6058ee6a84 100644
--- a/usr.sbin/quot/quot.c
+++ b/usr.sbin/quot/quot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quot.c,v 1.25 2015/01/16 06:40:19 deraadt Exp $	*/
+/*	$OpenBSD: quot.c,v 1.26 2015/01/20 18:22:21 deraadt Exp $	*/
 
 /*
  * Copyright (C) 1991, 1994 Wolfgang Solfrank.
@@ -31,7 +31,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXFRAG DEV_BSIZE MAXBSIZE */
+#include <sys/param.h>	/* DEV_BSIZE MAXBSIZE */
 #include <sys/mount.h>
 #include <sys/time.h>
 #include <ufs/ufs/dinode.h>