diff --git a/curses.h b/curses.h
index 5e610a97..ac7ffc08 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.130 2006/02/21 17:20:17 wmcbrine Exp $ */
+/* $Id: curses.h,v 1.131 2006/02/22 05:25:19 wmcbrine Exp $ */
 
 /* ----------------------------------------------------------------------
 				PDCurses
@@ -33,10 +33,10 @@ complicated set of #if defined() or #ifdefs.
 
 PDCurses definitions list:  (Only define those needed)
 
-	REGISTERWINDOWS True for auto window update registery.
 	DOS		True if compiling for DOS.
 	OS2		True if compiling for OS/2.
 	WIN32		True if compiling for Windows.
+	XCURSES		True if compiling for X11.
 	HC		True if using a Metaware compiler.
 	TC		True if using a Borland compiler.
 	MSC		True if using a Microsoft compiler.
@@ -512,6 +512,7 @@ typedef struct
  *	PDCurses Structure Definitions:
  *
  */
+
 typedef struct _win		/* definition of a window	*/
 {
 	int	_cury;		/* current pseudo-cursor	*/
@@ -570,25 +571,6 @@ typedef struct _win		/* definition of a window	*/
 *
 */
 
-#ifdef	REGISTERWINDOWS
-typedef struct _ref		/* Refresh Window Structure	*/
-{
-	WINDOW	*win;
-struct	_ref	*next;
-struct	_ref	*tail;
-} ACTIVE;
-
-typedef struct _wins
-{
-	WINDOW		*w;	/* pointer to a visible window	*/
-	struct _wins	*next;	/* Next visible window pointer	*/
-	struct _wins	*prev;	/* Next visible window pointer	*/
-	struct _wins	*tail;	/* Last visible window pointer	*/
-				/* Only head window (stdscr)
-				   has a valid tail pointer.	*/
-} WINDS;
-#endif
-
 typedef struct			/* structure for ripped off lines */
 {
 	int line;
@@ -669,7 +651,7 @@ typedef struct
 	unsigned long os_version;	/* Win32 Version		*/
 #endif
 
-#if defined (XCURSES)
+#if defined(XCURSES)
 	int	XcurscrSize;	/* size of Xcurscr shared memory block	*/
 	bool	sb_on;
 	int	sb_viewport_y;
@@ -679,12 +661,6 @@ typedef struct
 	int	sb_cur_y;
 	int	sb_cur_x;
 #endif
-
-#ifdef	REGISTERWINDOWS
-	WINDS	*visible;	/* List of visible windows		*/
-	bool	refreshall;	/* Refresh all registered windows?	*/
-#endif
-
 	short	line_color;	/* Color of line attributes - default white */
 
 } SCREEN;
@@ -728,10 +704,6 @@ extern	int		COLORS, COLOR_PAIRS;
 extern	int		_default_lines;	/* For presetting maximum lines	*/
 #endif
 
-#ifdef REGISTERWINDOWS
-extern	ACTIVE		*CurWins;	/* Currently Visible Windows	*/
-#endif
-
 
 
 /*man-start*********************************************************************
diff --git a/curspriv.h b/curspriv.h
index 99b57673..6a62695d 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.37 2006/02/21 07:05:43 wmcbrine Exp $ */
+/* $Id: curspriv.h,v 1.38 2006/02/22 05:25:19 wmcbrine Exp $ */
 
 /*                         CURSPRIV.H
 
@@ -306,14 +306,6 @@ void PDC_debug(char *, ...);
 # define PDC_LOG(x)
 #endif
 
-#ifdef REGISTERWINDOWS
-bool		PDC_inswin(WINDOW *, WINDOW *);
-int		PDC_addtail(WINDOW *);
-int		PDC_addwin(WINDOW *, WINDOW *);
-int		PDC_rmwin(WINDOW *);
-WINDS *		PDC_findwin(WINDOW *);
-#endif
-
 #define PDC_COLORS		8
 
 /* Internal macros for attributes */
diff --git a/pdcurses/initscr.c b/pdcurses/initscr.c
index 58ead297..f8d8700c 100644
--- a/pdcurses/initscr.c
+++ b/pdcurses/initscr.c
@@ -43,7 +43,7 @@
 
 #ifdef PDCDEBUG
 const char *rcsid_initscr =
-	"$Id: initscr.c,v 1.34 2006/02/21 04:21:13 wmcbrine Exp $";
+	"$Id: initscr.c,v 1.35 2006/02/22 05:25:19 wmcbrine Exp $";
 #endif
 
 const char *_curses_notice = "PDCurses 2.8 - Public Domain 2006";
@@ -298,11 +298,6 @@ WINDOW *Xinitscr(int argc, char *argv[])
 
 	curscr->_clear = FALSE;
 
-#ifdef REGISTERWINDOWS
-	SP->refreshall = FALSE;
-	_inswin(stdscr, (WINDOW *)NULL);
-#endif
-
 	PDC_init_atrtab();	/* set up default colors */
 
 #ifdef EMXVIDEO
diff --git a/pdcurses/refresh.c b/pdcurses/refresh.c
index 3d6b200e..23769900 100644
--- a/pdcurses/refresh.c
+++ b/pdcurses/refresh.c
@@ -40,7 +40,7 @@
 
 #ifdef PDCDEBUG
 const char *rcsid_refresh =
-	"$Id: refresh.c,v 1.18 2006/02/16 22:59:49 wmcbrine Exp $";
+	"$Id: refresh.c,v 1.19 2006/02/22 05:25:19 wmcbrine Exp $";
 #endif
 
 /*man-start*********************************************************************
@@ -208,9 +208,7 @@ int wnoutrefresh(WINDOW *win)
 int doupdate(void)
 {
 	int i;
-#ifdef REGISTERWINDOWS
-	WINDS *next = SP->visible;
-#endif
+
 	PDC_LOG(("doupdate() - called\n"));
 
 	if (isendwin())			/* coming back after endwin() called */
@@ -220,23 +218,6 @@ int doupdate(void)
 		SP->alive = TRUE;	/* so isendwin() result is correct */
 	}
 
-#ifdef REGISTERWINDOWS
-	if (SP->refreshall)
-	{
-		while (next != NULL)
-		{
-			if (next->w->_parent != NULL)
-			{
-				touchwin(next->w->_parent);
-				wnoutrefresh(next->w->_parent);
-			}
-			touchwin(next->w);
-			wnoutrefresh(next->w);
-			next = next->next;
-		}
-	}
-#endif
-
 	if (SP->shell)
 		reset_prog_mode();
 
diff --git a/pdcurses/window.c b/pdcurses/window.c
index 4163ce85..2e9be5c1 100644
--- a/pdcurses/window.c
+++ b/pdcurses/window.c
@@ -47,7 +47,7 @@
 
 #ifdef PDCDEBUG
 const char *rcsid_window =
-	"$Id: window.c,v 1.20 2006/02/16 22:59:49 wmcbrine Exp $";
+	"$Id: window.c,v 1.21 2006/02/22 05:25:19 wmcbrine Exp $";
 #endif
 
 /*man-start*********************************************************************
@@ -219,9 +219,6 @@ int delwin(WINDOW *win)
 	if (win == (WINDOW *)NULL)
 		return ERR;
 
-#ifdef	REGISTERWINDOWS
-	_rmwin(win);		/* remove from the visible windows list */
-#endif
 	/* subwindows use parents' lines */
 
 	if (!(win->_flags & (_SUBWIN|_SUBPAD)))