headers ordering (alphabetically) and cleanup, from mbalmer@ and myself;

32 files changed, 123 insertions, 139 deletions

diff --git a/usr.bin/cvs/admin.c b/usr.bin/cvs/admin.c
index 7a0f541f229..c4686cb0e24 100644
--- a/usr.bin/cvs/admin.c
+++ b/usr.bin/cvs/admin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: admin.c,v 1.16 2005/05/25 10:23:57 jfb Exp $	*/
+/*	$OpenBSD: admin.c,v 1.17 2005/05/31 08:58:47 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
@@ -29,13 +29,12 @@
 #include <sys/stat.h>
 
 #include <errno.h>
-#include <stdio.h>
 #include <fcntl.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
 
-#include "rcs.h"
 #include "cvs.h"
 #include "log.h"
 #include "proto.h"
diff --git a/usr.bin/cvs/annotate.c b/usr.bin/cvs/annotate.c
index a349a196404..fd1730fda42 100644
--- a/usr.bin/cvs/annotate.c
+++ b/usr.bin/cvs/annotate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: annotate.c,v 1.16 2005/05/30 08:27:03 xsa Exp $	*/
+/*	$OpenBSD: annotate.c,v 1.17 2005/05/31 08:58:47 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -28,14 +28,13 @@
 #include <sys/stat.h>
 
 #include <errno.h>
-#include <stdio.h>
 #include <fcntl.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "cvs.h"
-#include "rcs.h"
 #include "log.h"
 #include "proto.h"
 
diff --git a/usr.bin/cvs/buf.c b/usr.bin/cvs/buf.c
index 2ae596a84be..257036bb674 100644
--- a/usr.bin/cvs/buf.c
+++ b/usr.bin/cvs/buf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buf.c,v 1.10 2005/05/26 21:46:36 jfb Exp $	*/
+/*	$OpenBSD: buf.c,v 1.11 2005/05/31 08:58:47 xsa Exp $	*/
 /*
  * Copyright (c) 2003 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -27,14 +27,14 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 
-#include <stdio.h>
 #include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
-#include <unistd.h>
-#include <string.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "buf.h"
 #include "cvs.h"
diff --git a/usr.bin/cvs/checkout.c b/usr.bin/cvs/checkout.c
index d69455da7d1..7cee68f749c 100644
--- a/usr.bin/cvs/checkout.c
+++ b/usr.bin/cvs/checkout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: checkout.c,v 1.27 2005/05/31 08:26:40 xsa Exp $	*/
+/*	$OpenBSD: checkout.c,v 1.28 2005/05/31 08:58:47 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -30,12 +30,11 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "cvs.h"
 #include "log.h"
-#include "file.h"
 #include "proto.h"
 
 
diff --git a/usr.bin/cvs/cmd.c b/usr.bin/cvs/cmd.c
index 223c0579c24..ddd4fba5001 100644
--- a/usr.bin/cvs/cmd.c
+++ b/usr.bin/cvs/cmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.c,v 1.21 2005/05/25 04:12:54 jfb Exp $	*/
+/*	$OpenBSD: cmd.c,v 1.22 2005/05/31 08:58:47 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -28,15 +28,14 @@
 #include <sys/queue.h>
 #include <sys/time.h>
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "cvs.h"
 #include "log.h"
-#include "rcs.h"
 #include "proto.h"
 
 
diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c
index 7816b5eda44..f7bba3c6a5e 100644
--- a/usr.bin/cvs/commit.c
+++ b/usr.bin/cvs/commit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: commit.c,v 1.36 2005/05/30 09:52:55 joris Exp $	*/
+/*	$OpenBSD: commit.c,v 1.37 2005/05/31 08:58:47 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -29,15 +29,15 @@
 #include <sys/stat.h>
 
 #include <errno.h>
-#include <stdio.h>
 #include <fcntl.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
 
+#include "buf.h"
 #include "cvs.h"
 #include "log.h"
-#include "buf.h"
 #include "proto.h"
 
 
diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c
index 9873971df33..928c3c99162 100644
--- a/usr.bin/cvs/cvs.c
+++ b/usr.bin/cvs/cvs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cvs.c,v 1.67 2005/05/24 04:12:25 jfb Exp $	*/
+/*	$OpenBSD: cvs.c,v 1.68 2005/05/31 08:58:47 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -27,15 +27,15 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
+#include <ctype.h>
 #include <err.h>
-#include <pwd.h>
 #include <errno.h>
+#include <pwd.h>
+#include <signal.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "cvs.h"
 #include "log.h"
diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h
index 3c0a018e565..de961ccff68 100644
--- a/usr.bin/cvs/cvs.h
+++ b/usr.bin/cvs/cvs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cvs.h,v 1.62 2005/05/26 22:25:31 jfb Exp $	*/
+/*	$OpenBSD: cvs.h,v 1.63 2005/05/31 08:58:47 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -28,8 +28,9 @@
 #define CVS_H
 
 #include <sys/param.h>
-#include <stdio.h>
+
 #include <dirent.h>
+#include <stdio.h>
 
 #include "rcs.h"
 #include "file.h"
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c
index d5b089e0c54..add3e62ea70 100644
--- a/usr.bin/cvs/diff.c
+++ b/usr.bin/cvs/diff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff.c,v 1.40 2005/05/31 08:26:40 xsa Exp $	*/
+/*	$OpenBSD: diff.c,v 1.41 2005/05/31 08:58:47 xsa Exp $	*/
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
  * All rights reserved.
@@ -129,22 +129,22 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 
+#include <ctype.h>
+#include <dirent.h>
 #include <err.h>
 #include <errno.h>
-#include <ctype.h>
-#include <stdio.h>
 #include <fcntl.h>
 #include <paths.h>
 #include <regex.h>
-#include <dirent.h>
-#include <stdlib.h>
 #include <stddef.h>
-#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
+#include "buf.h"
 #include "cvs.h"
 #include "log.h"
-#include "buf.h"
 #include "proto.h"
 
 
diff --git a/usr.bin/cvs/edit.c b/usr.bin/cvs/edit.c
index 1bf7a441df9..03198223e2a 100644
--- a/usr.bin/cvs/edit.c
+++ b/usr.bin/cvs/edit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: edit.c,v 1.4 2005/05/28 20:39:08 xsa Exp $	*/
+/*	$OpenBSD: edit.c,v 1.5 2005/05/31 08:58:47 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -28,10 +28,10 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libgen.h>
 #include <unistd.h>
 
 #include "cvs.h"
diff --git a/usr.bin/cvs/entries.c b/usr.bin/cvs/entries.c
index 28f4580bef5..39a90bceb99 100644
--- a/usr.bin/cvs/entries.c
+++ b/usr.bin/cvs/entries.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: entries.c,v 1.33 2005/05/27 17:39:40 xsa Exp $	*/
+/*	$OpenBSD: entries.c,v 1.34 2005/05/31 08:58:47 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -34,8 +34,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "log.h"
 #include "cvs.h"
+#include "log.h"
 
 
 #define CVS_ENTRIES_NFIELDS  6
diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c
index 44325da5564..2b33fc4e083 100644
--- a/usr.bin/cvs/file.c
+++ b/usr.bin/cvs/file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.c,v 1.82 2005/05/31 08:26:40 xsa Exp $	*/
+/*	$OpenBSD: file.c,v 1.83 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -28,20 +28,20 @@
 #include <sys/queue.h>
 #include <sys/stat.h>
 
-#include <pwd.h>
+#include <dirent.h>
 #include <errno.h>
-#include <stdio.h>
 #include <fcntl.h>
+#include <fnmatch.h>
 #include <libgen.h>
-#include <dirent.h>
+#include <pwd.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
-#include <fnmatch.h>
+#include <unistd.h>
 
 #include "cvs.h"
-#include "log.h"
 #include "file.h"
+#include "log.h"
 #include "strtab.h"
 
 
diff --git a/usr.bin/cvs/getlog.c b/usr.bin/cvs/getlog.c
index 8a8542a7536..6c7eee1a020 100644
--- a/usr.bin/cvs/getlog.c
+++ b/usr.bin/cvs/getlog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getlog.c,v 1.30 2005/05/29 14:30:38 xsa Exp $	*/
+/*	$OpenBSD: getlog.c,v 1.31 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -26,16 +26,15 @@
 
 #include <sys/param.h>
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
-#include <string.h>
 #include <paths.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "cvs.h"
 #include "log.h"
-#include "file.h"
 #include "proto.h"
 
 
diff --git a/usr.bin/cvs/hist.c b/usr.bin/cvs/hist.c
index 0dd0bfcc445..680d9c5d860 100644
--- a/usr.bin/cvs/hist.c
+++ b/usr.bin/cvs/hist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hist.c,v 1.4 2005/04/16 17:50:08 joris Exp $	*/
+/*	$OpenBSD: hist.c,v 1.5 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -27,14 +27,14 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 
-#include <stdio.h>
 #include <fcntl.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
 
-#include "log.h"
 #include "cvs.h"
+#include "log.h"
 
 #define CVS_HIST_BUFSIZE    8192
 
diff --git a/usr.bin/cvs/history.c b/usr.bin/cvs/history.c
index 99d26101771..590bfc18f72 100644
--- a/usr.bin/cvs/history.c
+++ b/usr.bin/cvs/history.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: history.c,v 1.17 2005/05/31 08:26:40 xsa Exp $	*/
+/*	$OpenBSD: history.c,v 1.18 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -28,14 +28,13 @@
 #include <sys/stat.h>
 
 #include <errno.h>
-#include <stdio.h>
 #include <fcntl.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "cvs.h"
-#include "rcs.h"
 #include "log.h"
 #include "proto.h"
 
diff --git a/usr.bin/cvs/import.c b/usr.bin/cvs/import.c
index 5bba3313c39..ec64c4f4e63 100644
--- a/usr.bin/cvs/import.c
+++ b/usr.bin/cvs/import.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: import.c,v 1.22 2005/05/26 03:14:21 jfb Exp $	*/
+/*	$OpenBSD: import.c,v 1.23 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -30,12 +30,11 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
 
-#include "log.h"
-#include "file.h"
 #include "cvs.h"
+#include "log.h"
 #include "proto.h"
 
 
diff --git a/usr.bin/cvs/init.c b/usr.bin/cvs/init.c
index 64cc876f29c..118b2a0527e 100644
--- a/usr.bin/cvs/init.c
+++ b/usr.bin/cvs/init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init.c,v 1.16 2005/05/24 04:12:25 jfb Exp $	*/
+/*	$OpenBSD: init.c,v 1.17 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -28,14 +28,13 @@
 #include <sys/stat.h>
 
 #include <errno.h>
-#include <stdio.h>
 #include <fcntl.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "cvs.h"
-#include "rcs.h"
 #include "log.h"
 #include "proto.h"
 
diff --git a/usr.bin/cvs/log.c b/usr.bin/cvs/log.c
index a15016c685d..57697f21ffb 100644
--- a/usr.bin/cvs/log.c
+++ b/usr.bin/cvs/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.15 2005/04/06 21:42:32 jfb Exp $	*/
+/*	$OpenBSD: log.c,v 1.16 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -28,14 +28,13 @@
 
 #include <errno.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <stdarg.h>
+#include <string.h>
 #include <syslog.h>
+#include <unistd.h>
 
-#include "log.h"
 #include "cvs.h"
+#include "log.h"
 
 extern char *__progname;
 
diff --git a/usr.bin/cvs/logmsg.c b/usr.bin/cvs/logmsg.c
index 759e1625510..7a89b6082bd 100644
--- a/usr.bin/cvs/logmsg.c
+++ b/usr.bin/cvs/logmsg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: logmsg.c,v 1.13 2005/04/18 21:02:50 jfb Exp $	*/
+/*	$OpenBSD: logmsg.c,v 1.14 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -30,12 +30,12 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
 
+#include "buf.h"
 #include "cvs.h"
 #include "log.h"
-#include "buf.h"
 #include "proto.h"
 
 
diff --git a/usr.bin/cvs/proto.c b/usr.bin/cvs/proto.c
index e24f24dc5eb..976f66d9b81 100644
--- a/usr.bin/cvs/proto.c
+++ b/usr.bin/cvs/proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proto.c,v 1.55 2005/05/26 22:27:11 jfb Exp $	*/
+/*	$OpenBSD: proto.c,v 1.56 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -43,19 +43,17 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <fcntl.h>
-#include <stdio.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <libgen.h>
+#include <pwd.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
-#include <pwd.h>
+#include <unistd.h>
 
-#include "buf.h"
 #include "cvs.h"
 #include "log.h"
-#include "file.h"
 #include "proto.h"
 
 
diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c
index f2393f158e9..bd425dddb1a 100644
--- a/usr.bin/cvs/rcs.c
+++ b/usr.bin/cvs/rcs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcs.c,v 1.54 2005/05/25 21:59:16 jfb Exp $	*/
+/*	$OpenBSD: rcs.c,v 1.55 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -25,20 +25,19 @@
  */
 
 #include <sys/param.h>
-#include <sys/queue.h>
 #include <sys/stat.h>
 
-#include <pwd.h>
+#include <ctype.h>
 #include <errno.h>
+#include <pwd.h>
+#include <stdarg.h>
 #include <stdio.h>
-#include <ctype.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <stdarg.h>
 #include <string.h>
+#include <unistd.h>
 
-#include "rcs.h"
 #include "log.h"
+#include "rcs.h"
 #include "strtab.h"
 
 #define RCS_BUFSIZE     16384
diff --git a/usr.bin/cvs/rcsnum.c b/usr.bin/cvs/rcsnum.c
index 3baa12a0ce9..d5a140dcca2 100644
--- a/usr.bin/cvs/rcsnum.c
+++ b/usr.bin/cvs/rcsnum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsnum.c,v 1.11 2005/05/26 01:45:54 jfb Exp $	*/
+/*	$OpenBSD: rcsnum.c,v 1.12 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -31,8 +31,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "rcs.h"
 #include "log.h"
+#include "rcs.h"
 
 
 static int rcsnum_setsize  (RCSNUM *, u_int);
diff --git a/usr.bin/cvs/repo.c b/usr.bin/cvs/repo.c
index 6c95dee00b4..027738a4c38 100644
--- a/usr.bin/cvs/repo.c
+++ b/usr.bin/cvs/repo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: repo.c,v 1.3 2005/04/16 20:05:05 xsa Exp $	*/
+/*	$OpenBSD: repo.c,v 1.4 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -30,17 +30,16 @@
 #include <sys/stat.h>
 
 #include <errno.h>
-#include <stdio.h>
+#include <dirent.h>
 #include <fcntl.h>
+#include <libgen.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <dirent.h>
 #include <string.h>
-#include <libgen.h>
+#include <unistd.h>
 
 #include "log.h"
 #include "repo.h"
-#include "cvsd.h"
 
 
 
diff --git a/usr.bin/cvs/req.c b/usr.bin/cvs/req.c
index 0b65d7bdaf4..9408916cf8e 100644
--- a/usr.bin/cvs/req.c
+++ b/usr.bin/cvs/req.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: req.c,v 1.19 2005/05/31 08:26:40 xsa Exp $	*/
+/*	$OpenBSD: req.c,v 1.20 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -28,17 +28,16 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <errno.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "buf.h"
 #include "cvs.h"
 #include "log.h"
-#include "file.h"
 #include "proto.h"
 
 
diff --git a/usr.bin/cvs/resp.c b/usr.bin/cvs/resp.c
index 160bb28333d..e62610614e8 100644
--- a/usr.bin/cvs/resp.c
+++ b/usr.bin/cvs/resp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: resp.c,v 1.40 2005/05/24 22:00:25 joris Exp $	*/
+/*	$OpenBSD: resp.c,v 1.41 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -29,19 +29,18 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 
+#include <dirent.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <libgen.h>
 #include <stdio.h>
-#include <errno.h>
-#include <dirent.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
-#include <libgen.h>
+#include <unistd.h>
 
 #include "buf.h"
 #include "cvs.h"
 #include "log.h"
-#include "file.h"
 #include "proto.h"
 
 
diff --git a/usr.bin/cvs/root.c b/usr.bin/cvs/root.c
index 9c2d46e13ec..892482ca628 100644
--- a/usr.bin/cvs/root.c
+++ b/usr.bin/cvs/root.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: root.c,v 1.18 2005/05/20 19:40:27 jfb Exp $	*/
+/*	$OpenBSD: root.c,v 1.19 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -26,13 +26,13 @@
 
 #include <sys/types.h>
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
 #include <err.h>
 #include <errno.h>
-#include <string.h>
 #include <paths.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "cvs.h"
 #include "log.h"
diff --git a/usr.bin/cvs/server.c b/usr.bin/cvs/server.c
index 7b38cbbbbf1..6552c7cc686 100644
--- a/usr.bin/cvs/server.c
+++ b/usr.bin/cvs/server.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server.c,v 1.17 2005/05/24 04:12:25 jfb Exp $	*/
+/*	$OpenBSD: server.c,v 1.18 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -27,12 +27,12 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
-#include <string.h>
 #include <paths.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "cvs.h"
 #include "log.h"
diff --git a/usr.bin/cvs/status.c b/usr.bin/cvs/status.c
index d5de376d334..bf6b8637d8e 100644
--- a/usr.bin/cvs/status.c
+++ b/usr.bin/cvs/status.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: status.c,v 1.22 2005/05/24 04:12:25 jfb Exp $	*/
+/*	$OpenBSD: status.c,v 1.23 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -28,11 +28,11 @@
 #include <sys/stat.h>
 
 #include <errno.h>
-#include <stdio.h>
 #include <fcntl.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "cvs.h"
 #include "log.h"
diff --git a/usr.bin/cvs/strtab.c b/usr.bin/cvs/strtab.c
index 810162f72db..66898aae6ba 100644
--- a/usr.bin/cvs/strtab.c
+++ b/usr.bin/cvs/strtab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strtab.c,v 1.4 2005/04/06 03:27:54 joris Exp $	*/
+/*	$OpenBSD: strtab.c,v 1.5 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -35,8 +35,8 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "cvs.h"
 #include "log.h"
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c
index 9c1dd035d4d..8fd73654101 100644
--- a/usr.bin/cvs/update.c
+++ b/usr.bin/cvs/update.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: update.c,v 1.33 2005/05/30 08:27:03 xsa Exp $	*/
+/*	$OpenBSD: update.c,v 1.34 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -28,14 +28,13 @@
 #include <sys/stat.h>
 
 #include <errno.h>
-#include <stdio.h>
 #include <fcntl.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "cvs.h"
-#include "rcs.h"
 #include "log.h"
 #include "proto.h"
 
diff --git a/usr.bin/cvs/util.c b/usr.bin/cvs/util.c
index e308eaee6d8..7fe86db3baf 100644
--- a/usr.bin/cvs/util.c
+++ b/usr.bin/cvs/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.30 2005/05/27 17:04:59 jfb Exp $	*/
+/*	$OpenBSD: util.c,v 1.31 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -28,17 +28,16 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#include <md5.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <md5.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "cvs.h"
 #include "log.h"
-#include "file.h"
 
 /* letter -> mode type map */
 static const int cvs_modetypes[26] = {
diff --git a/usr.bin/cvs/version.c b/usr.bin/cvs/version.c
index f3ef4cb2e37..ec32cd649f7 100644
--- a/usr.bin/cvs/version.c
+++ b/usr.bin/cvs/version.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: version.c,v 1.14 2005/05/27 18:54:48 xsa Exp $	*/
+/*	$OpenBSD: version.c,v 1.15 2005/05/31 08:58:48 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -26,11 +26,11 @@
 
 #include <sys/types.h>
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "cvs.h"
 #include "log.h"