- Drop __RCSID's

- Define __UNCONST in sh.h instead of on the command line to fix build
  issue with !latest Sun Studio.

30 files changed, 37 insertions, 201 deletions

diff --git a/shells/pdksh/files/Makefile.in b/shells/pdksh/files/Makefile.in
index e5385621d5f..e9d18fa97b9 100644
--- a/shells/pdksh/files/Makefile.in
+++ b/shells/pdksh/files/Makefile.in
@@ -16,7 +16,7 @@ DEFS = @DEFS@
 LIBS = @LIBS@
 
 CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@ "-D__RCSID(str)=void empty_nothingness()" "-D__UNCONST(a)=((void *)(unsigned long)(const void *)(a))"
+CFLAGS = @CFLAGS@
 LDSTATIC = @LDSTATIC@
 LDFLAGS = @LDFLAGS@
 
@@ -70,12 +70,7 @@ OS2FILES = os2/Makefile os2/config.h os2/config.status os2/configure.cmd \
 	os2/emacs.out os2/kshrc.ksh os2/make.sed os2/os2.c os2/os2siglist.out \
 	os2/README.os2 os2/NEWS.os2 os2/os2bugs os2/th.cmd os2/config.cache
 
-all: check_cdefs real_all
-
-check_cdefs: .PHONY
-	if [ ! -e /usr/include/sys/cdefs.h ]; then \
-		mkdir sys && touch sys/cdefs.h; \
-	fi
+all: real_all
 
 real_all: $(SHELL_PROG)$(exe_suffix) $(SHELL_PROG).1
 
diff --git a/shells/pdksh/files/alloc.c b/shells/pdksh/files/alloc.c
index a0a6db29619..84e3e318432 100644
--- a/shells/pdksh/files/alloc.c
+++ b/shells/pdksh/files/alloc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: alloc.c,v 1.2 2008/05/31 16:47:36 tnn Exp $	*/
+/*	$NetBSD: alloc.c,v 1.3 2008/06/15 14:20:08 tnn Exp $	*/
 
 /*
  * Copyright (c) 2002 Marc Espie.
@@ -28,8 +28,6 @@
 /*
  * area-based allocation built on malloc/free
  */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: alloc.c,v 1.2 2008/05/31 16:47:36 tnn Exp $");
 
 #include "sh.h"
 
diff --git a/shells/pdksh/files/c_ksh.c b/shells/pdksh/files/c_ksh.c
index afeff6f29be..0aeee201d1e 100644
--- a/shells/pdksh/files/c_ksh.c
+++ b/shells/pdksh/files/c_ksh.c
@@ -1,13 +1,8 @@
-/*	$NetBSD: c_ksh.c,v 1.2 2008/05/31 16:47:36 tnn Exp $	*/
+/*	$NetBSD: c_ksh.c,v 1.3 2008/06/15 14:20:08 tnn Exp $	*/
 
 /*
  * built-in Korn commands: c_*
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: c_ksh.c,v 1.2 2008/05/31 16:47:36 tnn Exp $");
-#endif
 
 #include "sh.h"
 #include "ksh_stat.h"
diff --git a/shells/pdksh/files/c_sh.c b/shells/pdksh/files/c_sh.c
index a4cf3536ac7..3c129ca27b2 100644
--- a/shells/pdksh/files/c_sh.c
+++ b/shells/pdksh/files/c_sh.c
@@ -1,14 +1,8 @@
-/*	$NetBSD: c_sh.c,v 1.2 2008/05/31 16:47:36 tnn Exp $	*/
+/*	$NetBSD: c_sh.c,v 1.3 2008/06/15 14:20:08 tnn Exp $	*/
 
 /*
  * built-in Bourne commands
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: c_sh.c,v 1.2 2008/05/31 16:47:36 tnn Exp $");
-#endif
-
 
 #include "sh.h"
 #include "ksh_stat.h" 	/* umask() */
diff --git a/shells/pdksh/files/c_test.c b/shells/pdksh/files/c_test.c
index 66548790aea..43478689cba 100644
--- a/shells/pdksh/files/c_test.c
+++ b/shells/pdksh/files/c_test.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: c_test.c,v 1.2 2008/05/31 16:47:36 tnn Exp $	*/
+/*	$NetBSD: c_test.c,v 1.3 2008/06/15 14:20:08 tnn Exp $	*/
 
 /*
  * test(1); version 7-like  --  author Erik Baalbergen
@@ -8,12 +8,6 @@
  * modified by Michael Rendell to add Korn's [[ .. ]] expressions.
  * modified by J.T. Conklin to add POSIX compatibility.
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: c_test.c,v 1.2 2008/05/31 16:47:36 tnn Exp $");
-#endif
-
 
 #include "sh.h"
 #include "ksh_stat.h"
diff --git a/shells/pdksh/files/c_ulimit.c b/shells/pdksh/files/c_ulimit.c
index 3f3ed19e9e0..004982f1f53 100644
--- a/shells/pdksh/files/c_ulimit.c
+++ b/shells/pdksh/files/c_ulimit.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: c_ulimit.c,v 1.2 2008/05/31 16:47:36 tnn Exp $	*/
+/*	$NetBSD: c_ulimit.c,v 1.3 2008/06/15 14:20:08 tnn Exp $	*/
 
 /*
 	ulimit -- handle "ulimit" builtin
@@ -17,12 +17,6 @@
 	the extended 4.nBSD resource limits.  It now includes the code
 	that was originally under case SYSULIMIT in source file "xec.c".
 */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: c_ulimit.c,v 1.2 2008/05/31 16:47:36 tnn Exp $");
-#endif
-
 
 #include "sh.h"
 #include "ksh_time.h"
diff --git a/shells/pdksh/files/edit.c b/shells/pdksh/files/edit.c
index 4dcad724b27..d3285080996 100644
--- a/shells/pdksh/files/edit.c
+++ b/shells/pdksh/files/edit.c
@@ -1,15 +1,9 @@
-/*	$NetBSD: edit.c,v 1.2 2008/05/31 16:47:36 tnn Exp $	*/
+/*	$NetBSD: edit.c,v 1.3 2008/06/15 14:20:08 tnn Exp $	*/
 
 /*
  * Command line editing - common code
  *
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: edit.c,v 1.2 2008/05/31 16:47:36 tnn Exp $");
-#endif
-
 
 #include "config.h"
 #ifdef EDIT
diff --git a/shells/pdksh/files/emacs.c b/shells/pdksh/files/emacs.c
index 5acd8b8dd04..a78bf6006d7 100644
--- a/shells/pdksh/files/emacs.c
+++ b/shells/pdksh/files/emacs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: emacs.c,v 1.2 2008/05/31 16:47:36 tnn Exp $	*/
+/*	$NetBSD: emacs.c,v 1.3 2008/06/15 14:20:08 tnn Exp $	*/
 
 /*
  *  Emacs-like command line editing and history
@@ -7,12 +7,6 @@
  *  modified by Doug Kingston, Doug Gwyn, and Lou Salkind
  *  adapted to PD ksh by Eric Gisin
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: emacs.c,v 1.2 2008/05/31 16:47:36 tnn Exp $");
-#endif
-
 
 #include "config.h"
 #ifdef EMACS
diff --git a/shells/pdksh/files/eval.c b/shells/pdksh/files/eval.c
index a7a8edbde7e..f0016dab875 100644
--- a/shells/pdksh/files/eval.c
+++ b/shells/pdksh/files/eval.c
@@ -1,14 +1,8 @@
-/*	$NetBSD: eval.c,v 1.2 2008/05/31 16:47:36 tnn Exp $	*/
+/*	$NetBSD: eval.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  * Expansion - quoting, separation, substitution, globbing
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: eval.c,v 1.2 2008/05/31 16:47:36 tnn Exp $");
-#endif
-
 
 #include "sh.h"
 #include <pwd.h>
diff --git a/shells/pdksh/files/exec.c b/shells/pdksh/files/exec.c
index 5ce28f3444c..734d4846d9b 100644
--- a/shells/pdksh/files/exec.c
+++ b/shells/pdksh/files/exec.c
@@ -1,14 +1,8 @@
-/*	$NetBSD: exec.c,v 1.2 2008/05/31 16:47:36 tnn Exp $	*/
+/*	$NetBSD: exec.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  * execute command tree
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: exec.c,v 1.2 2008/05/31 16:47:36 tnn Exp $");
-#endif
-
 
 #include "sh.h"
 #include "c_test.h"
diff --git a/shells/pdksh/files/expr.c b/shells/pdksh/files/expr.c
index f5a0311ff61..dbd7e28b1ba 100644
--- a/shells/pdksh/files/expr.c
+++ b/shells/pdksh/files/expr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: expr.c,v 1.2 2008/05/31 16:47:36 tnn Exp $	*/
+/*	$NetBSD: expr.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  * Korn expression evaluation
@@ -6,12 +6,6 @@
 /*
  * todo: better error handling: if in builtin, should be builtin error, etc.
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: expr.c,v 1.2 2008/05/31 16:47:36 tnn Exp $");
-#endif
-
 
 #include "sh.h"
 #include <ctype.h>
diff --git a/shells/pdksh/files/history.c b/shells/pdksh/files/history.c
index 953316adbcc..d20d4f9cd7c 100644
--- a/shells/pdksh/files/history.c
+++ b/shells/pdksh/files/history.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: history.c,v 1.2 2008/05/31 16:47:36 tnn Exp $	*/
+/*	$NetBSD: history.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  * command history
@@ -16,12 +16,6 @@
  *		things. You need to have the mmap system call for this
  *		to work on your system
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: history.c,v 1.2 2008/05/31 16:47:36 tnn Exp $");
-#endif
-
 
 #include "sh.h"
 #include "ksh_stat.h"
diff --git a/shells/pdksh/files/io.c b/shells/pdksh/files/io.c
index ca3ca0f54ce..40af05e51bd 100644
--- a/shells/pdksh/files/io.c
+++ b/shells/pdksh/files/io.c
@@ -1,14 +1,8 @@
-/*	$NetBSD: io.c,v 1.2 2008/05/31 16:47:36 tnn Exp $	*/
+/*	$NetBSD: io.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  * shell buffered IO and formatted output
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: io.c,v 1.2 2008/05/31 16:47:36 tnn Exp $");
-#endif
-
 
 #include <ctype.h>
 #include "sh.h"
diff --git a/shells/pdksh/files/jobs.c b/shells/pdksh/files/jobs.c
index fd17dc153f0..747474f5ac0 100644
--- a/shells/pdksh/files/jobs.c
+++ b/shells/pdksh/files/jobs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: jobs.c,v 1.2 2008/05/31 16:47:36 tnn Exp $	*/
+/*	$NetBSD: jobs.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  * Process and job control
@@ -23,12 +23,6 @@
  *	  process groups
  *	- NEED_PGRP_SYNC defined iff JOBS is defined - see comment below
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: jobs.c,v 1.2 2008/05/31 16:47:36 tnn Exp $");
-#endif
-
 
 #include "sh.h"
 #include "ksh_stat.h"
diff --git a/shells/pdksh/files/lex.c b/shells/pdksh/files/lex.c
index 4d9fbc8d1a9..2ec5018f7f3 100644
--- a/shells/pdksh/files/lex.c
+++ b/shells/pdksh/files/lex.c
@@ -1,14 +1,8 @@
-/*	$NetBSD: lex.c,v 1.2 2008/05/31 16:47:37 tnn Exp $	*/
+/*	$NetBSD: lex.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  * lexical analysis and source input
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: lex.c,v 1.2 2008/05/31 16:47:37 tnn Exp $");
-#endif
-
 
 #include "sh.h"
 #include <ctype.h>
diff --git a/shells/pdksh/files/mail.c b/shells/pdksh/files/mail.c
index 2ee5eed5ac7..cc117adee0f 100644
--- a/shells/pdksh/files/mail.c
+++ b/shells/pdksh/files/mail.c
@@ -1,15 +1,9 @@
-/*	$NetBSD: mail.c,v 1.2 2008/05/31 16:47:37 tnn Exp $	*/
+/*	$NetBSD: mail.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  * Mailbox checking code by Robert J. Gibson, adapted for PD ksh by
  * John R. MacMillan
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: mail.c,v 1.2 2008/05/31 16:47:37 tnn Exp $");
-#endif
-
 
 #include "config.h"
 
diff --git a/shells/pdksh/files/main.c b/shells/pdksh/files/main.c
index 8aaa07d94ad..baf42810cb3 100644
--- a/shells/pdksh/files/main.c
+++ b/shells/pdksh/files/main.c
@@ -1,16 +1,10 @@
-/*	$NetBSD: main.c,v 1.2 2008/05/31 16:47:37 tnn Exp $	*/
+/*	$NetBSD: main.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  * startup, main loop, environments and error handling
  */
-#include <sys/cdefs.h>
 #include <locale.h>
 
-#ifndef lint
-__RCSID("$NetBSD: main.c,v 1.2 2008/05/31 16:47:37 tnn Exp $");
-#endif
-
-
 #define	EXTERN				/* define EXTERNs in sh.h */
 
 #include "sh.h"
diff --git a/shells/pdksh/files/misc.c b/shells/pdksh/files/misc.c
index 5bb7b8caa60..2ce06e8c90b 100644
--- a/shells/pdksh/files/misc.c
+++ b/shells/pdksh/files/misc.c
@@ -1,14 +1,8 @@
-/*	$NetBSD: misc.c,v 1.2 2008/05/31 16:47:37 tnn Exp $	*/
+/*	$NetBSD: misc.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  * Miscellaneous functions
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: misc.c,v 1.2 2008/05/31 16:47:37 tnn Exp $");
-#endif
-
 
 #include "sh.h"
 #include <ctype.h>	/* for FILECHCONV */
diff --git a/shells/pdksh/files/path.c b/shells/pdksh/files/path.c
index 525b2d52974..900d99969fe 100644
--- a/shells/pdksh/files/path.c
+++ b/shells/pdksh/files/path.c
@@ -1,10 +1,4 @@
-/*	$NetBSD: path.c,v 1.2 2008/05/31 16:47:37 tnn Exp $	*/
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: path.c,v 1.2 2008/05/31 16:47:37 tnn Exp $");
-#endif
-
+/*	$NetBSD: path.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 #include "sh.h"
 #include "ksh_stat.h"
diff --git a/shells/pdksh/files/sh.h b/shells/pdksh/files/sh.h
index 77c0338de5e..1448dabd6d4 100644
--- a/shells/pdksh/files/sh.h
+++ b/shells/pdksh/files/sh.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: sh.h,v 1.3 2008/05/31 16:47:37 tnn Exp $	*/
+/*	$NetBSD: sh.h,v 1.4 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  * Public Domain Bourne/Korn shell
  */
 
-/* $Id: sh.h,v 1.3 2008/05/31 16:47:37 tnn Exp $ */
+/* $Id: sh.h,v 1.4 2008/06/15 14:20:09 tnn Exp $ */
 
 #include "config.h"	/* system and option configuration info */
 
@@ -733,3 +733,8 @@ EXTERN	int	x_cols I__(80);	/* tty columns */
 # undef EXTERN
 #endif
 #undef I__
+
+#ifdef __UNCONST
+#undef __UNCONST
+#endif
+#define __UNCONST(a) ((void *)(unsigned long)(const void *)(a))
diff --git a/shells/pdksh/files/shf.c b/shells/pdksh/files/shf.c
index ecfbebfa595..f366e8b66e5 100644
--- a/shells/pdksh/files/shf.c
+++ b/shells/pdksh/files/shf.c
@@ -1,14 +1,8 @@
-/*	$NetBSD: shf.c,v 1.2 2008/05/31 16:47:37 tnn Exp $	*/
+/*	$NetBSD: shf.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  *  Shell file I/O routines
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: shf.c,v 1.2 2008/05/31 16:47:37 tnn Exp $");
-#endif
-
 
 #include "sh.h"
 #include "ksh_stat.h"
diff --git a/shells/pdksh/files/sigact.c b/shells/pdksh/files/sigact.c
index 5dfcd8b117d..f1974f3ce7c 100644
--- a/shells/pdksh/files/sigact.c
+++ b/shells/pdksh/files/sigact.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sigact.c,v 1.2 2008/05/31 16:47:37 tnn Exp $	*/
+/*	$NetBSD: sigact.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /* NAME:
  *      sigact.c - fake sigaction(2)
@@ -138,12 +138,6 @@
  *	- sigaction(),sigsuspend(),Signal(),signal(): use handler_t typedef
  *	  instead of explicit type.
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: sigact.c,v 1.2 2008/05/31 16:47:37 tnn Exp $");
-#endif
-
 
 /*
     #include <signal.h>
diff --git a/shells/pdksh/files/syn.c b/shells/pdksh/files/syn.c
index 109ca1b145a..d3bce2eb5e3 100644
--- a/shells/pdksh/files/syn.c
+++ b/shells/pdksh/files/syn.c
@@ -1,14 +1,8 @@
-/*	$NetBSD: syn.c,v 1.2 2008/05/31 16:47:37 tnn Exp $	*/
+/*	$NetBSD: syn.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  * shell parser (C version)
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: syn.c,v 1.2 2008/05/31 16:47:37 tnn Exp $");
-#endif
-
 
 #include "sh.h"
 #include "c_test.h"
diff --git a/shells/pdksh/files/table.c b/shells/pdksh/files/table.c
index b390986519e..1ac8fc3b29f 100644
--- a/shells/pdksh/files/table.c
+++ b/shells/pdksh/files/table.c
@@ -1,14 +1,8 @@
-/*	$NetBSD: table.c,v 1.2 2008/05/31 16:47:37 tnn Exp $	*/
+/*	$NetBSD: table.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  * dynamic hashed associative table for commands and variables
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: table.c,v 1.2 2008/05/31 16:47:37 tnn Exp $");
-#endif
-
 
 #include "sh.h"
 
diff --git a/shells/pdksh/files/trap.c b/shells/pdksh/files/trap.c
index 8f646ad8866..34c03293562 100644
--- a/shells/pdksh/files/trap.c
+++ b/shells/pdksh/files/trap.c
@@ -1,14 +1,8 @@
-/*	$NetBSD: trap.c,v 1.2 2008/05/31 16:47:37 tnn Exp $	*/
+/*	$NetBSD: trap.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  * signal handling
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: trap.c,v 1.2 2008/05/31 16:47:37 tnn Exp $");
-#endif
-
 
 /* Kludge to avoid bogus re-declaration of sigtraps[] error on AIX 3.2.5 */
 #define FROM_TRAP_C
diff --git a/shells/pdksh/files/tree.c b/shells/pdksh/files/tree.c
index 67b5237d91c..1e0594ecc64 100644
--- a/shells/pdksh/files/tree.c
+++ b/shells/pdksh/files/tree.c
@@ -1,14 +1,8 @@
-/*	$NetBSD: tree.c,v 1.2 2008/05/31 16:47:37 tnn Exp $	*/
+/*	$NetBSD: tree.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  * command tree climbing
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: tree.c,v 1.2 2008/05/31 16:47:37 tnn Exp $");
-#endif
-
 
 #include "sh.h"
 
diff --git a/shells/pdksh/files/tty.c b/shells/pdksh/files/tty.c
index 285c6c9a365..a4b8d0987dd 100644
--- a/shells/pdksh/files/tty.c
+++ b/shells/pdksh/files/tty.c
@@ -1,11 +1,4 @@
-/*	$NetBSD: tty.c,v 1.2 2008/05/31 16:47:37 tnn Exp $	*/
-
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: tty.c,v 1.2 2008/05/31 16:47:37 tnn Exp $");
-#endif
-
+/*	$NetBSD: tty.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 #include "sh.h"
 #include "ksh_stat.h"
diff --git a/shells/pdksh/files/var.c b/shells/pdksh/files/var.c
index ae81dd135d2..af585ed421d 100644
--- a/shells/pdksh/files/var.c
+++ b/shells/pdksh/files/var.c
@@ -1,11 +1,4 @@
-/*	$NetBSD: var.c,v 1.2 2008/05/31 16:47:37 tnn Exp $	*/
-
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: var.c,v 1.2 2008/05/31 16:47:37 tnn Exp $");
-#endif
-
+/*	$NetBSD: var.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 #include "sh.h"
 #include "ksh_time.h"
diff --git a/shells/pdksh/files/version.c b/shells/pdksh/files/version.c
index f18b18ac4bd..638fa66d9af 100644
--- a/shells/pdksh/files/version.c
+++ b/shells/pdksh/files/version.c
@@ -1,14 +1,8 @@
-/*	$NetBSD: version.c,v 1.2 2008/05/31 16:47:37 tnn Exp $	*/
+/*	$NetBSD: version.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  * value of $KSH_VERSION (or $SH_VERSION)
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: version.c,v 1.2 2008/05/31 16:47:37 tnn Exp $");
-#endif
-
 
 #include "sh.h"
 
diff --git a/shells/pdksh/files/vi.c b/shells/pdksh/files/vi.c
index dbde10b9e05..9dc119097a9 100644
--- a/shells/pdksh/files/vi.c
+++ b/shells/pdksh/files/vi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vi.c,v 1.2 2008/05/31 16:47:37 tnn Exp $	*/
+/*	$NetBSD: vi.c,v 1.3 2008/06/15 14:20:09 tnn Exp $	*/
 
 /*
  *	vi command editing
@@ -6,11 +6,6 @@
  *	bludgeoned to fit pdksh by Larry Bouzane, Jeff Sparkes & Eric Gisin
  *
  */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: vi.c,v 1.2 2008/05/31 16:47:37 tnn Exp $");
-#endif
 
 #include "config.h"
 #ifdef VI