diff --git a/src/lib/libutil/check_expire.c b/src/lib/libutil/check_expire.c
index dbc99754..5ff06063 100644
--- a/src/lib/libutil/check_expire.c
+++ b/src/lib/libutil/check_expire.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_expire.c,v 1.1 2000/11/26 01:27:19 millert Exp $	*/
+/*	$OpenBSD: check_expire.c,v 1.2 2001/08/16 18:34:40 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
@@ -46,11 +46,11 @@
 #include <syslog.h>
 #include <time.h>
 #include <tzfile.h>
-#include <util.h>
-
 #include <login_cap.h>
 #include <bsd_auth.h>
 
+#include "util.h"
+
 static char *pwd_update __P((struct passwd *));
 
 int
diff --git a/src/lib/libutil/fparseln.c b/src/lib/libutil/fparseln.c
index e09ce8fb..2c236160 100644
--- a/src/lib/libutil/fparseln.c
+++ b/src/lib/libutil/fparseln.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fparseln.c,v 1.1 1999/07/20 16:38:56 jakob Exp $
+/*	$OpenBSD: fparseln.c,v 1.2 2001/08/16 18:34:40 millert Exp $
 /*	$NetBSD: fparseln.c,v 1.7 1999/07/02 15:49:12 simonb Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fparseln.c,v 1.1 1999/07/20 16:38:56 jakob Exp $";
+static char rcsid[] = "$OpenBSD: fparseln.c,v 1.2 2001/08/16 18:34:40 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/cdefs.h>
@@ -39,7 +39,8 @@ static char rcsid[] = "$OpenBSD: fparseln.c,v 1.1 1999/07/20 16:38:56 jakob Exp
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <util.h>
+
+#include "util.h"
 
 static int isescaped __P((const char *, const char *, int));
 
diff --git a/src/lib/libutil/opendisk.c b/src/lib/libutil/opendisk.c
index 7afe2422..fba222d8 100644
--- a/src/lib/libutil/opendisk.c
+++ b/src/lib/libutil/opendisk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opendisk.c,v 1.1 1999/09/21 04:52:45 csapuntz Exp $	*/
+/*	$OpenBSD: opendisk.c,v 1.2 2001/08/16 18:34:40 millert Exp $	*/
 /*	$NetBSD: opendisk.c,v 1.4 1997/09/30 17:13:50 phil Exp $	*/
 
 /*-
@@ -42,11 +42,12 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <util.h>
 #include <paths.h>
 #include <stdio.h>
 #include <string.h>
 
+#include "util.h"
+
 int
 opendisk(path, flags, buf, buflen, iscooked)
 	const char *path;
diff --git a/src/lib/libutil/readlabel.c b/src/lib/libutil/readlabel.c
index 7b921f6b..b4634dab 100644
--- a/src/lib/libutil/readlabel.c
+++ b/src/lib/libutil/readlabel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: readlabel.c,v 1.4 1997/11/18 19:57:29 millert Exp $	*/
+/*	$OpenBSD: readlabel.c,v 1.5 2001/08/16 18:34:40 millert Exp $	*/
 
 /*
  * Copyright (c) 1996, Jason Downs.  All rights reserved.
@@ -33,7 +33,6 @@
 #include <paths.h>
 #include <string.h>
 #include <unistd.h>
-#include <util.h>
 #include <sys/dkio.h>
 #define DKTYPENAMES
 #include <sys/disklabel.h>
@@ -41,6 +40,8 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 
+#include "util.h"
+
 /*
  * Try to get a disklabel for the specified device, and return mount_xxx
  * style filesystem type name for the specified partition.