diff --git a/demos/firework.c b/demos/firework.c
index eb650954..862994c9 100644
--- a/demos/firework.c
+++ b/demos/firework.c
@@ -28,7 +28,7 @@
 
 #ifdef PDCDEBUG
 const char *rcsid_firework =
-	"$Id: firework.c,v 1.17 2006/02/05 23:54:31 wmcbrine Exp $";
+	"$Id: firework.c,v 1.18 2006/02/13 17:18:05 wmcbrine Exp $";
 #endif
 
 void myrefresh(void);
@@ -95,9 +95,7 @@ int main(int argc, char **argv)
 	}
 
 	endwin();
-#ifdef XCURSES
-	XCursesExit();
-#endif
+
 	return 0;
 }
 
diff --git a/demos/ncurses_cfg.h b/demos/ncurses_cfg.h
index 23ccf3f6..b74ef25e 100644
--- a/demos/ncurses_cfg.h
+++ b/demos/ncurses_cfg.h
@@ -14,11 +14,7 @@
 #include "../config.h"
 #include <curses.h>
 
-#ifdef XCURSES
-# define ExitProgram XCursesExit(),exit
-#else
-# define ExitProgram exit
-#endif
+#define ExitProgram exit
 
 #define HAVE_GETNSTR 1
 #define HAVE_GETTIMEOFDAY 1
diff --git a/demos/newdemo.c b/demos/newdemo.c
index 71ee911b..673c7408 100644
--- a/demos/newdemo.c
+++ b/demos/newdemo.c
@@ -32,7 +32,7 @@
 
 #ifdef PDCDEBUG
 const char *rcsid_newdemo =
-	"$Id: newdemo.c,v 1.23 2006/02/10 19:06:22 wmcbrine Exp $";
+	"$Id: newdemo.c,v 1.24 2006/02/13 17:18:05 wmcbrine Exp $";
 #endif
 
 int WaitForUser(void);
@@ -226,9 +226,7 @@ void trap(int sig)
 	if (sig == SIGINT)
 	{
 		endwin();
-#ifdef XCURSES
-		XCursesExit();
-#endif
+
 		exit(0);
 	}
 }
@@ -270,9 +268,7 @@ int main(int argc, char **argv)
 	if (win == NULL)
 	{
 		endwin();
-#ifdef XCURSES
-		XCursesExit();
-#endif
+
 		return 1;
 	}
 
@@ -439,9 +435,7 @@ int main(int argc, char **argv)
 	}
 
 	endwin();
-#ifdef XCURSES
-	XCursesExit();
-#endif
+
 	return 0;
 }
 
diff --git a/demos/ptest.c b/demos/ptest.c
index cafa90e6..3a052f9a 100644
--- a/demos/ptest.c
+++ b/demos/ptest.c
@@ -22,7 +22,7 @@
 
 #ifdef PDCDEBUG
 const char *rcsid_ptest =
-	"$Id: ptest.c,v 1.16 2006/02/05 23:54:31 wmcbrine Exp $";
+	"$Id: ptest.c,v 1.17 2006/02/13 17:18:05 wmcbrine Exp $";
 #endif
 
 #include <curses.h>
@@ -324,9 +324,7 @@ int main(int argc, char **argv)
 	}
 
 	endwin();
-#ifdef XCURSES
-	XCursesExit();
-#endif
+
 	return 0;
 }	/* end of main */
 
diff --git a/demos/testcurs.c b/demos/testcurs.c
index b709d131..362756d0 100644
--- a/demos/testcurs.c
+++ b/demos/testcurs.c
@@ -28,7 +28,7 @@
 #ifdef PDCDEBUG
 # define CURSES_LIBRARY /* needed for the prototype of PDC_debug */
 const char *rcsid_testcurs =
-	"$Id: testcurs.c,v 1.34 2006/02/05 23:54:31 wmcbrine Exp $";
+	"$Id: testcurs.c,v 1.35 2006/02/13 17:18:05 wmcbrine Exp $";
 #endif
 
 #include <stdio.h>
@@ -179,9 +179,6 @@ int main(int argc, char *argv[])
 	delwin(win);
 	endwin();
 
-#ifdef XCURSES
-	XCursesExit();
-#endif
 	return 0;
 }
 
diff --git a/demos/tui.c b/demos/tui.c
index 0a2bd507..89d20740 100644
--- a/demos/tui.c
+++ b/demos/tui.c
@@ -37,7 +37,7 @@ void rmerror(void);
 
 #ifdef PDCDEBUG
 const char *rcsid_tui =
-	"$Id: tui.c,v 1.16 2006/02/05 23:54:31 wmcbrine Exp $";
+	"$Id: tui.c,v 1.17 2006/02/13 17:18:05 wmcbrine Exp $";
 #endif
 
 #if defined(__unix) && !defined(__DJGPP__)
@@ -394,9 +394,6 @@ static void cleanup(void)	/* cleanup curses settings */
 		delwin(wstat);
 		normalcursor();
 		endwin();
-#ifdef XCURSES
-		XCursesExit();
-#endif
 		incurses = FALSE;
 	}
 }
diff --git a/demos/xmas.c b/demos/xmas.c
index bfc37c3e..cca8e346 100644
--- a/demos/xmas.c
+++ b/demos/xmas.c
@@ -96,7 +96,7 @@
 
 #ifdef PDCDEBUG
 const char *rcsid_xmas =
-	"$Id: xmas.c,v 1.17 2006/02/05 23:54:31 wmcbrine Exp $";
+	"$Id: xmas.c,v 1.18 2006/02/13 17:18:05 wmcbrine Exp $";
 #endif
 
 /* NOMACROS makes a big difference in the size with PDCurses */
@@ -628,9 +628,6 @@ int main(int argc, char **argv)
 	clear();
 	refresh();
 	endwin();
-#ifdef XCURSES
-	XCursesExit();
-#endif
 
 	return 0;
 }