diff --git a/include/limits.h b/include/limits.h
index 79d9ab69e3aa..3e3b5ebddf31 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: limits.h,v 1.17 2002/11/18 13:39:33 kleink Exp $	*/
+/*	$NetBSD: limits.h,v 1.18 2003/01/18 17:10:16 christos Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -87,7 +87,10 @@
 #define NL_SETMAX		255
 #define NL_TEXTMAX		2048
 
+/* Always ensure that this is consistent with <stdio.h> */
+#ifndef
 #define TMP_MAX			308915776	/* Legacy */
+#endif
 #endif /* !_POSIX_C_SOURCE || >= 200112L || _XOPEN_SOURCE */
 
 #endif /* !_ANSI_SOURCE */
diff --git a/include/stdio.h b/include/stdio.h
index 08d27515123a..19a133f2e2f3 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdio.h,v 1.48 2003/01/18 10:32:11 thorpej Exp $	*/
+/*	$NetBSD: stdio.h,v 1.49 2003/01/18 17:10:17 christos Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -193,7 +193,10 @@ __END_DECLS
 #define	P_tmpdir	"/var/tmp/"
 #endif
 #define	L_tmpnam	1024	/* XXX must be == PATH_MAX */
-#define	TMP_MAX		308915776
+/* Always ensure that this is consistent with <limits.h> */
+#ifndef TMP_MAX
+#define TMP_MAX			308915776	/* Legacy */
+#endif
 
 /* Always ensure that these are consistent with <fcntl.h> and <unistd.h>! */
 #ifndef SEEK_SET