From 187e734c1d43f84ad73d42479cfb5e421dd21a98 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Fri, 13 Oct 2000 13:43:37 +0000
Subject: [PATCH] Avoid impending world breakage. 1. Don't include <sys/conf.h>
 in userland.  It is not used, and including it    without including its
 prerequisite <sys/time.h> should have broken the    world. 2. Don't include
 <sys/mount.h>.  It is not used, except in -current it    bogusly includes
 <sys/stat.h> which bogusly includes <sys/time.h> and    thus accidentally
 provides the prerequisite in (1). 3. Cleaned up nearby include messes.

Not approved by despite 5 weeks notice: MAINTAINER
---
 sys/dev/vinum/vinumparser.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/sys/dev/vinum/vinumparser.c b/sys/dev/vinum/vinumparser.c
index ce353bfeb7f7..59d9abaddd7b 100644
--- a/sys/dev/vinum/vinumparser.c
+++ b/sys/dev/vinum/vinumparser.c
@@ -59,19 +59,13 @@
 
 #include <sys/param.h>
 #ifdef _KERNEL
+#include <sys/conf.h>
 #include <sys/systm.h>
+#include <machine/setjmp.h>
 #else
 #include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
 #endif
-#include <machine/setjmp.h>
-/* All this mess for a single struct definition */
-#include <sys/uio.h>
-#include <sys/namei.h>
 #include <sys/disklabel.h>
-#include <sys/mount.h>
-#include <sys/conf.h>
 
 #include <dev/vinum/vinumvar.h>
 #include <dev/vinum/vinumkw.h>
@@ -81,7 +75,6 @@
 #ifdef _KERNEL
 #define iswhite(c) ((c == ' ') || (c == '\t'))		    /* check for white space */
 #else /* get it from the headers */
-#include <ctype.h>
 #define iswhite isspace					    /* use the ctype macro */
 #endif