diff --git a/src/include/dirent.h b/src/include/dirent.h
index 89718362..54291f53 100644
--- a/src/include/dirent.h
+++ b/src/include/dirent.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dirent.h,v 1.5 1999/06/11 22:47:48 espie Exp $	*/
+/*	$OpenBSD: dirent.h,v 1.6 1999/09/17 13:13:46 espie Exp $	*/
 /*	$NetBSD: dirent.h,v 1.9 1995/03/26 20:13:37 jtc Exp $	*/
 
 /*-
@@ -83,7 +83,7 @@ typedef struct _dirdesc {
 
 #ifndef NULL
 #ifdef 	__GNUG__
-#define NULL	__null
+#define	NULL	__null
 #else
 #define	NULL	0
 #endif
diff --git a/src/include/stdio.h b/src/include/stdio.h
index ed1fb32c..50e0987e 100644
--- a/src/include/stdio.h
+++ b/src/include/stdio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdio.h,v 1.10 1998/11/20 11:18:26 d Exp $	*/
+/*	$OpenBSD: stdio.h,v 1.11 1999/09/17 13:13:46 espie Exp $	*/
 /*	$NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $	*/
 
 /*-
@@ -55,8 +55,12 @@ typedef	_BSD_SIZE_T_	size_t;
 #endif
 
 #ifndef NULL
+#ifdef 	__GNUG__
+#define	NULL	__null
+#else
 #define	NULL	0
 #endif
+#endif
 
 /*      
  * This is fairly grotesque, but pure ANSI code must not inspect the
diff --git a/src/include/string.h b/src/include/string.h
index d170174f..7be11126 100644
--- a/src/include/string.h
+++ b/src/include/string.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: string.h,v 1.5 1998/11/20 11:18:26 d Exp $	*/
+/*	$OpenBSD: string.h,v 1.6 1999/09/17 13:13:46 espie Exp $	*/
 /*	$NetBSD: string.h,v 1.6 1994/10/26 00:56:30 cgd Exp $	*/
 
 /*-
@@ -46,8 +46,12 @@ typedef	_BSD_SIZE_T_	size_t;
 #endif
 
 #ifndef	NULL
+#ifdef 	__GNUG__
+#define	NULL	__null
+#else
 #define	NULL	0
 #endif
+#endif
 
 #include <sys/cdefs.h>
 
diff --git a/src/include/time.h b/src/include/time.h
index b1754e83..e4c39e43 100644
--- a/src/include/time.h
+++ b/src/include/time.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: time.h,v 1.7 1999/06/11 22:47:48 espie Exp $	*/
+/*	$OpenBSD: time.h,v 1.8 1999/09/17 13:13:46 espie Exp $	*/
 /*	$NetBSD: time.h,v 1.9 1994/10/26 00:56:35 cgd Exp $	*/
 
 /*
@@ -49,7 +49,7 @@
 
 #ifndef	NULL
 #ifdef 	__GNUG__
-#define NULL	__null
+#define	NULL	__null
 #else
 #define	NULL	0
 #endif
diff --git a/src/include/unistd.h b/src/include/unistd.h
index 449295d9..e2d017ab 100644
--- a/src/include/unistd.h
+++ b/src/include/unistd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unistd.h,v 1.26 1999/06/11 22:47:47 espie Exp $ */
+/*	$OpenBSD: unistd.h,v 1.27 1999/09/17 13:13:46 espie Exp $ */
 /*	$NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $	*/
 
 /*-
@@ -49,7 +49,7 @@
 
 #ifndef NULL
 #ifdef 	__GNUG__
-#define NULL	__null
+#define	NULL	__null
 #else
 #define	NULL		0	/* null pointer constant */
 #endif