diff --git a/src/include/complex.h b/src/include/complex.h
index a291b392..b29f5a72 100644
--- a/src/include/complex.h
+++ b/src/include/complex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: complex.h,v 1.4 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: complex.h,v 1.5 2014/03/16 18:38:30 guenther Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -28,8 +28,6 @@
 #define _Complex	__complex__
 #endif
 #define _Complex_I	1.0fi
-#elif defined(lint)
-#define _Complex_I	1.0fi
 #endif
 
 #define complex		_Complex
diff --git a/src/include/ctype.h b/src/include/ctype.h
index 57c3a2b6..19b269ac 100644
--- a/src/include/ctype.h
+++ b/src/include/ctype.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ctype.h,v 1.22 2010/10/01 20:10:24 guenther Exp $	*/
+/*	$OpenBSD: ctype.h,v 1.23 2014/03/16 18:38:30 guenther Exp $	*/
 /*	$NetBSD: ctype.h,v 1.14 1994/10/26 00:55:47 cgd Exp $	*/
 
 /*
@@ -57,7 +57,7 @@ extern const char	*_ctype_;
 extern const short	*_tolower_tab_;
 extern const short	*_toupper_tab_;
 
-#if defined(__GNUC__) || defined(_ANSI_LIBRARY) || defined(lint)
+#if defined(__GNUC__) || defined(_ANSI_LIBRARY)
 int	isalnum(int);
 int	isalpha(int);
 int	iscntrl(int);
@@ -84,9 +84,9 @@ int	_tolower(int);
 int	_toupper(int);
 #endif /* __BSD_VISIBLE || __XPG_VISIBLE */
 
-#endif /* __GNUC__ || _ANSI_LIBRARY || lint */
+#endif /* __GNUC__ || _ANSI_LIBRARY */
 
-#if !defined(_ANSI_LIBRARY) && !defined(lint)
+#if !defined(_ANSI_LIBRARY)
 
 __only_inline int isalnum(int c)
 {
@@ -187,7 +187,7 @@ __only_inline int _toupper(int c)
 }
 #endif /* __BSD_VISIBLE || __XPG_VISIBLE */
 
-#endif /* !_ANSI_LIBRARY && !lint */
+#endif /* !_ANSI_LIBRARY */
 
 __END_DECLS
 
diff --git a/src/include/signal.h b/src/include/signal.h
index a29ea54f..367afea4 100644
--- a/src/include/signal.h
+++ b/src/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.20 2012/12/05 23:19:57 deraadt Exp $	*/
+/*	$OpenBSD: signal.h,v 1.21 2014/03/16 18:38:30 guenther Exp $	*/
 /*	$NetBSD: signal.h,v 1.8 1996/02/29 00:04:57 jtc Exp $	*/
 
 /*-
@@ -67,7 +67,7 @@ int	pthread_sigmask(int, const sigset_t *__restrict, sigset_t *__restrict);
 #endif
 int	sigsuspend(const sigset_t *);
 
-#if !defined(_ANSI_LIBRARY) && !defined(lint)
+#if !defined(_ANSI_LIBRARY)
 
 extern int *__errno(void);
 
@@ -96,7 +96,7 @@ __only_inline int sigismember(const sigset_t *__set, int __signo) {
 	}
 	return ((*__set & (1U << ((__signo)-1))) != 0);
 }
-#endif /* !_ANSI_LIBRARY && !lint */
+#endif /* !_ANSI_LIBRARY */
 
 /* List definitions after function declarations, or Reiser cpp gets upset. */
 #define	sigemptyset(set)	(*(set) = 0, 0)
diff --git a/src/include/stdbool.h b/src/include/stdbool.h
index 34304130..c0b65650 100644
--- a/src/include/stdbool.h
+++ b/src/include/stdbool.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdbool.h,v 1.5 2010/07/24 22:17:03 guenther Exp $ */
+/* $OpenBSD: stdbool.h,v 1.6 2014/03/16 18:38:30 guenther Exp $ */
 
 /*
  * Written by Marc Espie, September 25, 1999
@@ -10,7 +10,7 @@
 
 #ifndef __cplusplus
 
-#if (defined(__GNUC__) && __GNUC__ >= 3) || defined(__PCC__) || defined(lint)
+#if (defined(__GNUC__) && __GNUC__ >= 3) || defined(__PCC__)
 /* Support for _C99: type _Bool is already built-in. */
 #define false	0
 #define true	1
diff --git a/src/include/stdio.h b/src/include/stdio.h
index 76d2ad21..6b90aa4c 100644
--- a/src/include/stdio.h
+++ b/src/include/stdio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdio.h,v 1.45 2013/12/04 22:58:24 deraadt Exp $	*/
+/*	$OpenBSD: stdio.h,v 1.46 2014/03/16 18:38:30 guenther Exp $	*/
 /*	$NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $	*/
 
 /*-
@@ -437,7 +437,6 @@ extern int __isthreaded;
 #define putc(x, fp)	(!__isthreaded ? __sputc(x, fp) : (putc)(x, fp))
 #endif /* __BSD_VISIBLE */
 
-#ifndef lint
 #if __POSIX_VISIBLE >= 199506
 #define	getc_unlocked(fp)	__sgetc(fp)
 /*
@@ -448,7 +447,6 @@ extern int __isthreaded;
 #define putc_unlocked(x, fp)	__sputc(x, fp)
 #endif /* __BSD_VISIBLE */
 #endif /* __POSIX_VISIBLE >= 199506 */
-#endif /* lint */
 
 #define	getchar()	getc(stdin)
 #define	putchar(x)	putc(x, stdout)
diff --git a/src/lib/libc/stdlib/tfind.c b/src/lib/libc/stdlib/tfind.c
index ff6bcd74..0d1d5196 100644
--- a/src/lib/libc/stdlib/tfind.c
+++ b/src/lib/libc/stdlib/tfind.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: tfind.c,v 1.5 2005/03/30 18:51:49 pat Exp $	*/
+/*	$OpenBSD: tfind.c,v 1.6 2014/03/16 18:38:30 guenther Exp $	*/
 
 /*
  * Tree search generalized from Knuth (6.2.2) Algorithm T just like
  * the AT&T man page says.
  *
- * The node_t structure is for internal use only, lint doesn't grok it.
+ * The node_t structure is for internal use only
  *
  * Written by reading the System V Interface Definition, not the code.
  *
diff --git a/src/lib/libc/stdlib/tsearch.c b/src/lib/libc/stdlib/tsearch.c
index 2f5e369f..a141085d 100644
--- a/src/lib/libc/stdlib/tsearch.c
+++ b/src/lib/libc/stdlib/tsearch.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: tsearch.c,v 1.7 2012/02/06 20:29:54 guenther Exp $	*/
+/*	$OpenBSD: tsearch.c,v 1.8 2014/03/16 18:38:30 guenther Exp $	*/
 
 /*
  * Tree search generalized from Knuth (6.2.2) Algorithm T just like
  * the AT&T man page says.
  *
- * The node_t structure is for internal use only, lint doesn't grok it.
+ * The node_t structure is for internal use only
  *
  * Written by reading the System V Interface Definition, not the code.
  *