diff --git a/curses.h b/curses.h
index 4bc8a3ee..387e01e4 100644
--- a/curses.h
+++ b/curses.h
@@ -15,7 +15,7 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-/* $Id: curses.h,v 1.232 2006/09/24 21:24:28 wmcbrine Exp $ */
+/* $Id: curses.h,v 1.233 2006/10/08 20:54:30 wmcbrine Exp $ */
 
 /*----------------------------------------------------------------------*
  *				PDCurses				*
@@ -1613,13 +1613,6 @@ int	PDC_set_line_color(short);
 #define PDC_KEY_MODIFIER_ALT		4
 #define PDC_KEY_MODIFIER_NUMLOCK	8
 
-/* Load up curspriv.h. We allow anyone who defines CURSES_LIBRARY
-   to have access to our internal routines. */
-
-#ifdef CURSES_LIBRARY
-# include <curspriv.h>
-#endif
-
 #endif  /* __PDCURSES__ */
 
 #if defined(__cplusplus) || defined(__cplusplus__) || defined(__CPLUSPLUS)
diff --git a/curspriv.h b/curspriv.h
index 3460cfe5..2476d146 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.122 2006/09/25 19:25:19 wmcbrine Exp $ */
+/* $Id: curspriv.h,v 1.123 2006/10/08 20:54:30 wmcbrine Exp $ */
 
 /*                         CURSPRIV.H
 
@@ -25,6 +25,9 @@
 #ifndef __CURSES_INTERNALS__
 #define __CURSES_INTERNALS__ 1
 
+#define CURSES_LIBRARY
+#include <curses.h>
+
 /*----------------------------------------------------------------------*/
 /* window properties */
 
diff --git a/demos/testcurs.c b/demos/testcurs.c
index 462986b4..c2fcfac3 100644
--- a/demos/testcurs.c
+++ b/demos/testcurs.c
@@ -5,13 +5,9 @@
  *  wrs(5/28/93) -- modified to be consistent (perform identically) with
  *                  either PDCurses or under Unix System V, R4
  *
- *  $Id: testcurs.c,v 1.65 2006/09/25 00:09:22 wmcbrine Exp $
+ *  $Id: testcurs.c,v 1.66 2006/10/08 20:54:30 wmcbrine Exp $
  */
 
-#ifdef PDCDEBUG
-# define CURSES_LIBRARY /* needed for the prototype of PDC_debug */
-#endif
-
 #ifndef _XOPEN_SOURCE_EXTENDED
 # define _XOPEN_SOURCE_EXTENDED 1
 #endif
@@ -90,10 +86,6 @@ int main(int argc, char *argv[])
 	int key, old_option = -1, new_option = 0;
 	bool quit = FALSE;
 
-#ifdef PDCDEBUG
-	PDC_debug("testcurs started\n");
-#endif
-
 #ifdef HAVE_WIDE
 	/* This is here for ncurses. PDCurses doesn't need it. */
 
@@ -198,17 +190,11 @@ void Continue(WINDOW *win)
 
 int initTest(WINDOW **win, int argc, char *argv[])
 {
-#ifdef PDCDEBUG
-	PDC_debug("initTest called\n");
-#endif
 #ifdef XCURSES
 	Xinitscr(argc, argv);
 #else
 	initscr();
 #endif
-#ifdef PDCDEBUG
-	PDC_debug("after initscr()\n");
-#endif
 #ifdef A_COLOR
 	if (has_colors())
 		start_color();
diff --git a/dos/pdcdos.h b/dos/pdcdos.h
index 9ad0a1eb..bbb5168c 100644
--- a/dos/pdcdos.h
+++ b/dos/pdcdos.h
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-/* $Id: pdcdos.h,v 1.16 2006/09/30 15:45:04 wmcbrine Exp $ */
+/* $Id: pdcdos.h,v 1.17 2006/10/08 20:54:30 wmcbrine Exp $ */
 
-#define CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
 #if defined(_MSC_VER) || defined(_QC)
 # define MSC 1
diff --git a/os2/pdcclip.c b/os2/pdcclip.c
index c34e9a59..f23c3c49 100644
--- a/os2/pdcclip.c
+++ b/os2/pdcclip.c
@@ -15,7 +15,6 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define CURSES_LIBRARY 1
 #ifndef EMXVIDEO
 # define INCL_DOS
 # define INCL_WIN
@@ -23,11 +22,11 @@
 # define INCL_KBD
 # include <os2.h>
 #endif
-#include <curses.h>
+#include <curspriv.h>
 #include <stdlib.h>
 #include <string.h>
 
-RCSID("$Id: pdcclip.c,v 1.22 2006/08/13 05:36:52 wmcbrine Exp $");
+RCSID("$Id: pdcclip.c,v 1.23 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/os2/pdcdisp.c b/os2/pdcdisp.c
index 3f60500e..79cce322 100644
--- a/os2/pdcdisp.c
+++ b/os2/pdcdisp.c
@@ -15,16 +15,15 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
 #ifndef EMXVIDEO
 # define INCL_VIO
 # define INCL_KBD
 # include <os2.h>
 #endif
-#include <curses.h>
+#include <curspriv.h>
 #include <string.h>
 
-RCSID("$Id: pdcdisp.c,v 1.36 2006/09/22 15:39:30 wmcbrine Exp $");
+RCSID("$Id: pdcdisp.c,v 1.37 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/os2/pdcgetsc.c b/os2/pdcgetsc.c
index cd726719..dafe4a48 100644
--- a/os2/pdcgetsc.c
+++ b/os2/pdcgetsc.c
@@ -15,16 +15,15 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define CURSES_LIBRARY 1
 #ifndef EMXVIDEO
 # define INCL_VIO
 # define INCL_KBD
 # include <os2.h>
 #endif
-#include <curses.h>
+#include <curspriv.h>
 #include <stdlib.h>
 
-RCSID("$Id: pdcgetsc.c,v 1.27 2006/08/13 05:36:52 wmcbrine Exp $");
+RCSID("$Id: pdcgetsc.c,v 1.28 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/os2/pdckbd.c b/os2/pdckbd.c
index 29e94e84..6186da82 100644
--- a/os2/pdckbd.c
+++ b/os2/pdckbd.c
@@ -15,13 +15,12 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define CURSES_LIBRARY 1
 #ifndef EMXVIDEO
 # define INCL_VIO
 # define INCL_KBD
 # include <os2.h>
 #endif
-#include <curses.h>
+#include <curspriv.h>
 
 #if defined(CURSES__32BIT__) || defined(__IBMC__) || defined(__TURBOC__)
 # include <signal.h>
@@ -38,7 +37,7 @@ static int tahead = -1;
 static KBDINFO kbdinfo;		/* default keyboard mode */
 #endif
 
-RCSID("$Id: pdckbd.c,v 1.38 2006/09/10 20:26:28 wmcbrine Exp $");
+RCSID("$Id: pdckbd.c,v 1.39 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /************************************************************************
  *   Table for key code translation of function keys in keypad mode	*
diff --git a/os2/pdcscrn.c b/os2/pdcscrn.c
index 2e9eebbf..269ba0a1 100644
--- a/os2/pdcscrn.c
+++ b/os2/pdcscrn.c
@@ -15,17 +15,16 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define CURSES_LIBRARY 1
 #ifndef EMXVIDEO
 # define INCL_DOSMISC
 # define INCL_VIO
 # define INCL_KBD
 # include <os2.h>
 #endif
-#include <curses.h>
+#include <curspriv.h>
 #include <stdlib.h>
 
-RCSID("$Id: pdcscrn.c,v 1.50 2006/09/27 07:21:27 wmcbrine Exp $");
+RCSID("$Id: pdcscrn.c,v 1.51 2006/10/08 20:54:30 wmcbrine Exp $");
 
 int pdc_font;			/* default font size	*/
 
diff --git a/os2/pdcsetsc.c b/os2/pdcsetsc.c
index 8f19ec63..7c56196f 100644
--- a/os2/pdcsetsc.c
+++ b/os2/pdcsetsc.c
@@ -15,16 +15,15 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define CURSES_LIBRARY 1
 #ifndef EMXVIDEO
 # define INCL_VIO
 # define INCL_KBD
 # include <os2.h>
 #endif
-#include <curses.h>
+#include <curspriv.h>
 #include <string.h>
 
-RCSID("$Id: pdcsetsc.c,v 1.31 2006/08/17 22:05:41 wmcbrine Exp $");
+RCSID("$Id: pdcsetsc.c,v 1.32 2006/10/08 20:54:30 wmcbrine Exp $");
 
 extern int pdc_font;
 
diff --git a/os2/pdcutil.c b/os2/pdcutil.c
index c94d65f2..73e41855 100644
--- a/os2/pdcutil.c
+++ b/os2/pdcutil.c
@@ -15,13 +15,12 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define CURSES_LIBRARY 1
 #ifndef EMXVIDEO
 # define INCL_VIO
 # define INCL_KBD
 # include <os2.h>
 #endif
-#include <curses.h>
+#include <curspriv.h>
 
 #ifdef __EMX__
 # include <stdlib.h>
@@ -31,7 +30,7 @@
 APIRET APIENTRY DosSleep(ULONG ulTime);
 #endif
 
-RCSID("$Id: pdcutil.c,v 1.6 2006/09/25 06:34:41 wmcbrine Exp $");
+RCSID("$Id: pdcutil.c,v 1.7 2006/10/08 20:54:30 wmcbrine Exp $");
 
 void PDC_beep(void)
 {
diff --git a/pdcurses/addch.c b/pdcurses/addch.c
index 509e10d1..776e8822 100644
--- a/pdcurses/addch.c
+++ b/pdcurses/addch.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: addch.c,v 1.26 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: addch.c,v 1.27 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/addchstr.c b/pdcurses/addchstr.c
index 1ae0acca..4f07f4c6 100644
--- a/pdcurses/addchstr.c
+++ b/pdcurses/addchstr.c
@@ -15,11 +15,10 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 #include <string.h>
 
-RCSID("$Id: addchstr.c,v 1.30 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: addchstr.c,v 1.31 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/addstr.c b/pdcurses/addstr.c
index e95c6f4c..8167573f 100644
--- a/pdcurses/addstr.c
+++ b/pdcurses/addstr.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: addstr.c,v 1.28 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: addstr.c,v 1.29 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/attr.c b/pdcurses/attr.c
index aa07702c..5d26c121 100644
--- a/pdcurses/attr.c
+++ b/pdcurses/attr.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: attr.c,v 1.26 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: attr.c,v 1.27 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/beep.c b/pdcurses/beep.c
index dc5c37ff..36b79503 100644
--- a/pdcurses/beep.c
+++ b/pdcurses/beep.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: beep.c,v 1.23 2006/08/20 21:48:36 wmcbrine Exp $");
+RCSID("$Id: beep.c,v 1.24 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/bkgd.c b/pdcurses/bkgd.c
index 0b95dd3a..a0312035 100644
--- a/pdcurses/bkgd.c
+++ b/pdcurses/bkgd.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: bkgd.c,v 1.25 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: bkgd.c,v 1.26 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/border.c b/pdcurses/border.c
index 8ad2490c..c9f9736b 100644
--- a/pdcurses/border.c
+++ b/pdcurses/border.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: border.c,v 1.35 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: border.c,v 1.36 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/clear.c b/pdcurses/clear.c
index 963a6fed..af6ffffc 100644
--- a/pdcurses/clear.c
+++ b/pdcurses/clear.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: clear.c,v 1.22 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: clear.c,v 1.23 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/color.c b/pdcurses/color.c
index 16c537a9..10f991b9 100644
--- a/pdcurses/color.c
+++ b/pdcurses/color.c
@@ -15,12 +15,11 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 #include <stdlib.h>
 #include <string.h>
 
-RCSID("$Id: color.c,v 1.62 2006/10/01 18:51:50 wmcbrine Exp $");
+RCSID("$Id: color.c,v 1.63 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/delch.c b/pdcurses/delch.c
index a9765239..296ea483 100644
--- a/pdcurses/delch.c
+++ b/pdcurses/delch.c
@@ -15,11 +15,10 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 #include <string.h>
 
-RCSID("$Id: delch.c,v 1.21 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: delch.c,v 1.22 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/deleteln.c b/pdcurses/deleteln.c
index a18b06e4..18497bee 100644
--- a/pdcurses/deleteln.c
+++ b/pdcurses/deleteln.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: deleteln.c,v 1.21 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: deleteln.c,v 1.22 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/getch.c b/pdcurses/getch.c
index caa0f84e..c1bf0a6c 100644
--- a/pdcurses/getch.c
+++ b/pdcurses/getch.c
@@ -15,13 +15,12 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
 #define _INBUFSIZ	512	/* size of terminal input buffer */
 #define NUNGETCH	256	/* max # chars to ungetch() */
 
-RCSID("$Id: getch.c,v 1.37 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: getch.c,v 1.38 2006/10/08 20:54:30 wmcbrine Exp $");
 
 static int c_pindex = 0;	/* putter index */
 static int c_gindex = 1;	/* getter index */
diff --git a/pdcurses/getstr.c b/pdcurses/getstr.c
index 6cf40d52..15baca70 100644
--- a/pdcurses/getstr.c
+++ b/pdcurses/getstr.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: getstr.c,v 1.30 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: getstr.c,v 1.31 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/getyx.c b/pdcurses/getyx.c
index 1c94bf11..ebd778f4 100644
--- a/pdcurses/getyx.c
+++ b/pdcurses/getyx.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: getyx.c,v 1.17 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: getyx.c,v 1.18 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/inch.c b/pdcurses/inch.c
index 8ac41931..137f7659 100644
--- a/pdcurses/inch.c
+++ b/pdcurses/inch.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: inch.c,v 1.22 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: inch.c,v 1.23 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/inchstr.c b/pdcurses/inchstr.c
index 0d556980..68aa062e 100644
--- a/pdcurses/inchstr.c
+++ b/pdcurses/inchstr.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: inchstr.c,v 1.21 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: inchstr.c,v 1.22 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/initscr.c b/pdcurses/initscr.c
index a0e55690..34b7e8a7 100644
--- a/pdcurses/initscr.c
+++ b/pdcurses/initscr.c
@@ -15,11 +15,10 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 #include <stdlib.h>
 
-RCSID("$Id: initscr.c,v 1.77 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: initscr.c,v 1.78 2006/10/08 20:54:30 wmcbrine Exp $");
 
 const char *_curses_notice = "PDCurses 3.0 - Public Domain 2006";
 
diff --git a/pdcurses/inopts.c b/pdcurses/inopts.c
index 37cc7df3..03ae1d7e 100644
--- a/pdcurses/inopts.c
+++ b/pdcurses/inopts.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: inopts.c,v 1.29 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: inopts.c,v 1.30 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/insch.c b/pdcurses/insch.c
index 883a8d55..9fc09dec 100644
--- a/pdcurses/insch.c
+++ b/pdcurses/insch.c
@@ -15,11 +15,10 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 #include <string.h>
 
-RCSID("$Id: insch.c,v 1.26 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: insch.c,v 1.27 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/insstr.c b/pdcurses/insstr.c
index c5c5a31a..009495f0 100644
--- a/pdcurses/insstr.c
+++ b/pdcurses/insstr.c
@@ -15,11 +15,10 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 #include <string.h>
 
-RCSID("$Id: insstr.c,v 1.29 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: insstr.c,v 1.30 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/instr.c b/pdcurses/instr.c
index 7c245cce..ab54d72d 100644
--- a/pdcurses/instr.c
+++ b/pdcurses/instr.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: instr.c,v 1.26 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: instr.c,v 1.27 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/kernel.c b/pdcurses/kernel.c
index e4a37670..bdf22f16 100644
--- a/pdcurses/kernel.c
+++ b/pdcurses/kernel.c
@@ -15,11 +15,10 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 #include <string.h>
 
-RCSID("$Id: kernel.c,v 1.62 2006/08/21 16:42:37 wmcbrine Exp $");
+RCSID("$Id: kernel.c,v 1.63 2006/10/08 20:54:30 wmcbrine Exp $");
 
 RIPPEDOFFLINE linesripped[5];
 char linesrippedoff = 0;
diff --git a/pdcurses/mouse.c b/pdcurses/mouse.c
index 8da476d7..10462a04 100644
--- a/pdcurses/mouse.c
+++ b/pdcurses/mouse.c
@@ -15,11 +15,10 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 #include <string.h>
 
-RCSID("$Id: mouse.c,v 1.23 2006/08/23 19:06:59 wmcbrine Exp $");
+RCSID("$Id: mouse.c,v 1.24 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/move.c b/pdcurses/move.c
index 62741f14..f68892ab 100644
--- a/pdcurses/move.c
+++ b/pdcurses/move.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: move.c,v 1.17 2006/08/20 21:48:36 wmcbrine Exp $");
+RCSID("$Id: move.c,v 1.18 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/outopts.c b/pdcurses/outopts.c
index e1ddb04f..2d027afa 100644
--- a/pdcurses/outopts.c
+++ b/pdcurses/outopts.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: outopts.c,v 1.26 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: outopts.c,v 1.27 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/overlay.c b/pdcurses/overlay.c
index e4e174c3..3177bc53 100644
--- a/pdcurses/overlay.c
+++ b/pdcurses/overlay.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: overlay.c,v 1.22 2006/08/21 16:42:38 wmcbrine Exp $");
+RCSID("$Id: overlay.c,v 1.23 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/pad.c b/pdcurses/pad.c
index 049ac068..ac935b78 100644
--- a/pdcurses/pad.c
+++ b/pdcurses/pad.c
@@ -15,12 +15,11 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 #include <stdlib.h>
 #include <string.h>
 
-RCSID("$Id: pad.c,v 1.31 2006/08/20 21:48:36 wmcbrine Exp $");
+RCSID("$Id: pad.c,v 1.32 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /* save values for pechochar() */
 
diff --git a/pdcurses/pdcdebug.c b/pdcurses/pdcdebug.c
index 6feccefc..9eec8568 100644
--- a/pdcurses/pdcdebug.c
+++ b/pdcurses/pdcdebug.c
@@ -15,13 +15,12 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 #include <string.h>
 #include <sys/types.h>
 #include <time.h>
 
-RCSID("$Id: pdcdebug.c,v 1.22 2006/08/20 21:48:36 wmcbrine Exp $");
+RCSID("$Id: pdcdebug.c,v 1.23 2006/10/08 20:54:30 wmcbrine Exp $");
 
 bool pdc_trace_on = FALSE;
 
diff --git a/pdcurses/printw.c b/pdcurses/printw.c
index 595181b9..e3480558 100644
--- a/pdcurses/printw.c
+++ b/pdcurses/printw.c
@@ -15,14 +15,13 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define CURSES_LIBRARY 1
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include <curses.h>
+#include <curspriv.h>
 #include <string.h>
 
-RCSID("$Id: printw.c,v 1.27 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: printw.c,v 1.28 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/refresh.c b/pdcurses/refresh.c
index c4395d40..d89d55ee 100644
--- a/pdcurses/refresh.c
+++ b/pdcurses/refresh.c
@@ -15,12 +15,11 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 #include <stdlib.h>
 #include <string.h>
 
-RCSID("$Id: refresh.c,v 1.38 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: refresh.c,v 1.39 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/scanw.c b/pdcurses/scanw.c
index 7a6366af..106a2b7c 100644
--- a/pdcurses/scanw.c
+++ b/pdcurses/scanw.c
@@ -15,11 +15,10 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include <curses.h>
+#include <curspriv.h>
 #include <string.h>
 
 #ifndef HAVE_VSSCANF
@@ -35,7 +34,7 @@ static int _pdc_vsscanf(const char *, const char *, va_list);
 /* undefine any macros for functions defined in this module */
 #undef vw_scanw
 
-RCSID("$Id: scanw.c,v 1.27 2006/08/21 16:42:40 wmcbrine Exp $");
+RCSID("$Id: scanw.c,v 1.28 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/scr_dump.c b/pdcurses/scr_dump.c
index 90af68bd..ec29373b 100644
--- a/pdcurses/scr_dump.c
+++ b/pdcurses/scr_dump.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: scr_dump.c,v 1.16 2006/08/20 21:48:36 wmcbrine Exp $");
+RCSID("$Id: scr_dump.c,v 1.17 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/scroll.c b/pdcurses/scroll.c
index cd21e5f7..12d188c5 100644
--- a/pdcurses/scroll.c
+++ b/pdcurses/scroll.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: scroll.c,v 1.22 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: scroll.c,v 1.23 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/slk.c b/pdcurses/slk.c
index f7fc946d..e85eb0df 100644
--- a/pdcurses/slk.c
+++ b/pdcurses/slk.c
@@ -15,11 +15,10 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 #include <string.h>
 
-RCSID("$Id: slk.c,v 1.29 2006/08/21 16:42:41 wmcbrine Exp $");
+RCSID("$Id: slk.c,v 1.30 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/termattr.c b/pdcurses/termattr.c
index 264bdb5c..cfb1ad37 100644
--- a/pdcurses/termattr.c
+++ b/pdcurses/termattr.c
@@ -15,12 +15,11 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 #include <string.h>
 #include <limits.h>
 
-RCSID("$Id: termattr.c,v 1.39 2006/09/25 06:34:41 wmcbrine Exp $");
+RCSID("$Id: termattr.c,v 1.40 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/terminfo.c b/pdcurses/terminfo.c
index dee3458a..5e646141 100644
--- a/pdcurses/terminfo.c
+++ b/pdcurses/terminfo.c
@@ -15,10 +15,10 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
+#include <curspriv.h>
 #include <term.h>
 
-RCSID("$Id: terminfo.c,v 1.25 2006/08/20 21:48:36 wmcbrine Exp $");
+RCSID("$Id: terminfo.c,v 1.26 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/touch.c b/pdcurses/touch.c
index 689907ee..c5097e43 100644
--- a/pdcurses/touch.c
+++ b/pdcurses/touch.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: touch.c,v 1.18 2006/08/20 21:48:36 wmcbrine Exp $");
+RCSID("$Id: touch.c,v 1.19 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/util.c b/pdcurses/util.c
index bd6986f7..5cdd2b3f 100644
--- a/pdcurses/util.c
+++ b/pdcurses/util.c
@@ -15,10 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 
-RCSID("$Id: util.c,v 1.49 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: util.c,v 1.50 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/pdcurses/window.c b/pdcurses/window.c
index 9f3631cc..374bb348 100644
--- a/pdcurses/window.c
+++ b/pdcurses/window.c
@@ -15,11 +15,10 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#include <curses.h>
+#include <curspriv.h>
 #include <stdlib.h>
 
-RCSID("$Id: window.c,v 1.39 2006/09/24 21:22:33 wmcbrine Exp $");
+RCSID("$Id: window.c,v 1.40 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/win32/bccwin32.mak b/win32/bccwin32.mak
index d9e34739..045fa7e3 100644
--- a/win32/bccwin32.mak
+++ b/win32/bccwin32.mak
@@ -23,7 +23,7 @@ O = obj
 !include $(PDCURSES_HOME)\version.mif
 !include $(PDCURSES_HOME)\libobjs.mif
 
-osdir		= $(PDCURSES_HOME)/win32
+osdir		= $(PDCURSES_HOME)\win32
 
 CC		= bcc32 -q
 
diff --git a/win32/gccwin32.mak b/win32/gccwin32.mak
index 34fb2f98..d849a766 100644
--- a/win32/gccwin32.mak
+++ b/win32/gccwin32.mak
@@ -25,6 +25,8 @@ include $(PDCURSES_HOME)/libobjs.mif
 
 osdir		= $(PDCURSES_HOME)/win32
 
+PDCURSES_WIN_H	= $(osdir)/pdcwin.h
+
 CC		= gcc
 
 ifeq ($(DEBUG),Y)
@@ -73,6 +75,7 @@ $(LIBPANEL) : $(PANOBJS)
 	$(LIBEXE) $(LIBFLAGS) $@ $(PANOBJS)
 
 $(LIBOBJS) $(PDCOBJS) $(PANOBJS) : $(PDCURSES_HEADERS)
+$(PDCOBJS) : $(PDCURSES_WIN_H)
 $(PANOBJS) : $(PANEL_HEADER)
 $(DEMOS) : $(PDCURSES_CURSES_H) $(LIBCURSES)
 terminfo.o: $(TERM_HEADER)
@@ -96,13 +99,13 @@ ptest.exe: $(demodir)/ptest.c $(PANEL_HEADER) $(LIBPANEL)
 	$(CC) $(CCFLAGS) -o$@ $< $(LIBCURSES) $(LIBPANEL)
 
 tuidemo.exe: tuidemo.o tui.o
-	$(LINK) $(LDFLAGS) -o tuidemo.exe tuidemo.o tui.o $(LIBCURSES)
+	$(LINK) $(LDFLAGS) -o$@ tuidemo.o tui.o $(LIBCURSES)
 
 tui.o: $(demodir)/tui.c $(demodir)/tui.h $(PDCURSES_CURSES_H)
-	$(CC) -c $(CCFLAGS) -I$(demodir) -o $@ $<
+	$(CC) -c $(CCFLAGS) -I$(demodir) -o$@ $<
 
 tuidemo.o: $(demodir)/tuidemo.c $(PDCURSES_CURSES_H)
-	$(CC) -c $(CCFLAGS) -I$(demodir) -o $@ $<
+	$(CC) -c $(CCFLAGS) -I$(demodir) -o$@ $<
 
 #------------------------------------------------------------------------
 
diff --git a/win32/lccwin32.mak b/win32/lccwin32.mak
index f634de26..19c8244c 100644
--- a/win32/lccwin32.mak
+++ b/win32/lccwin32.mak
@@ -28,6 +28,8 @@ osdir		= $(PDCURSES_HOME)\win32
 pandir		= $(PDCURSES_HOME)\panel
 demodir		= $(PDCURSES_HOME)\demos
 
+PDCURSES_WIN_H	= $(osdir)\pdcwin.h
+
 CC		= lcc
 
 #CFLAGS		= -c -g3 -A -ansic
@@ -89,6 +91,7 @@ DEMOOBJS = testcurs.obj newdemo.obj xmas.obj tuidemo.obj tui.obj \
 firework.obj ptest.obj rain.obj worm.obj
 
 $(LIBOBJS) $(PDCOBJS) $(PANOBJS) : $(PDCURSES_HEADERS)
+$(PDCOBJS) : $(PDCURSES_WIN_H)
 $(PANOBJS) ptest.obj: $(PANEL_HEADER)
 terminfo.obj: $(TERM_HEADER)
 
diff --git a/win32/mingwin32.mak b/win32/mingwin32.mak
index 91afdec4..b9fb9637 100644
--- a/win32/mingwin32.mak
+++ b/win32/mingwin32.mak
@@ -25,6 +25,8 @@ include $(PDCURSES_HOME)/libobjs.mif
 
 osdir		= $(PDCURSES_HOME)/win32
 
+PDCURSES_WIN_H	= $(osdir)/pdcwin.h
+
 CC		= gcc
 
 ifeq ($(DEBUG),Y)
@@ -73,6 +75,7 @@ $(LIBPANEL) : $(PANOBJS)
 	$(LIBEXE) $(LIBFLAGS) $@ $(PANOBJS)
 
 $(LIBOBJS) $(PDCOBJS) $(PANOBJS) : $(PDCURSES_HEADERS)
+$(PDCOBJS) : $(PDCURSES_WIN_H)
 $(PANOBJS) : $(PANEL_HEADER)
 $(DEMOS) : $(PDCURSES_CURSES_H) $(LIBCURSES)
 terminfo.o: $(TERM_HEADER)
@@ -96,13 +99,13 @@ ptest.exe: $(demodir)/ptest.c $(PANEL_HEADER) $(LIBPANEL)
 	$(CC) $(CCFLAGS) -o$@ $< $(LIBCURSES) $(LIBPANEL)
 
 tuidemo.exe: tuidemo.o tui.o
-	$(LINK) $(LDFLAGS) -o tuidemo.exe tuidemo.o tui.o $(LIBCURSES)
+	$(LINK) $(LDFLAGS) -o$@ tuidemo.o tui.o $(LIBCURSES)
 
 tui.o: $(demodir)/tui.c $(demodir)/tui.h $(PDCURSES_CURSES_H)
-	$(CC) -c $(CCFLAGS) -I$(demodir) -o $@ $<
+	$(CC) -c $(CCFLAGS) -I$(demodir) -o$@ $<
 
 tuidemo.o: $(demodir)/tuidemo.c $(PDCURSES_CURSES_H)
-	$(CC) -c $(CCFLAGS) -I$(demodir) -o $@ $<
+	$(CC) -c $(CCFLAGS) -I$(demodir) -o$@ $<
 
 #------------------------------------------------------------------------
 
diff --git a/win32/pdcclip.c b/win32/pdcclip.c
index e9069e41..c2e96ac4 100644
--- a/win32/pdcclip.c
+++ b/win32/pdcclip.c
@@ -15,16 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#ifdef PDC_WIDE
-# define UNICODE
-#endif
+#include "pdcwin.h"
 
-#include <windows.h>
-#undef MOUSE_MOVED
-#define	CURSES_LIBRARY 1
-#include <curses.h>
-
-RCSID("$Id: pdcclip.c,v 1.18 2006/08/13 00:05:39 wmcbrine Exp $");
+RCSID("$Id: pdcclip.c,v 1.19 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/win32/pdcdisp.c b/win32/pdcdisp.c
index 9b6ca9dc..4f502b81 100644
--- a/win32/pdcdisp.c
+++ b/win32/pdcdisp.c
@@ -15,20 +15,12 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#ifdef PDC_WIDE
-# define UNICODE
-#endif
+#include "pdcwin.h"
 
-#include <windows.h>
-#undef MOUSE_MOVED
-#define CURSES_LIBRARY 1
-#include <curses.h>
 #include <stdlib.h>
 #include <string.h>
 
-extern HANDLE hConOut;
-
-RCSID("$Id: pdcdisp.c,v 1.35 2006/08/11 19:50:51 wmcbrine Exp $");
+RCSID("$Id: pdcdisp.c,v 1.36 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/win32/pdcgetsc.c b/win32/pdcgetsc.c
index 36834092..dcfe72d1 100644
--- a/win32/pdcgetsc.c
+++ b/win32/pdcgetsc.c
@@ -15,18 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#ifdef PDC_WIDE
-# define UNICODE
-#endif
+#include "pdcwin.h"
 
-#include <windows.h>
-#undef MOUSE_MOVED
-#define	CURSES_LIBRARY 1
-#include <curses.h>
-
-RCSID("$Id: pdcgetsc.c,v 1.26 2006/08/11 22:10:36 wmcbrine Exp $");
-
-extern HANDLE hConOut, hConIn;
+RCSID("$Id: pdcgetsc.c,v 1.27 2006/10/08 20:54:30 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/win32/pdckbd.c b/win32/pdckbd.c
index 6844254f..d876bcf6 100644
--- a/win32/pdckbd.c
+++ b/win32/pdckbd.c
@@ -15,16 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#ifdef PDC_WIDE
-# define UNICODE
-#endif
+#include "pdcwin.h"
 
-#include <windows.h>
-#undef MOUSE_MOVED
-#define CURSES_LIBRARY 1
-#include <curses.h>
-
-RCSID("$Id: pdckbd.c,v 1.64 2006/09/25 19:23:02 wmcbrine Exp $");
+RCSID("$Id: pdckbd.c,v 1.65 2006/10/08 20:54:30 wmcbrine Exp $");
 
 #define ACTUAL_MOUSE_MOVED	  (actual_mouse_status.changes & 8)
 #define ACTUAL_BUTTON_STATUS(x)   (actual_mouse_status.button[(x) - 1])
@@ -65,8 +58,6 @@ RCSID("$Id: pdckbd.c,v 1.64 2006/09/25 19:23:02 wmcbrine Exp $");
 static INPUT_RECORD save_ip;
 unsigned long pdc_key_modifiers = 0L;
 
-extern HANDLE hConIn;
-
 static int keyCount = 0;
 
 static void win32_getch(void);
diff --git a/win32/pdcscrn.c b/win32/pdcscrn.c
index 279bf9c8..33dc7127 100644
--- a/win32/pdcscrn.c
+++ b/win32/pdcscrn.c
@@ -15,16 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#ifdef PDC_WIDE
-# define UNICODE
-#endif
+#include "pdcwin.h"
 
-#include <windows.h>
-#undef MOUSE_MOVED
-#define CURSES_LIBRARY 1
-#include <curses.h>
-
-RCSID("$Id: pdcscrn.c,v 1.61 2006/09/27 07:21:27 wmcbrine Exp $");
+RCSID("$Id: pdcscrn.c,v 1.62 2006/10/08 20:54:30 wmcbrine Exp $");
 
 #define PDC_RESTORE_NONE     0
 #define PDC_RESTORE_BUFFER   1
@@ -38,8 +31,6 @@ static CONSOLE_SCREEN_BUFFER_INFO orig_scr;
 static CHAR_INFO *ciSaveBuffer = NULL;
 static DWORD dwConsoleMode = 0;
 
-extern int PDC_get_buffer_rows(void);
-
 /*man-start**************************************************************
 
   PDC_scr_close() - Internal low-level binding to close the physical screen
diff --git a/win32/pdcsetsc.c b/win32/pdcsetsc.c
index bcf0c51c..6765f7c6 100644
--- a/win32/pdcsetsc.c
+++ b/win32/pdcsetsc.c
@@ -15,18 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#ifdef PDC_WIDE
-# define UNICODE
-#endif
+#include "pdcwin.h"
 
-#include <windows.h>
-#undef MOUSE_MOVED
-#define CURSES_LIBRARY 1
-#include <curses.h>
-
-RCSID("$Id: pdcsetsc.c,v 1.28 2006/08/17 22:05:41 wmcbrine Exp $");
-
-extern HANDLE hConOut;
+RCSID("$Id: pdcsetsc.c,v 1.29 2006/10/08 20:54:30 wmcbrine Exp $");
 
 int PDC_curs_set(int visibility)
 {
diff --git a/win32/pdcutil.c b/win32/pdcutil.c
index 8741c479..b419d1ce 100644
--- a/win32/pdcutil.c
+++ b/win32/pdcutil.c
@@ -15,23 +15,18 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#ifdef PDC_WIDE
-# define UNICODE
-#endif
+#include "pdcwin.h"
 
-#include <windows.h>
-#undef MOUSE_MOVED
-#define CURSES_LIBRARY 1
-#include <curses.h>
-
-RCSID("$Id: pdcutil.c,v 1.7 2006/09/25 06:34:41 wmcbrine Exp $");
+RCSID("$Id: pdcutil.c,v 1.8 2006/10/08 20:54:30 wmcbrine Exp $");
 
 void PDC_beep(void)
 {
 	PDC_LOG(("PDC_beep() - called\n"));
 
+	fflush(stdout);
 /*	MessageBeep(MB_OK); */
 	MessageBeep(0XFFFFFFFF);
+	fflush(stdout);
 }
 
 void PDC_napms(int ms)
diff --git a/win32/vcwin32.mak b/win32/vcwin32.mak
index 2e3d44f7..d63fcc01 100644
--- a/win32/vcwin32.mak
+++ b/win32/vcwin32.mak
@@ -25,6 +25,8 @@ O = obj
 
 osdir		= $(PDCURSES_HOME)\win32
 
+PDCURSES_WIN_H	= $(osdir)\pdcwin.h
+
 CC		= cl.exe -nologo
 
 !ifdef DEBUG
@@ -41,9 +43,9 @@ CPPFLAGS	= -I$(PDCURSES_HOME) #-DPDC_WIDE
 
 LINK		= link.exe -nologo
 
-CCLIBS		= user32.lib
+CCLIBS		= user32.lib advapi32.lib
 # may need to add msvcrt.lib for VC 2.x, VC 5.0 doesn't want it
-#CCLIBS		= msvcrt.lib user32.lib
+#CCLIBS		= msvcrt.lib user32.lib advapi32.lib
 
 LIBEXE		= lib -nologo
 
@@ -76,6 +78,7 @@ clean:
 DEMOOBJS = $(DEMOS:.exe=.obj) tui.obj
 
 $(LIBOBJS) $(PDCOBJS) $(PANOBJS) : $(PDCURSES_HEADERS)
+$(PDCOBJS) : $(PDCURSES_WIN_H)
 $(DEMOOBJS) : $(PDCURSES_CURSES_H)
 $(PANOBJS) : $(PANEL_HEADER)
 terminfo.obj: $(TERM_HEADER)
diff --git a/x11/pdcx11.h b/x11/pdcx11.h
index 8c15b58f..112ba00c 100644
--- a/x11/pdcx11.h
+++ b/x11/pdcx11.h
@@ -15,9 +15,8 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-/* $Id: pdcx11.h,v 1.52 2006/09/27 07:21:27 wmcbrine Exp $ */
+/* $Id: pdcx11.h,v 1.53 2006/10/08 20:54:30 wmcbrine Exp $ */
 
-#define	CURSES_LIBRARY 1
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -81,7 +80,7 @@
 # include <Xlocale.h>
 #endif
 
-#include <curses.h>
+#include <curspriv.h>
 
 #define XCURSCR_Y_SIZE      (XCursesLINES * XCursesCOLS * sizeof(chtype))
 #define XCURSCR_FLAG_SIZE   (XCursesLINES * sizeof(int))