Take includes out of lst.h, re-add what's needed to separate files.

Removes remaining lint stuff from lst.lib.

29 files changed, 69 insertions, 166 deletions

diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index c58d891fc67..dc8ebce66ff 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: arch.c,v 1.45 2001/05/23 12:34:39 espie Exp $ */
+/*	$OpenBSD: arch.c,v 1.46 2001/05/29 12:53:38 espie Exp $ */
 /*	$NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $	*/
 
 /*
@@ -75,6 +75,7 @@
  *
  */
 
+#include <sys/param.h>
 #include <sys/types.h>
 #include <ar.h>
 #include <assert.h>
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index 5c937a8ecda..557c8c7ebbf 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: compat.c,v 1.38 2001/05/29 12:17:05 espie Exp $	*/
+/*	$OpenBSD: compat.c,v 1.39 2001/05/29 12:53:39 espie Exp $	*/
 /*	$NetBSD: compat.c,v 1.14 1996/11/06 17:59:01 christos Exp $	*/
 
 /*
@@ -45,9 +45,11 @@
 #include <sys/wait.h>
 #include <ctype.h>
 #include <errno.h>
+#include <limits.h>
 #include <signal.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "config.h"
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 66ee4b223ba..d93477e3f04 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: cond.c,v 1.25 2001/05/23 12:34:41 espie Exp $	*/
+/*	$OpenBSD: cond.c,v 1.26 2001/05/29 12:53:39 espie Exp $	*/
 /*	$NetBSD: cond.c,v 1.7 1996/11/06 17:59:02 christos Exp $	*/
 
 /*
@@ -43,6 +43,7 @@
 #include <ctype.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include "config.h"
 #include "defines.h"
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index 1f86296fd61..389de38d864 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: dir.c,v 1.33 2001/05/27 08:34:10 espie Exp $ */
+/*	$OpenBSD: dir.c,v 1.34 2001/05/29 12:53:39 espie Exp $ */
 /*	$NetBSD: dir.c,v 1.14 1997/03/29 16:51:26 christos Exp $	*/
 
 /*
@@ -66,11 +66,14 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
+#include <limits.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include "config.h"
 #include "defines.h"
@@ -603,7 +606,7 @@ DirExpandCurlyi(word, endw, path, expansions)
 
 	for (;;) {
 	    char	*file;	/* To hold current expansion */
-	    const char	*cp;
+	    const char	*cp;	/* Current position in brace clause */
 	
 	    /* Find the end of the current expansion */
 	    for (bracelevel = 0, cp = start; 
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index 4fac3299ce2..c71378497d2 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: for.c,v 1.25 2001/05/23 12:34:42 espie Exp $	*/
+/*	$OpenBSD: for.c,v 1.26 2001/05/29 12:53:40 espie Exp $	*/
 /*	$NetBSD: for.c,v 1.4 1996/11/06 17:59:05 christos Exp $ */
 
 /*
@@ -66,6 +66,7 @@
 #include <ctype.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include "config.h"
 #include "defines.h"
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 17a7d9a90e6..2504849b3f2 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: job.c,v 1.41 2001/05/23 12:34:44 espie Exp $	*/
+/*	$OpenBSD: job.c,v 1.42 2001/05/29 12:53:40 espie Exp $	*/
 /*	$NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $	*/
 
 /*
@@ -103,9 +103,11 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <signal.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "config.h"
diff --git a/usr.bin/make/lowparse.c b/usr.bin/make/lowparse.c
index 832849a98c2..4aea5e069d7 100644
--- a/usr.bin/make/lowparse.c
+++ b/usr.bin/make/lowparse.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: lowparse.c,v 1.10 2001/05/29 12:17:05 espie Exp $ */
+/*	$OpenBSD: lowparse.c,v 1.11 2001/05/29 12:53:41 espie Exp $ */
 
 /* low-level parsing functions. */
 
@@ -33,6 +33,7 @@
 #include <assert.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "config.h"
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index d89aa85136b..9536c02d3d4 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -2,7 +2,7 @@
 #define _LST_H_
 
 /*	$OpenPackages$ */
-/*	$OpenBSD: lst.h,v 1.20 2001/05/23 12:34:45 espie Exp $ */
+/*	$OpenBSD: lst.h,v 1.21 2001/05/29 12:53:41 espie Exp $ */
 /*	$NetBSD: lst.h,v 1.7 1996/11/06 17:59:12 christos Exp $ */
 
 /*
@@ -49,10 +49,6 @@
  * lst.h --
  *	Header for using the list library
  */
-#include	<sys/param.h>
-#ifdef __STDC__
-#include	<stdlib.h>
-#endif
 
 /* These data structures are PRIVATE !!!
  * Here for efficiency, so that some functions can be recoded as inlines,
diff --git a/usr.bin/make/lst.lib/lstAddNew.c b/usr.bin/make/lst.lib/lstAddNew.c
index 53334b775f3..ffa585f579a 100644
--- a/usr.bin/make/lst.lib/lstAddNew.c
+++ b/usr.bin/make/lst.lib/lstAddNew.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: lstAddNew.c,v 1.2 2001/05/23 12:34:53 espie Exp $	*/
+/*	$OpenBSD: lstAddNew.c,v 1.3 2001/05/29 12:53:44 espie Exp $	*/
 /* ex:ts=8 sw=4:
  */
 
@@ -31,11 +31,7 @@
  */
 
 #include	"lstInt.h"
-
-#ifndef lint
-UNUSED
-static char rcsid[] = "$OpenBSD: lstAddNew.c,v 1.2 2001/05/23 12:34:53 espie Exp $";
-#endif /* not lint */
+#include	<stddef.h>
 
 /* Add datum to the end of a list only if it wasn't there already.
  * Returns false if datum was already there.
diff --git a/usr.bin/make/lst.lib/lstAppend.c b/usr.bin/make/lst.lib/lstAppend.c
index aea38698b72..751502d631c 100644
--- a/usr.bin/make/lst.lib/lstAppend.c
+++ b/usr.bin/make/lst.lib/lstAppend.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: lstAppend.c,v 1.13 2001/05/23 12:34:53 espie Exp $	*/
+/*	$OpenBSD: lstAppend.c,v 1.14 2001/05/29 12:53:44 espie Exp $	*/
 /*	$NetBSD: lstAppend.c,v 1.5 1996/11/06 17:59:31 christos Exp $	*/
 
 /*
@@ -44,17 +44,10 @@
  */
 
 #include "lstInt.h"
+#include <sys/types.h>
+#include <stddef.h>
 #include "memory.h"
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lstAppend.c 8.1 (Berkeley) 6/6/93";
-#else
-UNUSED
-static char rcsid[] = "$OpenBSD: lstAppend.c,v 1.13 2001/05/23 12:34:53 espie Exp $";
-#endif
-#endif /* not lint */
-
 /*-
  *-----------------------------------------------------------------------
  * Lst_Append --
diff --git a/usr.bin/make/lst.lib/lstConcat.c b/usr.bin/make/lst.lib/lstConcat.c
index 9bb55445c65..ce848c3a9ae 100644
--- a/usr.bin/make/lst.lib/lstConcat.c
+++ b/usr.bin/make/lst.lib/lstConcat.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: lstConcat.c,v 1.13 2001/05/23 12:34:54 espie Exp $	*/
+/*	$OpenBSD: lstConcat.c,v 1.14 2001/05/29 12:53:45 espie Exp $	*/
 /*	$NetBSD: lstConcat.c,v 1.6 1996/11/06 17:59:34 christos Exp $	*/
 
 /*
@@ -44,17 +44,10 @@
  */
 
 #include "lstInt.h"
+#include <sys/types.h>
+#include <stddef.h>
 #include "memory.h"
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lstConcat.c 8.1 (Berkeley) 6/6/93";
-#else
-UNUSED
-static char rcsid[] = "$OpenBSD: lstConcat.c,v 1.13 2001/05/23 12:34:54 espie Exp $";
-#endif
-#endif /* not lint */
-
 /*-
  *-----------------------------------------------------------------------
  * Lst_Concat --
diff --git a/usr.bin/make/lst.lib/lstConcatDestroy.c b/usr.bin/make/lst.lib/lstConcatDestroy.c
index f14d6dabd51..030d7978a68 100644
--- a/usr.bin/make/lst.lib/lstConcatDestroy.c
+++ b/usr.bin/make/lst.lib/lstConcatDestroy.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: lstConcatDestroy.c,v 1.4 2001/05/23 12:34:54 espie Exp $	*/
+/*	$OpenBSD: lstConcatDestroy.c,v 1.5 2001/05/29 12:53:45 espie Exp $	*/
 /*	$NetBSD: lstConcat.c,v 1.6 1996/11/06 17:59:34 christos Exp $	*/
 
 /*
@@ -44,15 +44,7 @@
  */
 
 #include    "lstInt.h"
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lstConcat.c 8.1 (Berkeley) 6/6/93";
-#else
-UNUSED
-static char rcsid[] = "$OpenBSD: lstConcatDestroy.c,v 1.4 2001/05/23 12:34:54 espie Exp $";
-#endif
-#endif /* not lint */
+#include    <stddef.h>
 
 /*-
  *-----------------------------------------------------------------------
diff --git a/usr.bin/make/lst.lib/lstDeQueue.c b/usr.bin/make/lst.lib/lstDeQueue.c
index c964d9ec464..d7c8dc31743 100644
--- a/usr.bin/make/lst.lib/lstDeQueue.c
+++ b/usr.bin/make/lst.lib/lstDeQueue.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: lstDeQueue.c,v 1.12 2001/05/23 12:34:54 espie Exp $	*/
+/*	$OpenBSD: lstDeQueue.c,v 1.13 2001/05/29 12:53:45 espie Exp $	*/
 /*	$NetBSD: lstDeQueue.c,v 1.5 1996/11/06 17:59:36 christos Exp $	*/
 
 /*
@@ -44,15 +44,7 @@
  */
 
 #include	"lstInt.h"
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lstDeQueue.c	8.1 (Berkeley) 6/6/93";
-#else
-UNUSED
-static char rcsid[] = "$OpenBSD: lstDeQueue.c,v 1.12 2001/05/23 12:34:54 espie Exp $";
-#endif
-#endif /* not lint */
+#include 	<stdlib.h>
 
 /*-
  *-----------------------------------------------------------------------
diff --git a/usr.bin/make/lst.lib/lstDestroy.c b/usr.bin/make/lst.lib/lstDestroy.c
index babefb7b779..8d19372233b 100644
--- a/usr.bin/make/lst.lib/lstDestroy.c
+++ b/usr.bin/make/lst.lib/lstDestroy.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: lstDestroy.c,v 1.13 2001/05/23 12:34:55 espie Exp $	*/
+/*	$OpenBSD: lstDestroy.c,v 1.14 2001/05/29 12:53:45 espie Exp $	*/
 /*	$NetBSD: lstDestroy.c,v 1.6 1996/11/06 17:59:37 christos Exp $	*/
 
 /*
@@ -44,16 +44,7 @@
  */
 
 #include	"lstInt.h"
-#include	<stdio.h>
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lstDestroy.c	8.1 (Berkeley) 6/6/93";
-#else
-UNUSED
-static char rcsid[] = "$OpenBSD: lstDestroy.c,v 1.13 2001/05/23 12:34:55 espie Exp $";
-#endif
-#endif /* not lint */
+#include	<stdlib.h>
 
 /*-
  *-----------------------------------------------------------------------
diff --git a/usr.bin/make/lst.lib/lstDupl.c b/usr.bin/make/lst.lib/lstDupl.c
index 6f22b8d3460..9257c4eede2 100644
--- a/usr.bin/make/lst.lib/lstDupl.c
+++ b/usr.bin/make/lst.lib/lstDupl.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: lstDupl.c,v 1.15 2001/05/23 12:34:55 espie Exp $	*/
+/*	$OpenBSD: lstDupl.c,v 1.16 2001/05/29 12:53:46 espie Exp $	*/
 /*	$NetBSD: lstDupl.c,v 1.6 1996/11/06 17:59:37 christos Exp $	*/
 
 /*
@@ -45,15 +45,7 @@
  */
 
 #include    "lstInt.h"
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lstDupl.c	8.1 (Berkeley) 6/6/93";
-#else
-UNUSED
-static char rcsid[] = "$OpenBSD: lstDupl.c,v 1.15 2001/05/23 12:34:55 espie Exp $";
-#endif
-#endif /* not lint */
+#include <stddef.h>
 
 /*-
  *-----------------------------------------------------------------------
diff --git a/usr.bin/make/lst.lib/lstFindFrom.c b/usr.bin/make/lst.lib/lstFindFrom.c
index aab0be03f4b..4a6a33d47d1 100644
--- a/usr.bin/make/lst.lib/lstFindFrom.c
+++ b/usr.bin/make/lst.lib/lstFindFrom.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: lstFindFrom.c,v 1.11 2001/05/23 12:34:56 espie Exp $	*/
+/*	$OpenBSD: lstFindFrom.c,v 1.12 2001/05/29 12:53:46 espie Exp $	*/
 /*	$NetBSD: lstFindFrom.c,v 1.6 1996/11/06 17:59:40 christos Exp $ */
 
 /*
@@ -44,15 +44,7 @@
  */
 
 #include	"lstInt.h"
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lstFindFrom.c	8.1 (Berkeley) 6/6/93";
-#else
-UNUSED
-static char *rcsid = "$OpenBSD: lstFindFrom.c,v 1.11 2001/05/23 12:34:56 espie Exp $";
-#endif
-#endif /* not lint */
+#include	<stddef.h>
 
 /*-
  *-----------------------------------------------------------------------
diff --git a/usr.bin/make/lst.lib/lstForEachFrom.c b/usr.bin/make/lst.lib/lstForEachFrom.c
index 6c0ffe79250..1bf3763f7df 100644
--- a/usr.bin/make/lst.lib/lstForEachFrom.c
+++ b/usr.bin/make/lst.lib/lstForEachFrom.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: lstForEachFrom.c,v 1.11 2001/05/23 12:34:56 espie Exp $	*/
+/*	$OpenBSD: lstForEachFrom.c,v 1.12 2001/05/29 12:53:46 espie Exp $	*/
 /*	$NetBSD: lstForEachFrom.c,v 1.5 1996/11/06 17:59:42 christos Exp $	*/
 
 /*
@@ -45,15 +45,7 @@
  */
 
 #include	"lstInt.h"
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lstForEachFrom.c	8.1 (Berkeley) 6/6/93";
-#else
-UNUSED
-static char rcsid[] = "$OpenBSD: lstForEachFrom.c,v 1.11 2001/05/23 12:34:56 espie Exp $";
-#endif
-#endif /* not lint */
+#include	<stdlib.h>
 
 /*-
  *-----------------------------------------------------------------------
diff --git a/usr.bin/make/lst.lib/lstInit.c b/usr.bin/make/lst.lib/lstInit.c
index 58fe86ff252..a10c63ba57a 100644
--- a/usr.bin/make/lst.lib/lstInit.c
+++ b/usr.bin/make/lst.lib/lstInit.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: lstInit.c,v 1.12 2001/05/23 12:34:56 espie Exp $	*/
+/*	$OpenBSD: lstInit.c,v 1.13 2001/05/29 12:53:46 espie Exp $	*/
 /*	$NetBSD: lstInit.c,v 1.5 1996/11/06 17:59:43 christos Exp $	*/
 
 /*
@@ -44,15 +44,7 @@
  */
 
 #include	"lstInt.h"
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lstInit.c	8.1 (Berkeley) 6/6/93";
-#else
-UNUSED
-static char rcsid[] = "$OpenBSD: lstInit.c,v 1.12 2001/05/23 12:34:56 espie Exp $";
-#endif
-#endif /* not lint */
+#include	<stddef.h>
 
 /*-
  *-----------------------------------------------------------------------
diff --git a/usr.bin/make/lst.lib/lstInsert.c b/usr.bin/make/lst.lib/lstInsert.c
index 854ae9a78c2..49c21612f91 100644
--- a/usr.bin/make/lst.lib/lstInsert.c
+++ b/usr.bin/make/lst.lib/lstInsert.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: lstInsert.c,v 1.13 2001/05/23 12:34:56 espie Exp $	*/
+/*	$OpenBSD: lstInsert.c,v 1.14 2001/05/29 12:53:46 espie Exp $	*/
 /*	$NetBSD: lstInsert.c,v 1.5 1996/11/06 17:59:44 christos Exp $	*/
 
 /*
@@ -44,17 +44,10 @@
  */
 
 #include "lstInt.h"
+#include <sys/types.h>
+#include <stdlib.h>
 #include "memory.h"
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lstInsert.c 8.1 (Berkeley) 6/6/93";
-#else
-UNUSED
-static char rcsid[] = "$OpenBSD: lstInsert.c,v 1.13 2001/05/23 12:34:56 espie Exp $";
-#endif
-#endif /* not lint */
-
 /*-
  *-----------------------------------------------------------------------
  * Lst_Insert --
diff --git a/usr.bin/make/lst.lib/lstMember.c b/usr.bin/make/lst.lib/lstMember.c
index 624be86943f..cb46ab68a65 100644
--- a/usr.bin/make/lst.lib/lstMember.c
+++ b/usr.bin/make/lst.lib/lstMember.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: lstMember.c,v 1.10 2001/05/23 12:34:57 espie Exp $	*/
+/*	$OpenBSD: lstMember.c,v 1.11 2001/05/29 12:53:47 espie Exp $	*/
 /*	$NetBSD: lstMember.c,v 1.5 1996/11/06 17:59:48 christos Exp $	*/
 
 /*
@@ -44,15 +44,7 @@
  */
 
 #include    "lstInt.h"
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lstMember.c 8.1 (Berkeley) 6/6/93";
-#else
-UNUSED
-static char rcsid[] = "$OpenBSD: lstMember.c,v 1.10 2001/05/23 12:34:57 espie Exp $";
-#endif
-#endif /* not lint */
+#include    <stddef.h>
 
 LstNode
 Lst_Member(l, d)
diff --git a/usr.bin/make/lst.lib/lstRemove.c b/usr.bin/make/lst.lib/lstRemove.c
index 3624b26df07..a27b5f01efa 100644
--- a/usr.bin/make/lst.lib/lstRemove.c
+++ b/usr.bin/make/lst.lib/lstRemove.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: lstRemove.c,v 1.12 2001/05/23 12:34:57 espie Exp $	*/
+/*	$OpenBSD: lstRemove.c,v 1.13 2001/05/29 12:53:47 espie Exp $	*/
 /*	$NetBSD: lstRemove.c,v 1.5 1996/11/06 17:59:50 christos Exp $	*/
 
 /*
@@ -44,15 +44,8 @@
  */
 
 #include	"lstInt.h"
+#include	<stdlib.h>
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lstRemove.c 8.1 (Berkeley) 6/6/93";
-#else
-UNUSED
-static char rcsid[] = "$OpenBSD: lstRemove.c,v 1.12 2001/05/23 12:34:57 espie Exp $";
-#endif
-#endif /* not lint */
 
 /*-
  *-----------------------------------------------------------------------
diff --git a/usr.bin/make/lst.lib/lstReplace.c b/usr.bin/make/lst.lib/lstReplace.c
index 441782bd781..e84ff7c9a3b 100644
--- a/usr.bin/make/lst.lib/lstReplace.c
+++ b/usr.bin/make/lst.lib/lstReplace.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: lstReplace.c,v 1.11 2001/05/23 12:34:57 espie Exp $	*/
+/*	$OpenBSD: lstReplace.c,v 1.12 2001/05/29 12:53:47 espie Exp $	*/
 /*	$NetBSD: lstReplace.c,v 1.5 1996/11/06 17:59:51 christos Exp $	*/
 
 /*
@@ -44,15 +44,7 @@
  */
 
 #include	"lstInt.h"
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lstReplace.c	8.1 (Berkeley) 6/6/93";
-#else
-UNUSED
-static char rcsid[] = "$OpenBSD: lstReplace.c,v 1.11 2001/05/23 12:34:57 espie Exp $";
-#endif
-#endif /* not lint */
+#include	<stddef.h>
 
 /*-
  *-----------------------------------------------------------------------
diff --git a/usr.bin/make/lst.lib/lstSucc.c b/usr.bin/make/lst.lib/lstSucc.c
index f425c3aa8ea..af4d9408cff 100644
--- a/usr.bin/make/lst.lib/lstSucc.c
+++ b/usr.bin/make/lst.lib/lstSucc.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: lstSucc.c,v 1.9 2001/05/23 12:34:57 espie Exp $	*/
+/*	$OpenBSD: lstSucc.c,v 1.10 2001/05/29 12:53:48 espie Exp $	*/
 /*	$NetBSD: lstSucc.c,v 1.5 1996/11/06 17:59:52 christos Exp $	*/
 
 /*
@@ -44,15 +44,7 @@
  */
 
 #include	"lstInt.h"
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lstSucc.c	8.1 (Berkeley) 6/6/93";
-#else
-UNUSED
-static char rcsid[] = "$OpenBSD: lstSucc.c,v 1.9 2001/05/23 12:34:57 espie Exp $";
-#endif
-#endif /* not lint */
+#include	<stddef.h>
 
 /*-
  *-----------------------------------------------------------------------
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 4107e4272fa..b81881cde7b 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: main.c,v 1.48 2001/05/23 12:34:46 espie Exp $ */
+/*	$OpenBSD: main.c,v 1.49 2001/05/29 12:53:41 espie Exp $ */
 /*	$NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $	*/
 
 /*
@@ -40,6 +40,7 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifndef MAKE_BOOTSTRAP
@@ -47,6 +48,7 @@
 #endif
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "config.h"
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index 87964cb82b0..34d97651460 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: make.c,v 1.26 2001/05/23 12:34:46 espie Exp $	*/
+/*	$OpenBSD: make.c,v 1.27 2001/05/29 12:53:42 espie Exp $	*/
 /*	$NetBSD: make.c,v 1.10 1996/11/06 17:59:15 christos Exp $	*/
 
 /*
@@ -73,6 +73,7 @@
  *				and perform the .USE actions if so.
  */
 
+#include <limits.h>
 #include <stdio.h>
 #include "config.h"
 #include "defines.h"
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index e71eac27ec2..f61ded4b0bb 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: parse.c,v 1.61 2001/05/23 12:34:47 espie Exp $	*/
+/*	$OpenBSD: parse.c,v 1.62 2001/05/29 12:53:42 espie Exp $	*/
 /*	$NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $	*/
 
 /*
@@ -69,6 +69,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include "config.h"
 #include "defines.h"
diff --git a/usr.bin/make/stats.c b/usr.bin/make/stats.c
index 25b2f1a6731..734922fd7de 100644
--- a/usr.bin/make/stats.c
+++ b/usr.bin/make/stats.c
@@ -1,5 +1,5 @@
 /* $OpenPackages$ */
-/* $OpenBSD: stats.c,v 1.2 2001/05/23 12:34:49 espie Exp $ */
+/* $OpenBSD: stats.c,v 1.3 2001/05/29 12:53:43 espie Exp $ */
 
 /*
  * Copyright (c) 1999 Marc Espie.
@@ -40,11 +40,14 @@
 #include "stats.h"
 
 #ifdef HAS_STATS
-#include <stdio.h>
 #include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/time.h>
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/resource.h>
+#include "memory.h"
 
 static void print_stats(void);
 void Init_Stats(void);
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index 921a4dea6c1..568ff8d10e5 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: suff.c,v 1.42 2001/05/23 12:34:49 espie Exp $ */
+/*	$OpenBSD: suff.c,v 1.43 2001/05/29 12:53:43 espie Exp $ */
 /*	$NetBSD: suff.c,v 1.13 1996/11/06 17:59:25 christos Exp $	*/
 
 /*
@@ -93,6 +93,7 @@
 
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include "config.h"
 #include "defines.h"
diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index c259ff41d45..f30c50667c5 100644
--- a/usr.bin/make/targ.c
+++ b/usr.bin/make/targ.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: targ.c,v 1.33 2001/05/29 12:17:06 espie Exp $ */
+/*	$OpenBSD: targ.c,v 1.34 2001/05/29 12:53:43 espie Exp $ */
 /*	$NetBSD: targ.c,v 1.11 1997/02/20 16:51:50 christos Exp $	*/
 
 /*
@@ -103,6 +103,7 @@
  */
 
 #include <sys/types.h>
+#include <limits.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>