Index: sbin/routed/rtquery/rtquery.c
===================================================================
--- sbin/routed/rtquery/rtquery.c	(revision 218217)
+++ sbin/routed/rtquery/rtquery.c	(working copy)
@@ -49,6 +49,7 @@
 #include <bstring.h>
 #endif
 
+#if 0
 #define UNUSED __attribute__((unused))
 #ifndef __RCSID
 #define __RCSID(_s) static const char rcsid[] UNUSED = _s
@@ -67,6 +68,7 @@
 __RCSID("$Revision: 2.26 $");
 #ident "$Revision: 2.26 $"
 #endif
+#endif
 
 #ifndef sgi
 #define _HAVE_SIN_LEN
Index: contrib/lukemftp/src/main.c
===================================================================
--- contrib/lukemftp/src/main.c	(revision 218217)
+++ contrib/lukemftp/src/main.c	(working copy)
@@ -96,8 +96,10 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
+#if 0
 __COPYRIGHT("@(#) Copyright (c) 1985, 1989, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n");
+#endif
 #endif /* not lint */
 
 #ifndef lint