diff --git a/sbin/mbrlabel/mbrlabel.c b/sbin/mbrlabel/mbrlabel.c
index 78b015a84302..99332e5f6806 100644
--- a/sbin/mbrlabel/mbrlabel.c
+++ b/sbin/mbrlabel/mbrlabel.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mbrlabel.c,v 1.7 2000/03/15 11:56:02 fvdl Exp $	*/
+/*	$NetBSD: mbrlabel.c,v 1.8 2000/07/03 03:37:59 matt Exp $	*/
 
 /*
  * Copyright (C) 1998 Wolfgang Solfrank.
@@ -33,11 +33,12 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mbrlabel.c,v 1.7 2000/03/15 11:56:02 fvdl Exp $");
+__RCSID("$NetBSD: mbrlabel.c,v 1.8 2000/07/03 03:37:59 matt Exp $");
 #endif /* not lint */
 
 #include <stdio.h>
 #include <fcntl.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <util.h>
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index 1adef698107f..e90cee1829d3 100644
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mknod.c,v 1.18 1998/11/24 22:56:26 christos Exp $	*/
+/*	$NetBSD: mknod.c,v 1.19 2000/07/03 03:38:02 matt Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1998 The NetBSD Foundation, Inc.  All rights reserved.\n");
-__RCSID("$NetBSD: mknod.c,v 1.18 1998/11/24 22:56:26 christos Exp $");
+__RCSID("$NetBSD: mknod.c,v 1.19 2000/07/03 03:38:02 matt Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -51,6 +51,7 @@ __RCSID("$NetBSD: mknod.c,v 1.18 1998/11/24 22:56:26 christos Exp $");
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
 
 int main __P((int, char *[]));
 static void usage __P((void));
diff --git a/sbin/wsconsctl/Makefile b/sbin/wsconsctl/Makefile
index 069b5338134d..bb25c7a64335 100644
--- a/sbin/wsconsctl/Makefile
+++ b/sbin/wsconsctl/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 1999/01/10 18:05:49 augustss Exp $
+#	$NetBSD: Makefile,v 1.3 2000/07/03 03:38:02 matt Exp $
 
 PROG=	wsconsctl
 SRCS=	display.c keyboard.c keysym.c map_parse.y map_scan.l \
@@ -6,7 +6,7 @@ SRCS=	display.c keyboard.c keysym.c map_parse.y map_scan.l \
 MAN=	wsconsctl.8
 
 YHEADER=	1
-CPPFLAGS+=	-I.
+CPPFLAGS+=	-I. -I${.CURDIR}
 CLEANFILES+=	keysym.h
 
 .depend keysym.c: keysym.h
diff --git a/sbin/wsconsctl/keysym.c b/sbin/wsconsctl/keysym.c
index 565b5a9ee085..09971fc88ac1 100644
--- a/sbin/wsconsctl/keysym.c
+++ b/sbin/wsconsctl/keysym.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: keysym.c,v 1.3 1999/02/08 11:08:23 hannken Exp $ */
+/*	$NetBSD: keysym.c,v 1.4 2000/07/03 03:38:02 matt Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -39,6 +39,7 @@
 #include <dev/wscons/wsksymdef.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include "keysym.h"
 #include "wsconsctl.h"
diff --git a/sbin/wsconsctl/wsconsctl.c b/sbin/wsconsctl/wsconsctl.c
index 1be9ff653fe7..f61e0e9182b5 100644
--- a/sbin/wsconsctl/wsconsctl.c
+++ b/sbin/wsconsctl/wsconsctl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wsconsctl.c,v 1.2 1998/12/29 22:40:20 hannken Exp $ */
+/*	$NetBSD: wsconsctl.c,v 1.3 2000/07/03 03:38:03 matt Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -40,6 +40,7 @@
 #include <err.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include "wsconsctl.h"