diff --git a/lib/libc/gen/errc.c b/lib/libc/gen/errc.c
index 6918c37f38a0..54665166f0bc 100644
--- a/lib/libc/gen/errc.c
+++ b/lib/libc/gen/errc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: errc.c,v 1.2 2014/06/06 01:41:00 christos Exp $	*/
+/*	$NetBSD: errc.c,v 1.3 2014/06/06 11:38:41 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: errc.c,v 1.2 2014/06/06 01:41:00 christos Exp $");
+__RCSID("$NetBSD: errc.c,v 1.3 2014/06/06 11:38:41 joerg Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -46,7 +46,7 @@ __RCSID("$NetBSD: errc.c,v 1.2 2014/06/06 01:41:00 christos Exp $");
 __weak_alias(errc, _errc)
 #endif
 
-#if !defined(HAVE_ERR_H) || !defined(HAVE_DECL_ERRC)
+#if !HAVE_ERR_H || !HAVE_DECL_ERRC
 __dead void
 errc(int eval, int code, const char *fmt, ...)
 {
diff --git a/lib/libc/gen/verrc.c b/lib/libc/gen/verrc.c
index 06168cf3e725..6670e170988a 100644
--- a/lib/libc/gen/verrc.c
+++ b/lib/libc/gen/verrc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: verrc.c,v 1.2 2014/06/06 01:41:00 christos Exp $	*/
+/*	$NetBSD: verrc.c,v 1.3 2014/06/06 11:38:41 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: verrc.c,v 1.2 2014/06/06 01:41:00 christos Exp $");
+__RCSID("$NetBSD: verrc.c,v 1.3 2014/06/06 11:38:41 joerg Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -53,7 +53,7 @@ __RCSID("$NetBSD: verrc.c,v 1.2 2014/06/06 01:41:00 christos Exp $");
 __weak_alias(verrc, _verrc)
 #endif
 
-#if !defined(HAVE_ERR_H) || !defined(HAVE_DECL_ERRC)
+#if !HAVE_ERR_H || !HAVE_DECL_ERRC
 __dead void
 verrc(int eval, int code, const char *fmt, va_list ap)
 {
diff --git a/lib/libc/gen/vwarnc.c b/lib/libc/gen/vwarnc.c
index c1f598fb06d1..20d4f3e36246 100644
--- a/lib/libc/gen/vwarnc.c
+++ b/lib/libc/gen/vwarnc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vwarnc.c,v 1.2 2014/06/06 01:41:00 christos Exp $	*/
+/*	$NetBSD: vwarnc.c,v 1.3 2014/06/06 11:38:41 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: vwarnc.c,v 1.2 2014/06/06 01:41:00 christos Exp $");
+__RCSID("$NetBSD: vwarnc.c,v 1.3 2014/06/06 11:38:41 joerg Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -53,7 +53,7 @@ __RCSID("$NetBSD: vwarnc.c,v 1.2 2014/06/06 01:41:00 christos Exp $");
 __weak_alias(vwarnc, _vwarnc)
 #endif
 
-#if !defined(HAVE_ERR_H) || !defined(HAVE_DECL_VWARNC)
+#if !HAVE_ERR_H || !HAVE_DECL_VWARNC
 void
 vwarnc(int code, const char *fmt, va_list ap)
 {
diff --git a/lib/libc/gen/warnc.c b/lib/libc/gen/warnc.c
index c6478950c60d..38d588ed6b09 100644
--- a/lib/libc/gen/warnc.c
+++ b/lib/libc/gen/warnc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: warnc.c,v 1.2 2014/06/06 01:41:00 christos Exp $	*/
+/*	$NetBSD: warnc.c,v 1.3 2014/06/06 11:38:41 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: warnc.c,v 1.2 2014/06/06 01:41:00 christos Exp $");
+__RCSID("$NetBSD: warnc.c,v 1.3 2014/06/06 11:38:41 joerg Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -50,7 +50,7 @@ __RCSID("$NetBSD: warnc.c,v 1.2 2014/06/06 01:41:00 christos Exp $");
 __weak_alias(warnc, _warnc)
 #endif
 
-#if !defined(HAVE_ERR_H) || !defined(HAVE_DECL_WARNC)
+#if !HAVE_ERR_H || !HAVE_DECL_WARNC
 void
 warnc(int code, const char *fmt, ...)
 {