This commit was manufactured by cvs2svn to create tag 'pre-subset'.pre-subset

320 files changed, 0 insertions, 32632 deletions

diff --git a/PACE/pace/Makefile b/PACE/pace/Makefile
deleted file mode 100644
index c29a22d1cdc..00000000000
--- a/PACE/pace/Makefile
+++ /dev/null
@@ -1,498 +0,0 @@
-#----------------------------------------------------------------------------
-#       $Id$
-#
-#       Makefile for the PACE/pace C library release
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIB      = libPACE.a
-SHLIB    = libPACE.$(SOEXT)
-
-PACE_FILES = \
-  aio \
-  assert \
-  ctype \
-  dirent \
-  fcntl \
-  grp \
-  locale \
-  math \
-  mqueue \
-  pthread \
-  pwd \
-  sched \
-  semaphore \
-  setjmp \
-  signal \
-  stdio \
-  stdlib \
-  string \
-  termios \
-  time \
-  unistd \
-  utime
-CONFIG_FILES =
-SYS_FILES = \
-  sys/mman \
-  sys/socket \
-  sys/stat \
-  sys/times \
-  sys/utsname \
-  sys/wait
-
-# POSIX_SOCKET Unit of Functionality
-# pace_accept      is in sys/socket.h
-# pace_bind        is in sys/socket.h
-# pace_connect     is in sys/socket.h
-# pace_getpeername is in sys/socket.h
-# pace_getsockname is in sys/socket.h
-# pace_getsockopt  is in sys/socket.h
-# pace_setsockopt  is in sys/socket.h
-# pace_isfdtype    is in sys/socket.h
-# pace_listen      is in sys/socket.h
-# pace_recv        is in sys/socket.h
-# pace_recvfrom    is in sys/socket.h
-# pace_rcvmsg      is in sys/socket.h
-# pace_send        is in sys/socket.h
-# pace_sendto      is in sys/socket.h
-# pace_sendmsg     is in sys/socket.h
-# pace_shutdown    is in sys/socket.h
-# pace_socket      is in sys/socket.h
-# pace_socketpair  is in sys/socket.h
-POSIX_SOCK_FILES = \
-  sys/socket	
-
-# POSIX_SINGLE_PROCESS Unit of Functionality (POSIX.1)
-# pace_sysconf is in unistd.h;
-# pace_time is in time.h;
-# pace_uname is in sys/ustname.h
-POSIX_SP_FILES = \
-  unistd \
-  time \
-  sys/utsname
-
-# POSIX_MULTI_PROCESS Unit of Functionality (POSIX.1)
-# pace__exit is in unistd.h
-# pace_assert is in assert.h
-# pace_execl, pace_execle, pace_execlp, pace_execv, pace_execve, pace_execvp
-#  are in unistd.h;
-# pace_exit is in stdlib.h;
-# pace_fork is in unistd.h;
-# pace_getenv is in stdlib.h;
-# pace_getpid, pace_getppid are in unistd.h;
-# pace_setlocale is in locale.h;
-# pace_sleep is in unistd.h;
-# pace_times is in sys/times.h;
-# pace_wait, pace_waitpid are in wait.h;
-POSIX_MP_FILES = \
-  unistd \
-  assert \
-  stdlib \
-  locale \
-  sys/times \
-  sys/wait
-
-# POSIX_SIGNALS Unit of Functionality (POSIX.1)
-# pace_abort is in stdlib.h;
-# pace_alarm is in unistd.h;
-# pace_kill is in signal.h;
-# pace_pause is in unistd.h;
-# pace_sigaction, pace_sigaddset, pace_sigdelset, pace_sigemptyset,
-#  pace_sigfillset, pace_sigismember are in signal.h;
-# pace_siglongjmp is in setjmp.h;
-# pace_sigpending, pace_sigprocmask are in signal.h;
-# pace_sigsetjmp is in setjmp.h;
-# pace_sigsuspend is in signal.h;
-POSIX_SIG_FILES = \
-  stdlib \
-  unistd \
-  signal \
-  setjmp
-
-# POSIX_USER_GROUPS Unit of Functionality (POSIX.1)
-# pace_getegid, pace_geteuid, pace_getgid, pace_getgroups, pace_getlogin,
-#  pace_getpgrp, pace_getuid, pace_setgid, pace_setsid, pace_setuid are in
-#  unistd.h;
-POSIX_UG_FILES = \
-  unistd
-
-# POSIX_FILE_SYSTEM Unit of Functionality (POSIX.1)
-# pace_access, pace_chdir are in unistd.h;
-# pace_closedir is in dirent.h;
-# pace_creat is in fcntl.h;
-# pace_fpathconf is in unistd.h;
-# pace_fstat is in sys/stat.h
-# pace_getcwd, pace_link are in unistd.h
-# pace_mkdir is in sys/stat.h
-# pace_opendir is in dirent.h;
-# pace_pathconf is in unistd.h;
-# pace_readdir is in dirent.h;
-# pace_remove, pace_rename are in stdio.h;
-# pace_rewinddir is in dirent.h;
-# pace_rmdir is in unistd.h;
-# pace_stat is in sys/stat.h;
-# pace_tmpfile, pace_tmpnam are in stdio.h;
-# pace_unlink is in unistd.h;
-# pace_utime is in utime.h;
-POSIX_FS_FILES = \
-  unistd \
-  dirent \
-  fcntl \
-  sys/stat \
-  stdio \
-  utime
-
-# POSIX_FILE_ATTRIBUTES Unit of Functionality (POSIX.1)
-# pace_chmod is in sys/stat.h;
-# pace_chown is in unistd.h;
-# pace_umask is in sys/stat.h;
-POSIX_FA_FILES = \
-  sys/stat \
-  unistd
-
-# POSIX_FIFO Unit of Functionality (POSIX.1)
-# pace_mkfifo is in sys/stat.h;
-POSIX_F_FILES = \
-  sys/stat
-
-# POSIX_DEVICE_IO Unit of Functionality (POSIX.1)
-# pace_clearerr is in stdio.h;
-# pace_close is in unistd.h;
-# pace_fclose, pace_fdopen, pace_feof, pace_ferror are in stdio.h;
-# pace_fflush, pace_fgetc, pace_fgets, pace_fileno are in stdio.h;
-# pace_fopen, pace_fprintf, pace_fputc, pace_fputs, pace_fread, pace_freopen,
-#  pace_fscanf, pace_fwrite, pace_getc, pace_getchar, pace_gets are in stdio.h;
-# pace_open is in fcntl.h;
-# pace_perror, pace_printf, pace_putc, pace_putchar, pace_puts are in stdio.h;
-# pace_read is in unistd.h;
-# pace_scanf is in stdio.h;
-# pace_setbuf, pace_sprintf, pace_sscanf, pace_ungetc are in stdio.h;
-# pace_write are in unistd.h;
-POSIX_DI_FILES = \
-  stdio \
-  unistd \
-  fcntl
-
-# POSIX_FD_MGMT Unit of Functionality (POSIX.1)
-# pace_dup, pace_dup2 are in unistd.h;
-# pace_fcntl is in fcntl.h;
-# pace_fseek, pace_ftell are in stdio.h;
-# pace_lseek in unistd.h;
-# pace_rewind is in stdio.h;
-POSIX_FM_FILES = \
-  unistd \
-  fcntl \
-  stdio
-
-# POSIX_PIPE Unit of Functionality (POSIX.1)
-# pace_pipe is in unistd.h;
-POSIX_P_FILES = \
-  unistd
-
-# POSIX_DEVICE_SPECIFIC Unit of Functionality (POSIX.1)
-# pace_cfgetispeed, pace_cfgetospeed, pace_cfsetispeed, pace_cfsetospeed are
-#  in termios.h;
-# pace_ctermid is in stdio.h;
-# pace_isatty is in unistd.h;
-# pace_tcdrain, pace_tcflow, pace_tcflush, pace_tcgetattr, pace_tcsendbreak,
-#  pace_tcsetattr are in termios.h;
-# pace_ttyname is in unistd.h;
-POSIX_DS_FILES = \
-  termios \
-  stdio \
-  unistd
-
-# POSIX_SYSTEM_DATABASE Unit of Functionality (POSIX.1)
-# pace_getgrgid, pace_getgrnam, pace_getpwnam, pace_getpwuid are in grp.h;
-POSIX_SD_FILES = \
-  grp
-
-# POSIX_C_LANG_SUPPORT Unit of Functionality (POSIX.1)
-# Character handling functions (e.g., isalnum, toupper) are in ctype.h;
-# Mathematics functions (e.g., acos, tanh) are in math.h;
-# Non-local jump functions (i.e., longjmp, setjmp) are in setjmp.h;
-# General utility functions (i.e., abs, srand) are in stdlib.h;
-# String handling functions (i.e., strcat, strtok) are in string.h;
-# Date and Time functions (i.e., asctime, tzset) are in time.h;
-POSIX_CLS_FILES = \
-  ctype \
-  math \
-  setjmp \
-  stdlib \
-  time
-
-# _POSIX_JOB_CONTROL Unit of Functionality (POSIX.1)
-# pace_setpgid is in unistd.h;
-# pace_tcgetpgrp, pace_tcsetpgrp are in termios.h
-_POSIX_JC_FILES = \
-  unistd \
-  termios
-
-# POSIX_USER_GROUPS_R Unit of Functionality (POSIX.1)
-# pace_getlogin_r is in unistd.h;
-POSIX_UGR_FILES = \
-  unistd
-
-# POSIX_FILE_LOCKING Unit of Functionality (POSIX.1)
-# pace_flockfile, pace_ftrylockfile, pace_funlockfile, pace_getc_unlocked,
-# pace_getchar_unlocked, pace_putc_unlocked, pace_putchar_unlocked are in
-# stdio.h;
-POSIX_FL_FILES = \
-  stdio
-
-# POSIX_C_LANG_SUPPORT_R Unit of Functionality (POSIX.1)
-# pace_asctime_r, pace_ctime_r, pace_gmtime_r, pace_localtime_r are in time.h;
-# pace_rand_r is in stdlib.h;
-# pace_strtok_r is in string.h;
-# pace_readdir_r is in dirent.h;
-POSIX_CLSR_FILES = \
-  time \
-  stdlib \
-  string \
-  dirent
-
-# POSIX_SYSTEM_DATABASE_R Unit of Functionality (POSIX.1)
-# pace_getgrgid_r, pace_getgrnam_r are in grp.h;
-# pace_getpwnam_r, pace_getpwuid_r are in pwd.h;
-POSIX_SDR_FILES = \
-  grp \
-  pwd
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-INCLDIRS += -I$(PACE_ROOT)
-
-####
-#### Build customization.
-####
-ifndef PACE_COMPONENTS
-  #### Do we want PACE subsets as below? If so, we need to add the
-  #### documentation referenced below as well.
-  #### Please see docs/PACE-subsets.html for documentation. ??
-  PACE_COMPONENTS = \
-    Pace \
-    Config \
-    Sys
-  CFLAGS += -DPACE_HAS_ALL_POSIX_FUNCS
-endif # PACE_COMPONENTS
-
-ifeq (FOR_ACE,$(PACE_COMPONENTS))
-  #### These PACE components are necessary to support ACE.
-  override PACE_COMPONENTS = \
-    Pace \
-    Config \
-    Sys
-  CFLAGS += -DPACE_HAS_ALL_POSIX_FUNCS
-else  # ! FOR_ACE
-  #### Is there anything in PACE that ACE doesn't need? Probably not
-endif # ! FOR_ACE
-
-####
-#### PACE_COMPONENTS support.
-####
-ifneq (,$(findstring Pace,$(PACE_COMPONENTS)))
-  FILES += $(PACE_FILES)
-endif # Pace
-
-ifneq (,$(findstring Config,$(PACE_COMPONENTS)))
-  FILES += $(CONFIG_FILES)
-endif # Config
-
-ifneq (,$(findstring Sys,$(PACE_COMPONENTS)))
-  FILES += $(SYS_FILES)
-endif # Sys
-
-ifneq (,$(findstring Posix_sp,$(PACE_COMPONENTS)))
-  FILES = $(POSIX_SP_FILES)
-  LIB   = libPACE_SP.a
-  SHLIB = libPACE_SP.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_SP_UOF
-endif # Single Process
-
-ifneq (,$(findstring Posix_mp,$(PACE_COMPONENTS)))
-  FILES = $(POSIX_MP_FILES)
-  LIB   = libPACE_MP.a
-  SHLIB = libPACE_MP.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_MP_UOF
-endif # Multi Process
-
-ifneq (,$(findstring Posix_sig,$(PACE_COMPONENTS)))
-  FILES = $(POSIX_SIG_FILES)
-  LIB   = libPACE_S.a
-  SHLIB = libPACE_S.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_SIG_UOF
-endif # Signals
-
-ifneq (,$(findstring Posix_usg,$(PACE_COMPONENTS)))
-  FILES = $(POSIX_UG_FILES)
-  LIB   = libPACE_UG.a
-  SHLIB = libPACE_UG.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_UG_UOF
-endif # User Groups
-
-ifneq (,$(findstring Posix_fs,$(PACE_COMPONENTS)))
-  FILES = $(POSIX_FS_FILES)
-  LIB   = libPACE_FS.a
-  SHLIB = libPACE_FS.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_FS_UOF
-endif # File System
-
-ifneq (,$(findstring Posix_fa,$(PACE_COMPONENTS)))
-  FILES = $(POSIX_FA_FILES)
-  LIB   = libPACE_FA.a
-  SHLIB = libPACE_FA.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_FA_UOF
-endif # File Attributes
-
-ifneq (,$(findstring Posix_fif,$(PACE_COMPONENTS)))
-  FILES = $(POSIX_F_FILES)
-  LIB   = libPACE_F.a
-  SHLIB = libPACE_F.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_F_UOF
-endif # Fifo
-
-ifneq (,$(findstring Posix_di,$(PACE_COMPONENTS)))
-  FILES = $(POSIX_DI_FILES)
-  LIB   = libPACE_DI.a
-  SHLIB = libPACE_DI.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_DI_UOF
-endif # Device Input/Output
-
-ifneq (,$(findstring Posix_fm,$(PACE_COMPONENTS)))
-  FILES = $(POSIX_FM_FILES)
-  LIB   = libPACE_FM.a
-  SHLIB = libPACE_FM.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_FM_UOF
-endif # File Descriptor Management
-
-ifneq (,$(findstring Posix_p,$(PACE_COMPONENTS)))
-  FILES = $(POSIX_P_FILES)
-  LIB   = libPACE_P.a
-  SHLIB = libPACE_P.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_P_UOF
-endif # Pipe
-
-ifneq (,$(findstring Posix_ds,$(PACE_COMPONENTS)))
-  FILES = $(POSIX_DS_FILES)
-  LIB   = libPACE_DS.a
-  SHLIB = libPACE_DS.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_DS_UOF
-endif # Device Specific
-
-ifneq (,$(findstring Posix_sd,$(PACE_COMPONENTS)))
-  FILES = $(POSIX_SD_FILES)
-  LIB   = libPACE_SD.a
-  SHLIB = libPACE_SD.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_SD_UOF
-endif # System Database
-
-ifneq (,$(findstring Posix_cls,$(PACE_COMPONENTS)))
-  FILES = $(POSIX_CLS_FILES)
-  LIB   = libPACE_CLS.a
-  SHLIB = libPACE_CLS.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_CLS_UOF
-endif # C Language Support
-
-ifneq (,$(findstring Posix_jc,$(PACE_COMPONENTS)))
-  FILES = $(_POSIX_JC_FILES)
-  LIB   = libPACE_JC.a
-  SHLIB = libPACE_JC.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_JC_UOF
-endif # Job Control
-
-ifneq (,$(findstring Posix_ugr,$(PACE_COMPONENTS)))
-  FILES = $(POSIX_UGR_FILES)
-  LIB   = libPACE_UGR.a
-  SHLIB = libPACE_UGR.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_UGR_UOF
-endif # User Groups - Reentrant
-
-ifneq (,$(findstring Posix_fl,$(PACE_COMPONENTS)))
-  FILES = $(POSIX_FL_FILES)
-  LIB   = libPACE_FL.a
-  SHLIB = libPACE_FL.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_FL_UOF
-endif # File Locking
-
-ifneq (,$(findstring Posix_clr,$(PACE_COMPONENTS)))
-  FILES = $(POSIX_CLSR_FILES)
-  LIB   = libPACE_CLSR.a
-  SHLIB = libPACE_CLSR.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_CLSR_UOF
-endif # C Language Support - Reentrant
-
-ifneq (,$(findstring Posix_sr,$(PACE_COMPONENTS)))
-  FILES = $(POSIX_SDR_FILES)
-  LIB   = libPACE_SDR.a
-  SHLIB = libPACE_SDR.$(SOEXT)
-  CFLAGS += -DPACE_HAS_POSIX_SDR_UOF
-endif # System Database - Reentrant
-
-LSRC  = $(addsuffix .cpp,$(FILES))
-
-BUILD += PACE_COMPONENTS
-
-#### Setting PACELIB to null allows it to be used for building shared
-#### libraries, including libPACE.$(SOEXT,) on certain platforms.
-PACELIB =
-
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-#### Disable installs in this ($(ACE_ROOT)/pace/pace) directory, because this
-#### is the (default) destination of installs anyways.  This line prevents
-#### creation of a link from the PACE library to itself when the build of
-#### the PACE library fails.
-INSTALL =
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef PACE_ROOT
-  PACE_ROOT = $(ACE_ROOT)/PACE
-endif # ! PACE_ROOT
-
-include $(PACE_ROOT)/include/makeinclude/rules.common.GNU
-
-ifndef static_libs_only
-  ifndef shared_libs_only
-    static_libs_only = 1
-  endif # ! shared_libs_only
-endif # ! static_libs_only
-
-# If we are inlining the PACE functions then we need to define
-# PACE_HAS_INLINE. Inlining is the default.
-ifndef inline
-  CFLAGS += -DPACE_HAS_INLINE
-endif # ! inline
-
-ifeq (1,$(inline))
-  CFLAGS += -DPACE_HAS_INLINE
-endif # inline
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-
-.PHONY: PACE_COMPONENTS
-PACE_COMPONENTS:
-	@sh $(ACE_ROOT)/bin/ace_components --pace --set ' $(PACE_COMPONENTS) '
-
-realclean:
-	@sh $(ACE_ROOT)/bin/ace_components --pace --remove
-
-# AIX template compilation speedup hack
-# Not added for PACE - can always be added later if needed
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/PACE/pace/Makefile.am b/PACE/pace/Makefile.am
deleted file mode 100644
index 65d64169da5..00000000000
--- a/PACE/pace/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for the PACE C library
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-SUBDIRS = \
-  @SUBDIRS@
-
-DESTDIRS = \
-  config \
-  emulation \
-  man \
-  posix \
-  sys \
-  vxworks \
-  win32
-
-PACE_LIB = @PACE_LIB@
-
-lib_LTLIBRARIES = libPACE.la
-libPACE_la_LIBADD = $(PACE_LIB)
-
-pkginclude_HEADERS = \
-  aio.h \
-  assert.h \
-  ctype.h \
-  dirent.h \
-  errno.h \
-  fcntl.h \
-  grp.h \
-  limits.h \
-  locale.h \
-  math.h \
-  mqueue.h \
-  pthread.h \
-  pwd.h \
-  sched.h \
-  semaphore.h \
-  setjmp.h \
-  signal.h \
-  stddef.h \
-  stdio.h \
-  stdlib.h \
-  string.h \
-  termios.h \
-  time.h \
-  unistd.h \
-  utime.h
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
diff --git a/PACE/pace/aio.h b/PACE/pace/aio.h
deleted file mode 100644
index f9d8be32a3c..00000000000
--- a/PACE/pace/aio.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/aio.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_AIO_H
-#define PACE_AIO_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/aio.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/aio.h"
-#elif (PACE_WIN32)
-# include "pace/win32/aio.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function aio_cancel.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), section 6.7.7.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_aio_cancel (PACE_HANDLE fildes,
-                                               pace_aiocb * aiocb);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function aio_error.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), section 6.7.5.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_aio_error (const pace_aiocb * aiocbp);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function aio_fsync.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), section 6.7.9.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_aio_fsync (int op, pace_aiocb * aiocbp);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function aio_read.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), section 6.7.2.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_aio_read (pace_aiocb * aiocbp);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function aio_return.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), section 6.7.6.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_aio_return (pace_aiocb * aiocbp);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function aio_suspend.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), section 6.7.8.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_aio_suspend(const pace_aiocb * const list[],
-                                               int nent,
-                                               const pace_timespec * timeout);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function aio_write.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), section 6.7.3.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_aio_write (pace_aiocb * aiocbp);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function lio_listio.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), section 6.7.4.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_lio_listio (int mode,
-                                               pace_aiocb * const list[],
-                                               int nent,
-                                               pace_sigevent * sig);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/aio.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/aio.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/aio.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_AIO_H */
diff --git a/PACE/pace/assert.h b/PACE/pace/assert.h
deleted file mode 100644
index 00c5dff1180..00000000000
--- a/PACE/pace/assert.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $Id$ -*- C -*-
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/assert.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * =========================================================================== */
-
-#ifndef PACE_ASSERT_H
-#define PACE_ASSERT_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/assert.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/assert.h"
-#elif (PACE_WIN32)
-# include "pace/win32/assert.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX macro assert.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-
-     Use a macro because assert uses __FILE__ and __LINE__, which
-     would not be useful with an inline function.
-   */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-#if defined (PACE_NDEBUG)
-# define pace_assert(X)
-#else  /* ! PACE_NDEBUG */
-# define pace_assert(X) assert (X)
-#endif /* ! PACE_NDEBUG */
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/assert.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/assert.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/assert.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-# if defined (PACE_HAS_CPLUSPLUS)
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_ASSERT_H */
diff --git a/PACE/pace/config/compiler.h b/PACE/pace/config/compiler.h
deleted file mode 100644
index 92e25c97a05..00000000000
--- a/PACE/pace/config/compiler.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/config/compiler.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_CONFIG_COMPILER_H
-#define PACE_CONFIG_COMPILER_H
-
-#if defined (__cplusplus)
-# define PACE_HAS_CPLUSPLUS __cplusplus
-# if defined (PACE_HAS_INLINE)
-#   define PACE_INLINE inline
-# else
-#   define PACE_INLINE
-# endif /* ! PACE_HAS_INLINE */
-#else  /* ! __cplusplus */
-/* If PACE_HAS_INLINE is defined then we need the PACE functions to be
- * static. Otherwise, we want PACE_INLINE to be defined as nothing.
- */
-# if defined (PACE_HAS_INLINE)
-#   define PACE_INLINE static
-# else
-#   define PACE_INLINE
-# endif /* ! PACE_HAS_INLINE */
-#endif /* ! __cplusplus */
-
-#if defined (PACE_HAS_INLINE) && defined (__GNUC__) && !(PACE_LYNXOS)
-# define PACE_BROKEN_INLINE inline
-#else
-# define PACE_BROKEN_INLINE
-#endif /* PACE_HAS_INLINE */
-
-/* ============================================================================
- * Compiler Silencing macros
- *
- * Some compilers complain about parameters that are not used.  This macro
- * should keep them quiet.
- * ============================================================================
- */
-
-#if defined (ghs) ||         \
-    defined (__GNUC__) ||    \
-    defined (__hpux) ||      \
-    defined (__sgi) ||       \
-    defined (__DECCXX) ||    \
-    defined (__KCC) ||       \
-    defined (__rational__)   \
-    || (__USLC__)
-/* Some compilers complain about "statement with no effect" with (a).
- * This eliminates the warnings, and no code is generated for the null
- * conditional statement.  NOTE: that may only be true if -O is enabled,
- * such as with GreenHills (ghs) 1.8.8.
- */
-# define PACE_UNUSED_ARG(a) {if (&a)  { /* null */ }}
-#else /* ! ghs || __GNUC__ || ..... */
-# define PACE_UNUSED_ARG(a) (a)
-#endif /* ! ghs || __GNUC__ || ..... */
-
-#endif /* PACE_CONFIG_COMPILER_H */
diff --git a/PACE/pace/config/config.h b/PACE/pace/config/config.h
deleted file mode 100644
index fb0d0b4c760..00000000000
--- a/PACE/pace/config/config.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/config/config.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_CONFIG_CONFIG_H
-#define PACE_CONFIG_CONFIG_H
-
-#if !defined (PACE_HAS_POSIX_C_SOURCE)
-# if defined (_POSIX_C_SOURCE)
-#   define PACE_HAS_POSIX_C_SOURCE _POSIX_C_SOURCE
-# endif /* _POSIX_C_SOURCE */
-#endif /* ! PACE_HAS_POSIX_C_SOURCE */
-
-#if !defined (PACE_HAS_EXTENSIONS)
-# if defined (__EXTENSIONS__)
-#   define PACE_HAS_EXTENSIONS __EXTENSIONS__
-# endif /* __EXTENSIONS__ */
-#endif /* ! PACE_HAS_EXTENSIONS */
-
-#if !defined (PACE_HAS_REENTRANT)
-# if defined (PACE_LINUX)
-#   ifdef __USE_POSIX
-#     define PACE_HAS_REENTRANT 1
-#   else  /* ! __USE_POSIX */
-#   endif /* ! __USE_POSIX */
-# elif defined (PACE_LYNXOS)
-/* LynxOS uses _POSIX_REENTRANT_FUNCTIONS, but not _REENTRANT */
-# elif defined (PACE_SUNOS)
-#   if defined (__EXTENSIONS__) || defined (_REENTRANT) || \
-       (_POSIX_C_SOURCE - 0 >= 199506L)
-#     define PACE_HAS_REENTRANT 1
-#   else  /* ! __EXTENSIONS__ && ! _REENTRANT && _POSIX_C_SOURCE < 199506L */
-#   endif /* ! __EXTENSIONS__ && ! _REENTRANT && _POSIX_C_SOURCE < 199506L */
-# else  /* other POSIX */
-#   define PACE_HAS_REENTRANT 1
-# endif /* other POSIX */
-#endif /* ! PACE_HAS_REENTRANT */
-
-
-#if !defined (PACE_HAS_POSIX_PTHREAD_SEMANTICS)
-# if defined (_POSIX_PTHREAD_SEMANTICS)
-#   define PACE_HAS_POSIX_PTHREAD_SEMANTICS _POSIX_PTHREAD_SEMANTICS
-# endif /* _POSIX_PTHREAD_SEMANTICS */
-#endif /* ! PACE_HAS_POSIX_PTHREAD_SEMANTICS */
-
-
-#if PACE_HAS_POSIX == PACE_LYNXOS
-# define PACE_NONCONST_ARG_CAST(TYPE) (TYPE)
-# define PACE_VOIDSTARTSTAR_ARG_CAST(TYPE) (TYPE)
-# define PACE_AIO_SUSPEND_LIST_ARG_CAST (struct aiocb **)
-# define PACE_THR_ENTRY_CAST
-#elif PACE_HAS_POSIX == DIGITAL_UNIX
-# define PACE_NONCONST_ARG_CAST(TYPE) (TYPE)
-# define PACE_VOIDSTARTSTAR_ARG_CAST(TYPE)
-# define PACE_AIO_SUSPEND_LIST_ARG_CAST (const struct aiocb **)
-# define PACE_THR_ENTRY_CAST
-#elif PACE_LACKS_POSIX == PACE_VXWORKS
-# define PACE_NONCONST_ARG_CAST(TYPE) (TYPE)
-# define PACE_VOIDSTARTSTAR_ARG_CAST(TYPE)
-# define PACE_AIO_SUSPEND_LIST_ARG_CAST (const struct aiocb **)
-# define PACE_THR_ENTRY_CAST(TYPE) (TYPE)
-#else  /* ! PACE_LYNXOS */
-# define PACE_NONCONST_ARG_CAST(TYPE)
-# define PACE_VOIDSTARTSTAR_ARG_CAST(TYPE)
-# define PACE_AIO_SUSPEND_LIST_ARG_CAST
-# define PACE_THR_ENTRY_CAST
-#endif /* ! PACE_LYNXOS */
-
-/* Adding appropriate macros for the different POSIX units of
-   functionality that PACE supports.
-   These macros define which POSIX functions get included when
-   PACE is built. The functions are grouped according to POSIX
-   Units of Functionality per the POSIX document ?? pp. ??.
-   The following macros correspond to the following POSIX
-   Unit of Functionality:
-
-   PACE_HAS_POSIX_SOCK_UOF     -> POSIX Socket UoF
-   PACE_HAS_POSIX_SP_UOF       -> POSIX Single Process UoF
-   PACE_HAS_POSIX_MP_UOF       -> POSIX Multiple Process UoF
-   PACE_HAS_POSIX_SIG_UOF      -> POSIX Signals UoF
-   PACE_HAS_POSIX_UG_UOF       -> POSIX User Groups UoF
-   PACE_HAS_POSIX_FS_UOF       -> POSIX File System UoF
-   PACE_HAS_POSIX_FA_UOF       -> POSIX File Attributes UoF
-   PACE_HAS_POSIX_F_UOF        -> POSIX FIFO UoF
-   PACE_HAS_POSIX_DI_UOF       -> POSIX Device I/O UoF
-   PACE_HAS_POSIX_FM_UOF       -> POSIX File Descriptor Management UoF
-   PACE_HAS_POSIX_P_UOF        -> POSIX Pipe UoF
-   PACE_HAS_POSIX_DS_UOF       -> POSIX Device Specific UoF
-   PACE_HAS_POSIX_SD_UOF       -> POSIX System Database UoF
-   PACE_HAS_POSIX_CLS_UOF      -> POSIX C Language Support UoF
-   PACE_HAS_POSIX_JC_UOF       -> POSIX Job Control UoF
-   PACE_HAS_POSIX_UGR_UOF      -> POSIX User Groups (Reentrant) UoF
-   PACE_HAS_POSIX_FL_UOF       -> POSIX File Locking UoF
-   PACE_HAS_POSIX_CLSR_UOF     -> POSIX C Language Support (Reentrant) UoF
-   PACE_HAS_POSIX_SDR_UOF      -> POSIX System Database (Reentrant) UoF
-   PACE_HAS_POSIX_NONUOF_FUNCS -> Any POSIX function in PACE that is not in
-                                  one of the above units of functionality.
- */
-#if PACE_HAS_ALL_POSIX_FUNCS
-# define PACE_HAS_POSIX_UOF          1
-# define PACE_HAS_POSIX_SP_UOF       1
-# define PACE_HAS_POSIX_MP_UOF       1
-# define PACE_HAS_POSIX_SIG_UOF      1
-# define PACE_HAS_POSIX_UG_UOF       1
-# define PACE_HAS_POSIX_FS_UOF       1
-# define PACE_HAS_POSIX_FA_UOF       1
-# define PACE_HAS_POSIX_F_UOF        1
-# define PACE_HAS_POSIX_DI_UOF       1
-# define PACE_HAS_POSIX_FM_UOF       1
-# define PACE_HAS_POSIX_P_UOF        1
-# define PACE_HAS_POSIX_DS_UOF       1
-# define PACE_HAS_POSIX_SD_UOF       1
-# define PACE_HAS_POSIX_CLS_UOF      1
-# define PACE_HAS_POSIX_JC_UOF       1
-# define PACE_HAS_POSIX_UGR_UOF      1
-# define PACE_HAS_POSIX_FL_UOF       1
-# define PACE_HAS_POSIX_CLSR_UOF     1
-# define PACE_HAS_POSIX_SDR_UOF      1
-# define PACE_HAS_POSIX_NONUOF_FUNCS 1
-#else
-# if !defined PACE_HAS_POSIX_SOCK_UOF
-#   define PACE_HAS_POSIX_SOCK_UOF 0
-# endif /* ! PACE_HAS_POSIX_SOCK_UOF */
-# if !defined PACE_HAS_POSIX_SP_UOF
-#   define PACE_HAS_POSIX_SP_UOF 0
-# endif /* ! PACE_HAS_POSIX_SP_UOF */
-# if !defined PACE_HAS_POSIX_MP_UOF
-#   define PACE_HAS_POSIX_MP_UOF 0
-# endif /* ! PACE_HAS_POSIX_MP_UOF */
-# if !defined PACE_HAS_POSIX_SIG_UOF
-#   define PACE_HAS_POSIX_SIG_UOF 0
-# endif /* ! PACE_HAS_POSIX_SIG_UOF */
-# if !defined PACE_HAS_POSIX_UG_UOF
-#   define PACE_HAS_POSIX_UG_UOF 0
-# endif /* ! PACE_HAS_POSIX_UG_UOF */
-# if !defined PACE_HAS_POSIX_FS_UOF
-#   define PACE_HAS_POSIX_FS_UOF 0
-# endif /* ! PACE_HAS_POSIX_FS_UOF */
-# if !defined PACE_HAS_POSIX_FA_UOF
-#   define PACE_HAS_POSIX_FA_UOF 0
-# endif /* ! PACE_HAS_POSIX_FA_UOF */
-# if !defined PACE_HAS_POSIX_F_UOF
-#   define PACE_HAS_POSIX_F_UOF 0
-# endif /* ! PACE_HAS_POSIX_F_UOF */
-# if !defined PACE_HAS_POSIX_DI_UOF
-#   define PACE_HAS_POSIX_DI_UOF 0
-# endif /* ! PACE_HAS_POSIX_DI_UOF */
-# if !defined PACE_HAS_POSIX_FM_UOF
-#   define PACE_HAS_POSIX_FM_UOF 0
-# endif /* ! PACE_HAS_POSIX_FM_UOF */
-# if !defined PACE_HAS_POSIX_P_UOF
-#   define PACE_HAS_POSIX_P_UOF 0
-# endif /* ! PACE_HAS_POSIX_P_UOF */
-# if !defined PACE_HAS_POSIX_DS_UOF
-#   define PACE_HAS_POSIX_DS_UOF 0
-# endif /* ! PACE_HAS_POSIX_DS_UOF */
-# if !defined PACE_HAS_POSIX_SD_UOF
-#   define PACE_HAS_POSIX_SD_UOF 0
-# endif /* ! PACE_HAS_POSIX_SD_UOF */
-# if !defined PACE_HAS_POSIX_CLS_UOF
-#   define PACE_HAS_POSIX_CLS_UOF 0
-# endif /* ! PACE_HAS_POSIX_CLS_UOF */
-# if !defined PACE_HAS_POSIX_JC_UOF
-#   define PACE_HAS_POSIX_JC_UOF 0
-# endif /* ! PACE_HAS_POSIX_JC_UOF */
-# if !defined PACE_HAS_POSIX_UGR_UOF
-#   define PACE_HAS_POSIX_UGR_UOF 0
-# endif /* ! PACE_HAS_POSIX_UGR_UOF */
-# if !defined PACE_HAS_POSIX_FL_UOF
-#   define PACE_HAS_POSIX_FL_UOF 0
-# endif /* ! PACE_HAS_POSIX_FL_UOF */
-# if !defined PACE_HAS_POSIX_CLSR_UOF
-#   define PACE_HAS_POSIX_CLSR_UOF 0
-# endif /* ! PACE_HAS_POSIX_CLSR_UOF */
-# if !defined PACE_HAS_POSIX_SDR_UOF
-#   define PACE_HAS_POSIX_SDR_UOF 0
-# endif /* ! PACE_HAS_POSIX_SDR_UOF */
-# if !defined PACE_HAS_POSIX_NONUOF_FUNCS
-#   define PACE_HAS_POSIX_NONUOF_FUNCS 0
-# endif /* ! PACE_HAS_POSIX_NONUOF_FUNCS */
-#endif /* PACE_HAS_ALL_POSIX_FUNCS */
-
-#if (PACE_WIN32)
-
-# if defined (PACE_AS_STATIC_LIBS)
-#   if !defined (PACE_HAS_DLL)
-#     define PACE_HAS_DLL 0
-#   endif /* ! PACE_HAS_DLL */
-# else
-#   if !defined (PACE_HAS_DLL)
-#     define PACE_HAS_DLL 1
-#   endif /* ! PACE_HAS_DLL */
-# endif /* PACE_AS_STATIC_LIBS */
-
-#define PACE_Proper_Export_Flag __declspec (dllexport)
-#define PACE_Proper_Import_Flag __declspec (dllimport)
-
-#endif /* PACE_WIN32 */
-
-#if defined (PACE_HAS_DLL) && (PACE_HAS_DLL == 1)
-#  if defined (PACE_BUILD_DLL)
-#    define PACE_Export PACE_Proper_Export_Flag
-#  else /* PACE_BUILD_DLL */
-#    define PACE_Export PACE_Proper_Import_Flag
-#  endif /* PACE_BUILD_DLL */
-#else /* PACE_HAS_DLL != 1 */
-#  define PACE_Export
-#endif /* PACE_HAS_DLL != 1 */
-
-#endif /* PACE_CONFIG_CONFIG_H */
diff --git a/PACE/pace/config/constants.h b/PACE/pace/config/constants.h
deleted file mode 100644
index 885fc104987..00000000000
--- a/PACE/pace/config/constants.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    constants.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_CONFIG_CONSTANTS_H
-#define PACE_CONFIG_CONSTANTS_H
-
-#define PACE_ONE_SECOND_IN_MSECS 1000L
-#define PACE_ONE_SECOND_IN_USECS 1000000L
-#define PACE_ONE_SECOND_IN_NSECS 1000000000L
-
-/* ============================================================================
- * Posix minimum values
- * ============================================================================ */
-
-/* The number of I/O operations that can be specified in a list I/O call. */
-# if defined (_POSIX_AIO_LISTIO_MAX)
-# define PACE_POSIX_AIO_LISTIO_MAX _POSIX_AIO_LISTIO_MAX
-# endif
-
-/* The number of outstanding asynchronous I/O operations. */
-# if defined (_POSIX_AIO_MAX)
-# define PACE_POSIX_AIO_MAX _POSIX_AIO_MAX
-# endif
-
-/* The length of the arguments for one of the exec functions, in bytes,
- * excluding environment data. */
-# if defined (_POSIX_ARG_MAX)
-# define PACE_POSIX_ARG_MAX _POSIX_ARG_MAX
-# endif
-
-/* The number of simultaneous processes per real user ID. */
-# if defined (_POSIX_CHILD_MAX)
-# define PACE_POSIX_CHILD_MAX _POSIX_CHILD_MAX
-# endif
-
-/* The number of timer expiration overruns. */
-# if defined (_POSIX_DELAYTIMER_MAX)
-# define PACE_POSIX_DELAYTIMER_MAX _POSIX_DELAYTIMER_MAX
-# endif
-
-/* The value of a file's link count. */
-# if defined (_POSIX_LINK_MAX)
-# define PACE_POSIX_LINK_MAX _POSIX_LINK_MAX
-# endif
-
-/* The size of the storage required for a login name, in bytes,
- * including the terminating NULL. */
-# if defined (_POSIX_LOGIN_NAME_MAX)
-# define PACE_POSIX_LOGIN_NAME_MAX _POSIX_LOGIN_NAME_MAX
-# endif
-
-/* The number of bytes in a terminal canonical input queue. */
-# if defined (_POSIX_MAX_CANON)
-# define PACE_POSIX_MAX_CANON _POSIX_MAX_CANON
-# endif
-
-/* The number of bytes for which space will be available in a
- * terminal input queue. */
-# if defined (_POSIX_MAX_INPUT)
-# define PACE_POSIX_MAX_INPUT _POSIX_MAX_INPUT
-# endif
-
-/* The number of message queues that can be open for a single
- * process. */
-# if defined (_POSIX_MQ_OPEN_MAX)
-# define PACE_POSIX_MQ_OPEN_MAX _POSIX_MQ_OPEN_MAX
-# endif
-
-/* The maximum number of message priorities supported by the
- * implementation. */
-# if defined (_POSIX_MQ_PRIO_MAX)
-# define PACE_POSIX_MQ_PRIO_MAX _POSIX_MQ_PRIO_MAX
-# endif
-
-/* The number of bytes in a filename. */
-# if defined (_POSIX_NAME_MAX)
-# define PACE_POSIX_NAME_MAX _POSIX_NAME_MAX
-# endif
-
-/* The number of simultaneous supplementary group IDs per process. */
-# if defined (_POSIX_NGROUPS_MAX)
-# define PACE_POSIX_NGROUPS_MAX _POSIX_NGROUPS_MAX
-# endif
-
-/* The number of files that one process can have open at one time. */
-# if defined (_POSIX_OPEN_MAX)
-# define PACE_POSIX_OPEN_MAX _POSIX_OPEN_MAX
-# endif
-
-/* The number of bytes in a pathname. */
-# if defined (_POSIX_PATH_MAX)
-# define PACE_POSIX_PATH_MAX _POSIX_PATH_MAX
-# endif
-
-/* The number of bytes that can be written atomically when writing
- * to a pipe. */
-# if defined (_POSIX_PIPE_BUF)
-# define PACE_POSIX_PIPE_BUF _POSIX_PIPE_BUF
-# endif
-
-/* The number of realtime signal numbers reserved for application use. */
-# if defined (_POSIX_RTSIG_MAX)
-# define PACE_POSIX_RTSIG_MAX _POSIX_RTSIG_MAX
-# endif
-
-/* The number of semaphores that a process may have. */
-# if defined (_POSIX_SEM_NSEMS_MAX)
-# define PACE_POSIX_SEM_NSEMS_MAX _POSIX_SEM_NSEMS_MAX
-# endif
-
-/* The maximum value a semaphore may have. */
-# if defined (_POSIX_SEM_VALUE_MAX)
-# define PACE_POSIX_SEM_VALUE_MAX _POSIX_SEM_VALUE_MAX
-# endif
-
-/* The number of queued signals that a process may send and have pending
- * at the receiver(s) at any time. */
-# if defined (_POSIX_SIGQUEUE_MAX)
-# define PACE_POSIX_SIGQUEUE_MAX _POSIX_SIGQUEUE_MAX
-# endif
-
-/* The value that can be stored in an object of type ssize_t. */
-# if defined (_POSIX_SSIZE_MAX)
-# define PACE_POSIX_SSIZE_MAX _POSIX_SSIZE_MAX
-# endif
-
-/* The number of streams that one process can have open at one time. */
-# if defined (_POSIX_STREAM_MAX)
-# define PACE_POSIX_STREAM_MAX _POSIX_STREAM_MAX
-# endif
-
-/* The number of attempts made to destroy the thread-specific data
- * values of a thread on thread exit. */
-# if defined (_POSIX_THREAD_DESTRUCTOR_ITERATIONS)
-# define PACE_POSIX_THREAD_DESTRUCTOR_ITERATIONS _POSIX_THREAD_DESTRUCTORITERATIONS
-# endif
-
-/* The number of data keys per process. */
-# if defined (_POSIX_THREAD_KEYS_MAX)
-# define PACE_POSIX_THREAD_KEYS_MAX _POSIX_THREAD_KEYS_MAX
-# endif
-
-/* The number of threads per process. */
-# if defined (_POSIX_THREAD_THREADS_MAX)
-# define PACE_POSIX_THREAD_THREADS_MAX _POSIX_THREAD_THREADS_MAX
-# endif
-
-/* The size of the storage required for a terminal device name, in bytes,
- * including the terminating NULL. */
-# if defined (_POSIX_TTY_NAME_MAX)
-# define PACE_POSIX_TTY_NAME_MAX _POSIX_TTY_NAME_MAX
-# endif
-
-/* The per-process number of times. */
-# if defined (_POSIX_TIMER_MAX)
-# define PACE_POSIX_TIMER_MAX _POSIX_TIMER_MAX
-# endif
-
-/* The maximum number of bytes supported for the name of a time zone
- * (not of the TZ variable). */
-# if defined (_POSIX_TZNAME_MAX)
-# define PACE_POSIX_TZNAME_MAX _POSIX_TZNAME_MAX
-# endif
-
-
-/* ============================================================================
- * Temporary MACROS. Correct them later.
- * ============================================================================ */
-
-#include "pace/sys/types.h"
-
-/* Tracing */
-# define PACE_DEBUG(X)
-# define PACE_LM_DEBUG PACE_stderr
-# define PACE_BEGIN_DUMP
-# define PACE_END_DUMP
-
-/* Identification for PACE.h */
-# define PACE_RCSID(X,Y,Z)
-
-/* Hooks */
-/* Dummy values */
-# define PACE_ALLOC_HOOK_DECLARE int declare_hook
-# define PACE_ALLOC_HOOK_DEFINE(X)
-
-/* Signals / ioctl / fcntl - dummy values */
-# define PACE_SIGURG 1
-# define PACE_NONBLOCK 2
-# define PACE_CLOEXEC 3
-
-/* Flags */
-/* Will not be a macro, dummy values */
-# define PACE_set_flags(X,Y) 1
-# define PACE_clr_flags(X,Y) 1
-
-/* Log Error */
-# define PACE_ERROR(X)
-
-/* Host Entries */
-# if defined (PACE_HAS_STRUCT_NETDB_DATA)
-typedef char PACE_HOSTENT_DATA[sizeof(struct hostent_data)];
-typedef char PACE_SERVENT_DATA[sizeof(struct servent_data)];
-typedef char PACE_PROTOENT_DATA[sizeof(struct protoent_data)];
-# else
-# if !defined PACE_HOSTENT_DATA_SIZE
-# define PACE_HOSTENT_DATA_SIZE (4*1024)
-# endif /* PACE_HOSTENT_DATA_SIZE */
-# if !defined PACE_SERVENT_DATA_SIZE
-# define PACE_SERVENT_DATA_SIZE (4*1024)
-# endif /*PACE_SERVENT_DATA_SIZE */
-# if !defined PACE_PROTOENT_DATA_SIZE
-# define PACE_PROTOENT_DATA_SIZE (2*1024)
-# endif /*PACE_PROTOENT_DATA_SIZE */
-typedef char PACE_HOSTENT_DATA[PACE_HOSTENT_DATA_SIZE];
-typedef char PACE_SERVENT_DATA[PACE_SERVENT_DATA_SIZE];
-typedef char PACE_PROTOENT_DATA[PACE_PROTOENT_DATA_SIZE];
-# endif /* PACE_HAS_STRUCT_NETDB_DATA */
-
-/* PACE_HAS_SIN_LEN */
-
-/* PACE_FREE */
-/* adjust later to use macros to decide how to free */
-# define PACE_FREE(X,Y) \
-X Y
-
-# define AF_ANY -1
-
-/* PACE CATCHALL */
-/* FIONREAD is used in PACE_SOCK_IO::recvv */
-/* PACE_HAS_ALLOCA is used in PACE_SOCK_IO::recvv */
-
-#endif /* PACE_CONFIG_CONSTANTS_H */
diff --git a/PACE/pace/config/defaults.h b/PACE/pace/config/defaults.h
deleted file mode 100644
index deadb92b071..00000000000
--- a/PACE/pace/config/defaults.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    defaults.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-
-#ifndef PACE_CONFIG_DEFAULTS_H
-#define PACE_CONFIG_DEFAULTS_H
-
-
-/* Define the default constants for PACE.  Many of these are used for
- * the PACE tests and applications.  You can change these values by
- * defining the macros in your config.h file. */
-
-
-#endif /* PACE_CONFIG_DEFAULTS_H */
diff --git a/PACE/pace/config/defines.h b/PACE/pace/config/defines.h
deleted file mode 100644
index 0aabf77f21c..00000000000
--- a/PACE/pace/config/defines.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/config/defines.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_CONFIG_DEFINES_H
-#define PACE_CONFIG_DEFINES_H
-
-#include "pace/config/platform.h"
-#include "pace/config/config.h"
-#include "pace/config/compiler.h"
-#include "pace/config/constants.h"
-#include "pace/config/defaults.h"
-#include "pace/config/utility.h"
-#include "pace/config/features.h"
-
-#endif /* PACE_CONFIG_DEFINES_H */
diff --git a/PACE/pace/config/features.h b/PACE/pace/config/features.h
deleted file mode 100644
index 14ea1e86607..00000000000
--- a/PACE/pace/config/features.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/config/features.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_CONFIG_FEATURES_H
-#define PACE_CONFIG_FEATURES_H
-
-/* Features: Can be customized by the developer. */
-
-#if defined (WIN32)
-
-/* If using win32 .. define PACE_HAS_MFC to 1, if you want ACE to use
- * CWinThread. This should be defined, if your application uses MFC.
- * Setting applies to  : building PACE
- * Runtime restrictions: MFC DLLs must be installed
- * Additonal notes     : If both PACE_HAS_MFC and PACE_MT_SAFE are
- *                       defined, the MFC DLL (not the static lib)
- *                       will be used from ACE. */
-# if !defined (PACE_HAS_MFC)
-#  define PACE_HAS_MFC 0
-# endif /* PACE_HAS_MFC */
-
-/* Turn off the following define if you want to disable threading.
- * Compile using multi-thread libraries.
- * Setting applies to  : building PACE, linking with PACE
- * Runtime restrictions: multithreaded runtime DLL must be installed. */
-# if !defined (PACE_MT_SAFE)
-#  define PACE_MT_SAFE 1
-# endif /* PACE_MT_SAFE */
-
-/* Turn on multithreading. */
-# if !defined (_MT)
-# define _MT
-# endif /* _MT */
-
-#endif /* WIN32 */
-
-#endif /* PACE_CONFIG_FEATURES_H */
diff --git a/PACE/pace/config/platform.h b/PACE/pace/config/platform.h
deleted file mode 100644
index 4dde03ea27a..00000000000
--- a/PACE/pace/config/platform.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/config/platform.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_CONFIG_PLATFORM_H
-#define PACE_CONFIG_PLATFORM_H
-
-/* Be careful not to define these macros 2x. */
-/* IE: makefile or other config file. */
-/* This could create compiler warnings. */
-
-/* These platforms are POSIX compliant. */
-
-#if defined (PACE_LINUX)
-# define PACE_HAS_POSIX PACE_LINUX
-# define PACE_LYNXOS 0
-# define PACE_SUNOS 0
-# define PACE_VXWORKS 0
-# define PACE_WIN32 0
-#elif defined (PACE_LYNXOS)
-# define PACE_HAS_POSIX PACE_LYNXOS
-# define PACE_LINUX 0
-# define PACE_SUNOS 0
-# define PACE_VXWORKS 0
-# define PACE_WIN32 0
-#elif defined (PACE_OSF1)
-# define PACE_HAS_POSIX DIGITAL_UNIX
-# define PACE_LINUX 0
-# define PACE_LYNXOS 0
-# define PACE_VXWORKS 0
-# define PACE_WIN32 0
-#elif defined (PACE_SUNOS)
-# define PACE_HAS_POSIX PACE_SUNOS
-# define PACE_LINUX 0
-# define PACE_LYNXOS 0
-# define PACE_VXWORKS 0
-# define PACE_WIN32 0
-#elif defined (PACE_QNX)
-# define PACE_HAS_POSIX PACE_QNX
-# define PACE_LINUX 0
-# define PACE_SUNOS 0
-# define PACE_LYNXOS 0
-# define PACE_VXWORKS 0
-# define PACE_WIN32 0
-
-/* These platforms are NOT POSIX compliant. */
-
-/* This is really kludgy but not sure what else to do at this point.
-   It appears that if PACE_HAS_POSIX is not defined (i.e., no #define
-   at all of any kind) and the same goes for PACE_VXWORKS then in
-   pace/config/config.h #if PACE_HAS_POSIX == PACE_LYNXOS will evaluate
-   to true. I am assuming both get default values of 0.
-
-   PACE_WIN32 should be defined as 0 though because pace/config/utility.h
-   checks it.
-   */
-
-#elif defined (PACE_VXWORKS)
-# define PACE_LACKS_POSIX PACE_VXWORKS
-# define PACE_LINUX -1
-# define PACE_LYNXOS -1
-# define PACE_SUNOS -1
-# define PACE_WIN32 0
-/* Doesn't use the makefile! */
-#elif defined (WIN32)
-# undef PACE_WIN32
-# define PACE_WIN32 2000
-# define PACE_LACKS_POSIX PACE_WIN32
-# define PACE_LINUX 0
-# define PACE_LYNXOS 0
-# define PACE_SUNOS 0
-# define PACE_VXWORKS 0
-#endif
-
-#endif /* PACE_CONFIG_PLATFORM_H */
diff --git a/PACE/pace/config/utility.h b/PACE/pace/config/utility.h
deleted file mode 100644
index 79b13e4755f..00000000000
--- a/PACE/pace/config/utility.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/config/utility.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_CONFIG_UTILITY_H
-#define PACE_CONFIG_UTILITY_H
-
-/* ----------------------------------------------------------------------
- * error control
- * ---------------------------------------------------------------------- */
-
-#if defined (PACE_TRACING) && PACE_TRACING == 1
-# include <stdio.h>
-#endif
-
-#include "pace/errno.h"
-
-# define PACE_ERRNO_NO_SUPPORT_RETURN(FAILVALUE) \
-return ( (errno = ENOTSUP), FAILVALUE)
-
-# define PACE_ERRNO_NO_SUPPORT() errno=ENOTSUP
-
-/* ----------------------------------------------------------------------
-   A couple useful inline functions for checking whether bits are
-   enabled or disabled.
- * ---------------------------------------------------------------------- */
-
-# define PACE_POW(X) (((X) == 0)?1:(X-=1,X|=X>>1,X|=X>>2,X|=X>>4,X|=X>>8,X|=X>>16,(++X)))
-# define PACE_EVEN(NUM) (((NUM) & 1) == 0)
-# define PACE_ODD(NUM) (((NUM) & 1) == 1)
-# define PACE_BIT_ENABLED(WORD, BIT) (((WORD) & (BIT)) != 0)
-# define PACE_BIT_DISABLED(WORD, BIT) (((WORD) & (BIT)) == 0)
-# define PACE_BIT_CMP_MASK(WORD, BIT, MASK) (((WORD) & (BIT)) == MASK)
-# define PACE_SET_BITS(WORD, BITS) (WORD |= (BITS))
-# define PACE_CLR_BITS(WORD, BITS) (WORD &= ~(BITS))
-
-/* Turn a number into a string. */
-# define PACE_ITOA(X) #X
-
-/* Create a string of a server address with a "host:port" format. */
-# define PACE_SERVER_ADDRESS(H,P) H":"P
-
-/* ----------------------------------------------------------------------
-   Specific for (PACE_WIN32)
- * ---------------------------------------------------------------------- */
-
-#if (PACE_WIN32)
-
-#include <windows.h>
-
-/* Perform a mapping of Win32 error numbers into POSIX errnos. */
-# define PACE_FAIL_RETURN(RESULT) do { \
-  switch (GetLastError ()) { \
-  case ERROR_NOT_ENOUGH_MEMORY: errno = ENOMEM; break; \
-  case ERROR_FILE_EXISTS:       errno = EEXIST; break; \
-  case ERROR_SHARING_VIOLATION: errno = EACCES; break; \
-  case ERROR_PATH_NOT_FOUND:    errno = ENOENT; break; \
-  } \
-  return RESULT; } while (0)
-
-/* The "null" device on Win32. */
-# define PACE_DEV_NULL "nul"
-
-/* Define the pathname separator characters for Win32 (ugh). */
-# define PACE_DIRECTORY_SEPARATOR_STR "\\"
-# define PACE_DIRECTORY_SEPARATOR_CHAR '\\'
-# define PACE_LD_SEARCH_PATH "PATH"
-# define PACE_LD_SEARCH_PATH_SEPARATOR_STR ";"
-# define PACE_DLL_SUFFIX ".dll"
-# define PACE_DLL_PREFIX ""
-
-# define PACE_SYSCALL_FAILED 0xFFFFFFFF
-
-/* Turns "FALSE" into -1 */
-# define PACE_ADAPT_RETVAL(OP,RESULT) \
-  ((RESULT = (OP)) == FALSE ? -1 : 0)
-
-/* If failure, sets errno before returning */
-# define PACE_WIN32CALL_RETURN(X,TYPE,FAILVALUE) \
-  do { \
-    TYPE pace_result_; \
-    pace_result_ = (TYPE) X; \
-    if (pace_result_ == FAILVALUE) \
-    { \
-      errno = GetLastError (); \
-    } \
-    return pace_result_; \
-  } while (0)
-
-/* Casts return value. */
-# define PACE_OSCALL_RETURN(X,TYPE,FAILVALUE) \
-  return (TYPE) X;
-
-#endif /* PACE_WIN32 */
-
-/* ----------------------------------------------------------------------
- * debug tracing
- * ---------------------------------------------------------------------- */
-
-#if defined (PACE_TRACING) && PACE_TRACING == 1
-# define PACE_TRACE(MODULE) \
-fprintf(stderr, "PACE_TRACE %s, %d, %s\n", (MODULE), __LINE__, __FILE__)
-#else
-# define PACE_TRACE(MODULE)
-#endif /* TRACING */
-
-#endif /* PACE_CONFIG_UTILITY_H */
diff --git a/PACE/pace/ctype.h b/PACE/pace/ctype.h
deleted file mode 100644
index cbca084d280..00000000000
--- a/PACE/pace/ctype.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/ctype.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_CTYPE_H
-#define PACE_CTYPE_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/ctype.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/ctype.h"
-#elif (PACE_WIN32)
-# include "pace/win32/ctype.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function isalnum.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_isalnum (int c);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function isalpha.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_isalpha (int c);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function iscntrl.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_iscntrl (int c);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function isdigit.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_isdigit (int c);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function isgraph.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_isgraph (int c);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function islower.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_islower (int c);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function isprint.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_isprint (int c);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function ispunct.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_ispunct (int c);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function isspace.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_isspace (int c);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function isupper.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_isupper (int c);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function isxdigit.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_isxdigit (int c);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function tolower.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_tolower (int c);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function toupper.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_toupper (int c);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/ctype.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/ctype.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/ctype.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_CTYPE_H */
diff --git a/PACE/pace/dirent.h b/PACE/pace/dirent.h
deleted file mode 100644
index 55ab381a49d..00000000000
--- a/PACE/pace/dirent.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/dirent.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_DIRENT_H
-#define PACE_DIRENT_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/dirent.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/dirent.h"
-#elif (PACE_WIN32)
-# include "pace/win32/dirent.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function opendir.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.1.2.
-   */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE PACE_DIR * pace_opendir (const char * dirname);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function readdir.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.1.2.
-   */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE pace_dirent * pace_readdir (PACE_DIR * dirp);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function readdir_r.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.1.2.
-   */
-#if (PACE_HAS_POSIX_CLSR_UOF)
-  PACE_Export PACE_INLINE int pace_readdir_r (PACE_DIR * dirp,
-                                              pace_dirent * entry,
-                                              pace_dirent ** result);
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-  /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */
-
-  /**
-     PACE's implementation of the POSIX function rewinddir.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.1.2.
-   */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE void pace_rewinddir (PACE_DIR * dirp);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function closedir.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.1.2.
-   */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE int pace_closedir (PACE_DIR * dirp);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/dirent.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/dirent.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/dirent.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_DIRENT_H */
diff --git a/PACE/pace/emulation/mqueue.c b/PACE/pace/emulation/mqueue.c
deleted file mode 100644
index 4e0e6912de6..00000000000
--- a/PACE/pace/emulation/mqueue.c
+++ /dev/null
@@ -1,570 +0,0 @@
-/* $Id$ -*- C -*-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/emulation/mqueue.c
- *
- * = AUTHOR
- *    John Heitmann
- *
- * ============================================================================ */
-
-#include "pace/sys/mman.h"
-#include "pace/stdio.h"
-#include "pace/fcntl.h"
-#include "pace/string.h"
-#include "pace/stdlib.h"
-#include "pace/sys/types.h"
-#include "pace/pthread.h"
-#include "pace/sys/stat.h"
-#include "pace/emulation/mqueue.h"
-
-typedef struct
-{
-  pace_mq_attr attr;
-  pace_size_t num_open; /* How many processes have a valid mqd_t to here */
-  pace_size_t rec_wait; /* How many processes are blocked on mq_receive */
-  pace_pid_t not_pid; /* Who is actually registered for notification */
-  pace_sigevent notification;
-  pace_pthread_mutex_t mutex;
-  pace_pthread_cond_t cond;
-  pace_size_t head;
-  pace_size_t freelist;
-} mqfile;
-
-typedef struct
-{
-  pace_size_t next; /* Index of next element */
-  unsigned int priority;
-  pace_size_t length;
-} message_header;
-
-static struct mq_attr pace_attrdefault = { 0, 32, 256, 0 };
-#define PACE_MQ_LOCKPOSTFIX "mqlock9587"
-#define PACE_MQ_DATAPOSTFIX "mqdata2355"
-
-/* This remains mq_open due to the macro in pace/mqueue.h */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-pace_mqd_t mq_open (const char* name,
-                    int oflag,
-                    pace_mode_t mode,
-                    pace_mq_attr* attr)
-{
-  int m_padding = sizeof (message_header); /* How much extra space per message do we need */
-  int f_padding = sizeof (mqfile); /* How much fixed padding is needed */
-  int mflags, mprot;
-  int fd;
-  int i;
-  pace_size_t mapsize;
-  char* mmaploc;
-  char* new_name;
-  char* lock_name;
-  int create_mmap = 0; /* 1 if the file has never be inited */
-  message_header* temp = 0; /*Used in initialization of mqueue*/
-  long index; /* index into the file */
-  pace_mqd_t result = (pace_mqd_t) pace_malloc (sizeof (struct mqd));
-  pace_stat_s statbuf;
-
-retry:
-  if (attr == 0)
-  {
-    attr = &pace_attrdefault;
-  }
-  else
-  {
-    if (attr->mq_maxmsg < 0 || attr->mq_msgsize < 0)
-    {
-      errno = EBADF;
-      return (pace_mqd_t)-1;
-    }
-  }
-
-  /* Create a name that will go to /tmp with a unique name */
-  new_name = (char*) malloc (256);
-  lock_name = (char*) malloc (256);
-  snprintf (new_name, 256, "/tmp%s%s", name, PACE_MQ_DATAPOSTFIX);
-  snprintf (lock_name, 256, "/tmp%s%s", name, PACE_MQ_LOCKPOSTFIX);
-
-  /* Fix alignment */
-  if (attr->mq_msgsize % sizeof (long) != 0)
-  {
-    attr->mq_msgsize += 8 - (attr->mq_msgsize % sizeof (long));
-  }
-
-  if (oflag & PACE_O_CREAT)
-  {
-    /* We need to protect access without the help of O_RDONLY in the fs */
-    fd = pace_open (new_name, PACE_O_RDWR | PACE_O_CREAT | PACE_O_EXCL, mode);
-
-    if (fd == -1 && errno != EEXIST)
-    {
-      /* An error other than EEXIST has occurred. */
-      return (pace_mqd_t)-1;
-    }
-    else if (fd != -1)
-    {
-      /* If a new file was created successfully */
-      create_mmap = 1;
-    }
-    else if (oflag & PACE_O_EXCL)
-    {
-      /* If the file exists and we don't want it */
-      errno = EEXIST;
-      return (pace_mqd_t)-1;
-    }
-    else
-    {
-      /* We want the existing file */
-      fd = pace_open (new_name, PACE_O_RDWR);
-      if (fd == -1 && errno == ENOENT)
-      {
-        /* Something odd is going on */
-        goto retry;
-      }
-      else if (fd == -1)
-      {
-        return (pace_mqd_t)-1;
-      }
-    }
-  }
-  else
-  {
-    fd = pace_open (new_name, PACE_O_RDWR);
-    if (fd == -1)
-    {
-      return (pace_mqd_t)-1;
-    }
-  }
-
-  /*
-  The following loop makes shure that we haven't entered a race condition. If a file
-  has been created but not initialized, its IXUSR will not be set (see above).
-  */
-  while (create_mmap == 0)
-  {
-    if (stat (lock_name, &statbuf) == -1)
-    {
-      close (fd);
-      if (errno == ENOENT && (oflag & O_CREAT))
-      {
-        goto retry;
-      }
-      return (pace_mqd_t)-1;
-    }
-    else
-    {
-      break;
-    }
-  }
-
-  mapsize = f_padding + (attr->mq_msgsize + m_padding) * (attr->mq_maxmsg);
-  mprot = PACE_PROT_READ | PACE_PROT_WRITE;
-  mflags = PACE_MAP_SHARED;
-
-  if (create_mmap)
-  {
-    /* Create and 0 out the file */
-    if (pace_lseek (fd, mapsize, PACE_SEEK_SET) == -1)
-    {
-      pace_unlink (new_name);
-      return (pace_mqd_t)-1;
-    }
-    if (pace_write (fd, "", 1) != 1)
-    {
-      pace_unlink (new_name);
-      return (pace_mqd_t)-1;
-    }
-
-    mmaploc = (char*) pace_mmap (0, mapsize, mprot, mflags, fd, 0);
-    pace_close (fd);
-    if (mmaploc == MAP_FAILED)
-    {
-      pace_unlink (new_name);
-      return (pace_mqd_t)-1;
-    }
-
-    pace_memset (mmaploc, 0, mapsize);
-
-    if ((errno = pace_pthread_mutex_init (&(((mqfile*)mmaploc)->mutex), 0)) != 0)
-    {
-      pace_unlink (new_name);
-      pace_munmap (mmaploc, mapsize);
-      return (pace_mqd_t)-1;
-    }
-    if ((errno = pace_pthread_mutex_lock (&(((mqfile*)mmaploc)->mutex))) != 0)
-    {
-      pace_unlink (new_name);
-      pace_munmap (mmaploc, mapsize);
-      return (pace_mqd_t)-1;
-    }
-
-    if ((errno = pace_pthread_cond_init (&(((mqfile*)mmaploc)->cond), 0)) != 0)
-    {
-      pace_unlink (new_name);
-      pace_munmap (mmaploc, mapsize);
-      return (pace_mqd_t)-1;
-    }
-
-    index = sizeof (mqfile);
-    ((mqfile*)mmaploc)->freelist = index;
-    ((mqfile*)mmaploc)->head = 0;
-
-    for (i = 0; i < attr->mq_maxmsg; ++i)
-    {
-      temp = (message_header *) &mmaploc[index];
-      index += sizeof (message_header) + attr->mq_msgsize;
-      temp->next = index;
-    }
-    temp->next = 0;
-    attr->mq_curmsgs = 0;
-    ((mqfile*)mmaploc)->attr = *attr;
-
-    /* Create the lock file so that the file is known to be inited */
-    if (pace_open (lock_name, O_CREAT | O_EXCL) == -1)
-    {
-      pace_unlink (new_name);
-      pace_munmap (mmaploc, mapsize);
-      return (pace_mqd_t)-1;
-    }
-
-  }
-  else
-  {
-    /* Just open the existing map */
-    mmaploc = (char*) pace_mmap (0, mapsize, mprot, mflags, fd, 0);
-    if (mmaploc == MAP_FAILED)
-    {
-      return (pace_mqd_t)-1;
-    }
-    pace_close (fd);
-
-    /* ???? Test here for race */
-
-    if (pace_pthread_mutex_lock (&(((mqfile*)mmaploc)->mutex)) == -1)
-    {
-      pace_munmap (mmaploc, mapsize);
-      return (pace_mqd_t)-1;
-    }
-    ((mqfile*)mmaploc)->attr.mq_flags = attr->mq_flags;
-  }
-
-  ((mqfile*)mmaploc)->num_open++;
-
-
-  if (pace_pthread_mutex_unlock (&(((mqfile*)mmaploc)->mutex)) == -1)
-  {
-    pace_munmap (mmaploc, mapsize);
-    return (pace_mqd_t)-1;
-  }
-
-  result->mptr = mmaploc;
-  result->length = mapsize;
-  result->oflag = oflag;
-
-  return result;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int mq_close (pace_mqd_t mqdes)
-{
-  if (pace_pthread_mutex_lock (&( ((mqfile*)mqdes->mptr)->mutex)) == -1)
-  {
-    errno = EBADF;
-    return -1;
-  }
-  ((mqfile*)mqdes->mptr)->num_open--;
-  if (pace_pthread_mutex_unlock (&(((mqfile*)mqdes->mptr)->mutex)) == -1)
-  {
-    errno = EBADF;
-    return -1;
-  }
-  if (munmap (mqdes->mptr, mqdes->length) == -1)
-  {
-    return -1;
-  }
-  free (mqdes);
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int mq_unlink (const char* name)
-{
-  int result1, result2;
-  char* new_name;
-  new_name = (char*) malloc (256);
-  snprintf (new_name, 256, "/tmp%s%s", name, PACE_MQ_DATAPOSTFIX);
-  result1 = pace_unlink (new_name);
-  snprintf (new_name, 256, "/tmp%s%s", name, PACE_MQ_LOCKPOSTFIX);
-  result2 = pace_unlink (new_name);
-  free (new_name);
-  return (result1 == -1 || result2 == -1 ? -1 : 0);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int mq_send (pace_mqd_t mqdes,
-             const char* ptr,
-             pace_size_t length,
-             unsigned int priority)
-{
-  mqfile* queue = ((mqfile*)mqdes->mptr);
-  long index, old_index;
-  if (mqdes->oflag & O_RDONLY)
-  {
-    /* Incorrect access priviledges */
-    errno = EBADF;
-    return -1;
-  }
-  if (queue->attr.mq_msgsize < (int) length)
-  {
-    /* Message too long */
-    errno = EMSGSIZE;
-    return -1;
-  }
-  if ((errno = pace_pthread_mutex_lock (&queue->mutex)) != 0)
-  {
-    return -1;
-  }
-  /* If the queue is full... */
-  if (queue->attr.mq_curmsgs >= queue->attr.mq_maxmsg)
-  {
-    if (queue->attr.mq_flags & O_NONBLOCK)
-    {
-      errno = EAGAIN;
-      return -1;
-    }
-    while (queue->attr.mq_maxmsg <= queue->attr.mq_curmsgs)
-    {
-      pace_pthread_cond_wait (&queue->cond, &queue->mutex);
-      pace_printf ("Send Woke Up\n");
-    }
-  }
-
-  /* Fill in the fields of the header */
-  ((message_header*)(&mqdes->mptr[queue->freelist]))->priority = priority;
-  ((message_header*)(&mqdes->mptr[queue->freelist]))->length = length;
-  pace_memcpy (((void*)(&mqdes->mptr[queue->freelist + sizeof (message_header)])),
-               ptr, length);
-
-  /* Update the linked list */
-  old_index = 0;
-  index = queue->head;
-  while (index != 0 && ((message_header*)(&mqdes->mptr[index]))->priority >= priority)
-  {
-    old_index = index;
-    index = ((message_header*)(&mqdes->mptr[index]))->next;
-  }
-
-  /* If the msg goes at the head */
-  if (old_index == 0)
-  {
-    queue->head = queue->freelist;
-    queue->freelist = ((message_header*)(&mqdes->mptr[queue->freelist]))->next;
-    ((message_header*)(&mqdes->mptr[queue->head]))->next = index;
-  }
-  else
-  {
-    ((message_header*)(&mqdes->mptr[old_index]))->next = queue->freelist;
-    old_index = queue->freelist;
-    queue->freelist = ((message_header*)(&mqdes->mptr[queue->freelist]))->next;
-    ((message_header*)(&mqdes->mptr[old_index]))->next = index;
-  }
-
-  queue->attr.mq_curmsgs++;
-
-  if ((errno = pace_pthread_mutex_unlock (&queue->mutex)) != 0)
-  {
-    return -1;
-  }
-
-  if (queue->attr.mq_curmsgs == 1)
-  {
-    /* If there is no one waiting and blocked */
-    if (queue->not_pid != 0 && queue->rec_wait == 0)
-    {
-      if (queue->notification.sigev_notify == SIGEV_SIGNAL)
-      {
-        sigqueue (queue->not_pid,
-                  queue->notification.sigev_signo,
-                  queue->notification.sigev_value);
-      }
-      queue->not_pid = 0;
-    }
-    else
-    {
-      pace_printf ("Send is Signalling\n");
-      /* Let other waiting threads know there is food on the table */
-      if ((errno = pace_pthread_cond_signal (&((mqfile*)mqdes->mptr)->cond)) != 0)
-      {
-        return -1;
-      }
-    }
-  }
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-pace_ssize_t mq_receive (pace_mqd_t mqdes,
-                         char * msg_ptr,
-                         pace_size_t msg_len,
-                         unsigned int * nmsg_prio)
-{
-  mqfile* queue = ((mqfile*)mqdes->mptr);
-  pace_size_t temp;
-
-  if (queue->attr.mq_msgsize > (long) msg_len)
-  {
-    errno = EMSGSIZE;
-    return -1;
-  }
-
-  if ((errno = pace_pthread_mutex_lock (&queue->mutex)) != 0)
-  {
-    return -1;
-  }
-
-  /* If the queue is empty... */
-  if (queue->attr.mq_curmsgs <= 0)
-  {
-    if (queue->attr.mq_flags & O_NONBLOCK)
-    {
-      errno = EAGAIN;
-      return -1;
-    }
-    while (queue->attr.mq_curmsgs <= 0)
-    {
-      pace_printf ("Recv is going to sleep\n");
-      queue->rec_wait++;
-      pace_pthread_cond_wait (&(queue->cond), &(queue->mutex));
-      queue->rec_wait--;
-      pace_printf ("Recv is waking from sleep\n");
-    }
-  }
-
-  if (nmsg_prio != 0)
-  {
-    *nmsg_prio = ((message_header*)(&mqdes->mptr[queue->head]))->priority;
-  }
-
-  pace_memcpy (msg_ptr, ((void*)(&mqdes->mptr[queue->head + sizeof (message_header)])),
-               ((message_header*)(&mqdes->mptr[queue->head]))->length);
-  temp = queue->head;
-  queue->head = ((message_header*)(&mqdes->mptr[queue->head]))->next;
-  ((message_header*)(&mqdes->mptr[temp]))->next = queue->freelist;
-  queue->freelist = temp;
-
-  queue->attr.mq_curmsgs--;
-
-  if (pace_pthread_mutex_unlock (&queue->mutex) == -1)
-  {
-    errno = EBADMSG;
-    return -1;
-  }
-
-  if (queue->attr.mq_curmsgs == (queue->attr.mq_maxmsg-1))
-  {
-    pace_printf ("Recv is signalling\n");
-    /* Let other waiting threads know there is room available */
-    if ((errno = pace_pthread_cond_signal (&((mqfile*)mqdes->mptr)->cond)) != 0)
-    {
-      return -1;
-    }
-  }
-
-  return ((message_header*)(&mqdes->mptr[queue->head]))->length;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int mq_getattr (pace_mqd_t mqdes, pace_mq_attr * mqstat)
-{
-  mqfile* queue = ((mqfile*)mqdes->mptr);
-
-  if ((errno = pace_pthread_mutex_lock (&queue->mutex)) != 0)
-  {
-    return -1;
-  }
-
-  *mqstat = queue->attr;
-
-  pace_pthread_mutex_unlock (&queue->mutex);
-
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int mq_setattr(pace_mqd_t mqdes,
-               const pace_mq_attr * mqstat,
-               pace_mq_attr * omqstat)
-{
-  mqfile* queue = ((mqfile*)(mqdes->mptr));
-
-  if ((errno = pace_pthread_mutex_lock (&queue->mutex)) != 0)
-  {
-    return -1;
-  }
-  if (omqstat != 0)
-  {
-    *omqstat = ((mqfile*)mqdes->mptr)->attr;
-  }
-  if (mqstat == 0 || mqdes == 0)
-  {
-    /* You eediot*/
-    errno = EFAULT;
-    pace_pthread_mutex_unlock (&queue->mutex);
-    return -1;
-  }
-
-  ((mqfile*)mqdes->mptr)->attr.mq_flags = mqstat->mq_flags;
-
-  pace_pthread_mutex_unlock (&queue->mutex);
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int mq_notify (pace_mqd_t mqd, const pace_sigevent* notification)
-{
-  mqfile* queue = ((mqfile*)(mqd->mptr));
-  pace_pid_t pid = pace_getpid ();
-
-  if ((errno = pace_pthread_mutex_lock (&queue->mutex)) != 0)
-  {
-    return -1;
-  }
-
-  if (notification == 0)
-  {
-    /* Unregister if notification is null */
-    if (queue->not_pid == pid)
-    {
-      queue->not_pid = 0;
-    }
-  }
-  else
-  {
-    if (queue->not_pid && pace_kill (queue->not_pid, 0))
-    {
-      /* If another process is registered */
-      if (errno != ESRCH)
-      {
-        pace_pthread_mutex_unlock (&queue->mutex);
-        return -1;
-      }
-    }
-    queue->not_pid = pid;
-    queue->notification = *notification;
-  }
-
-  pthread_mutex_unlock (&queue->mutex);
-
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/emulation/mqueue.h b/PACE/pace/emulation/mqueue.h
deleted file mode 100644
index 539f0c19e90..00000000000
--- a/PACE/pace/emulation/mqueue.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $Id$
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/emulation/mqueue.h
- *
- * = AUTHOR
- *    John Heitmann
- *
- * = DESCRIPTION
- *    An implementation of POSIX message queues originally built for Linux,
- *    which lacks mqueue.h. Some ideas were taken from the W. Richard Stevens
- *    book Unix Network Programming Interprocess Communications Volume 2
- *    Second Edition.
- *    Memory Mapped io is used to enable a quick but persistent queue.
- *
- * ============================================================================ */
-
-#ifndef PACE_EMU_MQUEUE_H
-#define PACE_EMU_MQUEUE_H
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_MQ_ATTR
-typedef struct mq_attr
-{
-  long mq_flags;
-  long mq_maxmsg;
-  long mq_msgsize;
-  long mq_curmsgs;
-} pace_mq_attr;
-
-struct mqd
-{
-  long length;
-  int oflag;
-  char* mptr;
-};
-
-#define PACE_MQD_T
-typedef struct mqd* pace_mqd_t;
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-pace_mqd_t mq_open (const char* name,
-                    int oflag,
-                    pace_mode_t mode,
-                    pace_mq_attr* attr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int mq_close (pace_mqd_t mqdes);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int mq_unlink (const char* name);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int mq_send (pace_mqd_t mqdes,
-             const char* ptr,
-             pace_size_t length,
-             unsigned int priority);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-pace_ssize_t mq_receive (pace_mqd_t mqdes,
-                         char * msg_ptr,
-                         pace_size_t msg_len,
-                         unsigned int * nmsg_prio);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int mq_getattr (pace_mqd_t mqdes, pace_mq_attr * mqstat);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int mq_setattr(pace_mqd_t mqdes,
-               const pace_mq_attr * mqstat,
-               pace_mq_attr * omqstat);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int mq_notify (pace_mqd_t mqd, const pace_sigevent* notification);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_EMU_MQUEUE_H */
diff --git a/PACE/pace/emulation/time.h b/PACE/pace/emulation/time.h
deleted file mode 100644
index f4784190c81..00000000000
--- a/PACE/pace/emulation/time.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $Id$
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/emulation/time.h
- *
- * = AUTHOR
- *    John Heitmann
- *
- * ============================================================================ */
-
-#ifndef PACE_EMU_TIME_H
-#define PACE_EMU_TIME_H
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_EMU_CLOCKID_T
-#define PACE_EMU_CLOCKID_T
-  typedef int pace_emu_clockid_t;
-#endif /* PACE_EMU_CLOCKID_T */
-
-#ifndef PACE_EMU_TIMER_T
-#define PACE_EMU_TIMER_T
-  typedef int pace_emu_timer_t;
-#endif /* PACE_EMU_TIMER_T */
-
-#ifndef PACE_EMU_ITIMERSPEC
-#define PACE_EMU_ITIMERSPEC
-  typedef struct emu_itimerspec {} pace_emu_itimerspec;
-#endif /* PACE_EMU_ITIMERSPEC */
-
-#ifndef PACE_EMU_TIMESPEC
-#define PACE_EMU_TIMESPEC
-  typedef struct emu_timespec {} pace_emu_timespec;
-#endif /* PACE_EMU_TIMESPEC */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_EMU_TIME_H */
diff --git a/PACE/pace/errno.h b/PACE/pace/errno.h
deleted file mode 100644
index ae4f6bd4344..00000000000
--- a/PACE/pace/errno.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/errno.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_ERRNO_H
-#define PACE_ERRNO_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/errno.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/errno.h"
-#elif (PACE_WIN32)
-# include "pace/win32/errno.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_ERRNO_H */
diff --git a/PACE/pace/fcntl.h b/PACE/pace/fcntl.h
deleted file mode 100644
index 43d85574b26..00000000000
--- a/PACE/pace/fcntl.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/fnctl.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_FCNTL_H
-#define PACE_FCNTL_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/fcntl.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/fcntl.h"
-#elif (PACE_WIN32)
-# include "pace/win32/fcntl.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function creat.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.3.2.
-   */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE int pace_creat (const char * path, pace_mode_t mode);
-  /* WIN32 doesn't correctly return a file desciptor. WIN32 doesn't use
-     integers to represent file handles. Instead, we return 1 for success
-     and -1 for failure.
-   */
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function fcntl.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 6.5.2.
-   */
-#if (PACE_HAS_POSIX_FM_UOF)
-  /* int fcntl (int fildes, int cmd, *//* arg *//* ... ); */
-# if defined (PACE_WIN32)
-  int fcntl (PACE_HANDLE fildes, int cmd, /* arg */ ... );
-# endif /* PACE_WIN32 */
-
-# if defined (PACE_VXWORKS) && PACE_VXWORKS
-  PACE_Export PACE_INLINE int pace_fcntl(PACE_HANDLE fildes,
-                                         int cmd,
-                                         long arg);
-# else
-#  define pace_fcntl fcntl
-# endif /* ! PACE_VXWORKS */
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-  /**
-     PACE's implementation of the POSIX function open.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.3.1.
-   */
-#if (PACE_HAS_POSIX_DI_UOF)
-  /* int open (const char *path, int oflag, *//* pace_mode_t mode *//* ... );*/
-# if defined (PACE_HAS_CPLUPLUS)
-#  define pace_open ::open
-# else
-#  define pace_open open
-# endif /* PACE_HAS_CPLUSPLUS */
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/fcntl.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/fcntl.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/fcntl.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_FCNTL_H_INDIRECT */
diff --git a/PACE/pace/grp.h b/PACE/pace/grp.h
deleted file mode 100644
index eab5aba2b7c..00000000000
--- a/PACE/pace/grp.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/grp.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_GRP_H
-#define PACE_GRP_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/grp.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/grp.h"
-#elif (PACE_WIN32)
-# include "pace/win32/grp.h"
-#endif
-
-# if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-# endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function getgrgid.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 9.2.1.
-   */
-#if (PACE_HAS_POSIX_SD_UOF)
-  PACE_Export PACE_INLINE pace_group * pace_getgrgid (pace_gid_t gid);
-#endif /* PACE_HAS_POSIX_SD_UOF */
-
-  /**
-     PACE's implementation of the POSIX function getgrgid_r.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 9.2.1.
-   */
-#if (PACE_HAS_POSIX_SDR_UOF)
-  PACE_Export PACE_INLINE int pace_getgrgid_r (pace_gid_t gid,
-                                               pace_group * grp,
-                                               char * buffer,
-                                               size_t bufsize,
-                                               pace_group ** result);
-#endif /* PACE_HAS_POSIX_SDR_UOF */
-  /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */
-
-  /**
-     PACE's implementation of the POSIX function getgrnam.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 9.2.1.
-   */
-#if (PACE_HAS_POSIX_SD_UOF)
-  PACE_Export PACE_INLINE pace_group * pace_getgrnam (const char * name);
-#endif /* PACE_HAS_POSIX_SD_UOF */
-
-  /**
-     PACE's implementation of the POSIX function getgrnam_r.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 9.2.1.
-   */
-#if (PACE_HAS_POSIX_SDR_UOF)
-  PACE_Export PACE_INLINE int pace_getgrnam_r (const char * name,
-                                               pace_group * grp,
-                                               char * buffer,
-                                               size_t bufsize,
-                                               pace_group ** result);
-#endif /* PACE_HAS_POSIX_SDR_UOF */
-  /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/grp.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/grp.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/grp.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-# if defined (PACE_HAS_CPLUSPLUS)
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_GRP_H */
diff --git a/PACE/pace/limits.h b/PACE/pace/limits.h
deleted file mode 100644
index 9e13488b1fa..00000000000
--- a/PACE/pace/limits.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/limits.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_LIMITS_H_INDIRECT
-#define PACE_LIMITS_H_INDIRECT
-
-#include "pace/config/defines.h"
-
-#if defined (PACE_HAS_POSIX)
-# include "pace/posix/limits.h"
-#elif defined (PACE_VXWORKS)
-# include "pace/vxworks/limits.h"
-#elif defined (PACE_WIN32)
-# include "pace/win32/limits.h"
-#endif
-
-#endif /* PACE_LIMITS_H_INDIRECT */
diff --git a/PACE/pace/locale.h b/PACE/pace/locale.h
deleted file mode 100644
index 0435a4a7370..00000000000
--- a/PACE/pace/locale.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* $Id$ -*- C -*-
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/locale.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * =========================================================================== */
-
-#ifndef PACE_LOCALE_H
-#define PACE_LOCALE_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/locale.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/locale.h"
-#elif (PACE_WIN32)
-# include "pace/win32/locale.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     Fills in pace_lconv with values consistent with the
-     current locality.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE pace_lconv* pace_localeconv (void);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function setlocale.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.2.
-   */
-#if (PACE_HAS_POSIX_MP_UOF)
-  PACE_Export PACE_INLINE char * pace_setlocale (int category,
-                                                 const char * locale);
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/locale.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/locale.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/locale.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_LOCALE_H */
diff --git a/PACE/pace/man/Makefile b/PACE/pace/man/Makefile
deleted file mode 100644
index 8203d2d650c..00000000000
--- a/PACE/pace/man/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#----------------------------------------------------------------------------
-#       $Id$
-#
-#       Makefile for the PACE html man pages
-#       The man pages are generated from the POSIX header files.
-#----------------------------------------------------------------------------
-
-PACE_DOC++ = /project/doc/pkg/bin/doc++
-index.html:
-	$(PACE_DOC++) -H -F -B banner ../*.h
-
-clean:
-	$(RM) *.html *.gif *.class *.tex *.db .html
diff --git a/PACE/pace/man/banner b/PACE/pace/man/banner
deleted file mode 100644
index 668e1f5de5d..00000000000
--- a/PACE/pace/man/banner
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- $Id$ -->
-<!-- This is the banner file that doc++ inserts at the bottom of the -->
-<!-- generated html man pages. -->
-<!-- Originally written by: Joe Hoffert -->
-<A HREF="http://www.cs.wustl.edu/~luther/PACE/index.html"><IMG BORDER=0 ALIGN=RIGHT SRC=pace.jpg></A>
diff --git a/PACE/pace/man/pace.jpg b/PACE/pace/man/pace.jpg
deleted file mode 100644
index 62bc7130603..00000000000
--- a/PACE/pace/man/pace.jpg
+++ /dev/null
diff --git a/PACE/pace/math.h b/PACE/pace/math.h
deleted file mode 100644
index 44e23ee09e2..00000000000
--- a/PACE/pace/math.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = Filename
- *    pace/math.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_MATH_H
-#define PACE_MATH_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/math.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/math.h"
-#elif (PACE_WIN32)
-# include "pace/win32/math.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function acos.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_acos (double x);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function asin.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_asin (double x);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function atan.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_atan (double x);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function atan2.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_atan2 (double x, double y);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function cos.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_cos (double x);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function sin.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_sin (double x);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function tan.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_tan (double x);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function cosh.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_cosh (double x);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function sinh.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_sinh (double x);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function tanh.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_tanh (double x);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function exp.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_exp (double x);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function frexp.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_frexp (double x, int * exp);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function ldexp.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_ldexp (double x, int exp);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function log.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_log (double x);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function log10.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_log10 (double x);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function modf.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_modf (double x, double * iptr);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function pow.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_pow (double x, double y);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function sqrt.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_sqrt (double x);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function ceil.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_ceil (double x);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function fabs.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_fabs (double x);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function floor.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_floor (double x);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function fmod.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_fmod (double x, double y);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/math.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/math.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/math.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_MATH_H */
diff --git a/PACE/pace/mqueue.h b/PACE/pace/mqueue.h
deleted file mode 100644
index c799567c968..00000000000
--- a/PACE/pace/mqueue.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/mqueue.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_MQUEUE_H
-#define PACE_MQUEUE_H
-
-#include "pace/config/defines.h"
-#include "pace/signal.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/mqueue.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/mqueue.h"
-#elif (PACE_WIN32)
-# include "pace/win32/mqueue.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function mq_close.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 15.2.2.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_mq_close (pace_mqd_t mqdes);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function mq_getattr.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 15.2.8.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_mq_getattr (pace_mqd_t mqdes,
-                                               pace_mq_attr * mqstat);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function mq_notify.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 15.2.6.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_mq_notify (pace_mqd_t mqdes,
-                                              const pace_sigevent * notification);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function mq_open.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 15.2.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-#  define pace_mq_open mq_open
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-  /* mqd_t mq_open (const char *name, int oflag, (*//* args *//*) ... ); */
-
-  /**
-     PACE's implementation of the POSIX function mq_receive.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 15.2.5.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE pace_ssize_t pace_mq_receive (pace_mqd_t mqdes,
-                                                        char * msg_ptr,
-                                                        pace_size_t msg_len,
-                                                        unsigned int * nmsg_prio);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function mq_send.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 15.2.4.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_mq_send (pace_mqd_t mqdes,
-                                            const char * mst_ptr,
-                                            pace_size_t msg_len,
-                                            unsigned int psg_prio);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function mq_setattr.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 15.2.7.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_mq_setattr (pace_mqd_t mqdes,
-                                               const pace_mq_attr * mqstat,
-                                               pace_mq_attr * omqstat);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function mq_unlink.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 15.2.3.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_mq_unlink (const char * name);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/mqueue.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/mqueue.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/mqueue.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_MQUEUE_H */
diff --git a/PACE/pace/posix/Makefile.am b/PACE/pace/posix/Makefile.am
deleted file mode 100644
index d50c7d6885b..00000000000
--- a/PACE/pace/posix/Makefile.am
+++ /dev/null
@@ -1,113 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for the PACE C library
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-## Create a libtool convenience library that contains the contents of
-## the POSIX-specific version of PACE.
-noinst_LTLIBRARIES = libPACE_POSIX.la
-
-libPACE_POSIX_la_SOURCES = \
-  aio.c \
-  assert.c \
-  ctype.c \
-  dirent.c \
-  fcntl.c \
-  grp.c \
-  locale.c \
-  math.c \
-  mman.c \
-  mqueue.c \
-  pthread.c \
-  pwd.c \
-  sched.c \
-  semaphore.c \
-  setjmp.c \
-  signal.c \
-  stat.c \
-  stdio.c \
-  stdlib.c \
-  string.c \
-  termios.c \
-  time.c \
-  times.c \
-  unistd.c \
-  utime.c \
-  utsname.c \
-  wait.c
-
-PACE_INLINE_FILES = \
-  aio.inl \
-  assert.inl \
-  ctype.inl \
-  dirent.inl \
-  fcntl.inl \
-  grp.inl \
-  locale.inl \
-  math.inl \
-  mman.inl \
-  mqueue.inl \
-  pthread.inl \
-  pwd.inl \
-  sched.inl \
-  semaphore.inl \
-  setjmp.inl \
-  signal.inl \
-  stat.inl \
-  stdio.inl \
-  stdlib.inl \
-  string.inl \
-  termios.inl \
-  time.inl \
-  times.inl \
-  unistd.inl \
-  utime.inl \
-  utsname.inl \
-  wait.inl
-
-PACE_HEADER_FILES = \
-  aio.h \
-  assert.h \
-  ctype.h \
-  dirent.h \
-  errno.h \
-  fcntl.h \
-  grp.h \
-  limits.h \
-  locale.h \
-  math.h \
-  mman.h \
-  mqueue.h \
-  pthread.h \
-  pwd.h \
-  sched.h \
-  semaphore.h \
-  setjmp.h \
-  signal.h \
-  stat.h \
-  stdio.h \
-  stdlib.h \
-  string.h \
-  termios.h \
-  time.h \
-  times.h \
-  types.h \
-  unistd.h \
-  utime.h \
-  utsname.h \
-  wait.h
-
-pkgincludedir = $(includedir)/$(PACKAGE)/posix
-pkginclude_HEADERS = \
-  $(PACE_INLINE_FILES) \
-  $(PACE_HEADER_FILES)
diff --git a/PACE/pace/posix/README b/PACE/pace/posix/README
deleted file mode 100644
index 0116632c065..00000000000
--- a/PACE/pace/posix/README
+++ /dev/null
@@ -1 +0,0 @@
-POSIX dir
diff --git a/PACE/pace/posix/TODO b/PACE/pace/posix/TODO
deleted file mode 100644
index 6141d90a333..00000000000
--- a/PACE/pace/posix/TODO
+++ /dev/null
@@ -1,7 +0,0 @@
-$ID$
-
-Testing
-=======
-Test PACE libraries with and without PACE_HAS_POSIX_PTHREAD_SEMANTICS
-defined. There are some functions (e.g., in time.h) that have been
-changed because it looked like they didn't need this guard.
diff --git a/PACE/pace/posix/aio.c b/PACE/pace/posix/aio.c
deleted file mode 100644
index d2f62e92389..00000000000
--- a/PACE/pace/posix/aio.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/aio.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/aio.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/aio.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/aio.h b/PACE/pace/posix/aio.h
deleted file mode 100644
index 75a11416cc7..00000000000
--- a/PACE/pace/posix/aio.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/aio.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_AIO_H_POSIX
-#define PACE_AIO_H_POSIX
-
-#include <aio.h>
-#include "pace/time.h"
-#include "pace/signal.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_AIO_ALLDONE AIO_ALLDONE
-#define PACE_AIO_CANCELED AIO_CANCELED
-#define PACE_AIO_NOCANCELED AIO_NOTCANCELED
-#define PACE_LIO_NOP LIO_NOP
-#define PACE_LIO_NOWAIT LIO_NOWAIT
-#define PACE_LIO_READ LIO_READ
-#define PACE_LIO_WAIT LIO_WAIT
-#define PACE_LIO_WRITE LIO_WRITE
-
-#ifndef PACE_AIOCB
-#define PACE_AIOCB
-typedef struct aiocb pace_aiocb;
-#endif /* PACE_AIOCB */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_AIO_H_POSIX */
diff --git a/PACE/pace/posix/aio.inl b/PACE/pace/posix/aio.inl
deleted file mode 100644
index d219c0cabf9..00000000000
--- a/PACE/pace/posix/aio.inl
+++ /dev/null
@@ -1,94 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/aio.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_cancel (PACE_HANDLE fildes, pace_aiocb * aiocbp)
-{
-  return aio_cancel (fildes, aiocbp);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_error (const pace_aiocb * aiocbp)
-{
-  return aio_error (PACE_NONCONST_ARG_CAST (struct aiocb *) aiocbp);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_fsync (int op, pace_aiocb * aiocbp)
-{
-  return aio_fsync (op, aiocbp);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_read (pace_aiocb * aiocbp)
-{
-  return aio_read (aiocbp);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_return (pace_aiocb * aiocbp)
-{
-  return aio_return (aiocbp);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_suspend (const pace_aiocb * const list[],
-                  int nent,
-                  const pace_timespec * timeout)
-{
-  return aio_suspend (PACE_AIO_SUSPEND_LIST_ARG_CAST list,
-                      nent,
-                      PACE_NONCONST_ARG_CAST (struct timespec *) timeout);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_write (pace_aiocb * aiocbp)
-{
-  return aio_write (aiocbp);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_lio_listio (int mode,
-                 pace_aiocb * const list[],
-                 int nent,
-                 pace_sigevent * sig)
-{
-  return lio_listio (mode, PACE_NONCONST_ARG_CAST (struct aiocb **) list,
-                     nent, sig);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/posix/assert.c b/PACE/pace/posix/assert.c
deleted file mode 100644
index 368fd0a62f6..00000000000
--- a/PACE/pace/posix/assert.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/assert.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/assert.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/assert.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/assert.h b/PACE/pace/posix/assert.h
deleted file mode 100644
index 08c8b075cea..00000000000
--- a/PACE/pace/posix/assert.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/assert.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * =========================================================================== */
-
-#ifndef PACE_ASSERT_H_POSIX
-#define PACE_ASSERT_H_POSIX
-
-#include <assert.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-# if defined (PACE_HAS_CPLUSPLUS)
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_ASSERT_H_POSIX */
diff --git a/PACE/pace/posix/assert.inl b/PACE/pace/posix/assert.inl
deleted file mode 100644
index cc7974093d0..00000000000
--- a/PACE/pace/posix/assert.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/assert.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
diff --git a/PACE/pace/posix/ctype.c b/PACE/pace/posix/ctype.c
deleted file mode 100644
index 7bf7d34ae07..00000000000
--- a/PACE/pace/posix/ctype.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/ctype.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/ctype.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/ctype.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/ctype.h b/PACE/pace/posix/ctype.h
deleted file mode 100644
index 88c47c8e8cb..00000000000
--- a/PACE/pace/posix/ctype.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/ctype.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_CTYPE_H_POSIX
-#define PACE_CTYPE_H_POSIX
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_CTYPE_H_POSIX */
diff --git a/PACE/pace/posix/ctype.inl b/PACE/pace/posix/ctype.inl
deleted file mode 100644
index 538164bda4d..00000000000
--- a/PACE/pace/posix/ctype.inl
+++ /dev/null
@@ -1,133 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/ctype.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include <ctype.h>
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isalnum (int c)
-{
-  return isalnum (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isalpha (int c)
-{
-  return isalpha (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_iscntrl (int c)
-{
-  return iscntrl (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isdigit (int c)
-{
-  return isdigit (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isgraph (int c)
-{
-  return isgraph (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_islower (int c)
-{
-  return islower (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isprint (int c)
-{
-  return isprint (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_ispunct (int c)
-{
-  return ispunct (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isspace (int c)
-{
-  return isspace (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isupper (int c)
-{
-  return isupper (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isxdigit (int c)
-{
-  return isxdigit (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_tolower (int c)
-{
-  return tolower (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_toupper (int c)
-{
-  return toupper (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
diff --git a/PACE/pace/posix/dirent.c b/PACE/pace/posix/dirent.c
deleted file mode 100644
index d04ea9c1ac9..00000000000
--- a/PACE/pace/posix/dirent.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/dirent.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/dirent.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/dirent.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/dirent.h b/PACE/pace/posix/dirent.h
deleted file mode 100644
index 5662910233a..00000000000
--- a/PACE/pace/posix/dirent.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/dirent.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_DIRENT_H_POSIX
-#define PACE_DIRENT_H_POSIX
-
-#include "pace/sys/types.h"
-#include <dirent.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_DIR_T
-#define PACE_DIR_T
-typedef DIR PACE_DIR;
-#endif /* PACE_DIR_T */
-
-#ifndef PACE_DIRENT
-#define PACE_DIRENT
-typedef struct dirent pace_dirent;
-#endif /* PACE_DIRENT */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_DIRENT_H_POSIX */
diff --git a/PACE/pace/posix/dirent.inl b/PACE/pace/posix/dirent.inl
deleted file mode 100644
index 084b43e591c..00000000000
--- a/PACE/pace/posix/dirent.inl
+++ /dev/null
@@ -1,68 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/dirent.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-PACE_DIR *
-pace_opendir (const char * dirname)
-{
-  return opendir (dirname);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-pace_dirent *
-pace_readdir (PACE_DIR * dirp)
-{
-  return readdir (dirp);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-int
-pace_readdir_r (PACE_DIR * dirp, pace_dirent * entry,
-                pace_dirent ** result)
-{
-#if (PACE_LYNXOS)
-  *result = readdir_r (dirp, entry);
-  if (*result == 0)
-    return errno;
-  return 0;
-#else
-  return readdir_r (dirp, entry, result);
-#endif /* PACE_LYNXOS */
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-void
-pace_rewinddir (PACE_DIR * dirp)
-{
-  rewinddir (dirp);
-  return;
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_closedir (PACE_DIR * dirp)
-{
-  return closedir (dirp);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
diff --git a/PACE/pace/posix/errno.h b/PACE/pace/posix/errno.h
deleted file mode 100644
index 08595910435..00000000000
--- a/PACE/pace/posix/errno.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* $Id$
-
-* ============================================================================
-*
-* = LIBRARY
-*    pace
-*
-* = FILENAME
-*    pace/posix/errno.h
-*
-* = AUTHOR
-*    John Heitmann
-*
-* =========================================================================== *\
-/
-
-#ifndef PACE_ERRNO_H_POSIX
-#define PACE_ERRNO_H_POSIX
-
-#include <errno.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_E2BIG E2BIG
-#define PACE_EACCES EACCES
-#define PACE_EAGAIN EAGAIN
-#define PACE_EBADF EBADF
-#define PACE_EBADMSG
-#define PACE_EBUSY EBUSY
-#define PACE_ECANCELED ECANCELED
-#define PACE_ECHILD ECHILD
-#define PACE_EDEADLK EDEADLK
-#define PACE_EDOM EDOM
-#define PACE_EEXIST EEXIST
-#define PACE_EFAULT EFAULT
-#define PACE_EFBIG EFBIG
-#define PACE_EINPROGRESS EINPROGRESS
-#define PACE_EINTR EINTR
-#define PACE_EINVAL EINVAL
-#define PACE_EIO EIO
-#define PACE_EISDIR EISDIR
-#define PACE_EMFILE EMFILE
-#define PACE_EMLINK EMLINK
-#define PACE_EMSGSIZE EMSGSIZE
-#define PACE_EENAMETOOLONG ENAMETOOLONG
-#define PACE_ENFILE ENFILE
-#define PACE_ENODEV ENODEV
-#define PACE_ENOENT ENOENT
-#define PACE_ENOEXEC ENOEXEC
-#define PACE_ENOLCK ENOLCK
-#define PACE_ENOMEM ENOMEM
-#define PACE_ENOSPC ENOSPC
-#define PACE_ENOSYS ENOSYS
-#define PACE_ENOTDIR ENOTDIR
-#define PACE_ENOTEMPTY ENOTEMPTY
-#define PACE_ENOTSUP ENOTSUP
-#define PACE_ENOTTY ENOTTY
-#define PACE_ENXIO ENXIO
-#define PACE_EPERM EPERM
-#define PACE_EPIPE EPIPE
-#define PACE_ERANGE ERANGE
-#define PACE_EROFS EROFS
-#define PACE_ESPIPE ESPIPE
-#define PACE_ESRCH ESRCH
-#define PACE_ETIMEDOUT ETIMEDOUT
-#define PACE_EXDEV EXDEV
-
-#define pace_errno errno
-
-# if defined (PACE_HAS_CPLUSPLUS)
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_ERRNO_H_POSIX */
diff --git a/PACE/pace/posix/fcntl.c b/PACE/pace/posix/fcntl.c
deleted file mode 100644
index 69183a1ba35..00000000000
--- a/PACE/pace/posix/fcntl.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/fcntl.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/fcntl.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/fcntl.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/fcntl.h b/PACE/pace/posix/fcntl.h
deleted file mode 100644
index fc57bc098e3..00000000000
--- a/PACE/pace/posix/fcntl.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/fnctl.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_FCNTL_H_POSIX
-#define PACE_FCNTL_H_POSIX
-
-#include "pace/sys/types.h"
-#include "pace/unistd.h"
-#include "pace/sys/stat.h"
-#include <fcntl.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_FD_CLOEXEC FD_CLOEXEC
-#define PACE_F_DUPFD D_DUPFD
-#define PACE_F_GETFD F_GETFD
-#define PACE_F_GETFL F_GETFL
-#define PACE_F_GETLK F_GETLK
-#define PACE_F_RDLCK F_RDLCK
-#define PACE_F_SETFD F_SETFD
-#define PACE_F_SETFL F_SETFL
-#define PACE_F_SETLK F_SETLK
-#define PACE_F_SETLKW F_SETLKW
-#define PACE_F_UNLCK F_UNLCK
-#define PACE_F_WRLCK F_WRLCK
-#define PACE_O_ACCMODE O_ACCMODE
-#define PACE_O_APPEND O_APPEND
-#define PACE_O_CREAT O_CREAT
-#define PACE_O_DSYNC O_DSYNC
-#define PACE_O_EXCL O_EXCL
-#define PACE_O_NOCTTY O_NOCTTY
-#define PACE_O_NONBLOCK O_NONBLOCK
-#define PACE_O_RDONLY O_RDONLY
-#define PACE_O_RDWR O_RDWR
-#define PACE_O_RSYNC O_RSYNC
-#define PACE_O_SYNC O_SYNC
-#define PACE_O_TRUNC O_TRUNC
-#define PACE_O_WRONLY O_WRONLY
-
-#ifndef PACE_FLOCK
-#define PACE_FLOCK
-typedef struct flock pace_flock;
-#endif /* PACE_FLOCK */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_FCNTL_H_POSIX */
diff --git a/PACE/pace/posix/fcntl.inl b/PACE/pace/posix/fcntl.inl
deleted file mode 100644
index 01a7e732294..00000000000
--- a/PACE/pace/posix/fcntl.inl
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/fcntl.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_creat (const char * path, pace_mode_t mode)
-{
-  return creat (path, mode);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
diff --git a/PACE/pace/posix/grp.c b/PACE/pace/posix/grp.c
deleted file mode 100644
index 59b11cbb739..00000000000
--- a/PACE/pace/posix/grp.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/grp.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/grp.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/grp.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/grp.h b/PACE/pace/posix/grp.h
deleted file mode 100644
index 38be525562f..00000000000
--- a/PACE/pace/posix/grp.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace (posix ace)
- *
- * = FILENAME
- *    pace/posix/grp.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_GRP_H_POSIX
-#define PACE_GRP_H_POSIX
-
-#include <grp.h>
-
-# if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_GROUP
-#define PACE_GROUP
-typedef struct group pace_group;
-#endif /* PACE_GROUP */
-
-# if defined (PACE_HAS_CPLUSPLUS)
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_GRP_H_POSIX */
diff --git a/PACE/pace/posix/grp.inl b/PACE/pace/posix/grp.inl
deleted file mode 100644
index fcac3d5f1fd..00000000000
--- a/PACE/pace/posix/grp.inl
+++ /dev/null
@@ -1,73 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/grp.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_SD_UOF)
-PACE_INLINE
-pace_group *
-pace_getgrgid (pace_gid_t gid)
-{
-  return getgrgid (gid);
-}
-#endif /* PACE_HAS_POSIX_SD_UOF */
-
-#if (PACE_HAS_POSIX_SDR_UOF)
-PACE_INLINE
-int
-pace_getgrgid_r (pace_gid_t gid,
-                 pace_group * grp,
-                 char * buffer,
-                 size_t bufsize,
-                 pace_group ** result)
-{
-#if (PACE_LYNXOS)
-  *result = getgrgid_r (grp, gid, buffer, bufsize);
-  if (*result == 0)
-    return errno;
-  return 0;
-#else
-  return getgrgid_r (gid, grp, buffer, bufsize, result);
-#endif /* ! PACE_LYNXOS */
-}
-#endif /* PACE_HAS_POSIX_SDR_UOF */
-
-#if (PACE_HAS_POSIX_SD_UOF)
-PACE_INLINE
-pace_group *
-pace_getgrnam (const char * name)
-{
-  return getgrnam (name);
-}
-#endif /* PACE_HAS_POSIX_SD_UOF */
-
-#if (PACE_HAS_POSIX_SDR_UOF)
-PACE_INLINE
-int
-pace_getgrnam_r (const char * name,
-                  pace_group * grp,
-                  char * buffer,
-                  size_t bufsize,
-                  pace_group ** result)
-{
-#if (PACE_LYNXOS)
-  *result = getgrnam_r (grp, PACE_NONCONST_ARG_CAST (char *) name,
-                        buffer, bufsize);
-  if (*result == 0)
-    return errno;
-  return 0;
-#else
-  return getgrnam_r (name, grp, buffer, bufsize, result);
-#endif /* ! PACE_LYNXOS */
-}
-#endif /* PACE_HAS_POSIX_SDR_UOF */
diff --git a/PACE/pace/posix/limits.h b/PACE/pace/posix/limits.h
deleted file mode 100644
index fb952113bbd..00000000000
--- a/PACE/pace/posix/limits.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace (posix ace)
- *
- * = FILENAME
- *    pace/posix/limits.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_LIMITS_H
-#define PACE_LIMITS_H
-
-#include <limits.h>
-
-# if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-# endif /* (PACE_HAS_CPLUSPLUS) */
-
-# if defined (PACE_HAS_CPLUSPLUS)
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_LIMITS_H */
diff --git a/PACE/pace/posix/locale.c b/PACE/pace/posix/locale.c
deleted file mode 100644
index 3f818716eda..00000000000
--- a/PACE/pace/posix/locale.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/locale.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/locale.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/locale.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/locale.h b/PACE/pace/posix/locale.h
deleted file mode 100644
index 704d23d3c96..00000000000
--- a/PACE/pace/posix/locale.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/locale.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * =========================================================================== */
-
-#ifndef PACE_LOCALE_H_POSIX
-#define PACE_LOCALE_H_POSIX
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_LC_ALL LC_ALL
-#define PACE_LC_COLLATE LC_COLLATE
-#define PACE_LC_CTYPE LC_CTYPE
-#define PACE_LC_MONETARY LC_MONETARY
-#define PACE_LC_NUMERIC LC_NUMERIC
-#define PACE_LC_TIME LC_TIME
-#define PACE_NULL NULL
-
-#ifndef PACE_LCONV
-#define PACE_LCONV
-typedef struct lconv pace_lconv;
-#endif /* PACE_LCONV */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_LOCALE_H_POSIX */
diff --git a/PACE/pace/posix/locale.inl b/PACE/pace/posix/locale.inl
deleted file mode 100644
index ed0a94e319d..00000000000
--- a/PACE/pace/posix/locale.inl
+++ /dev/null
@@ -1,34 +0,0 @@
-/* $Id$ -*- C -*-
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/locale.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * =========================================================================== */
-
-#include <locale.h>
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_lconv *
-pace_localeconv (void)
-{
-  return localeconv ();
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-char *
-pace_setlocale (int category, const char * locale)
-{
-  return setlocale (category, locale);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
diff --git a/PACE/pace/posix/math.c b/PACE/pace/posix/math.c
deleted file mode 100644
index 8c2e32301fa..00000000000
--- a/PACE/pace/posix/math.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/math.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/math.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/math.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/math.h b/PACE/pace/posix/math.h
deleted file mode 100644
index 34e68241bc7..00000000000
--- a/PACE/pace/posix/math.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/math.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_MATH_H_POSIX
-#define PACE_MATH_H_POSIX
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_HUGE_VAL HUGE_VAL
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_MATH_H_POSIX */
diff --git a/PACE/pace/posix/math.inl b/PACE/pace/posix/math.inl
deleted file mode 100644
index 29709c4dd95..00000000000
--- a/PACE/pace/posix/math.inl
+++ /dev/null
@@ -1,215 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/math.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-/* FUZZ: disable check_for_math_include */
-#include <math.h>
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_acos (double x)
-{
-  return acos (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_asin (double x)
-{
-  return asin (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_atan (double x)
-{
-  return atan (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_atan2 (double x, double y)
-{
-  return atan2 (x, y);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_cos (double x)
-{
-  return cos (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_sin (double x)
-{
-  return sin (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_tan (double x)
-{
-  return tan (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_cosh (double x)
-{
-  return cosh (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_sinh (double x)
-{
-  return sinh (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_tanh (double x)
-{
-  return tanh (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_exp (double x)
-{
-  return exp (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_frexp (double x, int * exp)
-{
-  return frexp (x, exp);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_ldexp (double x, int exp)
-{
-  return ldexp (x, exp);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_log (double x)
-{
-  return log (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_log10 (double x)
-{
-  return log10 (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_modf (double x, double * iptr)
-{
-  return modf (x, iptr);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_pow (double x, double y)
-{
-  return pow (x, y);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_sqrt (double x)
-{
-  return sqrt (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_ceil (double x)
-{
-  return ceil (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_fabs (double x)
-{
-  return fabs (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_floor (double x)
-{
-  return floor (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_fmod (double x, double y)
-{
-  return fmod (x, y);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
diff --git a/PACE/pace/posix/mman.c b/PACE/pace/posix/mman.c
deleted file mode 100644
index b68b87baa22..00000000000
--- a/PACE/pace/posix/mman.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/mman.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/sys/mman.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/mman.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/mman.h b/PACE/pace/posix/mman.h
deleted file mode 100644
index f45efe48efa..00000000000
--- a/PACE/pace/posix/mman.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/mman.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_MMAN_H_POSIX
-#define PACE_SYS_MMAN_H_POSIX
-
-#include <sys/mman.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_MAP_FAILED MAP_FAILED
-#define PACE_MAP_FIXED MAP_FIXED
-#define PACE_MAP_PRIVATE MAP_PRIVATE
-#define PACE_MAP_SHARED MAP_SHARED
-#define PACE_MCL_CURRENT MCL_CURRENT
-#define PACE_MS_ASYNC MS_ASYNC
-#define PACE_MS_INVALIDATE
-#define PACE_MS_SYNC MS_SYNC
-#define PACE_PROT_EXEC PROT_EXEC
-#define PACE_PROT_NONE PROT_NONE
-#define PACE_PROT_READ PROT_READ
-#define PACE_PROT_WRITE PROT_WRITE
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_MMAN_H_POSIX */
diff --git a/PACE/pace/posix/mman.inl b/PACE/pace/posix/mman.inl
deleted file mode 100644
index a89782fa44e..00000000000
--- a/PACE/pace/posix/mman.inl
+++ /dev/null
@@ -1,127 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/mman.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mlock (const void * addr, pace_size_t len)
-{
-  return mlock (((char*)addr), len);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mlockall (int flags)
-{
-  return mlockall (flags);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void *
-pace_mmap (void * addr,
-           pace_size_t len,
-           int prot,
-           int flags,
-           PACE_HANDLE fildes,
-           pace_off_t off)
-{
-  return mmap ((char *) addr, len, prot, flags, fildes, off);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_munlock (const void * addr, pace_size_t len)
-{
-  return munlock (((char*)addr), len);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mprotect (void * addr,
-               pace_size_t len,
-               int prot)
-{
-  return mprotect ((char*)addr, len, prot);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_msync (void * addr,
-            pace_size_t len,
-            int flags)
-{
-  return msync ((char*)addr, len, flags);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_munlockall ()
-{
-  return munlockall ();
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_munmap (void * addr, pace_size_t len)
-{
-  return munmap ((char *) addr, len);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-PACE_HANDLE
-pace_shm_open (const char * name,
-               int oflag,
-               pace_mode_t mode)
-{
-# if (PACE_POSIX_C_SOURCE > 2)
-  return shm_open (name, oflag, mode);
-# else /* ! PACE_POSIX_C_SOURCE */
-  PACE_UNUSED_ARG (name);
-  PACE_UNUSED_ARG (oflag);
-  PACE_UNUSED_ARG (mode);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-# endif /* ! PACE_POSIX_C_SOURCE */
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_shm_unlink (const char * name)
-{
-# if (PACE_POSIX_C_SOURCE > 2)
-  return shm_unlink (name);
-# else /* ! PACE_POSIX_C_SOURCE */
-  PACE_UNUSED_ARG (name);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-# endif /* ! PACE_POSIX_C_SOURCE */
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/posix/mqueue.c b/PACE/pace/posix/mqueue.c
deleted file mode 100644
index 596c75e3905..00000000000
--- a/PACE/pace/posix/mqueue.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace (posix ace)
- *
- * = FILENAME
- *    pace/posix/mqueue.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/mqueue.h"
-
-#if PACE_LINUX
-# include "pace/emulation/mqueue.c"
-#endif /* PACE_LINUX */
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/mqueue.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/mqueue.h b/PACE/pace/posix/mqueue.h
deleted file mode 100644
index 66483f040cf..00000000000
--- a/PACE/pace/posix/mqueue.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/mqueue.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_MQUEUE_H_POSIX
-#define PACE_MQUEUE_H_POSIX
-
-#if PACE_LINUX
-# include "pace/emulation/mqueue.h"
-#else
-# include <mqueue.h>
-#endif /* PACE_LINUX */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_MQD_T
-#define PACE_MQD_T
-  typedef mqd_t pace_mqd_t;
-#endif /* PACE_MQD_T */
-
-#ifndef PACE_MQ_ATTR
-#define PACE_MQ_ATTR
-  typedef struct mq_attr pace_mq_attr;
-#endif /* PACE_MQ_ATTR */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_MQUEUE_H_POSIX */
diff --git a/PACE/pace/posix/mqueue.inl b/PACE/pace/posix/mqueue.inl
deleted file mode 100644
index 2459563e9b3..00000000000
--- a/PACE/pace/posix/mqueue.inl
+++ /dev/null
@@ -1,87 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/mqueue.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_close (pace_mqd_t mqdes)
-{
-  return mq_close (mqdes);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_getattr (pace_mqd_t mqdes,
-                 pace_mq_attr * mqstat)
-{
-  return mq_getattr (mqdes, mqstat);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_notify (pace_mqd_t mqdes,
-                const pace_sigevent * notification)
-{
-  return mq_notify (mqdes, notification);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-ssize_t
-pace_mq_receive (pace_mqd_t mqdes,
-                 char * msg_ptr,
-                 size_t msg_len,
-                 unsigned int * msg_prio)
-{
-  return mq_receive (mqdes, msg_ptr, msg_len, msg_prio);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_send (pace_mqd_t mqdes,
-              const char * msg_ptr,
-              size_t msg_len,
-              unsigned int msg_prio)
-{
-  return mq_send (mqdes, msg_ptr, msg_len, msg_prio);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_setattr (pace_mqd_t mqdes,
-                 const pace_mq_attr * mqstat,
-                 pace_mq_attr * omqstat)
-{
-  return mq_setattr (mqdes, mqstat, omqstat);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_unlink (const char * name)
-{
-  return mq_unlink (name);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/posix/pthread.c b/PACE/pace/posix/pthread.c
deleted file mode 100644
index 426c377c446..00000000000
--- a/PACE/pace/posix/pthread.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/pthread.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/pthread.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/pthread.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/pthread.h b/PACE/pace/posix/pthread.h
deleted file mode 100644
index b998c50e7c1..00000000000
--- a/PACE/pace/posix/pthread.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/pthread.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_PTHREAD_H_POSIX
-#define PACE_PTHREAD_H_POSIX
-
-#include <pthread.h>
-#include "pace/sys/types.h"
-#include "pace/signal.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_PTHREAD_CANCELED PTHREAD_CANCELED
-#define PACE_PTHREAD_CANCEL_AYNCHRONOUS PTHREAD_CANCEL_ASYNCHRONOUS
-#define PACE_PTHREAD_CANCEL_DEFERRED PTHREAD_CANCEL_DEFERRED
-#define PACE_PTHREAD_CACEL_DISABLE PTHREAD_CANCEL_DISABLE
-#define PACE_PTHREAD_CANCEL_ENABLE PTHREAD_CANCEL_ENABLE
-#define PACE_PTHREAD_COND_INITIALIZER PTHREAD_COND_INITIALIZER
-#define PACE_PTHREAD_CREATE_DETACHED PTHREAD_CREATE_DETACHED
-#define PACE_PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_JOINABLE
-#define PACE_PTHREAD_EXPLICIT_SCHED PTHREAD_EXPLICIT_SCHED
-#define PACE_PTHREAD_INHERIT_SCHED PTHREAD_INHERIT_SCHED
-#define PACE_PTHREAD_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
-#define PACE_PTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
-#define PACE_PTHREAD_PRIO_INHERIT PTHREAD_PRIO_INHERIT
-#define PACE_PTHREAD_PRIO_NONE PTHREAD_PRIO_NONE
-#define PACE_PTHREAD_PRIO_PROTECT PTHREAD_PRIO_PROTECT
-#define PACE_PTHREAD_PROCESS_PRIVATE PTHREAD_PROCESS_PRIVATE
-#define PACE_PTHREAD_PROCESS_SHARED PTHREAD_PROCESS_SHARED
-#define PACE_PTHREAD_SCOPE_PROCESS PTHREAD_SCOPE_PROCESS
-#define PACE_PTHREAD_SCOPE_SYSTEM PTHREAD_SCOPE_SYSTEM
-
-#ifndef PACE_SCHED_PARAM
-#define PACE_SCHED_PARAM
-  typedef struct sched_param pace_sched_param;
-#endif /* PACE_SCHED_PARAM */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-# ifndef PACE_ATFORK_PF
-# define PACE_ATFORK_PF
-  typedef void (*pace_atfork_pf) (void);
-# endif /* PACE_ATFORK_PF */
-
-# ifndef PACE_KEYCREATE_PF
-# define PACE_KEYCREATE_PF
-  typedef void (*pace_keycreate_pf) (void*);
-# endif /* PACE_KEYCREATE_PF */
-
-# ifndef PACE_ONCE_PF
-# define PACE_ONCE_PF
-  typedef void (*pace_once_pf) (void);
-# endif /* PACE_ONCE_PF */
-
-# ifndef PACE_CREATE_PF
-# define PACE_CREATE_PF
-  typedef void* (*pace_create_pf) (void*);
-# endif /* PACE_CREATE_PF */
-
-#endif /* PACE_HAS_CPLUPLUS */
-
-
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_PTHREAD_H_POSIX */
diff --git a/PACE/pace/posix/pthread.inl b/PACE/pace/posix/pthread.inl
deleted file mode 100644
index cb16f5b9575..00000000000
--- a/PACE/pace/posix/pthread.inl
+++ /dev/null
@@ -1,761 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/pthread.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/unistd.h"
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-# if defined (PACE_HAS_CPLUSPLUS)
-PACE_INLINE
-int
-pace_pthread_atfork (pace_atfork_pf prepare,
-                     pace_atfork_pf parent,
-                     pace_atfork_pf child)
-{
-  return pthread_atfork (prepare, parent, child);
-}
-# else /* ! PACE_HAS_CPLUSPLUS */
-PACE_INLINE
-int
-pace_pthread_atfork (void (*prepare) (),
-                     void (*parent) (),
-                     void (*child) ())
-{
-  return pthread_atfork (prepare, parent, child);
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_destroy (pace_pthread_attr_t * attr)
-{
-  return pthread_attr_destroy (attr);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getdetachstate (const pace_pthread_attr_t * attr,
-                                  int * detachstate)
-{
-  return pthread_attr_getdetachstate (attr, detachstate);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getinheritsched (const pace_pthread_attr_t * attr,
-                                   int * inheritsched)
-{
-#if PACE_LYNXOS == 0x300
-  return pthread_attr_getinheritsched (PACE_NONCONST_ARG_CAST (pace_pthread_attr_t *) attr);
-#else
-  return pthread_attr_getinheritsched (PACE_NONCONST_ARG_CAST (pace_pthread_attr_t *) attr,
-                                       inheritsched);
-#endif /* PACE_LYNXOS != 0x300 */
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getschedparam (const pace_pthread_attr_t * attr,
-                                 pace_sched_param * param)
-{
-  return pthread_attr_getschedparam (attr, param);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getschedpolicy (const pace_pthread_attr_t * attr,
-                                  int * policy)
-{
-  return pthread_attr_getschedpolicy (attr, policy);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getscope (const pace_pthread_attr_t * attr,
-                            int * contentionscope)
-{
-  return pthread_attr_getscope (attr, contentionscope);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getstackaddr (const pace_pthread_attr_t * attr,
-                                void ** stackaddr)
-{
-  return pthread_attr_getstackaddr (attr, stackaddr);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getstacksize (const pace_pthread_attr_t * attr,
-                                size_t * stacksize)
-{
-#if PACE_LYNXOS == 0x300
-  return pthread_attr_getstacksize (PACE_NONCONST_ARG_CAST (pace_pthread_attr_t *) attr);
-#else
-  return pthread_attr_getstacksize (PACE_NONCONST_ARG_CAST (pace_pthread_attr_t *) attr,
-                                    stacksize);
-#endif /* PACE_LYNXOS != 0x300 */
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_init (pace_pthread_attr_t * attr)
-{
-  return pthread_attr_init (attr);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setdetachstate (pace_pthread_attr_t * attr,
-                                  int detachstate)
-{
-  return pthread_attr_setdetachstate (attr, detachstate);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setinheritsched (pace_pthread_attr_t * attr,
-                                   int inheritsched)
-{
-  return pthread_attr_setinheritsched (attr, inheritsched);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setschedparam (pace_pthread_attr_t * attr,
-                                 const pace_sched_param * param)
-{
-  return pthread_attr_setschedparam (attr, param);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setschedpolicy (pace_pthread_attr_t * attr,
-                                  int policy)
-{
-  return pthread_attr_setschedpolicy (attr, policy);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setscope (pace_pthread_attr_t * attr,
-                            int contentionscope)
-{
-  return pthread_attr_setscope (attr, contentionscope);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setstackaddr (pace_pthread_attr_t * attr,
-                                void * stackaddr)
-{
-  return pthread_attr_setstackaddr (attr, stackaddr);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setstacksize (pace_pthread_attr_t * attr,
-                                size_t stacksize)
-{
-  return pthread_attr_setstacksize (attr, stacksize);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cancel (pace_pthread_t thread)
-{
-  return pthread_cancel (thread);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_broadcast (pace_pthread_cond_t * cond)
-{
-  return pthread_cond_broadcast (cond);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_destroy (pace_pthread_cond_t * cond)
-{
-  return pthread_cond_destroy (cond);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_init (pace_pthread_cond_t * cond,
-                        const pace_pthread_condattr_t * attr)
-{
-#if PACE_LYNXOS == 0x300
-  return pthread_cond_init (cond, *attr);
-#else
-  return pthread_cond_init (cond, attr);
-#endif /* PACE_LYNXOS != 0x300 */
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_signal (pace_pthread_cond_t * cond)
-{
-  return pthread_cond_signal (cond);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_timedwait (pthread_cond_t * cond,
-                             pace_pthread_mutex_t * mutex,
-                             const pace_timespec * abstime)
-{
-  return pthread_cond_timedwait (cond, mutex, PACE_NONCONST_ARG_CAST (struct timespec *) abstime);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_wait (pace_pthread_cond_t * cond,
-                        pace_pthread_mutex_t * mutex)
-{
-  return pthread_cond_wait (cond, mutex);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_condattr_destroy (pace_pthread_condattr_t * attr)
-{
-  return pthread_condattr_destroy (attr);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_condattr_getpshared (const pace_pthread_condattr_t * attr,
-                                  int * pshared)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (attr);
-  PACE_UNUSED_ARG (pshared);
-  return -1;
-#else
-  return pthread_condattr_getpshared (PACE_NONCONST_ARG_CAST (pace_pthread_condattr_t *) attr, pshared);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_condattr_init (pace_pthread_condattr_t * attr)
-{
-  return pthread_condattr_init (attr);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_condattr_setpshared (pace_pthread_condattr_t * attr,
-                                 int pshared)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (attr);
-  PACE_UNUSED_ARG (pshared);
-  return -1;
-#else
-  return pthread_condattr_setpshared (attr, pshared);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-# if defined (PACE_HAS_CPLUSPLUS)
-PACE_INLINE
-int
-pace_pthread_create (pace_pthread_t * thread,
-                     const pace_pthread_attr_t * attr,
-                     pace_create_pf start_routine,
-                     void * arg)
-{
-  return pthread_create (thread, attr, start_routine, arg);
-}
-# else /* ! PACE_HAS_CPLUSPLUS */
-PACE_INLINE
-int
-pace_pthread_create (pace_pthread_t * thread,
-                     const pace_pthread_attr_t * attr,
-                     void * (*start_routine) (void*),
-                     void * arg)
-{
-#if PACE_LYNXOS == 0x300
-  return pthread_create (thread, *attr, start_routine, arg);
-#else
-  return pthread_create (thread, attr, start_routine, arg);
-#endif /* PACE_LYNXOS != 0x300 */
-}
-# endif /*! PACE_HAS_CPLUSPLUS */
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_detach (pace_pthread_t thread)
-{
-#if PACE_LYNXOS == 0x300
-  return pthread_detach (&thread);
-#else
-  return pthread_detach (thread);
-#endif /* PACE_LYNXOS != 0x300 */
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_equal (pace_pthread_t t1, pthread_t t2)
-{
-  return pthread_equal (t1, t2);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void
-pace_pthread_exit (void * value_ptr)
-{
-  pthread_exit (value_ptr);
-  return;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_getschedparam (pace_pthread_t thread,
-                            int * policy,
-                            pace_sched_param * param)
-{
-  return pthread_getschedparam (thread, policy, param);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void *
-pace_pthread_getspecific (pace_pthread_key_t key)
-{
-#if PACE_LYNXOS == 0x300
-  void *value;
-  if (pthread_getspecific (key, &value) != 0)
-    return 0;
-
-  return value;
-#else
-  return pthread_getspecific (key);
-#endif /* PACE_LYNXOS != 0x300 */
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_join (pace_pthread_t thread, void ** value_ptr)
-{
-  return pthread_join (thread, value_ptr);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-# if defined (PACE_HAS_CPLUSPLUS)
-PACE_INLINE
-int
-pace_pthread_key_create (pace_pthread_key_t * key,
-                         pace_keycreate_pf destructor)
-{
-  return pthread_key_create (key, destructor);
-}
-#else /* ! PACE_HAS_CPLUSPLUS */
-PACE_INLINE
-int
-pace_pthread_key_create (pace_pthread_key_t * key,
-                         void (*destructor)(void*))
-{
-  return pthread_key_create (key, destructor);
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_key_delete (pace_pthread_key_t key)
-{
-  return pthread_key_delete (key);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_kill (pace_pthread_t thread, int sig)
-{
-  return pthread_kill (thread, sig);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_destroy (pace_pthread_mutex_t * mutex)
-{
-  return pthread_mutex_destroy (mutex);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_getprioceiling (pace_pthread_mutex_t * mutex,
-                                   int * prioceiling)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (mutex);
-  PACE_UNUSED_ARG (prioceiling);
-  return -1;
-#elif PACE_LYNXOS
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-#else  /* ! PACE_LYNXOS */
-  return pthread_mutex_getprioceiling (mutex, prioceiling);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_init (pace_pthread_mutex_t * mutex,
-                         const pace_pthread_mutexattr_t * attr)
-{
-#if PACE_LYNXOS == 0x300
-  return pthread_mutex_init (mutex, *attr);
-#else
-  return pthread_mutex_init (mutex, attr);
-#endif /* PACE_LYNXOS != 0x300 */
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_lock (pace_pthread_mutex_t * mutex)
-{
-  return pthread_mutex_lock (mutex);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_setprioceiling (pace_pthread_mutex_t * mutex,
-                                   int prioceiling,
-                                   int * old_ceiling)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (mutex);
-  PACE_UNUSED_ARG (prioceiling);
-  PACE_UNUSED_ARG (old_ceiling);
-  return -1;
-#elif PACE_LYNXOS
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-#else  /* ! PACE_LYNXOS */
-  return pthread_mutex_setprioceiling (mutex, prioceiling, old_ceiling);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_trylock (pthread_mutex_t * mutex)
-{
-  return pthread_mutex_trylock (mutex);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_unlock (pace_pthread_mutex_t * mutex)
-{
-  return pthread_mutex_unlock (mutex);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_destroy (pace_pthread_mutexattr_t * attr)
-{
-  return pthread_mutexattr_destroy (attr);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_getprioceiling (pace_pthread_mutexattr_t * attr,
-                                       int * prioceiling)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (attr);
-  PACE_UNUSED_ARG (prioceiling);
-  return -1;
-#else
-  return pthread_mutexattr_getprioceiling (attr, prioceiling);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_getprotocol (const pace_pthread_mutexattr_t * attr,
-                                    int * protocol)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (attr);
-  PACE_UNUSED_ARG (protocol);
-  return -1;
-#else
-  return pthread_mutexattr_getprotocol (PACE_NONCONST_ARG_CAST (pace_pthread_mutexattr_t *) attr, protocol);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_setprioceiling (pace_pthread_mutexattr_t * attr,
-                                       int prioceiling)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (attr);
-  PACE_UNUSED_ARG (prioceiling);
-  return -1;
-#else
-  return pthread_mutexattr_setprioceiling (attr, prioceiling);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_setprotocol (pace_pthread_mutexattr_t * attr,
-                                    int protocol)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (attr);
-  PACE_UNUSED_ARG (protocol);
-  return -1;
-#else
-  return pthread_mutexattr_setprotocol (attr, protocol);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_getpshared (const pace_pthread_mutexattr_t * attr,
-                                   int * pshared)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (attr);
-  PACE_UNUSED_ARG (pshared);
-  return -1;
-#else
-  return pthread_mutexattr_getpshared (PACE_NONCONST_ARG_CAST (pace_pthread_mutexattr_t *) attr, pshared);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_init (pace_pthread_mutexattr_t * attr)
-{
-  return pthread_mutexattr_init (attr);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_setpshared (pace_pthread_mutexattr_t * attr,
-                                   int pshared)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (attr);
-  PACE_UNUSED_ARG (pshared);
-  return -1;
-#else
-  return pthread_mutexattr_setpshared (attr, pshared);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-# if defined (PACE_HAS_CPLUSPLUS)
-PACE_INLINE
-int
-pace_pthread_once (pace_pthread_once_t * once_control,
-                   pace_once_pf void_routine)
-{
-  return pthread_once (once_control, void_routine);
-}
-# else /* ! PACE_HAS_CPLUSPLUS */
-PACE_INLINE
-int
-pace_pthread_once (pace_pthread_once_t * once_control,
-                   void (*void_routine) (void))
-{
-  return pthread_once (once_control, void_routine);
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_pthread_t
-pace_pthread_self ()
-{
-  return pthread_self ();
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_setcancelstate (int state, int * oldstate)
-{
-  return pthread_setcancelstate (state, oldstate);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_setcanceltype (int type, int * oldtype)
-{
-  return pthread_setcanceltype (type, oldtype);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_setschedparam (pace_pthread_t thread,
-                            int policy,
-                            const pace_sched_param * param)
-{
-  return pthread_setschedparam (thread, policy, param);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_setspecific (pace_pthread_key_t key, const void * value)
-{
-  return pthread_setspecific (key, PACE_NONCONST_ARG_CAST (void *) value);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_sigmask (int how, const sigset_t * set,
-                      sigset_t * oset)
-{
-  return pthread_sigmask (how, set, oset);
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void
-pace_pthread_testcancel ()
-{
-  pthread_testcancel ();
-  return;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
diff --git a/PACE/pace/posix/pwd.c b/PACE/pace/posix/pwd.c
deleted file mode 100644
index 6284186cd66..00000000000
--- a/PACE/pace/posix/pwd.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/pwd.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/pwd.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/pwd.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/pwd.h b/PACE/pace/posix/pwd.h
deleted file mode 100644
index 70398e0871c..00000000000
--- a/PACE/pace/posix/pwd.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/pwd.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_PWD_H_POSIX
-#define PACE_PWD_H_POSIX
-
-#include <pwd.h>
-#include "pace/sys/types.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_PASSWD
-#define PACE_PASSWD
-  typedef struct passwd pace_passwd;
-#endif /* PACE_PASSWD */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_PWD_H_POSIX */
diff --git a/PACE/pace/posix/pwd.inl b/PACE/pace/posix/pwd.inl
deleted file mode 100644
index ee52fd2be0d..00000000000
--- a/PACE/pace/posix/pwd.inl
+++ /dev/null
@@ -1,81 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/pwd.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_SD_UOF)
-PACE_INLINE
-pace_passwd *
-pace_getpwuid (pace_uid_t uid)
-{
-  return getpwuid (uid);
-}
-#endif /* PACE_HAS_POSIX_SD_UOF */
-
-#if (PACE_HAS_POSIX_SDR_UOF)
-PACE_INLINE
-int
-pace_getpwuid_r (pace_uid_t uid,
-                 pace_passwd * pwd,
-                 char * buffer,
-                 pace_size_t bufsize,
-                 pace_passwd ** result)
-{
-#if (PACE_LYNXOS)
-  if (getpwuid_r (pwd, uid, buffer, bufsize) == 0)
-    /* Successful search */
-    {
-      **result = *pwd;
-      return 0;
-    }
-
-  return -1;
-#else
-  return getpwuid_r (uid, pwd, buffer, bufsize, result);
-#endif /* ! PACE_LYNXOS */
-}
-#endif /* PACE_HAS_POSIX_SDR_UOF */
-
-#if (PACE_HAS_POSIX_SD_UOF)
-PACE_INLINE
-pace_passwd *
-pace_getpwnam (const char * name)
-{
-  return getpwnam (name);
-}
-#endif /* PACE_HAS_POSIX_SD_UOF */
-
-#if (PACE_HAS_POSIX_SDR_UOF)
-PACE_INLINE
-int
-pace_getpwnam_r (const char * name,
-                 pace_passwd * pwd,
-                 char * buffer,
-                 pace_size_t bufsize,
-                 pace_passwd ** result)
-{
-# if (PACE_LYNXOS)
-  if (getpwnam_r (pwd, PACE_NONCONST_ARG_CAST (char *) name,
-                  buffer, bufsize) == 0)
-    /* Successful search */
-    {
-      **result = *pwd;
-      return 0;
-    }
-
-  return -1;
-#else
-  return getpwnam_r (name, pwd, buffer, bufsize, result);
-#endif /* ! PACE_LYNXOS */
-}
-#endif /* PACE_HAS_POSIX_SDR_UOF */
diff --git a/PACE/pace/posix/sched.c b/PACE/pace/posix/sched.c
deleted file mode 100644
index d78a66dbc7f..00000000000
--- a/PACE/pace/posix/sched.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/sched.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/sched.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/sched.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/sched.h b/PACE/pace/posix/sched.h
deleted file mode 100644
index a3405d2bbd1..00000000000
--- a/PACE/pace/posix/sched.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/sched.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SCHED_H_POSIX
-#define PACE_SCHED_H_POSIX
-
-#include <sched.h>
-#include "pace/time.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_SCHED_FIFO SCHED_FIFO
-#define PACE_SCHED_OTHER SCHED_RR
-
-#ifndef PACE_SCHED_PARAM
-#define PACE_SCHED_PARAM
-  typedef struct sched_param pace_sched_param;
-#endif /* PACE_SCHED_PARAM */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SCHED_H_POSIX */
diff --git a/PACE/pace/posix/sched.inl b/PACE/pace/posix/sched.inl
deleted file mode 100644
index 86f3ac7d776..00000000000
--- a/PACE/pace/posix/sched.inl
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/sched.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_get_priority_max (int policy)
-{
-  return sched_get_priority_max (policy);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_get_priority_min (int policy)
-{
-  return sched_get_priority_min (policy);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_getparam (pace_pid_t pid,
-                     pace_sched_param * param)
-{
-  return sched_getparam (pid, param);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_rr_get_interval (pace_pid_t pid,
-                            pace_timespec * interval)
-{
-#if PACE_SUNOS == 551
-  return sched_get_rr_get_interval (pid, interval);
-#else
-  return sched_rr_get_interval (pid, interval);
-#endif /* PACE_SUNOS != 551 */
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_setparam (pace_pid_t pid,
-                     const pace_sched_param * param)
-{
-  return sched_setparam (pid, param);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_getscheduler (pace_pid_t pid)
-{
-  return sched_getscheduler (pid);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_setscheduler (pace_pid_t pid,
-                         int policy,
-                         const pace_sched_param * param)
-{
-  return sched_setscheduler (pid, policy, param);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_yield ()
-{
-  return sched_yield ();
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/posix/semaphore.c b/PACE/pace/posix/semaphore.c
deleted file mode 100644
index 695190f4531..00000000000
--- a/PACE/pace/posix/semaphore.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/semaphore.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/semaphore.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/semaphore.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/semaphore.h b/PACE/pace/posix/semaphore.h
deleted file mode 100644
index 4cdf0d3dd04..00000000000
--- a/PACE/pace/posix/semaphore.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/semaphore.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SEMAPHORE_H_POSIX
-#define PACE_SEMAPHORE_H_POSIX
-
-#include <semaphore.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-typedef sem_t pace_sem_t;
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SEMAPHORE_H_POSIX */
diff --git a/PACE/pace/posix/semaphore.inl b/PACE/pace/posix/semaphore.inl
deleted file mode 100644
index b0d4fb21906..00000000000
--- a/PACE/pace/posix/semaphore.inl
+++ /dev/null
@@ -1,86 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/semaphore.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_close (pace_sem_t * sem)
-{
-  return sem_close (sem);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_destroy (pace_sem_t * sem)
-{
-  return sem_destroy (sem);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_getvalue (pace_sem_t * sem, int * sval)
-{
-  return sem_getvalue (sem, sval);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_init (pace_sem_t * sem, int pshared, unsigned int value)
-{
-  return sem_init (sem, pshared, value);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_post (pace_sem_t * sem)
-{
-  return sem_post (sem);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_trywait (pace_sem_t * sem)
-{
-  return sem_trywait (sem);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_unlink (const char * name)
-{
-  return sem_unlink (name);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_wait (pace_sem_t * sem)
-{
-  return sem_wait (sem);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/posix/setjmp.c b/PACE/pace/posix/setjmp.c
deleted file mode 100644
index 00db5828a7c..00000000000
--- a/PACE/pace/posix/setjmp.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/setjmp.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/setjmp.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/setjmp.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/setjmp.h b/PACE/pace/posix/setjmp.h
deleted file mode 100644
index 30221f2e74d..00000000000
--- a/PACE/pace/posix/setjmp.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/setjmp.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SETJMP_H_POSIX
-#define PACE_SETJMP_H_POSIX
-
-#include <setjmp.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  typedef jmp_buf pace_jmp_buf;
-  typedef sigjmp_buf pace_sigjmp_buf;
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SETJMP_H_POSIX */
diff --git a/PACE/pace/posix/setjmp.inl b/PACE/pace/posix/setjmp.inl
deleted file mode 100644
index e51bcb77167..00000000000
--- a/PACE/pace/posix/setjmp.inl
+++ /dev/null
@@ -1,34 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/setjmp.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void
-pace_longjmp (pace_jmp_buf env, int val)
-{
-  longjmp (env, val);
-  return;
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-void
-pace_siglongjmp (pace_sigjmp_buf env, int val)
-{
-  siglongjmp (env, val);
-  return;
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
diff --git a/PACE/pace/posix/signal.c b/PACE/pace/posix/signal.c
deleted file mode 100644
index 46d96b76fb0..00000000000
--- a/PACE/pace/posix/signal.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/signal.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/signal.h"
-
-#if (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/signal.inl"
-#endif /* ! PACE_HAS_INLINE */
-
-#if (PACE_HAS_CPLUSPLUS)
-}
-#endif
diff --git a/PACE/pace/posix/signal.h b/PACE/pace/posix/signal.h
deleted file mode 100644
index 6362595ae31..00000000000
--- a/PACE/pace/posix/signal.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/signal.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#ifndef PACE_SIGNAL_H_POSIX
-#define PACE_SIGNAL_H_POSIX
-
-#include <signal.h>
-#include "pace/sys/types.h"
-#include "pace/time.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_SIG_PF
-# define PACE_SIG_PF
-  typedef void (*pace_sig_pf)(int);
-#endif /* PACE_SIG_PF */
-
-#ifndef PACE_SIG_ATOMIC_T
-#define PACE_SIG_ATOMIC_T
-  typedef sig_atomic_t pace_sig_atomic_t;
-#endif /* PACE_SIG_ATOMIC_T */
-
-#ifndef PACE_SIGSET_T
-#define PACE_SIGSET_T
-  typedef sigset_t pace_sigset_t;
-#endif /* PACE_SIGSET_T */
-
-#ifndef PACE_SIGACTION_S
-#define PACE_SIGACTION_S
-  typedef struct sigaction pace_sigaction_s;
-#endif /* PACE_SIGACTION_S */
-
-#ifndef PACE_SIGINFO_T
-#define PACE_SIGINFO_T
-  typedef siginfo_t pace_siginfo_t;
-#endif /* PACE_SIGINFO_T */
-
-#ifndef PACE_SIGEVENT
-#define PACE_SIGEVENT
-  typedef struct sigevent pace_sigevent;
-#endif /* PACE_SIGEVENT */
-
-#ifndef PACE_SIGVAL
-#define PACE_SIGVAL
-  typedef union sigval pace_sigval;
-#endif /* PACE_SIGVAL */
-
-#ifndef PACE_TIMESPEC
-#define PACE_TIMESPEC
-  typedef struct timespec pace_timespec;
-#endif /* PACE_TIMESPEC */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SIGNAL_H_POSIX */
diff --git a/PACE/pace/posix/signal.inl b/PACE/pace/posix/signal.inl
deleted file mode 100644
index ce591600baa..00000000000
--- a/PACE/pace/posix/signal.inl
+++ /dev/null
@@ -1,167 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/signal.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/pthread.h"
-#include "pace/time.h"
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_kill (pace_pid_t pid, int sig)
-{
-  return kill (pid, sig);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_raise (int sig)
-{
-  /* Implementation from POSIX std 8.1:54 */
-  return pthread_kill (pthread_self (), sig);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigaction (int sig, const pace_sigaction_s * act,
-                pace_sigaction_s * oact)
-{
-  return sigaction (sig, act, oact);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigaddset (pace_sigset_t * set, int signo)
-{
-  return sigaddset (set, signo);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigemptyset (pace_sigset_t * set)
-{
-  return sigemptyset (set);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigdelset (pace_sigset_t * set, int signo)
-{
-  return sigdelset (set, signo);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigfillset (pace_sigset_t * set)
-{
-  return sigfillset (set);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigismember (const pace_sigset_t * set, int signo)
-{
-  return sigismember (set, signo);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_sig_pf
-pace_signal (int sig, pace_sig_pf func)
-{
-  return signal (sig, func);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigpending (pace_sigset_t * set)
-{
-  return sigpending (set);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigprocmask (int how, const pace_sigset_t * set,
-                  pace_sigset_t * oset)
-{
-  return sigprocmask (how, set, oset);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sigqueue (pace_pid_t pid, int signo,
-               const pace_sigval value)
-{
-  return sigqueue (pid, signo, value);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigsuspend (const pace_sigset_t * sigmask)
-{
-  return sigsuspend (sigmask);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sigtimedwait (const pace_sigset_t * set, pace_siginfo_t * info,
-                   const pace_timespec * timeout)
-{
-  return sigtimedwait (set, info, timeout);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sigwait (const pace_sigset_t * set, int * sig)
-{
-  return sigwait (PACE_NONCONST_ARG_CAST (pace_sigset_t *) set,
-                  PACE_VOIDSTARTSTAR_ARG_CAST (void**) sig);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sigwaitinfo (const pace_sigset_t *set, pace_siginfo_t *info)
-{
-  return sigwaitinfo (set, info);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/posix/socket.c b/PACE/pace/posix/socket.c
deleted file mode 100644
index ef5494116c7..00000000000
--- a/PACE/pace/posix/socket.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/socket.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/sys/socket.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/socket.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/socket.h b/PACE/pace/posix/socket.h
deleted file mode 100644
index 187230d776a..00000000000
--- a/PACE/pace/posix/socket.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/socket.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SOCKET_H_POSIX
-#define PACE_SOCKET_H_POSIX
-
-#include <sys/types.h>
-#if PACE_LYNXOS == 0x300 || PACE_LYNXOS == 0x310
-#include <socket.h>
-#include <uio.h>
-#else
-#include <sys/socket.h>
-#include <sys/uio.h>
-#endif /* PACE_LYNXOS != 0x300 && PACE_LYNXOS != 0x310 */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_SOMAXCONN
-#define PACE_SOMAXCONN SOMAXCONN
-#endif /* PACE_SOMAXCONN */
-
-#ifndef PACE_SOCKLEN_T
-#define PACE_SOCKLEN_T
-# if PACE_LYNXOS == 0x300 || PACE_LYNXOS == 0x310 || PACE_SUNOS == 551 || PACE_SUNOS == 560 || PACE_QNX == 600
-    typedef int pace_socklen_t;
-# else
-    typedef socklen_t pace_socklen_t;
-# endif /* PACE_LYNXOS != 0x300 && PACE_LYNXOS != 0x310 */
-#endif /* PACE_SOCKLEN_T */
-
-#ifndef PACE_SA_FAMILY_T
-#define PACE_SA_FAMILY_T
-# if PACE_LYNXOS != 0x300 && PACE_LYNXOS != 0x310 && PACE_SUNOS != 551 && (PACE_HPUX)
-    typedef sa_family_t pace_family_t;
-# endif /* PACE_LYNXOS != 0x300 && PACE_LYNXOS != 0x310 */
-#endif /* PACE_SA_FAMILY_T */
-
-#ifndef PACE_MSGHDR
-#define PACE_MSGHDR
-    typedef struct msghdr pace_msghdr;
-#endif /* PACE_MSGHDR */
-
-#ifndef PACE_CMSGRHDR
-#define PACE_CMSGRHDR
-    typedef struct cmsghdr pace_cmsghdr;
-#endif /* PACE_CMSGRHDR */
-
-#ifndef PACE_LINGER
-#define PACE_LINGER
-    typedef struct linger pace_linger;
-#endif /* PACE_LINGER */
-
-#ifndef PACE_SOCK_STREAM
-#define PACE_SOCK_STREAM SOCK_STREAM
-#endif /* PACE_SOCK_STREAM */
-
-#ifndef PACE_SOCK_DGRAM
-#define PACE_SOCK_DGRAM SOCK_DGRAM
-#endif /* PACE_SOCK_DGRAM */
-
-#ifndef PACE_SOCK_RAW
-#define PACE_SOCK_RAW SOCK_RAW
-#endif /* PACE_MSGHDR */
-
-#ifndef PACE_SOCK_SEQPACKET
-#define PACE_SOCK_SEQPACKET SOCK_SEQPACKET
-#endif /* PACE_SOCK_SEQPACKET */
-
-#ifndef PACE_PF_UNSPEC
-#define PACE_PF_UNSPEC PF_UNSPEC
-#endif /* PACE_PF_UNSPEC */
-
-#ifndef PACE_PF_LOCAL
-#define PACE_PF_LOCAL PF_LOCAL
-#endif /* PACE_PF_LOCAL */
-
-#ifndef PACE_PF_INET
-#define PACE_PF_INET PF_INET
-#endif /* PACE_PF_INET */
-
-#ifndef PACE_PF_ISO
-#define PACE_PF_ISO PF_ISO
-#endif /* PACE_PF_ISO */
-
-#ifndef PACE_PF_OSI
-#define PACE_PF_OSI PF_OSI
-#endif /* PACE_PF_OSI */
-
-#ifndef PACE_AF_UNSPEC
-#define PACE_AF_UNSPEC AF_UNSPEC
-#endif /* PACE_AF_UNSPEC */
-
-#ifndef PACE_AF_LOCAL
-#define PACE_AF_LOCAL AF_LOCAL
-#endif /* PACE_AF_LOCAL */
-
-#ifndef PACE_AF_INET
-#define PACE_AF_INET AF_INET
-#endif /* PACE_AF_INET */
-
-#ifndef PACE_AF_ISO
-#define PACE_AF_ISO AF_ISO
-#endif /* PACE_AF_ISO */
-
-#ifndef PACE_AF_OSI
-#define PACE_AF_OSI AF_OSI
-#endif /* PACE_AF_OSI */
-
-#ifndef PACE_MSG_OOB
-#define PACE_MSG_OOB MSG_OOB
-#endif /* PACE_MSG_OOB */
-
-#ifndef PACE_MSG_PEEK
-#define PACE_MSG_PEEK MSG_PEEK
-#endif /* PACE_MSG_PEEK */
-
-#ifndef PACE_MSG_DONTROUTE
-#define PACE_MSG_DONTROUTE MSG_DONTROUTE
-#endif /* PACE_MSG_DONTROUTE */
-
-#ifndef PACE_MSG_EOR
-#define PACE_MSG_EOR MSG_EOR
-#endif /* PACE_MSG_EOR */
-
-#ifndef PACE_MSG_TRUNC
-#define PACE_MSG_TRUNC MSG_TRUNC
-#endif /* PACE_MSG_TRUNC */
-
-#ifndef PACE_MSG_CTRUNC
-#define PACE_MSG_CTRUNC MSG_CTRUNC
-#endif /* PACE_MSG_CTRUNC */
-
-#ifndef PACE_MSG_WAITALL
-#define PACE_MSG_WAITALL MSG_WAITALL
-#endif /* PACE_MSG_WAITALL */
-
-#ifndef PACE_SOL_SOCKET
-#define PACE_SOL_SOCKET SOL_SOCKET
-#endif /* PACE_SOL_SOCKET */
-
-#ifndef PACE_SO_BROADCAST
-#define PACE_SO_BROADCAST SO_BROADCAST
-#endif /* PACE_SO_BROADCAST */
-
-#ifndef PACE_SO_DEBUG
-#define PACE_SO_DEBUG SO_DEBUG
-#endif /* PACE_SO_DEBUG */
-
-#ifndef PACE_SO_DONTROUTE
-#define PACE_SO_DONTROUTE SO_DONTROUTE
-#endif /* PACE_SO_DONTROUTE */
-
-#ifndef PACE_SO_ERROR
-#define PACE_SO_ERROR SO_ERROR
-#endif /* PACE_SO_ERROR */
-
-#ifndef PACE_SO_KEEPALIVE
-#define PACE_SO_KEEPALIVE SO_KEEPALIVE
-#endif /* PACE_SO_KEEPALIVE */
-
-#ifndef PACE_SO_LINGER
-#define PACE_SO_LINGER SO_LINGER
-#endif /* PACE_SO_LINGER */
-
-#ifndef PACE_SO_OOBINLINE
-#define PACE_SO_OOBINLINE SO_OOBINLINE
-#endif /* PACE_SO_OOBINLINE */
-
-#ifndef PACE_SO_RCVBUF
-#define PACE_SO_RCVBUF SO_RCVBUF
-#endif /* PACE_SO_RCVBUF */
-
-#ifndef PACE_SO_RCVLOWAT
-#define PACE_SO_RCVLOWAT SO_RCVLOWAT
-#endif /* PACE_SO_RCVLOWAT */
-
-#ifndef PACE_SO_RCVTIMEO
-#define PACE_SO_RCVTIMEO SO_RCVTIMEO
-#endif /* PACE_SO_RCVTIMEO */
-
-#ifndef PACE_SO_REUSEADDR
-#define PACE_SO_REUSEADDR SO_REUSEADDR
-#endif /* PACE_SO_REUSEADDR */
-
-#ifndef PACE_SO_SNDBUF
-#define PACE_SO_SNDBUF SO_SNDBUF
-#endif /* PACE_SO_SNDBUF */
-
-#ifndef PACE_SO_SNDLOWAT
-#define PACE_SO_SNDLOWAT SO_SNDLOWAT
-#endif /* PACE_SO_SNDLOWAT */
-
-#ifndef PACE_SO_SNDTIMEO
-#define PACE_SO_SNDTIMEO SO_SNDTIMEO
-#endif /* PACE_SO_SNDTIMEO */
-
-#ifndef PACE_SO_TYPE
-#define PACE_SO_TYPE SO_TYPE
-#endif /* PACE_SO_TYPE */
-
-#ifndef PACE_CMSG_DATA
-#define PACE_CMSG_DATA(cmsg)          CMSG_DATA(cmsg)
-#endif /* PACE_CMSG_DATA */
-
-#ifndef PACE_CMSG_NXTHDR
-#define PACE_CMSG_NXTHDR(mhdr, cmsg)  CMSG_NXTHDR(mhdr, cmsg)
-#endif /* PACE_CMSG_DATA */
-
-#ifndef PACE_CMSG_FIRSTHDR
-#define PACE_CMSG_NXTHDR(mhdr, cmsg)  CMSG_NXTHDR(mhdr, cmsg)
-#endif /* PACE_CMSG_DATA */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SOCKET_H_POSIX */
diff --git a/PACE/pace/posix/socket.inl b/PACE/pace/posix/socket.inl
deleted file mode 100644
index 5b38e4e198c..00000000000
--- a/PACE/pace/posix/socket.inl
+++ /dev/null
@@ -1,242 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/socket.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include <unistd.h>
-#include <stdarg.h>
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_accept (int s,
-             pace_sockaddr * socketaddress,
-             pace_socklen_t * addresslen)
-{
-    accept (s, socketaddress, addresslen);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_bind (int s,
-           const pace_sockaddr * socketaddress,
-           pace_socklen_t addresslen)
-{
-    bind (s, socketaddress, addresslen);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_connect (int s,
-              const pace_sockaddr * socketaddress,
-              pace_socklen_t addresslen)
-{
-    connect (s, socketaddress, addresslen);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_getpeername (int s,
-                  pace_sockaddr * socketaddress,
-                  pace_socklen_t * addresslen)
-{
-    getpeername (s, socketaddress, addresslen);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_getsockname (int s,
-                  pace_sockaddr * socketaddress,
-                  pace_socklen_t * addresslen)
-{
-    getsockname (s, socketaddress, addresslen);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_getsockopt (int s,
-                 int level,
-                 int optname,
-                 void * optval,
-                 pace_socklen_t optlen)
-{
-    getsockopt (s, level, optname, optval, optlen);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_setsockopt (int s,
-                 int level,
-                 int optname,
-                 const * optval)
-{
-    setsockopt (s, level, optname, optval);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_setsockopt (int s,
-                 int level,
-                 int optname,
-                 const * optval)
-{
-    setsockopt (s, level, optname, optval);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_isfdtype (int fildes, int fdtype)
-{
-    isfdtype (fildes, fdtype);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_listen (int s, int backlog)
-{
-    listen (s, backlog);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-pace_ssize_t
-pace_recv (int s,
-           void * buf,
-           pace_size_t len,
-           int flags)
-{
-    recv (s, buf, len, flags);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-pace_ssize_t
-pace_recvfrom (int s,
-               void * buf,
-               pace_size_t len,
-               int flags,
-               pace_sockaddr * from,
-               pace_socklen_t * fromlen)
-{
-    recvfrom (s, buf, len, flags, from, fromlen);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-pace_ssize_t
-pace_rcvmsg (int s,
-             pace_msghdr * msg,
-             int flags)
-{
-    rcvmsg (s, msg, flags);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-pace_ssize_t
-pace_send (int s,
-           const void * buf,
-           pace_size_t len,
-           int flags)
-{
-    send (s, buf, len, flags);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-pace_ssize_t
-pace_sendto (int s,
-             const void * buf,
-             pace_size_t len,
-             int flags,
-             const pace_sockaddr * to,
-             pace_socklen_t * tolen)
-{
-    sendto (s, buf, len, flags, to, tolen);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-pace_ssize_t
-pace_sendmsg (int s,
-              const pace_msghdr * msg,
-              int flags)
-{
-    sendmsg (s, msg, flags);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_shutdown (int s, int how)
-{
-    shutdown (s, how);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_socket (int protofamily, int type, int protocol)
-{
-    socket (protofamily, type, protocol);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_socketpair (int protofamily,
-                 int type,
-                 int protocol,
-                 int sv[2])
-{
-    socketpair (protofamily, type, protocol, sy);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-
-
-
-
-
-
-
-
-
-
diff --git a/PACE/pace/posix/stat.c b/PACE/pace/posix/stat.c
deleted file mode 100644
index efd10b03f76..00000000000
--- a/PACE/pace/posix/stat.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/stat.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/sys/stat.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/stat.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/stat.h b/PACE/pace/posix/stat.h
deleted file mode 100644
index 1fc9ca38e74..00000000000
--- a/PACE/pace/posix/stat.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/stat.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_STAT_H_POSIX
-#define PACE_SYS_STAT_H_POSIX
-
-#include <sys/stat.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_S_IRGRP S_IRGRP
-#define PACE_S_IROTH S_IROTH
-#define PACE_S_IRUSR S_IRUSR
-#define PACE_S_IRWXG S_IRWXG
-#define PACE_S_IRWXO S_IRWXO
-#define PACE_S_IRWXU S_IRWXU
-#define PACE_S_ISBLK S_ISBLK
-#define PACE_S_ISCHR S_ISCHR
-#define PACE_S_ISDIR S_ISDIR
-#define PACE_S_ISFIFO S_ISFIFO
-#define PACE_S_ISGID S_SIGID
-#define PACE_S_ISREG S_ISREG
-#define PACE_S_ISUID S_ISUID
-#define PACE_S_IWGRP S_IWGRP
-#define PACE_S_IWOTH S_IWOTH
-#define PACE_S_IWUSR S_IWUSR
-#define PACE_S_IXGRP S_IXGRP
-#define PACE_S_IXOTH S_IXOTH
-#define PACE_S_IXUSR S_IXUSR
-#define PACE_S_TYPEISMQ S_TYPEISMQ
-#define PACE_S_TYPEISSEM S_TYPEISSEM
-#define PACE_S_TYPEISSHM S_TYPEISSHM
-
-#ifndef PACE_STAT
-#define PACE_STAT
-  /* Kludge since there is a func and a type of the same name */
-  typedef struct stat pace_stat_s;
-#endif /* PACE_STAT */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_STAT_H_POSIX */
diff --git a/PACE/pace/posix/stat.inl b/PACE/pace/posix/stat.inl
deleted file mode 100644
index fa9b1e61714..00000000000
--- a/PACE/pace/posix/stat.inl
+++ /dev/null
@@ -1,77 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/stat.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_FA_UOF)
-PACE_INLINE
-int
-pace_chmod (const char * path, pace_mode_t mode)
-{
-  return chmod (path, mode);
-}
-#endif /* PACE_HAS_POSIX_FA_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_fchmod (PACE_HANDLE fildes, pace_mode_t mode)
-{
-  return fchmod (fildes, mode);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_fstat (PACE_HANDLE fildes, pace_stat_s * buf)
-{
-  return fstat (fildes, buf);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_mkdir (const char * path, pace_mode_t mode)
-{
-  return mkdir (path, mode);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_F_UOF)
-PACE_INLINE
-int
-pace_mkfifo (const char * path, pace_mode_t mode)
-{
-  return mkfifo (path, mode);
-}
-#endif /* PACE_HAS_POSIX_F_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_stat (const char * path, pace_stat_s * buf)
-{
-  return stat (path, buf);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FA_UOF)
-PACE_INLINE
-pace_mode_t
-pace_umask (pace_mode_t cmask)
-{
-  return umask (cmask);
-}
-#endif /* PACE_HAS_POSIX_FA_UOF */
diff --git a/PACE/pace/posix/stdio.c b/PACE/pace/posix/stdio.c
deleted file mode 100644
index 251d6da309d..00000000000
--- a/PACE/pace/posix/stdio.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/stdio.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/stdio.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/stdio.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/stdio.h b/PACE/pace/posix/stdio.h
deleted file mode 100644
index 901476acd75..00000000000
--- a/PACE/pace/posix/stdio.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $Id$ -*- C -*-
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/stdio.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_STDIO_H_POSIX
-#define PACE_STDIO_H_POSIX
-
-#include <stdarg.h>
-#include <stdio.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_BUFSIZ BUFSIZ
-#define PACE_EOF EOF
-#define PACE_FILENAME_MAX FILENAME_MAX
-#define PACE_L_ctermid L_ctermid
-#define PACE_L_cuserid L_cuserid
-#ifndef PACE_NULL
-#define PACE_NULL NULL
-#endif /* PACE_NULL */
-#define PACE_SEEK_CUR SEEK_CUR
-#define PACE_SEEK_END SEEK_END
-#define PACE_SEEK_SET SEEK_SET
-#define PACE_TMP_MAX TMP_MAX
-#define pace_stderr stderr
-#define pace_stdout stdout
-#define pace_stdin stdin
-
-#ifndef PACE_FPOS_T
-#define PACE_FPOS_T
-typedef fpos_t pace_fpos_t;
-#endif /* PACE_FPOS_T */
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T
-  typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-typedef FILE PACE_FILE;
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_STDIO_H_POSIX */
diff --git a/PACE/pace/posix/stdio.inl b/PACE/pace/posix/stdio.inl
deleted file mode 100644
index 630d7c5e2bc..00000000000
--- a/PACE/pace/posix/stdio.inl
+++ /dev/null
@@ -1,502 +0,0 @@
-/* $Id$ -*- C -*-
-
- * ===========================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/stdio.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * =========================================================================== */
-
-#include <stdarg.h>
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-void
-pace_clearerr (FILE * stream)
-{
-  clearerr (stream);
-  return;
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-char *
-pace_ctermid (char * s)
-{
-  return ctermid (s);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fclose (FILE * stream)
-{
-  return fclose (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-FILE *
-pace_fdopen (int fildes,
-             const char * type)
-{
-  return fdopen (fildes,
-                 type);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_ferror (FILE * stream)
-{
-  return ferror (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_feof (FILE * stream)
-{
-  return feof (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fflush (FILE * stream)
-{
-  return fflush (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fileno (FILE * stream)
-{
-  return fileno (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fgetc (FILE * stream)
-{
-  return fgetc (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_fgetpos(PACE_FILE * stream,
-             pace_fpos_t * pos)
-{
-  return fgetpos (stream, pos);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-char *
-pace_fgets (char * s,
-            int n,
-            FILE * stream)
-{
-  return fgets (s,
-                n,
-                stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-void
-pace_flockfile (FILE * file)
-{
-#if defined (PACE_HAS_REENTRANT)
-  flockfile (file);
-#else /* ! PACE_HAS_REENTRANT */
-  PACE_UNUSED_ARG (file);
-  PACE_ERRNO_NO_SUPPORT ();
-#endif /* ! PACE_HAS_REENTRANT */
-  return;
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-FILE *
-pace_fopen (const char * filename,
-            const char * mode)
-{
-  return fopen (filename,
-                mode);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fputc (int c,
-            FILE * stream)
-{
-  return fputc (c,
-                stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fputs (const char * s,
-            FILE * stream)
-{
-  return fputs (s,
-                stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-size_t
-pace_fread (void * ptr,
-            size_t size,
-            size_t number_of_items,
-            FILE * stream)
-{
-  return fread (ptr,
-                size,
-                number_of_items,
-                stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-FILE *
-pace_freopen (const char * filename,
-              const char * mode,
-              FILE * stream)
-{
-  return freopen (filename,
-                  mode,
-                  stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-int
-pace_fseek (FILE * stream,
-            long offset,
-            int whence)
-{
-  return fseek (stream,
-                offset,
-                whence);
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_fsetpos(PACE_FILE *stream, const pace_fpos_t *pos)
-{
-  return fsetpos (stream, pos);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-long
-pace_ftell (FILE * stream)
-{
-  return ftell (stream);
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-int
-pace_ftrylockfile (FILE * file)
-{
-#if defined (PACE_HAS_REENTRANT)
-  return ftrylockfile (file);
-#else /* ! PACE_HAS_REENTRANT */
-  PACE_UNUSED_ARG(file);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-#endif /* ! PACE_HAS_REENTRANT */
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-void
-pace_funlockfile (FILE * file)
-{
-#if defined (PACE_HAS_REENTRANT)
-  funlockfile (file);
-#else /* ! PACE_HAS_REENTRANT */
-  PACE_UNUSED_ARG(file);
-  PACE_ERRNO_NO_SUPPORT ();
-#endif /* ! PACE_HAS_REENTRANT */
-  return;
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-pace_size_t
-pace_fwrite(const void * ptr,
-            pace_size_t size, pace_size_t nmemb,
-            PACE_FILE * stream)
-{
-  return fwrite (ptr, size, nmemb, stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_getc (FILE * stream)
-{
-  return getc (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-int
-pace_getc_unlocked (FILE * stream)
-{
-#if defined (PACE_HAS_REENTRANT)
-  return getc_unlocked (stream);
-#else /* ! PACE_HAS_POSIX */
-  PACE_UNUSED_ARG(stream);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-#endif /* ! PACE_HAS_POSIX */
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_getchar ()
-{
-  return getchar ();
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-int
-pace_getchar_unlocked ()
-{
-#if defined (PACE_HAS_REENTRANT)
-  return getchar_unlocked ();
-#else /* ! PACE_HAS_REENTRANT */
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-#endif /* ! PACE_HAS_REENTRANT */
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-char *
-pace_gets (char * s)
-{
-  return gets (s);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-void
-pace_perror (const char * s)
-{
-  perror (s);
-  return;
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_putc (int c,
-           FILE * stream)
-{
-  return putc (c, stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-int
-pace_putc_unlocked (int c,
-                    FILE * stream)
-{
-#if defined (PACE_HAS_REENTRANT)
-  return putc_unlocked (c, stream);
-#else /* ! PACE_HAS_REENTRANT */
-  PACE_UNUSED_ARG(c);
-  PACE_UNUSED_ARG(stream);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-#endif /* ! PACE_HAS_REENTRANT */
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_putchar (int c)
-{
-  return putchar (c);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-int
-pace_putchar_unlocked (int c)
-{
-#if defined (PACE_HAS_REENTRANT)
-  return putchar_unlocked (c);
-#else /* ! PACE_HAS_REENTRANT */
-  PACE_UNUSED_ARG(c);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-#endif /* ! PACE_HAS_REENTRANT */
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_puts (const char * s)
-{
-  return puts (s);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_remove (const char * path)
-{
-  return remove (path);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_rename (const char * old_name,
-             const char * new_name)
-{
-  return rename (old_name,
-                 new_name);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-void
-pace_rewind (FILE * stream)
-{
-  rewind (stream);
-  return;
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-void
-pace_setbuf (FILE * stream, char * buf)
-{
-  setbuf (stream, buf);
-  return;
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_setvbuf(PACE_FILE * stream,
-             char * buf,
-             int mode, pace_size_t size)
-{
-  return setvbuf (stream, buf, mode, size);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-FILE *
-pace_tmpfile ()
-{
- return tmpfile ();
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-char *
-pace_tmpnam (char * s)
-{
- return tmpnam (s);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_ungetc (int c, FILE * stream)
-{
- return ungetc (c, stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_vfprintf (PACE_FILE * stream,
-               const char * format,
-               va_list arg)
-{
-  return vfprintf (stream, format, arg);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_vprintf (const char * format,
-              va_list arg)
-{
-  return vprintf (format, arg);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_vsprintf (char * s,
-               const char * format,
-               va_list arg)
-{
-  return vsprintf (s, format, arg);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/posix/stdlib.c b/PACE/pace/posix/stdlib.c
deleted file mode 100644
index 041a8bd0bbe..00000000000
--- a/PACE/pace/posix/stdlib.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/stdlib.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/stdlib.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/stdlib.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/stdlib.h b/PACE/pace/posix/stdlib.h
deleted file mode 100644
index 5e9b762e77b..00000000000
--- a/PACE/pace/posix/stdlib.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/stdlib.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_STDLIB_H_POSIX
-#define PACE_STDLIB_H_POSIX
-
-#include <stdlib.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_EXIT_FAILURE EXIT_FAILURE
-#define PACE_EXIT_SUCCESS EXIT_SUCCESS
-#define PACE_MB_CUR_MAX MB_CUR_MAX
-#ifndef PACE_NULL
-# define PACE_NULL NULL
-#endif /* PACE_NULL */
-#define PACE_RAND_MAX RAND_MAX
-
-#ifndef PACE_DIV_T
-#define PACE_DIV_T
-  typedef div_t pace_div_t;
-#endif /* PACE_DIV_T */
-
-#ifndef PACE_LDIV_T
-#define PACE_LDIV_T
-  typedef ldiv_t pace_ldiv_t;
-#endif /* PACE_LDIV_T */
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T
-  typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-#ifndef PACE_WCHAR_T
-#define PACE_WCHAR_T
-  typedef wchar_t pace_wchar_t;
-#endif /* PACE_WCHAR_T */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-# ifndef PACE_BSEARCH_PF
-# define PACE_BSEARCH_PF
-  typedef int (*pace_bsearch_pf) (const void*, const void*);
-# endif /* PACE_BSEARCH_PF */
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_STDLIB_H_POSIX */
diff --git a/PACE/pace/posix/stdlib.inl b/PACE/pace/posix/stdlib.inl
deleted file mode 100644
index eb8e7f578a0..00000000000
--- a/PACE/pace/posix/stdlib.inl
+++ /dev/null
@@ -1,323 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/stdlib.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include <stdlib.h>
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-void
-pace_abort (void)
-{
-  abort ();
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_abs (int val)
-{
-  return abs (val);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_atexit (void (*func)(void))
-{
-  return atexit (func);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_atof (const char * str)
-{
-  return atof (str);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_atoi (const char * str)
-{
-  return atoi (str);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-long
-pace_atol (const char * str)
-{
-  return atol (str);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-# if defined (PACE_HAS_CPLUSPLUS)
-PACE_INLINE
-void *
-pace_bsearch (const void *key, const void *base,
-              size_t nel, size_t size,
-              pace_bsearch_pf compar)
-{
-  return bsearch (key, base, nel, size, compar);
-}
-# else /* ! PACE_HAS_CPLUSPLUS */
-PACE_INLINE
-void *
-pace_bsearch (const void *key, const void *base,
-              size_t nel, size_t size,
-              int (*compar)(const void *,const void *))
-{
-  return bsearch (key, base, nel, size, compar);
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_div_t
-pace_div (int numer, int denom)
-{
-  return div (numer, denom);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-void
-pace_exit (int status)
-{
-  exit (status);
-  return;
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-char *
-pace_getenv (const char * name)
-{
-  return getenv (name);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-long int
-pace_labs (long int j)
-{
-  return labs (j);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_ldiv_t
-pace_ldiv (long int numer, long int denom)
-{
-  return ldiv (numer, denom);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mblen (const char* s, pace_size_t n)
-{
-  return mblen (s, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_size_t
-pace_mbstowcs (pace_wchar_t* pwcs,
-               const char* s,
-               pace_size_t n)
-{
-  return mbstowcs (pwcs, s, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mbtowc (pace_wchar_t* pwc,
-             const char* s,
-             pace_size_t n)
-{
-  return mbtowc (pwc, s, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-# if (PACE_HAS_CPLUSPLUS)
-PACE_INLINE
-void
-pace_qsort (void * base, size_t nel, size_t width,
-            pace_bsearch_pf compar)
-{
-  qsort (base, nel, width, compar);
-}
-# else /* ! PACE_HAS_CPLUSPLUS */
-PACE_INLINE
-void
-pace_qsort (void * base, size_t nel, size_t width,
-            int (*compar)(const void *,const void *))
-{
-  qsort (base, nel, width, compar);
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_rand ()
-{
-  return rand ();
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void
-pace_srand (unsigned int seed)
-{
-  srand (seed);
-  return;
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-int
-pace_rand_r (unsigned int *seed)
-{
-#if defined (PACE_HAS_REENTRANT)
-  return rand_r (seed);
-#else  /* ! PACE_HAS_REENTRANT */
-  PACE_UNUSED_ARG (seed);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-#endif /* ! PACE_HAS_REENTRANT */
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-double
-pace_strtod (const char* nptr,
-             char** endptr)
-{
-  return strtod (nptr, endptr);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_strtol (const char* nptr,
-             char** endptr,
-             int base)
-{
-  return strtol (nptr, endptr, base);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-unsigned long int
-pace_strtoul (const char* nptr,
-              char** endptr,
-              int base)
-{
-  return strtoul (nptr, endptr, base);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_system (const char* string)
-{
-  return system (string);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_size_t
-pace_wcstombs (char* s,
-               const pace_wchar_t* pwcs,
-               pace_size_t n)
-{
-  return wcstombs (s, pwcs, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_wctomb (char* s, pace_wchar_t wchar)
-{
-  return wctomb (s, wchar);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-/* Memory Management. */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void *
-pace_malloc (size_t size)
-{
-  return malloc (size);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void *
-pace_calloc (size_t nelem, size_t elsize)
-{
-  return calloc (nelem, elsize);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void
-pace_free (void * ptr)
-{
-  free (ptr);
-  return;
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void *
-pace_realloc (void * ptr, size_t size)
-{
-  return realloc (ptr, size);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
diff --git a/PACE/pace/posix/string.c b/PACE/pace/posix/string.c
deleted file mode 100644
index 4d06077a947..00000000000
--- a/PACE/pace/posix/string.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/string.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/string.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/string.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/string.h b/PACE/pace/posix/string.h
deleted file mode 100644
index f25fd8b077e..00000000000
--- a/PACE/pace/posix/string.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/string.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_STRING_H_POSIX
-#define PACE_STRING_H_POSIX
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#if !defined (PACE_NULL)
-# define PACE_NULL NULL
-#endif /* NULL */
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T
-  typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_STRING_H_POSIX */
diff --git a/PACE/pace/posix/string.inl b/PACE/pace/posix/string.inl
deleted file mode 100644
index de23cfacf52..00000000000
--- a/PACE/pace/posix/string.inl
+++ /dev/null
@@ -1,206 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/string.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include <string.h>
-#include "pace/string.h"
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void *
-pace_memchr (const void *s, int c, pace_size_t n)
-{
-  return (void*) memchr (s, c, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_memcmp (const void *s1, const void *s2, pace_size_t n)
-{
-  return memcmp (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void *
-pace_memcpy (void * s1, const void * s2, pace_size_t n)
-{
-  return memcpy (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void *
-pace_memmove (void *s1, const void *s2, pace_size_t n)
-{
-  return memmove (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_BROKEN_INLINE
-void *
-pace_memset (void *s, int c, pace_size_t n)
-{
-  return memset (s, c, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strcat (char * s1, const char * s2)
-{
-  return strcat (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strncat (char * s1, const char * s2, size_t n)
-{
-  return strncat (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strchr (const char * s, int c)
-{
-  return (char*) strchr (s, c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strrchr (const char * s, int c)
-{
-  return (char*) strrchr (s, c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_BROKEN_INLINE
-int
-pace_strcmp (const char * s1, const char * s2)
-{
-  return strcmp (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_BROKEN_INLINE
-int
-pace_strncmp (const char * s1, const char * s2, size_t n)
-{
-  return strncmp (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_BROKEN_INLINE
-char *
-pace_strcpy (char * s1, const char * s2)
-{
-  return strcpy (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strncpy (char * s1, const char * s2, size_t n)
-{
-  return strncpy (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_BROKEN_INLINE
-size_t
-pace_strcspn (const char * s1, const char * s2)
-{
-  return strcspn (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-size_t
-pace_strspn (const char * s1, const char * s2)
-{
-  return strspn (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-size_t
-pace_strlen (const char * s)
-{
-  return strlen (s);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_BROKEN_INLINE
-char *
-pace_strpbrk (const char * s1, const char * s2)
-{
-  return (char*) strpbrk (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strstr (const char * s1, const char * s2)
-{
-  return (char*) strstr (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strtok (char * s1, const char * s2)
-{
-  return strtok (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-char *
-pace_strtok_r (char * s, const char * sep, char ** lasts)
-{
-# if defined (PACE_HAS_REENTRANT) || (PACE_LYNXOS) || (PACE_SUNOS)    
-  return strtok_r (s, sep, lasts);
-# else  /* ! PACE_HAS_REENTRANT */
-  PACE_UNUSED_ARG (s);
-  PACE_UNUSED_ARG (sep);
-  PACE_UNUSED_ARG (lasts);
-  PACE_ERRNO_NO_SUPPORT ();
-  return 0;
-# endif /* ! PACE_HAS_REENTRANT */
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
diff --git a/PACE/pace/posix/termios.c b/PACE/pace/posix/termios.c
deleted file mode 100644
index e828411f160..00000000000
--- a/PACE/pace/posix/termios.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/termios.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/termios.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/termios.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/termios.h b/PACE/pace/posix/termios.h
deleted file mode 100644
index e2fdb0d8af8..00000000000
--- a/PACE/pace/posix/termios.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/termios.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_TERMIOS_H_POSIX
-#define PACE_SYS_TERMIOS_H_POSIX
-
-#include "pace/sys/types.h"
-#include <termios.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS) */
-
-#ifndef PACE_CC_T
-#define PACE_CC_T
-typedef cc_t pace_cc_t;
-#endif /* PACE_CC_T */
-
-#ifndef PACE_SPEED_T
-#define PACE_SPEED_T
-typedef speed_t pace_speed_t;
-#endif /* PACE_SPEED_T */
-
-#ifndef PACE_TCFLAG_T
-#define PACE_TCFLAG_T
-typedef tcflag_t pace_tcflag_t;
-#endif /* PACE_TCFLAG_T */
-
-#ifndef PACE_TERMIOS
-#define PACE_TERMIOS
-typedef struct termios pace_termios;
-#endif /* PACE_TERMIOS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_TERMIOS_H_POSIX */
diff --git a/PACE/pace/posix/termios.inl b/PACE/pace/posix/termios.inl
deleted file mode 100644
index df12227a79e..00000000000
--- a/PACE/pace/posix/termios.inl
+++ /dev/null
@@ -1,109 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/termios.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/unistd.h"
-#include <termios.h>
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-pace_speed_t
-pace_cfgetospeed (const pace_termios *termiosp)
-{
-  return cfgetospeed (termiosp);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_cfsetospeed (pace_termios *termios_p, pace_speed_t speed)
-{
-  return cfsetospeed (termios_p, speed);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-pace_speed_t
-pace_cfgetispeed (const pace_termios *termios_p)
-{
-  return cfgetispeed (termios_p);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_cfsetispeed (pace_termios *termios_p, pace_speed_t speed)
-{
-  return cfsetispeed (termios_p, speed);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcdrain (PACE_HANDLE fildes)
-{
-  return tcdrain (fildes);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcgetattr (PACE_HANDLE fildes, pace_termios *termios_p)
-{
-  return tcgetattr (fildes, termios_p);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcflow (PACE_HANDLE fildes, int action)
-{
-  return tcflow (fildes, action);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcflush (PACE_HANDLE fildes, int queue_selector)
-{
-  return tcflush (fildes, queue_selector);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcsendbreak (PACE_HANDLE fildes, int duration)
-{
-  return tcsendbreak (fildes, duration);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcsetattr (PACE_HANDLE fildes,
-                int optional_actions,
-                const pace_termios *termios_p)
-{
-  return tcsetattr (fildes, optional_actions, termios_p);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
diff --git a/PACE/pace/posix/time.c b/PACE/pace/posix/time.c
deleted file mode 100644
index 08f00379305..00000000000
--- a/PACE/pace/posix/time.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/time.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/time.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/time.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/time.h b/PACE/pace/posix/time.h
deleted file mode 100644
index 8fb12b9f360..00000000000
--- a/PACE/pace/posix/time.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/time.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_TIME_H_POSIX
-#define PACE_TIME_H_POSIX
-
-#if PACE_LINUX
-# include "pace/emulation/time.h"
-#endif /* PACE_LINUX */
-
-#include <time.h>
-#include "pace/signal.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_CLK_TCK CLK_TCK
-#define PACE_CLOCKS_PER_SEC CLOCKS_PER_SEC
-#define PACE_CLOCK_REALTIME CLOCK_REALTIME
-#ifndef PACE_NULL
-#define PACE_NULL NULL
-#endif /* PACE_NULL */
-#define PACE_TIMER_ABSTIME TIMER_ABSTIME
-
-#ifndef PACE_CLOCKID_T
-#define PACE_CLOCKID_T
-# if defined PACE_EMU_CLOCKID_T
-  typedef pace_emu_clockid_t pace_clockid_t;
-# else
-  typedef clockid_t pace_clockid_t;
-# endif /* PACE_LINUX */
-#endif /* PACE_CLOCKID_T */
-
-#ifndef PACE_CLOCK_T
-#define PACE_CLOCK_T
-  typedef clock_t pace_clock_t;
-#endif /* PACE_CLOCK_T */
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T
-  typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-#ifndef PACE_TIMER_T
-#define PACE_TIMER_T
-# if defined PACE_EMU_TIMER_T
-  typedef pace_emu_timer_t pace_timer_t;
-# else
-  typedef timer_t pace_timer_t;
-# endif /* PACE_LINUX */
-#endif /* PACE_TIMER_T */
-
-#ifndef PACE_TIME_T
-#define PACE_TIME_T
-  typedef time_t pace_time_t;
-#endif /* PACE_TIME_T */
-
-#ifndef PACE_TM
-#define PACE_TM
-  typedef struct tm pace_tm;
-#endif /* PACE_TM */
-
-#ifndef PACE_TIMESPEC
-#define PACE_TIMESPEC
-  typedef struct timespec pace_timespec;
-#endif /* PACE_TIMESPEC */
-
-#ifndef PACE_ITIMERSPEC
-#define PACE_ITIMERSPEC
-  typedef struct itimerspec pace_itimerspec;
-#endif /* PACE_ITIMERSPEC */
-
-#ifndef PACE_SIGEVENT
-#define PACE_SIGEVENT
-  typedef struct sigevent pace_sigevent;
-#endif /* PACE_SIGEVENT */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_TIME_H_POSIX */
diff --git a/PACE/pace/posix/time.inl b/PACE/pace/posix/time.inl
deleted file mode 100644
index 415e728eb36..00000000000
--- a/PACE/pace/posix/time.inl
+++ /dev/null
@@ -1,324 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/time.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/errno.h"
-#include "pace/signal.h"
-extern int errno;
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_asctime (const pace_tm * time)
-{
-  return asctime (time);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-char *
-pace_asctime_r (const pace_tm * time, char * buf)
-{
-#if (PACE_LYNXOS)
-  /*lynxos 3.1 has POSIX.4 Draft 9 versions of this */
-  if (asctime_r (time, buf, 26) != 0)
-    return (char*) 0;
-  return buf;
-#else
-  return asctime_r (time, buf);
-#endif /* PACE_LYNXOS */
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_clock_t
-pace_clock (void)
-{
-  return clock ();
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-double
-pace_difftime (pace_time_t time1, pace_time_t time2)
-{
-  return difftime (time1, time2);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_clock_getres (pace_clockid_t clock_id,
-                   pace_timespec * res)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (clock_id);
-  PACE_UNUSED_ARG (res);
-  return -1;
-#else
-  return clock_getres (clock_id, res);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_clock_gettime (pace_clockid_t clock_id,
-                    pace_timespec * tp)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (clock_id);
-  PACE_UNUSED_ARG (tp);
-  return -1;
-#else
-  return clock_gettime (clock_id, tp);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_clock_settime (pace_clockid_t clock_id,
-                    const pace_timespec * tp)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (clock_id);
-  PACE_UNUSED_ARG (tp);
-  return -1;
-#else
-  return clock_settime (clock_id, PACE_NONCONST_ARG_CAST (struct timespec *) tp);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_ctime (const pace_time_t * clock)
-{
-  return ctime (clock);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-char *
-pace_ctime_r (const pace_time_t * clock, char * buf)
-{
-# if (PACE_LYNXOS)
-  return ctime_r (clock, buf, 26);
-# else
-  return ctime_r (clock, buf);
-# endif /* PACE_SUNOS */
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-pace_tm *
-pace_gmtime (const pace_time_t * clock)
-{
-  return gmtime (clock);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-pace_tm *
-pace_gmtime_r (const pace_time_t * clock, pace_tm * result)
-{
-#if (PACE_LYNXOS)
-  /*lynxos 3.1 has POSIX.4 Draft 9 versions of these */
-  if (gmtime_r (result, clock) != 0)
-    return (pace_tm*)0;
-  return result;
-#else
-  return gmtime_r (clock, result);
-#endif /* PACE_LYNXOS */
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-pace_tm *
-pace_localtime (const pace_time_t * clock)
-{
-  return localtime (clock);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-pace_tm *
-pace_localtime_r (const pace_time_t * clock, pace_tm * result)
-{
-#if (PACE_LYNXOS)
-  /*lynxos 3.1 has POSIX.4 Draft 9 versions of these */
-  if (localtime_r (result, clock) != 0)
-    return (pace_tm*)0;
-  return result;
-#else
-  return localtime_r (clock, result);
-#endif /* PACE_LYNXOS */
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-time_t
-pace_mktime (pace_tm * timeptr)
-{
-  return mktime (timeptr);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_nanosleep (const pace_timespec * rqtp,
-                pace_timespec * rmtp)
-{
-  return nanosleep (PACE_NONCONST_ARG_CAST (struct timespec *) rqtp, rmtp);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-size_t
-pace_strftime (char *s, pace_size_t maxsize,
-               const char *format,
-               const pace_tm *timeptr)
-{
-  return strftime (s, maxsize, format, timeptr);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-time_t
-pace_time (pace_time_t * tloc)
-{
-  return time (tloc);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_timer_create (pace_clockid_t clock_id,
-                   pace_sigevent * evp,
-                   pace_timer_t *timerid)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (clock_id);
-  PACE_UNUSED_ARG (evp);
-  PACE_UNUSED_ARG (timerid);
-  return -1;
-#else
-  return timer_create (clock_id, evp, timerid);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_timer_delete (pace_timer_t timerid)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (timerid);
-  return -1;
-#else
-  return timer_delete (timerid);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_timer_getoverrun (pace_timer_t timerid)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (timerid);
-  return -1;
-#else
-  return timer_getoverrun (timerid);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_timer_gettime (pace_timer_t timerid,
-                    pace_itimerspec * value)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (timerid);
-  PACE_UNUSED_ARG (value);
-  return -1;
-#else
-  return timer_gettime (timerid, value);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_timer_settime (pace_timer_t timerid,
-                    int flags,
-                    const pace_itimerspec * value,
-                    pace_itimerspec * ovalue)
-{
-#if PACE_LINUX
-  errno = ENOSYS;
-  PACE_UNUSED_ARG (timerid);
-  PACE_UNUSED_ARG (flags);
-  PACE_UNUSED_ARG (value);
-  PACE_UNUSED_ARG (ovalue);
-  return -1;
-#else
-  return timer_settime (timerid, flags, PACE_NONCONST_ARG_CAST (struct itimerspec *) value, ovalue);
-#endif /* PACE_LINUX */
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void
-pace_tzset ()
-{
-# if defined (PACE_HAS_POSIX_PTHREAD_SEMANTICS)
-  tzset ();
-# else /* ! PACE_HAS_POSIX_PTHREAD_SEMANTICS */
-  PACE_ERRNO_NO_SUPPORT ();
-# endif /* ! PACE_HAS_POSIX_PTHREAD_SEMANTICS */
-  return;
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
diff --git a/PACE/pace/posix/times.c b/PACE/pace/posix/times.c
deleted file mode 100644
index 3e47e331020..00000000000
--- a/PACE/pace/posix/times.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/times.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/sys/times.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/times.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/times.h b/PACE/pace/posix/times.h
deleted file mode 100644
index 1aeebd76a29..00000000000
--- a/PACE/pace/posix/times.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/times.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_TIMES_H_POSIX
-#define PACE_SYS_TIMES_H_POSIX
-
-#include <sys/times.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_CLOCK_T
-#define PACE_CLOCK_T
-typedef clock_t pace_clock_t;
-#endif /* PACE_CLOCK_T */
-
-#ifndef PACE_TMS
-#define PACE_TMS
-typedef struct tms pace_tms;
-#endif /* PACE_TMS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_TIMES_H_POSIX */
diff --git a/PACE/pace/posix/times.inl b/PACE/pace/posix/times.inl
deleted file mode 100644
index 5c808d1a7d0..00000000000
--- a/PACE/pace/posix/times.inl
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/times.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pace_clock_t
-pace_times (pace_tms * buffer)
-{
-  return times (buffer);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
diff --git a/PACE/pace/posix/types.h b/PACE/pace/posix/types.h
deleted file mode 100644
index 9ce4e5c2c85..00000000000
--- a/PACE/pace/posix/types.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/types.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#include <sys/types.h>
-#include <pthread.h>
-
-#ifndef PACE_SYS_TYPES_H_POSIX
-#define PACE_SYS_TYPES_H_POSIX
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /* For future upgradeability to wchar */
-#ifndef PACE_TCHAR
-#define PACE_TCHAR
-  typedef char pace_tchar;
-#endif /* PACE_TCHAR */
-
-#ifndef PACE_HANDLE
-  typedef int PACE_HANDLE;
-#endif /* PACE_HANDLE */
-
-#ifndef PACE_INVALID_HANDLE
-#define PACE_INVALID_HANDLE -1
-#endif /* PACE_INVALID_HANDLE */
-
-#ifndef PACE_DEV_T
-#define PACE_DEV_T
-  typedef dev_t pace_dev_t;
-#endif /* PACE_DEV_T */
-
-#ifndef PACE_GID_T
-#define PACE_GID_T
-  typedef gid_t pace_gid_t;
-#endif /* PACE_GID_T */
-
-#ifndef PACE_INO_T
-#define PACE_INO_T
-  typedef ino_t pace_ino_t;
-#endif /* PACE_INO_T */
-
-#ifndef PACE_MODE_T
-#define PACE_MODE_T
-  typedef mode_t pace_mode_t;
-#endif /* PACE_MODE_T */
-
-#ifndef PACE_NLINK_T
-#define PACE_NLINK_T
-  typedef nlink_t pace_nlink_t;
-#endif /* PACE_NLINK_T */
-
-#ifndef PACE_OFF_T
-#define PACE_OFF_T
-  typedef off_t pace_off_t;
-#endif /* PACE_OFF_T */
-
-#ifndef PACE_PID_T
-#define PACE_PID_T
-  typedef pid_t pace_pid_t;
-#endif /* PACE_PID_T */
-
-#ifndef PACE_PTHREAD_ATTR_T
-#define PACE_PTHREAD_ATTR_T
-  typedef pthread_attr_t pace_pthread_attr_t;
-#endif /* PACE_PTHREAD_ATTR_T */
-
-#ifndef PACE_PTHREAD_CONDATTR_T
-#define PACE_PTHREAD_CONDATTR_T
-  typedef pthread_condattr_t pace_pthread_condattr_t;
-#endif /* PACE_PTHREAD_CONDATTR_T */
-
-#ifndef PACE_PTHREAD_COND_T
-#define PACE_PTHREAD_COND_T
-  typedef pthread_cond_t pace_pthread_cond_t;
-#endif /* PACE_PTHREAD_COND_T */
-
-#ifndef PACE_PTHREAD_KEY_T
-#define PACE_PTHREAD_KEY_T
-  typedef pthread_key_t pace_pthread_key_t;
-#endif /* PACE_PTHREAD_KEY_T */
-
-#ifndef PACE_PTHREAD_MUTEXATTR_T
-#define PACE_PTHREAD_MUTEXATTR_T
-  typedef pthread_mutexattr_t pace_pthread_mutexattr_t;
-#endif /* PACE_PTHREAD_MUTEXATTR_T */
-
-#ifndef PACE_PTHREAD_MUTEX_T
-#define PACE_PTHREAD_MUTEX_T
-  typedef pthread_mutex_t pace_pthread_mutex_t;
-#endif /* PACE_PTHREAD_MUTEX_T */
-
-#ifndef PACE_PTHREAD_ONCE_T
-#define PACE_PTHREAD_ONCE_T
-  typedef pthread_once_t pace_pthread_once_t;
-#endif /* PACE_PTHREAD_ONCE_T */
-
-#ifndef PACE_PTHREAD_T
-#define PACE_PTHREAD_T
-  typedef pthread_t pace_pthread_t;
-#endif /* PACE_PTHREAD_T */
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T
-  typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-#ifndef PACE_SSIZE_T
-#define PACE_SSIZE_T
-  typedef ssize_t pace_ssize_t;
-#endif /* PACE_SSIZE_T */
-
-#ifndef PACE_UID_T
-#define PACE_UID_T
-  typedef uid_t pace_uid_t;
-#endif /* PACE_UID_T */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_TYPES_H_POSIX */
diff --git a/PACE/pace/posix/unistd.c b/PACE/pace/posix/unistd.c
deleted file mode 100644
index f8e1e9a4676..00000000000
--- a/PACE/pace/posix/unistd.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/unistd.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/unistd.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/unistd.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/unistd.h b/PACE/pace/posix/unistd.h
deleted file mode 100644
index 0b79b75b43b..00000000000
--- a/PACE/pace/posix/unistd.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/unistd.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_UNISTD_H_POSIX
-#define PACE_UNISTD_H_POSIX
-
-#include "pace/sys/types.h"
-#include <unistd.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_F_OK F_OK
-#ifndef PACE_NULL
-# define PACE_NULL NULL
-#endif /* PACE_NULL */
-#define PACE_R_OK R_OK
-#define PACE_SEEK_CUR SEEK_CUR
-#define PACE_SEEK_END SEEK_END
-#define PACE_SEEK_SET SEEK_SET
-#define PACE_STDERR_FILENO STDERR_FILENO
-#define PACE_STDIN_FILENO STDIN_FILENO
-#define PACE_STDOUT_FILENO STDOUT_FILENO
-#define PACE_W_OK W_OK
-#define PACE_X_OK X_OK
-
-/* _POSIX _PC _SC Macros need to go here */
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T
-typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-#ifndef PACE_SSIZE_T
-#define PACE_SSIZE_T
-typedef ssize_t pace_ssize_t;
-#endif /* PACE_SSIZE_T */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_UNISTD_H_POSIX */
diff --git a/PACE/pace/posix/unistd.inl b/PACE/pace/posix/unistd.inl
deleted file mode 100644
index c0496a7da7c..00000000000
--- a/PACE/pace/posix/unistd.inl
+++ /dev/null
@@ -1,470 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/unistd.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include <unistd.h>
-#include <stdarg.h>
-#include <string.h>
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-void
-pace__exit (int status)
-{
- _exit (status);
- return;
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_access (const char * path, int amode)
-{
-  return access (path, amode);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-unsigned int
-pace_alarm (unsigned int seconds)
-{
-  return alarm (seconds);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_chdir (const char * path)
-{
-  return chdir (path);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FA_UOF)
-PACE_INLINE
-int
-pace_chown (const char * path, uid_t owner, pace_gid_t group)
-{
-  return chown (path, owner, group);
-}
-#endif /* PACE_HAS_POSIX_FA_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_close (PACE_HANDLE fildes)
-{
-  return close (fildes);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-PACE_HANDLE
-pace_dup (PACE_HANDLE fildes)
-{
-  return dup (fildes);
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-PACE_HANDLE
-pace_dup2 (PACE_HANDLE fildes, PACE_HANDLE fildes2)
-{
-  return dup2 (fildes, fildes2);
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-int
-pace_execv (const char * path,
-            char * const argv[])
-{
-  return execv (path, argv);
-  /* if successful, this operation does NOT return */
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-int
-pace_execve (const char * path,
-             char * const argv[],
-             char * const envp[])
-{
-  return execve (path, argv, envp);
-  /* if successful, this operation does NOT return */
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-int
-pace_execvp (const char * file,
-             char * const argv[])
-{
-  return execvp (file, argv);
-  /* if successful, this operation does NOT return */
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_fdatasync (PACE_HANDLE fildes)
-{
-  return fdatasync (fildes);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pid_t
-pace_fork ()
-{
-  return fork ();
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-long
-pace_fpathconf (PACE_HANDLE fildes, int name)
-{
-  return fpathconf (fildes, name);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_fsync (PACE_HANDLE fildes)
-{
-  return fsync (fildes);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_ftruncate (PACE_HANDLE fildes, pace_off_t length)
-{
-  return ftruncate (fildes, length);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-char *
-pace_getcwd (char * buf, size_t size)
-{
-  return getcwd (buf, size);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-uid_t
-pace_getegid ()
-{
-  return getegid ();
-}
-#endif /* PACE_HAS_POSIX_UGR_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-uid_t
-pace_geteuid ()
-{
-  return geteuid ();
-}
-#endif /* PACE_HAS_POSIX_UGR_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-int
-pace_getgroups (int gidsetsize, pace_gid_t grouplist[])
-{
-  return getgroups (gidsetsize, grouplist);
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-uid_t
-pace_getgid ()
-{
-  return getgid ();
-}
-#endif /* PACE_HAS_POSIX_UGR_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-char*
-pace_getlogin ()
-{
-  return getlogin ();
-}
-#endif /* PACE_HAS_POSIX_UGR_UOF */
-
-#if (PACE_HAS_POSIX_UGR_UOF)
-PACE_INLINE
-int
-pace_getlogin_r (char * name, size_t namesize)
-{
-  /* this func will eventually get rewritten to *
-   * autodetect _REENTRANT correctly            */
-#if (PACE_HAS_REENTRANT) || (PACE_LYNXOS) || (PACE_SUNOS)    
-  /* supported call */
-  return getlogin_r (name, namesize);
-#else
-  /* unsupported call (emulated)                   *
-   * careful, emulation is not 100% reentrant safe */
-  char * non_reentrant_ptr_to_static_os_memory = getlogin ();
-  if (0 == non_reentrant_ptr_to_static_os_memory)
-    return errno;
-  strncpy (name, non_reentrant_ptr_to_static_os_memory, namesize);
-  return 1;
-#endif /* PACE_HAS_REENTRANT */
-}
-#endif /* PACE_HAS_POSIX_UGR_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-pid_t
-pace_getpgrp ()
-{
-  return getpgrp ();
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pid_t
-pace_getpid ()
-{
-  return getpid ();
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pid_t
-pace_getppid ()
-{
-  return getppid ();
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-uid_t
-pace_getuid ()
-{
-  return getuid ();
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_isatty (int fildes)
-{
-  return isatty (fildes);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_link (const char * existing, const char * new_link)
-{
-  return link (existing, new_link);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-pace_off_t
-pace_lseek (PACE_HANDLE fildes, pace_off_t offset, int whence)
-{
-  return lseek (fildes, offset, whence);
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-long
-pace_pathconf (const char * path, int name)
-{
-  return pathconf (path, name);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_pause ()
-{
-  return pause ();
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_P_UOF)
-PACE_INLINE
-int
-pace_pipe (PACE_HANDLE fildes[2])
-{
-  return pipe (fildes);
-}
-#endif /* PACE_HAS_POSIX_P_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-ssize_t
-pace_read (PACE_HANDLE fildes, void * buf, size_t nbyte)
-{
-  return read (fildes, buf, nbyte);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_rmdir (const char * path)
-{
-  return rmdir (path);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-int
-pace_setgid (pace_gid_t gid)
-{
-  return setgid (gid);
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_JC_UOF)
-PACE_INLINE
-int
-pace_setpgid (pid_t pid, pid_t pgid)
-{
-  return setpgid (pid, pgid);
-}
-#endif /* PACE_HAS_POSIX_JC_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-pid_t
-pace_setsid ()
-{
-  return setsid ();
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-int
-pace_setuid (uid_t uid)
-{
-  return setuid (uid);
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-unsigned int
-pace_sleep (unsigned int seconds)
-{
-  return sleep (seconds);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_SP_UOF)
-PACE_INLINE
-long
-pace_sysconf (int name)
-{
-  return sysconf (name);
-}
-#endif /* PACE_HAS_POSIX_SP_UOF */
-
-#if (PACE_HAS_POSIX_JC_UOF)
-PACE_INLINE
-pid_t
-pace_tcgetpgrp (PACE_HANDLE fildes)
-{
-  return tcgetpgrp (fildes);
-}
-#endif /* PACE_HAS_POSIX_JC_UOF */
-
-#if (PACE_HAS_POSIX_JC_UOF)
-PACE_INLINE
-int
-pace_tcsetpgrp (PACE_HANDLE fildes, pid_t pgrp_id)
-{
-  return tcsetpgrp (fildes, pgrp_id);
-}
-#endif /* PACE_HAS_POSIX_JC_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-char *
-pace_ttyname (PACE_HANDLE fildes)
-{
-  return ttyname (fildes);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_ttyname_r (PACE_HANDLE fildes,
-                char * name,
-                size_t namesize)
-{
-#if (PACE_SUNOS) || (PACE_LYNXOS)
-  if (ttyname_r (fildes, name, (int) namesize) == 0)
-    return errno;
-  return 0;
-#else
-  return ttyname_r (fildes, name, namesize);
-#endif /* PACE_SUNOS */
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_unlink (const char * path)
-{
-  return unlink (path);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-ssize_t
-pace_write (PACE_HANDLE fildes, const void * buf, size_t nbyte)
-{
-  return write (fildes, buf, nbyte);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
diff --git a/PACE/pace/posix/utime.c b/PACE/pace/posix/utime.c
deleted file mode 100644
index 864e8d422b1..00000000000
--- a/PACE/pace/posix/utime.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/utime.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/utime.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/utime.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/utime.h b/PACE/pace/posix/utime.h
deleted file mode 100644
index 00018e31751..00000000000
--- a/PACE/pace/posix/utime.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/utime.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_UTIME_H_POSIX
-#define PACE_UTIME_H_POSIX
-
-#include "pace/sys/types.h"
-#include <utime.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_UTIMBUF
-#define PACE_UTIMBUF
-typedef struct utimbuf pace_utimbuf;
-#endif /* PACE_UTIMBUF */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_UTIME_H_POSIX */
diff --git a/PACE/pace/posix/utime.inl b/PACE/pace/posix/utime.inl
deleted file mode 100644
index 589229d3b38..00000000000
--- a/PACE/pace/posix/utime.inl
+++ /dev/null
@@ -1,24 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/utime.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_utime (const char * path,
-            const pace_utimbuf * times)
-{
-  return utime (path, times);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
diff --git a/PACE/pace/posix/utsname.c b/PACE/pace/posix/utsname.c
deleted file mode 100644
index 1fa1461795e..00000000000
--- a/PACE/pace/posix/utsname.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/utsname.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/sys/utsname.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/utsname.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/utsname.h b/PACE/pace/posix/utsname.h
deleted file mode 100644
index 0e7d58e6f95..00000000000
--- a/PACE/pace/posix/utsname.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/utsname.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_UTSNAME_H_POSIX
-#define PACE_SYS_UTSNAME_H_POSIX
-
-#include <sys/utsname.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_UTSNAME
-#define PACE_UTSNAME
-typedef struct utsname pace_utsname;
-#endif /* PACE_UTSNAME */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_UTSNAME_H_POSIX */
diff --git a/PACE/pace/posix/utsname.inl b/PACE/pace/posix/utsname.inl
deleted file mode 100644
index 84797fd519e..00000000000
--- a/PACE/pace/posix/utsname.inl
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/utsname.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_SP_UOF)
-PACE_INLINE
-int
-pace_uname (pace_utsname * name)
-{
-  return uname (name);
-}
-#endif /* PACE_HAS_POSIX_SP_UOF */
diff --git a/PACE/pace/posix/wait.c b/PACE/pace/posix/wait.c
deleted file mode 100644
index 786b8e59fbd..00000000000
--- a/PACE/pace/posix/wait.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/wait.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/sys/wait.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/posix/wait.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/posix/wait.h b/PACE/pace/posix/wait.h
deleted file mode 100644
index 4bc233da5b5..00000000000
--- a/PACE/pace/posix/wait.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/wait.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_WAIT_H_POSIX
-#define PACE_WAIT_H_POSIX
-
-#include "pace/sys/types.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_WEXITSTATUS WEXITSTATUS
-#define PACE_WIFEXITED WIFEXITED
-#define PACE_WIFSIGNALED WISIGNALED
-#define PACE_WIFSTOPPED WIFSTOPPED
-#define PACE_WNOHANG WNOHANG
-#define PACE_WSTOPSIG WSTOPSIG
-#define PACE_WTERMSIG WTERMSIG
-#define PACE_WUNTRACED WUNTRACED
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_WAIT_H */
diff --git a/PACE/pace/posix/wait.inl b/PACE/pace/posix/wait.inl
deleted file mode 100644
index f1f98ad4d5e..00000000000
--- a/PACE/pace/posix/wait.inl
+++ /dev/null
@@ -1,34 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/wait.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include <sys/wait.h>
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pid_t
-pace_wait (int * statloc)
-{
-  return wait (statloc);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pid_t
-pace_waitpid (pid_t pid, int * statloc, int options)
-{
-  return waitpid (pid, statloc, options);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
diff --git a/PACE/pace/pthread.h b/PACE/pace/pthread.h
deleted file mode 100644
index a744915833d..00000000000
--- a/PACE/pace/pthread.h
+++ /dev/null
@@ -1,733 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/pthread.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_PTHREAD_H
-#define PACE_PTHREAD_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/pthread.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/pthread.h"
-#elif (PACE_WIN32)
-# include "pace/win32/pthread.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_atfork.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.1.3.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_atfork (void  (*prepare) (void),
-                           void (*parent) (void),
-                           void (*child) (void));
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_attr_destroy.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 16.2.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_attr_destroy (pace_pthread_attr_t * attr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_attr_getdetachstate.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 16.2.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_attr_getdetachstate (const pace_pthread_attr_t * attr,
-                                        int * detachstate);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_attr_getinheritsched.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.5.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_attr_getinheritsched (const pace_pthread_attr_t * attr,
-                                         int * inheritsched);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_attr_getschedparam.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.5.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_attr_getschedparam (const pace_pthread_attr_t * attr,
-                                       pace_sched_param * param);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_attr_getschedpolicy.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.5.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_attr_getschedpolicy (const pace_pthread_attr_t * attr,
-                                        int * policy);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_attr_getscope.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.5.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_attr_getscope (const pace_pthread_attr_t * attr,
-                                  int * contentionscope);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_attr_getstackaddr.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 16.2.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_attr_getstackaddr (const pace_pthread_attr_t * attr,
-                                      void ** stackaddr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_attr_getstacksize.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 16.2.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_attr_getstacksize (const pace_pthread_attr_t * attr,
-                                      size_t * stacksize);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_attr_init.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 16.2.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_attr_init (pace_pthread_attr_t * attr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_attr_setdetachstate.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 16.2.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_attr_setdetachstate (pace_pthread_attr_t * attr,
-                                        int detachstate);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_attr_setinheritsched.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.5.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_attr_setinheritsched (pace_pthread_attr_t * attr,
-                                         int inheritsched);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_attr_setschedparam.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.5.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_attr_setschedparam (pace_pthread_attr_t * attr,
-                                       const pace_sched_param * param);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_attr_setschedpolicy.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.5.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_attr_setschedpolicy (pace_pthread_attr_t * attr,
-                                        int policy);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_attr_setscope.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.5.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_attr_setscope (pace_pthread_attr_t * attr,
-                                  int contentionscope);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_attr_setstackaddr.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 16.2.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_attr_setstackaddr (pace_pthread_attr_t * attr,
-                                      void * stackaddr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_attr_setstacksize.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 16.2.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_attr_setstacksize (pace_pthread_attr_t * attr,
-                                      size_t stacksize);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_cancel.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 18.2.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_cancel (pace_pthread_t thread);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_cleanup_push.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 18.2.3.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-# define pace_pthread_cleanup_push(routine, arg) \
-    pthread_cleanup_push (routine, arg)
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_cleanup_pop.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 18.2.3.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-# define pace_pthread_cleanup_pop(execute) \
-    pthread_cleanup_pop (execute)
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-# define PACE_PTHREAD_COND_INITIALIZER PTHREAD_COND_INITIALIZER
-
-  /**
-     PACE's implementation of the POSIX function pthread_cond_broadcast.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.4.3.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_cond_broadcast (pace_pthread_cond_t * cond);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_cond_destroy.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.4.2.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_cond_destroy (pace_pthread_cond_t * cond);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_cond_init.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.4.2.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_cond_init (pace_pthread_cond_t * cond,
-                              const pace_pthread_condattr_t * attr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_cond_signal.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.4.3.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_cond_signal (pace_pthread_cond_t * cond);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_cond_timedwait.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.4.4.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_cond_timedwait (pace_pthread_cond_t * cond,
-                                   pace_pthread_mutex_t * mutex,
-                                   const pace_timespec * abstime);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_cond_wait.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.4.4.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_cond_wait (pace_pthread_cond_t * cond,
-                              pace_pthread_mutex_t * mutex);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_condattr_destroy.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.4.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_condattr_destroy (pace_pthread_condattr_t * attr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_condattr_getpshared.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.4.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_condattr_getpshared (const pace_pthread_condattr_t * attr,
-                                        int * pshared);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_condattr_init.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.4.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_condattr_init (pace_pthread_condattr_t * attr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_condattr_setpshared.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.4.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_condattr_setpshared (pace_pthread_condattr_t * attr,
-                                        int pshared);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_create.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 16.2.2.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_create (pace_pthread_t * thread,
-                           const pace_pthread_attr_t * attr,
-                           void * (*start_routine) (void*),
-                           void * arg);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_detach.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 16.2.4.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_detach (pace_pthread_t thread);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_equal.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 16.2.7.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_equal (pace_pthread_t t1,
-                          pace_pthread_t t2);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_exit.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 16.2.5.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  void pace_pthread_exit (void * value_ptr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_getschedparam.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.2.5.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_getschedparam (pace_pthread_t thread,
-                                  int * policy,
-                                  pace_sched_param * param);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_getspecific.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 17.1.2.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  void * pace_pthread_getspecific (pace_pthread_key_t key);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_join.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 16.2.3.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_join (pace_pthread_t thread,
-                         void ** value_ptr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_key_create.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 17.1.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_key_create (pace_pthread_key_t * key,
-                               void (*destructor)(void*));
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_key_delete.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 17.1.3.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_key_delete (pace_pthread_key_t key);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_kill.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.3.10.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_kill (pace_pthread_t thread,
-                         int sig);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_mutex_destroy.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.3.2.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_mutex_destroy (pace_pthread_mutex_t * mutex);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_mutex_getprioceiling.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.6.2.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_mutex_getprioceiling (pace_pthread_mutex_t * mutex,
-                                         int * prioceiling);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_mutex_init.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.3.2.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_mutex_init (pace_pthread_mutex_t * mutex,
-                               const pace_pthread_mutexattr_t * attr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_mutex_lock.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.3.3.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_mutex_lock (pace_pthread_mutex_t * mutex);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_mutex_setprioceiling.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.6.2.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_mutex_setprioceiling (pace_pthread_mutex_t * mutex,
-                                         int prioceiling,
-                                         int * old_ceiling);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_mutex_trylock.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.3.3.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_mutex_trylock (pace_pthread_mutex_t * mutex);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_mutex_unlock.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.3.3.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_mutex_unlock (pace_pthread_mutex_t * mutex);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_mutexattr_destroy.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.3.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_mutexattr_destroy (pace_pthread_mutexattr_t * sttr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function
-     pthread_mutexattr_getprioceiling.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.6.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_mutexattr_getprioceiling (pace_pthread_mutexattr_t * attr,
-                                             int * prioceiling);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_mutexattr_getprotocol.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.6.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_mutexattr_getprotocol (const pace_pthread_mutexattr_t * attr,
-                                          int * protocol);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function
-     pthread_mutexattr_setprioceiling.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.6.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_mutexattr_setprioceiling (pace_pthread_mutexattr_t * attr,
-                                             int prioceiling);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_mutexattr_setprotocol.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.6.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_mutexattr_setprotocol (pace_pthread_mutexattr_t * attr,
-                                          int protocol);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_mutexattr_getpshared.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.3.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_mutexattr_getpshared (const pace_pthread_mutexattr_t * attr,
-                                         int * pshared);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_mutexattr_init.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.3.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_mutexattr_init (pace_pthread_mutexattr_t * attr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_mutexattr_setpshared.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.3.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_mutexattr_setpshared (pace_pthread_mutexattr_t * attr,
-                                         int pshared);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_once.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 16.2.8.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_once (pace_pthread_once_t * once_control,
-                         void (*void_routine) (void));
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-# define PACE_PTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
-
-  /**
-     PACE's implementation of the POSIX function pthread_self.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 16.2.6.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  pace_pthread_t pace_pthread_self ();
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_setcancelstate.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 18.2.2.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_setcancelstate (int state,
-                                   int * oldstate);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_setcanceltype.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 18.2.2.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_setcanceltype (int type,
-                                  int * oldtype);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_setschedparam.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.5.2.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_setschedparam (pace_pthread_t thread,
-                                  int policy,
-                                  const pace_sched_param * param);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_setspecific.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 17.1.2.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_setspecific (pace_pthread_key_t key,
-                                const void * value);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_sigmask.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.3.5.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  int pace_pthread_sigmask (int how,
-                            const pace_sigset_t * set,
-                            pace_sigset_t * oset);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function pthread_testcancel.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 18.2.2.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE
-  void pace_pthread_testcancel ();
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/pthread.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/pthread.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/pthread.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_PTHREAD_H */
diff --git a/PACE/pace/pwd.h b/PACE/pace/pwd.h
deleted file mode 100644
index e4e9cf0bac5..00000000000
--- a/PACE/pace/pwd.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/pwd.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_PWD_H
-#define PACE_PWD_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/pwd.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/pwd.h"
-#elif (PACE_WIN32)
-# include "pace/win32/pwd.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function getpwuid.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 9.2.2.
-   */
-#if (PACE_HAS_POSIX_SD_UOF)
-  PACE_Export PACE_INLINE pace_passwd * pace_getpwuid (pace_uid_t uid);
-#endif /* PACE_HAS_POSIX_SD_UOF */
-
-  /**
-     PACE's implementation of the POSIX function getpwuid_r.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 9.2.2.
-   */
-#if (PACE_HAS_POSIX_SDR_UOF)
-  PACE_Export PACE_INLINE int pace_getpwuid_r (pace_uid_t uid,
-                                               pace_passwd * pwd,
-                                               char * buffer,
-                                               pace_size_t bufsize,
-                                               pace_passwd ** result);
-#endif /* PACE_HAS_POSIX_SDR_UOF */
-  /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */
-
-  /**
-     PACE's implementation of the POSIX function getpwnam.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 9.2.2.
-   */
-#if (PACE_HAS_POSIX_SD_UOF)
-  PACE_Export PACE_INLINE pace_passwd * pace_getpwnam (const char * name);
-#endif /* PACE_HAS_POSIX_SD_UOF */
-
-  /**
-     PACE's implementation of the POSIX function getpwnam_r.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 9.2.2.
-   */
-#if (PACE_HAS_POSIX_SDR_UOF)
-  PACE_Export PACE_INLINE int pace_getpwnam_r (const char * name,
-                                               pace_passwd * pwd,
-                                               char * buffer,
-                                               pace_size_t bufsize,
-                                               pace_passwd ** result);
-#endif /* PACE_HAS_POSIX_SDR_UOF */
-  /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/pwd.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/pwd.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/pwd.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_PWD_H */
diff --git a/PACE/pace/sched.h b/PACE/pace/sched.h
deleted file mode 100644
index 20c9dc50ca5..00000000000
--- a/PACE/pace/sched.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/sched.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SCHED_H
-#define PACE_SCHED_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/sched.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/sched.h"
-#elif (PACE_WIN32)
-# include "pace/win32/sched.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function sched_get_priority_max.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.3.6.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sched_get_priority_max (int policy);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sched_get_priority_min.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.3.6.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sched_get_priority_min (int policy);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sched_getparam.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.3.2.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sched_getparam (pace_pid_t pid,
-                                                   pace_sched_param * param);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sched_rr_get_interval.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.3.6.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sched_rr_get_interval (pace_pid_t pid,
-                                                          pace_timespec * interval);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sched_setparam.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.3.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sched_setparam (pace_pid_t pid,
-                                                   const pace_sched_param * param);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sched_getscheduler.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.3.4.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sched_getscheduler (pace_pid_t pid);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sched_setscheduler.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.3.3.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sched_setscheduler (pace_pid_t pid,
-                                                       int policy,
-                                                       const pace_sched_param * param);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sched_yield.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 13.3.5.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sched_yield ();
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/sched.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/sched.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/sched.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SCHED_H */
diff --git a/PACE/pace/semaphore.h b/PACE/pace/semaphore.h
deleted file mode 100644
index 9c2a34824aa..00000000000
--- a/PACE/pace/semaphore.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/semaphore.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SEMAPHORE_H
-#define PACE_SEMAPHORE_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/semaphore.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/semaphore.h"
-#elif (PACE_WIN32)
-# include "pace/win32/semaphore.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function sem_close.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.2.4.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sem_close (pace_sem_t * sem);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sem_destroy.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.2.2.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sem_destroy (pace_sem_t * sem);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sem_getvalue.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.2.8.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sem_getvalue (pace_sem_t * sem, int * sval);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sem_init.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.2.1.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sem_init (pace_sem_t * sem,
-                                             int pshared,
-                                             unsigned int value);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sem_open.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.2.3.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-# define pace_sem_open sem_open
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sem_post.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.2.7.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sem_post (pace_sem_t * sem);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sem_trywait.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.2.6.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sem_trywait (pace_sem_t * sem);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sem_unlink.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.2.5.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sem_unlink (const char * name);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sem_wait.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 11.2.6.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sem_wait (pace_sem_t * sem);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/semaphore.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/semaphore.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/semaphore.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SEMAPHORE_H */
diff --git a/PACE/pace/setjmp.h b/PACE/pace/setjmp.h
deleted file mode 100644
index 99a6651982f..00000000000
--- a/PACE/pace/setjmp.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/setjmp.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SETJMP_H
-#define PACE_SETJMP_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/setjmp.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/setjmp.h"
-#elif (PACE_WIN32)
-# include "pace/win32/setjmp.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function setjmp.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.3.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  /* int pace_setjmp (pace_jmp_buf env); */
-# define pace_setjmp setjmp
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function sigsetjmp.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.3.1.
-   */
-#if (PACE_HAS_POSIX_SIG_UOF)
-  /* int pace_sigsetjmp (pace_sigjmp_buf env, int savemask); */
-# define pace_sigsetjmp setjmp
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function longjmp.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.3.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE void pace_longjmp (pace_jmp_buf env, int val);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function siglongjmp.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.3.1.
-   */
-#if (PACE_HAS_POSIX_SIG_UOF)
-  PACE_Export PACE_INLINE void pace_siglongjmp (pace_sigjmp_buf env, int val);
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/setjmp.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/setjmp.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/setjmp.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SETJMP_H */
diff --git a/PACE/pace/signal.h b/PACE/pace/signal.h
deleted file mode 100644
index 6ca0a0f200c..00000000000
--- a/PACE/pace/signal.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/signal.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#ifndef PACE_SIGNAL_H
-#define PACE_SIGNAL_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/signal.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/signal.h"
-#elif (PACE_WIN32)
-# include "pace/win32/signal.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function kill.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.3.2.
-   */
-#if (PACE_HAS_POSIX_SIG_UOF)
-  PACE_Export PACE_INLINE int pace_kill (pace_pid_t pid, int sig);
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-  /**
-     C std 7.14.2.1
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_raise (int sig);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sigaction.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.3.4.
-   */
-#if (PACE_HAS_POSIX_SIG_UOF)
-  PACE_Export PACE_INLINE int pace_sigaction (int sig,
-                                              const pace_sigaction_s * act,
-                                              pace_sigaction_s * oact);
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function sigaddset.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.3.3.
-   */
-#if (PACE_HAS_POSIX_SIG_UOF)
-  PACE_Export PACE_INLINE int pace_sigaddset (pace_sigset_t * set, int signo);
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function sigemptyset.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.3.3.
-   */
-#if (PACE_HAS_POSIX_SIG_UOF)
-  PACE_Export PACE_INLINE int pace_sigemptyset (pace_sigset_t * set);
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function sigdelset.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.3.3.
-   */
-#if (PACE_HAS_POSIX_SIG_UOF)
-  PACE_Export PACE_INLINE int pace_sigdelset (pace_sigset_t * set, int signo);
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function sigfillset.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.3.3.
-   */
-#if (PACE_HAS_POSIX_SIG_UOF)
-  PACE_Export PACE_INLINE int pace_sigfillset (pace_sigset_t * set);
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function sigismember.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.3.3.
-   */
-#if (PACE_HAS_POSIX_SIG_UOF)
-  PACE_Export PACE_INLINE int pace_sigismember (const pace_sigset_t * set,
-                                                int signo);
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-  /**
-     C std 7.14.1.1
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE pace_sig_pf pace_signal(int sig, pace_sig_pf func);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sigpending.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.3.6.
-   */
-#if (PACE_HAS_POSIX_SIG_UOF)
-  PACE_Export PACE_INLINE int pace_sigpending (pace_sigset_t * set);
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function sigprocmask.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.3.5.
-   */
-#if (PACE_HAS_POSIX_SIG_UOF)
-  PACE_Export PACE_INLINE int pace_sigprocmask (int how,
-                                                const pace_sigset_t * set,
-                                                pace_sigset_t * oset);
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function sigqueue.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.3.9.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sigqueue (pace_pid_t pid,
-                                             int signo,
-                                             const pace_sigval value);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sigsuspend.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.3.7.
-   */
-#if (PACE_HAS_POSIX_SIG_UOF)
-  PACE_Export PACE_INLINE int pace_sigsuspend (const pace_sigset_t * sigmask);
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function sigtimedwait.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.3.8.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sigtimedwait (const pace_sigset_t * set,
-                                                 pace_siginfo_t * info,
-                                                 const pace_timespec * timeout);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function sigwait.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.3.8.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sigwait (const pace_sigset_t * set,
-                                            int * sig);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-  /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */
-
-  /**
-     PACE's implementation of the POSIX function sigwaitinfo.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.3.8.
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_sigwaitinfo (const pace_sigset_t * set,
-                                                pace_siginfo_t * info);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/signal.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/signal.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/signal.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SIGNAL_H */
diff --git a/PACE/pace/stddef.h b/PACE/pace/stddef.h
deleted file mode 100644
index 457dddcd50f..00000000000
--- a/PACE/pace/stddef.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $Id$
-
-* ============================================================================
-*
-* = LIBRARY
-*    pace
-*
-* = FILENAME
-*    pace/stddef.h
-*
-* = AUTHOR
-*    John Heitmann
-*
-* =========================================================================== */
-
-#ifndef PACE_STDDEF_H
-#define PACE_STDDEF_H
-
-#include <stddef.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_NULL
-#define PACE_NULL NULL;
-#endif /* PACE_NULL */
-
-#ifndef PACE_OFFSETOF
-# define PACE_OFFSETOF
-# define pace_offsetof offsetof;
-#endif /* PACE_OFFSETOF */
-
-#ifndef PACE_PTRDIFF_T
-#define PACE_PTRDIFF_T
-typedef ptrdiff_t pace_ptrdiff_t;
-#endif /* PACE_PTRDIFF_T */
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T
-typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-#ifndef PACE_WCHAR_T
-#define PACE_WCHAR_T
-typedef wchar_t pace_wchar_t;
-#endif /* PACE_WCHAR_T */
-
-# if defined (PACE_HAS_CPLUSPLUS)
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_STDDEF_H */
diff --git a/PACE/pace/stdio.h b/PACE/pace/stdio.h
deleted file mode 100644
index 29cb3444e35..00000000000
--- a/PACE/pace/stdio.h
+++ /dev/null
@@ -1,528 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/stdio.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_STDIO_H
-#define PACE_STDIO_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/stdio.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/stdio.h"
-#elif (PACE_WIN32)
-# include "pace/win32/stdio.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function clearerr.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE void pace_clearerr (PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function ctermid.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.7.1.
-     */
-#if (PACE_HAS_POSIX_DS_UOF)
-  PACE_Export PACE_INLINE char * pace_ctermid (char * s);
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function fclose.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE int pace_fclose (PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function fdopen.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.2.2.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE PACE_FILE * pace_fdopen (int fildes,
-                                                   const char * type);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function ferror.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE int pace_ferror (PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function feof.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE int pace_feof (PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function fflush.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE int pace_fflush (PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function fileno.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.2.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE int pace_fileno (PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function fgetc.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE int pace_fgetc (PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-    C std 7.19.9.1
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_fgetpos(PACE_FILE * stream,
-                               pace_fpos_t * pos);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function fgets.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE char * pace_fgets (char * s, int n,
-                                             PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function flockfile.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.2.6.
-     */
-#if (PACE_HAS_POSIX_FL_UOF)
-  PACE_Export PACE_INLINE void pace_flockfile (PACE_FILE * file);
-#endif /* PACE_HAS_POSIX_FL_UOF */
-  /* Requires PACE_HAS_REENTRANT. */
-
-  /**
-     PACE's implementation of the POSIX function fopen.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE PACE_FILE * pace_fopen (const char * filename,
-                                                  const char * mode);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function fprintf.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-# define pace_fprintf fprintf
-#endif /* PACE_HAS_POSIX_DI_UOF */
-  /*  int pace_fprintf (PACE_FILE *stream, const char *format, ...);*/
-
-  /**
-     PACE's implementation of the POSIX function fputc.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE int pace_fputc (int c, PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function fputs.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE int pace_fputs (const char * s, PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function fread.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE pace_size_t pace_fread (void * ptr,
-                                                  pace_size_t size,
-                                                  pace_size_t number_of_items,
-                                                  PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function freopen.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE FILE * pace_freopen (const char * filename,
-                                               const char * mode,
-                                               PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function fscanf.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-#  define pace_fscanf fscanf
-#endif /* PACE_HAS_POSIX_DI_UOF */
-  /* int pace_scanf (const char *format, ... ); */
-
-  /**
-     PACE's implementation of the POSIX function fseek.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_FM_UOF)
-  PACE_Export PACE_INLINE int pace_fseek (PACE_FILE * stream,
-                                          long offset,
-                                          int whence);
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-  /**
-    C std 7.19.9.3
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_fsetpos(PACE_FILE *stream,
-                                           const pace_fpos_t *pos);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function ftell.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_FM_UOF)
-  PACE_Export PACE_INLINE long pace_ftell (PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-  /**
-     PACE's implementation of the POSIX function ftrylockfile.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.2.6.
-     */
-#if (PACE_HAS_POSIX_FL_UOF)
-  PACE_Export PACE_INLINE int pace_ftrylockfile (PACE_FILE * file);
-#endif /* PACE_HAS_POSIX_FL_UOF */
-  /* Requires PACE_HAS_REENTRANT. */
-
-  /**
-     PACE's implementation of the POSIX function funlockfile.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.2.6.
-     */
-#if (PACE_HAS_POSIX_FL_UOF)
-  PACE_Export PACE_INLINE void pace_funlockfile (PACE_FILE * file);
-#endif /* PACE_HAS_POSIX_FL_UOF */
-  /* Requires PACE_HAS_REENTRANT. */
-
-  /**
-    C std 7.19.8.2
-    */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE pace_size_t pace_fwrite(const void * ptr,
-                                                  pace_size_t size,
-                                                  pace_size_t nmemb,
-                                                  PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function getc.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE int pace_getc (PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function getc_unlocked.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.2.7.
-     */
-#if (PACE_HAS_POSIX_FL_UOF)
-  PACE_Export PACE_INLINE int pace_getc_unlocked (PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_FL_UOF */
-  /* Requires PACE_HAS_REENTRANT. */
-
-  /**
-     PACE's implementation of the POSIX function getchar.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE int pace_getchar ();
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function getchar_unlocked.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.2.7.
-     */
-#if (PACE_HAS_POSIX_FL_UOF)
-  PACE_Export PACE_INLINE int pace_getchar_unlocked ();
-#endif /* PACE_HAS_POSIX_FL_UOF */
-  /* Requires PACE_HAS_REENTRANT. */
-
-  /**
-     PACE's implementation of the POSIX function gets.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE char *pace_gets (char * s);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function perror.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE void pace_perror (const char * s);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function printf.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-# define pace_printf printf
-#endif /* PACE_HAS_POSIX_DI_UOF */
-  /*  int pace_printf (const char* format, ...); */
-
-  /**
-     PACE's implementation of the POSIX function putc.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE int pace_putc (int c, PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function putc_unlocked.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.2.7.
-     */
-#if (PACE_HAS_POSIX_FL_UOF)
-  PACE_Export PACE_INLINE int pace_putc_unlocked (int c, PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_FL_UOF */
-  /* Requires PACE_HAS_REENTRANT. */
-
-  /**
-     PACE's implementation of the POSIX function putchar.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE int pace_putchar (int c);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function putchar_unlocked.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.2.7.
-     */
-#if (PACE_HAS_POSIX_FL_UOF)
-  PACE_Export PACE_INLINE int pace_putchar_unlocked (int c);
-#endif /* PACE_HAS_POSIX_FL_UOF */
-  /* Requires PACE_HAS_REENTRANT. */
-
-  /**
-     PACE's implementation of the POSIX function puts.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE int pace_puts (const char * s);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function remove.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE int pace_remove (const char * path);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function rename.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.5.3.
-     */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE int pace_rename (const char * old_name,
-                                           const char * new_name);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function rewind.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_FM_UOF)
-  PACE_Export PACE_INLINE void pace_rewind (PACE_FILE * stream);
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-  /**
-     PACE's implementation of the POSIX function sprintf.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-# define pace_sprintf sprintf
-#endif /* PACE_HAS_POSIX_DI_UOF */
-  /*  int pace_sprintf (char* s, const char* format, ...); */
-
-  /**
-     PACE's implementation of the POSIX function scanf.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-# define pace_scanf scanf
-#endif /* PACE_HAS_POSIX_DI_UOF */
-  /* int pace_scanf (const char *format, ... ); */
-
-  /**
-     PACE's implementation of the POSIX function setbuf.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE void pace_setbuf (PACE_FILE * stream, char * buf);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-
-  /**
-    C std 7.19.5.6
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_setvbuf(PACE_FILE * stream,
-                                           char * buf,
-                                           int mode, pace_size_t size);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-  /**
-     PACE's implementation of the POSIX function sscanf.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-# define pace_sscanf sscanf
-#endif /* PACE_HAS_POSIX_DI_UOF */
-  /* int pace_sscanf (const char *s, const char *format, ... ); */
-
-  /**
-     PACE's implementation of the POSIX function tmpfile.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE FILE * pace_tmpfile ();
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function tmpnam.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE char * pace_tmpnam (char * s);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function ungetc.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE int pace_ungetc (int c, FILE * stream);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-    C std 7.19.6.8
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_vfprintf (PACE_FILE * stream,
-                                             const char * format,
-                                             va_list arg);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-    C std 7.19.6.10
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_vprintf (const char * format,
-                                            va_list arg);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-    C std 7.19.6.13
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_vsprintf (char * s,
-                                             const char * format,
-                                             va_list arg);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/stdio.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/stdio.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/stdio.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_STDIO_H */
diff --git a/PACE/pace/stdlib.h b/PACE/pace/stdlib.h
deleted file mode 100644
index 60c7ea203d1..00000000000
--- a/PACE/pace/stdlib.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/stdlib.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_STDLIB_H
-#define PACE_STDLIB_H
-
-#include "pace/config/defines.h"
-#include "pace/unistd.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/stdlib.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/stdlib.h"
-#elif (PACE_WIN32)
-# include "pace/win32/stdlib.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-    C std 7.20.4.1
-    */
-#if (PACE_HAS_POSIX_SIG_UOF)
-  PACE_Export PACE_INLINE void pace_abort (void);
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function abs.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_abs (int val);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-    C std ref. 7.20.4.2
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_atexit (void (*func)(void));
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function atof.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE double pace_atof (const char * str);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function atoi.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_atoi (const char * str);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function atol.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE long pace_atol (const char * str);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function bsearch.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE void * pace_bsearch (const void *key,
-                                               const void *base,
-                                               size_t nel, size_t size,
-                                               int (*compar)(const void *,
-                                                             const void *));
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-    C std ref. 7.20.6.2
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE pace_div_t pace_div (int numer, int denom);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function exit.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_MP_UOF)
-  PACE_Export PACE_INLINE void pace_exit (int status);
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-  /**
-     PACE's implementation of the POSIX function getenv.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.6.1.
-     */
-#if (PACE_HAS_POSIX_MP_UOF)
-  PACE_Export PACE_INLINE char * pace_getenv (const char * name);
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-  /**
-    C std ref. 7.20.6.1
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE long int pace_labs (long int j);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-    C std ref. 7.20.6.2
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE pace_ldiv_t pace_ldiv (long int numer,
-                                                 long int denom);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-    C std ref. 7.20.7.1
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_mblen (const char* s, pace_size_t n);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-    C std ref. 7.20.8.1
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE pace_size_t pace_mbstowcs (pace_wchar_t* pwcs,
-                                                     const char* s,
-                                                     pace_size_t n);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-    C std ref. 7.20.7.2
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_mbtowc (pace_wchar_t* pwc,
-                                           const char* s,
-                                           pace_size_t n);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function qsort.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE void pace_qsort (void * base,
-                                           size_t nel,
-                                           size_t width,
-                                           int (*compar)(const void *,
-                                                         const void *));
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function rand.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_rand ();
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function srand.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE void pace_srand (unsigned int seed);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function rand_r.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.3.8.
-     */
-#if (PACE_HAS_POSIX_CLSR_UOF)
-  PACE_Export PACE_INLINE int pace_rand_r (unsigned int * seed);
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-  /* Requires PACE_HAS_REENTRANT. */
-
-  /**
-    C std ref. 7.20.1.3
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE double pace_strtod (const char* nptr,
-                                              char** endptr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-    C std ref. 7.20.1.4
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_strtol (const char* nptr,
-                                           char** endptr,
-                                           int base);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-    C std ref. 7.20.7.2
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE unsigned long int pace_strtoul (const char* nptr,
-                                                          char** endptr,
-                                                          int base);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-    C std ref. 7.20.4.5
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_system (const char* string);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-    C std ref. 7.20.8.2
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE pace_size_t pace_wcstombs (char* s,
-                                                     const pace_wchar_t* pwcs,
-                                                     pace_size_t n);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-    C std ref. 7.20.7.3
-    */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_wctomb (char* s, pace_wchar_t wchar);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-
-                        /* Memory Management */
-
-  /**
-     PACE's implementation of the POSIX function malloc.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE void * pace_malloc (size_t size);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function calloc.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE void * pace_calloc (size_t nelem, size_t elsize);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function free.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE void pace_free (void * ptr);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function realloc.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE void * pace_realloc (void * ptr, size_t size);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/stdlib.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/stdlib.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/stdlib.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_STDLIB_H */
diff --git a/PACE/pace/string.h b/PACE/pace/string.h
deleted file mode 100644
index 5160715c601..00000000000
--- a/PACE/pace/string.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/string.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_STRING_H
-#define PACE_STRING_H
-
-#include "pace/config/defines.h"
-#include "pace/unistd.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/string.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/string.h"
-#elif (PACE_WIN32)
-# include "pace/win32/string.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-  pace_memchr function, C std ref. 7.21.5.1
-  */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE void * pace_memchr(const void *s,
-                                             int c,
-                                             pace_size_t n);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-  pace_memcmp function, C std ref. 7.21.4.1
-  */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_memcmp(const void *s1,
-                                          const void *s2,
-                                          pace_size_t n);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-  pace_memcpy function, C std ref. 7.21.2.1
-  */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE void *pace_memcpy(void * s1,
-                                            const void * s2,
-                                            pace_size_t n);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-  pace_memmove function, C std ref.7.21.2.2
-  */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE void *pace_memmove(void *s1,
-                                             const void *s2,
-                                             pace_size_t n);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-  pace_memset function, C std ref. 7.21.6.1
-  */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE void *pace_memset(void *s, int c, pace_size_t n);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function strcat.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE char * pace_strcat (char * s1, const char * s2);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function strncat.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE char * pace_strncat (char * s1,
-                                               const char * s2,
-                                               size_t n);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function strchr.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE char * pace_strchr (const char * s, int c);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function strrchr.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE char * pace_strrchr (const char * s, int c);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function strcmp.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_strcmp (const char * s1, const char * s2);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function strncmp.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE int pace_strncmp (const char * s1,
-                                            const char * s2,
-                                            size_t n);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function strcpy.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE char * pace_strcpy (char * s1, const char * s2);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function strncpy.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE char * pace_strncpy (char * s1,
-                                               const char * s2,
-                                               size_t n);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function strcspn.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE size_t pace_strcspn (const char * s1,
-                                               const char * s2);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function strspn.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE size_t pace_strspn (const char * s1,
-                                              const char * s2);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function strlen.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE size_t pace_strlen (const char * s);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function strpbrk.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE char * pace_strpbrk (const char * s1,
-                                               const char * s2);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function strstr.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE char * pace_strstr (const char * s1,
-                                              const char * s2);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function strtok.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE char * pace_strtok (char * s1, const char * s2);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function strtok_r.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.3.3.
-     */
-#if (PACE_HAS_POSIX_CLSR_UOF)
-  PACE_Export PACE_INLINE char * pace_strtok_r (char * s,
-                                                const char * sep,
-                                                char ** lasts);
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-  /* Requires PACE_HAS_REENTRANT. */
-
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/string.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/string.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/string.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_STRING_H */
diff --git a/PACE/pace/sys/mman.h b/PACE/pace/sys/mman.h
deleted file mode 100644
index 28d11481391..00000000000
--- a/PACE/pace/sys/mman.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/sys/mman.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_MMAN_H
-#define PACE_SYS_MMAN_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/mman.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/mman.h"
-#elif (PACE_WIN32)
-# include "pace/win32/mman.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function mlock.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 12.1.2.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_mlock (const void * addr, pace_size_t len);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function mlockall.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 12.1.1.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_mlockall (int flags);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function mmap.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 12.2.1.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE void * pace_mmap (void * addr,
-                                            pace_size_t len,
-                                            int prot,
-                                            int flags,
-                                            PACE_HANDLE fildes,
-                                            pace_off_t off);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function mprotect.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 12.2.3.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_mprotect (void * addr,
-                                             pace_size_t len,
-                                             int prot);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function msync.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 12.2.4.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_msync (void * addr,
-                                          pace_size_t len,
-                                          int flags);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function munlock.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 12.1.2.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_munlock (const void * addr,
-                                            pace_size_t len);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function munlockall.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 12.1.1.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_munlockall ();
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function munmap.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 12.2.2.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_munmap (void * addr, pace_size_t len);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function shm_open.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 12.3.1.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE PACE_HANDLE pace_shm_open (const char * name,
-                                                     int oflag,
-                                                     pace_mode_t mode);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-  /* Requires PACE_POSIX_C_SOURCE > 2. */
-
-  /**
-     PACE's implementation of the POSIX function shm_open.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 12.3.2.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_shm_unlink (const char * name);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-  /* Requires PACE_POSIX_C_SOURCE > 2. */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/mman.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/mman.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/mman.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_MMAN_H */
diff --git a/PACE/pace/sys/socket.h b/PACE/pace/sys/socket.h
deleted file mode 100644
index 52b407cfeff..00000000000
--- a/PACE/pace/sys/socket.h
+++ /dev/null
@@ -1,252 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/sys/socket.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SOCKET_H
-#define PACE_SOCKET_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/socket.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/socket.h"
-#elif (PACE_WIN32)
-# include "pace/win32/socket.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-/**
-   PACE's implementation of the POSIX function accept.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE int pace_accept (int s,
-                                             pace_sockaddr * socketaddress,
-                                             pace_socklen_t * addresslen);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-/**
-   PACE's implementation of the POSIX function bind.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE int pace_bind (int s,
-                                           const pace_sockaddr * socketaddress,
-                                           pace_socklen_t addresslen);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-/**
-   PACE's implementation of the POSIX function connect.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE int pace_connect (int s,
-                                              const pace_sockaddr * socketaddress,
-                                              pace_socklen_t addresslen);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-/**
-   PACE's implementation of the POSIX function getpeername.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE int pace_getpeername (int s,
-                                                  pace_sockaddr * socketaddress,
-                                                  pace_socklen_t * addresslen);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-/**
-   PACE's implementation of the POSIX function getsockname.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE int pace_getsockname (int s,
-                                                  pace_sockaddr * socketaddress,
-                                                  pace_socklen_t * addresslen);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-/**
-   PACE's implementation of the POSIX function getsockopt.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE int pace_getsockopt (int s,
-                                                 int level,
-                                                 int optname,
-                                                 void * optval,
-                                                 pace_socklen_t optlen);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-/**
-   PACE's implementation of the POSIX function setsockopt.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE int pace_setsockopt (int s,
-                                                 int level,
-                                                 int optname,
-                                                 const * optval);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-/**
-   PACE's implementation of the POSIX function isfdtype.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE int pace_isfdtype (int fildes, int fdtype);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-/**
-   PACE's implementation of the POSIX function listen.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE int pace_listen (int s, int backlog);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-/**
-   PACE's implementation of the POSIX function recv.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE pace_ssize_t pace_recv (int s,
-                                                    void * buf,
-                                                    pace_size_t len,
-                                                    int flags);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-/**
-   PACE's implementation of the POSIX function recvfrom.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE pace_ssize_t pace_recvfrom (int s,
-                                                        void * buf,
-                                                        pace_size_t len,
-                                                        int flags,
-                                                        pace_sockaddr * from,
-                                                        pace_socklen_t * fromlen);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-/**
-   PACE's implementation of the POSIX function recvmsg.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE pace_ssize_t pace_rcvmsg (int s,
-                                                      pace_msghdr * msg,
-                                                      int flags);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-/**
-   PACE's implementation of the POSIX function send.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE pace_ssize_t pace_send (int s,
-                                                    const void * buf,
-                                                    pace_size_t len,
-                                                    int flags);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-/**
-   PACE's implementation of the POSIX function sendto.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE pace_ssize_t pace_sendto (int s,
-                                                      const void * buf,
-                                                      pace_size_t len,
-                                                      int flags,
-                                                      const pace_sockaddr * to,
-                                                      pace_socklen_t * tolen);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-/**
-   PACE's implementation of the POSIX function sendmsg.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE pace_ssize_t pace_sendmsg (int s,
-                                                       const pace_msghdr * msg,
-                                                       int flags);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-/**
-   PACE's implementation of the POSIX function shutdown.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE int pace_shutdown (int s, int how);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-/**
-   PACE's implementation of the POSIX function socket.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE int pace_socket (int protofamily,
-                                             int type,
-                                             int protocol);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-    
-/**
-   PACE's implementation of the POSIX function socketpair.
-   See IEEE Standards Project Approved 30 January 2000.
-   (IEEE Std P1003.1g, D6.6, March 1997 Edition)
-*/
-#if (PACE_HAS_POSIX_SOCK_UOF)
-    PACE_Export PACE_INLINE int pace_socketpair (int protofamily,
-                                                 int type,
-                                                 int protocol,
-                                                 int sv[2]);
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-    
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/socket.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/socket.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/socket.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SOCKET_H */
-
diff --git a/PACE/pace/sys/stat.h b/PACE/pace/sys/stat.h
deleted file mode 100644
index f1ab6a98dc0..00000000000
--- a/PACE/pace/sys/stat.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/sys/stat.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_STAT_H
-#define PACE_SYS_STAT_H
-
-#include "pace/config/defines.h"
-#include "pace/sys/types.h"
-
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/stat.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/stat.h"
-#elif (PACE_WIN32)
-# include "pace/win32/stat.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#if (PACE_HAS_POSIX_FA_UOF)
-  PACE_Export PACE_INLINE int pace_chmod (const char * path, pace_mode_t mode);
-#endif /* PACE_HAS_POSIX_FA_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_fchmod (PACE_HANDLE fildes,
-                                           pace_mode_t mode);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE int pace_fstat (PACE_HANDLE fildes,
-pace_stat_s * buf);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE int pace_mkdir (const char * path, pace_mode_t mode);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_F_UOF)
-  PACE_Export PACE_INLINE int pace_mkfifo (const char * path,
-                                           pace_mode_t mode);
-#endif /* PACE_HAS_POSIX_F_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE int pace_stat (const char * path, pace_stat_s * buf);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FA_UOF)
-  PACE_Export PACE_INLINE pace_mode_t pace_umask (pace_mode_t cmask);
-#endif /* PACE_HAS_POSIX_FA_UOF */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/stat.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/stat.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/stat.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_STAT_H */
diff --git a/PACE/pace/sys/times.h b/PACE/pace/sys/times.h
deleted file mode 100644
index 2f3db177f5c..00000000000
--- a/PACE/pace/sys/times.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/sys/times.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_TIMES_H
-#define PACE_SYS_TIMES_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/times.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/times.h"
-#elif (PACE_WIN32)
-# include "pace/win32/times.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-  PACE_Export PACE_INLINE pace_clock_t pace_times (pace_tms * buffer);
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/times.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/times.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/times.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_TIMES_H */
diff --git a/PACE/pace/sys/types.h b/PACE/pace/sys/types.h
deleted file mode 100644
index e668be409d7..00000000000
--- a/PACE/pace/sys/types.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/sys/types.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_TYPES_H
-#define PACE_SYS_TYPES_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/types.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/types.h"
-#elif (PACE_WIN32)
-# include "pace/win32/types.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_TYPES_H */
diff --git a/PACE/pace/sys/utsname.h b/PACE/pace/sys/utsname.h
deleted file mode 100644
index 1f50d58ea18..00000000000
--- a/PACE/pace/sys/utsname.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/sys/utsname.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_UTSNAME_H
-#define PACE_SYS_UTSNAME_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/utsname.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/utsname.h"
-#elif (PACE_WIN32)
-# include "pace/win32/utsname.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#if (PACE_HAS_POSIX_SP_UOF)
-  PACE_Export PACE_INLINE int pace_uname (pace_utsname * name);
-#endif /* PACE_HAS_POSIX_SP_UOF */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/utsname.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/utsname.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/utsname.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_UTSNAME_H */
diff --git a/PACE/pace/sys/wait.h b/PACE/pace/sys/wait.h
deleted file mode 100644
index 8fc12e00bd8..00000000000
--- a/PACE/pace/sys/wait.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/sys/wait.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_WAIT_H
-#define PACE_WAIT_H
-
-#include "pace/config/defines.h"
-#include "pace/sys/types.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/wait.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/wait.h"
-#elif (PACE_WIN32)
-# include "pace/win32/wait.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-  /**
-     PACE's implementation of the POSIX function wait.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.2.1.
-     */
-#if (PACE_HAS_POSIX_MP_UOF)
-  PACE_Export PACE_INLINE pace_pid_t pace_wait (int * statloc);
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-  /**
-     PACE's implementation of the POSIX function waitpid.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.2.1.
-     */
-#if (PACE_HAS_POSIX_MP_UOF)
-  PACE_Export PACE_INLINE pace_pid_t pace_waitpid (pace_pid_t pid,
-                                                   int * statloc,
-                                                   int options);
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/wait.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/wait.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/wait.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_WAIT_H */
diff --git a/PACE/pace/termios.h b/PACE/pace/termios.h
deleted file mode 100644
index 2a3d855259d..00000000000
--- a/PACE/pace/termios.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/termios.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_TERMIOS_H
-#define PACE_SYS_TERMIOS_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/termios.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/termios.h"
-#elif (PACE_WIN32)
-# include "pace/win32/termios.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function cfgetospeed.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 7.1.3.
-     */
-#if (PACE_HAS_POSIX_DS_UOF)
-  PACE_Export PACE_INLINE pace_speed_t pace_cfgetospeed (const pace_termios * termiosp);
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function cfsetospeed.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 7.1.3.
-     */
-#if (PACE_HAS_POSIX_DS_UOF)
-  PACE_Export PACE_INLINE int pace_cfsetospeed (pace_termios * termios_p,
-                                                pace_speed_t speed);
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function cfgetispeed.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 7.1.3.
-     */
-#if (PACE_HAS_POSIX_DS_UOF)
-  PACE_Export PACE_INLINE pace_speed_t pace_cfgetispeed (const pace_termios * termios_p);
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function cfsetispeed.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 7.1.3.
-     */
-#if (PACE_HAS_POSIX_DS_UOF)
-  PACE_Export PACE_INLINE int pace_cfsetispeed (pace_termios * termios_p,
-                                                pace_speed_t speed);
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function tcdrain.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 7.2.2.
-     */
-#if (PACE_HAS_POSIX_DS_UOF)
-  PACE_Export PACE_INLINE int pace_tcdrain (PACE_HANDLE fildes);
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function tcflow.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 7.2.2.
-     */
-#if (PACE_HAS_POSIX_DS_UOF)
-  PACE_Export PACE_INLINE int pace_tcflow (PACE_HANDLE fildes, int action);
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function tcflush.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 7.2.2.
-     */
-#if (PACE_HAS_POSIX_DS_UOF)
-  PACE_Export PACE_INLINE int pace_tcflush (PACE_HANDLE fildes,
-                                            int queue_selector);
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function tcgetattr.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 7.2.1.
-     */
-#if (PACE_HAS_POSIX_DS_UOF)
-  PACE_Export PACE_INLINE int pace_tcgetattr (PACE_HANDLE fildes,
-                                              pace_termios * termios_p);
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function tcsendbreak.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 7.2.2.
-     */
-#if (PACE_HAS_POSIX_DS_UOF)
-  PACE_Export PACE_INLINE int pace_tcsendbreak (PACE_HANDLE fildes,
-                                                int duration);
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function tcsetattr.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 7.2.1.
-     */
-#if (PACE_HAS_POSIX_DS_UOF)
-  PACE_Export PACE_INLINE int pace_tcsetattr (PACE_HANDLE fildes,
-                                              int optional_actions,
-                                              const pace_termios * termios_p);
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/termios.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/termios.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/termios.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_TERMIOS_H */
diff --git a/PACE/pace/time.h b/PACE/pace/time.h
deleted file mode 100644
index 688eac0ddf6..00000000000
--- a/PACE/pace/time.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/time.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_TIME_H
-#define PACE_TIME_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/time.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/time.h"
-#elif (PACE_WIN32)
-# include "pace/win32/time.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function asctime.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE char * pace_asctime (const pace_tm * time);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function asctime_r.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.1.
-     */
-#if (PACE_HAS_POSIX_CLSR_UOF)
-  PACE_Export PACE_INLINE char * pace_asctime_r (const pace_tm * tm,
-                                                 char * buf);
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-  /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */
-
-
-  /**
-     C std 7.23.2.1
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE pace_clock_t pace_clock (void);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     C std 7.23.2.2
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE double pace_difftime (pace_time_t time1,
-                                                pace_time_t time2);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function clock_getres.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 14.2.1.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_clock_getres (pace_clockid_t clock_id,
-                                                 pace_timespec * res);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function clock_gettime.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 14.2.1.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_clock_gettime (pace_clockid_t clock_id,
-                                                  pace_timespec * tp);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function clock_settime.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 14.2.1.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_clock_settime (pace_clockid_t clock_id,
-                                                  const pace_timespec * tp);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function ctime.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE char * pace_ctime (const pace_time_t * clock);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function ctime_r.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.3.5.
-     */
-#if (PACE_HAS_POSIX_CLSR_UOF)
-  PACE_Export PACE_INLINE char * pace_ctime_r (const pace_time_t * clock,
-                                               char * buf);
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-  /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */
-
-  /**
-     PACE's implementation of the POSIX function gmtime.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE pace_tm * pace_gmtime (const pace_time_t * clock);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function gmtime_r.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.3.6.
-     */
-#if (PACE_HAS_POSIX_CLSR_UOF)
-  PACE_Export PACE_INLINE pace_tm * pace_gmtime_r (const pace_time_t * clock,
-                                                   pace_tm * result);
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-  /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */
-
-  /**
-     PACE's implementation of the POSIX function localtime.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE pace_tm * pace_localtime (const time_t * clock);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function localtime_r.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.3.7.
-     */
-#if (PACE_HAS_POSIX_CLSR_UOF)
-  PACE_Export PACE_INLINE pace_tm * pace_localtime_r (const pace_time_t * clock,
-                                                      pace_tm * result);
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-  /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */
-
-  /**
-     PACE's implementation of the POSIX function mktime.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE pace_time_t pace_mktime (pace_tm * timeptr);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function nanosleep.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 14.2.5.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_nanosleep (const pace_timespec * rqtp,
-                                              pace_timespec * rmtp);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function strftime.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE pace_size_t pace_strftime (char *s,
-                                                     pace_size_t maxsize,
-                                                     const char *format,
-                                                     const pace_tm *timeptr);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function time.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.5.1.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE pace_time_t pace_time (pace_time_t *tloc);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function timer_create.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 14.2.2.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_timer_create (pace_clockid_t clock_id,
-                                                 pace_sigevent * evp,
-                                                 pace_timer_t * timerid);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function timer_delete.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 14.2.3.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_timer_delete (pace_timer_t timerid);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function timer_getoverrun.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 14.2.4.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_timer_getoverrun (pace_timer_t timerid);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function timer_gettime.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 14.2.4.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_timer_gettime (pace_timer_t timerid,
-                                                  pace_itimerspec * value);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function timer_settime.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 14.2.4.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_timer_settime (pace_timer_t timerid,
-                                                  int flags,
-                                                  const pace_itimerspec * value,
-                                                  pace_itimerspec * ovalue);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function tzset.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.3.2.
-     */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_Export PACE_INLINE void pace_tzset ();
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-  /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/time.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/time.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/time.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_TIME_H */
diff --git a/PACE/pace/unistd.h b/PACE/pace/unistd.h
deleted file mode 100644
index 3b6b99f545a..00000000000
--- a/PACE/pace/unistd.h
+++ /dev/null
@@ -1,524 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/unistd.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_UNISTD_H
-#define PACE_UNISTD_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/unistd.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/unistd.h"
-#elif (PACE_WIN32)
-# include "pace/win32/unistd.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function _exit.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.2.2.
-     */
-#if (PACE_HAS_POSIX_MP_UOF)
-  PACE_Export PACE_INLINE void pace__exit (int status);
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-  /**
-     PACE's implementation of the POSIX function access.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.6.3.
-     */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE int pace_access (const char * path, int amode);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function alarm.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.4.1.
-     */
-#if (PACE_HAS_POSIX_SIG_UOF)
-  PACE_Export PACE_INLINE unsigned int pace_alarm (unsigned int seconds);
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function chdir.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.2.1.
-     */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE int pace_chdir (const char * path);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function chown.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.6.5.
-     */
-#if (PACE_HAS_POSIX_FA_UOF)
-  PACE_Export PACE_INLINE int pace_chown (const char * path,
-                                          pace_uid_t owner,
-                                          pace_gid_t group);
-#endif /* PACE_HAS_POSIX_FA_UOF */
-
-  /**
-     PACE's implementation of the POSIX function close.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 6.3.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE int pace_close (PACE_HANDLE fildes);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function dup.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 6.2.1.
-     */
-#if (PACE_HAS_POSIX_FM_UOF)
-  PACE_Export PACE_INLINE PACE_HANDLE pace_dup (PACE_HANDLE fildes);
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-  /**
-     PACE's implementation of the POSIX function dup2.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 6.2.1.
-     */
-#if (PACE_HAS_POSIX_FM_UOF)
-  PACE_Export PACE_INLINE PACE_HANDLE pace_dup2 (PACE_HANDLE fildes,
-                                                 PACE_HANDLE fildes2);
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-  /**
-     PACE's implementation of the POSIX function execl.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.1.2.
-     */
-#if (PACE_HAS_POSIX_MP_UOF)
-# define pace_execl execl
-#endif /* PACE_HAS_POSIX_MP_UOF */
-  /*  PACE_Export PACE_INLINE int pace_execl (const char* path,
-      const char* arg, ...); */
-
-  /**
-     PACE's implementation of the POSIX function execle.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.1.2.
-     */
-#if (PACE_HAS_POSIX_MP_UOF)
-# define pace_execle execle
-#endif /* PACE_HAS_POSIX_MP_UOF */
-  /*  PACE_Export PACE_INLINE int pace_execle (const char* path,
-      const char* arg, ...);*/
-
-  /**
-     PACE's implementation of the POSIX function execlp.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.1.2.
-     */
-#if (PACE_HAS_POSIX_MP_UOF)
-# define pace_execlp execlp
-#endif /* PACE_HAS_POSIX_MP_UOF */
-  /* PACE_Export PACE_INLINE int pace_execlp (const char* file,
-     const char* arg,  ...);*/
-
-  /**
-     PACE's implementation of the POSIX function execv.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.1.2.
-     */
-#if (PACE_HAS_POSIX_MP_UOF)
-  PACE_Export PACE_INLINE int pace_execv (const char * path,
-                                          char * const argv[]);
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-  /**
-     PACE's implementation of the POSIX function execve.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.1.2.
-     */
-#if (PACE_HAS_POSIX_MP_UOF)
-  PACE_Export PACE_INLINE int pace_execve (const char * path,
-                                           char * const argv[],
-                                           char * const envp[]);
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-  /**
-     PACE's implementation of the POSIX function execvp.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.1.2.
-     */
-#if (PACE_HAS_POSIX_MP_UOF)
-  PACE_Export PACE_INLINE int pace_execvp (const char * file,
-                                           char * const argv[]);
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-  /**
-     PACE's implementation of the POSIX function fdatasync.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 6.6.2.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_fdatasync (PACE_HANDLE fildes);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function fork.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.1.1.
-     */
-#if (PACE_HAS_POSIX_MP_UOF)
-  PACE_Export PACE_INLINE pace_pid_t pace_fork ();
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-  /**
-     PACE's implementation of the POSIX function fpathconf.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.7.1.
-     */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE long pace_fpathconf (PACE_HANDLE fildes, int name);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function fsync.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 6.6.1.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_fsync (PACE_HANDLE fildes);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function ftruncate.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.6.7.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_ftruncate (PACE_HANDLE fildes,
-                                              pace_off_t length);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-  /**
-     PACE's implementation of the POSIX function getcwd.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.2.2.
-     */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE char * pace_getcwd (char * buf, size_t size);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function getegid.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.2.1.
-     */
-#if (PACE_HAS_POSIX_UG_UOF)
-  PACE_Export PACE_INLINE pace_uid_t pace_getegid ();
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function geteuid.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.2.1.
-     */
-#if (PACE_HAS_POSIX_UG_UOF)
-  PACE_Export PACE_INLINE pace_uid_t pace_geteuid ();
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function getgid.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.2.1.
-     */
-#if (PACE_HAS_POSIX_UG_UOF)
-  PACE_Export PACE_INLINE pace_uid_t pace_getgid ();
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function getgroups.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.2.3.
-     */
-#if (PACE_HAS_POSIX_UG_UOF)
-  PACE_Export PACE_INLINE int pace_getgroups (int gidsetsize,
-                                              pace_gid_t grouplist[]);
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function getlogin.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.2.4.
-     */
-#if (PACE_HAS_POSIX_UG_UOF)
-  PACE_Export PACE_INLINE char * pace_getlogin ();
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function getlogin_r.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.2.4.
-     */
-#if (PACE_HAS_POSIX_UGR_UOF)
-  PACE_Export PACE_INLINE int pace_getlogin_r (char * name, size_t namesize);
-#endif /* PACE_HAS_POSIX_UGR_UOF */
-  /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */
-
-  /**
-     PACE's implementation of the POSIX function getpgrp.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.3.1.
-     */
-#if (PACE_HAS_POSIX_UG_UOF)
-  PACE_Export PACE_INLINE pace_pid_t pace_getpgrp ();
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function getpid.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.1.1.
-     */
-#if (PACE_HAS_POSIX_MP_UOF)
-  PACE_Export PACE_INLINE pace_pid_t pace_getpid ();
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-  /**
-     PACE's implementation of the POSIX function getppid.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.1.1.
-     */
-#if (PACE_HAS_POSIX_MP_UOF)
-  PACE_Export PACE_INLINE pace_pid_t pace_getppid ();
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-  /**
-     PACE's implementation of the POSIX function getuid.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.2.1.
-     */
-#if (PACE_HAS_POSIX_UG_UOF)
-  PACE_Export PACE_INLINE pace_uid_t pace_getuid ();
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function isatty.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.7.2.
-     */
-#if (PACE_HAS_POSIX_DS_UOF)
-  PACE_Export PACE_INLINE int pace_isatty (int fildes);
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function link.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.3.4.
-     */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE int pace_link (const char * existing,
-                                         const char * new_link);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function lseek.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 6.5.3.
-     */
-#if (PACE_HAS_POSIX_FM_UOF)
-  PACE_Export PACE_INLINE pace_off_t pace_lseek (PACE_HANDLE fildes,
-                                                 off_t offset,
-                                                 int whence);
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-  /**
-     PACE's implementation of the POSIX function pathconf.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.7.1.
-     */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE long pace_pathconf (const char * path, int name);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function pause.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.4.2.
-     */
-#if (PACE_HAS_POSIX_SIG_UOF)
-  PACE_Export PACE_INLINE int pace_pause ();
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function pipe.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 6.1.1.
-     */
-#if (PACE_HAS_POSIX_P_UOF)
-  PACE_Export PACE_INLINE int pace_pipe (PACE_HANDLE fildes[2]);
-#endif /* PACE_HAS_POSIX_P_UOF */
-
-  /**
-     PACE's implementation of the POSIX function read.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 6.4.1.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE pace_ssize_t pace_read (PACE_HANDLE fildes,
-                                                  void * buf,
-                                                  size_t nbyte);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-  /**
-     PACE's implementation of the POSIX function rmdir.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.5.2.
-     */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE int pace_rmdir (const char * path);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function setgid.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.2.2.
-     */
-#if (PACE_HAS_POSIX_UG_UOF)
-  PACE_Export PACE_INLINE int pace_setgid (pace_gid_t gid);
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function setpgid.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.3.3.
-     */
-#if (PACE_HAS_POSIX_JC_UOF)
-  PACE_Export PACE_INLINE int pace_setpgid (pace_pid_t pid, pace_pid_t pgid);
-#endif /* PACE_HAS_POSIX_JC_UOF */
-
-  /**
-     PACE's implementation of the POSIX function setsid.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.3.2.
-     */
-#if (PACE_HAS_POSIX_UG_UOF)
-  PACE_Export PACE_INLINE pace_pid_t pace_setsid ();
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function setuid.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.2.2.
-     */
-#if (PACE_HAS_POSIX_UG_UOF)
-  PACE_Export PACE_INLINE int pace_setuid (pace_uid_t uid);
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function sleep.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 3.4.3.
-     */
-#if (PACE_HAS_POSIX_MP_UOF)
-  PACE_Export PACE_INLINE unsigned pace_sleep (unsigned int seconds);
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-  /**
-    PACE's implementation of the POSIX function sysconf.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.8.1.
-     */
-#if (PACE_HAS_POSIX_SP_UOF)
-  PACE_Export PACE_INLINE long pace_sysconf (int name);
-#endif /* PACE_HAS_POSIX_SP_UOF */
-
-  /**
-     PACE's implementation of the POSIX function ttyname.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 7.2.3.1.
-     */
-#if (PACE_HAS_POSIX_JC_UOF)
-  PACE_Export PACE_INLINE pace_pid_t pace_tcgetpgrp (PACE_HANDLE fildes);
-#endif /* PACE_HAS_POSIX_JC_UOF */
-
-  /**
-     PACE's implementation of the POSIX function ttyname.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 7.2.3.1.
-     */
-#if (PACE_HAS_POSIX_JC_UOF)
-  PACE_Export PACE_INLINE int pace_tcsetpgrp (PACE_HANDLE fildes,
-                                              pace_pid_t pgrp_id);
-#endif /* PACE_HAS_POSIX_JC_UOF */
-
-  /**
-     PACE's implementation of the POSIX function ttyname.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.7.2.
-     */
-#if (PACE_HAS_POSIX_DS_UOF)
-  PACE_Export PACE_INLINE char * pace_ttyname (PACE_HANDLE fildes);
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function ttyname_r.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 4.7.2.
-     */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_Export PACE_INLINE int pace_ttyname_r (PACE_HANDLE fildes,
-                                              char * name,
-                                              size_t namesize);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-  /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */
-
-  /**
-     PACE's implementation of the POSIX function unlink.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.5.1.
-     */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE int pace_unlink (const char * path);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function write.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 6.4.2.
-     */
-#if (PACE_HAS_POSIX_DI_UOF)
-  PACE_Export PACE_INLINE pace_ssize_t pace_write (PACE_HANDLE fildes,
-                                                   const void * buf,
-                                                   size_t nbyte);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/unistd.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/unistd.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/unistd.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_UNISTD_H */
diff --git a/PACE/pace/utime.h b/PACE/pace/utime.h
deleted file mode 100644
index 90a5cfa1a22..00000000000
--- a/PACE/pace/utime.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/utime.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_UTIME_H
-#define PACE_UTIME_H
-
-#include "pace/config/defines.h"
-
-#if (PACE_HAS_POSIX)
-# include "pace/posix/utime.h"
-#elif (PACE_VXWORKS)
-# include "pace/vxworks/utime.h"
-#elif (PACE_WIN32)
-# include "pace/win32/utime.h"
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function utime.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 5.6.6.
-     */
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_Export PACE_INLINE int pace_utime (const char * path,
-                                          const pace_utimbuf * times);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/utime.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/utime.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/utime.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_UTIME_H */
diff --git a/PACE/pace/vxworks/README b/PACE/pace/vxworks/README
deleted file mode 100644
index 170f4b84920..00000000000
--- a/PACE/pace/vxworks/README
+++ /dev/null
@@ -1 +0,0 @@
-VXWORKS dir.
diff --git a/PACE/pace/vxworks/aio.c b/PACE/pace/vxworks/aio.c
deleted file mode 100644
index f9c32d822b4..00000000000
--- a/PACE/pace/vxworks/aio.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/aio.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/aio.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/aio.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/aio.h b/PACE/pace/vxworks/aio.h
deleted file mode 100644
index fa519c4df73..00000000000
--- a/PACE/pace/vxworks/aio.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/aio.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_AIO_H_VXWORKS
-#define PACE_AIO_H_VXWORKS
-
-#include <aio.h>
-#include "pace/time.h"
-#include "pace/signal.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_AIO_ALLDONE AIO_ALLDONE
-#define PACE_AIO_CANCELED AIO_CANCELED
-#define PACE_AIO_NOCANCELED AIO_NOTCANCELED
-#define PACE_LIO_NOP LIO_NOP
-#define PACE_LIO_NOWAIT LIO_NOWAIT
-#define PACE_LIO_READ LIO_READ
-#define PACE_LIO_WAIT LIO_WAIT
-#define PACE_LIO_WRITE LIO_WRITE
-
-#ifndef PACE_AIOCB
-#define PACE_AIOCB
-typedef struct aiocb pace_aiocb;
-#endif /* PACE_AIOCB */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_AIO_H_VXWORKS */
diff --git a/PACE/pace/vxworks/aio.inl b/PACE/pace/vxworks/aio.inl
deleted file mode 100644
index f79a7573c4b..00000000000
--- a/PACE/pace/vxworks/aio.inl
+++ /dev/null
@@ -1,112 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/aio.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_cancel (PACE_HANDLE fildes, pace_aiocb * aiocbp)
-{
-  PACE_TRACE("pace_aio_cancel");
-
-  return aio_cancel (fildes, aiocbp);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_error (const pace_aiocb * aiocbp)
-{
-  PACE_TRACE("pace_aio_error");
-
-  return aio_error (PACE_NONCONST_ARG_CAST (struct aiocb *) aiocbp);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_fsync (int op, pace_aiocb * aiocbp)
-{
-  PACE_TRACE("pace_aio_fsync");
-
-  PACE_UNUSED_ARG (op);
-  PACE_UNUSED_ARG (aiocbp);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_read (pace_aiocb * aiocbp)
-{
-  PACE_TRACE("pace_aio_read");
-
-  return aio_read (aiocbp);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_return (pace_aiocb * aiocbp)
-{
-  PACE_TRACE("pace_aio_return");
-
-  return aio_return (aiocbp);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_suspend (const pace_aiocb * const list[],
-                  int nent,
-                  const pace_timespec * timeout)
-{
-  PACE_TRACE("pace_aio_suspend");
-
-  return aio_suspend (PACE_AIO_SUSPEND_LIST_ARG_CAST list,
-                      nent,
-                      PACE_NONCONST_ARG_CAST (struct timespec *) timeout);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_write (pace_aiocb * aiocbp)
-{
-  PACE_TRACE("pace_aio_write");
-
-  return aio_write (aiocbp);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_lio_listio (int mode,
-                 pace_aiocb * const list[],
-                 int nent,
-                 pace_sigevent * sig)
-{
-  PACE_TRACE("pace_lio_listio");
-
-  return lio_listio (mode, PACE_NONCONST_ARG_CAST (struct aiocb **) list,
-                     nent, sig);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/vxworks/assert.c b/PACE/pace/vxworks/assert.c
deleted file mode 100644
index 8731f27260d..00000000000
--- a/PACE/pace/vxworks/assert.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/assert.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/assert.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/assert.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/assert.h b/PACE/pace/vxworks/assert.h
deleted file mode 100644
index 3b2f014109d..00000000000
--- a/PACE/pace/vxworks/assert.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/assert.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * =========================================================================== */
-
-#ifndef PACE_ASSERT_H_VXWORKS
-#define PACE_ASSERT_H_VXWORKS
-
-#include <assert.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-# if defined (PACE_HAS_CPLUSPLUS)
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_ASSERT_H_VXWORKS */
diff --git a/PACE/pace/vxworks/assert.inl b/PACE/pace/vxworks/assert.inl
deleted file mode 100644
index b3def672d99..00000000000
--- a/PACE/pace/vxworks/assert.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/assert.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
diff --git a/PACE/pace/vxworks/ctype.c b/PACE/pace/vxworks/ctype.c
deleted file mode 100644
index 01b1da173ab..00000000000
--- a/PACE/pace/vxworks/ctype.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/ctype.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/ctype.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/ctype.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/ctype.h b/PACE/pace/vxworks/ctype.h
deleted file mode 100644
index 106684d7371..00000000000
--- a/PACE/pace/vxworks/ctype.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/ctype.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_CTYPE_H_VXWORKS
-#define PACE_CTYPE_H_VXWORKS
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_CTYPE_H_VXWORKS */
diff --git a/PACE/pace/vxworks/ctype.inl b/PACE/pace/vxworks/ctype.inl
deleted file mode 100644
index df9afc8dd76..00000000000
--- a/PACE/pace/vxworks/ctype.inl
+++ /dev/null
@@ -1,159 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/ctype.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include <ctype.h>
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isalnum (int c)
-{
-  PACE_TRACE("pace_isalnum");
-
-  return isalnum (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isalpha (int c)
-{
-  PACE_TRACE("pace_isalpha");
-
-  return isalpha (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_iscntrl (int c)
-{
-  PACE_TRACE("pace_iscntrl");
-
-  return iscntrl (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isdigit (int c)
-{
-  PACE_TRACE("pace_isdigit");
-
-  return isdigit (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isgraph (int c)
-{
-  PACE_TRACE("pace_isgraph");
-
-  return isgraph (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_islower (int c)
-{
-  PACE_TRACE("pace_islower");
-
-  return islower (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isprint (int c)
-{
-  PACE_TRACE("pace_isprint");
-
-  return isprint (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_ispunct (int c)
-{
-  PACE_TRACE("pace_ispunct");
-
-  return ispunct (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isspace (int c)
-{
-  PACE_TRACE("pace_isspace");
-
-  return isspace (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isupper (int c)
-{
-  PACE_TRACE("pace_isupper");
-
-  return isupper (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isxdigit (int c)
-{
-  PACE_TRACE("pace_isxdigit");
-
-  return isxdigit (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_tolower (int c)
-{
-  PACE_TRACE("pace_tolower");
-
-  return tolower (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_toupper (int c)
-{
-  PACE_TRACE("pace_toupper");
-
-  return toupper (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
diff --git a/PACE/pace/vxworks/dirent.c b/PACE/pace/vxworks/dirent.c
deleted file mode 100644
index c1a09545067..00000000000
--- a/PACE/pace/vxworks/dirent.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/dirent.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/dirent.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/dirent.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/dirent.h b/PACE/pace/vxworks/dirent.h
deleted file mode 100644
index 1b746c6ec4a..00000000000
--- a/PACE/pace/vxworks/dirent.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/dirent.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_DIRENT_H_VXWORKS
-#define PACE_DIRENT_H_VXWORKS
-
-#include "pace/sys/types.h"
-#include <dirent.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_DIR_T
-#define PACE_DIR_T
-typedef DIR PACE_DIR;
-#endif /* PACE_DIR_T */
-
-#ifndef PACE_DIRENT
-#define PACE_DIRENT
-typedef struct dirent pace_dirent;
-#endif /* PACE_DIRENT */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_DIRENT_H_VXWORKS */
diff --git a/PACE/pace/vxworks/dirent.inl b/PACE/pace/vxworks/dirent.inl
deleted file mode 100644
index 71d68023212..00000000000
--- a/PACE/pace/vxworks/dirent.inl
+++ /dev/null
@@ -1,74 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/dirent.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-PACE_DIR *
-pace_opendir (const char * dirname)
-{
-  PACE_TRACE("pace_opendir");
-
-  return opendir (PACE_NONCONST_ARG_CAST(char *) dirname);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-pace_dirent *
-pace_readdir (PACE_DIR * dirp)
-{
-  PACE_TRACE("pace_readdir");
-
-  return readdir (dirp);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-int
-pace_readdir_r (PACE_DIR * dirp, pace_dirent * entry,
-                pace_dirent ** result)
-{
-  PACE_TRACE("pace_readdir_r");
-
-  PACE_UNUSED_ARG (entry);
-  /* <result> has better not be 0! */
-  *result = pace_readdir (dirp);
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-void
-pace_rewinddir (PACE_DIR * dirp)
-{
-  PACE_TRACE("pace_rewinddir");
-
-  rewinddir (dirp);
-  return;
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_closedir (PACE_DIR * dirp)
-{
-  PACE_TRACE("pace_closedir");
-
-  return closedir (dirp);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
diff --git a/PACE/pace/vxworks/errno.h b/PACE/pace/vxworks/errno.h
deleted file mode 100644
index 7e64a524658..00000000000
--- a/PACE/pace/vxworks/errno.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* $Id$
-
-* ============================================================================
-*
-* = LIBRARY
-*    pace
-*
-* = FILENAME
-*    pace/vxworks/errno.h
-*
-* = AUTHOR
-*    Joe Hoffert
-*
-* =========================================================================== */
-
-#ifndef PACE_ERRNO_H_VXWORKS
-#define PACE_ERRNO_H_VXWORKS
-
-#include <errno.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_E2BIG E2BIG
-#define PACE_EACCES EACCES
-#define PACE_EAGAIN EAGAIN
-#define PACE_EBADF EBADF
-#define PACE_EBADMSG
-#define PACE_EBUSY EBUSY
-#define PACE_ECANCELED ECANCELED
-#define PACE_ECHILD ECHILD
-#define PACE_EDEADLK EDEADLK
-#define PACE_EDOM EDOM
-#define PACE_EEXIST EEXIST
-#define PACE_EFAULT EFAULT
-#define PACE_EFBIG EFBIG
-#define PACE_EINPROGRESS EINPROGRESS
-#define PACE_EINTR EINTR
-#define PACE_EINVAL EINVAL
-#define PACE_EIO EIO
-#define PACE_EISDIR EISDIR
-#define PACE_EMFILE EMFILE
-#define PACE_EMLINK EMLINK
-#define PACE_EMSGSIZE EMSGSIZE
-#define PACE_EENAMETOOLONG ENAMETOOLONG
-#define PACE_ENFILE ENFILE
-#define PACE_ENODEV ENODEV
-#define PACE_ENOENT ENOENT
-#define PACE_ENOEXEC ENOEXEC
-#define PACE_ENOLCK ENOLCK
-#define PACE_ENOMEM ENOMEM
-#define PACE_ENOSPC ENOSPC
-#define PACE_ENOSYS ENOSYS
-#define PACE_ENOTDIR ENOTDIR
-#define PACE_ENOTEMPTY ENOTEMPTY
-#define PACE_ENOTSUP ENOTSUP
-#define PACE_ENOTTY ENOTTY
-#define PACE_ENXIO ENXIO
-#define PACE_EPERM EPERM
-#define PACE_EPIPE EPIPE
-#define PACE_ERANGE ERANGE
-#define PACE_EROFS EROFS
-#define PACE_ESPIPE ESPIPE
-#define PACE_ESRCH ESRCH
-#define PACE_ETIMEDOUT ETIMEDOUT
-#define PACE_EXDEV EXDEV
-
-#define pace_errno errno
-
-# if defined (PACE_HAS_CPLUSPLUS)
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_ERRNO_H_VXWORKS */
diff --git a/PACE/pace/vxworks/fcntl.c b/PACE/pace/vxworks/fcntl.c
deleted file mode 100644
index c0bc9a30a38..00000000000
--- a/PACE/pace/vxworks/fcntl.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/fcntl.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/fcntl.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/fcntl.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/fcntl.h b/PACE/pace/vxworks/fcntl.h
deleted file mode 100644
index 534beaca5b2..00000000000
--- a/PACE/pace/vxworks/fcntl.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/fnctl.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_FCNTL_H_VXWORKS
-#define PACE_FCNTL_H_VXWORKS
-
-#include "pace/sys/types.h"
-#include "pace/unistd.h"
-#include "pace/sys/stat.h"
-#include <fcntl.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_FD_CLOEXEC FD_CLOEXEC
-#define PACE_F_DUPFD D_DUPFD
-#define PACE_F_GETFD F_GETFD
-#define PACE_F_GETFL F_GETFL
-#define PACE_F_GETLK F_GETLK
-#define PACE_F_RDLCK F_RDLCK
-#define PACE_F_SETFD F_SETFD
-#define PACE_F_SETFL F_SETFL
-#define PACE_F_SETLK F_SETLK
-#define PACE_F_SETLKW F_SETLKW
-#define PACE_F_UNLCK F_UNLCK
-#define PACE_F_WRLCK F_WRLCK
-#define PACE_O_ACCMODE O_ACCMODE
-#define PACE_O_APPEND O_APPEND
-#define PACE_O_CREAT O_CREAT
-#define PACE_O_DSYNC O_DSYNC
-#define PACE_O_EXCL O_EXCL
-#define PACE_O_NOCTTY O_NOCTTY
-#define PACE_O_NONBLOCK O_NONBLOCK
-#define PACE_O_RDONLY O_RDONLY
-#define PACE_O_RDWR O_RDWR
-#define PACE_O_RSYNC O_RSYNC
-#define PACE_O_SYNC O_SYNC
-#define PACE_O_TRUNC O_TRUNC
-#define PACE_O_WRONLY O_WRONLY
-
-#ifndef PACE_FLOCK
-#define PACE_FLOCK
-typedef struct flock pace_flock;
-#endif /* PACE_FLOCK */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_FCNTL_H_VXWORKS */
diff --git a/PACE/pace/vxworks/fcntl.inl b/PACE/pace/vxworks/fcntl.inl
deleted file mode 100644
index 23308b8fe22..00000000000
--- a/PACE/pace/vxworks/fcntl.inl
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/fcntl.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_creat (const char * path, pace_mode_t mode)
-{
-  PACE_TRACE("pace_creat");
-
-  return creat (path, mode);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-int
-pace_fcntl (PACE_HANDLE fildes, int cmd, long arg)
-{
-  PACE_TRACE("pace_fcntl");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_UNUSED_ARG(cmd);
-  PACE_UNUSED_ARG(arg);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
diff --git a/PACE/pace/vxworks/grp.c b/PACE/pace/vxworks/grp.c
deleted file mode 100644
index 4a12ee0f64c..00000000000
--- a/PACE/pace/vxworks/grp.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/grp.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/grp.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/grp.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/grp.h b/PACE/pace/vxworks/grp.h
deleted file mode 100644
index 5fcd0fd959d..00000000000
--- a/PACE/pace/vxworks/grp.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace (posix ace)
- *
- * = FILENAME
- *    pace/vxworks/grp.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_GRP_H_VXWORKS
-#define PACE_GRP_H_VXWORKS
-
-# if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_GROUP
-#define PACE_GROUP
-typedef struct group pace_group;
-#endif /* PACE_GROUP */
-
-# if defined (PACE_HAS_CPLUSPLUS)
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_GRP_H_VXWORKS */
diff --git a/PACE/pace/vxworks/grp.inl b/PACE/pace/vxworks/grp.inl
deleted file mode 100644
index 428ac7364e5..00000000000
--- a/PACE/pace/vxworks/grp.inl
+++ /dev/null
@@ -1,82 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/grp.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_SD_UOF)
-PACE_INLINE
-pace_group *
-pace_getgrgid (pace_gid_t gid)
-{
-  PACE_TRACE("pace_getgrgid");
-
-  /* getgrgid() is not supported:  just one user anyways */
-  PACE_UNUSED_ARG (gid);
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_SD_UOF */
-
-#if (PACE_HAS_POSIX_SDR_UOF)
-PACE_INLINE
-int
-pace_getgrgid_r (pace_gid_t gid,
-                 pace_group * grp,
-                 char * buffer,
-                 size_t bufsize,
-                 pace_group ** result)
-{
-  PACE_TRACE("pace_getgrgid_r");
-
-  /* getgrgid_r() is not supported:  just one user anyways */
-  PACE_UNUSED_ARG (gid);
-  PACE_UNUSED_ARG (grp);
-  PACE_UNUSED_ARG (buffer);
-  PACE_UNUSED_ARG (bufsize);
-  PACE_UNUSED_ARG (result);
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_SDR_UOF */
-
-#if (PACE_HAS_POSIX_SD_UOF)
-PACE_INLINE
-pace_group *
-pace_getgrnam (const char * name)
-{
-  PACE_TRACE("pace_getgrnam");
-
-  /* getgrnam() is not supported:  just one user anyways */
-  PACE_UNUSED_ARG (name);
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_SD_UOF */
-
-#if (PACE_HAS_POSIX_SDR_UOF)
-PACE_INLINE
-int
-pace_getgrnam_r (const char * name,
-                 pace_group * grp,
-                 char * buffer,
-                 size_t bufsize,
-                 pace_group ** result)
-{
-  PACE_TRACE("pace_getgrnam_r");
-
-  /* getgrnam_r() is not supported:  just one user anyways */
-  PACE_UNUSED_ARG (name);
-  PACE_UNUSED_ARG (grp);
-  PACE_UNUSED_ARG (buffer);
-  PACE_UNUSED_ARG (bufsize);
-  PACE_UNUSED_ARG (result);
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_SDR_UOF */
diff --git a/PACE/pace/vxworks/limits.h b/PACE/pace/vxworks/limits.h
deleted file mode 100644
index e0d70071157..00000000000
--- a/PACE/pace/vxworks/limits.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace (posix ace)
- *
- * = FILENAME
- *    pace/vxworks/limits.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_LIMITS_H_VXWORKS
-#define PACE_LIMITS_H_VXWORKS
-
-#include <limits.h>
-
-# if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-# endif /* (PACE_HAS_CPLUSPLUS) */
-
-# if defined (PACE_HAS_CPLUSPLUS)
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_LIMITS_H_VXWORKS */
diff --git a/PACE/pace/vxworks/locale.c b/PACE/pace/vxworks/locale.c
deleted file mode 100644
index 530fd21999c..00000000000
--- a/PACE/pace/vxworks/locale.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/locale.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/locale.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/locale.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/locale.h b/PACE/pace/vxworks/locale.h
deleted file mode 100644
index 4838e912fd3..00000000000
--- a/PACE/pace/vxworks/locale.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/locale.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * =========================================================================== */
-
-#ifndef PACE_LOCALE_H_VXWORKS
-#define PACE_LOCALE_H_VXWORKS
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_LC_ALL LC_ALL
-#define PACE_LC_COLLATE LC_COLLATE
-#define PACE_LC_CTYPE LC_CTYPE
-#define PACE_LC_MONETARY LC_MONETARY
-#define PACE_LC_NUMERIC LC_NUMERIC
-#define PACE_LC_TIME LC_TIME
-#define PACE_NULL NULL
-
-#ifndef PACE_LCONV
-#define PACE_LCONV
-typedef struct lconv pace_lconv;
-#endif /* PACE_LCONV */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_LOCALE_H_VXWORKS */
diff --git a/PACE/pace/vxworks/locale.inl b/PACE/pace/vxworks/locale.inl
deleted file mode 100644
index 5ce0566e9c3..00000000000
--- a/PACE/pace/vxworks/locale.inl
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $Id$ -*- C -*-
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/locale.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * =========================================================================== */
-
-#include <locale.h>
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_lconv *
-pace_localeconv (void)
-{
-  PACE_TRACE("pace_localeconv");
-
-  return localeconv ();
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-char *
-pace_setlocale (int category, const char * locale)
-{
-  PACE_TRACE("pace_setlocale");
-
-  return setlocale (category, locale);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
diff --git a/PACE/pace/vxworks/math.c b/PACE/pace/vxworks/math.c
deleted file mode 100644
index 1d3b87dc973..00000000000
--- a/PACE/pace/vxworks/math.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/math.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/math.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/math.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/math.h b/PACE/pace/vxworks/math.h
deleted file mode 100644
index cda356e550e..00000000000
--- a/PACE/pace/vxworks/math.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/math.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_MATH_H_VXWORKS
-#define PACE_MATH_H_VXWORKS
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_HUGE_VAL HUGE_VAL
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_MATH_H_VXWORKS */
diff --git a/PACE/pace/vxworks/math.inl b/PACE/pace/vxworks/math.inl
deleted file mode 100644
index 81bd1bc19e2..00000000000
--- a/PACE/pace/vxworks/math.inl
+++ /dev/null
@@ -1,259 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/math.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-/* FUZZ: disable check_for_math_include */
-#include <math.h>
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_acos (double x)
-{
-  PACE_TRACE("pace_acos");
-
-  return acos (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_asin (double x)
-{
-  PACE_TRACE("pace_asin");
-
-  return asin (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_atan (double x)
-{
-  PACE_TRACE("pace_atan");
-
-  return atan (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_atan2 (double x, double y)
-{
-  PACE_TRACE("pace_atan2");
-
-  return atan2 (x, y);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_cos (double x)
-{
-  PACE_TRACE("pace_cos");
-
-  return cos (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_sin (double x)
-{
-  PACE_TRACE("pace_sin");
-
-  return sin (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_tan (double x)
-{
-  PACE_TRACE("pace_tan");
-
-  return tan (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_cosh (double x)
-{
-  PACE_TRACE("pace_cosh");
-
-  return cosh (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_sinh (double x)
-{
-  PACE_TRACE("pace_sinh");
-
-  return sinh (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_tanh (double x)
-{
-  PACE_TRACE("pace_tanh");
-
-  return tanh (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_exp (double x)
-{
-  PACE_TRACE("pace_exp");
-
-  return exp (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_frexp (double x, int * exp)
-{
-  PACE_TRACE("pace_frexp");
-
-  return frexp (x, exp);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_ldexp (double x, int exp)
-{
-  PACE_TRACE("pace_ldexp");
-
-  return ldexp (x, exp);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_log (double x)
-{
-  PACE_TRACE("pace_log");
-
-  return log (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_log10 (double x)
-{
-  PACE_TRACE("pace_log10");
-
-  return log10 (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_modf (double x, double * iptr)
-{
-  PACE_TRACE("pace_modf");
-
-  return modf (x, iptr);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_pow (double x, double y)
-{
-  PACE_TRACE("pace_pow");
-
-  return pow (x, y);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_sqrt (double x)
-{
-  PACE_TRACE("pace_sqrt");
-
-  return sqrt (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_ceil (double x)
-{
-  PACE_TRACE("pace_ceil");
-
-  return ceil (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_fabs (double x)
-{
-  PACE_TRACE("pace_fabs");
-
-  return fabs (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_floor (double x)
-{
-  PACE_TRACE("pace_floor");
-
-  return floor (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_fmod (double x, double y)
-{
-  PACE_TRACE("pace_fmod");
-
-  return fmod (x, y);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
diff --git a/PACE/pace/vxworks/mman.c b/PACE/pace/vxworks/mman.c
deleted file mode 100644
index 149f345054e..00000000000
--- a/PACE/pace/vxworks/mman.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/mman.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/sys/mman.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/mman.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/mman.h b/PACE/pace/vxworks/mman.h
deleted file mode 100644
index 7bddb69ee86..00000000000
--- a/PACE/pace/vxworks/mman.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/mman.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_MMAN_H_VXWORKS
-#define PACE_SYS_MMAN_H_VXWORKS
-
-#include <sys/mman.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_MAP_FAILED MAP_FAILED
-#define PACE_MAP_FIXED MAP_FIXED
-#define PACE_MAP_PRIVATE MAP_PRIVATE
-#define PACE_MAP_SHARED MAP_SHARED
-#define PACE_MCL_CURRENT MCL_CURRENT
-#define PACE_MS_ASYNC MS_ASYNC
-#define PACE_MS_INVALIDATE
-#define PACE_MS_SYNC MS_SYNC
-#define PACE_PROT_EXEC PROT_EXEC
-#define PACE_PROT_NONE PROT_NONE
-#define PACE_PROT_READ PROT_READ
-#define PACE_PROT_WRITE PROT_WRITE
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_MMAN_H_VXWORKS */
diff --git a/PACE/pace/vxworks/mman.inl b/PACE/pace/vxworks/mman.inl
deleted file mode 100644
index 79e07ea78c0..00000000000
--- a/PACE/pace/vxworks/mman.inl
+++ /dev/null
@@ -1,153 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/mman.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/fcntl.h"
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mlock (const void * addr, pace_size_t len)
-{
-  PACE_TRACE("pace_mlock");
-
-  return mlock (((char*)addr), len);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mlockall (int flags)
-{
-  PACE_TRACE("pace_mlockall");
-
-  return mlockall (flags);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void *
-pace_mmap (void * addr,
-           pace_size_t len,
-           int prot,
-           int flags,
-           PACE_HANDLE fildes,
-           pace_off_t off)
-{
-  PACE_TRACE("pace_mmap");
-
-  PACE_UNUSED_ARG(addr);
-  PACE_UNUSED_ARG(len);
-  PACE_UNUSED_ARG(prot);
-  PACE_UNUSED_ARG(flags);
-  PACE_UNUSED_ARG(fildes);
-  PACE_UNUSED_ARG(off);
-  PACE_ERRNO_NO_SUPPORT_RETURN ((void *) -1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_munlock (const void * addr, pace_size_t len)
-{
-  PACE_TRACE("pace_munlock");
-
-  return munlock (((char*)addr), len);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mprotect (void * addr,
-               pace_size_t len,
-               int prot)
-{
-  PACE_TRACE("pace_mprotect");
-
-  PACE_UNUSED_ARG(addr);
-  PACE_UNUSED_ARG(len);
-  PACE_UNUSED_ARG(prot);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_msync (void * addr,
-            pace_size_t len,
-            int flags)
-{
-  PACE_TRACE("pace_msync");
-
-  PACE_UNUSED_ARG(addr);
-  PACE_UNUSED_ARG(len);
-  PACE_UNUSED_ARG(flags);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_munlockall ()
-{
-  PACE_TRACE("pace_munlockall");
-
-  return munlockall ();
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_munmap (void * addr, pace_size_t len)
-{
-  PACE_TRACE("pace_munmap");
-
-  PACE_UNUSED_ARG(addr);
-  PACE_UNUSED_ARG(len);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-PACE_HANDLE
-pace_shm_open (const char * name,
-               int oflag,
-               pace_mode_t mode)
-{
-  PACE_TRACE("pace_shm_open");
-
-  /* Just use open per ACE. */
-  return pace_open (name, oflag, mode);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_shm_unlink (const char * name)
-{
-  PACE_TRACE("pace_shm_unlink");
-
-  /* Just use unlink per ACE. */
-  return pace_unlink (name);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/vxworks/mqueue.c b/PACE/pace/vxworks/mqueue.c
deleted file mode 100644
index b2cbe7f35b9..00000000000
--- a/PACE/pace/vxworks/mqueue.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace (posix ace)
- *
- * = FILENAME
- *    pace/vxworks/mqueue.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/mqueue.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/mqueue.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/mqueue.h b/PACE/pace/vxworks/mqueue.h
deleted file mode 100644
index 8e3b66e136a..00000000000
--- a/PACE/pace/vxworks/mqueue.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/mqueue.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_MQUEUE_H_VXWORKS
-#define PACE_MQUEUE_H_VXWORKS
-
-#if PACE_LINUX
-# include "pace/emulation/mqueue.h"
-#else
-# include <mqueue.h>
-#endif /* PACE_LINUX */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_MQD_T
-#define PACE_MQD_T
-  typedef mqd_t pace_mqd_t;
-#endif /* PACE_MQD_T */
-
-#ifndef PACE_MQ_ATTR
-#define PACE_MQ_ATTR
-  typedef struct mq_attr pace_mq_attr;
-#endif /* PACE_MQ_ATTR */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_MQUEUE_H_VXWORKS */
diff --git a/PACE/pace/vxworks/mqueue.inl b/PACE/pace/vxworks/mqueue.inl
deleted file mode 100644
index 78b983e5e66..00000000000
--- a/PACE/pace/vxworks/mqueue.inl
+++ /dev/null
@@ -1,101 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/posix/mqueue.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_close (pace_mqd_t mqdes)
-{
-  PACE_TRACE("pace_mq_close");
-
-  return mq_close (mqdes);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_getattr (pace_mqd_t mqdes,
-                 pace_mq_attr * mqstat)
-{
-  PACE_TRACE("pace_mq_getattr");
-
-  return mq_getattr (mqdes, mqstat);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_notify (pace_mqd_t mqdes,
-                const pace_sigevent * notification)
-{
-  PACE_TRACE("pace_mq_notify");
-
-  return mq_notify (mqdes, notification);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-ssize_t
-pace_mq_receive (pace_mqd_t mqdes,
-                 char * msg_ptr,
-                 size_t msg_len,
-                 unsigned int * msg_prio)
-{
-  PACE_TRACE("pace_mq_receive");
-
-  return mq_receive (mqdes, msg_ptr, msg_len, msg_prio);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_send (pace_mqd_t mqdes,
-              const char * msg_ptr,
-              size_t msg_len,
-              unsigned int msg_prio)
-{
-  PACE_TRACE("pace_mq_send");
-
-  return mq_send (mqdes, msg_ptr, msg_len, msg_prio);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_setattr (pace_mqd_t mqdes,
-                 const pace_mq_attr * mqstat,
-                 pace_mq_attr * omqstat)
-{
-  PACE_TRACE("pace_mq_setattr");
-
-  return mq_setattr (mqdes, mqstat, omqstat);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_unlink (const char * name)
-{
-  PACE_TRACE("pace_mq_unlink");
-
-  return mq_unlink (name);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/vxworks/pthread.c b/PACE/pace/vxworks/pthread.c
deleted file mode 100644
index ecf556b1639..00000000000
--- a/PACE/pace/vxworks/pthread.c
+++ /dev/null
@@ -1,1376 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/pthread.c
- *
- * = AUTHOR
- *    Joe Hoffert. The *VAST* majority of the pthread code for VxWorks
- *    has been supplied by Hughes Network Systems via Braeton Taylor.
- *
- * ============================================================================= */
-
-#include "pace/pthread.h"
-
-/* pthread queue */
-static pthread_q_entry pthread_queue[PTHEAD_QUEUE_MAX_LEN];
-static pthread_q_entry * first = NULL;
-static pthread_q_entry * current = NULL;
-static int pthread_count = 0;
-/*static pthread_q_entry * pthread_queue_get_entry();*/
-static int initialized = 0;
-static int registered_cleanup_init = 0;
-
-static pthread_key_entry keyList[PTHREAD_KEYS_MAX];
-
-/* 
- *  The defaut pthread attr structure, if calling task 
- *  does not pass attr, this default will be used 
- */
-static struct _PTHREAD_ATTR _pthread_attr_default_s =
-{
-  PTHREAD_DEFAULT_STACK_SIZE, /* stacksize */
-  { '\0' },       /* name */
-  {100},          /* priority */
-  PTHREAD_SCOPE_SYSTEM,  /* scope */
-  SCHED_FIFO,   /* indirect function */
-  /* According to the POSIX standard PTHREAD_CREATE_JOINABLE
-   * is the default
-   */
-  /*PTHREAD_CREATE_DETACHED  * detached */
-  PTHREAD_CREATE_JOINABLE  /* joinable */
-};
-
-/* global default access */
-pace_pthread_attr_t  pthread_attr_default = &_pthread_attr_default_s;
-
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/pthread.inl"
-#endif /* ! PACE_HAS_INLINE */
-
-/*
- * VxWorks Helper Functions
- */
-
-/*
- * Setup the thread information needed for main. This function
- * mimics much of what's in pthread_create below but this is
- * only for registering a thread already created (as in the case
- * of main).
- */
-STATUS
-pacevx_vxworks_init()
-{
-  WIND_TCB *pTcb;
-  pace_pthread_t pthread;
-  int taskid;
-  unsigned int i;
-  STATUS status;
-
-  PACE_TRACE("pacevx_vxworks_init");
-
-  /* Fill in the main thread's TCB with the information needed
-   * for POSIX emulation.
-   */
-  taskid = taskIdSelf();
-  if ((pTcb = taskTcb(taskid)) == NULL)
-    {
-      taskDelete(taskid);
-      return ERROR;
-    }
-
-  pthread = (pace_pthread_t )malloc(sizeof(struct _PTHREAD_T));
-
-  if (pthread == NULL)
-    {
-      taskDelete(taskid);
-      return ERROR;
-    }
-
-  /* construct pace_pthread_t structure */
-
-  bzero((char *)pthread, sizeof(struct _PTHREAD_T));
-  pthread->tid = taskid;
-  pthread->stateflag = PTHREAD_CANCEL_ENABLE;
-  pthread->canceltype = PTHREAD_CANCEL_ASYNCHRONOUS;
-  /*pthread->detachflag = PTHREAD_CREATE_JOINABLE;*/
-  pthread->detachflag = PTHREAD_CREATE_DETACHED;
-
-  /* initialize the join semaphore also */
-  if ((pthread->joinSem = semBCreate(SEM_Q_PRIORITY, SEM_EMPTY)) == NULL)
-    {
-      free((void *)pthread);
-      taskDelete(taskid);
-      return ERROR;
-    }
-
-  /* save to the WIND_TCB for reference afterward */
-  pTcb->_USER_SPARE4 = (int) pthread;
-
-  /* I guess this doesn't need to get added for the main thread.
-   * It seems to cause problems for main.
-  if (registered_cleanup_init == 0)
-    {
-      status = taskDeleteHookAdd((FUNCPTR)pacevx_pthread_run_cleanup);
-      if (status == ERROR)
-        {
-          return ERROR;
-        }
-      registered_cleanup_init = 1;
-    }
-
-  pacevx_pthread_queue_add(pthread);
-  */
-
-  return OK;
-}
-
-/*
- * Get a free entry from the pthread queue.
- */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-pthread_q_entry *
-pacevx_pthread_queue_get_entry ()
-{
-  int i;
-
-  PACE_TRACE("pacevx_pthread_queue_get_entry");
-
-  for (i = 0; i < PTHEAD_QUEUE_MAX_LEN; i++)
-    {
-      if (pthread_queue[i].status == FALSE)
-        return &pthread_queue[i];
-    }
-
-  /* error condition, can alloc more in future */
-  return NULL;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-/* 
- * Run the destructor functions for the specific data key
- */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-void
-pacevx_pthread_destructor_key (pace_pthread_key_t key, void * arg)
-{
-  PACE_TRACE("pacevx_pthread_destructor_key");
-
-  if (pacevx_pthread_key_validate(key))
-    {
-      if (keyList[key].destructor != NULL)
-        {
-          (*(keyList[key].destructor))(arg);
-        }
-    }
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-/*
- * Run the destructor functions for the thread
- * For each key value, if there is a non-NULL destructor pointer, 
- * and the thread has a non-NULL value associated with that key, 
- * the function pointed to is called with the current associated 
- * value as its sole argument.
- *
- * return: none.
- */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-void
-pacevx_pthread_destructor_thread (pace_pthread_t pthread)
-{
-  int i;
- 
-  PACE_TRACE("pacevx_pthread_destructor_thread");
-
-  for (i = 0; i < PTHREAD_KEYS_MAX; i ++)
-    {
-      if (pthread->keyvaluelist[i] != NULL)
-        {
-          pacevx_pthread_destructor_key(i, pthread->keyvaluelist[i]);
-        }
-    }
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-/*
- * General exit processing.
- */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-void
-pacevx_pthread_proc_exit (pace_pthread_t pthread, void *value_ptr)
-{
-  int key;
-  int needgive = 0;
-
-  PACE_TRACE("pacevx_pthread_proc_exit");
-
-  pacevx_pthread_cleanup_popall(pthread);
-
-  /* thread storage data cleanup is automatically*/
-  pacevx_pthread_destructor_thread(pthread);
-
-  /* joinable or detached */
-  if (pthread->detachflag == PTHREAD_CREATE_DETACHED)
-    {
-      free(pthread);
-    }
-  else
-    {
-      key = intLock();
-
-      /* pass the value */
-      pthread->joinvalue = value_ptr;
-
-      switch (pthread->joinstate)
-        {
-        case JOIN_PENDING:
-          pthread->joinstate = JOIN_TERMINATED;
-          needgive = 1;
-          break;
-        case JOIN_NORMAL:
-        default:
-          pthread->joinstate = JOIN_TERMINATED;
-          break;
-        }
-      intUnlock(key);
-
-      /* unblock the calling thread */
-      if (needgive)
-        semGive(((pace_pthread_t)(pthread->jointhread))->joinSem);
-    }
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pacevx_pthread_verify (pace_pthread_t pthread) 
-{
-  int key;
-  pthread_q_entry * entry;
-
-  PACE_TRACE("pacevx_pthread_verify");
-
-  key = intLock();
-
-  /* if queue is empty */
-  if (first == NULL)
-    {
-      intUnlock(key);
-      return ERROR;
-    }
-
-  entry = first; /* get the first one */
-
-  while (entry != NULL)
-    {
-     if (entry->pthread == pthread)
-       {
-         intUnlock(key);
-         return TRUE;
-       }
-     entry = entry->next;
-    } 
-
-  intUnlock(key);
-
-  return FALSE;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-/*
- * The cleanup routine that will be called if the task get deleted.
- */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-void
-pacevx_pthread_run_cleanup (WIND_TCB *pTcb) 
-/* pointer to deleted task's WIND_TCB */
-{
-  pace_pthread_t pthread;
-
-  PACE_TRACE("pacevx_pthread_run_cleanup");
-
-  /* free thread tcb only*/
-  if (pTcb->_USER_SPARE4 != 0)
-    {
-      pthread = (pace_pthread_t) pTcb->_USER_SPARE4;
-
-      pacevx_pthread_proc_exit(pthread, NULL);
-    }
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-/*
- * Add to the pthread queue.
- */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pacevx_pthread_queue_add (pace_pthread_t pthread)
-{
-  int key;
-  pthread_q_entry * entry;
-
-  PACE_TRACE("pacevx_pthread_queue_add");
-
-  key = intLock();
-
-  if ((entry = pacevx_pthread_queue_get_entry()) != NULL) 
-    {
-      entry->status = TRUE;
-      entry->pthread = pthread;
-
-      if (first == NULL)
-        {
-          first = entry;
-          current = entry;
-        }
-      else
-        {
-          current->next = entry;
-          current = entry;
-        }
-      pthread_count ++;
-      intUnlock(key);
-      return OK;
-    }
-
-  intUnlock(key);
-  return ERROR;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-/*
- * Remove an entry to the pthread queue.
- */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pacevx_pthread_queue_remove (pace_pthread_t pthread)
-{
-  int key;
-  pthread_q_entry * entry1;
-  pthread_q_entry * entry2;
-
-  PACE_TRACE("pacevx_pthread_queue_remove");
-
-  key = intLock();
-
-  if (first == NULL)
-    {
-      intUnlock(key);
-      return ERROR;
-    }
-
-  /* if it is the first one, simple */
-  if (first->pthread == pthread)
-    {
-      first->status = FALSE;
-      first->pthread = NULL;
-
-      entry1 = first->next;
-
-      first->next = NULL;
-
-      /* if it is the only one */
-      if (current == first)
-        current = entry1;
-
-      first = entry1;
-
-      /* Check for the last thread and unregister cleanup function */
-      if (first == NULL)
-        taskDeleteHookDelete((FUNCPTR)pacevx_pthread_run_cleanup);
-
-      intUnlock(key);
-      return OK;
-    }
-     
-  /* else */
-
-  entry1 = first;
-  entry2 = entry1->next;
-  
-  while (entry2 != NULL)
-    {
-      if (entry2->pthread == pthread)
-      {
-         if (current == entry2)
-           current = entry1;
-
-         entry1->next = entry2->next; /* remove the node */
-
-         /* set invalid and put back to the list */
-         entry2->status = FALSE;
-         entry2->pthread = NULL;
-         entry2->next = NULL;
-         intUnlock(key);
-         return OK;
-      }
-      entry1 = entry2;
-      entry2 = entry2->next;
-   }
-
-   intUnlock(key);
-   return ERROR;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-/* 
- * Run the rest of cleanup routines left in the stack.
- */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-void
-pacevx_pthread_cleanup_popall (pace_pthread_t thread)
-{
-  int count;
-  int i;
-
-  PACE_TRACE("pacevx_pthread_cleanup_popall");
-
-  count = thread->rtnCount - 1;
-
-  /*
-   * We don't currently support any way
-   * to add cleanup routines since pace_pthread_cleanup_push and
-   * pace_pthread_cleanup_pop are undefined macros for VxWorks.
-   */
-  for (i = count; i > 0 ; i--)
-    {
-      thread->rtnCount --;
-      (*(thread->cleanupRtn[i].routine))(thread->cleanupRtn[i].args);
-    }
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-/*
- * Validate the key to see if the key is already created (valid)
- */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pacevx_pthread_key_validate (pace_pthread_key_t key)
-{
-  int intkey;
-
-  PACE_TRACE("pacevx_pthread_key_validate");
-
-  intkey = intLock();
-
-  if (keyList[key].valid)
-    {
-      intUnlock(intkey);
-      return TRUE;
-    }
-  else
-    {
-      intUnlock(intkey);
-      return FALSE;
-    }
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-
-/*
- * PACE - POSIX Functions
- */
-
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_cond_timedwait (pace_pthread_cond_t * cond,
-                        pace_pthread_mutex_t * mutex,
-                        const pace_timespec * abstime)
-{
-  /*
-  int msec_timeout;
-  if (abstime->sec () == 0 && abstime->usec () == 0)
-    msec_timeout = 0; * Do a "poll." *
-  else
-    {
-      // Assumes that struct timespec is same size as struct timeval,
-      // which assumes that time_t is a long: it currently is.
-      struct pace_timespec ts;
-
-      pace_clock_gettime (CLOCK_REALTIME, &ts);
-
-      // Note that we must convert between absolute time (which is
-      // passed as a parameter) and relative time.
-      pace_timespec relative_time = (*abstime) - ts;
-
-      // Watchout for situations where a context switch has caused the
-      // current time to be > the timeout.
-      if (relative_time < 0)
-        msec_timeout = 0;
-      else
-        msec_timeout = relative_time.msec ();
-    }
-  // Inline the call to ACE_OS::sema_wait () because it takes an
-  // ACE_Time_Value argument.  Avoid the cost of that conversion . . .
-  int ticks_per_sec = ::sysClkRateGet ();
-  int ticks = msec_timeout * ticks_per_sec / ACE_ONE_SECOND_IN_MSECS;
-  result = ::semTake (cv->sema_.sema_, ticks);
-  */
-
-
-
-
-
-  int timeval = 0;
-  int errornumber;
-  int returnval = 0;
-  STATUS status;
-
-  PACE_TRACE("pthread_cond_timedwait");
-
-  if (pace_pthread_mutex_unlock(mutex) != OK) return ERROR;
-
-  /* convert the abstime to timeval */
-  status = semTake(*cond, timeval);
-
-  if (status != OK)
-    {
-      errornumber = errnoGet();
-      if (errornumber == S_objLib_OBJ_ID_ERROR)
-        returnval = EINVAL;
-      else if (errornumber == S_objLib_OBJ_TIMEOUT) 
-        returnval = ETIMEDOUT;
-      else 
-        returnval = ERROR;
-    }
-
-  pace_pthread_mutex_lock(mutex);
-
-  return returnval;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_cond_wait (pace_pthread_cond_t * cond,
-                   pace_pthread_mutex_t * mutex)
-{
-  STATUS status;
-  int errornumber;
-  int returnval = 0;
-
-  PACE_TRACE("pthread_cond_wait");
-
-  if (pace_pthread_mutex_unlock(mutex) != OK)
-    return ERROR;
-
-  status = semTake(*cond, WAIT_FOREVER);
-
-  if(status != OK)
-    {
-      errornumber = errnoGet();
-      if (errornumber == S_objLib_OBJ_ID_ERROR) 
-          returnval = EINVAL;
-      else
-          returnval = ERROR;
-    }
-
-  pace_pthread_mutex_lock(mutex);
-
-  return returnval;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_create (pace_pthread_t * thread,
-                const pace_pthread_attr_t * attr,
-# if defined (PACE_HAS_CPLUSPLUS)
-                pace_create_pf start_routine,
-# else
-                void * (*start_routine) (void*),
-# endif
-                void * arg)
-{
-  pace_pthread_attr_t pattr;
-  char * pname;
-  int taskid;
-  pace_pthread_t pthread;
-  WIND_TCB * pTcb;
-
-  PACE_TRACE("pthread_create");
-
-  if (attr == 0) 
-    pattr = pthread_attr_default;
-  else
-    if (*attr == 0)
-       pattr = pthread_attr_default;
-    else
-       pattr = *attr;
-
-  if (pattr->name[0] != '\0')   /* name is provided */
-    pname = pattr->name;
-  else
-    pname = (char *)0;
-
-  taskid = taskSpawn(pname, 
-                     (SCHED_FIFO_HIGH_PRI - pattr->schedule.sched_priority), 
-                     VX_FP_TASK, pattr->stacksize, (FUNCPTR)start_routine, 
-                     (int)arg, 0,0,0,0,0,0,0,0,0);
-
-  if (taskid == ERROR)
-     return ERROR;
-
-  if ((pTcb = taskTcb(taskid)) == NULL)
-    {
-      taskDelete(taskid);
-      return ERROR;
-    }
-
-  pthread = (pace_pthread_t) malloc(sizeof(struct _PTHREAD_T));
-
-  if (pthread == NULL)
-    {
-      taskDelete(taskid);
-      return ERROR;
-    }
-
-  /* construct pace_pthread_t structure */
-
-  bzero((char *)pthread, sizeof(struct _PTHREAD_T));
-  pthread->tid = taskid;
-  pthread->stateflag = PTHREAD_CANCEL_ENABLE;
-  pthread->canceltype = PTHREAD_CANCEL_ASYNCHRONOUS;
-  pthread->detachflag = pattr->dstate;
-
-  /* initialize the join semaphore also */
-  if ((pthread->joinSem = semBCreate(SEM_Q_PRIORITY, SEM_EMPTY)) == NULL)
-    {
-      free((void *)pthread);
-      taskDelete(taskid);
-      return ERROR;
-    }
-
-  /* pass it to the caller */
-  *thread = pthread;   
-
-  /* save to the WIND_TCB for reference afterward */
-  pTcb->_USER_SPARE4 = (int) pthread;
-
-  if (registered_cleanup_init == 0)
-    {
-      taskDeleteHookAdd((FUNCPTR)pacevx_pthread_run_cleanup);
-      registered_cleanup_init = 1;
-    }
-
-  pacevx_pthread_queue_add(pthread);
-
-  return OK;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_detach (pace_pthread_t thread)
-{
-  int key;
-  int needfree;
-  needfree = 0;
-
-  PACE_TRACE("pthread_detach");
-
-  if (!pacevx_pthread_verify(thread))
-    return EINVAL;
-
-  key = intLock();
-
-  switch (thread->joinstate)
-    {
-      /* task is joined, or detached, but still running, do nothing */
-      case JOIN_PENDING:
-      case JOIN_DETATCHED:
-        intUnlock(key);
-        return OK;
-        break;
-      case JOIN_NORMAL:      /* task is running */
-        thread->joinstate = JOIN_DETATCHED;
-        break;
-      case JOIN_TERMINATED:
-        needfree = 1;
-        break;
-      default:
-        break;
-    }
-
-  intUnlock(key);
-
-  if (needfree) 
-    {
-      pacevx_pthread_queue_remove(thread);
-      free(thread);
-    }
-  return OK;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_join (pace_pthread_t thread, void ** value_ptr)
-{
-  /*
-   * The pthread_join() function suspends execution of the calling
-   * thread until the target thread terminates, unless the target 
-   * thread has already terminated.
-   * The terminating thread can pass value to the caller by
-   * pthread_exit() and the calling thread gets it from "value_ptr"
-   * The application must verify the "value_ptr" value before using it.
-   */
-  pace_pthread_t pthread;
-  int needfree;
-  int key;
-
-  PACE_TRACE("pthread_join");
-
-  if (!pacevx_pthread_verify(thread))
-    return ERROR;
-
-  if (thread->detachflag != PTHREAD_CREATE_JOINABLE)
-     return ERROR;
-
-  if ((pthread = pace_pthread_self()) == NULL)
-      return ERROR;
-
-  needfree = 0;
-
-  key = intLock();
-  switch (thread->joinstate)
-    {
-      case JOIN_NORMAL:
-        thread->jointhread = pthread;
-        thread->joinstate = JOIN_PENDING;
-        break;
-      case JOIN_TERMINATED:
-        needfree = 1;
-        break;
-      case JOIN_PENDING:
-      default:
-        intUnlock(key);
-        return ERROR;
-    }
-  intUnlock(key);
-
-  if (needfree)
-  {
-     *value_ptr = thread->joinvalue;
-     pacevx_pthread_queue_remove(thread);
-     free(thread);
-     return OK;
-  }
-
-  /* if we are here, thread is not terminated yet */
-  semTake(pthread->joinSem, WAIT_FOREVER);
-
-  /* cleanup */
-  *value_ptr = thread->joinvalue;
-  pacevx_pthread_queue_remove(thread);
-  free(thread);
-  return OK;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_key_create (pace_pthread_key_t * key,
-# if defined (PACE_HAS_CPLUSPLUS)
-                    pace_keycreate_pf destructor)
-# else
-                    void (*destructor)(void*))
-# endif
-{
-  /*
-   * Create a thread-specific data key. Also initialize the 
-   * data structure if it is called first time.
-   */
-  int i;
-  int intkey;
-
-  PACE_TRACE("pthread_key_create");
-
-  /* do the initialization if it is the first time */
-  if (initialized == 0)
-    {
-      initialized = 1;
-
-      /* initialize the data structure */
-      for (i = 0; i < PTHREAD_KEYS_MAX; i++)
-        {
-          keyList[i].index = i;
-          keyList[i].valid = FALSE;
-          keyList[i].destructor = NULL;
-        } 
-    }
-
-  /* find first available position */
-  intkey = intLock();
-  for (i = 0; i < PTHREAD_KEYS_MAX; i++)
-    {
-      if (keyList[i].valid == FALSE)
-        {
-          *key = (pace_pthread_key_t)keyList[i].index;
-          keyList[i].valid = TRUE;
-          keyList[i].destructor = destructor;
-          intUnlock(intkey);
-
-          return OK;
-        }
-    }
-
-  intUnlock(intkey);
-  return ERROR;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_key_delete (pace_pthread_key_t key)
-{
-  int intkey;
-
-  PACE_TRACE("pthread_key_delete");
-
-  if ((key < 0) || (key >= PTHREAD_KEYS_MAX))
-    return ERROR;
-
-  intkey = intLock();
-
-  keyList[key].valid = FALSE;
-  keyList[key].destructor = NULL;
-
-  intUnlock(intkey);
-
-  return OK;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_once (pace_pthread_once_t * once_control,
-# if defined (PACE_HAS_CPLUSPLUS)
-              pace_once_pf init_routine)
-# else
-              void (*init_routine) (void))
-# endif 
-{
-  /*
-   * Once function allows the function to be executed exact only once
-   * Subsequent calls of pthread_once() with the same once_control will 
-   * not call the void_routine(). 
-   */
-  int i;
-  int key;
-  pace_pthread_t pthread;
-
-  PACE_TRACE("pthread_once");
-
-  if ((pthread = pace_pthread_self()) == NULL)
-    return ERROR;
-
-  /* make it atomic */
-  key = intLock();
-
-  for (i = 0; i < pthread->onceCount; i++)
-    {
-      if (*once_control == pthread->onceList[i].once_ctl)
-        {
-          /* do nothing, already called */
-          intUnlock(key);
-          return OK;
-        }
-    }
-
-  /* if we are here, no match is found */
-  pthread->onceList[pthread->onceCount].once_ctl = *once_control;
-  pthread->onceCount++;
-  intUnlock(key);
-
-  /* run the init routine */
-  (*init_routine)();
-  return OK;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_attr_init (pace_pthread_attr_t * attr)
-{
-  PACE_TRACE("pthread_attr_init");
-
-  /*
-   * Attempt to allocate memory for the attributes object.
-   */
-
-  if ((*attr = (pace_pthread_attr_t) malloc(sizeof(struct _PTHREAD_ATTR)))
-      == NULL)
-    {
-      return ERROR;
-    }
-
-  /*
-   * Set the default attributes.
-   */
-
-  memcpy ((void *)(*attr), (void *)pthread_attr_default, 
-          sizeof(struct _PTHREAD_ATTR));
-
-  return OK;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_attr_setdetachstate (pace_pthread_attr_t * attr,
-                             int detachstate)
-{
-  PACE_TRACE("pthread_attr_setdetachstate");
-
-  if ((detachstate != PTHREAD_CREATE_DETACHED) ||
-      (detachstate != PTHREAD_CREATE_JOINABLE))
-    {
-      (*attr)->dstate = PTHREAD_CREATE_DETACHED;
-      return ERROR;
-    }
-
-  (*attr)->dstate = detachstate;
-  return OK; 
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_attr_setschedparam (pace_pthread_attr_t * attr,
-                            const pace_sched_param * param)
-{
-  PACE_TRACE("pthread_attr_setschedparam");
-
-  /* range check */
-  if (param->sched_priority > SCHED_RR_HIGH_PRI ||
-      param->sched_priority < SCHED_RR_LOW_PRI )
-    {
-      return ERROR;
-    }
-
-  (*attr)->schedule.sched_priority = param->sched_priority;
-  return OK;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_cancel (pace_pthread_t thread)
-{
-  PACE_TRACE("pthread_cancel");
-
-  /*
-   * In VxWorks, to cancel a thread is to delete a task. 
-   */
-  if (!pacevx_pthread_verify(thread))
-    return ESRCH;
-
-  if (taskIdVerify(thread->tid) == ERROR) /* already exit, never happen */
-    return ERROR;
-
-  if (thread->stateflag == PTHREAD_CANCEL_DISABLE)
-    return ERROR;
-  else
-    return (taskDelete(thread->tid));
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_getschedparam (pace_pthread_t thread,
-                       int * policy,
-                       pace_sched_param * param)
-{
-  PACE_TRACE("pthread_getschedparam");
-
-  if (thread == 0)
-    return ERROR;
-
-  *policy = sched_getscheduler(thread->tid);
-
-  if (sched_getparam(thread->tid, param) == OK)
-    {
-      /* convert VxWorks priority to POSIX priority */
-      param->sched_priority = SCHED_FIFO_HIGH_PRI - param->sched_priority;
-      return OK;
-    }
-  
-   return ERROR;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-void *
-pthread_getspecific (pace_pthread_key_t key)
-{
-  pace_pthread_t pthread;
-
-  PACE_TRACE("pthread_getspecific");
-
-  if (!pacevx_pthread_key_validate(key))
-    return NULL;
-
-  if ((pthread = pace_pthread_self()) != NULL)
-    {
-      return pthread->keyvaluelist[key];
-    }
-
-  return NULL;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_mutex_init (pace_pthread_mutex_t * mutex,
-                    const pace_pthread_mutexattr_t * attr)
-{
-  /*
-   * Initialises the mutex referenced by mutex with attributes 
-   * specified by attr. If attr is NULL, the default mutex 
-   * attributes are used.
-   */
-
-  /* Make SEM_Q_FIFO the default since this is what ACE does (and
-   * ACE works) plus this is supposedly the default for VxWorks.
-   */
-  int options = SEM_Q_FIFO;
-
-  PACE_TRACE("pthread_mutex_init");
-
-  if (attr != NULL)
-    {
-      switch ((*attr)->protocol)
-        {
-        case PTHREAD_PRIO_INHERIT:
-          /* POSIX's PTHREAD_PRIO_INHERIT maps to VxWorks' SEM_INVERSION_SAFE.
-           * However, this doesn't seem to be supported (at least on 5.3.1).
-           * Return an error.
-           */
-          return ERROR;
-          break;
-
-        case PTHREAD_PRIO_PROTECT:
-          /* VxWorks does not support this functionality.
-           * Return an error.
-           */
-          return ERROR;
-          break;
-
-        case PTHREAD_PRIO_NONE:
-          options = SEM_Q_FIFO;
-          break;
-
-        default:
-          perror("Invalid POSIX protocol specified");
-          return ERROR;
-          break;
-        }
-    }
-
-  *mutex = semMCreate(options);
-  if (*mutex == NULL) {
-    return ERROR;
-  }
-
-  return OK;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_mutex_lock (pace_pthread_mutex_t * mutex)
-{
-  STATUS status;
-  int errornumber;
-
-  PACE_TRACE("pthread_mutex_lock");
-
-  status = semTake(*mutex, WAIT_FOREVER);
-  if (status == OK)
-    {
-      return OK;
-    }
-  else
-    {
-      errornumber = errnoGet();
-      if (errornumber == S_objLib_OBJ_ID_ERROR)
-        return EINVAL;
-
-      return ERROR;
-    }
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_mutex_trylock (pace_pthread_mutex_t * mutex)
-{
-  STATUS status;
-  int errornumber;
-
-  PACE_TRACE("pthread_mutex_trylock");
-
-  status = semTake(*mutex, NO_WAIT);
-  if (status == OK) 
-    return OK;
-  else
-    {
-      errornumber = errnoGet();
-      if (errornumber == S_objLib_OBJ_ID_ERROR)
-        return EINVAL;
-      if (errornumber == S_objLib_OBJ_UNAVAILABLE)
-        return EBUSY;
-
-      return ERROR;
-    }
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_mutex_unlock (pace_pthread_mutex_t * mutex)
-{
-  STATUS status;
-  int errornumber;
-
-  PACE_TRACE("pthread_mutex_unlock");
-
-  status = semGive(*mutex);
-  if (status == OK) 
-    return OK;
-  else
-    {
-      errornumber = errnoGet();
-      if (errornumber == S_semLib_INVALID_OPERATION)
-        return EPERM;
-
-      return ERROR;
-    }
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_mutexattr_setprotocol (pace_pthread_mutexattr_t * attr,
-                               int protocol)
-{
-  PACE_TRACE("pthread_mutexattr_setprotocol");
-
-/* 
- * Does not support PTHREAD_PRIO_PROTECT for VxWorks
- */
-  if ((protocol == PTHREAD_PRIO_NONE) ||
-      (protocol == PTHREAD_PRIO_INHERIT )) 
-    {
-      (*attr)->protocol = protocol;
-      return OK;
-    }
-
-  return ERROR;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_mutexattr_init (pace_pthread_mutexattr_t * attr)
-{
-  /*
-   * Initializes a mutex attributes object attr with the 
-   * default value for all of the attributes
-   */
-  pace_pthread_mutexattr_t pattr;
-
-  PACE_TRACE("pthread_mutexattr_init");
-
-  pattr = (pace_pthread_mutexattr_t) malloc(sizeof(struct _PTHREAD_MUX_ATTR));
-  if (pattr == NULL)
-    return ERROR;
-
-  /* POSIX's PTHREAD_PRIO_INHERIT maps to VxWorks' SEM_INVERSION_SAFE.
-   * However, this doesn't seem to be supported (at least on 5.3.1).
-   * Set PTHREAD_PRIO_NONE as the default since the only other choice
-   * is PTHREAD_PRIO_PROTECT which VxWorks doesn't support.
-   pattr->protocol = PTHREAD_PRIO_INHERIT;
-   */
-  pattr->protocol = PTHREAD_PRIO_NONE;
-  pattr->shared = PTHREAD_PROCESS_SHARED;
-  pattr->type = PTHREAD_MUTEX_DEFAULT;
-
-  *attr = pattr;
-  return OK;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_mutexattr_setpshared (pace_pthread_mutexattr_t * attr,
-                              int pshared)
-{
-  PACE_TRACE("pthread_mutexattr_setpshared");
-
-  /*
-   * Only supports PTHREAD_PROCESS_SHARED
-   */
-  if (attr == 0) return EINVAL;
-
-  if (pshared != PTHREAD_PROCESS_SHARED)
-    return ERROR;
-  else
-    return OK;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_setcancelstate (int state, int * oldstate)
-{
-  int key;
-  pace_pthread_t pthread;
-
-  PACE_TRACE("pthread_setcancelstate");
-
-  if ((state != PTHREAD_CANCEL_ENABLE) &&
-      (state != PTHREAD_CANCEL_DISABLE))
-    {
-      return ERROR;
-    }
-
-  if ((pthread = pace_pthread_self()) == NULL)
-    return ERROR;
-
-  key = intLock();
-  *oldstate = pthread->stateflag;
-  pthread->stateflag = state;
-  intUnlock(key);
-
-  return OK;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_setcanceltype (int type, int * oldtype)
-{
-  /* 
-   * Only asychronouse type is supported 
-   */
-  pace_pthread_t pthread;
-
-  PACE_TRACE("pthread_setcanceltype");
-
-  if (type != PTHREAD_CANCEL_ASYNCHRONOUS)
-    return ERROR;
-
-  if ((pthread = pace_pthread_self()) == NULL)
-    return ERROR;
-
-  *oldtype = pthread->canceltype;
-
-  return OK;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_setschedparam (pace_pthread_t thread,
-                       int policy,
-                       const pace_sched_param * param)
-{
-  /* 
-   * Only priority can be changed.
-   */
-  struct sched_param sparam;
-
-  PACE_TRACE("pthread_setschedparam");
-
-  if (thread == 0)
-    return ERROR;
-
-  if (policy != sched_getscheduler(thread->tid))
-    return ERROR;
- 
-  /* convert POSIX priority to VxWorks priority */
-  sparam.sched_priority = SCHED_FIFO_HIGH_PRI - param->sched_priority;
- 
-  return (sched_setparam(thread->tid, &sparam));
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_setspecific (pace_pthread_key_t key, const void * value)
-{
-  pace_pthread_t pthread;
-
-  PACE_TRACE("pthread_setspecific");
-
-  if (!pacevx_pthread_key_validate(key))
-    return ERROR;
-
-  if ((pthread = pace_pthread_self()) != NULL)
-    {
-      pthread->keyvaluelist[key] = PACE_NONCONST_ARG_CAST(void *) value;
-      return OK;
-    }
-
-  return ERROR;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_sigmask (int how,
-                 const sigset_t * set,
-                 sigset_t * oset)
-{
-  PACE_TRACE("pthread_sigmask");
-
-  switch (how)
-    {
-    case SIG_BLOCK:
-    case SIG_UNBLOCK:
-      {
-        /* get the old mask */
-        *oset = sigsetmask (*set);
-        /* create a new mask:  the following assumes that sigset_t is 4 bytes,
-         * which it is on VxWorks 5.2, so bit operations are done simply . . .
-         */
-        sigsetmask (how == SIG_BLOCK ? (*oset |= *set) : (*oset &= ~*set));
-        break;
-      }
-    case SIG_SETMASK:
-      *oset = sigsetmask (*set);
-      break;
-    default:
-      return -1;
-    }
- 
-  return 0;
-}
-#endif /* PACE_HAS_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-pace_pthread_t
-pthread_self ()
-{
-  WIND_TCB *pTcb;
-
-  PACE_TRACE("pthread_self");
-
-  if ((pTcb = taskTcb(taskIdSelf())) == NULL)
-    return (pace_pthread_t)NULL;
-
-  return (pace_pthread_t)(pTcb->_USER_SPARE4);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/vxworks/pthread.h b/PACE/pace/vxworks/pthread.h
deleted file mode 100644
index 260fe7a553d..00000000000
--- a/PACE/pace/vxworks/pthread.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/pthread.h
- *
- * = AUTHOR
- *    Joe Hoffert. The *VAST* majority of the pthread code for VxWorks
- *    has been supplied by Hughes Network Systems via Braeton Taylor.
- *
- * ============================================================================ */
-
-#ifndef PACE_PTHREAD_H_VXWORKS
-#define PACE_PTHREAD_H_VXWORKS
-
-#include <taskLib.h>
-#include <taskHookLib.h>
-#include <intLib.h>
-#include <errnoLib.h>
-#include "pace/sys/types.h"
-#include "pace/signal.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_PTHREAD_CANCELED PTHREAD_CANCELED
-#define PACE_PTHREAD_CANCEL_AYNCHRONOUS PTHREAD_CANCEL_ASYNCHRONOUS
-#define PACE_PTHREAD_CANCEL_DEFERRED PTHREAD_CANCEL_DEFERRED
-#define PACE_PTHREAD_CACEL_DISABLE PTHREAD_CANCEL_DISABLE
-#define PACE_PTHREAD_CANCEL_ENABLE PTHREAD_CANCEL_ENABLE
-#define PACE_PTHREAD_COND_INITIALIZER PTHREAD_COND_INITIALIZER
-#define PACE_PTHREAD_CREATE_DETACHED PTHREAD_CREATE_DETACHED
-#define PACE_PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_JOINABLE
-#define PACE_PTHREAD_EXPLICIT_SCHED PTHREAD_EXPLICIT_SCHED
-#define PACE_PTHREAD_INHERIT_SCHED PTHREAD_INHERIT_SCHED
-#define PACE_PTHREAD_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
-#define PACE_PTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
-#define PACE_PTHREAD_PRIO_INHERIT PTHREAD_PRIO_INHERIT
-#define PACE_PTHREAD_PRIO_NONE PTHREAD_PRIO_NONE
-#define PACE_PTHREAD_PRIO_PROTECT PTHREAD_PRIO_PROTECT
-#define PACE_PTHREAD_PROCESS_PRIVATE PTHREAD_PROCESS_PRIVATE
-#define PACE_PTHREAD_PROCESS_SHARED PTHREAD_PROCESS_SHARED
-#define PACE_PTHREAD_SCOPE_PROCESS PTHREAD_SCOPE_PROCESS
-#define PACE_PTHREAD_SCOPE_SYSTEM PTHREAD_SCOPE_SYSTEM
-
-#define PTHREAD_MUTEX_INITIALIZER 0
-#define PTHREAD_COND_INITIALIZER 0
-
-#ifndef PACE_SCHED_PARAM
-#define PACE_SCHED_PARAM
-  typedef struct sched_param pace_sched_param;
-#endif /* PACE_SCHED_PARAM */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-# ifndef PACE_ATFORK_PF
-# define PACE_ATFORK_PF
-  typedef void (*pace_atfork_pf) (void);
-# endif /* PACE_ATFORK_PF */
-
-# ifndef PACE_KEYCREATE_PF
-# define PACE_KEYCREATE_PF
-  typedef void (*pace_keycreate_pf) (void*);
-# endif /* PACE_KEYCREATE_PF */
-
-# ifndef PACE_ONCE_PF
-# define PACE_ONCE_PF
-  typedef void (*pace_once_pf) (void);
-# endif /* PACE_ONCE_PF */
-
-# ifndef PACE_CREATE_PF
-# define PACE_CREATE_PF
-  typedef void* (*pace_create_pf) (void*);
-# endif /* PACE_CREATE_PF */
-
-#endif /* PACE_HAS_CPLUPLUS */
-
-  /*
-   * VxWorks helper functions
-   */
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  extern pace_pthread_attr_t pthread_attr_default;
-
-  STATUS pacevx_vxworks_init();
-  void pacevx_pthread_proc_exit(pace_pthread_t pthread, void *value_ptr);
-  int pacevx_pthread_verify(pace_pthread_t pthread);
-  void pacevx_pthread_run_cleanup (WIND_TCB *pTcb);
-  int pacevx_pthread_queue_add(pace_pthread_t pthread);
-  int pacevx_pthread_queue_remove(pace_pthread_t pthread);
-  void pacevx_pthread_cleanup_popall(pace_pthread_t thread);
-  void pacevx_pthread_destructor_thread(pace_pthread_t pthread);
-  int pacevx_pthread_key_validate(pace_pthread_key_t key);
-  void pacevx_pthread_destructor_key(pace_pthread_key_t key, void * arg);
-
-  int pthread_cond_timedwait (pace_pthread_cond_t * cond,
-                              pace_pthread_mutex_t * mutex,
-                              const pace_timespec * abstime);
-  int pthread_cond_wait (pace_pthread_cond_t * cond,
-                         pace_pthread_mutex_t * mutex);
-# if defined (PACE_HAS_CPLUSPLUS)
-  int pthread_create (pace_pthread_t * thread,
-                      const pace_pthread_attr_t * attr,
-                      pace_create_pf start_routine,
-                      void * arg);
-  int pthread_key_create (pace_pthread_key_t * key,
-                          pace_keycreate_pf destructor);
-  int pthread_once (pace_pthread_once_t * once_control,
-                    pace_once_pf init_routine);
-# else /* ! PACE_HAS_CPLUSPLUS */
-  int pthread_create (pace_pthread_t * thread,
-                      const pace_pthread_attr_t * attr,
-                      void * (*start_routine) (void*),
-                      void * arg);
-  int pthread_key_create (pace_pthread_key_t * key,
-                          void (*destructor)(void*));
-  int pthread_once (pace_pthread_once_t * once_control,
-                    void (*init_routine) (void));
-# endif /*! PACE_HAS_CPLUSPLUS */
-  int pthread_detach (pace_pthread_t thread);
-  int pthread_join (pace_pthread_t thread, void ** value_ptr);
-  int pthread_key_delete (pace_pthread_key_t key);
-  int pthread_attr_init (pace_pthread_attr_t * attr);
-  int pthread_attr_setdetachstate (pace_pthread_attr_t * attr,
-                                   int detachstate);
-  int pthread_attr_setschedparam (pace_pthread_attr_t * attr,
-                                  const pace_sched_param * param);
-  int pthread_cancel (pace_pthread_t thread);
-  int pthread_getschedparam (pace_pthread_t thread,
-                             int * policy,
-                             pace_sched_param * param);
-  void * pthread_getspecific (pace_pthread_key_t key);
-  int pthread_mutex_init (pace_pthread_mutex_t * mutex,
-                          const pace_pthread_mutexattr_t * attr);
-  int pthread_mutex_lock (pace_pthread_mutex_t * mutex);
-  int pthread_mutex_trylock (pace_pthread_mutex_t * mutex);
-  int pthread_mutex_unlock (pace_pthread_mutex_t * mutex);
-  int pthread_mutexattr_setprotocol (pace_pthread_mutexattr_t * attr,
-                                     int protocol);
-  int pthread_mutexattr_init (pace_pthread_mutexattr_t * attr);
-  int pthread_mutexattr_setpshared (pace_pthread_mutexattr_t * attr,
-                                    int pshared);
-  int pthread_setcancelstate (int state, int * oldstate);
-  int pthread_setcanceltype (int type, int * oldtype);
-  int pthread_setschedparam (pace_pthread_t thread,
-                             int policy,
-                             const pace_sched_param * param);
-  int pthread_setspecific (pace_pthread_key_t key,
-                           const void * value);
-  int pthread_sigmask (int how,
-                       const sigset_t * set,
-                       sigset_t * oset);
-  pace_pthread_t pthread_self ();
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_PTHREAD_H_VXWORKS */
diff --git a/PACE/pace/vxworks/pthread.inl b/PACE/pace/vxworks/pthread.inl
deleted file mode 100644
index 02f694072bd..00000000000
--- a/PACE/pace/vxworks/pthread.inl
+++ /dev/null
@@ -1,935 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/pthread.inl
- *
- * = AUTHOR
- *    Joe Hoffert. The *VAST* majority of the pthread code for VxWorks
- *    has been supplied by Hughes Network Systems via Braeton Taylor.
- *    
- *
- * ============================================================================= */
-
-#include "pace/unistd.h"
-
-#include "pace/stdio.h"
-
-/*
- * PACE - POSIX Functions
- */
-
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_atfork (
-# if defined (PACE_HAS_CPLUSPLUS)
-                     pace_atfork_pf prepare,
-                     pace_atfork_pf parent,
-                     pace_atfork_pf child
-# else /* ! PACE_HAS_CPLUSPLUS */
-                     void (*prepare) (),
-                     void (*parent) (),
-                     void (*child) ()
-# endif /* PACE_HAS_CPLUSPLUS */
-                     )
-{
-  PACE_TRACE("pace_pthread_atfork");
-  /*
-   * In VxWorks, there is only one process.
-   */
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_destroy (pace_pthread_attr_t * attr)
-{
-  PACE_TRACE("pace_pthread_attr_destroy");
-  /*
-   * Free memory allocated to the attributes object.
-   */
-  if ((*attr) == 0)
-    return ERROR;
- 
-  free ((char *) *attr);
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getdetachstate (const pace_pthread_attr_t * attr,
-                                  int * detachstate)
-{
-  PACE_TRACE("pace_pthread_attr_getdetachstate");
-
-  *detachstate = (*attr)->dstate;
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getinheritsched (const pace_pthread_attr_t * attr,
-                                   int * inheritsched)
-{
-  PACE_TRACE("pace_pthread_attr_getinheritsched");
-
-  /*
-   * Get the priority inheritence of the thread attribute structure.
-   * Only PTHREAD_EXPLICIT_SCHED is returned.
-   */
-  *inheritsched = PTHREAD_EXPLICIT_SCHED;
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getschedparam (const pace_pthread_attr_t * attr,
-                                 pace_sched_param * param)
-{
-  PACE_TRACE("pace_pthread_attr_getschedparam");
-
-  param->sched_priority = (*attr)->schedule.sched_priority;
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getschedpolicy (const pace_pthread_attr_t * attr,
-                                  int * policy)
-{
-  PACE_TRACE("pace_pthread_attr_getschedpolicy");
-
-  /*
-   * VxWorks only supports SCHED_FIFO.
-   */
-
-  *policy = SCHED_FIFO;
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getscope (const pace_pthread_attr_t * attr,
-                            int * contentionscope)
-{
-  PACE_TRACE("pace_pthread_attr_getscope");
-
-  /*
-   * Since all VxWorks tasks are system wide scope,
-   * no support for the scope except for PTHREAD_SCOPE_SYSTEM
-   */
-
-  *contentionscope = PTHREAD_SCOPE_SYSTEM;
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getstackaddr (const pace_pthread_attr_t * attr,
-                                void ** stackaddr)
-{
-  PACE_TRACE("pace_pthread_attr_getstackaddr");
-
-  /*
-   * VxWorks has no support for stack address getting 
-   */
-
-  return ERROR;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getstacksize (const pace_pthread_attr_t * attr,
-                                size_t * stacksize)
-{
-  PACE_TRACE("pace_pthread_attr_getstacksize");
-
-  if (*attr == 0)
-    return ERROR;
-
-  *stacksize = (*attr)->stacksize;
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_init (pace_pthread_attr_t * attr)
-{
-  PACE_TRACE("pace_pthread_attr_init");
-
-  return pthread_attr_init(attr);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setdetachstate (pace_pthread_attr_t * attr,
-                                  int detachstate)
-{
-  PACE_TRACE("pace_pthread_attr_setdetachstate");
-
-  return pthread_attr_setdetachstate (attr, detachstate);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setinheritsched (pace_pthread_attr_t * attr,
-                                   int inheritsched)
-{
-  PACE_TRACE("pace_pthread_attr_setinheritsched");
-
-  /*
-   * For VxWorks, no inheritance of priority between the spawning task
-   * and the spawned task. Only PTHREAD_EXPLICIT_SCHED is supported.
-   */
-  if (inheritsched == PTHREAD_EXPLICIT_SCHED)
-    {
-      return OK;
-    }
-
-  return ERROR;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setschedparam (pace_pthread_attr_t * attr,
-                                 const pace_sched_param * param)
-{
-  PACE_TRACE("pace_pthread_attr_setschedparam");
-
-  return pthread_attr_setschedparam (attr, param);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setschedpolicy (pace_pthread_attr_t * attr,
-                                  int policy)
-{
-  PACE_TRACE("pace_pthread_attr_setschedpolicy");
-
-  /*
-   * In VxWorks, the schedule policy is set in system scope, 
-   * the whole system is running with one single scheduler, and
-   * is always pre-emptive priority based. The system wide 
-   * scheduler can only be changed by kernelTimeSlice() 
-   *
-   * To maintain the RTOS characteristics, only SCHED_FIFO is
-   * supported.
-   */
-  if (policy != SCHED_FIFO)
-    return ERROR;
-  else
-    return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setscope (pace_pthread_attr_t * attr,
-                            int contentionscope)
-{
-  PACE_TRACE("pace_pthread_attr_setscope");
-
-  /*
-   * Since all VxWorks tasks are system wide scope,
-   * no support for the scope except for PTHREAD_SCOPE_SYSTEM
-   */
-  if (contentionscope != PTHREAD_SCOPE_SYSTEM)
-    return ERROR;
-  else
-    return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setstackaddr (pace_pthread_attr_t * attr,
-                                void * stackaddr)
-{
-  PACE_TRACE("pace_pthread_attr_setstackaddr");
-
-  /*
-   * VxWorks does not support stack address setting.
-   */
-  return ERROR;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setstacksize (pace_pthread_attr_t * attr,
-                                size_t stacksize)
-{
-  PACE_TRACE("pace_pthread_attr_setstacksize");
-
-  /*
-   * Default size will be assigned if the stacksize is 0
-   */
-  if (*attr == 0) return ERROR;
-
-  if (stacksize != 0)
-    (*attr)->stacksize = stacksize;
-  else
-    (*attr)->stacksize = PTHREAD_DEFAULT_STACK_SIZE;
-
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cancel (pace_pthread_t thread)
-{
-  PACE_TRACE("pace_pthread_cancel");
-
-  return pthread_cancel (thread);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_broadcast (pace_pthread_cond_t * cond)
-{
-  PACE_TRACE("pace_pthread_cond_broadcast");
-
-  /* 
-   * This call unblocks all the threads that are blocked 
-   * on the specified condition variable cond.  
-   */
-  return semFlush(*cond);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_destroy (pace_pthread_cond_t * cond)
-{
-  PACE_TRACE("pace_pthread_cond_destroy");
-
-  if (*cond != NULL)
-    return semDelete(*cond);
-
-  return EINVAL;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_init (pace_pthread_cond_t * cond,
-                        const pace_pthread_condattr_t * attr)
-{
-  PACE_TRACE("pace_pthread_cond_init");
-
-  *cond = semBCreate(SEM_Q_PRIORITY, SEM_FULL);
-  if (*cond == NULL)
-    return ERROR;
-
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_signal (pace_pthread_cond_t * cond)
-{
-  PACE_TRACE("pace_pthread_cond_signal");
-
-  return semGive(*cond);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_timedwait (pace_pthread_cond_t * cond,
-                             pace_pthread_mutex_t * mutex,
-                             const pace_timespec * abstime)
-{
-  PACE_TRACE("pace_pthread_cond_timedwait");
-
-  return pthread_cond_timedwait(cond,
-                                mutex,
-                                abstime);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_wait (pace_pthread_cond_t * cond,
-                        pace_pthread_mutex_t * mutex)
-{
-  PACE_TRACE("pace_pthread_cond_wait");
-
-  return pthread_cond_wait(cond,
-                           mutex);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_condattr_destroy (pace_pthread_condattr_t * attr)
-{
-  PACE_TRACE("pace_pthread_condattr_destroy");
-
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_condattr_getpshared (const pace_pthread_condattr_t * attr,
-                                  int * pshared)
-{
-  PACE_TRACE("pace_pthread_condattr_getpshared");
-
-  /*
-   * All the resources in present VxWorks are shared system wide.
-   */
-  *pshared = PTHREAD_PROCESS_SHARED;
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_condattr_init (pace_pthread_condattr_t * attr)
-{
-  PACE_TRACE("pace_pthread_condattr_init");
-
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_condattr_setpshared (pace_pthread_condattr_t * attr,
-                                 int pshared)
-{
-  PACE_TRACE("pace_pthread_condattr_setpshared");
-
-  /*
-   * All the resources in present VxWorks are shared system wide.
-   */
-  if (pshared != PTHREAD_PROCESS_SHARED)
-    return ERROR;
- 
-  return OK;  
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_create (pace_pthread_t * thread,
-                     const pace_pthread_attr_t * attr,
-                     void * (*start_routine) (void*),
-                     void * arg)
-{
-  PACE_TRACE("pace_pthread_create");
-
-  return pthread_create (thread,
-                         attr,
-                         start_routine,
-                         arg);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_detach (pace_pthread_t thread)
-{
-  PACE_TRACE("pace_pthread_detach");
-
-  return pthread_detach (thread);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_equal (pace_pthread_t t1, pace_pthread_t t2)
-{
-  PACE_TRACE("pace_pthread_equal");
-
-  if (pacevx_pthread_verify(t1) && pacevx_pthread_verify(t2))
-    {
-      if (t1->tid != t2->tid)
-        return 0;
-    }
-
-  return 1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void
-pace_pthread_exit (void * value_ptr)
-{
-  /*
-   * Normal thread exit. All the cleanup routines will be popped, if any.
-   * If the thread is detached, free the storage; otherwise wait for join.
-   */
-  pace_pthread_t pthread;
-
-  PACE_TRACE("pace_pthread_exit");
-
-  if ((pthread = pace_pthread_self()) != NULL)
-    {
-      pacevx_pthread_proc_exit(pthread, value_ptr);
- 
-      exit(0);
-    }
-
-  exit(-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_getschedparam (pace_pthread_t thread,
-                            int * policy,
-                            pace_sched_param * param)
-{
-  PACE_TRACE("pace_pthread_getschedparam");
-
-  return pthread_getschedparam (thread,
-                                policy,
-                                param);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void *
-pace_pthread_getspecific (pace_pthread_key_t key)
-{
-  PACE_TRACE("pace_pthread_getspecific");
-
-  return pthread_getspecific (key);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_join (pace_pthread_t thread, void ** value_ptr)
-{
-  PACE_TRACE("pace_pthread_join");
-
-  return pthread_join (thread,
-                       value_ptr);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_key_create (pace_pthread_key_t * key,
-                         void (*destructor)(void*))
-{
-  PACE_TRACE("pace_pthread_key_create");
-
-  return pthread_key_create (key,
-                             destructor);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_key_delete (pace_pthread_key_t key)
-{
-  PACE_TRACE("pace_pthread_key_delete");
-
-  return pthread_key_delete (key);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_kill (pace_pthread_t thread, int sig)
-{
-  PACE_TRACE("pace_pthread_kill");
-
-  if (pacevx_pthread_verify(thread))
-    return kill(thread->tid, sig);
-  else
-    return EINVAL;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_destroy (pace_pthread_mutex_t * mutex)
-{
-  PACE_TRACE("pace_pthread_mutex_destroy");
-
-  if (*mutex != NULL)
-    return semDelete(*mutex);
-
-  return EINVAL;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_getprioceiling (pace_pthread_mutex_t * mutex,
-                                   int * prioceiling)
-{
-  PACE_TRACE("pace_pthread_mutex_getprioceiling");
-
-  /* 
-   * Mutex priority is not supported in VxWorks;
-   * it depends on the thread using it and has the same priority
-   * ceiling as this thread (SCHED_RR_HIGH_PRI).
-   */
-  *prioceiling = SCHED_RR_HIGH_PRI;
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_init (pace_pthread_mutex_t * mutex,
-                         const pace_pthread_mutexattr_t * attr)
-{
-  PACE_TRACE("pace_pthread_mutex_init");
-
-  return pthread_mutex_init (mutex,
-                             attr);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_lock (pace_pthread_mutex_t * mutex)
-{
-  PACE_TRACE("pace_pthread_mutex_lock");
-
-  return pthread_mutex_lock (mutex);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_setprioceiling (pace_pthread_mutex_t * mutex,
-                                   int prioceiling,
-                                   int * old_ceiling)
-{
-  PACE_TRACE("pace_pthread_mutex_setprioceiling");
-
-  /*
-   * Mutex priority is not supported in VxWorks;
-   * it depends on the thread using it and has the same priority
-   * ceiling as this thread (SCHED_RR_HIGH_PRI).
-   */
-  *old_ceiling = SCHED_RR_HIGH_PRI;
-
-  if (prioceiling != SCHED_RR_HIGH_PRI)
-    return ERROR;
-
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_trylock (pace_pthread_mutex_t * mutex)
-{
-  PACE_TRACE("pace_pthread_mutex_trylock");
-
-  return pthread_mutex_trylock (mutex);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_unlock (pace_pthread_mutex_t * mutex)
-{
-  PACE_TRACE("pace_pthread_mutex_unlock");
-
-  return pthread_mutex_unlock (mutex);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_destroy (pace_pthread_mutexattr_t * attr)
-{
-  PACE_TRACE("pace_pthread_mutexattr_destroy");
-
-  free(*attr);
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_getprioceiling (pace_pthread_mutexattr_t * attr,
-                                       int * prioceiling)
-{
-  PACE_TRACE("pace_pthread_mutexattr_getprioceiling");
-
-  /* 
-   * Mutex priority is not supported in VxWorks, 
-   * it depends the thread using it and has the same priority
-   * ceiling as this thread (SCHED_RR_HIGH_PRI).
-   */
-  *prioceiling = SCHED_RR_HIGH_PRI;
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_getprotocol (const pace_pthread_mutexattr_t * attr,
-                                    int * protocol)
-{
-  PACE_TRACE("pace_pthread_mutexattr_getprotocol");
-
-/*
- * Does not support PTHREAD_PRIO_PROTECT for VxWorks
- */
-  if (attr == 0)
-    return EINVAL;
-
-  *protocol = (*attr)->protocol;
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_setprioceiling (pace_pthread_mutexattr_t * attr,
-                                       int prioceiling)
-{
-  PACE_TRACE("pace_pthread_mutexattr_setprioceiling");
-
-  /* 
-   * Mutex priority is not supported in VxWorks;
-   * it depends on the thread using it and has the same priority
-   * ceiling as this thread (SCHED_RR_HIGH_PRI).
-   */
-  if (prioceiling == SCHED_RR_HIGH_PRI)
-     return OK;
-  else
-     return ERROR;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_setprotocol (pace_pthread_mutexattr_t * attr,
-                                    int protocol)
-{
-  PACE_TRACE("pace_pthread_mutexattr_setprotocol");
-
-  return pthread_mutexattr_setprotocol (attr,
-                                        protocol);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_getpshared (const pace_pthread_mutexattr_t * attr,
-                                   int * pshared)
-{
-  PACE_TRACE("pace_pthread_mutexattr_getpshared");
-
-  /*
-   * Only supports PTHREAD_PROCESS_SHARED 
-   */
-  *pshared = PTHREAD_PROCESS_SHARED;
-  return OK;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_init (pace_pthread_mutexattr_t * attr)
-{
-  PACE_TRACE("pace_pthread_mutexattr_init");
-
-  return pthread_mutexattr_init (attr);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_setpshared (pace_pthread_mutexattr_t * attr,
-                                   int pshared)
-{
-  PACE_TRACE("pace_pthread_mutexattr_setpshared");
-
-  return pthread_mutexattr_setpshared (attr,
-                                       pshared);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_once (pace_pthread_once_t * once_control,
-                   void (*void_routine) (void))
-{
-  PACE_TRACE("pace_pthread_once");
-
-  return pthread_once (once_control,
-                       void_routine);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_pthread_t
-pace_pthread_self ()
-{
-  PACE_TRACE("pace_pthread_self");
-
-  return pthread_self();
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_setcancelstate (int state,
-                             int * oldstate)
-{
-  PACE_TRACE("pace_pthread_setcancelstate");
-
-  return pthread_setcancelstate (state,
-                                 oldstate);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_setcanceltype (int type,
-                            int * oldtype)
-{
-  PACE_TRACE("pace_pthread_setcanceltype");
-
-  return pthread_setcanceltype (type,
-                                oldtype);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_setschedparam (pace_pthread_t thread,
-                            int policy,
-                            const pace_sched_param * param)
-{
-  PACE_TRACE("pace_pthread_setschedparam");
-
-  return pthread_setschedparam (thread,
-                                policy,
-                                param);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_setspecific (pace_pthread_key_t key,
-                          const void * value)
-{
-  PACE_TRACE("pace_pthread_setspecific");
-
-  return pthread_setspecific (key,
-                              value);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_sigmask (int how,
-                      const pace_sigset_t * set,
-                      pace_sigset_t * oset)
-{
-  PACE_TRACE("pace_pthread_sigmask");
-
-  return pthread_sigmask (how,
-                          set,
-                          oset);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void
-pace_pthread_testcancel ()
-{
-  PACE_TRACE("pace_pthread_testcancel");
-
-  /* Do nothing per ACE (i.e., ACE_OS::thr_testcancel). */
-  return;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/vxworks/pwd.c b/PACE/pace/vxworks/pwd.c
deleted file mode 100644
index 08f623cb684..00000000000
--- a/PACE/pace/vxworks/pwd.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/pwd.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/pwd.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/pwd.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/pwd.h b/PACE/pace/vxworks/pwd.h
deleted file mode 100644
index 4a2463658e5..00000000000
--- a/PACE/pace/vxworks/pwd.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/pwd.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_PWD_H_VXWORKS
-#define PACE_PWD_H_VXWORKS
-
-#include "pace/sys/types.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_PASSWD
-#define PACE_PASSWD
-  typedef struct passwd pace_passwd;
-#endif /* PACE_PASSWD */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_PWD_H_VXWORKS */
diff --git a/PACE/pace/vxworks/pwd.inl b/PACE/pace/vxworks/pwd.inl
deleted file mode 100644
index 1e4aab00715..00000000000
--- a/PACE/pace/vxworks/pwd.inl
+++ /dev/null
@@ -1,82 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/pwd.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_SD_UOF)
-PACE_INLINE
-pace_passwd *
-pace_getpwuid (pace_uid_t uid)
-{
-  PACE_TRACE("pace_getpwuid");
-
-  /* getpwuid() is not supported:  just one user anyways */
-  PACE_UNUSED_ARG (uid);
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_SD_UOF */
-
-#if (PACE_HAS_POSIX_SDR_UOF)
-PACE_INLINE
-int
-pace_getpwuid_r (pace_uid_t uid,
-                 pace_passwd * pwd,
-                 char * buffer,
-                 pace_size_t bufsize,
-                 pace_passwd ** result)
-{
-  PACE_TRACE("pace_getpwuid_r");
-
-  /* getpwuid_r() is not supported:  just one user anyways */
-  PACE_UNUSED_ARG (uid);
-  PACE_UNUSED_ARG (pwd);
-  PACE_UNUSED_ARG (buffer);
-  PACE_UNUSED_ARG (bufsize);
-  PACE_UNUSED_ARG (result);
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_SDR_UOF */
-
-#if (PACE_HAS_POSIX_SD_UOF)
-PACE_INLINE
-pace_passwd *
-pace_getpwnam (const char * name)
-{
-  PACE_TRACE("pace_getpwnam");
-
-  /* getpwuid() is not supported:  just one user anyways */
-  PACE_UNUSED_ARG (name);
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_SD_UOF */
-
-#if (PACE_HAS_POSIX_SDR_UOF)
-PACE_INLINE
-int
-pace_getpwnam_r (const char * name,
-                 pace_passwd * pwd,
-                 char * buffer,
-                 pace_size_t bufsize,
-                 pace_passwd ** result)
-{
-  PACE_TRACE("pace_getpwnam_r");
-
-  /* getpwuid_r() is not supported:  just one user anyways */
-  PACE_UNUSED_ARG (name);
-  PACE_UNUSED_ARG (pwd);
-  PACE_UNUSED_ARG (buffer);
-  PACE_UNUSED_ARG (bufsize);
-  PACE_UNUSED_ARG (result);
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_SDR_UOF */
diff --git a/PACE/pace/vxworks/sched.c b/PACE/pace/vxworks/sched.c
deleted file mode 100644
index 14a8857f86e..00000000000
--- a/PACE/pace/vxworks/sched.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/sched.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/sched.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/sched.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/sched.h b/PACE/pace/vxworks/sched.h
deleted file mode 100644
index 722b5953c95..00000000000
--- a/PACE/pace/vxworks/sched.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/sched.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_SCHED_H_VXWORKS
-#define PACE_SCHED_H_VXWORKS
-
-#include <sched.h>
-#include "pace/time.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_SCHED_FIFO SCHED_FIFO
-#define PACE_SCHED_OTHER SCHED_RR
-
-#ifndef PACE_SCHED_PARAM
-#define PACE_SCHED_PARAM
-  typedef struct sched_param pace_sched_param;
-#endif /* PACE_SCHED_PARAM */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SCHED_H_VXWORKS */
diff --git a/PACE/pace/vxworks/sched.inl b/PACE/pace/vxworks/sched.inl
deleted file mode 100644
index 1d6a11bcdf3..00000000000
--- a/PACE/pace/vxworks/sched.inl
+++ /dev/null
@@ -1,107 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/sched.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_get_priority_max (int policy)
-{
-  PACE_TRACE("pace_sched_get_priority_max");
-
-  return sched_get_priority_max (policy);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_get_priority_min (int policy)
-{
-  PACE_TRACE("pace_sched_get_priority_min");
-
-  return sched_get_priority_min (policy);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_getparam (pace_pid_t pid,
-                     pace_sched_param * param)
-{
-  PACE_TRACE("pace_sched_getparam");
-
-  return sched_getparam (pid, param);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_rr_get_interval (pace_pid_t pid,
-                            pace_timespec * interval)
-{
-  PACE_TRACE("pace_sched_rr_get_interval");
-
-  return sched_rr_get_interval (pid, interval);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_setparam (pace_pid_t pid,
-                     const pace_sched_param * param)
-{
-  PACE_TRACE("pace_sched_setparam");
-
-  return sched_setparam (pid, param);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_getscheduler (pace_pid_t pid)
-{
-  PACE_TRACE("pace_sched_getscheduler");
-
-  return sched_getscheduler (pid);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_setscheduler (pace_pid_t pid,
-                         int policy,
-                         const pace_sched_param * param)
-{
-  PACE_TRACE("pace_sched_setscheduler");
-
-  return sched_setscheduler (pid, policy, param);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_yield ()
-{
-  PACE_TRACE("pace_sched_yield");
-
-  return sched_yield ();
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/vxworks/semaphore.c b/PACE/pace/vxworks/semaphore.c
deleted file mode 100644
index f4d56e89543..00000000000
--- a/PACE/pace/vxworks/semaphore.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/semaphore.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/semaphore.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/semaphore.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/semaphore.h b/PACE/pace/vxworks/semaphore.h
deleted file mode 100644
index f5a0a97d05a..00000000000
--- a/PACE/pace/vxworks/semaphore.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/semaphore.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_SEMAPHORE_H_VXWORKS
-#define PACE_SEMAPHORE_H_VXWORKS
-
-#include <semaphore.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-typedef sem_t pace_sem_t;
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SEMAPHORE_H_VXWORKS */
diff --git a/PACE/pace/vxworks/semaphore.inl b/PACE/pace/vxworks/semaphore.inl
deleted file mode 100644
index edf2e95eea4..00000000000
--- a/PACE/pace/vxworks/semaphore.inl
+++ /dev/null
@@ -1,102 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/semaphore.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_close (pace_sem_t * sem)
-{
-  PACE_TRACE("pace_sem_close");
-
-  return sem_close (sem);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_destroy (pace_sem_t * sem)
-{
-  PACE_TRACE("pace_sem_destroy");
-
-  return sem_destroy (sem);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_getvalue (pace_sem_t * sem, int * sval)
-{
-  PACE_TRACE("pace_sem_getvalue");
-
-  return sem_getvalue (sem, sval);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_init (pace_sem_t * sem, int pshared, unsigned int value)
-{
-  PACE_TRACE("pace_sem_init");
-
-  return sem_init (sem, pshared, value);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_post (pace_sem_t * sem)
-{
-  PACE_TRACE("pace_sem_post");
-
-  return sem_post (sem);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_trywait (pace_sem_t * sem)
-{
-  PACE_TRACE("pace_sem_trywait");
-
-  return sem_trywait (sem);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_unlink (const char * name)
-{
-  PACE_TRACE("pace_sem_unlink");
-
-  return sem_unlink (name);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_wait (pace_sem_t * sem)
-{
-  PACE_TRACE("pace_sem_wait");
-
-  return sem_wait (sem);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/vxworks/setjmp.c b/PACE/pace/vxworks/setjmp.c
deleted file mode 100644
index e2248f0389b..00000000000
--- a/PACE/pace/vxworks/setjmp.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/setjmp.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/setjmp.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/setjmp.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/setjmp.h b/PACE/pace/vxworks/setjmp.h
deleted file mode 100644
index 5c0f8b57751..00000000000
--- a/PACE/pace/vxworks/setjmp.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/setjmp.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_SETJMP_H_VXWORKS
-#define PACE_SETJMP_H_VXWORKS
-
-#include <types/vxTypesOld.h>
-#include <setjmp.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  typedef jmp_buf pace_jmp_buf;
-  typedef sigjmp_buf pace_sigjmp_buf;
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SETJMP_H_VXWORKS */
diff --git a/PACE/pace/vxworks/setjmp.inl b/PACE/pace/vxworks/setjmp.inl
deleted file mode 100644
index b302dc91f55..00000000000
--- a/PACE/pace/vxworks/setjmp.inl
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/setjmp.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void
-pace_longjmp (pace_jmp_buf env, int val)
-{
-  PACE_TRACE("pace_longjmp");
-
-  longjmp (env, val);
-  return;
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-void
-pace_siglongjmp (pace_sigjmp_buf env, int val)
-{
-  PACE_TRACE("pace_siglongjmp");
-
-  siglongjmp (env, val);
-  return;
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
diff --git a/PACE/pace/vxworks/signal.c b/PACE/pace/vxworks/signal.c
deleted file mode 100644
index b7b840f3539..00000000000
--- a/PACE/pace/vxworks/signal.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/signal.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/signal.h"
-
-#if (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/signal.inl"
-#endif /* ! PACE_HAS_INLINE */
-
-#if (PACE_HAS_CPLUSPLUS)
-}
-#endif
diff --git a/PACE/pace/vxworks/signal.h b/PACE/pace/vxworks/signal.h
deleted file mode 100644
index 9b4343559a8..00000000000
--- a/PACE/pace/vxworks/signal.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/signal.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#ifndef PACE_SIGNAL_H_VXWORKS
-#define PACE_SIGNAL_H_VXWORKS
-
-#include <signal.h>
-#include "pace/sys/types.h"
-#include "pace/time.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_SIG_PF
-# define PACE_SIG_PF
-  typedef void (*pace_sig_pf)(int);
-#endif /* PACE_SIG_PF */
-
-#ifndef PACE_SIG_ATOMIC_T
-#define PACE_SIG_ATOMIC_T
-  typedef sig_atomic_t pace_sig_atomic_t;
-#endif /* PACE_SIG_ATOMIC_T */
-
-#ifndef PACE_SIGSET_T
-#define PACE_SIGSET_T
-  typedef sigset_t pace_sigset_t;
-#endif /* PACE_SIGSET_T */
-
-#ifndef PACE_SIGACTION_S
-#define PACE_SIGACTION_S
-  typedef struct sigaction pace_sigaction_s;
-#endif /* PACE_SIGACTION_S */
-
-#ifndef PACE_SIGINFO_T
-#define PACE_SIGINFO_T
-  typedef siginfo_t pace_siginfo_t;
-#endif /* PACE_SIGINFO_T */
-
-#ifndef PACE_SIGEVENT
-#define PACE_SIGEVENT
-  typedef struct sigevent pace_sigevent;
-#endif /* PACE_SIGEVENT */
-
-#ifndef PACE_SIGVAL
-#define PACE_SIGVAL
-  typedef union sigval pace_sigval;
-#endif /* PACE_SIGVAL */
-
-#ifndef PACE_TIMESPEC
-#define PACE_TIMESPEC
-  typedef struct timespec pace_timespec;
-#endif /* PACE_TIMESPEC */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SIGNAL_H_VXWORKS */
diff --git a/PACE/pace/vxworks/signal.inl b/PACE/pace/vxworks/signal.inl
deleted file mode 100644
index b5c94f61d4b..00000000000
--- a/PACE/pace/vxworks/signal.inl
+++ /dev/null
@@ -1,207 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/signal.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_kill (pace_pid_t pid, int sig)
-{
-  PACE_TRACE("pace_kill");
-
-  return kill (pid, sig);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_raise (int sig)
-{
-  PACE_TRACE("pace_raise");
-
-  return raise (sig);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigaction (int sig, const pace_sigaction_s * act,
-                pace_sigaction_s * oact)
-{
-  PACE_TRACE("pace_sigaction");
-
-  return sigaction (sig, act, oact);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigaddset (pace_sigset_t * set, int signo)
-{
-  PACE_TRACE("pace_sigaddset");
-
-  return sigaddset (set, signo);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigemptyset (pace_sigset_t * set)
-{
-  PACE_TRACE("pace_sigemptyset");
-
-  return sigemptyset (set);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigdelset (pace_sigset_t * set, int signo)
-{
-  PACE_TRACE("pace_sigdelset");
-
-  return sigdelset (set, signo);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigfillset (pace_sigset_t * set)
-{
-  PACE_TRACE("pace_sigfillset");
-
-  return sigfillset (set);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigismember (const pace_sigset_t * set, int signo)
-{
-  PACE_TRACE("pace_sigismember");
-
-  return sigismember (set, signo);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_sig_pf
-pace_signal (int sig, pace_sig_pf func)
-{
-  PACE_TRACE("pace_signal");
-
-  return signal (sig, func);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigpending (pace_sigset_t * set)
-{
-  PACE_TRACE("pace_sigpending");
-
-  return sigpending (set);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigprocmask (int how, const pace_sigset_t * set,
-                  pace_sigset_t * oset)
-{
-  PACE_TRACE("pace_sigprocmask");
-
-  return sigprocmask (how, set, oset);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sigqueue (pace_pid_t pid, int signo,
-               const pace_sigval value)
-{
-  PACE_TRACE("pace_sigqueue");
-
-  return sigqueue (pid, signo, value);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigsuspend (const pace_sigset_t * sigmask)
-{
-  PACE_TRACE("pace_sigsuspend");
-
-  return sigsuspend (sigmask);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sigtimedwait (const pace_sigset_t * set, pace_siginfo_t * info,
-                   const pace_timespec * timeout)
-{
-  PACE_TRACE("pace_sigtimedwait");
-
-  return sigtimedwait (set, info, timeout);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sigwait (const pace_sigset_t * set, int * sig)
-{
-  PACE_TRACE("pace_sigwait");
-
-  /* It appears that sigwait is not supported for 5.3.1 or 5.4.
-   * ACE uses sigtimedwait instead. (The code below is directly
-   * from ACE_OS.
-   * This is the call that should be made if VxWorks supported
-   * sigwait:
-   PACE_UNUSED_ARG (sig);
-   return sigwait (set);
-
-   * Second arg is a struct siginfo *, which we don't need (the
-   * selected signal number is returned).  Third arg is timeout:  0
-   * means forever.
-   */
-  *sig = sigtimedwait (set, 0, 0);
-  return *sig;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sigwaitinfo (const pace_sigset_t *set, pace_siginfo_t *info)
-{
-  PACE_TRACE("pace_sigwaitinfo");
-
-  return sigwaitinfo (set, info);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/vxworks/socket.c b/PACE/pace/vxworks/socket.c
deleted file mode 100644
index 84b52baa24c..00000000000
--- a/PACE/pace/vxworks/socket.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/socket.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/sys/socket.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/socket.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/socket.h b/PACE/pace/vxworks/socket.h
deleted file mode 100644
index 4d23fe807d1..00000000000
--- a/PACE/pace/vxworks/socket.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/socket.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_SOCKET_H_VXWORKS
-#define PACE_SOCKET_H_VXWORKS
-
-#include <sys/types.h>
-#include <sockLib.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_SOMAXCONN
-#define PACE_SOMAXCONN SOMAXCONN
-#endif /* PACE_SOMAXCONN */
-
-#ifndef PACE_SOCKLEN_T
-#define PACE_SOCKLEN_T
-    typedef int pace_socklen_t;
-#endif /* PACE_SOCKLEN_T */
-
-#ifndef PACE_SA_FAMILY_T
-#define PACE_SA_FAMILY_T
-#endif /* PACE_SA_FAMILY_T */
-
-#ifndef PACE_MSGHDR
-#define PACE_MSGHDR
-    typedef struct msghdr pace_msghdr;
-#endif /* PACE_MSGHDR */
-
-#ifndef PACE_CMSGRHDR
-#define PACE_CMSGRHDR
-    typedef struct cmsghdr pace_cmsghdr;
-#endif /* PACE_CMSGRHDR */
-
-#ifndef PACE_LINGER
-#define PACE_LINGER
-    typedef struct linger pace_linger;
-#endif /* PACE_LINGER */
-
-#ifndef PACE_SOCK_STREAM
-#define PACE_SOCK_STREAM SOCK_STREAM
-#endif /* PACE_SOCK_STREAM */
-
-#ifndef PACE_SOCK_DGRAM
-#define PACE_SOCK_DGRAM SOCK_DGRAM
-#endif /* PACE_SOCK_DGRAM */
-
-#ifndef PACE_SOCK_RAW
-#define PACE_SOCK_RAW SOCK_RAW
-#endif /* PACE_MSGHDR */
-
-#ifndef PACE_SOCK_SEQPACKET
-#define PACE_SOCK_SEQPACKET SOCK_SEQPACKET
-#endif /* PACE_SOCK_SEQPACKET */
-
-#ifndef PACE_PF_UNSPEC
-#define PACE_PF_UNSPEC PF_UNSPEC
-#endif /* PACE_PF_UNSPEC */
-
-#ifndef PACE_PF_LOCAL
-#define PACE_PF_LOCAL PF_LOCAL
-#endif /* PACE_PF_LOCAL */
-
-#ifndef PACE_PF_INET
-#define PACE_PF_INET PF_INET
-#endif /* PACE_PF_INET */
-
-#ifndef PACE_PF_ISO
-#define PACE_PF_ISO PF_ISO
-#endif /* PACE_PF_ISO */
-
-#ifndef PACE_PF_OSI
-#define PACE_PF_OSI PF_OSI
-#endif /* PACE_PF_OSI */
-
-#ifndef PACE_AF_UNSPEC
-#define PACE_AF_UNSPEC AF_UNSPEC
-#endif /* PACE_AF_UNSPEC */
-
-#ifndef PACE_AF_LOCAL
-#define PACE_AF_LOCAL AF_LOCAL
-#endif /* PACE_AF_LOCAL */
-
-#ifndef PACE_AF_INET
-#define PACE_AF_INET AF_INET
-#endif /* PACE_AF_INET */
-
-#ifndef PACE_AF_ISO
-#define PACE_AF_ISO AF_ISO
-#endif /* PACE_AF_ISO */
-
-#ifndef PACE_AF_OSI
-#define PACE_AF_OSI AF_OSI
-#endif /* PACE_AF_OSI */
-
-#ifndef PACE_MSG_OOB
-#define PACE_MSG_OOB MSG_OOB
-#endif /* PACE_MSG_OOB */
-
-#ifndef PACE_MSG_PEEK
-#define PACE_MSG_PEEK MSG_PEEK
-#endif /* PACE_MSG_PEEK */
-
-#ifndef PACE_MSG_DONTROUTE
-#define PACE_MSG_DONTROUTE MSG_DONTROUTE
-#endif /* PACE_MSG_DONTROUTE */
-
-#ifndef PACE_MSG_EOR
-#define PACE_MSG_EOR MSG_EOR
-#endif /* PACE_MSG_EOR */
-
-#ifndef PACE_MSG_TRUNC
-#define PACE_MSG_TRUNC MSG_TRUNC
-#endif /* PACE_MSG_TRUNC */
-
-#ifndef PACE_MSG_CTRUNC
-#define PACE_MSG_CTRUNC MSG_CTRUNC
-#endif /* PACE_MSG_CTRUNC */
-
-#ifndef PACE_MSG_WAITALL
-#define PACE_MSG_WAITALL MSG_WAITALL
-#endif /* PACE_MSG_WAITALL */
-
-#ifndef PACE_SOL_SOCKET
-#define PACE_SOL_SOCKET SOL_SOCKET
-#endif /* PACE_SOL_SOCKET */
-
-#ifndef PACE_SO_BROADCAST
-#define PACE_SO_BROADCAST SO_BROADCAST
-#endif /* PACE_SO_BROADCAST */
-
-#ifndef PACE_SO_DEBUG
-#define PACE_SO_DEBUG SO_DEBUG
-#endif /* PACE_SO_DEBUG */
-
-#ifndef PACE_SO_DONTROUTE
-#define PACE_SO_DONTROUTE SO_DONTROUTE
-#endif /* PACE_SO_DONTROUTE */
-
-#ifndef PACE_SO_ERROR
-#define PACE_SO_ERROR SO_ERROR
-#endif /* PACE_SO_ERROR */
-
-#ifndef PACE_SO_KEEPALIVE
-#define PACE_SO_KEEPALIVE SO_KEEPALIVE
-#endif /* PACE_SO_KEEPALIVE */
-
-#ifndef PACE_SO_LINGER
-#define PACE_SO_LINGER SO_LINGER
-#endif /* PACE_SO_LINGER */
-
-#ifndef PACE_SO_OOBINLINE
-#define PACE_SO_OOBINLINE SO_OOBINLINE
-#endif /* PACE_SO_OOBINLINE */
-
-#ifndef PACE_SO_RCVBUF
-#define PACE_SO_RCVBUF SO_RCVBUF
-#endif /* PACE_SO_RCVBUF */
-
-#ifndef PACE_SO_RCVLOWAT
-#define PACE_SO_RCVLOWAT SO_RCVLOWAT
-#endif /* PACE_SO_RCVLOWAT */
-
-#ifndef PACE_SO_RCVTIMEO
-#define PACE_SO_RCVTIMEO SO_RCVTIMEO
-#endif /* PACE_SO_RCVTIMEO */
-
-#ifndef PACE_SO_REUSEADDR
-#define PACE_SO_REUSEADDR SO_REUSEADDR
-#endif /* PACE_SO_REUSEADDR */
-
-#ifndef PACE_SO_SNDBUF
-#define PACE_SO_SNDBUF SO_SNDBUF
-#endif /* PACE_SO_SNDBUF */
-
-#ifndef PACE_SO_SNDLOWAT
-#define PACE_SO_SNDLOWAT SO_SNDLOWAT
-#endif /* PACE_SO_SNDLOWAT */
-
-#ifndef PACE_SO_SNDTIMEO
-#define PACE_SO_SNDTIMEO SO_SNDTIMEO
-#endif /* PACE_SO_SNDTIMEO */
-
-#ifndef PACE_SO_TYPE
-#define PACE_SO_TYPE SO_TYPE
-#endif /* PACE_SO_TYPE */
-
-#ifndef PACE_CMSG_DATA
-#define PACE_CMSG_DATA(cmsg)          CMSG_DATA(cmsg)
-#endif /* PACE_CMSG_DATA */
-
-#ifndef PACE_CMSG_NXTHDR
-#define PACE_CMSG_NXTHDR(mhdr, cmsg)  CMSG_NXTHDR(mhdr, cmsg)
-#endif /* PACE_CMSG_DATA */
-
-#ifndef PACE_CMSG_FIRSTHDR
-#define PACE_CMSG_NXTHDR(mhdr, cmsg)  CMSG_NXTHDR(mhdr, cmsg)
-#endif /* PACE_CMSG_DATA */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SOCKET_H_VXWORKS */
diff --git a/PACE/pace/vxworks/socket.inl b/PACE/pace/vxworks/socket.inl
deleted file mode 100644
index 440254fd0da..00000000000
--- a/PACE/pace/vxworks/socket.inl
+++ /dev/null
@@ -1,280 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/socket.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include <unistd.h>
-#include <stdarg.h>
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_accept (int s,
-             pace_sockaddr * socketaddress,
-             pace_socklen_t * addresslen)
-{
-  PACE_TRACE("pace_accept");
-
-  accept (s, socketaddress, addresslen);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_bind (int s,
-           const pace_sockaddr * socketaddress,
-           pace_socklen_t addresslen)
-{
-  PACE_TRACE("pace_bind");
-
-  bind (s, socketaddress, addresslen);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_connect (int s,
-              const pace_sockaddr * socketaddress,
-              pace_socklen_t addresslen)
-{
-  PACE_TRACE("pace_connect");
-
-  connect (s, socketaddress, addresslen);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_getpeername (int s,
-                  pace_sockaddr * socketaddress,
-                  pace_socklen_t * addresslen)
-{
-  PACE_TRACE("pace_getpeername");
-
-  getpeername (s, socketaddress, addresslen);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_getsockname (int s,
-                  pace_sockaddr * socketaddress,
-                  pace_socklen_t * addresslen)
-{
-  PACE_TRACE("pace_getsockname");
-
-  getsockname (s, socketaddress, addresslen);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_getsockopt (int s,
-                 int level,
-                 int optname,
-                 void * optval,
-                 pace_socklen_t optlen)
-{
-  PACE_TRACE("pace_getsockopt");
-
-  getsockopt (s, level, optname, optval, optlen);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_setsockopt (int s,
-                 int level,
-                 int optname,
-                 const * optval)
-{
-  PACE_TRACE("pace_setsockopt");
-
-  setsockopt (s, level, optname, optval);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_setsockopt (int s,
-                 int level,
-                 int optname,
-                 const * optval)
-{
-  PACE_TRACE("pace_setsockopt");
-
-  setsockopt (s, level, optname, optval);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_isfdtype (int fildes, int fdtype)
-{
-  PACE_TRACE("pace_isfdtype");
-
-  isfdtype (fildes, fdtype);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_listen (int s, int backlog)
-{
-  PACE_TRACE("pace_listen");
-
-  listen (s, backlog);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-pace_ssize_t
-pace_recv (int s,
-           void * buf,
-           pace_size_t len,
-           int flags)
-{
-  PACE_TRACE("pace_recv");
-
-  recv (s, buf, len, flags);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-pace_ssize_t
-pace_recvfrom (int s,
-               void * buf,
-               pace_size_t len,
-               int flags,
-               pace_sockaddr * from,
-               pace_socklen_t * fromlen)
-{
-  PACE_TRACE("pace_recvfrom");
-
-  recvfrom (s, buf, len, flags, from, fromlen);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-pace_ssize_t
-pace_rcvmsg (int s,
-             pace_msghdr * msg,
-             int flags)
-{
-  PACE_TRACE("pace_rcvmsg");
-
-  rcvmsg (s, msg, flags);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-pace_ssize_t
-pace_send (int s,
-           const void * buf,
-           pace_size_t len,
-           int flags)
-{
-  PACE_TRACE("pace_send");
-
-  send (s, buf, len, flags);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-pace_ssize_t
-pace_sendto (int s,
-             const void * buf,
-             pace_size_t len,
-             int flags,
-             const pace_sockaddr * to,
-             pace_socklen_t * tolen)
-{
-  PACE_TRACE("pace_sendto");
-
-  sendto (s, buf, len, flags, to, tolen);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-pace_ssize_t
-pace_sendmsg (int s,
-              const pace_msghdr * msg,
-              int flags)
-{
-  PACE_TRACE("pace_sendmsg");
-
-  sendmsg (s, msg, flags);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_shutdown (int s, int how)
-{
-  PACE_TRACE("pace_shutdown");
-
-  shutdown (s, how);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_socket (int protofamily, int type, int protocol)
-{
-  PACE_TRACE("pace_socket");
-
-  socket (protofamily, type, protocol);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-#if (PACE_HAS_POSIX_SOCK_UOF)
-PACE_INLINE
-int
-pace_socketpair (int protofamily,
-                 int type,
-                 int protocol,
-                 int sv[2])
-{
-  PACE_TRACE("pace_socketpair");
-
-  socketpair (protofamily, type, protocol, sy);
-}
-#endif /* PACE_HAS_POSIX_SOCK_UOF */
-
-
-
-
-
-
-
-
-
-
-
diff --git a/PACE/pace/vxworks/stat.c b/PACE/pace/vxworks/stat.c
deleted file mode 100644
index 4a1e3ba06bb..00000000000
--- a/PACE/pace/vxworks/stat.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/stat.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/sys/stat.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/stat.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/stat.h b/PACE/pace/vxworks/stat.h
deleted file mode 100644
index ce6669cb971..00000000000
--- a/PACE/pace/vxworks/stat.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/stat.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_STAT_H_VXWORKS
-#define PACE_SYS_STAT_H_VXWORKS
-
-#include <types/vxTypesOld.h>
-#include <sys/stat.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_S_IRGRP S_IRGRP
-#define PACE_S_IROTH S_IROTH
-#define PACE_S_IRUSR S_IRUSR
-#define PACE_S_IRWXG S_IRWXG
-#define PACE_S_IRWXO S_IRWXO
-#define PACE_S_IRWXU S_IRWXU
-#define PACE_S_ISBLK S_ISBLK
-#define PACE_S_ISCHR S_ISCHR
-#define PACE_S_ISDIR S_ISDIR
-#define PACE_S_ISFIFO S_ISFIFO
-#define PACE_S_ISGID S_SIGID
-#define PACE_S_ISREG S_ISREG
-#define PACE_S_ISUID S_ISUID
-#define PACE_S_IWGRP S_IWGRP
-#define PACE_S_IWOTH S_IWOTH
-#define PACE_S_IWUSR S_IWUSR
-#define PACE_S_IXGRP S_IXGRP
-#define PACE_S_IXOTH S_IXOTH
-#define PACE_S_IXUSR S_IXUSR
-#define PACE_S_TYPEISMQ S_TYPEISMQ
-#define PACE_S_TYPEISSEM S_TYPEISSEM
-#define PACE_S_TYPEISSHM S_TYPEISSHM
-
-#ifndef PACE_STAT
-#define PACE_STAT
-  /* Kludge since there is a func and a type of the same name */
-  typedef struct stat pace_stat_s;
-#endif /* PACE_STAT */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_STAT_H_VXWORKS */
diff --git a/PACE/pace/vxworks/stat.inl b/PACE/pace/vxworks/stat.inl
deleted file mode 100644
index 56359e690a0..00000000000
--- a/PACE/pace/vxworks/stat.inl
+++ /dev/null
@@ -1,99 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/stat.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_FA_UOF)
-PACE_INLINE
-int
-pace_chmod (const char * path, pace_mode_t mode)
-{
-  PACE_TRACE("pace_chmod");
-
-  PACE_UNUSED_ARG(path);
-  PACE_UNUSED_ARG(mode);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FA_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_fchmod (PACE_HANDLE fildes, pace_mode_t mode)
-{
-  PACE_TRACE("pace_fchmod");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_UNUSED_ARG(mode);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_fstat (PACE_HANDLE fildes, pace_stat_s * buf)
-{
-  PACE_TRACE("pace_fstat");
-
-  return fstat (fildes, buf);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_mkdir (const char * path, pace_mode_t mode)
-{
-  PACE_TRACE("pace_mkdir");
-
-  PACE_UNUSED_ARG (mode);
-  return mkdir (PACE_NONCONST_ARG_CAST (char *) path);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_F_UOF)
-PACE_INLINE
-int
-pace_mkfifo (const char * path, pace_mode_t mode)
-{
-  PACE_TRACE("pace_mkfifo");
-
-  PACE_UNUSED_ARG(path);
-  PACE_UNUSED_ARG(mode);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_F_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_stat (const char * path, pace_stat_s * buf)
-{
-  PACE_TRACE("pace_stat");
-
-  return stat (PACE_NONCONST_ARG_CAST (char *) path, buf);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FA_UOF)
-PACE_INLINE
-pace_mode_t
-pace_umask (pace_mode_t cmask)
-{
-  PACE_TRACE("pace_umask");
-
-  PACE_UNUSED_ARG(cmask);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FA_UOF */
diff --git a/PACE/pace/vxworks/stdio.c b/PACE/pace/vxworks/stdio.c
deleted file mode 100644
index ec5b053e2ff..00000000000
--- a/PACE/pace/vxworks/stdio.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/stdio.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/stdio.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/stdio.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/stdio.h b/PACE/pace/vxworks/stdio.h
deleted file mode 100644
index 2e819b7a431..00000000000
--- a/PACE/pace/vxworks/stdio.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $Id$ -*- C -*-
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/stdio.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_STDIO_H_VXWORKS
-#define PACE_STDIO_H_VXWORKS
-
-#include <stdarg.h>
-#include <stdio.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_BUFSIZ BUFSIZ
-#define PACE_EOF EOF
-#define PACE_FILENAME_MAX FILENAME_MAX
-#define PACE_L_ctermid L_ctermid
-#define PACE_L_cuserid L_cuserid
-#ifndef PACE_NULL
-#define PACE_NULL NULL
-#endif /* PACE_NULL */
-#define PACE_SEEK_CUR SEEK_CUR
-#define PACE_SEEK_END SEEK_END
-#define PACE_SEEK_SET SEEK_SET
-#define PACE_TMP_MAX TMP_MAX
-#define pace_stderr stderr
-#define pace_stdout stdout
-#define pace_stdin stdin
-
-#ifndef PACE_FPOS_T
-#define PACE_FPOS_T
-typedef fpos_t pace_fpos_t;
-#endif /* PACE_FPOS_T */
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T
-  typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-typedef FILE PACE_FILE;
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_STDIO_H_VXWORKS */
diff --git a/PACE/pace/vxworks/stdio.inl b/PACE/pace/vxworks/stdio.inl
deleted file mode 100644
index 27ffc39bcc5..00000000000
--- a/PACE/pace/vxworks/stdio.inl
+++ /dev/null
@@ -1,565 +0,0 @@
-/* $Id$ -*- C -*-
-
- * ===========================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/stdio.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * =========================================================================== */
-
-#include <stdarg.h>
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-void
-pace_clearerr (FILE * stream)
-{
-  PACE_TRACE("pace_clearerr");
-
-  clearerr (stream);
-  return;
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-char *
-pace_ctermid (char * s)
-{
-  PACE_TRACE("pace_ctermid");
-
-  PACE_UNUSED_ARG(s);
-  PACE_ERRNO_NO_SUPPORT_RETURN ((char *) 0);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fclose (FILE * stream)
-{
-  PACE_TRACE("pace_fclose");
-
-  return fclose (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-FILE *
-pace_fdopen (int fildes,
-             const char * type)
-{
-  PACE_TRACE("pace_fdopen");
-
-  return fdopen (fildes,
-                 type);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_ferror (FILE * stream)
-{
-  PACE_TRACE("pace_ferror");
-
-  return ferror (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_feof (FILE * stream)
-{
-  PACE_TRACE("pace_feof");
-
-  return feof (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fflush (FILE * stream)
-{
-  PACE_TRACE("pace_fflush");
-
-  return fflush (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fileno (FILE * stream)
-{
-  PACE_TRACE("pace_fileno");
-
-  return fileno (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fgetc (FILE * stream)
-{
-  PACE_TRACE("pace_fgetc");
-
-  return fgetc (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_fgetpos (PACE_FILE * stream,
-              pace_fpos_t * pos)
-{
-  PACE_TRACE("pace_fgetpos");
-
-  return fgetpos (stream, pos);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-char *
-pace_fgets (char * s,
-            int n,
-            FILE * stream)
-{
-  PACE_TRACE("pace_fgets");
-
-  return fgets (s,
-                n,
-                stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-void
-pace_flockfile (FILE * file)
-{
-  PACE_TRACE("pace_flockfile");
-
-  PACE_UNUSED_ARG (file);
-  PACE_ERRNO_NO_SUPPORT ();
-  return;
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-FILE *
-pace_fopen (const char * filename,
-            const char * mode)
-{
-  PACE_TRACE("pace_fopen");
-
-  return fopen (filename,
-                mode);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fputc (int c,
-            FILE * stream)
-{
-  PACE_TRACE("pace_fputc");
-
-  return fputc (c,
-                stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fputs (const char * s,
-            FILE * stream)
-{
-  PACE_TRACE("pace_fputs");
-
-  return fputs (s,
-                stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-size_t
-pace_fread (void * ptr,
-            size_t size,
-            size_t number_of_items,
-            FILE * stream)
-{
-  PACE_TRACE("pace_fread");
-
-  return fread (ptr,
-                size,
-                number_of_items,
-                stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-FILE *
-pace_freopen (const char * filename,
-              const char * mode,
-              FILE * stream)
-{
-  PACE_TRACE("pace_freopen");
-
-  return freopen (filename,
-                  mode,
-                  stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-int
-pace_fseek (FILE * stream,
-            long offset,
-            int whence)
-{
-  PACE_TRACE("pace_fseek");
-
-  return fseek (stream,
-                offset,
-                whence);
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_fsetpos (PACE_FILE *stream, const pace_fpos_t *pos)
-{
-  PACE_TRACE("pace_fsetpos");
-
-  return fsetpos (stream, pos);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-long
-pace_ftell (FILE * stream)
-{
-  PACE_TRACE("pace_ftell");
-
-  return ftell (stream);
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-int
-pace_ftrylockfile (FILE * file)
-{
-  PACE_TRACE("pace_ftrylockfile");
-
-  PACE_UNUSED_ARG(file);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-void
-pace_funlockfile (FILE * file)
-{
-  PACE_TRACE("pace_funlockfile");
-
-  PACE_UNUSED_ARG(file);
-  PACE_ERRNO_NO_SUPPORT ();
-  return;
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-pace_size_t
-pace_fwrite (const void * ptr,
-             pace_size_t size, pace_size_t nmemb,
-             PACE_FILE * stream)
-{
-  PACE_TRACE("pace_fwrite");
-
-  return fwrite (ptr, size, nmemb, stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_getc (FILE * stream)
-{
-  PACE_TRACE("pace_getc");
-
-  return getc (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-int
-pace_getc_unlocked (FILE * stream)
-{
-  PACE_TRACE("pace_getc_unlocked");
-
-  PACE_UNUSED_ARG(stream);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_getchar ()
-{
-  PACE_TRACE("pace_getchar");
-
-  return getchar ();
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-int
-pace_getchar_unlocked ()
-{
-  PACE_TRACE("pace_getchar_unlocked");
-
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-char *
-pace_gets (char * s)
-{
-  PACE_TRACE("pace_gets");
-
-  return gets (s);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-void
-pace_perror (const char * s)
-{
-  PACE_TRACE("pace_perror");
-
-  perror (s);
-  return;
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_putc (int c,
-           FILE * stream)
-{
-  PACE_TRACE("pace_putc");
-
-  return putc (c, stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-int
-pace_putc_unlocked (int c,
-                    FILE * stream)
-{
-  PACE_TRACE("pace_putc_unlocked");
-
-  PACE_UNUSED_ARG(c);
-  PACE_UNUSED_ARG(stream);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_putchar (int c)
-{
-  PACE_TRACE("pace_putchar");
-
-  return putchar (c);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-int
-pace_putchar_unlocked (int c)
-{
-  PACE_TRACE("pace_putchar_unlocked");
-
-  PACE_UNUSED_ARG(c);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_puts (const char * s)
-{
-  PACE_TRACE("pace_puts");
-
-  return puts (s);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_remove (const char * path)
-{
-  PACE_TRACE("pace_remove");
-
-  return remove (path);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_rename (const char * old_name,
-             const char * new_name)
-{
-  PACE_TRACE("pace_rename");
-
-  return rename (old_name,
-                 new_name);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-void
-pace_rewind (FILE * stream)
-{
-  PACE_TRACE("pace_rewind");
-
-  rewind (stream);
-  return;
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-void
-pace_setbuf (FILE * stream, char * buf)
-{
-  PACE_TRACE("pace_setbuf");
-
-  setbuf (stream, buf);
-  return;
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_setvbuf (PACE_FILE * stream,
-              char * buf,
-              int mode, pace_size_t size)
-{
-  PACE_TRACE("pace_setvbuf");
-
-  return setvbuf (stream, buf, mode, size);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-FILE *
-pace_tmpfile ()
-{
-  PACE_TRACE("pace_tmpfile");
-
-  return tmpfile ();
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-char *
-pace_tmpnam (char * s)
-{
-  PACE_TRACE("pace_tmpnam");
-
-  return tmpnam (s);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_ungetc (int c, FILE * stream)
-{
-  PACE_TRACE("pace_ungetc");
-
-  return ungetc (c, stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_vfprintf (PACE_FILE * stream,
-               const char * format,
-               va_list arg)
-{
-  PACE_TRACE("pace_vfprintf");
-
-  return vfprintf (stream, format, arg);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_vprintf (const char * format,
-              va_list arg)
-{
-  PACE_TRACE("pace_vprintf");
-
-  return vprintf (format, arg);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_vsprintf (char * s,
-               const char * format,
-               va_list arg)
-{
-  PACE_TRACE("pace_vsprintf");
-
-  return vsprintf (s, format, arg);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/vxworks/stdlib.c b/PACE/pace/vxworks/stdlib.c
deleted file mode 100644
index bea76354026..00000000000
--- a/PACE/pace/vxworks/stdlib.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/stdlib.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/stdlib.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/stdlib.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/stdlib.h b/PACE/pace/vxworks/stdlib.h
deleted file mode 100644
index 75a5196af60..00000000000
--- a/PACE/pace/vxworks/stdlib.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/stdlib.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_STDLIB_H_VXWORKS
-#define PACE_STDLIB_H_VXWORKS
-
-#include <stdlib.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_EXIT_FAILURE EXIT_FAILURE
-#define PACE_EXIT_SUCCESS EXIT_SUCCESS
-#define PACE_MB_CUR_MAX MB_CUR_MAX
-#ifndef PACE_NULL
-# define PACE_NULL NULL
-#endif /* PACE_NULL */
-#define PACE_RAND_MAX RAND_MAX
-
-#ifndef PACE_DIV_T
-#define PACE_DIV_T
-  typedef div_t pace_div_t;
-#endif /* PACE_DIV_T */
-
-#ifndef PACE_LDIV_T
-#define PACE_LDIV_T
-  typedef ldiv_t pace_ldiv_t;
-#endif /* PACE_LDIV_T */
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T
-  typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-#ifndef PACE_WCHAR_T
-#define PACE_WCHAR_T
-  typedef wchar_t pace_wchar_t;
-#endif /* PACE_WCHAR_T */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-# ifndef PACE_BSEARCH_PF
-# define PACE_BSEARCH_PF
-  typedef int (*pace_bsearch_pf) (const void*, const void*);
-# endif /* PACE_BSEARCH_PF */
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_STDLIB_H_VXWORKS */
diff --git a/PACE/pace/vxworks/stdlib.inl b/PACE/pace/vxworks/stdlib.inl
deleted file mode 100644
index 56569bb52bd..00000000000
--- a/PACE/pace/vxworks/stdlib.inl
+++ /dev/null
@@ -1,381 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/stdlib.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include <stdlib.h>
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-void
-pace_abort (void)
-{
-  PACE_TRACE("pace_abort");
-
-  abort ();
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_abs (int val)
-{
-  PACE_TRACE("pace_abs");
-
-  return abs (val);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_atexit (void (*func)(void))
-{
-  PACE_TRACE("pace_atexit");
-
-  return atexit (func);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_atof (const char * str)
-{
-  PACE_TRACE("pace_atof");
-
-  return atof (str);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_atoi (const char * str)
-{
-  PACE_TRACE("pace_atoi");
-
-  return atoi (str);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-long
-pace_atol (const char * str)
-{
-  PACE_TRACE("pace_atol");
-
-  return atol (str);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-# if defined (PACE_HAS_CPLUSPLUS)
-PACE_INLINE
-void *
-pace_bsearch (const void *key, const void *base,
-              size_t nel, size_t size,
-              pace_bsearch_pf compar)
-{
-  PACE_TRACE("pace_bsearch");
-
-  return bsearch (key, base, nel, size, compar);
-}
-# else /* ! PACE_HAS_CPLUSPLUS */
-PACE_INLINE
-void *
-pace_bsearch (const void *key, const void *base,
-              size_t nel, size_t size,
-              int (*compar)(const void *,const void *))
-{
-  PACE_TRACE("pace_bsearch");
-
-  return bsearch (key, base, nel, size, compar);
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_div_t
-pace_div (int numer, int denom)
-{
-  PACE_TRACE("pace_div");
-
-  return div (numer, denom);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-void
-pace_exit (int status)
-{
-  PACE_TRACE("pace_exit");
-
-  exit (status);
-  return;
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-char *
-pace_getenv (const char * name)
-{
-  PACE_TRACE("pace_getenv");
-
-  return getenv (name);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-long int
-pace_labs (long int j)
-{
-  PACE_TRACE("pace_labs");
-
-  return labs (j);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_ldiv_t
-pace_ldiv (long int numer, long int denom)
-{
-  PACE_TRACE("pace_ldiv");
-
-  return ldiv (numer, denom);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mblen (const char* s, pace_size_t n)
-{
-  PACE_TRACE("pace_mblen");
-
-  return mblen (s, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_size_t
-pace_mbstowcs (pace_wchar_t* pwcs,
-               const char* s,
-               pace_size_t n)
-{
-  PACE_TRACE("pace_mbstowcs");
-
-  return mbstowcs (pwcs, s, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mbtowc (pace_wchar_t* pwc,
-             const char* s,
-             pace_size_t n)
-{
-  PACE_TRACE("pace_mbtowc");
-
-  return mbtowc (pwc, s, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-# if (PACE_HAS_CPLUSPLUS)
-PACE_INLINE
-void
-pace_qsort (void * base, size_t nel, size_t width,
-            pace_bsearch_pf compar)
-{
-  PACE_TRACE("pace_qsort");
-
-  qsort (base, nel, width, compar);
-}
-# else /* ! PACE_HAS_CPLUSPLUS */
-PACE_INLINE
-void
-pace_qsort (void * base, size_t nel, size_t width,
-            int (*compar)(const void *,const void *))
-{
-  PACE_TRACE("pace_qsort");
-
-  qsort (base, nel, width, compar);
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_rand ()
-{
-  PACE_TRACE("pace_rand");
-
-  return rand ();
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void
-pace_srand (unsigned int seed)
-{
-  PACE_TRACE("pace_srand");
-
-  srand (seed);
-  return;
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-int
-pace_rand_r (unsigned int *seed)
-{
-  PACE_TRACE("pace_rand_r");
-
-  PACE_UNUSED_ARG (seed);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-double
-pace_strtod (const char* nptr,
-             char** endptr)
-{
-  PACE_TRACE("pace_strtod");
-
-  return strtod (nptr, endptr);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_strtol (const char* nptr,
-             char** endptr,
-             int base)
-{
-  PACE_TRACE("pace_strtol");
-
-  return strtol (nptr, endptr, base);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-unsigned long int
-pace_strtoul (const char* nptr,
-              char** endptr,
-              int base)
-{
-  PACE_TRACE("pace_strtoul");
-
-  return strtoul (nptr, endptr, base);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_system (const char* string)
-{
-  PACE_TRACE("pace_system");
-
-  return system (string);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_size_t
-pace_wcstombs (char* s,
-               const pace_wchar_t* pwcs,
-               pace_size_t n)
-{
-  PACE_TRACE("pace_wcstombs");
-
-  return wcstombs (s, pwcs, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_wctomb (char* s, pace_wchar_t wchar)
-{
-  PACE_TRACE("pace_wctomb");
-
-  return wctomb (s, wchar);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-/* Memory Management. */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void *
-pace_malloc (size_t size)
-{
-  PACE_TRACE("pace_malloc");
-
-  return malloc (size);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void *
-pace_calloc (size_t nelem, size_t elsize)
-{
-  PACE_TRACE("pace_calloc");
-
-  return calloc (nelem, elsize);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void
-pace_free (void * ptr)
-{
-  PACE_TRACE("pace_free");
-
-  free (ptr);
-  return;
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void *
-pace_realloc (void * ptr, size_t size)
-{
-  PACE_TRACE("pace_realloc");
-
-  return realloc (ptr, size);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
diff --git a/PACE/pace/vxworks/string.c b/PACE/pace/vxworks/string.c
deleted file mode 100644
index a6404ccfd0b..00000000000
--- a/PACE/pace/vxworks/string.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/string.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/string.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/string.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/string.h b/PACE/pace/vxworks/string.h
deleted file mode 100644
index f2fcee61fe5..00000000000
--- a/PACE/pace/vxworks/string.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/string.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_STRING_H_VXWORKS
-#define PACE_STRING_H_VXWORKS
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#if !defined (PACE_NULL)
-# define PACE_NULL NULL
-#endif /* NULL */
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T
-  typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_STRING_H_VXWORKS */
diff --git a/PACE/pace/vxworks/string.inl b/PACE/pace/vxworks/string.inl
deleted file mode 100644
index 65c2701b606..00000000000
--- a/PACE/pace/vxworks/string.inl
+++ /dev/null
@@ -1,238 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/string.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include <string.h>
-#include "pace/string.h"
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void *
-pace_memchr (const void *s, int c, pace_size_t n)
-{
-  PACE_TRACE("pace_memchr");
-
-  return (void*) memchr (s, c, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_memcmp (const void *s1, const void *s2, pace_size_t n)
-{
-  PACE_TRACE("pace_memcmp");
-
-  return memcmp (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void *
-pace_memcpy (void * s1, const void * s2, pace_size_t n)
-{
-  PACE_TRACE("pace_memcpy");
-
-  return memcpy (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void *
-pace_memmove (void *s1, const void *s2, pace_size_t n)
-{
-  PACE_TRACE("pace_memmove");
-
-  return memmove (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_BROKEN_INLINE
-void *
-pace_memset (void *s, int c, pace_size_t n)
-{
-  PACE_TRACE("pace_memset");
-
-  return memset (s, c, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strcat (char * s1, const char * s2)
-{
-  PACE_TRACE("pace_strcat");
-
-  return strcat (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strncat (char * s1, const char * s2, size_t n)
-{
-  PACE_TRACE("pace_strncat");
-
-  return strncat (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strchr (const char * s, int c)
-{
-  PACE_TRACE("pace_strchr");
-
-  return (char*) strchr (s, c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strrchr (const char * s, int c)
-{
-  PACE_TRACE("pace_strrchr");
-
-  return (char*) strrchr (s, c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_BROKEN_INLINE
-int
-pace_strcmp (const char * s1, const char * s2)
-{
-  PACE_TRACE("pace_strcmp");
-
-  return strcmp (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_BROKEN_INLINE
-int
-pace_strncmp (const char * s1, const char * s2, size_t n)
-{
-  PACE_TRACE("pace_strncmp");
-
-  return strncmp (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_BROKEN_INLINE
-char *
-pace_strcpy (char * s1, const char * s2)
-{
-  PACE_TRACE("pace_strcpy");
-
-  return strcpy (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strncpy (char * s1, const char * s2, size_t n)
-{
-  PACE_TRACE("pace_strncpy");
-
-  return strncpy (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_BROKEN_INLINE
-size_t
-pace_strcspn (const char * s1, const char * s2)
-{
-  PACE_TRACE("pace_strcspn");
-
-  return strcspn (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-size_t
-pace_strspn (const char * s1, const char * s2)
-{
-  PACE_TRACE("pace_strspn");
-
-  return strspn (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-size_t
-pace_strlen (const char * s)
-{
-  PACE_TRACE("pace_strlen");
-
-  return strlen (s);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_BROKEN_INLINE
-char *
-pace_strpbrk (const char * s1, const char * s2)
-{
-  PACE_TRACE("pace_strpbrk");
-
-  return (char*) strpbrk (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strstr (const char * s1, const char * s2)
-{
-  PACE_TRACE("pace_strstr");
-
-  return (char*) strstr (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strtok (char * s1, const char * s2)
-{
-  PACE_TRACE("pace_strtok");
-
-  return strtok (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-char *
-pace_strtok_r (char * s, const char * sep, char ** lasts)
-{
-  PACE_TRACE("pace_strtok_r");
-
-  return strtok_r (s, sep, lasts);
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
diff --git a/PACE/pace/vxworks/termios.c b/PACE/pace/vxworks/termios.c
deleted file mode 100644
index 4cc7e1d7388..00000000000
--- a/PACE/pace/vxworks/termios.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/termios.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/termios.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/termios.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/termios.h b/PACE/pace/vxworks/termios.h
deleted file mode 100644
index a21eef15fb6..00000000000
--- a/PACE/pace/vxworks/termios.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/termios.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_TERMIOS_H_VXWORKS
-#define PACE_SYS_TERMIOS_H_VXWORKS
-
-#include "pace/sys/types.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS) */
-
-#ifndef PACE_CC_T
-#define PACE_CC_T
-typedef int pace_cc_t;
-#endif /* PACE_CC_T */
-
-#ifndef PACE_SPEED_T
-#define PACE_SPEED_T
-typedef int pace_speed_t;
-#endif /* PACE_SPEED_T */
-
-#ifndef PACE_TCFLAG_T
-#define PACE_TCFLAG_T
-typedef int pace_tcflag_t;
-#endif /* PACE_TCFLAG_T */
-
-#ifndef PACE_TERMIOS
-#define PACE_TERMIOS
-typedef int pace_termios;
-#endif /* PACE_TERMIOS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_TERMIOS_H_VXWORKS */
diff --git a/PACE/pace/vxworks/termios.inl b/PACE/pace/vxworks/termios.inl
deleted file mode 100644
index 30c778371f3..00000000000
--- a/PACE/pace/vxworks/termios.inl
+++ /dev/null
@@ -1,145 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/termios.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-pace_speed_t
-pace_cfgetospeed (const pace_termios *termiosp)
-{
-  PACE_TRACE("pace_cfgetospeed");
-
-  PACE_UNUSED_ARG(termiosp);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_cfsetospeed (pace_termios *termios_p, pace_speed_t speed)
-{
-  PACE_TRACE("pace_cfsetospeed");
-
-  PACE_UNUSED_ARG(termios_p);
-  PACE_UNUSED_ARG(speed);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-pace_speed_t
-pace_cfgetispeed (const pace_termios *termios_p)
-{
-  PACE_TRACE("pace_cfgetispeed");
-
-  PACE_UNUSED_ARG(termios_p);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_cfsetispeed (pace_termios *termios_p, pace_speed_t speed)
-{
-  PACE_TRACE("pace_cfsetispeed");
-
-  PACE_UNUSED_ARG(termios_p);
-  PACE_UNUSED_ARG(speed);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcdrain (PACE_HANDLE fildes)
-{
-  PACE_TRACE("pace_tcdrain");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcgetattr (PACE_HANDLE fildes, pace_termios *termios_p)
-{
-  PACE_TRACE("pace_tcgetattr");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_UNUSED_ARG(termios_p);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcflow (PACE_HANDLE fildes, int action)
-{
-  PACE_TRACE("pace_tcflow");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_UNUSED_ARG(action);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcflush (PACE_HANDLE fildes, int queue_selector)
-{
-  PACE_TRACE("pace_tcflush");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_UNUSED_ARG(queue_selector);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcsendbreak (PACE_HANDLE fildes, int duration)
-{
-  PACE_TRACE("pace_tcsendbreak");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_UNUSED_ARG(duration);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcsetattr (PACE_HANDLE fildes,
-                int optional_actions,
-                const pace_termios *termios_p)
-{
-  PACE_TRACE("pace_tcsetattr");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_UNUSED_ARG(optional_actions);
-  PACE_UNUSED_ARG(termios_p);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
diff --git a/PACE/pace/vxworks/time.c b/PACE/pace/vxworks/time.c
deleted file mode 100644
index 2074220b3ab..00000000000
--- a/PACE/pace/vxworks/time.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/time.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/time.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/time.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/time.h b/PACE/pace/vxworks/time.h
deleted file mode 100644
index d5f51c59d38..00000000000
--- a/PACE/pace/vxworks/time.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/time.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_TIME_H_VXWORKS
-#define PACE_TIME_H_VXWORKS
-
-#include <time.h>
-#include "pace/signal.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_CLK_TCK CLK_TCK
-#define PACE_CLOCKS_PER_SEC CLOCKS_PER_SEC
-#define PACE_CLOCK_REALTIME CLOCK_REALTIME
-#ifndef PACE_NULL
-#define PACE_NULL NULL
-#endif /* PACE_NULL */
-#define PACE_TIMER_ABSTIME TIMER_ABSTIME
-
-#ifndef PACE_CLOCKID_T
-#define PACE_CLOCKID_T
-# if defined PACE_EMU_CLOCKID_T
-  typedef pace_emu_clockid_t pace_clockid_t;
-# else
-  typedef clockid_t pace_clockid_t;
-# endif /* PACE_LINUX */
-#endif /* PACE_CLOCKID_T */
-
-#ifndef PACE_CLOCK_T
-#define PACE_CLOCK_T
-  typedef clock_t pace_clock_t;
-#endif /* PACE_CLOCK_T */
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T
-  typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-#ifndef PACE_TIMER_T
-#define PACE_TIMER_T
-  typedef timer_t pace_timer_t;
-#endif /* PACE_TIMER_T */
-
-#ifndef PACE_TIME_T
-#define PACE_TIME_T
-  typedef time_t pace_time_t;
-#endif /* PACE_TIME_T */
-
-#ifndef PACE_TM
-#define PACE_TM
-  typedef struct tm pace_tm;
-#endif /* PACE_TM */
-
-#ifndef PACE_TIMESPEC
-#define PACE_TIMESPEC
-  typedef struct timespec pace_timespec;
-#endif /* PACE_TIMESPEC */
-
-#ifndef PACE_ITIMERSPEC
-#define PACE_ITIMERSPEC
-  typedef struct itimerspec pace_itimerspec;
-#endif /* PACE_ITIMERSPEC */
-
-#ifndef PACE_SIGEVENT
-#define PACE_SIGEVENT
-  typedef struct sigevent pace_sigevent;
-#endif /* PACE_SIGEVENT */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_TIME_H_VXWORKS */
diff --git a/PACE/pace/vxworks/time.inl b/PACE/pace/vxworks/time.inl
deleted file mode 100644
index a2ed9715823..00000000000
--- a/PACE/pace/vxworks/time.inl
+++ /dev/null
@@ -1,296 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/time.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/errno.h"
-#include "pace/signal.h"
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_asctime (const pace_tm * time)
-{
-  PACE_TRACE("pace_asctime");
-
-  return asctime (time);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-char *
-pace_asctime_r (const pace_tm * time, char * buf)
-{
-  /*VxWorks 5.3 seems to have POSIX.4 Draft 9 versions of this as well */
-  size_t buflen = 26;
-
-  PACE_TRACE("pace_asctime_r");
-
-  if (asctime_r (time, buf, & buflen) != 0)
-    return (char*) 0;
-  return buf;
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_clock_t
-pace_clock (void)
-{
-  PACE_TRACE("pace_clock");
-
-  return clock ();
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-double
-pace_difftime (pace_time_t time1, pace_time_t time2)
-{
-  PACE_TRACE("pace_difftime");
-
-  return difftime (time1, time2);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_clock_getres (pace_clockid_t clock_id,
-                   pace_timespec * res)
-{
-  PACE_TRACE("pace_clock_getres");
-
-  return clock_getres (clock_id, res);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_clock_gettime (pace_clockid_t clock_id,
-                    pace_timespec * tp)
-{
-  PACE_TRACE("pace_clock_gettime");
-
-  return clock_gettime (clock_id, tp);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_clock_settime (pace_clockid_t clock_id,
-                    const pace_timespec * tp)
-{
-  PACE_TRACE("pace_clock_settime");
-
-  return clock_settime (clock_id, PACE_NONCONST_ARG_CAST (struct timespec *) tp);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_ctime (const pace_time_t * clock)
-{
-  PACE_TRACE("pace_ctime");
-
-  return ctime (clock);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-char *
-pace_ctime_r (const pace_time_t * clock, char * buf)
-{
-  size_t buflen = 26;
-
-  PACE_TRACE("pace_ctime_r");
-
-  return ctime_r (clock, buf, & buflen);
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-pace_tm *
-pace_gmtime (const pace_time_t * clock)
-{
-  PACE_TRACE("pace_gmtime");
-
-  return gmtime (clock);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-pace_tm *
-pace_gmtime_r (const pace_time_t * clock, pace_tm * result)
-{
-  PACE_TRACE("pace_gmtime_r");
-
-  /* VxWorks 5.3 apparently has POSIX.4 Draft 9 versions of these */
-  if (gmtime_r (clock, result) != 0)
-    return (pace_tm*)0;
-  return result;
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-pace_tm *
-pace_localtime (const pace_time_t * clock)
-{
-  PACE_TRACE("pace_localtime");
-
-  return localtime (clock);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-pace_tm *
-pace_localtime_r (const pace_time_t * clock, pace_tm * result)
-{
-  PACE_TRACE("pace_localtime_r");
-
-  /* VxWorks 5.3 apparently has POSIX.4 Draft 9 versions of these */
-  if (localtime_r (clock, result) != 0)
-    return (pace_tm*)0;
-  return result;
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-time_t
-pace_mktime (pace_tm * timeptr)
-{
-  PACE_TRACE("pace_mktime");
-
-  return mktime (timeptr);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_nanosleep (const pace_timespec * rqtp,
-                pace_timespec * rmtp)
-{
-  PACE_TRACE("pace_nanosleep");
-
-  return nanosleep (PACE_NONCONST_ARG_CAST (struct timespec *) rqtp, rmtp);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-size_t
-pace_strftime (char *s, pace_size_t maxsize,
-               const char *format,
-               const pace_tm *timeptr)
-{
-  PACE_TRACE("pace_strftime");
-
-  return strftime (s, maxsize, format, timeptr);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-time_t
-pace_time (pace_time_t * tloc)
-{
-  PACE_TRACE("pace_time");
-
-  return time (tloc);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_timer_create (pace_clockid_t clock_id,
-                   pace_sigevent * evp,
-                   pace_timer_t *timerid)
-{
-  PACE_TRACE("pace_timer_create");
-
-  return timer_create (clock_id, evp, timerid);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_timer_delete (pace_timer_t timerid)
-{
-  PACE_TRACE("pace_timer_delete");
-
-  return timer_delete (timerid);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_timer_getoverrun (pace_timer_t timerid)
-{
-  PACE_TRACE("pace_timer_getoverrun");
-
-  return timer_getoverrun (timerid);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_timer_gettime (pace_timer_t timerid,
-                    pace_itimerspec * value)
-{
-  PACE_TRACE("pace_timer_gettime");
-
-  return timer_gettime (timerid, value);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_timer_settime (pace_timer_t timerid,
-                    int flags,
-                    const pace_itimerspec * value,
-                    pace_itimerspec * ovalue)
-{
-  PACE_TRACE("pace_timer_settime");
-
-  return timer_settime (timerid, flags, PACE_NONCONST_ARG_CAST (struct itimerspec *) value, ovalue);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void
-pace_tzset ()
-{
-  PACE_TRACE("pace_tzset");
-
-  PACE_ERRNO_NO_SUPPORT ();
-  return;
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
diff --git a/PACE/pace/vxworks/times.c b/PACE/pace/vxworks/times.c
deleted file mode 100644
index 51b4dc90dc7..00000000000
--- a/PACE/pace/vxworks/times.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/times.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/sys/times.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/times.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/times.h b/PACE/pace/vxworks/times.h
deleted file mode 100644
index d2ae481355e..00000000000
--- a/PACE/pace/vxworks/times.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/times.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_TIMES_H_VXWORKS
-#define PACE_SYS_TIMES_H_VXWORKS
-
-#include <sys/times.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_CLOCK_T
-#define PACE_CLOCK_T
-typedef int pace_clock_t;
-#endif /* PACE_CLOCK_T */
-
-#ifndef PACE_TMS
-#define PACE_TMS
-typedef struct tms pace_tms;
-#endif /* PACE_TMS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_TIMES_H_VXWORKS */
diff --git a/PACE/pace/vxworks/times.inl b/PACE/pace/vxworks/times.inl
deleted file mode 100644
index c571dd8a2de..00000000000
--- a/PACE/pace/vxworks/times.inl
+++ /dev/null
@@ -1,26 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/times.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pace_clock_t
-pace_times (pace_tms * buffer)
-{
-  PACE_TRACE("pace_times");
-
-  PACE_UNUSED_ARG(buffer);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
diff --git a/PACE/pace/vxworks/types.h b/PACE/pace/vxworks/types.h
deleted file mode 100644
index dbcdcf7ce63..00000000000
--- a/PACE/pace/vxworks/types.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/types.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#include <sys/types.h>
-#include <sched.h>
-#include <semLib.h>
-
-#ifndef PACE_SYS_TYPES_H_VXWORKS
-#define PACE_SYS_TYPES_H_VXWORKS
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PTHREAD_MAX_PRIORITY 255
-#define PTHREAD_MIN_PRIORITY 0
-
-#define MAX_CLEAN_RTN 20
-#define MAX_ONCE_ENTRY 100
-
-#define JOIN_NORMAL 0
-#define JOIN_PENDING 1
-#define JOIN_TERMINATED 2
-#define JOIN_DETATCHED 3
-
-/* This needs to be pretty big for VxWorks according to ACE */
-#define PTHREAD_DEFAULT_STACK_SIZE 64000
-
-/* detach */
-#define PTHREAD_CREATE_DETACHED         0x40    /* = THR_DETACHED */
-#define PTHREAD_CREATE_JOINABLE         0
-/* scope */
-#define PTHREAD_SCOPE_SYSTEM            0x01    /* = THR_BOUND */
-#define PTHREAD_SCOPE_PROCESS           0
-
-/* inherit */
-#define PTHREAD_INHERIT_SCHED           1
-#define PTHREAD_EXPLICIT_SCHED          0
-
-/*
- * Value of process-shared attribute
- */
-#define PTHREAD_PROCESS_SHARED          1       /* = USYNC_PROCESS */
-#define PTHREAD_PROCESS_PRIVATE         0       /* = USYNC_THREAD */
-#define DEFAULT_TYPE                    PTHREAD_PROCESS_PRIVATE
-
-#define PTHREAD_MUTEX_DEFAULT     0x1
-#define PTHREAD_MUTEX_ERRORCHECK  0x2
-#define PTHREAD_MUTEX_NORMAL      0x3
-#define PTHREAD_MUTEX_RECURSIVE   0x4
-
-#define PTHREAD_PRIO_INHERIT      0x10
-#define PTHREAD_PRIO_NONE         0x20
-#define PTHREAD_PRIO_PROTECT      0x30
-
-/*
- * macros - default initializers defined as in synch.h
- * Any change here should be reflected in synch.h.
- */
-
-
-/* cancellation type and state */
-#define PTHREAD_CANCEL_ENABLE           0x00
-#define PTHREAD_CANCEL_DISABLE          0x01
-#define PTHREAD_CANCEL_DEFERRED         0x00
-#define PTHREAD_CANCEL_ASYNCHRONOUS     0x02
-#define PTHREAD_CANCELED                -19
-
-#define PTHREAD_MAXNAME 100
-
-
-  /* For future upgradeability to wchar */
-#ifndef PACE_TCHAR
-#define PACE_TCHAR
-  typedef char pace_tchar;
-#endif /* PACE_TCHAR */
-
-#ifndef PACE_HANDLE
-  typedef int PACE_HANDLE;
-#endif /* PACE_HANDLE */
-
-#ifndef PACE_INVALID_HANDLE
-#define PACE_INVALID_HANDLE -1
-#endif /* PACE_INVALID_HANDLE */
-
-#ifndef PACE_DEV_T
-#define PACE_DEV_T
-  typedef dev_t pace_dev_t;
-#endif /* PACE_DEV_T */
-
-#ifndef PACE_GID_T
-#define PACE_GID_T
-  typedef gid_t pace_gid_t;
-#endif /* PACE_GID_T */
-
-#ifndef PACE_INO_T
-#define PACE_INO_T
-  typedef ino_t pace_ino_t;
-#endif /* PACE_INO_T */
-
-#ifndef PACE_MODE_T
-#define PACE_MODE_T
-  typedef mode_t pace_mode_t;
-#endif /* PACE_MODE_T */
-
-#ifndef PACE_NLINK_T
-#define PACE_NLINK_T
-  typedef nlink_t pace_nlink_t;
-#endif /* PACE_NLINK_T */
-
-#ifndef PACE_OFF_T
-#define PACE_OFF_T
-  typedef off_t pace_off_t;
-#endif /* PACE_OFF_T */
-
-#ifndef PACE_PID_T
-#define PACE_PID_T
-  typedef pid_t pace_pid_t;
-#endif /* PACE_PID_T */
-
-#ifndef PACE_PTHREAD_ATTR_T
-#define PACE_PTHREAD_ATTR_T
-
-  typedef struct _PTHREAD_ATTR
-  {
-    int stacksize;          
-    char name[PTHREAD_MAXNAME];      /*the name */
-    struct sched_param schedule;           /* priority */
-    int scope;              /* options  */
-    int policy;             /* schedule policy */
-    int dstate;             /* detached state */
-  } * pace_pthread_attr_t;
-#endif /* PACE_PTHREAD_ATTR_T */
-
-#ifndef PACE_PTHREAD_CONDATTR_T
-#define PACE_PTHREAD_CONDATTR_T
-  typedef int pace_pthread_condattr_t;
-#endif /* PACE_PTHREAD_CONDATTR_T */
-
-#ifndef PACE_PTHREAD_COND_T
-#define PACE_PTHREAD_COND_T
-  typedef SEM_ID pace_pthread_cond_t;
-#endif /* PACE_PTHREAD_COND_T */
-
-#ifndef PACE_PTHREAD_KEY_T
-#define PACE_PTHREAD_KEY_T
-  typedef int pace_pthread_key_t;
-#endif /* PACE_PTHREAD_KEY_T */
-
-#ifndef PACE_PTHREAD_MUTEXATTR_T
-#define PACE_PTHREAD_MUTEXATTR_T
-
-  typedef struct _PTHREAD_MUX_ATTR
-  {
-    int protocol;   /* priority inheritance */
-    int shared;     /* system or process */
-    int type;       /* mutex type */
-  } * pace_pthread_mutexattr_t;
-#endif /* PACE_PTHREAD_MUTEXATTR_T */
-
-#ifndef PACE_PTHREAD_MUTEX_T
-#define PACE_PTHREAD_MUTEX_T
-  typedef SEM_ID pace_pthread_mutex_t;
-#endif /* PACE_PTHREAD_MUTEX_T */
-
-#ifndef PACE_PTHREAD_ONCE_T
-#define PACE_PTHREAD_ONCE_T
-  typedef int pace_pthread_once_t;
-# define PTHREAD_ONCE_INIT 0
-#endif /* PACE_PTHREAD_ONCE_T */
-
-#ifndef PACE_PTHREAD_T
-#define PACE_PTHREAD_T
-# define PTHREAD_KEYS_MAX 100
-# define _USER_SPARE4 spare4
-  typedef struct _FUNC_HANDLE 
-  {
-    void (*routine)(void *);
-    void * args;
-  } funcHandle;
-
-  typedef struct _ONCE_FUNC
-  {
-    int once_ctl;
-    void (*init_routine)(void);
-  } pthread_once_e;
-
-  typedef struct _PTHREAD_T
-  {
-    unsigned int tid;
-    funcHandle cleanupRtn[MAX_CLEAN_RTN];
-    int rtnCount;
-    pthread_once_e onceList[MAX_ONCE_ENTRY];
-    int onceCount;     /* once variable count */
-    int stateflag;     /* cancel state */
-    int canceltype;    /* cancel type */
-    int detachflag;    /* detached state */
-    int joinstate;     /* join state */
-    SEM_ID joinSem;    /* join semaphore */
-    void * joinvalue;  /* pass value */
-    struct _PTHREAD_T * jointhread;    /* the calling thread */
-    void * keyvaluelist[PTHREAD_KEYS_MAX];
-  } * pace_pthread_t;
-#endif /* PACE_PTHREAD_T */
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T
-  typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-#ifndef PACE_SSIZE_T
-#define PACE_SSIZE_T
-  typedef ssize_t pace_ssize_t;
-#endif /* PACE_SSIZE_T */
-
-#ifndef PACE_UID_T
-#define PACE_UID_T
-  typedef uid_t pace_uid_t;
-#endif /* PACE_UID_T */
-
-#ifndef PACE_PTHREAD_QUEUE_T
-#define PACE_PTHREAD_QUEUE_T
-  struct _PTHREAD_QUEUE_ENTRY
-  {
-    int status;
-    pace_pthread_t pthread;
-    struct _PTHREAD_QUEUE_ENTRY * next;
-  };
-
-  typedef struct _PTHREAD_QUEUE_ENTRY pthread_q_entry;
-
-# define PTHEAD_QUEUE_MAX_LEN 100
-
-  struct _PTHREAD_KEY_ENTRY
-  {
-    int index;
-    int valid;
-    void (*destructor)(void*);
-  };
-
-  typedef struct _PTHREAD_KEY_ENTRY pthread_key_entry;
-#endif /* PACE_PTHREAD_QUEUE_T */
-
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_TYPES_H_VXWORKS */
diff --git a/PACE/pace/vxworks/unistd.c b/PACE/pace/vxworks/unistd.c
deleted file mode 100644
index 16234ef66fb..00000000000
--- a/PACE/pace/vxworks/unistd.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/unistd.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/unistd.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/unistd.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/unistd.h b/PACE/pace/vxworks/unistd.h
deleted file mode 100644
index 19ca710618f..00000000000
--- a/PACE/pace/vxworks/unistd.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/unistd.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_UNISTD_H_VXWORKS
-#define PACE_UNISTD_H_VXWORKS
-
-#include "pace/sys/types.h"
-#include <unistd.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_F_OK F_OK
-#ifndef PACE_NULL
-# define PACE_NULL NULL
-#endif /* PACE_NULL */
-#define PACE_R_OK R_OK
-#define PACE_SEEK_CUR SEEK_CUR
-#define PACE_SEEK_END SEEK_END
-#define PACE_SEEK_SET SEEK_SET
-#define PACE_STDERR_FILENO STDERR_FILENO
-#define PACE_STDIN_FILENO STDIN_FILENO
-#define PACE_STDOUT_FILENO STDOUT_FILENO
-#define PACE_W_OK W_OK
-#define PACE_X_OK X_OK
-
-/* _POSIX _PC _SC Macros need to go here */
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T
-typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-#ifndef PACE_SSIZE_T
-#define PACE_SSIZE_T
-typedef ssize_t pace_ssize_t;
-#endif /* PACE_SSIZE_T */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_UNISTD_H_VXWORKS */
diff --git a/PACE/pace/vxworks/unistd.inl b/PACE/pace/vxworks/unistd.inl
deleted file mode 100644
index eb4c1ac675f..00000000000
--- a/PACE/pace/vxworks/unistd.inl
+++ /dev/null
@@ -1,601 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/unistd.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include <unistd.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-void
-pace__exit (int status)
-{
-  PACE_TRACE("pace__exit");
-
-  exit (status);
-  return;
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_access (const char * path, int amode)
-{
-  PACE_TRACE("pace_access");
-
-  PACE_UNUSED_ARG(path);
-  PACE_UNUSED_ARG(amode);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-unsigned int
-pace_alarm (unsigned int seconds)
-{
-  PACE_TRACE("pace_alarm");
-
-  PACE_UNUSED_ARG(seconds);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_chdir (const char * path)
-{
-  PACE_TRACE("pace_chdir");
-
-  return chdir (PACE_NONCONST_ARG_CAST (char *) path);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FA_UOF)
-PACE_INLINE
-int
-pace_chown (const char * path, uid_t owner, pace_gid_t group)
-{
-  PACE_TRACE("pace_chown");
-
-  PACE_UNUSED_ARG(path);
-  PACE_UNUSED_ARG(owner);
-  PACE_UNUSED_ARG(group);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FA_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_close (PACE_HANDLE fildes)
-{
-  PACE_TRACE("pace_close");
-
-  return close (fildes);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-PACE_HANDLE
-pace_dup (PACE_HANDLE fildes)
-{
-  PACE_TRACE("pace_dup");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-PACE_HANDLE
-pace_dup2 (PACE_HANDLE fildes, PACE_HANDLE fildes2)
-{
-  PACE_TRACE("pace_dup2");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_UNUSED_ARG(fildes2);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-int
-pace_execv (const char * path,
-            char * const argv[])
-{
-  PACE_TRACE("pace_execv");
-
-  PACE_UNUSED_ARG(path);
-  PACE_UNUSED_ARG(argv);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-  /* if successful, this operation does NOT return */
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-int
-pace_execve (const char * path,
-             char * const argv[],
-             char * const envp[])
-{
-  PACE_TRACE("pace_execve");
-
-  PACE_UNUSED_ARG(path);
-  PACE_UNUSED_ARG(argv);
-  PACE_UNUSED_ARG(envp);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-  /* if successful, this operation does NOT return */
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-int
-pace_execvp (const char * file,
-             char * const argv[])
-{
-  PACE_TRACE("pace_execvp");
-
-  PACE_UNUSED_ARG(file);
-  PACE_UNUSED_ARG(argv);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-  /* if successful, this operation does NOT return */
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_fdatasync (PACE_HANDLE fildes)
-{
-  PACE_TRACE("pace_fdatasync");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pid_t
-pace_fork ()
-{
-  PACE_TRACE("pace_fork");
-
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-long
-pace_fpathconf (PACE_HANDLE fildes, int name)
-{
-  PACE_TRACE("pace_fpathconf");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_UNUSED_ARG(name);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_fsync (PACE_HANDLE fildes)
-{
-  PACE_TRACE("pace_fsync");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_ftruncate (PACE_HANDLE fildes, pace_off_t length)
-{
-  PACE_TRACE("pace_ftruncate");
-
-  return ftruncate (fildes, length);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-char *
-pace_getcwd (char * buf, size_t size)
-{
-  PACE_TRACE("pace_getcwd");
-
-  return getcwd (buf, size);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-uid_t
-pace_getegid ()
-{
-  PACE_TRACE("pace_getegid");
-
-  /* getegid() is not supported:  just one user anyway */
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_UGR_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-uid_t
-pace_geteuid ()
-{
-  PACE_TRACE("pace_geteuid");
-
-  /* geteuid() is not supported:  just one user anyway */
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_UGR_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-int
-pace_getgroups (int gidsetsize, pace_gid_t grouplist[])
-{
-  PACE_TRACE("pace_getgroups");
-
-  /* getgroups() is not supported:  just one user anyway */
-  PACE_UNUSED_ARG(gidsetsize);
-  PACE_UNUSED_ARG(grouplist);
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-uid_t
-pace_getgid ()
-{
-  PACE_TRACE("pace_getgid");
-
-  /* getgid() is not supported:  just one user anyway */
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_UGR_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-char*
-pace_getlogin ()
-{
-  PACE_TRACE("pace_getlogin");
-
-  PACE_ERRNO_NO_SUPPORT_RETURN ((char *) 0);
-}
-#endif /* PACE_HAS_POSIX_UGR_UOF */
-
-#if (PACE_HAS_POSIX_UGR_UOF)
-PACE_INLINE
-int
-pace_getlogin_r (char * name, size_t namesize)
-{
-  PACE_TRACE("pace_getlogin_r");
-
-  PACE_UNUSED_ARG(name);
-  PACE_UNUSED_ARG(namesize);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_UGR_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-pid_t
-pace_getpgrp ()
-{
-  PACE_TRACE("pace_getpgrp");
-
-  /* getpgrp() is not supported:  just one user anyway */
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pid_t
-pace_getpid ()
-{
-  PACE_TRACE("pace_getpid");
-
-  /* getpid() is not supported:  just one user anyway */
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pid_t
-pace_getppid ()
-{
-  PACE_TRACE("pace_getppid");
-
-  /* getppid() is not supported:  just one user anyway */
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-uid_t
-pace_getuid ()
-{
-  PACE_TRACE("pace_getuid");
-
-  /* getuid() is not supported:  just one user anyways */
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_isatty (int fildes)
-{
-  PACE_TRACE("pace_isatty");
-
-  return isatty (fildes);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_link (const char * existing, const char * new_link)
-{
-  PACE_TRACE("pace_link");
-
-  PACE_UNUSED_ARG(existing);
-  PACE_UNUSED_ARG(new_link);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-pace_off_t
-pace_lseek (PACE_HANDLE fildes, pace_off_t offset, int whence)
-{
-  PACE_TRACE("pace_lseek");
-
-  return lseek (fildes, offset, whence);
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-long
-pace_pathconf (const char * path, int name)
-{
-  PACE_TRACE("pace_pathconf");
-
-  PACE_UNUSED_ARG(path);
-  PACE_UNUSED_ARG(name);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_pause ()
-{
-  PACE_TRACE("pace_pause");
-
-  return pause ();
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_P_UOF)
-PACE_INLINE
-int
-pace_pipe (PACE_HANDLE fildes[2])
-{
-  PACE_TRACE("pace_pipe");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_P_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-ssize_t
-pace_read (PACE_HANDLE fildes, void * buf, size_t nbyte)
-{
-  PACE_TRACE("pace_read");
-
-  return read (fildes, PACE_NONCONST_ARG_CAST (char *) buf, nbyte);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_rmdir (const char * path)
-{
-  PACE_TRACE("pace_rmdir");
-
-  return rmdir (PACE_NONCONST_ARG_CAST (char *) path);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-int
-pace_setgid (pace_gid_t gid)
-{
-  PACE_TRACE("pace_setgid");
-
-  /* setuid() is not supported:  just one user anyways */
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_JC_UOF)
-PACE_INLINE
-int
-pace_setpgid (pid_t pid, pid_t pgid)
-{
-  PACE_TRACE("pace_setpgid");
-
-  /* setpgid() is not supported:  just one user anyways */
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_JC_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-pid_t
-pace_setsid ()
-{
-  PACE_TRACE("pace_setsid");
-
-  /* setsid() is not supported:  just one user anyways */
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-int
-pace_setuid (uid_t uid)
-{
-  PACE_TRACE("pace_setuid");
-
-  /* setuid() is not supported:  just one user anyways */
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-unsigned int
-pace_sleep (unsigned int seconds)
-{
-  struct timespec rqtp;
-  /* Initializer doesn't work with Green Hills 1.8.7 */
-
-  PACE_TRACE("pace_sleep");
-
-  rqtp.tv_sec = seconds;
-  rqtp.tv_nsec = 0L;
-  return nanosleep (&rqtp, 0);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_SP_UOF)
-PACE_INLINE
-long
-pace_sysconf (int name)
-{
-  PACE_TRACE("pace_sysconf");
-
-  PACE_UNUSED_ARG(name);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SP_UOF */
-
-#if (PACE_HAS_POSIX_JC_UOF)
-PACE_INLINE
-pid_t
-pace_tcgetpgrp (PACE_HANDLE fildes)
-{
-  PACE_TRACE("pace_tcgetpgrp");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_JC_UOF */
-
-#if (PACE_HAS_POSIX_JC_UOF)
-PACE_INLINE
-int
-pace_tcsetpgrp (PACE_HANDLE fildes, pid_t pgrp_id)
-{
-  PACE_TRACE("pace_tcsetpgrp");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_UNUSED_ARG(pgrp_id);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_JC_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-char *
-pace_ttyname (PACE_HANDLE fildes)
-{
-  PACE_TRACE("pace_ttyname");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_ERRNO_NO_SUPPORT_RETURN ((char *) 0);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_ttyname_r (PACE_HANDLE fildes,
-                char * name,
-                size_t namesize)
-{
-  PACE_TRACE("pace_ttyname_r");
-
-  PACE_UNUSED_ARG(fildes);
-  PACE_UNUSED_ARG(name);
-  PACE_UNUSED_ARG(namesize);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_unlink (const char * path)
-{
-  PACE_TRACE("pace_unlink");
-
-  return unlink (PACE_NONCONST_ARG_CAST (char *) path);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-ssize_t
-pace_write (PACE_HANDLE fildes, const void * buf, size_t nbyte)
-{
-  PACE_TRACE("pace_write");
-
-  return write (fildes, PACE_NONCONST_ARG_CAST (char *) buf, nbyte);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
diff --git a/PACE/pace/vxworks/utime.c b/PACE/pace/vxworks/utime.c
deleted file mode 100644
index fc770964337..00000000000
--- a/PACE/pace/vxworks/utime.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/utime.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/utime.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/utime.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/utime.h b/PACE/pace/vxworks/utime.h
deleted file mode 100644
index 144ca29d567..00000000000
--- a/PACE/pace/vxworks/utime.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/utime.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_UTIME_H_VXWORKS
-#define PACE_UTIME_H_VXWORKS
-
-#include "pace/sys/types.h"
-#include <utime.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_UTIMBUF
-#define PACE_UTIMBUF
-typedef struct utimbuf pace_utimbuf;
-#endif /* PACE_UTIMBUF */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_UTIME_H_VXWORKS */
diff --git a/PACE/pace/vxworks/utime.inl b/PACE/pace/vxworks/utime.inl
deleted file mode 100644
index 28c38097d68..00000000000
--- a/PACE/pace/vxworks/utime.inl
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/utime.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_utime (const char * path,
-            const pace_utimbuf * times)
-{
-  PACE_TRACE("pace_utime");
-
-  return utime (PACE_NONCONST_ARG_CAST (char *) path,
-                PACE_NONCONST_ARG_CAST (pace_utimbuf *) times);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
diff --git a/PACE/pace/vxworks/utsname.c b/PACE/pace/vxworks/utsname.c
deleted file mode 100644
index be5b4a33584..00000000000
--- a/PACE/pace/vxworks/utsname.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/utsname.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/sys/utsname.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/utsname.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/utsname.h b/PACE/pace/vxworks/utsname.h
deleted file mode 100644
index 6773129303a..00000000000
--- a/PACE/pace/vxworks/utsname.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/utsname.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_UTSNAME_H_VXWORKS
-#define PACE_SYS_UTSNAME_H_VXWORKS
-
-#include "pace/stddef.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_UTSNAME
-#define PACE_UTSNAME
-# if !defined (SYS_NMLN)
-#   define SYS_NMLN 257
-# endif /* SYS_NMLN */
-# if !defined (_SYS_NMLN)
-#   define _SYS_NMLN SYS_NMLN
-# endif /* _SYS_NMLN */
-typedef struct
-{
-  pace_tchar sysname[_SYS_NMLN];
-  pace_tchar nodename[_SYS_NMLN];
-  pace_tchar release[_SYS_NMLN];
-  pace_tchar version[_SYS_NMLN];
-  pace_tchar machine[_SYS_NMLN];
-} pace_utsname;
-#endif /* PACE_UTSNAME */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_UTSNAME_H_VXWORKS */
diff --git a/PACE/pace/vxworks/utsname.inl b/PACE/pace/vxworks/utsname.inl
deleted file mode 100644
index 0925ebfef1f..00000000000
--- a/PACE/pace/vxworks/utsname.inl
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/utsname.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/string.h"
-#include <hostLib.h>
-#include <sysLib.h>
-
-#if (PACE_HAS_POSIX_SP_UOF)
-PACE_INLINE
-int
-pace_uname (pace_utsname * name)
-{
-  size_t maxnamelen = sizeof name->nodename;
-
-  PACE_TRACE("pace_uname");
-
-  pace_strcpy (name->sysname, "VxWorks");
-#if (PACE_VXWORKS == 531)
-  pace_strcpy (name->release, "5.3.1");
-#elif (PACE_VXWORKS == 540)
-  pace_strcpy (name->release, "5.4.0");
-#endif /* PACE_VXWORKS != 531 */
-  pace_strcpy (name->version, sysBspRev ());
-  pace_strcpy (name->machine, sysModel ());
- 
-  return gethostname (name->nodename, maxnamelen);
-}
-#endif /* PACE_HAS_POSIX_SP_UOF */
diff --git a/PACE/pace/vxworks/wait.c b/PACE/pace/vxworks/wait.c
deleted file mode 100644
index 2be98112c5f..00000000000
--- a/PACE/pace/vxworks/wait.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/wait.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/sys/wait.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/vxworks/wait.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/vxworks/wait.h b/PACE/pace/vxworks/wait.h
deleted file mode 100644
index 1e588452e1f..00000000000
--- a/PACE/pace/vxworks/wait.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/wait.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_WAIT_H_VXWORKS
-#define PACE_WAIT_H_VXWORKS
-
-#include "pace/sys/types.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_WEXITSTATUS WEXITSTATUS
-#define PACE_WIFEXITED WIFEXITED
-#define PACE_WIFSIGNALED WISIGNALED
-#define PACE_WIFSTOPPED WIFSTOPPED
-#define PACE_WNOHANG WNOHANG
-#define PACE_WSTOPSIG WSTOPSIG
-#define PACE_WTERMSIG WTERMSIG
-#define PACE_WUNTRACED WUNTRACED
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_WAIT_H_VXWORKS */
diff --git a/PACE/pace/vxworks/wait.inl b/PACE/pace/vxworks/wait.inl
deleted file mode 100644
index 1aee5137b7f..00000000000
--- a/PACE/pace/vxworks/wait.inl
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/vxworks/wait.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include <sys/wait.h>
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pid_t
-pace_wait (int * statloc)
-{
-  PACE_TRACE("pace_wait");
-
-  PACE_UNUSED_ARG (statloc);
-  PACE_ERRNO_NO_SUPPORT_RETURN (0);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pid_t
-pace_waitpid (pid_t pid, int * statloc, int options)
-{
-  PACE_TRACE("pace_waitpid");
-
-  PACE_UNUSED_ARG (pid);
-  PACE_UNUSED_ARG (statloc);
-  PACE_UNUSED_ARG (options);
-  PACE_ERRNO_NO_SUPPORT_RETURN (0);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
diff --git a/PACE/pace/win32/README b/PACE/pace/win32/README
deleted file mode 100644
index d46fa4c9dc3..00000000000
--- a/PACE/pace/win32/README
+++ /dev/null
@@ -1 +0,0 @@
-WIN32 dir
diff --git a/PACE/pace/win32/TODO b/PACE/pace/win32/TODO
deleted file mode 100644
index 659d8656d19..00000000000
--- a/PACE/pace/win32/TODO
+++ /dev/null
@@ -1,29 +0,0 @@
-----------------------------------------------------------------------
-
-	* Emulation:
-	  - pthreads
-	  - dirent
-
-	* ACE_wrappers/PACE/docs/PACE_POSIX_support.txt:
-
-	  Update this file as emulation occurs.
-
-	* Build ACE with ACE_HAS_PACE
-
-----------------------------------------------------------------------
-
-	* pthreads: Do we need to define this for win32?
-
-	  OS.cpp:2769 => PACE_PTHREAD_STACK_MIN
-	  OS.cpp:2798 => PACE_PTHREAD_CREATE_JOINABLE
-	  OS.cpp:2801 => PACE_PTHREAD_CREATE_DETACHED
-
-----------------------------------------------------------------------
-
-        * get rid of the temp macros / junk in config/constants.h
-
-----------------------------------------------------------------------
-
-        * add MFC support to pthread.c
-
-----------------------------------------------------------------------
diff --git a/PACE/pace/win32/aio.c b/PACE/pace/win32/aio.c
deleted file mode 100644
index 25c7427877e..00000000000
--- a/PACE/pace/win32/aio.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/aio.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/aio.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/aio.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/win32/aio.h b/PACE/pace/win32/aio.h
deleted file mode 100644
index 764372de642..00000000000
--- a/PACE/pace/win32/aio.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/aio.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_AIO_H_WIN32
-#define PACE_AIO_H_WIN32
-
-#include "pace/time.h"
-#include "pace/signal.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_AIO_ALLDONE AIO_ALLDONE
-#define PACE_AIO_CANCELED AIO_CANCELED
-#define PACE_AIO_NOCANCELED AIO_NOTCANCELED
-#define PACE_LIO_NOP LIO_NOP
-#define PACE_LIO_NOWAIT LIO_NOWAIT
-#define PACE_LIO_READ LIO_READ
-#define PACE_LIO_WAIT LIO_WAIT
-#define PACE_LIO_WRITE LIO_WRITE
-
-#ifndef PACE_AIOCB
-#define PACE_AIOCB
-typedef struct aiocb pace_aiocb;
-#endif /* PACE_AIOCB */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_AIO_H_WIN32 */
diff --git a/PACE/pace/win32/aio.inl b/PACE/pace/win32/aio.inl
deleted file mode 100644
index 1c1335857f0..00000000000
--- a/PACE/pace/win32/aio.inl
+++ /dev/null
@@ -1,106 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/aio.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_cancel (PACE_HANDLE fildes, pace_aiocb * aiocbp)
-{
-  PACE_UNUSED_ARG (fildes);
-  PACE_UNUSED_ARG (aiocbp);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_error (const pace_aiocb * aiocbp)
-{
-  PACE_UNUSED_ARG (aiocbp);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_fsync (int op, pace_aiocb * aiocbp)
-{
-  PACE_UNUSED_ARG (op);
-  PACE_UNUSED_ARG (aiocbp);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_read (pace_aiocb * aiocbp)
-{
-  PACE_UNUSED_ARG (aiocbp);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_return (pace_aiocb * aiocbp)
-{
-  PACE_UNUSED_ARG (aiocbp);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_suspend (const pace_aiocb * const list[],
-                  int nent,
-                  const pace_timespec * timeout)
-{
-  PACE_UNUSED_ARG (list);
-  PACE_UNUSED_ARG (nent);
-  PACE_UNUSED_ARG (timeout);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_aio_write (pace_aiocb * aiocbp)
-{
-  PACE_UNUSED_ARG (aiocbp);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_lio_listio (int mode,
-                 pace_aiocb * const list[],
-                 int nent,
-                 pace_sigevent * sig)
-{
-  PACE_UNUSED_ARG (mode);
-  PACE_UNUSED_ARG (list);
-  PACE_UNUSED_ARG (nent);
-  PACE_UNUSED_ARG (sig);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/win32/assert.c b/PACE/pace/win32/assert.c
deleted file mode 100644
index 7620a619828..00000000000
--- a/PACE/pace/win32/assert.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/assert.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/assert.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/assert.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/win32/assert.h b/PACE/pace/win32/assert.h
deleted file mode 100644
index af0c8dac758..00000000000
--- a/PACE/pace/win32/assert.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/assert.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * =========================================================================== */
-
-#ifndef PACE_ASSERT_H_WIN32
-#define PACE_ASSERT_H_WIN32
-
-#include <assert.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-# if defined (PACE_HAS_CPLUSPLUS)
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_ASSERT_H_WIN32 */
diff --git a/PACE/pace/win32/assert.inl b/PACE/pace/win32/assert.inl
deleted file mode 100644
index 00796cb2f26..00000000000
--- a/PACE/pace/win32/assert.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/assert.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
diff --git a/PACE/pace/win32/ctype.c b/PACE/pace/win32/ctype.c
deleted file mode 100644
index dd3be4098b0..00000000000
--- a/PACE/pace/win32/ctype.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/ctype.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/ctype.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/ctype.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/win32/ctype.h b/PACE/pace/win32/ctype.h
deleted file mode 100644
index 9025f3de909..00000000000
--- a/PACE/pace/win32/ctype.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/ctype.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_CTYPE_H_WIN32
-#define PACE_CTYPE_H_WIN32
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_CTYPE_H_WIN32 */
diff --git a/PACE/pace/win32/ctype.inl b/PACE/pace/win32/ctype.inl
deleted file mode 100644
index 60f692f2c12..00000000000
--- a/PACE/pace/win32/ctype.inl
+++ /dev/null
@@ -1,133 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/ctype.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include <ctype.h>
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isalnum (int c)
-{
-  return isalnum (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isalpha (int c)
-{
-  return isalpha (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_iscntrl (int c)
-{
-  return iscntrl (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isdigit (int c)
-{
-  return isdigit (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isgraph (int c)
-{
-  return isgraph (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_islower (int c)
-{
-  return islower (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isprint (int c)
-{
-  return isprint (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_ispunct (int c)
-{
-  return ispunct (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isspace (int c)
-{
-  return isspace (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isupper (int c)
-{
-  return isupper (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_isxdigit (int c)
-{
-  return isxdigit (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_tolower (int c)
-{
-  return tolower (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_toupper (int c)
-{
-  return toupper (c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
diff --git a/PACE/pace/win32/dirent.c b/PACE/pace/win32/dirent.c
deleted file mode 100644
index b67213012f0..00000000000
--- a/PACE/pace/win32/dirent.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/dirent.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/dirent.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/dirent.inl"
-#endif /* ! PACE_HAS_INLINE */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-int
-closedir (PACE_DIR * dirp)
-{
-  if (dirp->current_handle_ != (void*)0)
-    {
-      FindClose (dirp->current_handle_);
-    }
-  dirp->current_handle_ = (void*)0;
-  dirp->started_reading_ = 0;
-  return 1;
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_DIR *
-opendir (const char * dirname)
-{
-  PACE_DIR * dirp = (PACE_DIR*) pace_malloc (sizeof (PACE_DIR));
-  const pace_size_t dir_size = pace_strlen (dirname) + 1;
-  dirp->directory_name_ = (char*) pace_malloc (dir_size);
-  pace_strcpy (dirp->directory_name_, dirname);
-  dirp->current_handle_ = PACE_INVALID_HANDLE;
-  dirp->started_reading_ = 0;
-  return dirp;
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-pace_dirent *
-readdir (PACE_DIR * dirp)
-{
-  if (dirp->started_reading_)
-    {
-      dirp->current_handle_ = FindFirstFile (dirp->directory_name_,
-                                             &(dirp->fdata_));
-      if (dirp->current_handle_ != PACE_INVALID_HANDLE)
-        {
-          FindClose (dirp->current_handle_);
-          dirp->current_handle_ = PACE_INVALID_HANDLE;
-        }
-      else /* Skip "." and ".." */
-        {
-          int retval = 1;
-          while (*(dirp->fdata_.cFileName) == '.'
-                 && retval
-                 && dirp->fdata_.dwFileAttributes == FILE_ATTRIBUTE_DIRECTORY)
-            {
-              retval = FindNextFile (dirp->current_handle_,
-                                     &(dirp->fdata_));
-            }
-          if (retval == 0)
-            {
-              dirp->current_handle_ = PACE_INVALID_HANDLE;
-            }
-        }
-      dirp->started_reading_ = 1;
-    }
-  else
-    {
-      int retval = FindNextFile (dirp->current_handle_,
-                                 &(dirp->fdata_));
-      if (retval == 0)
-        {
-          dirp->current_handle_ = PACE_INVALID_HANDLE;
-        }
-    }
-
-  if (dirp->current_handle_ != PACE_INVALID_HANDLE)
-    {
-      dirp->dirent_.d_name = dirp->fdata_.cFileName;
-      return &(dirp->dirent_);
-    }
-  else
-    {
-      return (pace_dirent*)0;
-    }
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
diff --git a/PACE/pace/win32/dirent.h b/PACE/pace/win32/dirent.h
deleted file mode 100644
index 9a379a35a12..00000000000
--- a/PACE/pace/win32/dirent.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/dirent.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_DIRENT_H_WIN32
-#define PACE_DIRENT_H_WIN32
-
-#include "pace/sys/types.h"
-#include "windows.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_DIRENT_T
-#define PACE_DIRENT_T
-
-  typedef struct /* dirent */ {
-    unsigned short d_ino;
-    unsigned short d_off;
-    unsigned short d_reclen;
-    char * d_name;
-  } pace_dirent;
-
-#endif /* PACE_DIRENT_T */
-
-#ifndef PACE_DIR_T
-#define PACE_DIR_T
-
-  typedef WIN32_FIND_DATA PACE_TEXT_WIN32_FIND_DATA;
-
-  typedef struct /* DIR */ {
-    char * directory_name_;
-    // The name of the directory we are looking into
-    HANDLE current_handle_;
-    // Remember the handle between calls.
-    pace_dirent dirent_;
-    // The struct for the results
-    PACE_TEXT_WIN32_FIND_DATA fdata_;
-    // The struct for intermediate results.
-    int started_reading_;
-    // A flag to remember if we started reading already.
-  } PACE_DIR;
-
-#endif /* PACE_DIR_T */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-  int closedir (PACE_DIR * dirp);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-  PACE_DIR * opendir (const char * dirname);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-  pace_dirent * readdir (PACE_DIR * dirp);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_DIRENT_H_WIN32 */
diff --git a/PACE/pace/win32/dirent.inl b/PACE/pace/win32/dirent.inl
deleted file mode 100644
index edf5071c55d..00000000000
--- a/PACE/pace/win32/dirent.inl
+++ /dev/null
@@ -1,68 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/dirent.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/string.h"
-#include "pace/stdlib.h"
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_closedir (PACE_DIR * dirp)
-{
-  return closedir (dirp);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-PACE_DIR *
-pace_opendir (const char * dirname)
-{
-  return opendir (dirname);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-pace_dirent *
-pace_readdir (PACE_DIR * dirp)
-{
-  return readdir (dirp);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-int
-pace_readdir_r (PACE_DIR * dirp,
-                pace_dirent * entry,
-                pace_dirent ** result)
-{
-  PACE_UNUSED_ARG (dirp);
-  PACE_UNUSED_ARG (entry);
-  PACE_UNUSED_ARG (result);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-void
-pace_rewinddir (PACE_DIR * dirp)
-{
-  PACE_UNUSED_ARG (dirp);
-  PACE_ERRNO_NO_SUPPORT ();
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
diff --git a/PACE/pace/win32/errno.h b/PACE/pace/win32/errno.h
deleted file mode 100644
index 7e35b76b566..00000000000
--- a/PACE/pace/win32/errno.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* $Id$
-
-* ============================================================================
-*
-* = LIBRARY
-*    pace
-*
-* = FILENAME
-*    pace/win32/errno.h
-*
-* = AUTHOR
-*    John Heitmann
-*
-* =========================================================================== */
-
-
-#ifndef PACE_ERRNO_H_WIN32
-#define PACE_ERRNO_H_WIN32
-
-#include <errno.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#if !defined (ENOSYS)
-# define ENOSYS EFAULT   /* Operation not supported or unknown error. */
-#endif /* !ENOSYS */
-
-#if !defined (ENOTSUP)
-# define ENOTSUP ENOSYS  /* Operation not supported. */
-#endif /* !ENOTSUP */
-
-#define PACE_E2BIG E2BIG
-#define PACE_EACCES EACCES
-#define PACE_EAGAIN EAGAIN
-#define PACE_EBADF EBADF
-#define PACE_EBADMSG
-#define PACE_EBUSY EBUSY
-#define PACE_ECANCELED ECANCELED
-#define PACE_ECHILD ECHILD
-#define PACE_EDEADLK EDEADLK
-#define PACE_EDOM EDOM
-#define PACE_EEXIST EEXIST
-#define PACE_EFAULT EFAULT
-#define PACE_EFBIG EFBIG
-#define PACE_EINPROGRESS EINPROGRESS
-#define PACE_EINTR EINTR
-#define PACE_EINVAL EINVAL
-#define PACE_EIO EIO
-#define PACE_EISDIR EISDIR
-#define PACE_EMFILE EMFILE
-#define PACE_EMLINK EMLINK
-#define PACE_EMSGSIZE EMSGSIZE
-#define PACE_EENAMETOOLONG ENAMETOOLONG
-#define PACE_ENFILE ENFILE
-#define PACE_ENODEV ENODEV
-#define PACE_ENOENT ENOENT
-#define PACE_ENOEXEC ENOEXEC
-#define PACE_ENOLCK ENOLCK
-#define PACE_ENOMEM ENOMEM
-#define PACE_ENOSPC ENOSPC
-#define PACE_ENOSYS ENOSYS
-#define PACE_ENOTDIR ENOTDIR
-#define PACE_ENOTEMPTY ENOTEMPTY
-#define PACE_ENOTSUP ENOTSUP
-#define PACE_ENOTTY ENOTTY
-#define PACE_ENXIO ENXIO
-#define PACE_EPERM EPERM
-#define PACE_EPIPE EPIPE
-#define PACE_ERANGE ERANGE
-#define PACE_EROFS EROFS
-#define PACE_ESPIPE ESPIPE
-#define PACE_ESRCH ESRCH
-#define PACE_ETIMEDOUT ETIMEDOUT
-#define PACE_EXDEV EXDEV
-
-#define pace_errno errno
-
-# if defined (PACE_HAS_CPLUSPLUS)
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_ERRNO_H_WIN32 */
diff --git a/PACE/pace/win32/fcntl.c b/PACE/pace/win32/fcntl.c
deleted file mode 100644
index 5fe6e12bfb0..00000000000
--- a/PACE/pace/win32/fcntl.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/fcntl.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/fcntl.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/fcntl.inl"
-#endif /* ! PACE_HAS_INLINE */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-#include <windows.h>
-#include <wtypes.h>
-int
-pace_win32_creat (const char * path, pace_mode_t mode)
-{
-  /* Emulation is still buggy! DO NOT YET USE! */
-
-  DWORD access = GENERIC_READ,
-	creation = OPEN_EXISTING,
-	flags = 0,
-	shared_mode = FILE_SHARE_READ | FILE_SHARE_WRITE;
-
-  HANDLE h = (void*)0;
-
-  if (PACE_BIT_ENABLED (mode, O_WRONLY))
-    {
-      access = GENERIC_WRITE;
-    }
-  else if (PACE_BIT_ENABLED (mode, O_RDWR))
-    {
-      access = GENERIC_READ | GENERIC_WRITE;
-    }
-
-  if ((mode & (_O_CREAT | _O_EXCL)) == (_O_CREAT | _O_EXCL))
-    {
-      creation = CREATE_NEW;
-    }
-  else if ((mode & (_O_CREAT | _O_TRUNC)) == (_O_CREAT | _O_TRUNC))
-    {
-      creation = CREATE_ALWAYS;
-    }
-  else if (PACE_BIT_ENABLED (mode, _O_CREAT))
-    {
-      creation = OPEN_ALWAYS;
-    }
-  else if (PACE_BIT_ENABLED (mode, _O_TRUNC))
-    {
-      creation = TRUNCATE_EXISTING;
-    }
-
-  if (PACE_BIT_ENABLED (mode, _O_TEMPORARY))
-    {
-      flags |= FILE_FLAG_DELETE_ON_CLOSE | FILE_ATTRIBUTE_TEMPORARY;
-    }
-
-  if (PACE_BIT_ENABLED (mode, FILE_FLAG_WRITE_THROUGH))
-    {
-      flags |= FILE_FLAG_WRITE_THROUGH;
-    }
-  if (PACE_BIT_ENABLED (mode, FILE_FLAG_OVERLAPPED))
-    {
-      flags |= FILE_FLAG_OVERLAPPED;
-    }
-  if (PACE_BIT_ENABLED (mode, FILE_FLAG_NO_BUFFERING))
-    {
-      flags |= FILE_FLAG_NO_BUFFERING;
-    }
-  if (PACE_BIT_ENABLED (mode, FILE_FLAG_RANDOM_ACCESS))
-    {
-      flags |= FILE_FLAG_RANDOM_ACCESS;
-    }
-  if (PACE_BIT_ENABLED (mode, FILE_FLAG_SEQUENTIAL_SCAN))
-    {
-      flags |= FILE_FLAG_SEQUENTIAL_SCAN;
-    }
-  if (PACE_BIT_ENABLED (mode, FILE_FLAG_DELETE_ON_CLOSE))
-    {
-      flags |= FILE_FLAG_DELETE_ON_CLOSE;
-    }
-  if (PACE_BIT_ENABLED (mode, FILE_FLAG_BACKUP_SEMANTICS))
-    {
-      flags |= FILE_FLAG_BACKUP_SEMANTICS;
-    }
-  if (PACE_BIT_ENABLED (mode, FILE_FLAG_POSIX_SEMANTICS))
-    {
-      flags |= FILE_FLAG_POSIX_SEMANTICS;
-    }
-
-#if 0 //////////////////////////////////////////////////////////////////////
-
-  /* Threads and version info that isn't implemented yet in PACE.
-     ACE_MT (ACE_thread_mutex_t *ace_os_monitor_lock = 0;)
-   */
-  if (PACE_BIT_ENABLED (mode, _O_APPEND))
-    {
-      ACE_MT
-        (
-          ace_os_monitor_lock = (ACE_thread_mutex_t *)
-            ACE_OS_Object_Manager::preallocated_object[
-              ACE_OS_Object_Manager::ACE_OS_MONITOR_LOCK];
-          ACE_OS::thread_mutex_lock (ace_os_monitor_lock);
-        )
-    }
-
-#if !defined (ACE_HAS_WINCE)  /* CE doesn't have FILE_SHARE_DELETE */
-  if (ACE_OS::get_win32_versioninfo().dwPlatformId ==
-      VER_PLATFORM_WIN32_NT)
-    shared_mode |= FILE_SHARE_DELETE;
-#endif /* ACE_HAS_WINCE */
-
-////////////////////////////////////////////////////////////
-#endif /* 0 */
-
-  h = CreateFile (path,
-                  access,
-                  shared_mode,
-                  0,
-                  creation,
-                  flags,
-                  0);
-
-  if (PACE_BIT_ENABLED (mode, _O_APPEND))
-    {
-      if (h != PACE_INVALID_HANDLE)
-        {
-          SetFilePointer (h, 0, 0, FILE_END);
-        }
-      /* Threads and version info that isn't implemented yet in PACE.
-         ACE_MT (ACE_thread_mutex_t *ace_os_monitor_lock = 0;)
-         ACE_MT (ACE_OS::thread_mutex_unlock (ace_os_monitor_lock);)
-       */
-    }
-  
-  if (h == PACE_INVALID_HANDLE)
-    {
-      /* Where is this in ACE?
-         ACE_FAIL_RETURN (h);
-       */
-      return -1;
-    }
-  else
-    {
-      /* return h;
-	  
-	 POSIX returns lowest unused file descriptor but windows
-         doesn't handle files in the same manner.
-         We return -1 for failure and 1 for success.
-       */
-      return 1;
-    }
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
diff --git a/PACE/pace/win32/fcntl.h b/PACE/pace/win32/fcntl.h
deleted file mode 100644
index 7cb57a52cb0..00000000000
--- a/PACE/pace/win32/fcntl.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/fnctl.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_FCNTL_H_WIN32
-#define PACE_FCNTL_H_WIN32
-
-#include "pace/sys/types.h"
-#include "pace/unistd.h"
-#include "pace/sys/stat.h"
-#include <fcntl.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#if defined (__BORLANDC__)
-#define _O_TEMPORARY 0x08
-#endif /* __BORLANDC__ */
-
-#define PACE_FD_CLOEXEC FD_CLOEXEC
-#define PACE_F_DUPFD D_DUPFD
-#define PACE_F_GETFD F_GETFD
-#define PACE_F_GETFL F_GETFL
-#define PACE_F_GETLK F_GETLK
-#define PACE_F_RDLCK F_RDLCK
-#define PACE_F_SETFD F_SETFD
-#define PACE_F_SETFL F_SETFL
-#define PACE_F_SETLK F_SETLK
-#define PACE_F_SETLKW F_SETLKW
-#define PACE_F_UNLCK F_UNLCK
-#define PACE_F_WRLCK F_WRLCK
-#define PACE_O_ACCMODE O_ACCMODE
-#define PACE_O_APPEND O_APPEND
-#define PACE_O_CREAT O_CREAT
-#define PACE_O_DSYNC O_DSYNC
-#define PACE_O_EXCL O_EXCL
-#define PACE_O_NOCTTY O_NOCTTY
-#define PACE_O_NONBLOCK O_NONBLOCK
-#define PACE_O_RDONLY O_RDONLY
-#define PACE_O_RDWR O_RDWR
-#define PACE_O_RSYNC O_RSYNC
-#define PACE_O_SYNC O_SYNC
-#define PACE_O_TRUNC O_TRUNC
-#define PACE_O_WRONLY O_WRONLY
-
-#ifndef PACE_FLOCK
-#define PACE_FLOCK
-typedef struct flock pace_flock;
-#endif /* PACE_FLOCK */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-  int pace_win32_creat (const char * path, pace_mode_t mode);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_FCNTL_H_WIN32 */
diff --git a/PACE/pace/win32/fcntl.inl b/PACE/pace/win32/fcntl.inl
deleted file mode 100644
index b821d7bbfc9..00000000000
--- a/PACE/pace/win32/fcntl.inl
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/fcntl.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_creat (const char * path, pace_mode_t mode)
-{
-  /* Emulation is still buggy! creat (path, mode); */
-  PACE_UNUSED_ARG (path);
-  PACE_UNUSED_ARG (mode);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_fcntl (PACE_HANDLE fildes, int cmd, /* arg */ ... )
-{
-  PACE_UNUSED_ARG (fildes);
-  PACE_UNUSED_ARG (cmd);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
diff --git a/PACE/pace/win32/grp.c b/PACE/pace/win32/grp.c
deleted file mode 100644
index 0bcfffa87d4..00000000000
--- a/PACE/pace/win32/grp.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/grp.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/grp.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/grp.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/win32/grp.h b/PACE/pace/win32/grp.h
deleted file mode 100644
index c800c8bc21e..00000000000
--- a/PACE/pace/win32/grp.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace ()
- *
- * = FILENAME
- *    pace/win32/grp.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_GRP_H_WIN32
-#define PACE_GRP_H_WIN32
-
-# if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_GROUP
-#define PACE_GROUP
-  typedef struct group {
-    int val_;
-  } pace_group;
-#endif /* PACE_GROUP */
-
-# if defined (PACE_HAS_CPLUSPLUS)
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_GRP_H_WIN32 */
diff --git a/PACE/pace/win32/grp.inl b/PACE/pace/win32/grp.inl
deleted file mode 100644
index 905e9eadea3..00000000000
--- a/PACE/pace/win32/grp.inl
+++ /dev/null
@@ -1,72 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/grp.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_SD_UOF)
-PACE_INLINE
-pace_group *
-pace_getgrgid (pace_gid_t gid)
-{
-  pace_group * retval = (pace_group*)0;
-  PACE_UNUSED_ARG (gid);
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_SD_UOF */
-
-#if (PACE_HAS_POSIX_SDR_UOF)
-PACE_INLINE
-int
-pace_getgrgid_r (pace_gid_t gid,
-                 pace_group * grp,
-                 char * buffer,
-                 size_t bufsize,
-                 pace_group ** result)
-{
-  PACE_UNUSED_ARG (gid);
-  PACE_UNUSED_ARG (grp);
-  PACE_UNUSED_ARG (buffer);
-  PACE_UNUSED_ARG (bufsize);
-  PACE_UNUSED_ARG (result);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SDR_UOF */
-
-#if (PACE_HAS_POSIX_SD_UOF)
-PACE_INLINE
-pace_group *
-pace_getgrnam (const char * name)
-{
-  pace_group * retval = (pace_group*)0;
-  PACE_UNUSED_ARG (name);
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_SD_UOF */
-
-#if (PACE_HAS_POSIX_SDR_UOF)
-PACE_INLINE
-int
-pace_getgrnam_r (const char * name,
-                 pace_group * grp,
-                 char * buffer,
-                 size_t bufsize,
-                 pace_group ** result)
-{
-  PACE_UNUSED_ARG (name);
-  PACE_UNUSED_ARG (grp);
-  PACE_UNUSED_ARG (buffer);
-  PACE_UNUSED_ARG (bufsize);
-  PACE_UNUSED_ARG (result);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SDR_UOF */
diff --git a/PACE/pace/win32/limits.h b/PACE/pace/win32/limits.h
deleted file mode 100644
index 0624528da7a..00000000000
--- a/PACE/pace/win32/limits.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/limits.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================ */
-
-#ifndef PACE_LIMITS_H_WIN32
-#define PACE_LIMITS_H_WIN32
-
-#include <limits.h>
-
-# if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-# endif /* (PACE_HAS_CPLUSPLUS) */
-
-# if defined (PACE_HAS_CPLUSPLUS)
-}
-# endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_LIMITS_H_WIN32 */
diff --git a/PACE/pace/win32/locale.c b/PACE/pace/win32/locale.c
deleted file mode 100644
index 1d10f0e3b32..00000000000
--- a/PACE/pace/win32/locale.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/locale.c
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * ============================================================================= */
-
-#include "pace/locale.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/locale.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/win32/locale.h b/PACE/pace/win32/locale.h
deleted file mode 100644
index c56a9d9fec3..00000000000
--- a/PACE/pace/win32/locale.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/locale.h
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * =========================================================================== */
-
-#ifndef PACE_LOCALE_H_WIN32
-#define PACE_LOCALE_H_WIN32
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_LC_ALL LC_ALL
-#define PACE_LC_COLLATE LC_COLLATE
-#define PACE_LC_CTYPE LC_CTYPE
-#define PACE_LC_MONETARY LC_MONETARY
-#define PACE_LC_NUMERIC LC_NUMERIC
-#define PACE_LC_TIME LC_TIME
-#define PACE_NULL NULL
-
-#ifndef PACE_LCONV
-#define PACE_LCONV
-typedef struct lconv pace_lconv;
-#endif /* PACE_LCONV */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_LOCALE_H */
diff --git a/PACE/pace/win32/locale.inl b/PACE/pace/win32/locale.inl
deleted file mode 100644
index bdcf0ba226a..00000000000
--- a/PACE/pace/win32/locale.inl
+++ /dev/null
@@ -1,34 +0,0 @@
-/* $Id$ -*- C -*-
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/locale.inl
- *
- * = AUTHOR
- *    Joe Hoffert
- *
- * =========================================================================== */
-
-#include <locale.h>
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_lconv *
-pace_localeconv (void)
-{
-  return localeconv ();
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-char *
-pace_setlocale (int category, const char * locale)
-{
-  return setlocale (category, locale);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
diff --git a/PACE/pace/win32/math.c b/PACE/pace/win32/math.c
deleted file mode 100644
index 01302f35ac5..00000000000
--- a/PACE/pace/win32/math.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/math.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/math.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/math.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/win32/math.h b/PACE/pace/win32/math.h
deleted file mode 100644
index e1658a72c12..00000000000
--- a/PACE/pace/win32/math.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/math.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_MATH_H_WIN32
-#define PACE_MATH_H_WIN32
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_HUGE_VAL HUGE_VAL
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_MATH_H_WIN32 */
diff --git a/PACE/pace/win32/math.inl b/PACE/pace/win32/math.inl
deleted file mode 100644
index 47112cebda3..00000000000
--- a/PACE/pace/win32/math.inl
+++ /dev/null
@@ -1,215 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/math.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-/* FUZZ: disable check_for_math_include */
-#include <math.h>
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_acos (double x)
-{
-  return acos (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_asin (double x)
-{
-  return asin (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_atan (double x)
-{
-  return atan (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_atan2 (double x, double y)
-{
-  return atan2 (x, y);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_cos (double x)
-{
-  return cos (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_sin (double x)
-{
-  return sin (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_tan (double x)
-{
-  return tan (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_cosh (double x)
-{
-  return cosh (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_sinh (double x)
-{
-  return sinh (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_tanh (double x)
-{
-  return tanh (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_exp (double x)
-{
-  return exp (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_frexp (double x, int * exp)
-{
-  return frexp (x, exp);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_ldexp (double x, int exp)
-{
-  return ldexp (x, exp);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_log (double x)
-{
-  return log (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_log10 (double x)
-{
-  return log10 (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_modf (double x, double * iptr)
-{
-  return modf (x, iptr);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_pow (double x, double y)
-{
-  return pow (x, y);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_sqrt (double x)
-{
-  return sqrt (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_ceil (double x)
-{
-  return ceil (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_fabs (double x)
-{
-  return fabs (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_floor (double x)
-{
-  return floor (x);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_fmod (double x, double y)
-{
-  return fmod (x, y);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
diff --git a/PACE/pace/win32/mman.c b/PACE/pace/win32/mman.c
deleted file mode 100644
index 7c08f8f6e0f..00000000000
--- a/PACE/pace/win32/mman.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/mman.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/sys/mman.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/mman.inl"
-#endif /* ! PACE_HAS_INLINE */
-
-#include <windows.h>
-#include <stdio.h>
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-void *
-mmap (void * addr, size_t len, int prot, int flags,
-      PACE_HANDLE fildes, pace_off_t off)
-{
-  void *addr_mapping = 0;
-  int nt_flags = 0;
-  PACE_HANDLE file_mapping = PACE_INVALID_HANDLE;
-
-  if (PACE_BIT_ENABLED (flags, MAP_PRIVATE))
-    {
-      prot = PAGE_WRITECOPY;
-      nt_flags = FILE_MAP_COPY;
-    }
-  else if (PACE_BIT_ENABLED (flags, MAP_SHARED))
-    {
-      if (PACE_BIT_ENABLED (prot, PAGE_READONLY))
-        nt_flags = FILE_MAP_READ;
-      if (PACE_BIT_ENABLED (prot, PAGE_READWRITE))
-        nt_flags = FILE_MAP_WRITE;
-    }
-
-  file_mapping = CreateFileMapping (fildes,
-                                    0,
-                                    prot,
-                                    0,
-                                    0,
-                                    0);
-  if (file_mapping == 0)
-    PACE_FAIL_RETURN (MAP_FAILED);
-
-# if defined (PACE_OS_EXTRA_MMAP_FLAGS)
-  nt_flags |= PACE_OS_EXTRA_MMAP_FLAGS;
-# endif /* PACE_OS_EXTRA_MMAP_FLAGS */
-
-# if !defined (PACE_HAS_WINCE)
-  addr_mapping = MapViewOfFileEx (file_mapping,
-                                  nt_flags,
-                                  0,
-                                  off,
-                                  len,
-                                  addr);
-# else
-  ACE_UNUSED_ARG (addr);        /* WinCE does not allow specifying <addr>.*/
-  addr_mapping = MapViewOfFile (file_mapping,
-                                nt_flags,
-                                0,
-                                off,
-                                len);
-# endif /* ! PACE_HAS_WINCE */
-
-  /* Only close this down if we used the temporary. */
-  if (file_mapping == PACE_INVALID_HANDLE)
-    CloseHandle (file_mapping);
-
-  if (addr_mapping == 0)
-    PACE_FAIL_RETURN (MAP_FAILED);
-
-  else if (PACE_BIT_ENABLED (flags, MAP_FIXED)
-           && addr_mapping != addr)
-    {
-      errno = EINVAL;
-      return MAP_FAILED;
-    }
-  else
-    return addr_mapping;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-mprotect (void * addr, size_t len, int prot)
-{
-  DWORD dummy; /* Sigh! */
-  return VirtualProtect(addr, len, prot, &dummy) ? 0 : -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-msync (void * addr, size_t len, int flags)
-{
-  PACE_UNUSED_ARG (flags);
-  PACE_WIN32CALL_RETURN
-    (PACE_ADAPT_RETVAL
-     (FlushViewOfFile (addr, len), pace_result_), int, -1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-munmap (void * addr, size_t len)
-{
-  PACE_UNUSED_ARG (len);
-  PACE_WIN32CALL_RETURN
-    (PACE_ADAPT_RETVAL
-     (UnmapViewOfFile (addr), pace_result_), int, -1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/win32/mman.h b/PACE/pace/win32/mman.h
deleted file mode 100644
index 2a5621823d7..00000000000
--- a/PACE/pace/win32/mman.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/mman.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_MMAN_H_WIN32
-#define PACE_SYS_MMAN_H_WIN32
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-# define MAP_PRIVATE 1
-# define MAP_SHARED  2
-# define MAP_FIXED   4
-# if !defined (MAP_FAILED)
-#   undef MAP_FAILED
-#   define MAP_FAILED ((void *) -1)
-# endif
-
-# define PACE_MAP_FAILED MAP_FAILED
-# define PACE_MAP_FIXED MAP_FIXED
-# define PACE_MAP_PRIVATE MAP_PRIVATE
-# define PACE_MAP_SHARED MAP_SHARED
-# define PACE_MCL_CURRENT MCL_CURRENT
-# define PACE_MS_ASYNC MS_ASYNC
-# define PACE_MS_INVALIDATE
-# define PACE_MS_SYNC MS_SYNC
-# define PACE_PROT_EXEC PROT_EXEC
-# define PACE_PROT_NONE PROT_NONE
-# define PACE_PROT_READ PROT_READ
-# define PACE_PROT_WRITE PROT_WRITE
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  void * mmap (void * addr, size_t len, int prot, int flags,
-               PACE_HANDLE fildes, pace_off_t off);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int mprotect (void * addr, size_t len, int prot);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int msync (void * addr, size_t len, int flags);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int munmap (void * addr, size_t len);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_MMAN_H */
diff --git a/PACE/pace/win32/mman.inl b/PACE/pace/win32/mman.inl
deleted file mode 100644
index c324089991b..00000000000
--- a/PACE/pace/win32/mman.inl
+++ /dev/null
@@ -1,129 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/mman.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include <io.h>
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mlock (const void * addr, pace_size_t len)
-{
-  PACE_UNUSED_ARG (addr);
-  PACE_UNUSED_ARG (len);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mlockall (int flags)
-{
-  PACE_UNUSED_ARG (flags);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void *
-pace_mmap (void * addr,
-           size_t len,
-           int prot,
-           int flags,
-           PACE_HANDLE fildes,
-           pace_off_t off)
-{
-  return mmap (addr, len, prot, flags, fildes, off);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_munlock (const void * addr, size_t len)
-{
-  PACE_UNUSED_ARG (addr);
-  PACE_UNUSED_ARG (len);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mprotect (void * addr, size_t len, int prot)
-{
-  return mprotect (addr, len, prot);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_msync (void * addr,
-            size_t len,
-            int flags)
-{
-  return msync (addr, len, flags);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_munlockall ()
-{
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_munmap (void * addr, size_t len)
-{
-  return munmap (addr, len);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-PACE_HANDLE
-pace_shm_open (const char * name, int oflag, pace_mode_t mode)
-{
-  /* Would be similar to ACE_OS::open
-     which (currently uses threads and Object Manager).
-   */
-  PACE_HANDLE retval = PACE_INVALID_HANDLE;
-  PACE_UNUSED_ARG (name);
-  PACE_UNUSED_ARG (oflag);
-  PACE_UNUSED_ARG (mode);
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_shm_unlink (const char * name)
-{
-#if defined (__BORLANDC__)
-  return unlink (name);
-#else /* __BORLANDC__ */
-  return _unlink (name);
-#endif /* __BORLANDC__ */
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/win32/mqueue.c b/PACE/pace/win32/mqueue.c
deleted file mode 100644
index 2f08c3e979e..00000000000
--- a/PACE/pace/win32/mqueue.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace ()
- *
- * = FILENAME
- *    pace/win32/mqueue.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/mqueue.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/mqueue.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/win32/mqueue.h b/PACE/pace/win32/mqueue.h
deleted file mode 100644
index 17110c5a740..00000000000
--- a/PACE/pace/win32/mqueue.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/mqueue.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_MQUEUE_H_WIN32
-#define PACE_MQUEUE_H_WIN32
-
-#include "pace/signal.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_MQD_T
-#define PACE_MQD_T
-  /* Temporary fix until we emulate these funcs.
-     typedef mqd_t pace_mqd_t;
-   */
-  typedef int pace_mqd_t;
-#endif /* PACE_MQD_T */
-
-#ifndef PACE_MQ_ATTR
-#define PACE_MQ_ATTR
-  /* Temporary fix until we emulate these funcs.
-     typedef struct mq_attr pace_mq_attr
-   */
-  typedef struct mq_attr { int a_; } pace_mq_attr;
-#endif /* PACE_MQ_ATTR */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_MQUEUE_H_WIN32 */
diff --git a/PACE/pace/win32/mqueue.inl b/PACE/pace/win32/mqueue.inl
deleted file mode 100644
index 956ddaf7be2..00000000000
--- a/PACE/pace/win32/mqueue.inl
+++ /dev/null
@@ -1,104 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/mqueue.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_close (pace_mqd_t mqdes)
-{
-  PACE_UNUSED_ARG (mqdes);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_getattr (pace_mqd_t mqdes,
-                 pace_mq_attr * mqstat)
-{
-  PACE_UNUSED_ARG (mqdes);
-  PACE_UNUSED_ARG (mqstat);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_notify (pace_mqd_t mqdes,
-                const pace_sigevent * notification)
-{
-  PACE_UNUSED_ARG (mqdes);
-  PACE_UNUSED_ARG (notification);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_ssize_t
-pace_mq_receive (pace_mqd_t mqdes,
-                 char * msg_ptr,
-                 size_t msg_len,
-                 unsigned int * msg_prio)
-{
-  PACE_UNUSED_ARG (mqdes);
-  PACE_UNUSED_ARG (msg_ptr);
-  PACE_UNUSED_ARG (msg_len);
-  PACE_UNUSED_ARG (msg_prio);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_send (pace_mqd_t mqdes,
-              const char * msg_ptr,
-              size_t msg_len,
-              unsigned int msg_prio)
-{
-  PACE_UNUSED_ARG (mqdes);
-  PACE_UNUSED_ARG (msg_ptr);
-  PACE_UNUSED_ARG (msg_len);
-  PACE_UNUSED_ARG (msg_prio);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_setattr (pace_mqd_t mqdes,
-                 const pace_mq_attr * mqstat,
-                 pace_mq_attr * omqstat)
-{
-  PACE_UNUSED_ARG (mqdes);
-  PACE_UNUSED_ARG (mqstat);
-  PACE_UNUSED_ARG (omqstat);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mq_unlink (const char * name)
-{
-  PACE_UNUSED_ARG (name);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/win32/pace.dsw b/PACE/pace/win32/pace.dsw
deleted file mode 100644
index d1deae4e284..00000000000
--- a/PACE/pace/win32/pace.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "pace_dll"=.\pace_dll.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "pace_lib"=.\pace_lib.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/PACE/pace/win32/pace_dll.dsp b/PACE/pace/win32/pace_dll.dsp
deleted file mode 100644
index 8fca3ae3eb9..00000000000
--- a/PACE/pace/win32/pace_dll.dsp
+++ /dev/null
@@ -1,623 +0,0 @@
-# Microsoft Developer Studio Project File - Name="PACE DLL" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=PACE DLL - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "pace_dll.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "pace_dll.mak" CFG="PACE DLL - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "PACE DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "PACE DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "PACE DLL - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "DLL\Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PACE_DLL_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "_WINDOWS" /D "PACE_BUILD_DLL" /D "WIN32" /D "PACE_HAS_ALL_POSIX_FUNCS" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../../../bin/pace.dll"

-# SUBTRACT LINK32 /profile

-

-!ELSEIF  "$(CFG)" == "PACE DLL - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "pace_dll___Win32_Debug"

-# PROP BASE Intermediate_Dir "pace_dll___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "DLL\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PACE_DLL_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D "_WINDOWS" /D "PACE_BUILD_DLL" /D "WIN32" /D "PACE_HAS_ALL_POSIX_FUNCS" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"../../../bin/paced.dll" /pdbtype:sept

-# SUBTRACT LINK32 /nodefaultlib

-

-!ENDIF 

-

-# Begin Target

-

-# Name "PACE DLL - Win32 Release"

-# Name "PACE DLL - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\aio.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\assert.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\ctype.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\dirent.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\fcntl.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\grp.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\locale.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\math.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\mman.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\mqueue.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\pthread.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\pwd.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\sched.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\semaphore.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\setjmp.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\signal.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\stat.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\stdio.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\stdlib.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\string.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\termios.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\time.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\times.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\unistd.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\utime.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\utsname.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\wait.c

-# End Source File

-# End Group

-# Begin Group "Header Files (Prototypes)"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\aio.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\assert.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\ctype.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\dirent.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\errno.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\fcntl.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\grp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\limits.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\locale.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\math.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\sys\mman.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\mqueue.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\pthread.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\pwd.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\sched.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\semaphore.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\setjmp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\signal.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\sys\stat.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\stddef.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\stdio.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\stdlib.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\string.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\termios.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\time.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\sys\times.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\sys\types.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\unistd.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\utime.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\sys\utsname.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\sys\wait.h

-# End Source File

-# End Group

-# Begin Group "Header Files (Win32 Specific)"

-

-# PROP Default_Filter "h"

-# Begin Source File

-

-SOURCE=.\aio.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\assert.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ctype.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\dirent.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\errno.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\fcntl.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\grp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\limits.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\locale.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\math.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\mman.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\mqueue.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\pthread.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\pthreadtypes.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\pwd.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sched.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\schedtypes.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\semaphore.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\setjmp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\signal.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\stat.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\stdio.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\stdlib.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\string.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\termios.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\time.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\times.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\types.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\unistd.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\utime.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\utsname.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\wait.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter "inl"

-# Begin Source File

-

-SOURCE=.\aio.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\assert.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\ctype.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\dirent.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\fcntl.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\grp.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\locale.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\math.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\mman.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\mqueue.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\pthread.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\pwd.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\sched.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\semaphore.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\setjmp.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\signal.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\stat.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\stdio.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\stdlib.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\string.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\termios.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\time.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\times.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\unistd.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\utime.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\utsname.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\wait.inl

-# End Source File

-# End Group

-# Begin Group "Config Files"

-

-# PROP Default_Filter "c"

-# Begin Source File

-

-SOURCE=..\config\compiler.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\config\config.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\config\constants.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\config\defaults.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\config\defines.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\config\features.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\config\platform.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\config\temp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\config\utility.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/PACE/pace/win32/pace_lib.dsp b/PACE/pace/win32/pace_lib.dsp
deleted file mode 100644
index 0a41c79bf03..00000000000
--- a/PACE/pace/win32/pace_lib.dsp
+++ /dev/null
@@ -1,609 +0,0 @@
-# Microsoft Developer Studio Project File - Name="PACE LIB" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

-

-CFG=PACE LIB - Win32 Static Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "pace_lib.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "pace_lib.mak" CFG="PACE LIB - Win32 Static Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "PACE LIB - Win32 Static Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "PACE LIB - Win32 Static Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "PACE LIB - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "LIB\Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "PACE_AS_STATIC_LIBS" /D "WIN32" /D "PACE_HAS_ALL_POSIX_FUNCS" /V"ERBOSE:LIB" /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:".\paces.lib"

-

-!ELSEIF  "$(CFG)" == "PACE LIB - Win32 Static Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "pace_lib___Win32_Debug"

-# PROP BASE Intermediate_Dir "pace_lib___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "LIB\Debug"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "PACE_HAS_ALL_POSIX_FUNCS" /D "PACE_AS_STATIC_LIBS" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:".\pacesd.lib"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "PACE LIB - Win32 Static Release"

-# Name "PACE LIB - Win32 Static Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\aio.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\assert.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\ctype.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\dirent.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\fcntl.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\grp.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\locale.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\math.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\mman.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\mqueue.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\pthread.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\pwd.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\sched.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\semaphore.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\setjmp.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\signal.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\stat.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\stdio.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\stdlib.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\string.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\termios.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\time.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\times.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\unistd.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\utime.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\utsname.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\wait.c

-# End Source File

-# End Group

-# Begin Group "Header Files (Prototypes)"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\aio.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\assert.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\ctype.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\dirent.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\errno.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\fcntl.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\grp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\limits.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\locale.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\math.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\sys\mman.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\mqueue.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\pthread.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\pwd.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\sched.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\semaphore.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\setjmp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\signal.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\sys\stat.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\stddef.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\stdio.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\stdlib.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\string.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\termios.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\time.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\sys\times.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\sys\types.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\unistd.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\utime.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\sys\utsname.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\sys\wait.h

-# End Source File

-# End Group

-# Begin Group "Header Files (Win32 Specific)"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\aio.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\assert.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ctype.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\dirent.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\errno.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\fcntl.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\grp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\limits.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\locale.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\math.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\mman.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\mqueue.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\pthread.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\pthreadtypes.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\pwd.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sched.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\schedtypes.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\semaphore.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\setjmp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\signal.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\stat.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\stdio.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\stdlib.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\string.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\termios.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\time.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\times.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\types.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\unistd.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\utime.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\utsname.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\wait.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter "inl"

-# Begin Source File

-

-SOURCE=.\aio.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\assert.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\ctype.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\dirent.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\fcntl.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\grp.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\locale.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\math.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\mman.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\mqueue.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\pthread.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\pwd.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\sched.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\semaphore.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\setjmp.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\signal.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\stat.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\stdio.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\stdlib.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\string.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\termios.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\time.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\times.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\unistd.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\utime.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\utsname.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\wait.inl

-# End Source File

-# End Group

-# Begin Group "Config Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\config\compiler.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\config\config.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\config\constants.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\config\defaults.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\config\defines.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\config\features.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\config\platform.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\config\temp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\config\utility.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/PACE/pace/win32/pthread.c b/PACE/pace/win32/pthread.c
deleted file mode 100644
index b53dab9396c..00000000000
--- a/PACE/pace/win32/pthread.c
+++ /dev/null
@@ -1,359 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/pthread.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/pthread.h"
-#include <process.h>
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/pthread.inl"
-#endif /* ! PACE_HAS_INLINE */
-
-//////////////////////////////////////////////////////////////////////
-// pthread_t
-//////////////////////////////////////////////////////////////////////
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_create (pace_pthread_t * thread,
-		const pace_pthread_attr_t * attr,
-		void * (*start_routine) (void*),
-		void * arg)
-{
-  /* Get around a gcc bug. */
-  typedef unsigned (__stdcall *bthrexr)(void*);
-
-  unsigned flags = 0x0, thr_addr = 0x0;
-  if (attr->sparam_.sched_priority != THREAD_PRIORITY_NORMAL)
-    {
-      // CREATE_SUSPENDED is the only flag win32 currently supports
-      flags = CREATE_SUSPENDED;
-    }
-
-  thread = (pace_pthread_t)
-    _beginthreadex (0,
-		    attr->stack_size_,
-		    (bthrexr) start_routine,
-		    arg,
-		    flags,
-		    &thr_addr);
-
-  if (flags == CREATE_SUSPENDED && thread != 0)
-    {
-      SetThreadPriority (thread, attr->sparam_.sched_priority);
-      ResumeThread (thread);
-    }
-
-  if (thread == 0)
-    {
-      return 0;
-    }
-  else
-    {
-      PACE_FAIL_RETURN (-1);
-    }
-
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-pace_pthread_t
-pthread_self ()
-{
-  return GetCurrentThread ();
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_getschedparam (pace_pthread_t thread,
-		       int * policy,
-		       pace_sched_param * param)
-{
-  PACE_UNUSED_ARG (policy);
-  if (param != (pace_sched_param*)0)
-    {
-      param->sched_priority = GetThreadPriority (thread);
-      return 0;
-    }
-  /* Invalid pointer to pace_sched_param. */
-  return -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pthread_setschedparam (pace_pthread_t thread,
-			     int policy,
-			     const pace_sched_param * param)
-{
-  PACE_UNUSED_ARG(policy);
-
-  if (SetThreadPriority (thread, param->sched_priority))
-    {
-      return 0;
-    }
-  /* ERROR: with return value of SetThreadPriority. */
-  return -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-//////////////////////////////////////////////////////////////////////
-// pthread_attr_t
-//////////////////////////////////////////////////////////////////////
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_attr_init (pace_pthread_attr_t * attr)
-{
-  /* These need to be the platform defaults!
-   * Since I made this, I need to maintain this invariant!
-   * Eventually, #define 'words' would be better than
-   * constants here! */
-
-  attr->init_ = 1;
-  attr->detach_state_ = 0;
-  attr->policy_ = 0;
-  attr->sparam_.sched_priority = 0;
-  attr->inherit_sched_ = 0;
-  attr->contention_scope_ = 0;
-  attr->guard_size_ = 0;
-  attr->stackaddr_set_ = 0;
-  attr->stack_addr_ = (void*)0;
-  attr->stack_size_ = 0;
-
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_attr_destroy (pace_pthread_attr_t * attr)
-{
-  if (attr->init_ == 1)
-    {
-      attr->init_ = 0;
-      return 0;
-    }
-  /* ERROR: not initilalized properly! */
-  return -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_attr_getdetachstate (const pace_pthread_attr_t * attr,
-			     int * detachstate)
-{
-  if (attr->init_ == 1)
-    {
-      *detachstate = attr->detach_state_;
-      return 0;
-    }
-  /* ERROR: not initilalized properly! */
-  return -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_attr_setdetachstate (pace_pthread_attr_t * attr,
-			     int detachstate)
-{
-  if (attr->init_ == 1)
-    {
-      attr->detach_state_ = detachstate;
-      return 0;
-    }
-  /* ERROR: not initilalized properly! */
-  return -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_attr_getinheritsched (const pace_pthread_attr_t * attr,
-			      int * inheritsched)
-{
-  if (attr->init_ == 1)
-    {
-      *inheritsched = attr->inherit_sched_;
-      return 0;
-    }
-  /* ERROR: not initilalized properly! */
-  return -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_attr_setinheritsched (pace_pthread_attr_t * attr,
-			      int inheritsched)
-{
-  if (attr->init_ == 1)
-    {
-      attr->inherit_sched_ = inheritsched;
-      return 0;
-    }
-  /* ERROR: not initilalized properly! */
-  return -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_attr_getschedparam (const pace_pthread_attr_t * attr,
-			    pace_sched_param * param)
-{
-  if (attr->init_ == 1)
-    {
-      param->sched_priority = attr->sparam_.sched_priority;
-      return 0;
-    }
-  /* ERROR: not initilalized properly! */
-  return -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_attr_setschedparam (pace_pthread_attr_t * attr,
-			    const pace_sched_param * param)
-{
-  if (attr->init_ == 1)
-    {
-      attr->sparam_.sched_priority = param->sched_priority;
-      return 0;
-    }
-  /* ERROR: not initilalized properly! */
-  return -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int pthread_attr_getschedpolicy (const pace_pthread_attr_t * attr,
-				 int * policy)
-{
-  if (attr->init_ == 1)
-    {
-      *policy = attr->policy_;
-      return 0;
-    }
-  /* ERROR: not initilalized properly! */
-  return -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int pthread_attr_setschedpolicy (pace_pthread_attr_t * attr,
-				 int policy)
-{
-  if (attr->init_ == 1)
-    {
-      attr->policy_ = policy;
-      return 0;
-    }
-  /* ERROR: not initilalized properly! */
-  return -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_attr_getscope (const pace_pthread_attr_t * attr,
-		       int * contentionscope)
-{
-  if (attr->init_ == 1)
-    {
-      *contentionscope = attr->contention_scope_;
-      return 0;
-    }
-  /* ERROR: not initialized properly! */
-  return -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_attr_setscope (pace_pthread_attr_t * attr,
-		       int contentionscope)
-{
-  if (attr->init_ == 1)
-    {
-      attr->contention_scope_ = contentionscope;
-      return 0;
-    }
-  /* ERROR: not initialized properly! */
-  return -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_attr_getstackaddr (const pace_pthread_attr_t * attr,
-			   void ** stackaddr)
-{
-  if (attr->init_ == 1)
-    {
-      *stackaddr = attr->stack_addr_;
-      return 0;
-    }
-  /* ERROR: not initilalized properly! */
-  return -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_attr_setstackaddr (pace_pthread_attr_t * attr,
-			   void * stackaddr)
-{
-  if (attr->init_ == 1)
-    {
-      attr->stack_addr_ = stackaddr;
-      return 0;
-    }
-  /* ERROR: not initilalized properly! */
-  return -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_attr_getstacksize (const pace_pthread_attr_t * attr,
-			   size_t * stacksize)
-{
-  if (attr->init_ == 1)
-    {
-      *stacksize = attr->stack_size_;
-      return 0;
-    }
-  /* ERROR: not initilalized properly! */
-  return -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pthread_attr_setstacksize (pace_pthread_attr_t * attr,
-			   size_t stacksize)
-{
-  if (attr->init_ == 1)
-    {
-      attr->stack_size_ = stacksize;
-      return 0;
-    }
-  /* ERROR: not initilalized properly! */
-  return -1;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/win32/pthread.h b/PACE/pace/win32/pthread.h
deleted file mode 100644
index 582b89c2ab1..00000000000
--- a/PACE/pace/win32/pthread.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/pthread.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_PTHREAD_H_WIN32
-#define PACE_PTHREAD_H_WIN32
-
-#include "pace/sys/types.h"
-#include "pace/signal.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_PTHREAD_CANCELED PTHREAD_CANCELED
-#define PACE_PTHREAD_CANCEL_AYNCHRONOUS PTHREAD_CANCEL_ASYNCHRONOUS
-#define PACE_PTHREAD_CANCEL_DEFERRED PTHREAD_CANCEL_DEFERRED
-#define PACE_PTHREAD_CACEL_DISABLE PTHREAD_CANCEL_DISABLE
-#define PACE_PTHREAD_CANCEL_ENABLE PTHREAD_CANCEL_ENABLE
-#define PACE_PTHREAD_COND_INITIALIZER PTHREAD_COND_INITIALIZER
-#define PACE_PTHREAD_CREATE_DETACHED PTHREAD_CREATE_DETACHED
-#define PACE_PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_JOINABLE
-#define PACE_PTHREAD_EXPLICIT_SCHED PTHREAD_EXPLICIT_SCHED
-#define PACE_PTHREAD_INHERIT_SCHED PTHREAD_INHERIT_SCHED
-#define PACE_PTHREAD_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
-#define PACE_PTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
-#define PACE_PTHREAD_PRIO_INHERIT PTHREAD_PRIO_INHERIT
-#define PACE_PTHREAD_PRIO_NONE PTHREAD_PRIO_NONE
-#define PACE_PTHREAD_PRIO_PROTECT PTHREAD_PRIO_PROTECT
-#define PACE_PTHREAD_PROCESS_PRIVATE PTHREAD_PROCESS_PRIVATE
-#define PACE_PTHREAD_PROCESS_SHARED PTHREAD_PROCESS_SHARED
-#define PACE_PTHREAD_SCOPE_PROCESS PTHREAD_SCOPE_PROCESS
-#define PACE_PTHREAD_SCOPE_SYSTEM PTHREAD_SCOPE_SYSTEM
-
-#if defined (PACE_HAS_CPLUSPLUS)
-
-# ifndef PACE_ATFORK_PF
-# define PACE_ATFORK_PF
-  typedef void (*pace_atfork_pf) (void);
-# endif /* PACE_ATFORK_PF */
-
-# ifndef PACE_KEYCREATE_PF
-# define PACE_KEYCREATE_PF
-  typedef void (*pace_keycreate_pf) (void*);
-# endif /* PACE_KEYCREATE_PF */
-
-# ifndef PACE_ONCE_PF
-# define PACE_ONCE_PF
-  typedef void (*pace_once_pf) (void);
-# endif /* PACE_ONCE_PF */
-
-# ifndef PACE_CREATE_PF
-# define PACE_CREATE_PF
-  typedef void* (*pace_create_pf) (void*);
-# endif /* PACE_CREATE_PF */
-
-#endif /* PACE_HAS_CPLUPLUS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pthread_create (pace_pthread_t * thread,
-		      const pace_pthread_attr_t * attr,
-		      void * (*start_routine) (void*),
-		      void * arg);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  pace_pthread_t pthread_self ();
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  /* Returns -1 if invalid pointer to param is passed in! */
-  int pthread_getschedparam (pace_pthread_t thread,
-			     int * policy,
-			     pace_sched_param * param);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pthread_setschedparam (pace_pthread_t thread,
-			     int policy,
-			     const pace_sched_param * param);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  /* Returns -1 if attr is already valid! */
-  int pthread_attr_init (pace_pthread_attr_t * attr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  /* Returns -1 if attr is invalid! */
-  int pthread_attr_destroy (pace_pthread_attr_t * attr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pthread_attr_getdetachstate (const pace_pthread_attr_t * attr,
-				   int * detachstate);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pthread_attr_setdetachstate (pace_pthread_attr_t * attr,
-				   int detachstate);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pthread_attr_getinheritsched (const pace_pthread_attr_t * attr,
-				    int * inheritsched);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pthread_attr_setinheritsched (pace_pthread_attr_t * attr,
-				    int inheritsched);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pthread_attr_getschedparam (const pace_pthread_attr_t * attr,
-				  pace_sched_param * param);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pthread_attr_setschedparam (pace_pthread_attr_t * attr,
-				  const pace_sched_param * param);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pthread_attr_getschedpolicy (const pace_pthread_attr_t * attr,
-				   int * policy);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pthread_attr_setschedpolicy (pace_pthread_attr_t * attr,
-				   int policy);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pthread_attr_getscope (const pace_pthread_attr_t * attr,
-			     int * contentionscope);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pthread_attr_setscope (pace_pthread_attr_t * attr,
-			     int contentionscope);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pthread_attr_getstackaddr (const pace_pthread_attr_t * attr,
-				 void ** stackaddr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pthread_attr_setstackaddr (pace_pthread_attr_t * attr,
-				 void * stackaddr);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pthread_attr_getstacksize (const pace_pthread_attr_t * attr,
-				 size_t * stacksize);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pthread_attr_setstacksize (pace_pthread_attr_t * attr,
-				 size_t stacksize);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_PTHREAD_H_WIN32 */
diff --git a/PACE/pace/win32/pthread.inl b/PACE/pace/win32/pthread.inl
deleted file mode 100644
index 3fea1729342..00000000000
--- a/PACE/pace/win32/pthread.inl
+++ /dev/null
@@ -1,682 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/pthread.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/unistd.h"
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_atfork (void (*prepare) (void),
-                     void (*parent) (void),
-                     void (*child) (void))
-{
-  PACE_UNUSED_ARG (prepare);
-  PACE_UNUSED_ARG (parent);
-  PACE_UNUSED_ARG (child);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_create (pace_pthread_t * thread,
-                     const pace_pthread_attr_t * attr,
-                     void * (*start_routine) (void*),
-                     void * arg)
-{
-  PACE_UNUSED_ARG (thread);
-  PACE_UNUSED_ARG (attr);
-  PACE_UNUSED_ARG (start_routine);
-  PACE_UNUSED_ARG (arg);
-  
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_pthread_t
-pace_pthread_self ()
-{
-  return pthread_self ();
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_getschedparam (pace_pthread_t thread,
-                            int * policy,
-                            pace_sched_param * param)
-{
-  return pthread_getschedparam (thread, policy, param);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_setschedparam (pace_pthread_t thread,
-                            int policy,
-                            const pace_sched_param * param)
-{
-  return pthread_setschedparam (thread, policy, param);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_init (pace_pthread_attr_t * attr)
-{
-  return pthread_attr_init (attr);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_destroy (pace_pthread_attr_t * attr)
-{
-  return pthread_attr_destroy (attr);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getdetachstate (const pace_pthread_attr_t * attr,
-                                  int * detachstate)
-{
-  return pthread_attr_getdetachstate (attr, detachstate);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setdetachstate (pace_pthread_attr_t * attr,
-                                  int detachstate)
-{
-  return pthread_attr_setdetachstate (attr, detachstate);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getinheritsched (const pace_pthread_attr_t * attr,
-                                   int * inheritsched)
-{
-  return pthread_attr_getinheritsched (attr, inheritsched);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setinheritsched (pace_pthread_attr_t * attr,
-                                   int inheritsched)
-{
-  return pthread_attr_setinheritsched (attr, inheritsched);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getschedparam (const pace_pthread_attr_t * attr,
-                                 pace_sched_param * param)
-{
-  return pthread_attr_getschedparam (attr, param);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setschedparam (pace_pthread_attr_t * attr,
-                                 const pace_sched_param * param)
-{
-  return pthread_attr_setschedparam (attr, param);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getschedpolicy (const pace_pthread_attr_t * attr,
-                                  int * policy)
-{
-  return pthread_attr_getschedpolicy (attr, policy);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setschedpolicy (pace_pthread_attr_t * attr,
-                                  int policy)
-{
-  return pthread_attr_setschedpolicy (attr, policy);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getscope (const pace_pthread_attr_t * attr,
-                            int * contentionscope)
-{
-  return pthread_attr_getscope (attr, contentionscope);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setscope (pace_pthread_attr_t * attr,
-                            int contentionscope)
-{
-  return pthread_attr_setscope (attr, contentionscope);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getstackaddr (const pace_pthread_attr_t * attr,
-                                void ** stackaddr)
-{
-  return pthread_attr_getstackaddr (attr, stackaddr);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setstackaddr (pace_pthread_attr_t * attr,
-                                void * stackaddr)
-{
-  return pthread_attr_setstackaddr (attr, stackaddr);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_getstacksize (const pace_pthread_attr_t * attr,
-                                size_t * stacksize)
-{
-  return pthread_attr_getstacksize (attr, stacksize);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_attr_setstacksize (pace_pthread_attr_t * attr,
-                                size_t stacksize)
-{
-  return pthread_attr_setstacksize (attr, stacksize);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cancel (pace_pthread_t thread)
-{
-  PACE_UNUSED_ARG (thread);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_broadcast (pace_pthread_cond_t * cond)
-{
-  PACE_UNUSED_ARG (cond);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_destroy (pace_pthread_cond_t * cond)
-{
-  PACE_UNUSED_ARG (cond);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_init (pace_pthread_cond_t * cond,
-                        const pace_pthread_condattr_t * attr)
-{
-  PACE_UNUSED_ARG (cond);
-  PACE_UNUSED_ARG (attr);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_signal (pace_pthread_cond_t * cond)
-{
-  PACE_UNUSED_ARG (cond);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_timedwait (pace_pthread_cond_t * cond,
-                             pace_pthread_mutex_t * mutex,
-                             const struct timespec * abstime)
-{
-  PACE_UNUSED_ARG (cond);
-  PACE_UNUSED_ARG (mutex);
-  PACE_UNUSED_ARG (abstime);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_cond_wait (pace_pthread_cond_t * cond,
-                        pace_pthread_mutex_t * mutex)
-{
-  PACE_UNUSED_ARG (cond);
-  PACE_UNUSED_ARG (mutex);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_condattr_destroy (pace_pthread_condattr_t * attr)
-{
-  PACE_UNUSED_ARG (attr);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_condattr_getpshared (const pace_pthread_condattr_t * attr,
-                                  int * pshared)
-{
-  PACE_UNUSED_ARG (attr);
-  PACE_UNUSED_ARG (pshared);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_condattr_init (pace_pthread_condattr_t * attr)
-{
-  PACE_UNUSED_ARG (attr);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_condattr_setpshared (pace_pthread_condattr_t * attr,
-                                 int pshared)
-{
-  PACE_UNUSED_ARG (attr);
-  PACE_UNUSED_ARG (pshared);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_detach (pace_pthread_t thread)
-{
-  PACE_UNUSED_ARG (thread);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_equal (pace_pthread_t t1, pace_pthread_t t2)
-{
-  return t1 == t2;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void
-pace_pthread_exit (void * value_ptr)
-{
-  PACE_UNUSED_ARG (value_ptr);
-  PACE_ERRNO_NO_SUPPORT ();
-  return;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void *
-pace_pthread_getspecific (pace_pthread_key_t key)
-{
-  void * retval = (void*)0;
-  PACE_UNUSED_ARG (key);
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_join (pace_pthread_t thread, void ** value_ptr)
-{
-  PACE_UNUSED_ARG (thread);
-  PACE_UNUSED_ARG (value_ptr);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_key_create (pace_pthread_key_t * key,
-                         void (*destructor)(void*))
-{
-  PACE_UNUSED_ARG (key);
-  PACE_UNUSED_ARG (destructor);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_key_delete (pace_pthread_key_t key)
-{
-  PACE_UNUSED_ARG (key);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_kill (pace_pthread_t thread, int sig)
-{
-  PACE_UNUSED_ARG (thread);
-  PACE_UNUSED_ARG (sig);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_destroy (pace_pthread_mutex_t * mutex)
-{
-  PACE_UNUSED_ARG (mutex);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_getprioceiling (pace_pthread_mutex_t * mutex,
-                                   int * prioceiling)
-{
-  PACE_UNUSED_ARG (mutex);
-  PACE_UNUSED_ARG (prioceiling);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_init (pace_pthread_mutex_t * mutex,
-                         const pace_pthread_mutexattr_t * attr)
-{
-  PACE_UNUSED_ARG (mutex);
-  PACE_UNUSED_ARG (attr);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_lock (pace_pthread_mutex_t * mutex)
-{
-  PACE_UNUSED_ARG (mutex);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_setprioceiling (pace_pthread_mutex_t * mutex,
-                                   int prioceiling,
-                                   int * old_ceiling)
-{
-  PACE_UNUSED_ARG (mutex);
-  PACE_UNUSED_ARG (prioceiling);
-  PACE_UNUSED_ARG (old_ceiling);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_trylock (pace_pthread_mutex_t * mutex)
-{
-  PACE_UNUSED_ARG (mutex);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutex_unlock (pace_pthread_mutex_t * mutex)
-{
-  PACE_UNUSED_ARG (mutex);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_destroy (pace_pthread_mutexattr_t * attr)
-{
-  PACE_UNUSED_ARG (attr);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_getprioceiling (pace_pthread_mutexattr_t * attr,
-                                       int * prioceiling)
-{
-  PACE_UNUSED_ARG (attr);
-  PACE_UNUSED_ARG (prioceiling);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_getprotocol (const pace_pthread_mutexattr_t * attr,
-                                    int * protocol)
-{
-  PACE_UNUSED_ARG (attr);
-  PACE_UNUSED_ARG (protocol);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_setprioceiling (pace_pthread_mutexattr_t * attr,
-                                       int prioceiling)
-{
-  PACE_UNUSED_ARG (attr);
-  PACE_UNUSED_ARG (prioceiling);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_setprotocol (pace_pthread_mutexattr_t * attr,
-                                    int protocol)
-{
-  PACE_UNUSED_ARG (attr);
-  PACE_UNUSED_ARG (protocol);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_getpshared (const pace_pthread_mutexattr_t * attr,
-                                   int * pshared)
-{
-  PACE_UNUSED_ARG (attr);
-  PACE_UNUSED_ARG (pshared);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_init (pace_pthread_mutexattr_t * attr)
-{
-  PACE_UNUSED_ARG (attr);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_mutexattr_setpshared (pace_pthread_mutexattr_t * attr,
-                                   int pshared)
-{
-  PACE_UNUSED_ARG (attr);
-  PACE_UNUSED_ARG (pshared);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_once (pace_pthread_once_t * once_control,
-                   void (*void_routine) (void))
-{
-  PACE_UNUSED_ARG (once_control);
-  PACE_UNUSED_ARG (void_routine);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_setcancelstate (int state, int * oldstate)
-{
-  PACE_UNUSED_ARG (state);
-  PACE_UNUSED_ARG (oldstate);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_setcanceltype (int type, int * oldtype)
-{
-  PACE_UNUSED_ARG (type);
-  PACE_UNUSED_ARG (oldtype);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_setspecific (pace_pthread_key_t key, const void * value)
-{
-  PACE_UNUSED_ARG (key);
-  PACE_UNUSED_ARG (value);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_pthread_sigmask (int how, const pace_sigset_t * set,
-                      pace_sigset_t * oset)
-{
-  PACE_UNUSED_ARG (how);
-  PACE_UNUSED_ARG (set);
-  PACE_UNUSED_ARG (oset);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void
-pace_pthread_testcancel ()
-{
-  PACE_ERRNO_NO_SUPPORT ();
-  return;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/win32/pthreadtypes.h b/PACE/pace/win32/pthreadtypes.h
deleted file mode 100644
index 9d578a56801..00000000000
--- a/PACE/pace/win32/pthreadtypes.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/pthreadtypes.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-/* Keep pthread types defined here as they just clutter up sys/types.h
-
- * Do NOT include this file directly!! Please include "sys/types.h". */
-
-#ifndef PACE_SYS_PTHREADTYPES_H_WIN32
-#define PACE_SYS_PTHREADTYPES_H_WIN32
-
-#include "pace/win32/schedtypes.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_PTHREAD_ATTR_T
-#define PACE_PTHREAD_ATTR_T 1
-  typedef struct pthread_attr_t
-  {
-    int init_;
-    int detach_state_;
-    int policy_;
-    pace_sched_param sparam_;
-    int inherit_sched_;
-    int contention_scope_;
-    pace_size_t guard_size_;
-    int stackaddr_set_ ;
-    void * stack_addr_;
-    pace_size_t stack_size_;
-  } pace_pthread_attr_t;
-#endif /* PACE_PTHREAD_ATTR_T */
-
-#ifndef PACE_PTHREAD_COND_T
-#define PACE_PTHREAD_COND_T 1
-  typedef struct pthread_cond_t
-  {
-#if 0
-    /* Concurrent access protection. */
-    struct _pthread_fastlock __c_lock;
-
-    /* Pool of threads waiting. */
-    _pthread_descr __c_waiting;
-#endif
-    int a;
-
-  } pace_pthread_cond_t;
-
-#endif /* PACE_PTHREAD_COND_T */
-
-#ifndef PACE_PTHREAD_CONDATTR_T
-#define PACE_PTHREAD_CONDATTR_T 1
-  typedef struct pthread_condattr_t
-  {
-    int not_used_;
-  } pace_pthread_condattr_t;
-#endif /* PACE_PTHREAD_CONDATTR_T */
-
-#ifndef PACE_PTHREAD_KEY_T
-#define PACE_PTHREAD_KEY_T 1
-  typedef unsigned int pthread_key_t;
-  typedef pthread_key_t pace_pthread_key_t;
-#endif /* PACE_PTHREAD_KEY_T */
-
-#ifndef PACE_PTHREAD_MUTEX_T
-#define PACE_PTHREAD_MUTEX_T 1
-  typedef struct pthread_mutex_t
-  {
-    /* Depth of recursive locking */
-    int recursive_count_;
-
-#if 0
-    /* Owner thread (if recursive or errcheck) */
-    _pthread_descr __m_owner;
-#endif
-
-    /* Mutex kind: fast, recursive or errcheck */
-    int type_;
-
-    union
-    {
-       HANDLE proc_mutex_;
-       CRITICAL_SECTION thr_mutex_;
-    };
-
-#if 0
-    /* Underlying fast lock */
-    struct _pthread_fastlock __m_lock;
-#endif
-
-  } pace_pthread_mutex_t;
-#endif /* PACE_PTHREAD_MUTEX_T */
-
-#ifndef PACE_PTHREAD_MUTEXATTR_T
-#define PACE_PTHREAD_MUTEXATTR_T
-  typedef struct pthread_mutexattr_t
-  {
-    int mutex_kind_;
-  } pace_pthread_mutexattr_t;
-#endif /* PACE_PTHREAD_MUTEXATTR_T */
-
-#ifndef PACE_PTHREAD_ONCE
-#define PACE_PTHREAD_ONCE
-
-  typedef int pthread_once_t;
-  typedef pthread_once_t pace_pthread_once_t;
-
-#endif /* PACE_PTHREAD_ONCE */
-
-#ifndef PACE_PTHREAD_T
-#define PACE_PTHREAD_T
-  typedef HANDLE pace_pthread_t;
-  typedef DWORD pace_idpthread_t;
-#endif /* PACE_PTHREAD_T */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_PTHREADTYPES_H_WIN32 */
diff --git a/PACE/pace/win32/pwd.c b/PACE/pace/win32/pwd.c
deleted file mode 100644
index bb58fd5ce40..00000000000
--- a/PACE/pace/win32/pwd.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/pwd.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/pwd.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/pwd.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/win32/pwd.h b/PACE/pace/win32/pwd.h
deleted file mode 100644
index f66e326d96c..00000000000
--- a/PACE/pace/win32/pwd.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/pwd.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_PWD_H_WIN32
-#define PACE_PWD_H_WIN32
-
-#include "pace/sys/types.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_PASSWD
-#define PACE_PASSWD
-  typedef struct passwd { int a_; } pace_passwd;
-#endif /* PACE_PASSWD */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_PWD_H_WIN32 */
diff --git a/PACE/pace/win32/pwd.inl b/PACE/pace/win32/pwd.inl
deleted file mode 100644
index 24e9f7b1f10..00000000000
--- a/PACE/pace/win32/pwd.inl
+++ /dev/null
@@ -1,72 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/pwd.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_SD_UOF)
-PACE_INLINE
-pace_passwd *
-pace_getpwuid (pace_uid_t uid)
-{
-  pace_passwd * retval = (pace_passwd*)0;
-  PACE_UNUSED_ARG (uid);
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_SD_UOF */
-
-#if (PACE_HAS_POSIX_SDR_UOF)
-PACE_INLINE
-int
-pace_getpwuid_r (pace_uid_t uid,
-                 pace_passwd * pwd,
-                 char * buffer,
-                 pace_size_t bufsize,
-                 pace_passwd ** result)
-{
-  PACE_UNUSED_ARG (uid);
-  PACE_UNUSED_ARG (pwd);
-  PACE_UNUSED_ARG (buffer);
-  PACE_UNUSED_ARG (bufsize);
-  PACE_UNUSED_ARG (result);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SDR_UOF */
-
-#if (PACE_HAS_POSIX_SD_UOF)
-PACE_INLINE
-pace_passwd *
-pace_getpwnam (const char * name)
-{
-  pace_passwd * retval = (pace_passwd*)0;
-  PACE_UNUSED_ARG (name);
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_SD_UOF */
-
-#if (PACE_HAS_POSIX_SDR_UOF)
-PACE_INLINE
-int
-pace_getpwnam_r (const char * name,
-                 pace_passwd * pwd,
-                 char * buffer,
-                 pace_size_t bufsize,
-                 pace_passwd ** result)
-{
-  PACE_UNUSED_ARG (name);
-  PACE_UNUSED_ARG (pwd);
-  PACE_UNUSED_ARG (buffer);
-  PACE_UNUSED_ARG (bufsize);
-  PACE_UNUSED_ARG (result);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SDR_UOF */
diff --git a/PACE/pace/win32/sched.c b/PACE/pace/win32/sched.c
deleted file mode 100644
index 9438ab245c5..00000000000
--- a/PACE/pace/win32/sched.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/sched.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/sched.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/sched.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/win32/sched.h b/PACE/pace/win32/sched.h
deleted file mode 100644
index 6c04ae6b995..00000000000
--- a/PACE/pace/win32/sched.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/sched.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SCHED_H_WIN32
-#define PACE_SCHED_H_WIN32
-
-  /* These definitions are used in other files.
-   * Separate the declarations from the definitions to avoid circular
-   * inclusion. ie: some other funcs just need the typedefs and structs. */
-
-#include "pace/win32/schedtypes.h"
-#include "pace/time.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SCHED_H_WIN32 */
diff --git a/PACE/pace/win32/sched.inl b/PACE/pace/win32/sched.inl
deleted file mode 100644
index 06577337db6..00000000000
--- a/PACE/pace/win32/sched.inl
+++ /dev/null
@@ -1,103 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/sched.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_get_priority_max (int policy)
-{
-  PACE_UNUSED_ARG (policy);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_get_priority_min (int policy)
-{
-  PACE_UNUSED_ARG (policy);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_getparam (pace_pid_t pid,
-                     pace_sched_param * param)
-{
-  PACE_UNUSED_ARG (pid);
-  PACE_UNUSED_ARG (param);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_rr_get_interval (pace_pid_t pid,
-                            pace_timespec * interval)
-{
-  PACE_UNUSED_ARG (pid);
-  PACE_UNUSED_ARG (interval);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_setparam (pace_pid_t pid,
-                     const pace_sched_param * param)
-{
-  PACE_UNUSED_ARG (pid);
-  PACE_UNUSED_ARG (param);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_getscheduler (pace_pid_t pid)
-{
-  PACE_UNUSED_ARG (pid);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_setscheduler (pace_pid_t pid,
-                         int policy,
-                         const pace_sched_param * param)
-{
-  PACE_UNUSED_ARG (pid);
-  PACE_UNUSED_ARG (policy);
-  PACE_UNUSED_ARG (param);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sched_yield ()
-{
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/win32/schedtypes.h b/PACE/pace/win32/schedtypes.h
deleted file mode 100644
index b3358e0c5db..00000000000
--- a/PACE/pace/win32/schedtypes.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/schedtypes.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-/* Keep sched types defined here as they need to be in more than one
- * file and otherwise cause circular dependencies.
-
- * Do NOT include this file directly!! Please include "pace/sched.h". */
-
-#ifndef PACE_SYS_SCHEDTYPES_H_WIN32
-#define PACE_SYS_SCHEDTYPES_H_WIN32
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /* These are defined via POSIX, but win32 is not POSIX compliant!
-   * So please forgive me for these (non pace prefix) sins! */
-
-#ifndef SCHED_OTHER
-#define SCHED_OTHER 0
-#endif /* SCHED_RR */
-
-#ifndef SCHED_FIFO
-#define SCHED_FIFO 1
-#endif /* SCHED_FIFO */
-
-#ifndef SCHED_RR
-#define SCHED_RR 2
-#endif /* SCHED_RR */
-
-#ifndef PACE_SCHED_OTHER
-#define PACE_SCHED_OTHER SCHED_OTHER
-#endif /* PACE_SCHED_OTHER */
-
-#ifndef PACE_SCHED_FIFO
-#define PACE_SCHED_FIFO SCHED_FIFO
-#endif /* PACE_SCHED_FIFO */
-
-#ifndef PACE_SCHED_RR
-#define PACE_SCHED_RR SCHED_RR
-#endif /* PACE_SCHED_RR */
-
-#ifndef PACE_SCHED_PARAM
-#define PACE_SCHED_PARAM 1
-  typedef struct sched_param
-  {
-    int sched_priority;
-  } pace_sched_param;
-#endif
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_SCHEDTYPES_H_WIN32 */
diff --git a/PACE/pace/win32/semaphore.c b/PACE/pace/win32/semaphore.c
deleted file mode 100644
index 23728df5c29..00000000000
--- a/PACE/pace/win32/semaphore.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/semaphore.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/semaphore.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/semaphore.inl"
-#endif /* ! PACE_HAS_INLINE */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-# include <stdio.h>
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-sem_close (pace_sem_t * sem)
-{
-  PACE_WIN32CALL_RETURN
-    (PACE_ADAPT_RETVAL
-     (CloseHandle (sem), pace_result_), int, -1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-sem_destroy (pace_sem_t * sem)
-{
-  PACE_WIN32CALL_RETURN
-    (PACE_ADAPT_RETVAL
-     (CloseHandle (sem), pace_result_), int, -1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-sem_init (pace_sem_t * sem, int pshared, unsigned int value)
-{
-  PACE_UNUSED_ARG (pshared);
-
-  /* Create the semaphore with its value initialized to <count> and
-     its maximum value initialized to <max>.
-
-     How do we want to call CreateSemaphore? What about the char *?
-   */
-  *sem = CreateSemaphore (0, value, 2147483647, "noname");
-
-  if (*sem == 0)
-    {
-      PACE_FAIL_RETURN (-1);
-    }
-  /* NOTREACHED */
-  else
-    {
-      return 0;
-    }
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-sem_post (pace_sem_t * sem)
-{
-  PACE_WIN32CALL_RETURN
-    (PACE_ADAPT_RETVAL
-     (ReleaseSemaphore (*sem, 1, 0), pace_result_), int, -1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-sem_trywait (pace_sem_t * sem)
-{
-  int result = WaitForSingleObject (*sem, 0);
-
-  if (result == WAIT_OBJECT_0)
-    {
-      return 0;
-    }
-  else
-    {
-      if (result == WAIT_TIMEOUT)
-        {
-          errno = EBUSY;
-        }
-      else
-        {
-          errno = GetLastError ();
-        }
-      /* This is a hack, we need to find an appropriate mapping... */
-      return -1;
-    }
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-sem_wait (pace_sem_t * sem)
-{
-  switch (WaitForSingleObject (*sem, INFINITE))
-    {
-    case WAIT_OBJECT_0:
-      return 0;
-    default:
-      /* This is a hack, we need to find an appropriate mapping... */
-      errno = GetLastError ();
-      return -1;
-    }
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
diff --git a/PACE/pace/win32/semaphore.h b/PACE/pace/win32/semaphore.h
deleted file mode 100644
index 7abd89211f0..00000000000
--- a/PACE/pace/win32/semaphore.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/semaphore.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SEMAPHORE_H_WIN32
-#define PACE_SEMAPHORE_H_WIN32
-
-#include <windows.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_SEM_T
-#define PACE_SEM_T
-  typedef HANDLE pace_sem_t;
-#endif /* PACE_SEM_T */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int sem_close (pace_sem_t * sem);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int sem_destroy (pace_sem_t * sem);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int sem_init (pace_sem_t * sem, int pshared, unsigned int value);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  PACE_INLINE pace_sem_t * sem_open (const char * name, int oflag, ...);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int sem_post (pace_sem_t * sem);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int sem_trywait (pace_sem_t * sem);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int sem_wait (pace_sem_t * sem);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SEMAPHORE_H_WIN32 */
diff --git a/PACE/pace/win32/semaphore.inl b/PACE/pace/win32/semaphore.inl
deleted file mode 100644
index dea94013317..00000000000
--- a/PACE/pace/win32/semaphore.inl
+++ /dev/null
@@ -1,108 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/semaphore.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include <io.h>
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_close (pace_sem_t * sem)
-{
-  return sem_close (sem);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_destroy (pace_sem_t * sem)
-{
-  return sem_destroy (sem);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_getvalue (pace_sem_t * sem, int * sval)
-{
-  PACE_UNUSED_ARG (sem);
-  PACE_UNUSED_ARG (sval);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_init (pace_sem_t * sem,
-               int pshared,
-               unsigned int value)
-{
-  return sem_init (sem, pshared, value);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_sem_t *
-pace_sem_open (const char * name, int oflag, ...)
-{
-  PACE_UNUSED_ARG (name);
-  PACE_UNUSED_ARG (oflag);
-  return (pace_sem_t)NULL;
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_post (pace_sem_t * sem)
-{
-  return sem_post (sem);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_trywait (pace_sem_t * sem)
-{
-  return sem_trywait (sem);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_unlink (const char * name)
-{
-#if defined (__BORLANDC__)
-  return unlink (name);
-#else /* __BORLANDC__ */
-  return _unlink (name);
-#endif /* __BORLANDC__ */
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sem_wait (pace_sem_t * sem)
-{
-  return sem_wait (sem);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
diff --git a/PACE/pace/win32/setjmp.c b/PACE/pace/win32/setjmp.c
deleted file mode 100644
index b245f6fe3c1..00000000000
--- a/PACE/pace/win32/setjmp.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/setjmp.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/setjmp.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/setjmp.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/win32/setjmp.h b/PACE/pace/win32/setjmp.h
deleted file mode 100644
index bd8b44ad1fd..00000000000
--- a/PACE/pace/win32/setjmp.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/setjmp.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SETJMP_H_WIN32
-#define PACE_SETJMP_H_WIN32
-
-#include <setjmp.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-# define PACE_SIGJLEN 128
-
-# ifndef PACE_JMP_BUF
-# define PACE_JMP_BUF
-  typedef jmp_buf pace_jmp_buf;
-#endif /* PACE_JMP_BUF */
-
-# ifndef PACE_SIGJMP_BUF
-# define PACE_SIGJMP_BUF
-  typedef long sigjmp_buf[PACE_SIGJLEN];
-  typedef sigjmp_buf pace_sigjmp_buf;
-#endif /* PACE_SIGJMP_BUF */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SETJMP_H_WIN32 */
diff --git a/PACE/pace/win32/setjmp.inl b/PACE/pace/win32/setjmp.inl
deleted file mode 100644
index d3be714dfd4..00000000000
--- a/PACE/pace/win32/setjmp.inl
+++ /dev/null
@@ -1,36 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/setjmp.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void
-pace_longjmp (pace_jmp_buf env, int val)
-{
-  longjmp (env, val);
-  return;
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-void
-pace_siglongjmp (pace_sigjmp_buf env, int val)
-{
-  PACE_UNUSED_ARG (env);
-  PACE_UNUSED_ARG (val);
-  PACE_ERRNO_NO_SUPPORT ();
-  return;
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
diff --git a/PACE/pace/win32/signal.c b/PACE/pace/win32/signal.c
deleted file mode 100644
index f0d1685971a..00000000000
--- a/PACE/pace/win32/signal.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/signal.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/signal.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/signal.inl"
-#endif /* ! PACE_HAS_INLINE */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-int
-sigaction (int sig, const pace_sigaction_s * act,
-           pace_sigaction_s * oact)
-{
-  pace_sigaction_s sa;
-
-  if (oact == 0)
-    {
-      oact = &sa;
-    }
-
-  if (act == 0)
-    {
-      oact->sa_handler = signal (sig, SIG_IGN);
-      signal (sig, oact->sa_handler);
-    }
-  else
-    {
-      oact->sa_handler = signal (sig, act->sa_handler);
-    }
-  return (oact->sa_handler == SIG_ERR ? -1 : 0);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
diff --git a/PACE/pace/win32/signal.h b/PACE/pace/win32/signal.h
deleted file mode 100644
index 8795f8726b6..00000000000
--- a/PACE/pace/win32/signal.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/signal.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-
-#ifndef PACE_SIGNAL_H_WIN32
-#define PACE_SIGNAL_H_WIN32
-
-#include "pace/sys/types.h"
-#include "pace/time.h"
-#include <signal.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_SIGATOMIC_T
-#define PACE_SIGATOMIC_T
-  typedef sig_atomic_t pace_sig_atomic_t;
-#endif /* PACE_SIGATOMIC_T */
-
-#ifndef PACE_SIGSET_T
-#define PACE_SIGSET_T
-  enum { PACE_SIG_BITS = 4 };
-  typedef struct /* sigset_t */ {
-    /* signal set type */
-    unsigned int sigbits_[PACE_SIG_BITS];
-  } pace_sigset_t;
-#endif /* PACE_SIGSET_T */
-
-#ifndef PACE_SIGACTION_S
-#define PACE_SIGACTION_S
-  typedef void (__cdecl *pace_sig_pf)(int);
-  typedef struct /* sigaction */ {
-    int sa_flags;
-    pace_sig_pf sa_handler;
-    pace_sigset_t sa_mask;
-  }  pace_sigaction_s;
-#endif /* PACE_SIGACTION_S */
-
-#ifndef PACE_SIGINFO_T
-#define PACE_SIGINFO_T
-  typedef struct /* siginfo_t */ {
-
-    PACE_HANDLE si_handle_;
-    // Win32 HANDLE that has become signaled.
-
-    PACE_HANDLE *si_handles_;
-    // Array of Win32 HANDLEs all of which have become signaled.
-  } pace_siginfo_t;
-# endif /* PACE_SIGINFO_T */
-
-#ifndef PACE_SIGEVENT
-  typedef struct sigevent pace_sigevent;
-#endif /* PACE_SIGEVENT */
-
-#ifndef PACE_SIGVAL
-  typedef union sigval pace_sigval;
-#endif /* PACE_SIGVAL */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-  int sigaction (int sig, const pace_sigaction_s * act,
-                 pace_sigaction_s * oact);
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SIGNAL_H_WIN32 */
diff --git a/PACE/pace/win32/signal.inl b/PACE/pace/win32/signal.inl
deleted file mode 100644
index 437d609f926..00000000000
--- a/PACE/pace/win32/signal.inl
+++ /dev/null
@@ -1,193 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/signal.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_kill (pace_pid_t pid, int sig)
-{
-  PACE_UNUSED_ARG (pid);
-  PACE_UNUSED_ARG (sig);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_raise (int sig)
-{
-  PACE_UNUSED_ARG (sig);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigaction (int sig, const pace_sigaction_s * act,
-                pace_sigaction_s * oact)
-{
-  return sigaction (sig, act, oact);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigaddset (pace_sigset_t * set, int signo)
-{
-  PACE_UNUSED_ARG (set);
-  PACE_UNUSED_ARG (signo);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigemptyset (pace_sigset_t * set)
-{
-  PACE_UNUSED_ARG (set);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigdelset (pace_sigset_t * set, int signo)
-{
-  PACE_UNUSED_ARG (set);
-  PACE_UNUSED_ARG (signo);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigfillset (pace_sigset_t * set)
-{
-  /* PACE_SIG_BITS is an enum defined in PACE/pace/win32/signal.inl */
-  int i = 0;
-  for ( ; i < PACE_SIG_BITS; ++i)
-  {
-    set->sigbits_[i] = ~(unsigned int)0;
-  }
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigismember (const pace_sigset_t * set, int signo)
-{
-  PACE_UNUSED_ARG (set);
-  PACE_UNUSED_ARG (signo);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void
-(*pace_signal(int sig, void (*func)(int)))(int)
-{
-  return signal (sig, func);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigpending (pace_sigset_t * set)
-{
-  PACE_UNUSED_ARG (set);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigprocmask (int how, const pace_sigset_t * set,
-                  pace_sigset_t * oset)
-{
-  PACE_UNUSED_ARG (how);
-  PACE_UNUSED_ARG (set);
-  PACE_UNUSED_ARG (oset);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sigqueue (pace_pid_t pid, int signo,
-               const pace_sigval value)
-{
-  PACE_UNUSED_ARG (pid);
-  PACE_UNUSED_ARG (signo);
-  PACE_UNUSED_ARG (value);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigsuspend (const pace_sigset_t * sigmask)
-{
-  PACE_UNUSED_ARG (sigmask);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sigtimedwait (const pace_sigset_t * set, pace_siginfo_t * info,
-                   const pace_timespec * timeout)
-{
-  PACE_UNUSED_ARG (set);
-  PACE_UNUSED_ARG (info);
-  PACE_UNUSED_ARG (timeout);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sigwait (const pace_sigset_t * set, int * sig)
-{
-  PACE_UNUSED_ARG (set);
-  PACE_UNUSED_ARG (sig);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_sigwaitinfo (const pace_sigset_t * set, pace_siginfo_t * info)
-{
-  PACE_UNUSED_ARG (set);
-  PACE_UNUSED_ARG (info);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/win32/socket.c b/PACE/pace/win32/socket.c
deleted file mode 100644
index 682a843fe1b..00000000000
--- a/PACE/pace/win32/socket.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * $Id$
- */
-
-#include "pace/sys/socket.h"
-
-/*
- * Empty for win32.
- */
diff --git a/PACE/pace/win32/socket.h b/PACE/pace/win32/socket.h
deleted file mode 100644
index bfaaaab9953..00000000000
--- a/PACE/pace/win32/socket.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * $Id$
- *
- * Empty for win32.
- */
diff --git a/PACE/pace/win32/socket.inl b/PACE/pace/win32/socket.inl
deleted file mode 100644
index 62d778da847..00000000000
--- a/PACE/pace/win32/socket.inl
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * $Id$
- */
-
-/*
- * Empty for win32.
- */
diff --git a/PACE/pace/win32/stat.c b/PACE/pace/win32/stat.c
deleted file mode 100644
index 1f2bb2fabe5..00000000000
--- a/PACE/pace/win32/stat.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/stat.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/sys/stat.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/stat.inl"
-#endif /* ! PACE_HAS_INLINE */
-
-#include <windows.h>
-#include <direct.h>
-
-#if (PACE_HAS_POSIX_FS_UOF)
-int
-pace_win32_mkdir (const char * path, pace_mode_t mode)
-{
-  PACE_UNUSED_ARG (mode);
-# if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-  PACE_OSCALL_RETURN (_mkdir ((char *) path), int, -1);
-# elif defined (PACE_WINCE)
-  PACE_WIN32CALL_RETURN
-    (PACE_ADAPT_RETVAL
-     (CreateDirectory (path, NULL), pace_result_), int, -1);
-# else
-  PACE_OSCALL_RETURN (_mkdir (path), int, -1);
-# endif /* PACE_WIN32 */
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
diff --git a/PACE/pace/win32/stat.h b/PACE/pace/win32/stat.h
deleted file mode 100644
index e05363468ad..00000000000
--- a/PACE/pace/win32/stat.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/stat.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_STAT_H_WIN32
-#define PACE_SYS_STAT_H_WIN32
-
-#include "pace/sys/types.h"
-#include <sys/stat.h>
-#include <io.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_S_IRGRP S_IRGRP
-#define PACE_S_IROTH S_IROTH
-#define PACE_S_IRUSR S_IRUSR
-#define PACE_S_IRWXG S_IRWXG
-#define PACE_S_IRWXO S_IRWXO
-#define PACE_S_IRWXU S_IRWXU
-#define PACE_S_ISBLK S_ISBLK
-#define PACE_S_ISCHR S_ISCHR
-#define PACE_S_ISDIR S_ISDIR
-#define PACE_S_ISFIFO S_ISFIFO
-#define PACE_S_ISGID S_SIGID
-#define PACE_S_ISREG S_ISREG
-#define PACE_S_ISUID S_ISUID
-#define PACE_S_IWGRP S_IWGRP
-#define PACE_S_IWOTH S_IWOTH
-#define PACE_S_IWUSR S_IWUSR
-#define PACE_S_IXGRP S_IXGRP
-#define PACE_S_IXOTH S_IXOTH
-#define PACE_S_IXUSR S_IXUSR
-#define PACE_S_TYPEISMQ S_TYPEISMQ
-#define PACE_S_TYPEISSEM S_TYPEISSEM
-#define PACE_S_TYPEISMQ S_TYPEISMQ
-#define PACE_S_TYPEISSEM S_TYPEISSEM
-#define PACE_S_TYPEISSHM S_TYPEISSHM
-
-#ifndef PACE_STAT
-#define PACE_STAT
-  typedef struct stat pace_stat_s;
-#endif /* PACE_STAT */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-  int pace_win32_mkdir (const char * path, pace_mode_t mode);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_STAT_H_WIN32 */
diff --git a/PACE/pace/win32/stat.inl b/PACE/pace/win32/stat.inl
deleted file mode 100644
index 4ebc17eed86..00000000000
--- a/PACE/pace/win32/stat.inl
+++ /dev/null
@@ -1,99 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/stat.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_FA_UOF)
-PACE_INLINE
-int
-pace_chmod (const char * path, pace_mode_t mode)
-{
-  PACE_UNUSED_ARG (path);
-  PACE_UNUSED_ARG (mode);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FA_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_fchmod (PACE_HANDLE fildes, pace_mode_t mode)
-{
-  PACE_UNUSED_ARG (fildes);
-  PACE_UNUSED_ARG (mode);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_fstat (PACE_HANDLE fildes, pace_stat_s * buf)
-{
-  /* There are two impl in ACE. This is the simpler. But requires
-   * you to close the temporary file desc. */
-  int retval = -1;
-  int fd = _open_osfhandle ((long) fildes, 0);
-  if (fd != -1)
-    {
-      retval = _fstat (fd, (struct _stat *) buf);
-    }
-
-  _close (fd);
-
-  /* Remember to close the file handle. */
-  return retval;
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_mkdir (const char * path, pace_mode_t mode)
-{
-  return pace_win32_mkdir (path, mode);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_F_UOF)
-PACE_INLINE
-int
-pace_mkfifo (const char * path, pace_mode_t mode)
-{
-  PACE_UNUSED_ARG (path);
-  PACE_UNUSED_ARG (mode);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_F_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_stat (const char * path, pace_stat_s * buf)
-{
-  return _stat (path, (struct _stat *)buf);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FA_UOF)
-PACE_INLINE
-pace_mode_t
-pace_umask (pace_mode_t cmask)
-{
-#if defined (__BORLANDC__)
-  return umask (cmask);
-#else /* __BORLANDC__ */
-  return _umask (cmask);
-#endif /* __BORLANDC__ */
-}
-#endif /* PACE_HAS_POSIX_FA_UOF */
diff --git a/PACE/pace/win32/stdio.c b/PACE/pace/win32/stdio.c
deleted file mode 100644
index 3aae70d32ca..00000000000
--- a/PACE/pace/win32/stdio.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/stdio.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/stdio.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/stdio.inl"
-#endif /* ! PACE_HAS_INLINE */
-
-
-#if (PACE_HAS_POSIX_FM_UOF)
-int
-pace_win32_fseek (FILE * stream, long offset, int whence)
-{
-# if SEEK_SET != FILE_BEGIN \
-  || SEEK_CUR != FILE_CURRENT \
-  || SEEK_END != FILE_END
-  //#error Windows NT is evil AND rude!
-  switch (whence)
-    {
-    case SEEK_SET:
-      whence = FILE_BEGIN;
-      break;
-    case SEEK_CUR:
-      whence = FILE_CURRENT;
-      break;
-    case SEEK_END:
-      whence = FILE_END;
-      break;
-    default:
-      errno = EINVAL;
-      return -1; // rather safe than sorry
-    }
-#   endif  /* SEEK_SET != FILE_BEGIN
-           || SEEK_CUR != FILE_CURRENT
-           || SEEK_END != FILE_END */
-  PACE_OSCALL_RETURN (fseek (stream, offset, whence), int, -1);
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
diff --git a/PACE/pace/win32/stdio.h b/PACE/pace/win32/stdio.h
deleted file mode 100644
index f765305c77c..00000000000
--- a/PACE/pace/win32/stdio.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/stdio.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_STDIO_H_WIN32
-#define PACE_STDIO_H_WIN32
-
-#include <stdio.h>
-#include <stdarg.h>
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  typedef FILE PACE_FILE;
-  typedef fpos_t pace_fpos_t;
-
-# ifndef PACE_BUSIZ
-# define PACE_BUFSIZ BUFSIZ
-# endif /* PACE_BUFSIZ */
-
-# ifndef PACE_EOF
-# define PACE_EOF EOF
-# endif /* PACE_EOF */
-
-# ifndef PACE_FILENAME_MAX
-# define PACE_FILENAME_MAX FILENAME_MAX
-# endif /* PACE_FILENAME_MAX */
-
-# ifndef PACE_L_ctermid
-# define PACE_L_ctermid L_ctermid
-# endif /* PACE_L_ctermid */
-
-# ifndef PACE_L_cuserid
-# define PACE_L_cuserid L_cuserid
-# endif /* PACE_L_cuserid */
-
-# ifndef PACE_NULL
-# define PACE_NULL NULL
-# endif /* PACE_NULL */
-
-# ifndef PACE_SEEK_CUR
-# define PACE_SEEK_CUR SEEK_CUR
-# endif /* PACE_SEEK_CUR */
-
-# ifndef PACE_SEEK_END
-# define PACE_SEEK_END SEEK_END
-# endif /* PACE_SEEK_END */
-
-# ifndef PACE_SEEK_SET
-# define PACE_SEEK_SET SEEK_SET
-# endif /* PACE_SEEK_SET */
-
-# ifndef PACE_TMP_MAX
-# define PACE_TMP_MAX TMP_MAX
-# endif /* PACE_TMP_MAX */
-
-# ifndef pace_stderr
-# define pace_stderr stderr
-# endif /* pace_stderr */
-
-# ifndef pace_stdout
-# define pace_stdout stdout
-# endif /* pace_stdout */
-
-# ifndef pace_stdin
-# define pace_stdin stdin
-# endif
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T 1
-  typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_STDIO_H_WIN32 */
diff --git a/PACE/pace/win32/stdio.inl b/PACE/pace/win32/stdio.inl
deleted file mode 100644
index 180140149b9..00000000000
--- a/PACE/pace/win32/stdio.inl
+++ /dev/null
@@ -1,464 +0,0 @@
-/* $Id$ -*- C -*-
-
- * ===========================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/stdio.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * =========================================================================== */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-void
-pace_clearerr (FILE * stream)
-{
-  clearerr (stream);
-  return;
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fclose (FILE * stream)
-{
-  return fclose (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-char *
-pace_ctermid (char * s)
-{
-  char * retval = (char*)0;
-  PACE_UNUSED_ARG (s);
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-FILE *
-pace_fdopen (int fildes,
-             const char * type)
-{
-#if defined (__BORLANDC__)
-  return fdopen (fildes, (char *)type);
-#else /* __BORLANDC__ */
-  return fdopen (fildes, type);
-#endif /* __BORLANDC__ */
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_ferror (FILE * stream)
-{
-  return ferror (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_feof (FILE * stream)
-{
-  return feof (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fflush (FILE * stream)
-{
-  return fflush (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fileno (FILE * stream)
-{
-  return fileno (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fgetc (FILE * stream)
-{
-  return fgetc (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_fgetpos(PACE_FILE * stream,
-             pace_fpos_t * pos)
-{
-  return fgetpos (stream, pos);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-char *
-pace_fgets (char * s,
-            int n,
-            FILE * stream)
-{
-  return fgets (s, n, stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-void
-pace_flockfile (FILE * file)
-{
-  PACE_UNUSED_ARG (file);
-  PACE_ERRNO_NO_SUPPORT ();
-  return;
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-FILE *
-pace_fopen (const char * filename,
-            const char * mode)
-{
-  return fopen (filename, mode);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fputc (int c, FILE * stream)
-{
-  return fputc (c, stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_fputs (const char * s, FILE * stream)
-{
-  return fputs (s, stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-size_t
-pace_fread (void * ptr,
-            size_t size,
-            size_t number_of_items,
-            FILE * stream)
-{
-  return fread (ptr,
-                size,
-                number_of_items,
-                stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-FILE *
-pace_freopen (const char * filename,
-              const char * mode,
-              FILE * stream)
-{
-  return freopen (filename, mode, stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-int
-pace_fseek (FILE * stream,
-            long offset,
-            int whence)
-{
-  return fseek (stream, offset, whence);
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_fsetpos(PACE_FILE * stream, const pace_fpos_t * pos)
-{
-  return fsetpos (stream, pos);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-long
-pace_ftell (FILE * stream)
-{
-  return ftell (stream);
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-int
-pace_ftrylockfile (FILE * file)
-{
-  PACE_UNUSED_ARG (file);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-void
-pace_funlockfile (FILE * file)
-{
-  PACE_UNUSED_ARG(file);
-  PACE_ERRNO_NO_SUPPORT ();
-  return;
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-pace_size_t
-pace_fwrite(const void * ptr,
-            pace_size_t size, pace_size_t nmemb,
-            PACE_FILE * stream)
-{
-  return fwrite (ptr, size, nmemb, stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_getc (FILE * stream)
-{
-  return getc (stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-int
-pace_getc_unlocked (FILE * stream)
-{
-  PACE_UNUSED_ARG (stream);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_getchar ()
-{
-  return getchar ();
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-int
-pace_getchar_unlocked ()
-{
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-char *
-pace_gets (char * s)
-{
-  return gets (s);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-void
-pace_perror (const char * s)
-{
-  perror (s);
-  return;
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_putc (int c, FILE * stream)
-{
-  return putc (c, stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-int
-pace_putc_unlocked (int c,
-                    FILE * stream)
-{
-  PACE_UNUSED_ARG (c);
-  PACE_UNUSED_ARG (stream);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_putchar (int c)
-{
-  return putchar (c);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FL_UOF)
-PACE_INLINE
-int
-pace_putchar_unlocked (int c)
-{
-  PACE_UNUSED_ARG(c);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FL_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_puts (const char * s)
-{
-  return puts (s);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_remove (const char * path)
-{
-  return remove (path);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_rename (const char * old_name,
-             const char * new_name)
-{
-  return rename (old_name, new_name);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-void
-pace_rewind (FILE * stream)
-{
-  rewind (stream);
-  return;
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-void
-pace_setbuf (FILE * stream, char * buf)
-{
-  setbuf (stream, buf);
-  return;
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_setvbuf(PACE_FILE * stream,
-             char * buf,
-             int mode, pace_size_t size)
-{
-  return setvbuf (stream, buf, mode, size);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-FILE *
-pace_tmpfile ()
-{
- return tmpfile ();
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-char *
-pace_tmpnam (char * s)
-{
- return tmpnam (s);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_ungetc (int c, FILE * stream)
-{
- return ungetc (c, stream);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_vfprintf (PACE_FILE * stream,
-               const char * format,
-               va_list arg)
-{
-  return vfprintf (stream, format, arg);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_vprintf (const char * format,
-              va_list arg)
-{
-  return vprintf (format, arg);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_vsprintf (char * s,
-               const char * format,
-               va_list arg)
-{
-  return vsprintf (s, format, arg);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/win32/stdlib.c b/PACE/pace/win32/stdlib.c
deleted file mode 100644
index 2d6f593e75d..00000000000
--- a/PACE/pace/win32/stdlib.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/stdlib.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/stdlib.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/stdlib.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/win32/stdlib.h b/PACE/pace/win32/stdlib.h
deleted file mode 100644
index 01a93eded34..00000000000
--- a/PACE/pace/win32/stdlib.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/stdlib.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_STDLIB_H_WIN32
-#define PACE_STDLIB_H_WIN32
-
-#include <stdlib.h>
-#include "pace/unistd.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  typedef div_t pace_div_t;
-  typedef ldiv_t pace_ldiv_t;
-
-# ifndef PACE_EXIT_FAILURE
-# define PACE_EXIT_FAILURE EXIT_FAILURE
-# endif /* PACE_EXIT_FAILURE */
-
-# ifndef PACE_EXIT_SUCCESS
-# define PACE_EXIT_SUCCESS EXIT_SUCCESS
-# endif /* PACE_EXIT_SUCCESS */
-
-# ifndef PACE_MB_CUR_MAX
-# define PACE_MB_CUR_MAX MB_CUR_MAX
-# endif /* PACE_MB_CUR_MAX */
-
-# ifndef PACE_NULL
-# define PACE_NULL NULL
-# endif /* PACE_NULL */
-
-# ifndef PACE_RAND_MAX
-# define PACE_RAND_MAX RAND_MAX
-# endif /* PACE_RAND_MAX */
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T 1
-  typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-#ifndef PACE_WCHAR_T
-#define PACE_WCHAR_T 1
-  typedef wchar_t pace_wchar_t;
-#endif /* PACE_WCHAR_T */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_STDLIB_H_WIN32 */
diff --git a/PACE/pace/win32/stdlib.inl b/PACE/pace/win32/stdlib.inl
deleted file mode 100644
index 3597e1954dc..00000000000
--- a/PACE/pace/win32/stdlib.inl
+++ /dev/null
@@ -1,303 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/stdlib.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include <stdlib.h>
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-void
-pace_abort (void)
-{
-  abort ();
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_abs (int val)
-{
-  return abs (val);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int 
-pace_atexit (void (*func)(void))
-{
-  return atexit (func);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-double
-pace_atof (const char * str)
-{
-  return atof (str);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_atoi (const char * str)
-{
-  return atoi (str);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-long
-pace_atol (const char * str)
-{
-  return atol (str);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void *
-pace_bsearch (const void *key, const void *base,
-              size_t nel, size_t size,
-              int (*compar)(const void *,const void *))
-{
-  return bsearch (key, base, nel, size, compar);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_div_t 
-pace_div (int numer, int denom)
-{
-  return div (numer, denom);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-void
-pace_exit (int status)
-{
-  exit (status);
-  return;
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-char *
-pace_getenv (const char * name)
-{
-  return getenv (name);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-long int
-pace_labs (long int j)
-{
-  return labs (j);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_ldiv_t
-pace_ldiv (long int numer, long int denom)
-{
-  return ldiv (numer, denom);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mblen (const char* s, pace_size_t n)
-{
-  return mblen (s, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_size_t
-pace_mbstowcs (pace_wchar_t* pwcs,
-               const char* s,
-               pace_size_t n)
-{
-  return mbstowcs (pwcs, s, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_mbtowc (pace_wchar_t* pwc,
-             const char* s,
-             pace_size_t n)
-{
-  return mbtowc (pwc, s, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void
-pace_qsort (void * base, size_t nel, size_t width,
-            int (*compar)(const void *, const void *))
-{
-  qsort (base, nel, width, compar);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_rand ()
-{
-  return rand ();
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void
-pace_srand (unsigned int seed)
-{
-  srand (seed);
-  return;
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-int
-pace_rand_r (unsigned int *seed)
-{
-  PACE_UNUSED_ARG (seed);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-double
-pace_strtod (const char* nptr,
-             char** endptr)
-{
-  return strtod (nptr, endptr);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_strtol (const char* nptr,
-             char** endptr,
-             int base)
-{
-  return strtol (nptr, endptr, base);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-unsigned long int
-pace_strtoul (const char* nptr,
-              char** endptr,
-              int base)
-{
-  return strtoul (nptr, endptr, base);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_system (const char* string)
-{
-  PACE_UNUSED_ARG (string);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_size_t
-pace_wcstombs (char* s,
-               const pace_wchar_t* pwcs,
-               pace_size_t n)
-{
-  return wcstombs (s, pwcs, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_wctomb (char* s, pace_wchar_t wchar)
-{
-  return wctomb (s, wchar);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-/* Memory Management. */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void *
-pace_malloc (size_t size)
-{
-  return malloc (size);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void *
-pace_calloc (size_t nelem, size_t elsize)
-{
-  return calloc (nelem, elsize);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void
-pace_free (void * ptr)
-{
-  free (ptr);
-  return;
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void *
-pace_realloc (void * ptr, size_t size)
-{
-  return realloc (ptr, size);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-
-
-
diff --git a/PACE/pace/win32/string.c b/PACE/pace/win32/string.c
deleted file mode 100644
index f7f79cc7fab..00000000000
--- a/PACE/pace/win32/string.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/string.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/string.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/string.inl"
-#endif /* ! PACE_HAS_INLINE */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-char *
-strtok_r (char * s, const char * sep, char ** lasts)
-{
-  int l_org;
-  int l_sub;
-
-  if (s == 0)
-    s = *lasts;
-  else
-    *lasts = s;
-  if (*s == 0)                  // We have reached the end
-    return 0;
-  l_org = pace_strlen (s);
-  l_sub = pace_strlen (s = pace_strtok (s, sep));
-  *lasts = s + l_sub;
-  if (l_sub != l_org)
-    *lasts += 1;
-  return s ;
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
diff --git a/PACE/pace/win32/string.h b/PACE/pace/win32/string.h
deleted file mode 100644
index fdc5be5ab96..00000000000
--- a/PACE/pace/win32/string.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/string.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_STRING_H_WIN32
-#define PACE_STRING_H_WIN32
-
-#include "pace/unistd.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#if !defined (PACE_NULL)
-# define PACE_NULL NULL
-#endif /* NULL */
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T
-  typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-char * strtok_r (char * s, const char * sep, char ** lasts);
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_STRING_H_WIN32 */
diff --git a/PACE/pace/win32/string.inl b/PACE/pace/win32/string.inl
deleted file mode 100644
index be669a7048c..00000000000
--- a/PACE/pace/win32/string.inl
+++ /dev/null
@@ -1,198 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/string.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include <string.h>
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void *
-pace_memchr (const void *s, int c, pace_size_t n)
-{
-  return memchr (s, c, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_memcmp (const void *s1, const void *s2, pace_size_t n)
-{
-  return memcmp (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void *
-pace_memcpy (void * s1, const void * s2, pace_size_t n)
-{
-  return memcpy (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void *
-pace_memmove (void *s1, const void *s2, pace_size_t n)
-{
-  return memmove (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-void *
-pace_memset (void *s, int c, pace_size_t n)
-{
-  return memset (s, c, n);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strcat (char * s1, const char * s2)
-{
-  return strcat (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strncat (char * s1, const char * s2, size_t n)
-{
-  return strncat (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strchr (const char * s, int c)
-{
-  return strchr (s, c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strrchr (const char * s, int c)
-{
-  return strrchr (s, c);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_strcmp (const char * s1, const char * s2)
-{
-  return strcmp (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-int
-pace_strncmp (const char * s1, const char * s2, size_t n)
-{
-  return strncmp (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strcpy (char * s1, const char * s2)
-{
-  return strcpy (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strncpy (char * s1, const char * s2, size_t n)
-{
-  return strncpy (s1, s2, n);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-size_t
-pace_strcspn (const char * s1, const char * s2)
-{
-  return strcspn (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-size_t
-pace_strspn (const char * s1, const char * s2)
-{
-  return strspn (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-size_t
-pace_strlen (const char * s)
-{
-  return strlen (s);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strpbrk (const char * s1, const char * s2)
-{
-  return strpbrk (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strstr (const char * s1, const char * s2)
-{
-  return strstr (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_strtok (char * s1, const char * s2)
-{
-  return strtok (s1, s2);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-char *
-pace_strtok_r (char * s, const char * sep, char ** lasts)
-{
-  return strtok_r (s, sep, lasts);
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-
diff --git a/PACE/pace/win32/termios.c b/PACE/pace/win32/termios.c
deleted file mode 100644
index d5d32ced9a6..00000000000
--- a/PACE/pace/win32/termios.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/termios.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/termios.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/termios.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/win32/termios.h b/PACE/pace/win32/termios.h
deleted file mode 100644
index 8d491f5f460..00000000000
--- a/PACE/pace/win32/termios.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/termios.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_TERMIOS_H_WIN32
-#define PACE_SYS_TERMIOS_H_WIN32
-
-#include "pace/sys/types.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS) */
-
-#ifndef PACE_CC_T
-#define PACE_CC_T
-  /* Temporary until we correctly emulate these funcs on WIN32. */
-  typedef int cc_t;
-  typedef cc_t pace_cc_t;
-#endif /* PACE_CC_T */
-
-#ifndef PACE_SPEED_T
-#define PACE_SPEED_T
-  /* Temporary until we correctly emulate these funcs on WIN32. */
-  typedef int speed_t;
-  typedef speed_t pace_speed_t;
-#endif /* PACE_SPEED_T */
-
-#ifndef PACE_TCFLAG_T
-#define PACE_TCFLAG_T
-  /* Temporary until we correctly emulate these funcs on WIN32. */
-  typedef int tcflag_t;
-  typedef tcflag_t pace_tcflag_t;
-#endif /* PACE_TCFLAG_T */
-
-#ifndef PACE_TERMIOS
-#define PACE_TERMIOS
-  /* Temporary until we correctly emulate these funcs on WIN32. */
-  typedef struct termios { int a_; } pace_termios;
-#endif /* PACE_TERMIOS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_TERMIOS_H_WIN32 */
diff --git a/PACE/pace/win32/termios.inl b/PACE/pace/win32/termios.inl
deleted file mode 100644
index 4b9905bff62..00000000000
--- a/PACE/pace/win32/termios.inl
+++ /dev/null
@@ -1,124 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/termios.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-speed_t
-pace_cfgetospeed (const pace_termios * termiosp)
-{
-  PACE_UNUSED_ARG (termiosp);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_cfsetospeed (pace_termios * termios_p, pace_speed_t speed)
-{
-  PACE_UNUSED_ARG (termios_p);
-  PACE_UNUSED_ARG (speed);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-speed_t
-pace_cfgetispeed (const pace_termios * termios_p)
-{
-  PACE_UNUSED_ARG (termios_p);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_cfsetispeed (pace_termios * termios_p, pace_speed_t speed)
-{
-  PACE_UNUSED_ARG (termios_p);
-  PACE_UNUSED_ARG (speed);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcdrain (PACE_HANDLE fildes)
-{
-  PACE_UNUSED_ARG (fildes);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcgetattr (PACE_HANDLE fildes, pace_termios * termios_p)
-{
-  PACE_UNUSED_ARG (fildes);
-  PACE_UNUSED_ARG (termios_p);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcflow (PACE_HANDLE fildes, int action)
-{
-  PACE_UNUSED_ARG (fildes);
-  PACE_UNUSED_ARG (action);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcflush (PACE_HANDLE fildes, int queue_selector)
-{
-  PACE_UNUSED_ARG (fildes);
-  PACE_UNUSED_ARG (queue_selector);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcsendbreak (PACE_HANDLE fildes, int duration)
-{
-  PACE_UNUSED_ARG (fildes);
-  PACE_UNUSED_ARG (duration);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_tcsetattr (PACE_HANDLE fildes,
-                int optional_actions,
-                const pace_termios * termios_p)
-{
-  PACE_UNUSED_ARG (fildes);
-  PACE_UNUSED_ARG (optional_actions);
-  PACE_UNUSED_ARG (termios_p);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
diff --git a/PACE/pace/win32/time.c b/PACE/pace/win32/time.c
deleted file mode 100644
index f5ed95f59fa..00000000000
--- a/PACE/pace/win32/time.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/time.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/time.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/time.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/win32/time.h b/PACE/pace/win32/time.h
deleted file mode 100644
index aeaf12e0771..00000000000
--- a/PACE/pace/win32/time.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/time.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_TIME_H_WIN32
-#define PACE_TIME_H_WIN32
-
-#include <time.h>
-#include "pace/sys/types.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-# ifndef PACE_CLK_TCK
-# define PACE_CLK_TCK CLK_TCK
-# endif /* PACE_CLK_TCK */
-
-# ifndef PACE_CLOCKS_PER_SEC
-# define PACE_CLOCKS_PER_SEC CLOCKS_PER_SEC
-# endif /* PACE_CLOCKS_PER_SEC */
-
-# ifndef PACE_CLOCK_REALTIME
-# define PACE_CLOCK_REALTIME CLOCK_REALTIME
-# endif /* PACE_CLOCK_REALTIME */
-
-# ifndef PACE_NULL
-# define PACE_NULL NULL
-# endif /* PACE_NULL */
-
-# ifndef PACE_TIMER_ABSTIME
-# define PACE_TIMER_ABSTIME TIMER_ABSTIME
-# endif /* PACE_TIMER_ABSTIME */
-
-#ifndef PACE_CLOCKID_T
-#define PACE_CLOCKID_T 1
-  typedef int clockid_t;
-  typedef clockid_t pace_clockid_t;
-#endif /* PACE_CLOCKID_T */
-
-#ifndef PACE_CLOCK_T
-#define PACE_CLOCK_T 1
-  typedef clock_t pace_clock_t;
-#endif /* PACE_CLOCK_T */
-
-#ifndef PACE_TIMER_T
-#define PACE_TIMER_T 1
-  typedef long timer_t;
-  typedef timer_t pace_timer_t;
-#endif /* PACE_TIMER_T */
-
-#ifndef PACE_TIME_T
-#define PACE_TIME_T 1
-  typedef time_t pace_time_t;
-#endif /* PACE_TIME_T */
-
-#ifndef PACE_TM
-#define PACE_TM 1
-  typedef struct tm pace_tm;
-#endif /* PACE_TM */
-
-#ifndef PACE_TIMESPEC
-#define PACE_TIMESPEC 1
-  typedef struct timespec pace_timespec;
-#endif /* PACE_TIMESPEC */
-
-#ifndef PACE_ITIMERSPEC
-#define PACE_ITIMERSPEC 1
-  typedef struct itimerspec pace_itimerspec;
-#endif /* PACE_ITIMERSPEC */
-
-#ifndef PACE_SIGVAL
-#define PACE_SIGVAL 1
-  typedef union sigval {
-    int sival_int;                 /* integer value */
-    void * sival_ptr;              /* pointer value */
-} pace_sigval;
-#endif  /* PACE_SIGVAL */
-
-#ifndef PACE_SIGEVENT
-#define PACE_SIGEVENT 1
-  typedef struct sigevent {
-    int sigev_notify;             /* notification mode */
-    int sigev_signo;              /* signal number */
-    union sigval sigev_value;     /* signal value */
-    void (*sigev_notify_function)(union sigval);
-    pace_pthread_attr_t * sigev_notify_attributes;
-    int __sigev_pad2;
-  } pace_sigevent;
-#endif /* PACE_SIGEVENT */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_TIME_H_WIN32 */
diff --git a/PACE/pace/win32/time.inl b/PACE/pace/win32/time.inl
deleted file mode 100644
index 7550ef274ad..00000000000
--- a/PACE/pace/win32/time.inl
+++ /dev/null
@@ -1,265 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/time.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_asctime (const struct tm * time)
-{
-  return asctime (time);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-char *
-pace_asctime_r (const struct tm * time, char * buf)
-{
-  char * retval = (char*)0;
-  PACE_UNUSED_ARG (time);
-  PACE_UNUSED_ARG (buf);
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-pace_clock_t
-pace_clock (void)
-{
-  return clock ();
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-double
-pace_difftime (pace_time_t time1, pace_time_t time2)
-{
-  return difftime (time1, time2);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_clock_getres (clockid_t clock_id,
-                   struct timespec * res)
-{
-  PACE_UNUSED_ARG (clock_id);
-  PACE_UNUSED_ARG (res);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_clock_gettime (clockid_t clock_id,
-                    struct timespec * tp)
-{
-  PACE_UNUSED_ARG (clock_id);
-  PACE_UNUSED_ARG (tp);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_clock_settime (clockid_t clock_id,
-                    const struct timespec * tp)
-{
-  PACE_UNUSED_ARG (clock_id);
-  PACE_UNUSED_ARG (tp);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-char *
-pace_ctime (const time_t * clock)
-{
-  return ctime (clock);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-char *
-pace_ctime_r (const time_t * clock, char * buf)
-{
-  char * retval = (char*)0;
-  PACE_UNUSED_ARG (clock);
-  PACE_UNUSED_ARG (buf);
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-struct tm *
-pace_gmtime (const time_t * clock)
-{
-  return gmtime (clock);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-struct tm *
-pace_gmtime_r (const time_t * clock, struct tm * result)
-{
-  struct tm * retval = (struct tm*)0;
-  PACE_UNUSED_ARG (clock);
-  PACE_UNUSED_ARG (result);
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-struct tm *
-pace_localtime (const time_t * clock)
-{
-  return localtime (clock);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLSR_UOF)
-PACE_INLINE
-struct tm *
-pace_localtime_r (const time_t * clock, struct tm * result)
-{
-  struct tm * retval = (struct tm*)0;
-  PACE_UNUSED_ARG (clock);
-  PACE_UNUSED_ARG (result);
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_CLSR_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-time_t
-pace_mktime (struct tm * timeptr)
-{
-  return mktime (timeptr);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_nanosleep (const struct timespec * rqtp,
-                struct timespec * rmtp)
-{
-  PACE_UNUSED_ARG (rqtp);
-  PACE_UNUSED_ARG (rmtp);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-size_t
-pace_strftime (char * s, size_t maxsize,
-               const char * format,
-               const struct tm * timeptr)
-{
-  return strftime (s, maxsize, format, timeptr);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-time_t
-pace_time (time_t * tloc)
-{
-  return time (tloc);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_timer_create (clockid_t clock_id,
-                   struct sigevent * evp,
-                   pace_timer_t * timerid)
-{
-  PACE_UNUSED_ARG (clock_id);
-  PACE_UNUSED_ARG (evp);
-  PACE_UNUSED_ARG (timerid);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_timer_delete (pace_timer_t timerid)
-{
-  PACE_UNUSED_ARG (timerid);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_timer_getoverrun (pace_timer_t timerid)
-{
-  PACE_UNUSED_ARG (timerid);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_timer_gettime (pace_timer_t timerid,
-                    pace_itimerspec * value)
-{
-  PACE_UNUSED_ARG (timerid);
-  PACE_UNUSED_ARG (value);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_timer_settime (pace_timer_t timerid,
-                    int flags,
-                    const pace_itimerspec * value,
-                    pace_itimerspec * ovalue)
-{
-  PACE_UNUSED_ARG (timerid);
-  PACE_UNUSED_ARG (flags);
-  PACE_UNUSED_ARG (value);
-  PACE_UNUSED_ARG (ovalue);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
-void
-pace_tzset ()
-{
-  _tzset ();
-  return;
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
diff --git a/PACE/pace/win32/times.c b/PACE/pace/win32/times.c
deleted file mode 100644
index d699c0edd36..00000000000
--- a/PACE/pace/win32/times.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/times.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/sys/times.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/times.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/win32/times.h b/PACE/pace/win32/times.h
deleted file mode 100644
index 26a500cbf76..00000000000
--- a/PACE/pace/win32/times.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/times.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_TIMES_H_WIN32
-#define PACE_SYS_TIMES_H_WIN32
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_CLOCK_T
-#define PACE_CLOCK_T
-  /* Temporary until we emulate this correctly. */
-  typedef int clock_t;
-  typedef clock_t pace_clock_t;
-#endif /* PACE_CLOCK_T */
-
-#ifndef PACE_TMS
-#define PACE_TMS
-  /* Temporary until we emulate this correctly. */
-  typedef struct tms { int a_; } pace_tms;
-#endif /* PACE_TMS */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_TIMES_H_WIN32 */
diff --git a/PACE/pace/win32/times.inl b/PACE/pace/win32/times.inl
deleted file mode 100644
index 1f4765882dc..00000000000
--- a/PACE/pace/win32/times.inl
+++ /dev/null
@@ -1,24 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/times.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pace_clock_t
-pace_times (struct tms * buffer)
-{
-  PACE_UNUSED_ARG (buffer);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
diff --git a/PACE/pace/win32/types.h b/PACE/pace/win32/types.h
deleted file mode 100644
index cd6a7b10cd8..00000000000
--- a/PACE/pace/win32/types.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/types.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_TYPES_H_WIN32
-#define PACE_SYS_TYPES_H_WIN32
-
-#include <sys/types.h>
-#if defined (__BORLANDC__)
-# include <windows.h>
-#else /* __BORLANDC__ */
-# include <wtypes.h>
-# include <windef.h>
-#endif /* __BORLANDC__ */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_TCHAR
-#define PACE_TCHAR 1
-  typedef char pace_tchar;
-#endif /* PACE_TCHAR */
-
-#ifndef PACE_HANDLE
-#define PACE_HANDLE HANDLE
-#endif /* PACE_HANDLE */
-
-#ifndef PACE_INVALID_HANDLE
-#define PACE_INVALID_HANDLE (HANDLE)-1
-#endif /* PACE_INVALID_HANDLE */
-
-#ifndef PACE_DEV_T
-#define PACE_DEV_T 1
-  typedef dev_t pace_dev_t;
-#endif /* PACE_DEV_T */
-
-#ifndef PACE_GID_T
-#define PACE_GID_T 1
-  typedef int pace_gid_t;
-#endif /* PACE_GID_T */
-
-#ifndef PACE_INO_T
-#define PACE_INO_T 1
-  typedef ino_t pace_ino_t;
-#endif /* PACE_INO_T */
-
-#ifndef PACE_MODE_T
-#define PACE_MODE_T 1
-  typedef int pace_mode_t;
-#endif /* PACE_MODE_T */
-
-#ifndef PACE_NLINK_T
-#define PACE_NLINK_T 1
-  typedef DWORD pace_nlink_t;
-#endif /* PACE_NLINK_T */
-
-#ifndef PACE_OFF_T
-#define PACE_OFF_T 1
-  typedef off_t pace_off_t;
-#endif /* PACE_OFF_T */
-
-#ifndef PACE_PID_T
-#define PACE_PID_T 1
-  typedef long pace_pid_t;
-#endif /* PACE_PID_T */
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T 1
-  typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-#ifndef PACE_SSIZE_T
-#define PACE_SSIZE_T 1
-  typedef long pace_ssize_t;
-#endif /* PACE_SSIZE_T */
-
-#ifndef PACE_UID_T
-#define PACE_UID_T 1
-  typedef int pace_uid_t;
-#endif /* PACE_UID_T */
-
-#include "pace/win32/pthreadtypes.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_TYPES_H_WIN32 */
diff --git a/PACE/pace/win32/unistd.c b/PACE/pace/win32/unistd.c
deleted file mode 100644
index 1eda995d323..00000000000
--- a/PACE/pace/win32/unistd.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/unistd.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/unistd.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/unistd.inl"
-#endif /* ! PACE_HAS_INLINE */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-int
-pace_win32_close (PACE_HANDLE fildes)
-{
-  PACE_WIN32CALL_RETURN
-    (PACE_ADAPT_RETVAL
-     (CloseHandle (fildes), pace_result_), int, -1);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_HANDLE
-pace_win32_dup (PACE_HANDLE fildes)
-{
-  PACE_HANDLE new_fd;
-  if (DuplicateHandle(GetCurrentProcess (),
-                      fildes,
-                      GetCurrentProcess(),
-                      &new_fd,
-                      0,
-                      TRUE,
-                      DUPLICATE_SAME_ACCESS))
-    {
-      return new_fd;
-    }
-  else
-    {
-      PACE_FAIL_RETURN (PACE_INVALID_HANDLE);
-    }
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-int
-pace_win32_ftruncate (PACE_HANDLE fildes, pace_off_t length)
-{
-  if (SetFilePointer (fildes, length, NULL, FILE_BEGIN) != (unsigned) -1)
-    {
-      PACE_WIN32CALL_RETURN
-        (PACE_ADAPT_RETVAL
-         (SetEndOfFile (fildes), pace_result_), int, -1);
-    }
-  else
-    {
-      PACE_FAIL_RETURN (-1);
-    }
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-pace_off_t
-pace_win32_lseek (PACE_HANDLE fildes, pace_off_t offset, int whence)
-{
-# if SEEK_SET != FILE_BEGIN \
-  || SEEK_CUR != FILE_CURRENT \
-  || SEEK_END != FILE_END
-
-  /* #error Windows NT is evil AND rude! */
-  switch (whence) {
-
-    case SEEK_SET: {
-      whence = FILE_BEGIN;
-      break;
-    }
-    case SEEK_CUR: {
-      whence = FILE_CURRENT;
-      break;
-    }
-    case SEEK_END: {
-      whence = FILE_END;
-      break;
-    }
-    default: {
-      errno = EINVAL;
-      return (off_t)-1; // rather safe than sorry
-    }
-  }
-  PACE_OSCALL_RETURN (lseek (handle, offset, whence), off_t, -1);
-# endif  /* SEEK_SET != FILE_BEGIN || SEEK_CUR != FILE_CURRENT || SEEK_END != FILE_END */
-  DWORD result = SetFilePointer (fildes, offset, NULL, whence);
-  if (result == PACE_SYSCALL_FAILED)
-    {
-      off_t retval = -1;
-      PACE_FAIL_RETURN (retval);
-    }
-  else
-    {
-      return result;
-    }
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-pace_ssize_t
-pace_win32_write (PACE_HANDLE fildes, const void * buf, size_t nbyte)
-{
-  DWORD bytes_written; /* This is set to 0 byte WriteFile. */
-
-  if (WriteFile (fildes, buf, nbyte, &bytes_written, 0))
-    {
-      return (pace_ssize_t) bytes_written;
-    }
-  else
-    {
-      PACE_FAIL_RETURN (-1);
-    }
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-pace_ssize_t
-pace_win32_read (PACE_HANDLE fildes, void * buf, size_t nbyte)
-{
-  DWORD ok_len;
-
-  if (ReadFile (fildes, buf, nbyte, &ok_len, 0))
-    {
-      return (pace_ssize_t) ok_len;
-    }
-  else
-    {
-      PACE_FAIL_RETURN (-1);
-    }
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
diff --git a/PACE/pace/win32/unistd.h b/PACE/pace/win32/unistd.h
deleted file mode 100644
index 1292cea5bd9..00000000000
--- a/PACE/pace/win32/unistd.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/unistd.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_UNISTD_H_WIN32
-#define PACE_UNISTD_H_WIN32
-
-#include "pace/sys/types.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-# ifndef PACE_F_OK
-# define PACE_F_OK F_OK
-# endif /* PACE_F_OK */
-
-# ifndef PACE_NULL
-# define PACE_NULL NULL
-# endif /* PACE_NULL */
-
-# ifndef PACE_R_OK
-# define PACE_R_OK R_OK
-# endif /* PACE_R_OK */
-
-# ifndef PACE_SEEK_CUR
-# define PACE_SEEK_CUR SEEK_CUR
-# endif /* PACE_SEEK_CUR */
-
-# ifndef PACE_SEEK_END
-# define PACE_SEEK_END SEEK_END
-# endif /* PACE_SEEK_END */
-
-# ifndef PACE_SEEK_SET
-# define PACE_SEEK_SET SEEK_SET
-# endif /* PACE_SEEK_SET */
-
-# ifndef PACE_STDERR_FILENO
-# define PACE_STDERR_FILENO STDERR_FILENO
-# endif /* PACE_STDERR_FILENO */
-
-# ifndef PACE_STDIN_FILENO
-# define PACE_STDIN_FILENO STDIN_FILENO
-# endif /* PACE_STDIN_FILENO */
-
-# ifndef PACE_STDOUT_FILENO
-# define PACE_STDOUT_FILENO STDOUT_FILENO
-# endif /* PACE_STDOUT_FILENO */
-
-# ifndef PACE_W_OK
-# define PACE_W_OK W_OK
-# endif /* PACE_W_OK */
-
-# ifndef PACE_X_OK
-# define PACE_X_OK X_OK
-# endif /* PACE_X_OK */
-
-/* _POSIX _PC _SC Macros go here */
-
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T 1
-typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
-
-#ifndef PACE_SSIZE_T
-#define PACE_SSIZE_T 1
-typedef ssize_t pace_ssize_t;
-#endif /* PACE_SSIZE_T */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-  int pace_win32_close (PACE_HANDLE fildes);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-  PACE_HANDLE pace_win32_dup (PACE_HANDLE fildes);
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-  int pace_win32_ftruncate (PACE_HANDLE fildes, pace_off_t length);
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-  pace_off_t pace_win32_lseek (PACE_HANDLE fildes,
-                               pace_off_t offset,
-                               int whence);
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-  pace_ssize_t pace_win32_write (PACE_HANDLE fildes,
-                                 const void * buf,
-                                 pace_size_t nbyte);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-  pace_ssize_t pace_win32_read (PACE_HANDLE fildes,
-                                void * buf,
-                                pace_size_t nbyte);
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_UNISTD_H_WIN32 */
-
-
-
-
diff --git a/PACE/pace/win32/unistd.inl b/PACE/pace/win32/unistd.inl
deleted file mode 100644
index 83f3f2a9e14..00000000000
--- a/PACE/pace/win32/unistd.inl
+++ /dev/null
@@ -1,514 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/unistd.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include <stdarg.h>
-#include <io.h>
-#include <stdio.h>
-#include <direct.h>
-#include <process.h>
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-void
-pace__exit (int status)
-{
- _exit (status);
- return;
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_access (const char * path, int amode)
-{
-  return _access (path, amode);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-unsigned int
-pace_alarm (unsigned int seconds)
-{
-  PACE_UNUSED_ARG (seconds);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_chdir (const char * path)
-{
-#if defined (__BORLANDC__)
-  return chdir (path);
-#else /* __BORLANDC__ */
-  return _chdir (path);
-#endif /* __BORLANDC__ */
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FA_UOF)
-PACE_INLINE
-int
-pace_chown (const char * path, pace_uid_t owner, pace_gid_t group)
-{
-  PACE_UNUSED_ARG (path);
-  PACE_UNUSED_ARG (owner);
-  PACE_UNUSED_ARG (group);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);  
-}
-#endif /* PACE_HAS_POSIX_FA_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-int
-pace_close (PACE_HANDLE fildes)
-{
-  return pace_win32_close (fildes);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-PACE_HANDLE
-pace_dup (PACE_HANDLE fildes)
-{
-  return pace_win32_dup (fildes);
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-PACE_HANDLE
-pace_dup2 (PACE_HANDLE fildes, PACE_HANDLE fildes2)
-{
-  PACE_HANDLE retval = (void*)0;
-  PACE_UNUSED_ARG (fildes);
-  PACE_UNUSED_ARG (fildes2);
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-int
-pace_execv (const char * path,
-            char * const argv[])
-{
-#if defined (__BORLANDC__) || defined(__MINGW32__)
-  return execv (path, argv);
-#else /* __BORLANDC__ || __MINGW32__ */
-  return _execv (path, (const char * const *) argv);
-#endif /* __BORLANDC__ || __MINGW32__ */
-  /* if successful, this operation does NOT return */
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-int
-pace_execve (const char * path,
-             char * const argv[],
-             char * const envp[])
-{
-#if defined (__BORLANDC__) || defined (__MINGW32__)
-  return execve (path, argv, envp);
-#else /* __BORLANDC__ || __MINGW32__ */
-  return _execve (path, (const char *const *) argv,
-                  (const char *const *) envp);
-#endif /* __BORLANDC__ || __MINGW32__ */
-  /* if successful, this operation does NOT return */
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-int
-pace_execvp (const char * file,
-             char * const argv[])
-{
-#if defined (__BORLANDC__) || defined (__MINGW32__)
-  return execvp (file, argv);
-#else /* __BORLANDC__ || __MINGW32__ */
-  return _execvp (file, (const char *const *) argv);
-#endif /* __BORLANDC__ || __MINGW32__ */
-  /* if successful, this operation does NOT return */
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_fdatasync (PACE_HANDLE fildes)
-{
-  PACE_UNUSED_ARG (fildes);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pace_pid_t
-pace_fork ()
-{
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-long
-pace_fpathconf (PACE_HANDLE fildes, int name)
-{
-  PACE_UNUSED_ARG (fildes);
-  PACE_UNUSED_ARG (name);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_fsync (PACE_HANDLE fildes)
-{
-  PACE_UNUSED_ARG (fildes);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_ftruncate (PACE_HANDLE fildes, pace_off_t length)
-{
-  return pace_win32_ftruncate (fildes, length);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-char *
-pace_getcwd (char * buf, size_t size)
-{
-  return getcwd (buf, size);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-pace_uid_t
-pace_getegid ()
-{
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-pace_uid_t
-pace_geteuid ()
-{
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-int
-pace_getgroups (int gidsetsize, pace_gid_t grouplist[])
-{
-  PACE_UNUSED_ARG (gidsetsize);
-  PACE_UNUSED_ARG (grouplist);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-pace_uid_t
-pace_getgid ()
-{
-  pace_uid_t retval = -1;
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-char *
-pace_getlogin ()
-{
-  char * retval = (char*)0;
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_UGR_UOF)
-PACE_INLINE
-int
-pace_getlogin_r (char * name, size_t namesize)
-{
-  PACE_UNUSED_ARG (name);
-  PACE_UNUSED_ARG (namesize);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_UGR_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-pace_pid_t
-pace_getpgrp ()
-{
-  pace_pid_t retval = -1;
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pace_pid_t
-pace_getpid ()
-{
-  return GetCurrentProcessId ();
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pace_pid_t
-pace_getppid ()
-{
-  pace_pid_t retval = -1;
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-pace_uid_t
-pace_getuid ()
-{
-  pace_uid_t retval = -1;
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-int
-pace_isatty (int fildes)
-{
-#if defined (__BORLANDC__) || defined (__MINGW32__)
-  return isatty (fildes);
-#else /* __BORLANDC__ || __MINGW32__ */
-  return _isatty (fildes);
-#endif /* __BORLANDC__ || __MINGW32__ */
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_link (const char * existing, const char * new_link)
-{
-  PACE_UNUSED_ARG (existing);
-  PACE_UNUSED_ARG (new_link);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_FM_UOF)
-PACE_INLINE
-pace_off_t
-pace_lseek (PACE_HANDLE fildes, pace_off_t offset, int whence)
-{
-  return pace_win32_lseek (fildes, offset, whence);
-}
-#endif /* PACE_HAS_POSIX_FM_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-long
-pace_pathconf (const char * path, int name)
-{
-  PACE_UNUSED_ARG (path);
-  PACE_UNUSED_ARG (name);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_pause ()
-{
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_P_UOF)
-PACE_INLINE
-int
-pace_pipe (PACE_HANDLE fildes[2])
-{
-  PACE_UNUSED_ARG (fildes);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_P_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-pace_ssize_t
-pace_read (PACE_HANDLE fildes, void * buf, pace_size_t nbyte)
-{
-  return pace_win32_read (fildes, buf, nbyte);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_rmdir (const char * path)
-{
-  return rmdir (path);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-int
-pace_setgid (pace_gid_t gid)
-{
-  PACE_UNUSED_ARG (gid);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_JC_UOF)
-PACE_INLINE
-int
-pace_setpgid (pace_pid_t pid, pace_pid_t pgid)
-{
-  PACE_UNUSED_ARG (pid);
-  PACE_UNUSED_ARG (pgid);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_JC_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-pace_pid_t
-pace_setsid ()
-{
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);  
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_UG_UOF)
-PACE_INLINE
-int
-pace_setuid (pace_uid_t uid)
-{
-  PACE_UNUSED_ARG (uid);
-  PACE_ERRNO_NO_SUPPORT_RETURN (uid);
-}
-#endif /* PACE_HAS_POSIX_UG_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-unsigned int
-pace_sleep (unsigned int seconds)
-{
-  Sleep (seconds * PACE_ONE_SECOND_IN_MSECS);
-  return 0;
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_SP_UOF)
-PACE_INLINE
-long
-pace_sysconf (int name)
-{
-  PACE_UNUSED_ARG (name);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SP_UOF */
-
-#if (PACE_HAS_POSIX_JC_UOF)
-PACE_INLINE
-pace_pid_t
-pace_tcgetpgrp (PACE_HANDLE fildes)
-{
-  pace_pid_t retval = -1;
-  PACE_UNUSED_ARG (fildes);
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_JC_UOF */
-
-#if (PACE_HAS_POSIX_JC_UOF)
-PACE_INLINE
-int
-pace_tcsetpgrp (PACE_HANDLE fildes, pace_pid_t pgrp_id)
-{
-  PACE_UNUSED_ARG (fildes);
-  PACE_UNUSED_ARG (pgrp_id);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_JC_UOF */
-
-#if (PACE_HAS_POSIX_DS_UOF)
-PACE_INLINE
-char *
-pace_ttyname (PACE_HANDLE fildes)
-{
-  char * retval = (char*) 0;
-  PACE_UNUSED_ARG (fildes);
-  PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-}
-#endif /* PACE_HAS_POSIX_DS_UOF */
-
-#if (PACE_HAS_POSIX_NONUOF_FUNCS)
-PACE_INLINE
-int
-pace_ttyname_r (PACE_HANDLE fildes,
-                char * name,
-                size_t namesize)
-{
-  PACE_UNUSED_ARG (fildes);
-  PACE_UNUSED_ARG (name);
-  PACE_UNUSED_ARG (namesize);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_unlink (const char * path)
-{
-  return _unlink (path);
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if (PACE_HAS_POSIX_DI_UOF)
-PACE_INLINE
-pace_ssize_t
-pace_write (PACE_HANDLE fildes, const void * buf, size_t nbyte)
-{
-  return pace_win32_write (fildes, buf, nbyte);
-}
-#endif /* PACE_HAS_POSIX_DI_UOF */
diff --git a/PACE/pace/win32/utime.c b/PACE/pace/win32/utime.c
deleted file mode 100644
index cafec0eb6cb..00000000000
--- a/PACE/pace/win32/utime.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/utime.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/utime.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/utime.inl"
-#endif /* ! PACE_HAS_INLINE */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-int
-win32_utime (const char * path, const pace_utimbuf * times)
-{
-  PACE_UNUSED_ARG (path);
-  PACE_UNUSED_ARG (times);
-
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-
-#if 0
-  /* Not yet working */
-     char * path2 = (char*) malloc (sizeof (path));
-     pace_strcpy (path2, path);
-
-     pace_utimbuf * times2 = (pace_utimbuf*) malloc (sizeof (pace_utimbuf);
-     memcpy (times2, times, sizeof times);
-     return _utime (path2, times2);
-#endif
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
diff --git a/PACE/pace/win32/utime.h b/PACE/pace/win32/utime.h
deleted file mode 100644
index 5b90db1bd70..00000000000
--- a/PACE/pace/win32/utime.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/utime.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_UTIME_H_WIN32
-#define PACE_UTIME_H_WIN32
-
-#include "pace/sys/types.h"
-#if defined (__BORLANDC__)
-#include <utime.h>
-#else
-#include <sys/utime.h>
-#endif /* __BORLANDC__ */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#ifndef PACE_UTIMBUF
-#define PACE_UTIMBUF
-  typedef struct _utimbuf pace_utimbuf;
-#endif /* PACE_UTIMBUF */
-
-#if (PACE_HAS_POSIX_FS_UOF)
-  int win32_utime (const char * path, const pace_utimbuf * times);
-#endif /* PACE_HAS_POSIX_FS_UOF */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_UTIME_H_WIN32 */
diff --git a/PACE/pace/win32/utime.inl b/PACE/pace/win32/utime.inl
deleted file mode 100644
index 4a83d7713e0..00000000000
--- a/PACE/pace/win32/utime.inl
+++ /dev/null
@@ -1,33 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/utime.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/string.h"
-
-#if (PACE_HAS_POSIX_FS_UOF)
-PACE_INLINE
-int
-pace_utime (const char * path,
-            const pace_utimbuf * times)
-{
-  /* Emulation not yet finished! Not yet working! */
-
-#if defined (__BORLANDC__)
-  return utime (path, (const struct utimbuf*)times);  
-#else /* __BORLANDC__ */
-  /* Not quite the perfect answer... win32 doesn't take const args. */
-  return _utime ((char*)path, (struct _utimbuf*)times);  
-#endif /* __BORLANDC__ */
-}
-#endif /* PACE_HAS_POSIX_FS_UOF */
diff --git a/PACE/pace/win32/utsname.c b/PACE/pace/win32/utsname.c
deleted file mode 100644
index 9963f1ff624..00000000000
--- a/PACE/pace/win32/utsname.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/utsname.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/sys/utsname.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/utsname.inl"
-#endif /* ! PACE_HAS_INLINE */
-
-#if (PACE_HAS_POSIX_SP_UOF)
-int
-uname (pace_utsname * name)
-{
-  PACE_UNUSED_ARG (name);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-
-#if 0  /* Emulation: Not bug free! :-/ */
-
-  size_t maxnamelen = sizeof name->nodename;
-  pace_strcpy (name->sysname, "Win32");
-
-  OSVERSIONINFO vinfo;
-  vinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-  ::GetVersionEx (&vinfo);
-
-  SYSTEM_INFO sinfo;
-  GetSystemInfo(&sinfo);
-  pace_strcpy (name->sysname, "Win32");
-  
-  if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
-    {
-      /* Get information from the two structures */
-      pace_sprintf (name->release, "Windows NT %d.%d",
-                    vinfo.dwMajorVersion,
-                    vinfo.dwMinorVersion);
-      pace_sprintf (name->version,
-                    "Build %d %s",
-                    vinfo.dwBuildNumber,
-                    vinfo.szCSDVersion);
-      
-      /* We have to make sure that the size of (processor + subtype) is
-         not greater than the size of name->machine.  So we give half
-         the space to the processor and half the space to subtype.  The
-         -1 is necessary for because of the space between processor and
-         subtype in the machine name.
-      */
-      const int bufsize = ((sizeof (name->machine) / sizeof (ACE_TCHAR)) / 2) - 1;
-      char processor[bufsize] = "Unknown";
-      char subtype[bufsize] = "Unknown";
-      
-      WORD arch = sinfo.wProcessorArchitecture;
-      
-      switch (arch)
-        {
-
-        case PROCESSOR_ARCHITECTURE_INTEL: {
-          
-          pace_strcpy (processor, "Intel");
-          if (sinfo.wProcessorLevel == 3)
-            {
-              pace_strcpy (subtype, "80386");
-            }
-          else if (sinfo.wProcessorLevel == 4)
-            {
-              pace_strcpy (subtype, "80486");
-            }
-          else if (sinfo.wProcessorLevel == 5)
-            {
-              pace_strcpy (subtype, "Pentium");
-            }
-          else if (sinfo.wProcessorLevel == 6)
-            {
-              pace_strcpy (subtype, "Pentium Pro");
-            }
-          else if (sinfo.wProcessorLevel == 7)  /* guessing here */
-            {
-              pace_strcpy (subtype, "Pentium II");
-            }
-          break;
-        }
-        
-        case PROCESSOR_ARCHITECTURE_MIPS: {
-          pace_strcpy (processor, "MIPS");
-          pace_strcpy (subtype, "R4000");
-          break;
-        }
-        
-        case PROCESSOR_ARCHITECTURE_ALPHA: {
-          pace_strcpy (processor, "Alpha");
-          pace_sprintf (subtype, "%d", sinfo.wProcessorLevel);
-          break;
-        }
-        
-        case PROCESSOR_ARCHITECTURE_PPC: {
-          pace_strcpy (processor, "PPC");
-          if (sinfo.wProcessorLevel == 1)
-            {
-              pace_strcpy (subtype, "601");
-            }
-          else if (sinfo.wProcessorLevel == 3)
-            {
-              pace_strcpy (subtype, "603");
-            }
-          else if (sinfo.wProcessorLevel == 4)
-            {
-              pace_strcpy (subtype, "604");
-            }
-          else if (sinfo.wProcessorLevel == 6)
-            {
-              pace_strcpy (subtype, "603+");
-            }
-          else if (sinfo.wProcessorLevel == 9)
-            {
-              pace_strcpy (subtype, "804+");
-            }
-          else if (sinfo.wProcessorLevel == 20)
-            {
-              pace_strcpy (subtype, "620");
-            }
-          break;
-        }
-        
-        case PROCESSOR_ARCHITECTURE_UNKNOWN: {
-          
-        default:
-          {
-            /* @@ We could provide WinCE specific info here.  But let's
-               defer that to some later point.
-            */
-            pace_strcpy (processor, "Unknown");
-            break;
-          }
-        }
-        }
-      pace_sprintf(name->machine, "%s %s", processor, subtype);
-    }
-  else if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
-    {
-      // Get Windows 95 Information
-      pace_strcpy (name->release, "Windows 95");
-      pace_sprintf (name->version, "%d", LOWORD (vinfo.dwBuildNumber));
-      if (sinfo.dwProcessorType == PROCESSOR_INTEL_386)
-        {
-          pace_strcpy (name->machine, "Intel 80386");
-        }
-      else if (sinfo.dwProcessorType == PROCESSOR_INTEL_486)
-        {
-          pace_strcpy (name->machine, "Intel 80486");
-        }
-      else if (sinfo.dwProcessorType == PROCESSOR_INTEL_PENTIUM)
-        {
-          pace_strcpy (name->machine, "Intel Pentium");
-        }
-    }
-  else
-    {
-      /* We don't know what this is! */
-      pace_strcpy (name->release, "???");
-      pace_strcpy (name->version, "???");
-      pace_strcpy (name->machine, "???");
-    }
-  
-  /* ick */
-  return ACE_OS::hostname (name->nodename, maxnamelen);
-
-#endif /* emulation */
-
-}
-#endif /* PACE_HAS_POSIX_SP_UOF */
diff --git a/PACE/pace/win32/utsname.h b/PACE/pace/win32/utsname.h
deleted file mode 100644
index c603b6b2c31..00000000000
--- a/PACE/pace/win32/utsname.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/utsname.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_SYS_UTSNAME_H_WIN32
-#define PACE_SYS_UTSNAME_H_WIN32
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-# ifndef PACE_UTSNAME
-# define PACE_UTSNAME
-# define PACE_SYS_NMLN 257
-  typedef struct /* utsname */ {
-    char sysname[PACE_SYS_NMLN];
-    char nodename[PACE_SYS_NMLN];
-    char release[PACE_SYS_NMLN];
-    char version[PACE_SYS_NMLN];
-    char machine[PACE_SYS_NMLN];
-} pace_utsname;
-# endif /* PACE_UTSNAME */
-
-#if (PACE_HAS_POSIX_SP_UOF)
-  int uname (pace_utsname * name);
-#endif /* PACE_HAS_POSIX_SP_UOF */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SYS_UTSNAME_H_WIN32 */
diff --git a/PACE/pace/win32/utsname.inl b/PACE/pace/win32/utsname.inl
deleted file mode 100644
index bc79bb80db4..00000000000
--- a/PACE/pace/win32/utsname.inl
+++ /dev/null
@@ -1,26 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/utsname.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/string.h"
-
-#if (PACE_HAS_POSIX_SP_UOF)
-PACE_INLINE
-int
-pace_uname (pace_utsname * name)
-{
-  PACE_UNUSED_ARG (name);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-}
-#endif /* PACE_HAS_POSIX_SP_UOF */
diff --git a/PACE/pace/win32/wait.c b/PACE/pace/win32/wait.c
deleted file mode 100644
index 6a4308040af..00000000000
--- a/PACE/pace/win32/wait.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/wait.c
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#include "pace/sys/wait.h"
-
-#if !defined (PACE_HAS_INLINE)
-# include "pace/win32/wait.inl"
-#endif /* ! PACE_HAS_INLINE */
diff --git a/PACE/pace/win32/wait.h b/PACE/pace/win32/wait.h
deleted file mode 100644
index cf2b7007afa..00000000000
--- a/PACE/pace/win32/wait.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $Id$
-
- * ============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/wait.h
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================ */
-
-#ifndef PACE_WAIT_H_WIN32
-#define PACE_WAIT_H_WIN32
-
-#include "pace/sys/types.h"
-
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#define PACE_WEXITSTATUS WEXITSTATUS
-#define PACE_WIFEXITED WIFEXITED
-#define PACE_WIFSIGNALED WISIGNALED
-#define PACE_WIFSTOPPED WIFSTOPPED
-#define PACE_WNOHANG WNOHANG
-#define PACE_WSTOPSIG WSTOPSIG
-#define PACE_WTERMSIG WTERMSIG
-#define PACE_WUNTRACED WUNTRACED
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_WAIT_H_WIN32 */
diff --git a/PACE/pace/win32/wait.inl b/PACE/pace/win32/wait.inl
deleted file mode 100644
index 166a0936d10..00000000000
--- a/PACE/pace/win32/wait.inl
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $Id$ -*- C -*-
-
- * =============================================================================
- *
- * = LIBRARY
- *    pace
- *
- * = FILENAME
- *    pace/win32/wait.inl
- *
- * = AUTHOR
- *    Luther Baker
- *
- * ============================================================================= */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pace_pid_t
-pace_wait (int * statloc)
-{
-  PACE_UNUSED_ARG (statloc);
-
-  {
-    pace_pid_t retval = -1;
-    PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-  }
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */
-
-#if (PACE_HAS_POSIX_MP_UOF)
-PACE_INLINE
-pace_pid_t
-pace_waitpid (pace_pid_t pid, int * statloc, int options)
-{
-  PACE_UNUSED_ARG (pid);
-  PACE_UNUSED_ARG (statloc);
-  PACE_UNUSED_ARG (options);
-
-  /* ACE version uses a HANDLE */
-  {
-    pace_pid_t retval = -1;
-    PACE_ERRNO_NO_SUPPORT_RETURN (retval);
-  }
-}
-#endif /* PACE_HAS_POSIX_MP_UOF */