From 2c872e05abde7665fd7d24427d1317995fe97d2f Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Fri, 9 Apr 2010 07:38:27 +0200
Subject: [PATCH] window(1): Remove __RCSID & friends.

---
 usr.bin/window/Makefile      |  2 +-
 usr.bin/window/char.c        | 10 +--------
 usr.bin/window/cmd.c         | 10 +--------
 usr.bin/window/cmd1.c        | 10 +--------
 usr.bin/window/cmd2.c        | 10 +--------
 usr.bin/window/cmd3.c        | 10 +--------
 usr.bin/window/cmd4.c        | 10 +--------
 usr.bin/window/cmd5.c        | 10 +--------
 usr.bin/window/cmd6.c        | 10 +--------
 usr.bin/window/cmd7.c        | 10 +--------
 usr.bin/window/compress.c    | 10 +--------
 usr.bin/window/context.c     | 10 +--------
 usr.bin/window/error.c       | 10 +--------
 usr.bin/window/lcmd.c        | 10 +--------
 usr.bin/window/lcmd1.c       | 10 +--------
 usr.bin/window/lcmd2.c       | 10 +--------
 usr.bin/window/main.c        | 15 +------------
 usr.bin/window/mloop.c       | 10 +--------
 usr.bin/window/parser1.c     | 10 +--------
 usr.bin/window/parser2.c     | 10 +--------
 usr.bin/window/parser3.c     | 10 +--------
 usr.bin/window/parser4.c     | 10 +--------
 usr.bin/window/parser5.c     | 10 +--------
 usr.bin/window/scanner.c     | 10 +--------
 usr.bin/window/startup.c     | 10 +--------
 usr.bin/window/string.c      | 10 +--------
 usr.bin/window/ttf100.c      | 10 +--------
 usr.bin/window/ttgeneric.c   | 10 +--------
 usr.bin/window/tth19.c       | 10 +--------
 usr.bin/window/tth29.c       | 10 +--------
 usr.bin/window/ttinit.c      | 10 +--------
 usr.bin/window/ttoutput.c    | 10 +--------
 usr.bin/window/tttermcap.c   | 10 +--------
 usr.bin/window/tttvi925.c    | 10 +--------
 usr.bin/window/ttwyse60.c    | 10 +--------
 usr.bin/window/ttwyse75.c    | 10 +--------
 usr.bin/window/ttzapple.c    | 10 +--------
 usr.bin/window/ttzentec.c    | 10 +--------
 usr.bin/window/var.c         | 10 +--------
 usr.bin/window/win.c         | 10 +--------
 usr.bin/window/wwadd.c       | 10 +--------
 usr.bin/window/wwalloc.c     | 10 +--------
 usr.bin/window/wwbox.c       | 10 +--------
 usr.bin/window/wwchild.c     | 10 +--------
 usr.bin/window/wwclose.c     | 10 +--------
 usr.bin/window/wwclreol.c    | 10 +--------
 usr.bin/window/wwclreos.c    | 10 +--------
 usr.bin/window/wwcursor.c    | 10 +--------
 usr.bin/window/wwdata.c      | 42 ------------------------------------
 usr.bin/window/wwdelchar.c   | 10 +--------
 usr.bin/window/wwdelete.c    | 10 +--------
 usr.bin/window/wwdelline.c   | 10 +--------
 usr.bin/window/wwdump.c      | 10 +--------
 usr.bin/window/wwend.c       | 10 +--------
 usr.bin/window/wwenviron.c   | 10 +--------
 usr.bin/window/wwerror.c     | 10 +--------
 usr.bin/window/wwflush.c     | 10 +--------
 usr.bin/window/wwframe.c     | 10 +--------
 usr.bin/window/wwgets.c      | 10 +--------
 usr.bin/window/wwinit.c      | 10 +--------
 usr.bin/window/wwinschar.c   | 10 +--------
 usr.bin/window/wwinsline.c   | 10 +--------
 usr.bin/window/wwiomux.c     | 10 +--------
 usr.bin/window/wwlabel.c     | 10 +--------
 usr.bin/window/wwmisc.c      | 10 +--------
 usr.bin/window/wwmove.c      | 10 +--------
 usr.bin/window/wwopen.c      | 10 +--------
 usr.bin/window/wwprintf.c    | 10 +--------
 usr.bin/window/wwpty.c       | 10 +--------
 usr.bin/window/wwputc.c      | 10 +--------
 usr.bin/window/wwputs.c      | 10 +--------
 usr.bin/window/wwredraw.c    | 10 +--------
 usr.bin/window/wwredrawwin.c | 10 +--------
 usr.bin/window/wwrint.c      | 10 +--------
 usr.bin/window/wwscroll.c    | 10 +--------
 usr.bin/window/wwsize.c      | 10 +--------
 usr.bin/window/wwspawn.c     | 10 +--------
 usr.bin/window/wwsuspend.c   | 10 +--------
 usr.bin/window/wwterminfo.c  | 10 +--------
 usr.bin/window/wwtty.c       | 10 +--------
 usr.bin/window/wwunframe.c   | 10 +--------
 usr.bin/window/wwupdate.c    | 10 +--------
 usr.bin/window/wwwrite.c     | 10 +--------
 usr.bin/window/xx.c          | 10 +--------
 usr.bin/window/xxflush.c     | 10 +--------
 85 files changed, 84 insertions(+), 795 deletions(-)
 delete mode 100644 usr.bin/window/wwdata.c

diff --git a/usr.bin/window/Makefile b/usr.bin/window/Makefile
index 9446be51fe..31db8c889a 100644
--- a/usr.bin/window/Makefile
+++ b/usr.bin/window/Makefile
@@ -9,7 +9,7 @@ SRCS=	char.c cmd.c cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \
 	ttf100.c ttgeneric.c tth19.c tth29.c ttinit.c ttoutput.c tttermcap.c \
 	tttvi925.c ttwyse60.c ttwyse75.c ttzapple.c ttzentec.c var.c win.c \
 	wwadd.c wwalloc.c wwbox.c wwchild.c wwclose.c wwclreol.c wwclreos.c \
-	wwcursor.c wwdata.c wwdelchar.c wwdelete.c wwdelline.c wwdump.c \
+	wwcursor.c wwdelchar.c wwdelete.c wwdelline.c wwdump.c \
 	wwend.c wwenviron.c wwerror.c wwflush.c wwframe.c wwgets.c wwinit.c \
 	wwinschar.c wwinsline.c wwiomux.c wwlabel.c wwmisc.c wwmove.c \
 	wwopen.c wwprintf.c wwpty.c wwputc.c wwputs.c wwredraw.c \
diff --git a/usr.bin/window/char.c b/usr.bin/window/char.c
index 8727df150e..d5c455ab46 100644
--- a/usr.bin/window/char.c
+++ b/usr.bin/window/char.c
@@ -1,3 +1,4 @@
+/*	@(#)char.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: char.c,v 1.6 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)char.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: char.c,v 1.6 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include "char.h"
 
 char _cmap[] = {
diff --git a/usr.bin/window/cmd.c b/usr.bin/window/cmd.c
index deec51dd0c..a048df536a 100644
--- a/usr.bin/window/cmd.c
+++ b/usr.bin/window/cmd.c
@@ -1,3 +1,4 @@
+/*	@(#)cmd.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: cmd.c,v 1.8 2003/08/07 11:17:21 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cmd.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: cmd.c,v 1.8 2003/08/07 11:17:21 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include <unistd.h>
 #include "defs.h"
 #include "char.h"
diff --git a/usr.bin/window/cmd1.c b/usr.bin/window/cmd1.c
index d31997e3e2..90b1dd9b4b 100644
--- a/usr.bin/window/cmd1.c
+++ b/usr.bin/window/cmd1.c
@@ -1,3 +1,4 @@
+/*	@(#)cmd1.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: cmd1.c,v 1.7 2003/08/07 11:17:22 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cmd1.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: cmd1.c,v 1.7 2003/08/07 11:17:22 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "defs.h"
 #include "char.h"
 
diff --git a/usr.bin/window/cmd2.c b/usr.bin/window/cmd2.c
index 333c92c3b5..386e7d8064 100644
--- a/usr.bin/window/cmd2.c
+++ b/usr.bin/window/cmd2.c
@@ -1,3 +1,4 @@
+/*	@(#)cmd2.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: cmd2.c,v 1.7 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cmd2.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: cmd2.c,v 1.7 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include "defs.h"
 
 const char *help_shortcmd[] = {
diff --git a/usr.bin/window/cmd3.c b/usr.bin/window/cmd3.c
index cac5d7f647..7a56d1e506 100644
--- a/usr.bin/window/cmd3.c
+++ b/usr.bin/window/cmd3.c
@@ -1,3 +1,4 @@
+/*	@(#)cmd3.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: cmd3.c,v 1.8 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cmd3.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: cmd3.c,v 1.8 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include "defs.h"
 #include "window_string.h"
 
diff --git a/usr.bin/window/cmd4.c b/usr.bin/window/cmd4.c
index 270ab4b090..275f7f4995 100644
--- a/usr.bin/window/cmd4.c
+++ b/usr.bin/window/cmd4.c
@@ -1,3 +1,4 @@
+/*	@(#)cmd4.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: cmd4.c,v 1.6 2003/08/07 11:17:22 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cmd4.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: cmd4.c,v 1.6 2003/08/07 11:17:22 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "defs.h"
 
 void
diff --git a/usr.bin/window/cmd5.c b/usr.bin/window/cmd5.c
index 1a64864627..5d57fd5064 100644
--- a/usr.bin/window/cmd5.c
+++ b/usr.bin/window/cmd5.c
@@ -1,3 +1,4 @@
+/*	@(#)cmd5.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: cmd5.c,v 1.7 2003/08/07 11:17:23 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cmd5.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: cmd5.c,v 1.7 2003/08/07 11:17:23 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "defs.h"
 
 /*
diff --git a/usr.bin/window/cmd6.c b/usr.bin/window/cmd6.c
index e747723540..8a989fa14b 100644
--- a/usr.bin/window/cmd6.c
+++ b/usr.bin/window/cmd6.c
@@ -1,3 +1,4 @@
+/*	@(#)cmd6.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: cmd6.c,v 1.8 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cmd6.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: cmd6.c,v 1.8 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include "defs.h"
 #include "window_string.h"
 #include "char.h"
diff --git a/usr.bin/window/cmd7.c b/usr.bin/window/cmd7.c
index f69593b593..684cf9d43d 100644
--- a/usr.bin/window/cmd7.c
+++ b/usr.bin/window/cmd7.c
@@ -1,3 +1,4 @@
+/*	@(#)cmd7.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: cmd7.c,v 1.8 2006/05/02 22:30:25 christos Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cmd7.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: cmd7.c,v 1.8 2006/05/02 22:30:25 christos Exp $");
-#endif
-#endif /* not lint */
-
 #include <stdlib.h>
 #include <unistd.h>
 #include "defs.h"
diff --git a/usr.bin/window/compress.c b/usr.bin/window/compress.c
index 5e907fb9a5..14da34ab33 100644
--- a/usr.bin/window/compress.c
+++ b/usr.bin/window/compress.c
@@ -1,3 +1,4 @@
+/*	@(#)compress.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: compress.c,v 1.7 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)compress.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: compress.c,v 1.7 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/window/context.c b/usr.bin/window/context.c
index 6de15c0af9..11124d12fb 100644
--- a/usr.bin/window/context.c
+++ b/usr.bin/window/context.c
@@ -1,3 +1,4 @@
+/*	@(#)context.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: context.c,v 1.7 2003/08/07 11:17:24 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)context.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: context.c,v 1.7 2003/08/07 11:17:24 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include <fcntl.h>
 #include <stdlib.h>
 #include "defs.h"
diff --git a/usr.bin/window/error.c b/usr.bin/window/error.c
index 40d84980f7..da3ff9330a 100644
--- a/usr.bin/window/error.c
+++ b/usr.bin/window/error.c
@@ -1,3 +1,4 @@
+/*	@(#)error.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: error.c,v 1.6 2003/08/07 11:17:25 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)error.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: error.c,v 1.6 2003/08/07 11:17:25 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "defs.h"
 #include "context.h"
 #include "char.h"
diff --git a/usr.bin/window/lcmd.c b/usr.bin/window/lcmd.c
index 8fecadfff3..0f9d1df48d 100644
--- a/usr.bin/window/lcmd.c
+++ b/usr.bin/window/lcmd.c
@@ -1,3 +1,4 @@
+/*	@(#)lcmd.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: lcmd.c,v 1.9 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lcmd.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: lcmd.c,v 1.9 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include "defs.h"
 #include "lcmd.h"
 #include "window_string.h"
diff --git a/usr.bin/window/lcmd1.c b/usr.bin/window/lcmd1.c
index 489e373c01..4018790f56 100644
--- a/usr.bin/window/lcmd1.c
+++ b/usr.bin/window/lcmd1.c
@@ -1,3 +1,4 @@
+/*	@(#)lcmd1.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: lcmd1.c,v 1.11 2006/12/18 20:04:55 christos Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lcmd1.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: lcmd1.c,v 1.11 2006/12/18 20:04:55 christos Exp $");
-#endif
-#endif /* not lint */
-
 #include <string.h>
 #include <unistd.h>
 #include "defs.h"
diff --git a/usr.bin/window/lcmd2.c b/usr.bin/window/lcmd2.c
index 25f28e8983..6fb4a00b6d 100644
--- a/usr.bin/window/lcmd2.c
+++ b/usr.bin/window/lcmd2.c
@@ -1,3 +1,4 @@
+/*	@(#)lcmd2.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: lcmd2.c,v 1.15 2008/12/29 01:53:35 christos Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lcmd2.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: lcmd2.c,v 1.15 2008/12/29 01:53:35 christos Exp $");
-#endif
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/usr.bin/window/main.c b/usr.bin/window/main.c
index 1696ee7271..969afa5b8c 100644
--- a/usr.bin/window/main.c
+++ b/usr.bin/window/main.c
@@ -1,3 +1,4 @@
+/*	@(#)main.c	8.2 (Berkeley) 4/2/94	*/
 /*	$NetBSD: main.c,v 1.15 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,20 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1983, 1993\
- The Regents of the University of California.  All rights reserved.");
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 4/2/94";
-#else
-__RCSID("$NetBSD: main.c,v 1.15 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include <err.h>
 #include <paths.h>
 #include <stdio.h>
diff --git a/usr.bin/window/mloop.c b/usr.bin/window/mloop.c
index 89852155b1..bd1722dab1 100644
--- a/usr.bin/window/mloop.c
+++ b/usr.bin/window/mloop.c
@@ -1,3 +1,4 @@
+/*	@(#)mloop.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: mloop.c,v 1.8 2003/08/07 11:17:27 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mloop.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: mloop.c,v 1.8 2003/08/07 11:17:27 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include <sys/param.h>
 #include <unistd.h>
 #include "defs.h"
diff --git a/usr.bin/window/parser1.c b/usr.bin/window/parser1.c
index 6586bc3439..f5733b950f 100644
--- a/usr.bin/window/parser1.c
+++ b/usr.bin/window/parser1.c
@@ -1,3 +1,4 @@
+/*	@(#)parser1.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: parser1.c,v 1.6 2003/08/07 11:17:28 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)parser1.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: parser1.c,v 1.6 2003/08/07 11:17:28 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "defs.h"
 #include "parser.h"
 
diff --git a/usr.bin/window/parser2.c b/usr.bin/window/parser2.c
index 1f3c43ea7c..53696e9481 100644
--- a/usr.bin/window/parser2.c
+++ b/usr.bin/window/parser2.c
@@ -1,3 +1,4 @@
+/*	@(#)parser2.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: parser2.c,v 1.11 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)parser2.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: parser2.c,v 1.11 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #define EXTERN
 #include "ww.h"
 #include "defs.h"
diff --git a/usr.bin/window/parser3.c b/usr.bin/window/parser3.c
index a1bc0dfdc0..313e6a2dc4 100644
--- a/usr.bin/window/parser3.c
+++ b/usr.bin/window/parser3.c
@@ -1,3 +1,4 @@
+/*	@(#)parser3.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: parser3.c,v 1.6 2003/08/07 11:17:28 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)parser3.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: parser3.c,v 1.6 2003/08/07 11:17:28 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "defs.h"
 #include "parser.h"
 
diff --git a/usr.bin/window/parser4.c b/usr.bin/window/parser4.c
index 423deff772..d90510a738 100644
--- a/usr.bin/window/parser4.c
+++ b/usr.bin/window/parser4.c
@@ -1,3 +1,4 @@
+/*	@(#)parser4.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: parser4.c,v 1.9 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)parser4.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: parser4.c,v 1.9 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include <string.h>
 #include "defs.h"
 #include "parser.h"
diff --git a/usr.bin/window/parser5.c b/usr.bin/window/parser5.c
index 3a835505d8..267230e625 100644
--- a/usr.bin/window/parser5.c
+++ b/usr.bin/window/parser5.c
@@ -1,3 +1,4 @@
+/*	@(#)parser5.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: parser5.c,v 1.7 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)parser5.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: parser5.c,v 1.7 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include "defs.h"
 #include "parser.h"
 #include "var.h"
diff --git a/usr.bin/window/scanner.c b/usr.bin/window/scanner.c
index 7cbfe4a533..38ca877630 100644
--- a/usr.bin/window/scanner.c
+++ b/usr.bin/window/scanner.c
@@ -1,3 +1,4 @@
+/*	@(#)scanner.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: scanner.c,v 1.9 2003/08/07 11:17:29 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)scanner.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: scanner.c,v 1.9 2003/08/07 11:17:29 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include <stdlib.h>
 
 #include "defs.h"
diff --git a/usr.bin/window/startup.c b/usr.bin/window/startup.c
index 3b683d5f62..650063af4f 100644
--- a/usr.bin/window/startup.c
+++ b/usr.bin/window/startup.c
@@ -1,3 +1,4 @@
+/*	@(#)startup.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: startup.c,v 1.8 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)startup.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: startup.c,v 1.8 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include <stdlib.h>
 #include "defs.h"
 #include "var.h"
diff --git a/usr.bin/window/string.c b/usr.bin/window/string.c
index 625d3c208a..16b47b6a21 100644
--- a/usr.bin/window/string.c
+++ b/usr.bin/window/string.c
@@ -1,3 +1,4 @@
+/*	@(#)string.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: string.c,v 1.10 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)string.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: string.c,v 1.10 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/window/ttf100.c b/usr.bin/window/ttf100.c
index c8941ab733..49f990ee38 100644
--- a/usr.bin/window/ttf100.c
+++ b/usr.bin/window/ttf100.c
@@ -1,3 +1,4 @@
+/*	@(#)ttf100.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: ttf100.c,v 1.6 2003/08/07 11:17:30 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ttf100.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: ttf100.c,v 1.6 2003/08/07 11:17:30 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "tt.h"
 
diff --git a/usr.bin/window/ttgeneric.c b/usr.bin/window/ttgeneric.c
index d2d6d5c89a..44bfe60cd5 100644
--- a/usr.bin/window/ttgeneric.c
+++ b/usr.bin/window/ttgeneric.c
@@ -1,3 +1,4 @@
+/*	@(#)ttgeneric.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: ttgeneric.c,v 1.10 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ttgeneric.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: ttgeneric.c,v 1.10 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include <stdlib.h>
 #include <string.h>
 #include <termcap.h>
diff --git a/usr.bin/window/tth19.c b/usr.bin/window/tth19.c
index 956af6aa93..85c6bf79ec 100644
--- a/usr.bin/window/tth19.c
+++ b/usr.bin/window/tth19.c
@@ -1,3 +1,4 @@
+/*	@(#)tth19.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: tth19.c,v 1.7 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tth19.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: tth19.c,v 1.7 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "tt.h"
 #include "char.h"
diff --git a/usr.bin/window/tth29.c b/usr.bin/window/tth29.c
index b230407c4a..970984af8f 100644
--- a/usr.bin/window/tth29.c
+++ b/usr.bin/window/tth29.c
@@ -1,3 +1,4 @@
+/*	@(#)tth29.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: tth29.c,v 1.6 2003/08/07 11:17:31 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tth29.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: tth29.c,v 1.6 2003/08/07 11:17:31 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "tt.h"
 #include "char.h"
diff --git a/usr.bin/window/ttinit.c b/usr.bin/window/ttinit.c
index 67a5cfe4aa..868b676f83 100644
--- a/usr.bin/window/ttinit.c
+++ b/usr.bin/window/ttinit.c
@@ -1,3 +1,4 @@
+/*	@(#)ttinit.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: ttinit.c,v 1.9 2003/08/13 15:21:07 itojun Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ttinit.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: ttinit.c,v 1.9 2003/08/13 15:21:07 itojun Exp $");
-#endif
-#endif /* not lint */
-
 #include <stdlib.h>
 #include <string.h>
 #include "ww.h"
diff --git a/usr.bin/window/ttoutput.c b/usr.bin/window/ttoutput.c
index 2e1281a1f2..12e794ccc9 100644
--- a/usr.bin/window/ttoutput.c
+++ b/usr.bin/window/ttoutput.c
@@ -1,3 +1,4 @@
+/*	@(#)ttoutput.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: ttoutput.c,v 1.9 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ttoutput.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: ttoutput.c,v 1.9 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/usr.bin/window/tttermcap.c b/usr.bin/window/tttermcap.c
index bdf1da2042..f26dc31012 100644
--- a/usr.bin/window/tttermcap.c
+++ b/usr.bin/window/tttermcap.c
@@ -1,3 +1,4 @@
+/*	@(#)tttermcap.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: tttermcap.c,v 1.9 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tttermcap.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: tttermcap.c,v 1.9 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include <stdlib.h>
 #include <string.h>
 #include <termcap.h>
diff --git a/usr.bin/window/tttvi925.c b/usr.bin/window/tttvi925.c
index 602f7be9f9..816250c096 100644
--- a/usr.bin/window/tttvi925.c
+++ b/usr.bin/window/tttvi925.c
@@ -1,3 +1,4 @@
+/*	@(#)tttvi925.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: tttvi925.c,v 1.6 2003/08/07 11:17:32 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tttvi925.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: tttvi925.c,v 1.6 2003/08/07 11:17:32 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "tt.h"
 
diff --git a/usr.bin/window/ttwyse60.c b/usr.bin/window/ttwyse60.c
index b818a6bcee..d5bb78c379 100644
--- a/usr.bin/window/ttwyse60.c
+++ b/usr.bin/window/ttwyse60.c
@@ -1,3 +1,4 @@
+/*	@(#)ttwyse60.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: ttwyse60.c,v 1.6 2003/08/07 11:17:32 agc Exp $	*/
 
 /*
@@ -39,15 +40,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ttwyse60.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: ttwyse60.c,v 1.6 2003/08/07 11:17:32 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "tt.h"
 
diff --git a/usr.bin/window/ttwyse75.c b/usr.bin/window/ttwyse75.c
index d8037b6e7b..b0f50986e7 100644
--- a/usr.bin/window/ttwyse75.c
+++ b/usr.bin/window/ttwyse75.c
@@ -1,3 +1,4 @@
+/*	@(#)ttwyse75.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: ttwyse75.c,v 1.6 2003/08/07 11:17:32 agc Exp $	*/
 
 /*
@@ -39,15 +40,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ttwyse75.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: ttwyse75.c,v 1.6 2003/08/07 11:17:32 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "tt.h"
 
diff --git a/usr.bin/window/ttzapple.c b/usr.bin/window/ttzapple.c
index 98d339a47f..9f20fe69d6 100644
--- a/usr.bin/window/ttzapple.c
+++ b/usr.bin/window/ttzapple.c
@@ -1,3 +1,4 @@
+/*	@(#)ttzapple.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: ttzapple.c,v 1.9 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ttzapple.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: ttzapple.c,v 1.9 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include <stdio.h>
 #include "ww.h"
 #include "tt.h"
diff --git a/usr.bin/window/ttzentec.c b/usr.bin/window/ttzentec.c
index 33d666d88b..c911e12cd5 100644
--- a/usr.bin/window/ttzentec.c
+++ b/usr.bin/window/ttzentec.c
@@ -1,3 +1,4 @@
+/*	@(#)ttzentec.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: ttzentec.c,v 1.6 2003/08/07 11:17:33 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ttzentec.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: ttzentec.c,v 1.6 2003/08/07 11:17:33 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "tt.h"
 
diff --git a/usr.bin/window/var.c b/usr.bin/window/var.c
index 74cd3422b9..7967d4db31 100644
--- a/usr.bin/window/var.c
+++ b/usr.bin/window/var.c
@@ -1,3 +1,4 @@
+/*	@(#)var.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: var.c,v 1.10 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)var.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: var.c,v 1.10 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include <stdlib.h>
 #include <string.h>
 #include "value.h"
diff --git a/usr.bin/window/win.c b/usr.bin/window/win.c
index ed0efff5a8..10e1fb437f 100644
--- a/usr.bin/window/win.c
+++ b/usr.bin/window/win.c
@@ -1,3 +1,4 @@
+/*	@(#)win.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: win.c,v 1.14 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)win.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: win.c,v 1.14 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include <string.h>
 #include "defs.h"
 #include "char.h"
diff --git a/usr.bin/window/wwadd.c b/usr.bin/window/wwadd.c
index d505e7afd9..b7224371f4 100644
--- a/usr.bin/window/wwadd.c
+++ b/usr.bin/window/wwadd.c
@@ -1,3 +1,4 @@
+/*	@(#)wwadd.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwadd.c,v 1.7 2003/08/07 11:17:35 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwadd.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwadd.c,v 1.7 2003/08/07 11:17:35 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 
 /*
diff --git a/usr.bin/window/wwalloc.c b/usr.bin/window/wwalloc.c
index 09637b9246..3a3243ea00 100644
--- a/usr.bin/window/wwalloc.c
+++ b/usr.bin/window/wwalloc.c
@@ -1,3 +1,4 @@
+/*	@(#)wwalloc.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwalloc.c,v 1.6 2003/08/07 11:17:36 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwalloc.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwalloc.c,v 1.6 2003/08/07 11:17:36 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include <stdlib.h>
 #include "ww.h"
 
diff --git a/usr.bin/window/wwbox.c b/usr.bin/window/wwbox.c
index 40e7a79282..43cc5e1f6d 100644
--- a/usr.bin/window/wwbox.c
+++ b/usr.bin/window/wwbox.c
@@ -1,3 +1,4 @@
+/*	@(#)wwbox.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwbox.c,v 1.6 2003/08/07 11:17:36 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwbox.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwbox.c,v 1.6 2003/08/07 11:17:36 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "tt.h"
 
diff --git a/usr.bin/window/wwchild.c b/usr.bin/window/wwchild.c
index 1e4cee78e2..e6c0a272eb 100644
--- a/usr.bin/window/wwchild.c
+++ b/usr.bin/window/wwchild.c
@@ -1,3 +1,4 @@
+/*	@(#)wwchild.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwchild.c,v 1.8 2006/12/18 20:04:55 christos Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwchild.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwchild.c,v 1.8 2006/12/18 20:04:55 christos Exp $");
-#endif
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <errno.h>
diff --git a/usr.bin/window/wwclose.c b/usr.bin/window/wwclose.c
index ac5f25da8e..a654dec64b 100644
--- a/usr.bin/window/wwclose.c
+++ b/usr.bin/window/wwclose.c
@@ -1,3 +1,4 @@
+/*	@(#)wwclose.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwclose.c,v 1.6 2003/08/07 11:17:36 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwclose.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwclose.c,v 1.6 2003/08/07 11:17:36 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include <stdlib.h>
 #include <unistd.h>
 #include "ww.h"
diff --git a/usr.bin/window/wwclreol.c b/usr.bin/window/wwclreol.c
index d9e5a105e7..010f5a9bd6 100644
--- a/usr.bin/window/wwclreol.c
+++ b/usr.bin/window/wwclreol.c
@@ -1,3 +1,4 @@
+/*	@(#)wwclreol.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwclreol.c,v 1.7 2003/08/07 11:17:37 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwclreol.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwclreol.c,v 1.7 2003/08/07 11:17:37 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "tt.h"
 
diff --git a/usr.bin/window/wwclreos.c b/usr.bin/window/wwclreos.c
index c8cb430767..051fe954f3 100644
--- a/usr.bin/window/wwclreos.c
+++ b/usr.bin/window/wwclreos.c
@@ -1,3 +1,4 @@
+/*	@(#)wwclreos.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwclreos.c,v 1.7 2003/08/07 11:17:37 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwclreos.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwclreos.c,v 1.7 2003/08/07 11:17:37 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "tt.h"
 
diff --git a/usr.bin/window/wwcursor.c b/usr.bin/window/wwcursor.c
index d68b1d06cd..d6f2f500e4 100644
--- a/usr.bin/window/wwcursor.c
+++ b/usr.bin/window/wwcursor.c
@@ -1,3 +1,4 @@
+/*	@(#)wwcursor.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwcursor.c,v 1.7 2003/08/07 11:17:37 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwcursor.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwcursor.c,v 1.7 2003/08/07 11:17:37 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 
 void
diff --git a/usr.bin/window/wwdata.c b/usr.bin/window/wwdata.c
deleted file mode 100644
index 7a3054473f..0000000000
--- a/usr.bin/window/wwdata.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$NetBSD: wwdata.c,v 1.5 2003/08/07 11:17:37 agc Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Edward Wang at The University of California, Berkeley.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwdata.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwdata.c,v 1.5 2003/08/07 11:17:37 agc Exp $");
-#endif
-#endif /* not lint */
diff --git a/usr.bin/window/wwdelchar.c b/usr.bin/window/wwdelchar.c
index ed70f9d064..758aacc843 100644
--- a/usr.bin/window/wwdelchar.c
+++ b/usr.bin/window/wwdelchar.c
@@ -1,3 +1,4 @@
+/*	@(#)wwdelchar.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwdelchar.c,v 1.7 2003/08/07 11:17:38 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwdelchar.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwdelchar.c,v 1.7 2003/08/07 11:17:38 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "tt.h"
 #include "xx.h"
diff --git a/usr.bin/window/wwdelete.c b/usr.bin/window/wwdelete.c
index 9bdfc5b38b..07083fd69e 100644
--- a/usr.bin/window/wwdelete.c
+++ b/usr.bin/window/wwdelete.c
@@ -1,3 +1,4 @@
+/*	@(#)wwdelete.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwdelete.c,v 1.7 2003/08/07 11:17:38 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwdelete.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwdelete.c,v 1.7 2003/08/07 11:17:38 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 
 /*
diff --git a/usr.bin/window/wwdelline.c b/usr.bin/window/wwdelline.c
index 604b000610..509e16483c 100644
--- a/usr.bin/window/wwdelline.c
+++ b/usr.bin/window/wwdelline.c
@@ -1,3 +1,4 @@
+/*	@(#)wwdelline.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwdelline.c,v 1.6 2003/08/07 11:17:38 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwdelline.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwdelline.c,v 1.6 2003/08/07 11:17:38 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 
 void
diff --git a/usr.bin/window/wwdump.c b/usr.bin/window/wwdump.c
index c83d5d69cc..31abdf5b14 100644
--- a/usr.bin/window/wwdump.c
+++ b/usr.bin/window/wwdump.c
@@ -1,3 +1,4 @@
+/*	@(#)wwdump.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwdump.c,v 1.8 2003/08/07 11:17:38 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwdump.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwdump.c,v 1.8 2003/08/07 11:17:38 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include <stdio.h>
 #include <string.h>
 #include "ww.h"
diff --git a/usr.bin/window/wwend.c b/usr.bin/window/wwend.c
index 82658294de..f0948d61cc 100644
--- a/usr.bin/window/wwend.c
+++ b/usr.bin/window/wwend.c
@@ -1,3 +1,4 @@
+/*	@(#)wwend.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwend.c,v 1.8 2006/12/18 20:04:55 christos Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwend.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwend.c,v 1.8 2006/12/18 20:04:55 christos Exp $");
-#endif
-#endif /* not lint */
-
 #include <stdlib.h>
 #include <unistd.h>
 #include "ww.h"
diff --git a/usr.bin/window/wwenviron.c b/usr.bin/window/wwenviron.c
index 18dceae0d6..a963944b29 100644
--- a/usr.bin/window/wwenviron.c
+++ b/usr.bin/window/wwenviron.c
@@ -1,3 +1,4 @@
+/*	@(#)wwenviron.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwenviron.c,v 1.9 2003/08/07 11:17:39 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwenviron.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwenviron.c,v 1.9 2003/08/07 11:17:39 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include <sys/types.h>
 #if !defined(OLD_TTY) && !defined(TIOCSCTTY) && !defined(TIOCNOTTY)
 #include <sys/ioctl.h>
diff --git a/usr.bin/window/wwerror.c b/usr.bin/window/wwerror.c
index fd505b74b6..401d9ee156 100644
--- a/usr.bin/window/wwerror.c
+++ b/usr.bin/window/wwerror.c
@@ -1,3 +1,4 @@
+/*	@(#)wwerror.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwerror.c,v 1.7 2003/08/07 11:17:39 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwerror.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwerror.c,v 1.7 2003/08/07 11:17:39 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include <errno.h>
 #include <string.h>
 #include "ww.h"
diff --git a/usr.bin/window/wwflush.c b/usr.bin/window/wwflush.c
index f5c35dc798..bd44384c79 100644
--- a/usr.bin/window/wwflush.c
+++ b/usr.bin/window/wwflush.c
@@ -1,3 +1,4 @@
+/*	@(#)wwflush.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwflush.c,v 1.10 2006/12/18 20:04:55 christos Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwflush.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwflush.c,v 1.10 2006/12/18 20:04:55 christos Exp $");
-#endif
-#endif /* not lint */
-
 #include <signal.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/usr.bin/window/wwframe.c b/usr.bin/window/wwframe.c
index a67c71b47f..c00ae6d1e4 100644
--- a/usr.bin/window/wwframe.c
+++ b/usr.bin/window/wwframe.c
@@ -1,3 +1,4 @@
+/*	@(#)wwframe.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwframe.c,v 1.7 2003/08/07 11:17:39 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwframe.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwframe.c,v 1.7 2003/08/07 11:17:39 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "tt.h"
 
diff --git a/usr.bin/window/wwgets.c b/usr.bin/window/wwgets.c
index f60e40212d..b00fa83bcb 100644
--- a/usr.bin/window/wwgets.c
+++ b/usr.bin/window/wwgets.c
@@ -1,3 +1,4 @@
+/*	@(#)wwgets.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwgets.c,v 1.9 2003/08/07 11:17:40 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwgets.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwgets.c,v 1.9 2003/08/07 11:17:40 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include <string.h>
 #include "ww.h"
 #include "char.h"
diff --git a/usr.bin/window/wwinit.c b/usr.bin/window/wwinit.c
index d83f5caa87..6a563e5a1f 100644
--- a/usr.bin/window/wwinit.c
+++ b/usr.bin/window/wwinit.c
@@ -1,3 +1,4 @@
+/*	@(#)wwinit.c	8.2 (Berkeley) 4/28/95	*/
 /*	$NetBSD: wwinit.c,v 1.19 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwinit.c	8.2 (Berkeley) 4/28/95";
-#else
-__RCSID("$NetBSD: wwinit.c,v 1.19 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include <fcntl.h>
 #include <signal.h>
 #include <stdlib.h>
diff --git a/usr.bin/window/wwinschar.c b/usr.bin/window/wwinschar.c
index aea243843d..4e95e1a2ef 100644
--- a/usr.bin/window/wwinschar.c
+++ b/usr.bin/window/wwinschar.c
@@ -1,3 +1,4 @@
+/*	@(#)wwinschar.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwinschar.c,v 1.7 2003/08/07 11:17:40 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwinschar.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwinschar.c,v 1.7 2003/08/07 11:17:40 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "tt.h"
 #include "xx.h"
diff --git a/usr.bin/window/wwinsline.c b/usr.bin/window/wwinsline.c
index 17c97af8a0..1f5141512d 100644
--- a/usr.bin/window/wwinsline.c
+++ b/usr.bin/window/wwinsline.c
@@ -1,3 +1,4 @@
+/*	@(#)wwinsline.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwinsline.c,v 1.6 2003/08/07 11:17:40 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwinsline.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwinsline.c,v 1.6 2003/08/07 11:17:40 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 
 void
diff --git a/usr.bin/window/wwiomux.c b/usr.bin/window/wwiomux.c
index f75474d6af..2453f3c28d 100644
--- a/usr.bin/window/wwiomux.c
+++ b/usr.bin/window/wwiomux.c
@@ -1,3 +1,4 @@
+/*	@(#)wwiomux.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwiomux.c,v 1.14 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwiomux.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwiomux.c,v 1.14 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include <sys/types.h>
 #if !defined(OLD_TTY) && !defined(TIOCPKT_DATA)
 #include <sys/ioctl.h>
diff --git a/usr.bin/window/wwlabel.c b/usr.bin/window/wwlabel.c
index 8a54d2d8f1..e4b877886a 100644
--- a/usr.bin/window/wwlabel.c
+++ b/usr.bin/window/wwlabel.c
@@ -1,3 +1,4 @@
+/*	@(#)wwlabel.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwlabel.c,v 1.8 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwlabel.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwlabel.c,v 1.8 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "char.h"
 
diff --git a/usr.bin/window/wwmisc.c b/usr.bin/window/wwmisc.c
index c48e04b10f..d7c3829c54 100644
--- a/usr.bin/window/wwmisc.c
+++ b/usr.bin/window/wwmisc.c
@@ -1,3 +1,4 @@
+/*	@(#)wwmisc.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwmisc.c,v 1.7 2003/08/07 11:17:41 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwmisc.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwmisc.c,v 1.7 2003/08/07 11:17:41 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "tt.h"
 #include "char.h"
diff --git a/usr.bin/window/wwmove.c b/usr.bin/window/wwmove.c
index e6d17ed874..05bfa2e82c 100644
--- a/usr.bin/window/wwmove.c
+++ b/usr.bin/window/wwmove.c
@@ -1,3 +1,4 @@
+/*	@(#)wwmove.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwmove.c,v 1.7 2003/08/07 11:17:42 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwmove.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwmove.c,v 1.7 2003/08/07 11:17:42 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 
 /*
diff --git a/usr.bin/window/wwopen.c b/usr.bin/window/wwopen.c
index 9825f9b533..049f6b83c7 100644
--- a/usr.bin/window/wwopen.c
+++ b/usr.bin/window/wwopen.c
@@ -1,3 +1,4 @@
+/*	@(#)wwopen.c	8.2 (Berkeley) 4/28/95	*/
 /*	$NetBSD: wwopen.c,v 1.12 2003/08/07 11:17:42 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwopen.c	8.2 (Berkeley) 4/28/95";
-#else
-__RCSID("$NetBSD: wwopen.c,v 1.12 2003/08/07 11:17:42 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <fcntl.h>
diff --git a/usr.bin/window/wwprintf.c b/usr.bin/window/wwprintf.c
index 27baeae821..0e9b71a5de 100644
--- a/usr.bin/window/wwprintf.c
+++ b/usr.bin/window/wwprintf.c
@@ -1,3 +1,4 @@
+/*	@(#)wwprintf.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwprintf.c,v 1.6 2003/08/07 11:17:42 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwprintf.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwprintf.c,v 1.6 2003/08/07 11:17:42 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 
 void
diff --git a/usr.bin/window/wwpty.c b/usr.bin/window/wwpty.c
index ea926f6e92..e61e3fdd7f 100644
--- a/usr.bin/window/wwpty.c
+++ b/usr.bin/window/wwpty.c
@@ -1,3 +1,4 @@
+/*	@(#)wwpty.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwpty.c,v 1.8 2003/08/07 11:17:42 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwpty.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwpty.c,v 1.8 2003/08/07 11:17:42 agc Exp $");
-#endif
-#endif /* not lint */
-
 #if !defined(OLD_TTY) && !defined(TIOCPKT)
 #include <sys/ioctl.h>
 #endif
diff --git a/usr.bin/window/wwputc.c b/usr.bin/window/wwputc.c
index 0d8619c4d0..767f204a38 100644
--- a/usr.bin/window/wwputc.c
+++ b/usr.bin/window/wwputc.c
@@ -1,3 +1,4 @@
+/*	@(#)wwputc.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwputc.c,v 1.6 2003/08/07 11:17:43 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwputc.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwputc.c,v 1.6 2003/08/07 11:17:43 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 
 void
diff --git a/usr.bin/window/wwputs.c b/usr.bin/window/wwputs.c
index 408189d2a9..9cb1acc7f5 100644
--- a/usr.bin/window/wwputs.c
+++ b/usr.bin/window/wwputs.c
@@ -1,3 +1,4 @@
+/*	@(#)wwputs.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwputs.c,v 1.7 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwputs.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwputs.c,v 1.7 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 
 void
diff --git a/usr.bin/window/wwredraw.c b/usr.bin/window/wwredraw.c
index 45e80d7853..c32656cbb8 100644
--- a/usr.bin/window/wwredraw.c
+++ b/usr.bin/window/wwredraw.c
@@ -1,3 +1,4 @@
+/*	@(#)wwredraw.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwredraw.c,v 1.6 2003/08/07 11:17:43 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwredraw.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwredraw.c,v 1.6 2003/08/07 11:17:43 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "tt.h"
 #include "xx.h"
diff --git a/usr.bin/window/wwredrawwin.c b/usr.bin/window/wwredrawwin.c
index 055f5235c3..9c814d5b2e 100644
--- a/usr.bin/window/wwredrawwin.c
+++ b/usr.bin/window/wwredrawwin.c
@@ -1,3 +1,4 @@
+/*	@(#)wwredrawwin.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwredrawwin.c,v 1.7 2003/08/07 11:17:44 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwredrawwin.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwredrawwin.c,v 1.7 2003/08/07 11:17:44 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 
 void
diff --git a/usr.bin/window/wwrint.c b/usr.bin/window/wwrint.c
index 94266b1cd9..c02b4536fc 100644
--- a/usr.bin/window/wwrint.c
+++ b/usr.bin/window/wwrint.c
@@ -1,3 +1,4 @@
+/*	@(#)wwrint.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwrint.c,v 1.7 2003/08/07 11:17:44 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwrint.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwrint.c,v 1.7 2003/08/07 11:17:44 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include <unistd.h>
 #include "ww.h"
 #include "tt.h"
diff --git a/usr.bin/window/wwscroll.c b/usr.bin/window/wwscroll.c
index bff11107ed..072c583b36 100644
--- a/usr.bin/window/wwscroll.c
+++ b/usr.bin/window/wwscroll.c
@@ -1,3 +1,4 @@
+/*	@(#)wwscroll.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwscroll.c,v 1.7 2003/08/07 11:17:44 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwscroll.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwscroll.c,v 1.7 2003/08/07 11:17:44 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include <stdlib.h>
 
 #include "ww.h"
diff --git a/usr.bin/window/wwsize.c b/usr.bin/window/wwsize.c
index 23bbe1a25a..3a03de2150 100644
--- a/usr.bin/window/wwsize.c
+++ b/usr.bin/window/wwsize.c
@@ -1,3 +1,4 @@
+/*	@(#)wwsize.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwsize.c,v 1.9 2006/05/02 22:24:05 christos Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwsize.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwsize.c,v 1.9 2006/05/02 22:24:05 christos Exp $");
-#endif
-#endif /* not lint */
-
 #include <stdlib.h>
 #include "ww.h"
 
diff --git a/usr.bin/window/wwspawn.c b/usr.bin/window/wwspawn.c
index 4038275603..498458acaf 100644
--- a/usr.bin/window/wwspawn.c
+++ b/usr.bin/window/wwspawn.c
@@ -1,3 +1,4 @@
+/*	@(#)wwspawn.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwspawn.c,v 1.10 2006/12/18 20:04:55 christos Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwspawn.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwspawn.c,v 1.10 2006/12/18 20:04:55 christos Exp $");
-#endif
-#endif /* not lint */
-
 #include <signal.h>
 #include <unistd.h>
 #include "ww.h"
diff --git a/usr.bin/window/wwsuspend.c b/usr.bin/window/wwsuspend.c
index 96e30c559e..21c9531a22 100644
--- a/usr.bin/window/wwsuspend.c
+++ b/usr.bin/window/wwsuspend.c
@@ -1,3 +1,4 @@
+/*	@(#)wwsuspend.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwsuspend.c,v 1.6 2003/08/07 11:17:45 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwsuspend.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwsuspend.c,v 1.6 2003/08/07 11:17:45 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include <signal.h>
 #include "ww.h"
 #include "tt.h"
diff --git a/usr.bin/window/wwterminfo.c b/usr.bin/window/wwterminfo.c
index de38f13efb..3b04ad0bbd 100644
--- a/usr.bin/window/wwterminfo.c
+++ b/usr.bin/window/wwterminfo.c
@@ -1,3 +1,4 @@
+/*	@(#)wwterminfo.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwterminfo.c,v 1.5 2003/08/07 11:17:45 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwterminfo.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwterminfo.c,v 1.5 2003/08/07 11:17:45 agc Exp $");
-#endif
-#endif /* not lint */
-
 #ifdef TERMINFO
 
 #include <sys/types.h>
diff --git a/usr.bin/window/wwtty.c b/usr.bin/window/wwtty.c
index ef2475cc8f..86631a5c8c 100644
--- a/usr.bin/window/wwtty.c
+++ b/usr.bin/window/wwtty.c
@@ -1,3 +1,4 @@
+/*	@(#)wwtty.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwtty.c,v 1.7 2003/08/07 11:17:46 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwtty.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwtty.c,v 1.7 2003/08/07 11:17:46 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include <sys/types.h>
 #if !defined(OLD_TTY) && !defined(TIOCGWINSZ)
 #include <sys/ioctl.h>
diff --git a/usr.bin/window/wwunframe.c b/usr.bin/window/wwunframe.c
index a241cbfc4f..0f9d4d3f8e 100644
--- a/usr.bin/window/wwunframe.c
+++ b/usr.bin/window/wwunframe.c
@@ -1,3 +1,4 @@
+/*	@(#)wwunframe.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwunframe.c,v 1.7 2003/08/07 11:17:46 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwunframe.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwunframe.c,v 1.7 2003/08/07 11:17:46 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 
 void
diff --git a/usr.bin/window/wwupdate.c b/usr.bin/window/wwupdate.c
index f0759167a3..3990279aaf 100644
--- a/usr.bin/window/wwupdate.c
+++ b/usr.bin/window/wwupdate.c
@@ -1,3 +1,4 @@
+/*	@(#)wwupdate.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwupdate.c,v 1.6 2003/08/07 11:17:46 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwupdate.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwupdate.c,v 1.6 2003/08/07 11:17:46 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "tt.h"
 #include "xx.h"
diff --git a/usr.bin/window/wwwrite.c b/usr.bin/window/wwwrite.c
index 6cfe5cfd79..781524f454 100644
--- a/usr.bin/window/wwwrite.c
+++ b/usr.bin/window/wwwrite.c
@@ -1,3 +1,4 @@
+/*	@(#)wwwrite.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: wwwrite.c,v 1.9 2009/04/14 08:50:06 lukem Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wwwrite.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: wwwrite.c,v 1.9 2009/04/14 08:50:06 lukem Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "tt.h"
 #include "xx.h"
diff --git a/usr.bin/window/xx.c b/usr.bin/window/xx.c
index 5e66e17e29..b77a807b45 100644
--- a/usr.bin/window/xx.c
+++ b/usr.bin/window/xx.c
@@ -1,3 +1,4 @@
+/*	@(#)xx.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: xx.c,v 1.7 2003/08/07 11:17:46 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)xx.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: xx.c,v 1.7 2003/08/07 11:17:46 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include <stdlib.h>
 #include <string.h>
 #define EXTERN
diff --git a/usr.bin/window/xxflush.c b/usr.bin/window/xxflush.c
index 71feef53a7..8be5cdd67f 100644
--- a/usr.bin/window/xxflush.c
+++ b/usr.bin/window/xxflush.c
@@ -1,3 +1,4 @@
+/*	@(#)xxflush.c	8.1 (Berkeley) 6/6/93	*/
 /*	$NetBSD: xxflush.c,v 1.6 2003/08/07 11:17:47 agc Exp $	*/
 
 /*
@@ -32,15 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)xxflush.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: xxflush.c,v 1.6 2003/08/07 11:17:47 agc Exp $");
-#endif
-#endif /* not lint */
-
 #include "ww.h"
 #include "xx.h"
 #include "tt.h"
-- 
2.41.0