diff --git a/config.h.in b/config.h.in
index 9a9c1517..0ef7556a 100644
--- a/config.h.in
+++ b/config.h.in
@@ -116,8 +116,5 @@
 /* Define if you want to build XCurses with threads */
 #undef USE_THREADS
 
-/* Define if you want to build XCurses with processes */
-#undef USE_PROCESSES
-
 /* Define XPointer is typedefed in X11/Xlib.h */
 #undef XPOINTER_TYPEDEFED
diff --git a/configure b/configure
index d0ca42cf..3e292ecf 100755
--- a/configure
+++ b/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os SYS_DEFS RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP MH_EXTRA_LIBS LIBOBJS MH_XINC_DIR MH_XLIBS x11type PURIFY SHLPST MODPST EEXTRA CEXTRA OSAVE OBJ EXE GETOPT DYN_COMP SHLIBS LD_RXLIB1 LD_RXTRANSLIB1 SHLPRE LIBPST LIBPRE LIBEXE LIBFLAGS DYNAMIC_LDFLAGS STATIC_LDFLAGS SHL_TARGETS O2SAVE O2SHO CC2O BASE_INSTALL OTHER_INSTALLS BASE_BINARY SAVE2O RXPACKEXPORTS RXPACKEXP CAN_USE_ABI LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os SYS_DEFS RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP MH_EXTRA_LIBS LIBOBJS MH_XINC_DIR MH_XLIBS PURIFY SHLPST MODPST EEXTRA CEXTRA OSAVE OBJ EXE GETOPT DYN_COMP SHLIBS LD_RXLIB1 LD_RXTRANSLIB1 SHLPRE LIBPST LIBPRE LIBEXE LIBFLAGS DYNAMIC_LDFLAGS STATIC_LDFLAGS SHL_TARGETS O2SAVE O2SHO CC2O BASE_INSTALL OTHER_INSTALLS BASE_BINARY SAVE2O RXPACKEXPORTS RXPACKEXP CAN_USE_ABI LTLIBOBJS'
 ac_subst_files='aix_exports'
 
 # Initialize some variables set by options.
@@ -5265,13 +5265,6 @@ _ACEOF
 
 fi
 
-	cat >>confdefs.h <<\_ACEOF
-#define USE_PROCESSES 1
-_ACEOF
-
-	x11type="process"
-
-
 # Check whether --enable-purify or --disable-purify was given.
 if test "${enable_purify+set}" = set; then
   enableval="$enable_purify"
@@ -5509,7 +5502,7 @@ echo "$as_me:$LINENO: checking compiler flags for a dynamic object" >&5
 echo $ECHO_N "checking compiler flags for a dynamic object... $ECHO_C" >&6
 
 cat > conftest.$ac_ext <<EOF
-#line 5512 "configure"
+#line 5505 "configure"
 int a=0
 EOF
 
@@ -5548,7 +5541,7 @@ echo "${ECHO_T}none of $mh_cv_flags supported" >&6
 
 mh_compile='${CC-cc} -c $DYN_COMP conftest.$ac_ext 1>&5'
 cat > conftest.$ac_ext <<EOF
-#line 5551 "configure"
+#line 5544 "configure"
 int foo()
 {
 return(0);
@@ -6319,7 +6312,6 @@ s,@MH_EXTRA_LIBS@,$MH_EXTRA_LIBS,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@MH_XINC_DIR@,$MH_XINC_DIR,;t t
 s,@MH_XLIBS@,$MH_XLIBS,;t t
-s,@x11type@,$x11type,;t t
 s,@PURIFY@,$PURIFY,;t t
 s,@SHLPST@,$SHLPST,;t t
 s,@MODPST@,$MODPST,;t t
diff --git a/configure.ac b/configure.ac
index 2868b12b..f61efa02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,23 +157,6 @@ if test "$with_latin1" = yes; then
 	AC_DEFINE(INCLUDE_LATIN1)
 fi
 
-dnl ----------------- check for thread support -----------------------
-dnl ----------------- REMOVE TEMPORARILY -----------------------------
-dnl allow --with-threads to build with threads
-dnl AC_ARG_WITH(threads,
-dnl 	[  --with-threads          build XCurses with threads],
-dnl 	[with_threads=$withval],
-dnl 	[with_threads=no],
-dnl )
-dnl if test "$with_threads" = yes; then
-dnl 	AC_DEFINE(USE_THREADS)
-dnl 	x11type="thread"
-dnl else
-	AC_DEFINE(USE_PROCESSES)
-	x11type="process"
-dnl fi
-AC_SUBST(x11type)
-
 dnl ----------------- check for Purify support -----------------------
 dnl allow --enable-purify to enable linking with Purify
 AC_ARG_ENABLE(purify,
diff --git a/pdcurses/Makefile.aix.in b/pdcurses/Makefile.aix.in
index 956868b5..4562727c 100644
--- a/pdcurses/Makefile.aix.in
+++ b/pdcurses/Makefile.aix.in
@@ -10,8 +10,8 @@ THIS		= Makefile
 @SET_MAKE@
 
 srcdir		= @srcdir@
-x11basedir		= $(srcdir)/../x11
-x11dir		= $(x11basedir)/@x11type@
+x11basedir	= $(srcdir)/../x11
+x11dir		= $(x11basedir)/process
 
 VPATH		= @srcdir@
 prefix		= @prefix@
@@ -20,28 +20,28 @@ libdir		= $(exec_prefix)
 includedir	= @includedir@
 
 PDCURSES_HOME		=$(srcdir)/..
-PDCURSES_CONFIG_H		=../config.h
-PDCURSES_CURSES_H		=$(PDCURSES_HOME)/curses.h
-PDCURSES_CURSPRIV_H		=$(PDCURSES_HOME)/curspriv.h
-PDCURSES_HEADERS		=$(PDCURSES_CONFIG_H) $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
+PDCURSES_CONFIG_H	=../config.h
+PDCURSES_CURSES_H	=$(PDCURSES_HOME)/curses.h
+PDCURSES_CURSPRIV_H	=$(PDCURSES_HOME)/curspriv.h
+PDCURSES_HEADERS	=$(PDCURSES_CONFIG_H) $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
 PDCURSES_X11_H		=$(x11basedir)/pdcx11.h
 
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
 
-SHL_TARGETS =      @SHL_TARGETS@
-DYN_COMP =         @DYN_COMP@
-SHLPRE =           @SHLPRE@
-SHLPST =           @SHLPST@
-LD_RXLIB1  =       @LD_RXLIB1@
-LD_RXLIB2  =       # @MH_XLIBS@ @MH_EXTRA_LIBS@ -lc
-MH_XLIBS =         @MH_XLIBS@
-MH_EXTRA_LIBS =    @MH_EXTRA_LIBS@
-O2SAVE  =          @O2SAVE@
-O2SHO  =           @O2SHO@
-CC2O   =           @CC2O@
-SAVE2O  =          @SAVE2O@
-DYNAMIC_LDFLAGS  = @DYNAMIC_LDFLAGS@ $(EEXTRA)
+SHL_TARGETS	= @SHL_TARGETS@
+DYN_COMP	= @DYN_COMP@
+SHLPRE		= @SHLPRE@
+SHLPST		= @SHLPST@
+LD_RXLIB1	= @LD_RXLIB1@
+LD_RXLIB2	= # @MH_XLIBS@ @MH_EXTRA_LIBS@ -lc
+MH_XLIBS	= @MH_XLIBS@
+MH_EXTRA_LIBS	= @MH_EXTRA_LIBS@
+O2SAVE		= @O2SAVE@
+O2SHO		= @O2SHO@
+CC2O		= @CC2O@
+SAVE2O		= @SAVE2O@
+DYNAMIC_LDFLAGS = @DYNAMIC_LDFLAGS@ $(EEXTRA)
 
 CC		= @CC@
 CFLAGS		= @CFLAGS@ $(DYN_COMP)
diff --git a/pdcurses/Makefile.in b/pdcurses/Makefile.in
index e27a8ab5..e9e0582d 100644
--- a/pdcurses/Makefile.in
+++ b/pdcurses/Makefile.in
@@ -11,7 +11,7 @@ THIS		= Makefile
 
 srcdir		= @srcdir@
 x11basedir	= $(srcdir)/../x11
-x11dir		= $(x11basedir)/@x11type@
+x11dir		= $(x11basedir)/process
 
 VPATH		= @srcdir@
 prefix		= @prefix@
diff --git a/x11/pdcx11.h b/x11/pdcx11.h
index 9acad4ae..a390d84e 100644
--- a/x11/pdcx11.h
+++ b/x11/pdcx11.h
@@ -3,7 +3,7 @@
  * Hessling 1994-1999. M.Hessling@qut.edu.au				*
  ************************************************************************/
 
-/* $Id: pdcx11.h,v 1.23 2006/03/22 11:59:53 wmcbrine Exp $ */
+/* $Id: pdcx11.h,v 1.24 2006/03/22 14:05:29 wmcbrine Exp $ */
 
 #define	CURSES_LIBRARY 1
 #ifdef HAVE_CONFIG_H
@@ -18,23 +18,19 @@
 #include <ctype.h>
 #include <pwd.h>
 
-/* #includes specific to running XCurses with seperate processes */
-
-#ifdef USE_PROCESSES
-# include <sys/types.h>
-# include <sys/socket.h>
-# ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-# endif
-# ifdef HAVE_SYS_SELECT_H
-#  include <sys/select.h>   /* AIX needs this for FD_ZERO etc macros */
-# endif
-# include <sys/ipc.h>
-# include <sys/shm.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
 #endif
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>   /* AIX needs this for FD_ZERO etc macros */
+#endif
+#include <sys/ipc.h>
+#include <sys/shm.h>
 
 #if !defined(XPOINTER_TYPEDEFED)
- typedef char * XPointer;
+typedef char * XPointer;
 #endif
 
 #ifdef TIME_WITH_SYS_TIME
@@ -112,8 +108,8 @@
 
 #define XtCNormalFont    "NormalFont"
 #define XtNnormalFont    "normalFont"
-#define XtCItalicFont      "ItalicFont"
-#define XtNitalicFont      "italicFont"
+#define XtCItalicFont    "ItalicFont"
+#define XtNitalicFont    "italicFont"
 
 #define XtCPointer       "Pointer"
 #define XtNpointer       "pointer"
@@ -133,8 +129,8 @@
 #define XtCScrollbarWidth   "ScrollbarWidth"
 #define XtNscrollbarWidth   "scrollbarWidth"
 
-#define XtCCursorBlinkRate   "CursorBlinkRate"
-#define XtNcursorBlinkRate   "cursorBlinkRate"
+#define XtCCursorBlinkRate  "CursorBlinkRate"
+#define XtNcursorBlinkRate  "cursorBlinkRate"
 
 #define XtCPointerForeColor "PointerForeColor"
 #define XtNpointerForeColor "pointerForeColor"