diff --git a/curspriv.h b/curspriv.h
index ebba06a9..2bdd7949 100644
--- a/curspriv.h
+++ b/curspriv.h
@@ -15,7 +15,7 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-/* $Id: curspriv.h,v 1.62 2006/03/28 19:02:39 wmcbrine Exp $ */
+/* $Id: curspriv.h,v 1.63 2006/03/29 20:06:40 wmcbrine Exp $ */
 
 /*                         CURSPRIV.H
 
@@ -306,8 +306,10 @@ void	movedata(unsigned, unsigned, unsigned, unsigned, unsigned);
 #ifdef PDCDEBUG
 void PDC_debug(const char *, ...);
 # define PDC_LOG(x) if (trace_on) PDC_debug x
+# define RCSID(x) static const char *rcsid = x
 #else
 # define PDC_LOG(x)
+# define RCSID(x)
 #endif
 
 #define PDC_COLORS		8
diff --git a/dos/pdcclip.c b/dos/pdcclip.c
index 16c198c1..50e3d065 100644
--- a/dos/pdcclip.c
+++ b/dos/pdcclip.c
@@ -20,10 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCclip =
-	"$Id: pdcclip.c,v 1.20 2006/02/27 08:13:03 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcclip.c,v 1.21 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /* global clipboard contents, should be NULL if none set */
 
diff --git a/dos/pdcdisp.c b/dos/pdcdisp.c
index 87ad2bca..7821305a 100644
--- a/dos/pdcdisp.c
+++ b/dos/pdcdisp.c
@@ -19,10 +19,7 @@
 #include <curses.h>
 #include <string.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCdisp =
-	"$Id: pdcdisp.c,v 1.30 2006/03/28 13:45:06 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcdisp.c,v 1.31 2006/03/29 20:06:40 wmcbrine Exp $");
 
 extern unsigned char atrtab[MAX_ATRTAB];
 
diff --git a/dos/pdcgetsc.c b/dos/pdcgetsc.c
index 33ac6524..bf293a05 100644
--- a/dos/pdcgetsc.c
+++ b/dos/pdcgetsc.c
@@ -19,10 +19,7 @@
 #include <curses.h>
 #include <stdlib.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCgetsc =
-	"$Id: pdcgetsc.c,v 1.19 2006/03/27 20:11:17 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcgetsc.c,v 1.20 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/dos/pdcgo32.c b/dos/pdcgo32.c
index 7881be57..6a98b2c1 100644
--- a/dos/pdcgo32.c
+++ b/dos/pdcgo32.c
@@ -18,10 +18,7 @@
 #define CURSES_LIBRARY 1
 #include <curses.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCgo32 =
-	"$Id: pdcgo32.c,v 1.9 2006/02/22 06:09:46 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcgo32.c,v 1.10 2006/03/29 20:06:40 wmcbrine Exp $");
 
 #include <pc.h>    
 #include <sys/movedata.h> /* prototypes of dosmemget() and dosmemput() */
diff --git a/dos/pdckbd.c b/dos/pdckbd.c
index cffdfdac..3f86416a 100644
--- a/dos/pdckbd.c
+++ b/dos/pdckbd.c
@@ -24,10 +24,7 @@
 #define	CURSES_LIBRARY 1
 #include <curses.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCkbd =
-	"$Id: pdckbd.c,v 1.22 2006/03/27 20:35:13 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdckbd.c,v 1.23 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /************************************************************************
  *    Table for key code translation of function keys in keypad mode	*
diff --git a/dos/pdcscrn.c b/dos/pdcscrn.c
index 1d24730a..aab9db06 100644
--- a/dos/pdcscrn.c
+++ b/dos/pdcscrn.c
@@ -24,10 +24,7 @@
 # include <sys/movedata.h>
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCscrn =
-	"$Id: pdcscrn.c,v 1.26 2006/03/27 20:35:13 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcscrn.c,v 1.27 2006/03/29 20:06:40 wmcbrine Exp $");
 
 static unsigned short *saved_screen = NULL;
 static int saved_lines = 0;
diff --git a/dos/pdcsetsc.c b/dos/pdcsetsc.c
index abaae180..6b5ab2d5 100644
--- a/dos/pdcsetsc.c
+++ b/dos/pdcsetsc.c
@@ -18,10 +18,7 @@
 #define	CURSES_LIBRARY 1
 #include <curses.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCsetsc =
-	"$Id: pdcsetsc.c,v 1.16 2006/02/27 07:28:31 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcsetsc.c,v 1.17 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/os2/pdcclip.c b/os2/pdcclip.c
index eff50fd0..a949d541 100644
--- a/os2/pdcclip.c
+++ b/os2/pdcclip.c
@@ -24,10 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCclip =
-	"$Id: pdcclip.c,v 1.19 2006/03/26 01:48:49 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcclip.c,v 1.20 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/os2/pdcdisp.c b/os2/pdcdisp.c
index a5ab187d..fdcdc548 100644
--- a/os2/pdcdisp.c
+++ b/os2/pdcdisp.c
@@ -19,10 +19,7 @@
 #include <curses.h>
 #include <string.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCdisp =
-	"$Id: pdcdisp.c,v 1.23 2006/03/27 14:33:00 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcdisp.c,v 1.24 2006/03/29 20:06:40 wmcbrine Exp $");
 
 extern unsigned char atrtab[MAX_ATRTAB];
 
diff --git a/os2/pdcgetsc.c b/os2/pdcgetsc.c
index 17035b82..0c971243 100644
--- a/os2/pdcgetsc.c
+++ b/os2/pdcgetsc.c
@@ -19,10 +19,7 @@
 #include <curses.h>
 #include <stdlib.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCgetsc =
-	"$Id: pdcgetsc.c,v 1.20 2006/03/27 20:35:13 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcgetsc.c,v 1.21 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/os2/pdckbd.c b/os2/pdckbd.c
index 9af8b565..d5b35b04 100644
--- a/os2/pdckbd.c
+++ b/os2/pdckbd.c
@@ -26,10 +26,7 @@
 # include <bsedos.h>
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCkbd =
-	"$Id: pdckbd.c,v 1.23 2006/03/27 20:52:01 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdckbd.c,v 1.24 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /************************************************************************
  *   Table for key code translation of function keys in keypad mode	*
diff --git a/os2/pdcscrn.c b/os2/pdcscrn.c
index d11a5259..4d81e3b3 100644
--- a/os2/pdcscrn.c
+++ b/os2/pdcscrn.c
@@ -20,10 +20,7 @@
 #include <curses.h>
 #include <stdlib.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCscrn =
-	"$Id: pdcscrn.c,v 1.23 2006/03/27 04:35:41 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcscrn.c,v 1.24 2006/03/29 20:06:40 wmcbrine Exp $");
 
 #ifdef EMXVIDEO
 static unsigned char *saved_screen = NULL;
diff --git a/os2/pdcsetsc.c b/os2/pdcsetsc.c
index 72d595b8..f42f7fa4 100644
--- a/os2/pdcsetsc.c
+++ b/os2/pdcsetsc.c
@@ -19,10 +19,7 @@
 #include <curses.h>
 #include <string.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCsetsc =
-	"$Id: pdcsetsc.c,v 1.18 2006/03/26 01:48:49 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcsetsc.c,v 1.19 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/addch.c b/pdcurses/addch.c
index 5ab997e9..379bc092 100644
--- a/pdcurses/addch.c
+++ b/pdcurses/addch.c
@@ -34,10 +34,7 @@
 # undef wmove
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_addch =
-	"$Id: addch.c,v 1.18 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: addch.c,v 1.19 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/addchstr.c b/pdcurses/addchstr.c
index 96b29fb0..f4ebeed2 100644
--- a/pdcurses/addchstr.c
+++ b/pdcurses/addchstr.c
@@ -35,10 +35,7 @@
 # undef wmove
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_addchstr =
-	"$Id: addchstr.c,v 1.23 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: addchstr.c,v 1.24 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/addstr.c b/pdcurses/addstr.c
index 005f55e3..0d78f9df 100644
--- a/pdcurses/addstr.c
+++ b/pdcurses/addstr.c
@@ -36,10 +36,7 @@
 # undef waddch
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_addstr =
-	"$Id: addstr.c,v 1.18 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: addstr.c,v 1.19 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/attr.c b/pdcurses/attr.c
index 38a7f5f8..9915bbae 100644
--- a/pdcurses/attr.c
+++ b/pdcurses/attr.c
@@ -33,10 +33,7 @@
 #undef color_set
 #undef wcolor_set
 
-#ifdef PDCDEBUG
-const char *rcsid_attr =
-	"$Id: attr.c,v 1.20 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: attr.c,v 1.21 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/beep.c b/pdcurses/beep.c
index 50c0389a..9c38d23f 100644
--- a/pdcurses/beep.c
+++ b/pdcurses/beep.c
@@ -27,10 +27,7 @@
 # undef wrefresh
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_beep =
-	"$Id: beep.c,v 1.18 2006/03/26 01:48:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: beep.c,v 1.19 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/bkgd.c b/pdcurses/bkgd.c
index 6d96747b..3ce5131b 100644
--- a/pdcurses/bkgd.c
+++ b/pdcurses/bkgd.c
@@ -25,10 +25,7 @@
 #undef wbkgd
 #undef wbkgdset
 
-#ifdef PDCDEBUG
-const char *rcsid_bkgd =
-	"$Id: bkgd.c,v 1.18 2006/03/27 20:35:30 wmcbrine Exp $";
-#endif
+RCSID("$Id: bkgd.c,v 1.19 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/border.c b/pdcurses/border.c
index a6043ca2..18b835de 100644
--- a/pdcurses/border.c
+++ b/pdcurses/border.c
@@ -34,10 +34,7 @@
 #undef PDC_leftline
 #undef PDC_rightline
 
-#ifdef PDCDEBUG
-const char *rcsid_border =
-	"$Id: border.c,v 1.20 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: border.c,v 1.21 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/clear.c b/pdcurses/clear.c
index c8cec829..6545cd1f 100644
--- a/pdcurses/clear.c
+++ b/pdcurses/clear.c
@@ -28,10 +28,7 @@
 #undef clrtoeol
 #undef wclrtoeol
 
-#ifdef PDCDEBUG
-const char *rcsid_clear =
-	"$Id: clear.c,v 1.18 2006/03/20 07:43:33 wmcbrine Exp $";
-#endif
+RCSID("$Id: clear.c,v 1.19 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/color.c b/pdcurses/color.c
index 2c0f41e7..430cc03c 100644
--- a/pdcurses/color.c
+++ b/pdcurses/color.c
@@ -34,10 +34,7 @@
 
 static void PDC_init_pair(short, short, short);
 
-#ifdef PDCDEBUG
-const char *rcsid_color =
-	"$Id: color.c,v 1.44 2006/03/26 01:48:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: color.c,v 1.45 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/delch.c b/pdcurses/delch.c
index 853ab04f..8de35d7a 100644
--- a/pdcurses/delch.c
+++ b/pdcurses/delch.c
@@ -31,10 +31,7 @@
 # undef wmove
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_delch =
-	"$Id: delch.c,v 1.17 2006/03/20 07:43:33 wmcbrine Exp $";
-#endif
+RCSID("$Id: delch.c,v 1.18 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/deleteln.c b/pdcurses/deleteln.c
index a23c279d..c1c16595 100644
--- a/pdcurses/deleteln.c
+++ b/pdcurses/deleteln.c
@@ -27,10 +27,7 @@
 #undef winsertln
 #undef mvwinsertln
 
-#ifdef PDCDEBUG
-const char *rcsid_deleteln =
-	"$Id: deleteln.c,v 1.17 2006/03/20 07:43:33 wmcbrine Exp $";
-#endif
+RCSID("$Id: deleteln.c,v 1.18 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/getch.c b/pdcurses/getch.c
index 4aeea270..81f769c9 100644
--- a/pdcurses/getch.c
+++ b/pdcurses/getch.c
@@ -33,10 +33,7 @@
 # undef wmove
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_getch =
-	"$Id: getch.c,v 1.26 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: getch.c,v 1.27 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/getstr.c b/pdcurses/getstr.c
index 9b4b48fc..e41ee9cc 100644
--- a/pdcurses/getstr.c
+++ b/pdcurses/getstr.c
@@ -38,10 +38,7 @@
 # undef wmove
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_getstr =
-	"$Id: getstr.c,v 1.24 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: getstr.c,v 1.25 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/getyx.c b/pdcurses/getyx.c
index 56776850..fb68acb9 100644
--- a/pdcurses/getyx.c
+++ b/pdcurses/getyx.c
@@ -26,10 +26,7 @@
 #undef getpary
 #undef getparx
 
-#ifdef PDCDEBUG
-const char *rcsid_getyx =
-	"$Id: getyx.c,v 1.14 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: getyx.c,v 1.15 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/inch.c b/pdcurses/inch.c
index fa834284..401e8fb5 100644
--- a/pdcurses/inch.c
+++ b/pdcurses/inch.c
@@ -30,10 +30,7 @@
 # undef wmove
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_inch =
-	"$Id: inch.c,v 1.15 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: inch.c,v 1.16 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/inchstr.c b/pdcurses/inchstr.c
index 338e9890..76c00857 100644
--- a/pdcurses/inchstr.c
+++ b/pdcurses/inchstr.c
@@ -34,10 +34,7 @@
 # undef wmove
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_inchstr =
-	"$Id: inchstr.c,v 1.15 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: inchstr.c,v 1.16 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/initscr.c b/pdcurses/initscr.c
index b811a63a..c03b2beb 100644
--- a/pdcurses/initscr.c
+++ b/pdcurses/initscr.c
@@ -41,10 +41,7 @@
 # undef wnoutrefresh
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_initscr =
-	"$Id: initscr.c,v 1.40 2006/03/26 01:48:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: initscr.c,v 1.41 2006/03/29 20:06:40 wmcbrine Exp $");
 
 const char *_curses_notice = "PDCurses 2.8 - Public Domain 2006";
 
diff --git a/pdcurses/inopts.c b/pdcurses/inopts.c
index 1c7f2cbe..e88d646a 100644
--- a/pdcurses/inopts.c
+++ b/pdcurses/inopts.c
@@ -45,10 +45,7 @@
 # undef wmove
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_inopts =
-	"$Id: inopts.c,v 1.24 2006/03/25 00:41:22 wmcbrine Exp $";
-#endif
+RCSID("$Id: inopts.c,v 1.25 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/insch.c b/pdcurses/insch.c
index b739eb9f..001cfdb0 100644
--- a/pdcurses/insch.c
+++ b/pdcurses/insch.c
@@ -32,10 +32,7 @@
 # undef wmove
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_insch =
-	"$Id: insch.c,v 1.16 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: insch.c,v 1.17 2006/03/29 20:06:40 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/insstr.c b/pdcurses/insstr.c
index 45500efa..ed105c97 100644
--- a/pdcurses/insstr.c
+++ b/pdcurses/insstr.c
@@ -37,10 +37,7 @@
 # undef waddch
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_insstr =
-	"$Id: insstr.c,v 1.21 2006/03/25 01:37:35 wmcbrine Exp $";
-#endif
+RCSID("$Id: insstr.c,v 1.22 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/instr.c b/pdcurses/instr.c
index b815717b..82b8f4fb 100644
--- a/pdcurses/instr.c
+++ b/pdcurses/instr.c
@@ -37,10 +37,7 @@
 # undef mvwinch
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_instr =
-	"$Id: instr.c,v 1.17 2006/03/25 01:37:35 wmcbrine Exp $";
-#endif
+RCSID("$Id: instr.c,v 1.18 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/kernel.c b/pdcurses/kernel.c
index 60d8cbe1..e4f7ccf9 100644
--- a/pdcurses/kernel.c
+++ b/pdcurses/kernel.c
@@ -69,10 +69,7 @@ APIRET APIENTRY DosSleep(ULONG ulTime);
 # undef wmove
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_kernel =
-	"$Id: kernel.c,v 1.42 2006/03/27 20:35:30 wmcbrine Exp $";
-#endif
+RCSID("$Id: kernel.c,v 1.43 2006/03/29 20:06:41 wmcbrine Exp $");
 
 RIPPEDOFFLINE linesripped[5];
 char linesrippedoff = 0;
diff --git a/pdcurses/mouse.c b/pdcurses/mouse.c
index b1eec864..b53642a4 100644
--- a/pdcurses/mouse.c
+++ b/pdcurses/mouse.c
@@ -29,10 +29,7 @@
 #undef getmouse
 #undef getbmap
 
-#ifdef PDCDEBUG
-const char *rcsid_mouse =
-	"$Id: mouse.c,v 1.17 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: mouse.c,v 1.18 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/move.c b/pdcurses/move.c
index 6e658a11..e7893a50 100644
--- a/pdcurses/move.c
+++ b/pdcurses/move.c
@@ -22,10 +22,7 @@
 #undef move
 #undef wmove
 
-#ifdef PDCDEBUG
-const char *rcsid_move =
-	"$Id: move.c,v 1.14 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: move.c,v 1.15 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/outopts.c b/pdcurses/outopts.c
index ee68074a..a5cea586 100644
--- a/pdcurses/outopts.c
+++ b/pdcurses/outopts.c
@@ -29,10 +29,7 @@
 #undef scrollok
 #undef raw_output
 
-#ifdef PDCDEBUG
-const char *rcsid_outopts =
-	"$Id: outopts.c,v 1.20 2006/03/25 00:30:36 wmcbrine Exp $";
-#endif
+RCSID("$Id: outopts.c,v 1.21 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/overlay.c b/pdcurses/overlay.c
index ee36cbe8..84068c72 100644
--- a/pdcurses/overlay.c
+++ b/pdcurses/overlay.c
@@ -29,10 +29,7 @@
 # undef wmove
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_overlay =
-	"$Id: overlay.c,v 1.17 2006/03/01 08:34:35 wmcbrine Exp $";
-#endif
+RCSID("$Id: overlay.c,v 1.18 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/pad.c b/pdcurses/pad.c
index af62a06f..19ff55eb 100644
--- a/pdcurses/pad.c
+++ b/pdcurses/pad.c
@@ -34,10 +34,7 @@
 # undef doupdate
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_pad =
-	"$Id: pad.c,v 1.19 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: pad.c,v 1.20 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /* save values for pechochar() */
 
diff --git a/pdcurses/pdcdebug.c b/pdcurses/pdcdebug.c
index bd6bbe49..fa40ae26 100644
--- a/pdcurses/pdcdebug.c
+++ b/pdcurses/pdcdebug.c
@@ -23,10 +23,7 @@
 
 #undef PDC_debug
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCdebug =
-	"$Id: pdcdebug.c,v 1.18 2006/02/27 08:13:03 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcdebug.c,v 1.19 2006/03/29 20:06:41 wmcbrine Exp $");
 
 bool trace_on = FALSE;
 
diff --git a/pdcurses/pdcutil.c b/pdcurses/pdcutil.c
index 20dab74e..4104a121 100644
--- a/pdcurses/pdcutil.c
+++ b/pdcurses/pdcutil.c
@@ -24,10 +24,7 @@
 #endif
 #include <curses.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCutil =
-	"$Id: pdcutil.c,v 1.30 2006/03/26 01:48:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcutil.c,v 1.31 2006/03/29 20:06:41 wmcbrine Exp $");
 
 void PDC_beep(void)
 {
diff --git a/pdcurses/pdcwin.c b/pdcurses/pdcwin.c
index ec6cdd6f..e6f30ac2 100644
--- a/pdcurses/pdcwin.c
+++ b/pdcurses/pdcwin.c
@@ -22,10 +22,7 @@
 #include <curses.h>
 #include <string.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCwin =
-	"$Id: pdcwin.c,v 1.38 2006/03/27 14:15:54 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcwin.c,v 1.39 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/printw.c b/pdcurses/printw.c
index d48b7471..c1d35d47 100644
--- a/pdcurses/printw.c
+++ b/pdcurses/printw.c
@@ -36,10 +36,7 @@
 # undef wmove
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_printw =
-	"$Id: printw.c,v 1.23 2006/03/11 06:23:16 wmcbrine Exp $";
-#endif
+RCSID("$Id: printw.c,v 1.24 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/refresh.c b/pdcurses/refresh.c
index 21428639..a8b71e0e 100644
--- a/pdcurses/refresh.c
+++ b/pdcurses/refresh.c
@@ -38,10 +38,7 @@
 # undef reset_prog_mode
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_refresh =
-	"$Id: refresh.c,v 1.29 2006/03/27 14:33:00 wmcbrine Exp $";
-#endif
+RCSID("$Id: refresh.c,v 1.30 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/scanw.c b/pdcurses/scanw.c
index 9b308e42..2f90ca4c 100644
--- a/pdcurses/scanw.c
+++ b/pdcurses/scanw.c
@@ -47,10 +47,7 @@ static int PDC_vsscanf(const char *, const char *, va_list);
 # undef wmove
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_scanw =
-	"$Id: scanw.c,v 1.23 2006/03/20 17:33:57 wmcbrine Exp $";
-#endif
+RCSID("$Id: scanw.c,v 1.24 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/scr_dump.c b/pdcurses/scr_dump.c
index 6850b1b8..a2cd71bb 100644
--- a/pdcurses/scr_dump.c
+++ b/pdcurses/scr_dump.c
@@ -24,10 +24,7 @@
 #undef scr_restore
 #undef scr_set
 
-#ifdef PDCDEBUG
-const char *rcsid_scr_dump =
-	"$Id: scr_dump.c,v 1.13 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: scr_dump.c,v 1.14 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/scroll.c b/pdcurses/scroll.c
index 78a87910..8089e8e2 100644
--- a/pdcurses/scroll.c
+++ b/pdcurses/scroll.c
@@ -23,10 +23,7 @@
 #undef scrl
 #undef wscrl
 
-#ifdef PDCDEBUG
-const char *rcsid_scroll =
-	"$Id: scroll.c,v 1.18 2006/03/20 07:43:33 wmcbrine Exp $";
-#endif
+RCSID("$Id: scroll.c,v 1.19 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/slk.c b/pdcurses/slk.c
index 1a9515f9..f1dbcb4d 100644
--- a/pdcurses/slk.c
+++ b/pdcurses/slk.c
@@ -33,10 +33,7 @@
 #undef slk_attroff
 #undef slk_color
 
-#ifdef PDCDEBUG
-const char *rcsid_slk =
-	"$Id: slk.c,v 1.21 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: slk.c,v 1.22 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/termattr.c b/pdcurses/termattr.c
index 3b2df7f1..6d876553 100644
--- a/pdcurses/termattr.c
+++ b/pdcurses/termattr.c
@@ -31,10 +31,7 @@
 #undef termname
 #undef wordchar
 
-#ifdef PDCDEBUG
-const char *rcsid_termattr =
-	"$Id: termattr.c,v 1.26 2006/03/27 04:35:41 wmcbrine Exp $";
-#endif
+RCSID("$Id: termattr.c,v 1.27 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/terminfo.c b/pdcurses/terminfo.c
index d5fe9570..aa16078d 100644
--- a/pdcurses/terminfo.c
+++ b/pdcurses/terminfo.c
@@ -23,10 +23,7 @@
 #undef vidattr
 #undef vidputs
 
-#ifdef PDCDEBUG
-const char *rcsid_terminfo =
-	"$Id: terminfo.c,v 1.20 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: terminfo.c,v 1.21 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/touch.c b/pdcurses/touch.c
index 6c52abda..9c80a2e5 100644
--- a/pdcurses/touch.c
+++ b/pdcurses/touch.c
@@ -32,10 +32,7 @@
 # undef wmove
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_touch =
-	"$Id: touch.c,v 1.15 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: touch.c,v 1.16 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/util.c b/pdcurses/util.c
index 09142495..0dd93b61 100644
--- a/pdcurses/util.c
+++ b/pdcurses/util.c
@@ -34,10 +34,7 @@
 #undef delay_output
 #undef flushinp
 
-#ifdef PDCDEBUG
-const char *rcsid_util =
-	"$Id: util.c,v 1.30 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: util.c,v 1.31 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/window.c b/pdcurses/window.c
index 0cc8cbc2..2763f212 100644
--- a/pdcurses/window.c
+++ b/pdcurses/window.c
@@ -45,10 +45,7 @@
 # undef wclrtobot
 #endif
 
-#ifdef PDCDEBUG
-const char *rcsid_window =
-	"$Id: window.c,v 1.26 2006/03/25 00:30:36 wmcbrine Exp $";
-#endif
+RCSID("$Id: window.c,v 1.27 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/win32/pdcclip.c b/win32/pdcclip.c
index 14af01d3..1fc39951 100644
--- a/win32/pdcclip.c
+++ b/win32/pdcclip.c
@@ -19,10 +19,7 @@
 #define	CURSES_LIBRARY 1
 #include <curses.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCclip =
-	"$Id: pdcclip.c,v 1.14 2006/02/27 08:13:03 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcclip.c,v 1.15 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/win32/pdcdisp.c b/win32/pdcdisp.c
index 3b7e8851..be3d069c 100644
--- a/win32/pdcdisp.c
+++ b/win32/pdcdisp.c
@@ -24,10 +24,7 @@
 extern HANDLE hConOut;
 extern unsigned char atrtab[MAX_ATRTAB];
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCdisp =
-	"$Id: pdcdisp.c,v 1.20 2006/03/27 14:33:00 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcdisp.c,v 1.21 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/win32/pdcgetsc.c b/win32/pdcgetsc.c
index d3cdf219..5d0f556c 100644
--- a/win32/pdcgetsc.c
+++ b/win32/pdcgetsc.c
@@ -19,10 +19,7 @@
 #define	INCLUDE_WINDOWS_H
 #include <curses.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCgetsc =
-	"$Id: pdcgetsc.c,v 1.14 2006/03/27 16:24:16 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcgetsc.c,v 1.15 2006/03/29 20:06:41 wmcbrine Exp $");
 
 extern HANDLE hConOut, hConIn;
 extern CONSOLE_SCREEN_BUFFER_INFO scr;
diff --git a/win32/pdckbd.c b/win32/pdckbd.c
index ebf83dd9..6aab09ce 100644
--- a/win32/pdckbd.c
+++ b/win32/pdckbd.c
@@ -19,10 +19,7 @@
 #define INCLUDE_WINDOWS_H
 #include <curses.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCkbd =
-	"$Id: pdckbd.c,v 1.41 2006/03/26 01:48:53 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdckbd.c,v 1.42 2006/03/29 20:06:41 wmcbrine Exp $");
 
 #define KEY_STATE TRUE
 #define MS_MOUSE_MOVED 1
diff --git a/win32/pdcscrn.c b/win32/pdcscrn.c
index d353aeb6..74ee087a 100644
--- a/win32/pdcscrn.c
+++ b/win32/pdcscrn.c
@@ -19,10 +19,7 @@
 #define INCLUDE_WINDOWS_H
 #include <curses.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCscrn =
-	"$Id: pdcscrn.c,v 1.33 2006/03/27 16:24:16 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcscrn.c,v 1.34 2006/03/29 20:06:41 wmcbrine Exp $");
 
 #define PDC_RESTORE_NONE     0
 #define PDC_RESTORE_BUFFER   1
diff --git a/win32/pdcsetsc.c b/win32/pdcsetsc.c
index eff24a91..232d0292 100644
--- a/win32/pdcsetsc.c
+++ b/win32/pdcsetsc.c
@@ -19,10 +19,7 @@
 #define	INCLUDE_WINDOWS_H
 #include <curses.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCsetsc =
-	"$Id: pdcsetsc.c,v 1.16 2006/03/27 16:24:16 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcsetsc.c,v 1.17 2006/03/29 20:06:41 wmcbrine Exp $");
 
 extern HANDLE hConOut;
 
diff --git a/x11/ScrollBox.h b/x11/ScrollBox.h
index 53854b23..50e6378c 100644
--- a/x11/ScrollBox.h
+++ b/x11/ScrollBox.h
@@ -11,6 +11,8 @@
      copies from any such party to do so.  This license includes without
      limitation a license to do the foregoing actions under any patents of
      the party supplying this software to the X Consortium.
+
+     $Id: ScrollBox.h,v 1.3 2006/03/29 20:06:41 wmcbrine Exp $
  */
 
 #ifndef _XORAscrollBox_h
diff --git a/x11/ScrollBoxP.h b/x11/ScrollBoxP.h
index 53abee06..a60e5a55 100644
--- a/x11/ScrollBoxP.h
+++ b/x11/ScrollBoxP.h
@@ -11,6 +11,8 @@
      copies from any such party to do so.  This license includes without
      limitation a license to do the foregoing actions under any patents of
      the party supplying this software to the X Consortium.
+
+     $Id: ScrollBoxP.h,v 1.4 2006/03/29 20:06:41 wmcbrine Exp $
  */
 
 /* 
diff --git a/x11/latin1kbd.h b/x11/latin1kbd.h
index c751fade..e5d7d296 100644
--- a/x11/latin1kbd.h
+++ b/x11/latin1kbd.h
@@ -1,3 +1,4 @@
+/* $Id: latin1kbd.h,v 1.3 2006/03/29 20:06:41 wmcbrine Exp $ */
 
 /* Definitions of latin1 character set for XCurses */
 
diff --git a/x11/pdcclip.c b/x11/pdcclip.c
index 2306e26b..b9e7ed5f 100644
--- a/x11/pdcclip.c
+++ b/x11/pdcclip.c
@@ -19,10 +19,7 @@
 #include <curses.h>
 #include <stdlib.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCclip =
-	"$Id: pdcclip.c,v 1.16 2006/02/27 08:13:03 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcclip.c,v 1.17 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/x11/pdcdisp.c b/x11/pdcdisp.c
index 19581bf2..5c805920 100644
--- a/x11/pdcdisp.c
+++ b/x11/pdcdisp.c
@@ -19,10 +19,7 @@
 #include <curses.h>
 #include <string.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCdisp =
-	"$Id: pdcdisp.c,v 1.20 2006/03/27 14:33:00 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcdisp.c,v 1.21 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/x11/pdcgetsc.c b/x11/pdcgetsc.c
index ebccc473..ef22074a 100644
--- a/x11/pdcgetsc.c
+++ b/x11/pdcgetsc.c
@@ -18,10 +18,7 @@
 #define	CURSES_LIBRARY 1
 #include <curses.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCgetsc =
-	"$Id: pdcgetsc.c,v 1.14 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcgetsc.c,v 1.15 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/x11/pdckbd.c b/x11/pdckbd.c
index 80f80cc6..5da7c7dd 100644
--- a/x11/pdckbd.c
+++ b/x11/pdckbd.c
@@ -18,10 +18,7 @@
 #define	CURSES_LIBRARY 1
 #include <curses.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCkbd =
-	"$Id: pdckbd.c,v 1.19 2006/02/23 01:46:52 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdckbd.c,v 1.20 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/x11/pdcscrn.c b/x11/pdcscrn.c
index c90d8f11..65a8d574 100644
--- a/x11/pdcscrn.c
+++ b/x11/pdcscrn.c
@@ -18,10 +18,7 @@
 #define	CURSES_LIBRARY 1
 #include <curses.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCscrn =
-	"$Id: pdcscrn.c,v 1.22 2006/03/27 16:26:43 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcscrn.c,v 1.23 2006/03/29 20:06:41 wmcbrine Exp $");
 
 bool GLOBAL_sb_on = FALSE;
 bool GLOBAL_slk_on = FALSE;
diff --git a/x11/pdcsetsc.c b/x11/pdcsetsc.c
index 802d8492..c5c7b4eb 100644
--- a/x11/pdcsetsc.c
+++ b/x11/pdcsetsc.c
@@ -18,10 +18,7 @@
 #define	CURSES_LIBRARY 1
 #include <curses.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCsetsc =
-	"$Id: pdcsetsc.c,v 1.15 2006/02/27 07:28:32 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcsetsc.c,v 1.16 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/x11/pdcx11.c b/x11/pdcx11.c
index e570b5bc..15ba19e3 100644
--- a/x11/pdcx11.c
+++ b/x11/pdcx11.c
@@ -8,10 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef PDCDEBUG
-const char *rcsid_PDCx11 =
-	"$Id: pdcx11.c,v 1.56 2006/03/22 17:10:18 wmcbrine Exp $";
-#endif
+RCSID("$Id: pdcx11.c,v 1.57 2006/03/29 20:06:41 wmcbrine Exp $");
 
 AppData app_data;
 
diff --git a/x11/process/x11.c b/x11/process/x11.c
index 4ef68342..2c63476d 100644
--- a/x11/process/x11.c
+++ b/x11/process/x11.c
@@ -7,10 +7,7 @@
 
 #include <stdlib.h>
 
-#ifdef PDCDEBUG
-const char rcsid_x11 =
-	"$Id: x11.c,v 1.41 2006/02/27 07:58:31 wmcbrine Exp $";
-#endif
+RCSID("$Id: x11.c,v 1.42 2006/03/29 20:06:41 wmcbrine Exp $");
 
 extern AppData app_data;
 
diff --git a/x11/process/x11.h b/x11/process/x11.h
index 118c0bec..026fa20f 100644
--- a/x11/process/x11.h
+++ b/x11/process/x11.h
@@ -1,3 +1,5 @@
+/* $Id: x11.h,v 1.8 2006/03/29 20:06:41 wmcbrine Exp $ */
+
 void dummy_function(void);
 void get_GC(Display *, Window, GC *, XFontStruct *, int, int, bool);
 void makeXY(int, int, int, int, int *, int *);
diff --git a/x11/process/x11common.c b/x11/process/x11common.c
index 1200a903..50f72ded 100644
--- a/x11/process/x11common.c
+++ b/x11/process/x11common.c
@@ -5,10 +5,7 @@
 
 #include "pdcx11.h"
 
-#ifdef PDCDEBUG
-const char rcsid_x11common =
-        "$Id: x11common.c,v 1.13 2006/03/01 08:04:34 wmcbrine Exp $";
-#endif
+RCSID("$Id: x11common.c,v 1.14 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /* Variables specific to process port */
 
diff --git a/x11/process/x11curses.c b/x11/process/x11curses.c
index a3f5f263..b1c2617a 100644
--- a/x11/process/x11curses.c
+++ b/x11/process/x11curses.c
@@ -10,10 +10,7 @@
 
 #include <stdlib.h>
 
-#ifdef PDCDEBUG
-const char rcsid_x11curses =
-        "$Id: x11curses.c,v 1.28 2006/03/01 08:04:34 wmcbrine Exp $";
-#endif
+RCSID("$Id: x11curses.c,v 1.29 2006/03/29 20:06:41 wmcbrine Exp $");
 
 extern AppData app_data;
 
diff --git a/x11/sb.c b/x11/sb.c
index d1e989d1..67bfe137 100644
--- a/x11/sb.c
+++ b/x11/sb.c
@@ -26,10 +26,7 @@
 #undef sb_get_vert
 #undef sb_refresh
 
-#ifdef PDCDEBUG
-const char *rcsid_sb =
-	"$Id: sb.c,v 1.15 2006/02/23 01:46:53 wmcbrine Exp $";
-#endif
+RCSID("$Id: sb.c,v 1.16 2006/03/29 20:06:41 wmcbrine Exp $");
 
 /*man-start**************************************************************