As done in OpenCVS, general includes cleanup sweep. OK otto@.

24 files changed, 166 insertions, 99 deletions

diff --git a/usr.bin/rcs/buf.c b/usr.bin/rcs/buf.c
index ea435057c88..40aeac46c0f 100644
--- a/usr.bin/rcs/buf.c
+++ b/usr.bin/rcs/buf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buf.c,v 1.11 2007/02/22 08:30:45 xsa Exp $	*/
+/*	$OpenBSD: buf.c,v 1.12 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2003 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -24,7 +24,16 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include <sys/queue.h>
+#include <sys/stat.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "buf.h"
 #include "xmalloc.h"
diff --git a/usr.bin/rcs/buf.h b/usr.bin/rcs/buf.h
index 4d966c1ced6..16ded552b25 100644
--- a/usr.bin/rcs/buf.h
+++ b/usr.bin/rcs/buf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buf.h,v 1.8 2007/02/22 08:30:45 xsa Exp $	*/
+/*	$OpenBSD: buf.h,v 1.9 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2003 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -38,6 +38,8 @@
 #ifndef BUF_H
 #define BUF_H
 
+#include <sys/types.h>
+
 /* flags */
 #define BUF_AUTOEXT	1	/* autoextend on append */
 
diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c
index 3afa7079d02..9a96c6190f2 100644
--- a/usr.bin/rcs/ci.c
+++ b/usr.bin/rcs/ci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ci.c,v 1.194 2007/02/22 19:11:13 otto Exp $	*/
+/*	$OpenBSD: ci.c,v 1.195 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2005, 2006 Niall O'Higgins <niallo@openbsd.org>
  * All rights reserved.
@@ -24,7 +24,15 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include <sys/stat.h>
+
+#include <ctype.h>
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "rcsprog.h"
 #include "diff.h"
diff --git a/usr.bin/rcs/co.c b/usr.bin/rcs/co.c
index aca34e660d9..fec4e712751 100644
--- a/usr.bin/rcs/co.c
+++ b/usr.bin/rcs/co.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: co.c,v 1.104 2007/02/22 19:11:13 otto Exp $	*/
+/*	$OpenBSD: co.c,v 1.105 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -24,7 +24,14 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include <sys/stat.h>
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "rcsprog.h"
 #include "diff.h"
diff --git a/usr.bin/rcs/date.y b/usr.bin/rcs/date.y
index 5e08849ed0d..10c69ac1c05 100644
--- a/usr.bin/rcs/date.y
+++ b/usr.bin/rcs/date.y
@@ -1,5 +1,5 @@
 %{
-/*	$OpenBSD: date.y,v 1.5 2007/01/20 06:57:54 ray Exp $	*/
+/*	$OpenBSD: date.y,v 1.6 2007/02/27 07:59:13 xsa Exp $	*/
 
 /*
 **  Originally written by Steven M. Bellovin <smb@research.att.com> while
@@ -14,7 +14,11 @@
 /* SUPPRESS 287 on yaccpar_sccsid *//* Unused static variable */
 /* SUPPRESS 288 on yyerrlab *//* Label unused */
 
-#include "includes.h"
+#include <sys/timeb.h>
+
+#include <ctype.h>
+#include <err.h>
+#include <string.h>
 
 #include "rcsprog.h"
 
diff --git a/usr.bin/rcs/diff.c b/usr.bin/rcs/diff.c
index 929f198164a..09d341a47a9 100644
--- a/usr.bin/rcs/diff.c
+++ b/usr.bin/rcs/diff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff.c,v 1.11 2007/02/22 08:30:45 xsa Exp $	*/
+/*	$OpenBSD: diff.c,v 1.12 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
  * All rights reserved.
@@ -126,7 +126,17 @@
  *	6n words for files of length n.
  */
 
-#include "includes.h"
+#include <sys/param.h>
+#include <sys/stat.h>
+
+#include <ctype.h>
+#include <err.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "buf.h"
 #include "diff.h"
diff --git a/usr.bin/rcs/diff.h b/usr.bin/rcs/diff.h
index ef349b9ae44..817ab08a7ee 100644
--- a/usr.bin/rcs/diff.h
+++ b/usr.bin/rcs/diff.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff.h,v 1.5 2006/09/21 15:30:07 millert Exp $	*/
+/*	$OpenBSD: diff.h,v 1.6 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
  * All rights reserved.
@@ -67,6 +67,10 @@
 #ifndef RCS_DIFF_H
 #define RCS_DIFF_H
 
+#include <sys/queue.h>
+
+#include <regex.h>
+
 #include "buf.h"
 #include "rcs.h"
 
diff --git a/usr.bin/rcs/diff3.c b/usr.bin/rcs/diff3.c
index b7a225441ce..7792fc962d9 100644
--- a/usr.bin/rcs/diff3.c
+++ b/usr.bin/rcs/diff3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff3.c,v 1.19 2007/02/22 08:30:45 xsa Exp $	*/
+/*	$OpenBSD: diff3.c,v 1.20 2007/02/27 07:59:13 xsa Exp $	*/
 
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
@@ -72,10 +72,15 @@ static const char copyright[] =
 
 #ifndef lint
 static const char rcsid[] =
-    "$OpenBSD: diff3.c,v 1.19 2007/02/22 08:30:45 xsa Exp $";
+    "$OpenBSD: diff3.c,v 1.20 2007/02/27 07:59:13 xsa Exp $";
 #endif /* not lint */
 
-#include "includes.h"
+#include <ctype.h>
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "diff.h"
 #include "rcsprog.h"
diff --git a/usr.bin/rcs/ident.c b/usr.bin/rcs/ident.c
index 595c2c3bfe0..1f237e89566 100644
--- a/usr.bin/rcs/ident.c
+++ b/usr.bin/rcs/ident.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ident.c,v 1.23 2007/02/08 03:35:09 ray Exp $	*/
+/*	$OpenBSD: ident.c,v 1.24 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
  * All rights reserved.
@@ -24,7 +24,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include <ctype.h>
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "rcsprog.h"
 
diff --git a/usr.bin/rcs/includes.h b/usr.bin/rcs/includes.h
deleted file mode 100644
index aa2f2184df5..00000000000
--- a/usr.bin/rcs/includes.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$OpenBSD: includes.h,v 1.2 2006/04/26 07:56:31 xsa Exp $	*/
-/*
- * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef INCLUDES_H
-#define INCLUDES_H
-
-#include <sys/time.h>
-#include <sys/timeb.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/wait.h>
-
-#include <ctype.h>
-#include <dirent.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <fnmatch.h>
-#include <libgen.h>
-#include <pwd.h>
-#include <regex.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#endif	/* INCLUDES_H */
diff --git a/usr.bin/rcs/merge.c b/usr.bin/rcs/merge.c
index 779a9e910ed..19c99dde691 100644
--- a/usr.bin/rcs/merge.c
+++ b/usr.bin/rcs/merge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: merge.c,v 1.4 2006/08/11 08:18:19 xsa Exp $	*/
+/*	$OpenBSD: merge.c,v 1.5 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
  * All rights reserved.
@@ -24,7 +24,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #include "rcsprog.h"
 #include "diff.h"
diff --git a/usr.bin/rcs/rcs.c b/usr.bin/rcs/rcs.c
index 8dd596c687b..f7cd4d349c9 100644
--- a/usr.bin/rcs/rcs.c
+++ b/usr.bin/rcs/rcs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcs.c,v 1.35 2007/01/02 16:43:45 niallo Exp $	*/
+/*	$OpenBSD: rcs.c,v 1.36 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -24,7 +24,18 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include <sys/stat.h>
+
+#include <ctype.h>
+#include <err.h>
+#include <errno.h>
+#include <libgen.h>
+#include <pwd.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "diff.h"
 #include "rcs.h"
diff --git a/usr.bin/rcs/rcs.h b/usr.bin/rcs/rcs.h
index de99dc5e97f..12daf5aabd6 100644
--- a/usr.bin/rcs/rcs.h
+++ b/usr.bin/rcs/rcs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcs.h,v 1.5 2006/06/03 03:05:10 niallo Exp $	*/
+/*	$OpenBSD: rcs.h,v 1.6 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -27,6 +27,8 @@
 #ifndef RCS_H
 #define RCS_H
 
+#include <sys/queue.h>
+
 #include "buf.h"
 
 #define RCS_DIFF_MAXARG		32
diff --git a/usr.bin/rcs/rcsclean.c b/usr.bin/rcs/rcsclean.c
index 91d424762db..59e7100f1b2 100644
--- a/usr.bin/rcs/rcsclean.c
+++ b/usr.bin/rcs/rcsclean.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsclean.c,v 1.47 2006/05/27 05:49:14 ray Exp $	*/
+/*	$OpenBSD: rcsclean.c,v 1.48 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -24,7 +24,13 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include <sys/types.h>
+
+#include <dirent.h>
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #include "rcsprog.h"
 #include "diff.h"
diff --git a/usr.bin/rcs/rcsdiff.c b/usr.bin/rcs/rcsdiff.c
index 9c97203235a..39b3ca14ff9 100644
--- a/usr.bin/rcs/rcsdiff.c
+++ b/usr.bin/rcs/rcsdiff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsdiff.c,v 1.71 2006/10/12 17:20:12 niallo Exp $	*/
+/*	$OpenBSD: rcsdiff.c,v 1.72 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -24,7 +24,14 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include <sys/stat.h>
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "rcsprog.h"
 #include "diff.h"
diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c
index ef69302c01b..ba0e93cf0d5 100644
--- a/usr.bin/rcs/rcsmerge.c
+++ b/usr.bin/rcs/rcsmerge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsmerge.c,v 1.49 2006/10/12 17:20:12 niallo Exp $	*/
+/*	$OpenBSD: rcsmerge.c,v 1.50 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
  * All rights reserved.
@@ -24,7 +24,11 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "rcsprog.h"
 #include "diff.h"
diff --git a/usr.bin/rcs/rcsnum.c b/usr.bin/rcs/rcsnum.c
index 8ce3e3203b8..34045d782e4 100644
--- a/usr.bin/rcs/rcsnum.c
+++ b/usr.bin/rcs/rcsnum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsnum.c,v 1.3 2006/07/27 03:17:10 ray Exp $	*/
+/*	$OpenBSD: rcsnum.c,v 1.4 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -24,7 +24,11 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include <sys/param.h>
+
+#include <ctype.h>
+#include <err.h>
+#include <string.h>
 
 #include "rcs.h"
 #include "xmalloc.h"
diff --git a/usr.bin/rcs/rcsprog.c b/usr.bin/rcs/rcsprog.c
index 02a2487874f..f25b9cd7d0f 100644
--- a/usr.bin/rcs/rcsprog.c
+++ b/usr.bin/rcs/rcsprog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsprog.c,v 1.136 2007/01/10 18:04:25 joris Exp $	*/
+/*	$OpenBSD: rcsprog.c,v 1.137 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -24,7 +24,13 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include <sys/stat.h>
+
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "rcsprog.h"
 
diff --git a/usr.bin/rcs/rcstime.c b/usr.bin/rcs/rcstime.c
index 197c216e292..c2372afbef7 100644
--- a/usr.bin/rcs/rcstime.c
+++ b/usr.bin/rcs/rcstime.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcstime.c,v 1.2 2006/05/29 03:00:12 niallo Exp $	*/
+/*	$OpenBSD: rcstime.c,v 1.3 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -24,7 +24,9 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include <err.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "rcs.h"
 
diff --git a/usr.bin/rcs/rcsutil.c b/usr.bin/rcs/rcsutil.c
index 11976adc86c..f23279e4678 100644
--- a/usr.bin/rcs/rcsutil.c
+++ b/usr.bin/rcs/rcsutil.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsutil.c,v 1.28 2007/02/22 19:11:13 otto Exp $	*/
+/*	$OpenBSD: rcsutil.c,v 1.29 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2005, 2006 Joris Vink <joris@openbsd.org>
  * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
@@ -27,7 +27,14 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include <sys/stat.h>
+
+#include <ctype.h>
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "rcsprog.h"
 
diff --git a/usr.bin/rcs/rlog.c b/usr.bin/rcs/rlog.c
index 61007867b43..2b3d02df091 100644
--- a/usr.bin/rcs/rlog.c
+++ b/usr.bin/rcs/rlog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rlog.c,v 1.56 2006/10/12 17:20:12 niallo Exp $	*/
+/*	$OpenBSD: rlog.c,v 1.57 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
@@ -25,7 +25,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include <err.h>
+#include <libgen.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "rcsprog.h"
 #include "diff.h"
diff --git a/usr.bin/rcs/worklist.c b/usr.bin/rcs/worklist.c
index 910bcea18d2..9f5fa6f86fe 100644
--- a/usr.bin/rcs/worklist.c
+++ b/usr.bin/rcs/worklist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: worklist.c,v 1.1 2006/04/26 02:55:13 joris Exp $	*/
+/*	$OpenBSD: worklist.c,v 1.2 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -24,7 +24,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include <sys/queue.h>
+
+#include <err.h>
+#include <signal.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "worklist.h"
 #include "xmalloc.h"
diff --git a/usr.bin/rcs/worklist.h b/usr.bin/rcs/worklist.h
index fcbe1c14b1e..a3ff34b8487 100644
--- a/usr.bin/rcs/worklist.h
+++ b/usr.bin/rcs/worklist.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: worklist.h,v 1.1 2006/04/26 02:55:13 joris Exp $	*/
+/*	$OpenBSD: worklist.h,v 1.2 2007/02/27 07:59:13 xsa Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -27,6 +27,8 @@
 #ifndef WORKLIST_H
 #define WORKLIST_H
 
+#include <sys/param.h>
+
 struct rcs_worklist {
 	char					wkl_path[MAXPATHLEN];
 	volatile SLIST_ENTRY(rcs_worklist)	wkl_list;
diff --git a/usr.bin/rcs/xmalloc.c b/usr.bin/rcs/xmalloc.c
index 370ab0f99e7..31953559787 100644
--- a/usr.bin/rcs/xmalloc.c
+++ b/usr.bin/rcs/xmalloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xmalloc.c,v 1.2 2006/04/29 05:31:28 ray Exp $ */
+/* $OpenBSD: xmalloc.c,v 1.3 2007/02/27 07:59:13 xsa Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -13,7 +13,12 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-#include "includes.h"
+#include <err.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "xmalloc.h"