ChangeLogTag:Thu Apr 17 19:26:24 UTC 2003 Don Hinton <dhinton@dresystems.com>

85 files changed, 3005 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 213c19615e5..2658a515feb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,94 @@
+Thu Apr 17 19:26:24 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+	* ace/os_include/aio.h:
+	* ace/os_include/assert.h:
+	* ace/os_include/complex.h:
+	* ace/os_include/cpio.h:
+	* ace/os_include/ctype.h:
+	* ace/os_include/dirent.h:
+	* ace/os_include/dlfcn.h:
+	* ace/os_include/errno.h:
+	* ace/os_include/fcntl.h:
+	* ace/os_include/fenv.h:
+	* ace/os_include/float.h:
+	* ace/os_include/fmtmsg.h:
+	* ace/os_include/fnmatch.h:
+	* ace/os_include/ftw.h:
+	* ace/os_include/glob.h:
+	* ace/os_include/grp.h:
+	* ace/os_include/iconv.h:
+	* ace/os_include/inttypes.h:
+	* ace/os_include/iso646.h:
+	* ace/os_include/langinfo.h:
+	* ace/os_include/libgen.h:
+	* ace/os_include/limits.h:
+	* ace/os_include/local.h:
+	* ace/os_include/math.h:
+	* ace/os_include/monetary.h:
+	* ace/os_include/mqueue.h:
+	* ace/os_include/ndbm.h:
+	* ace/os_include/netdb.h:
+	* ace/os_include/nl_types.h:
+	* ace/os_include/poll.h:
+	* ace/os_include/pthread.h:
+	* ace/os_include/pwd.h:
+	* ace/os_include/regex.h:
+	* ace/os_include/sched.h:
+	* ace/os_include/search.h:
+	* ace/os_include/semaphore.h:
+	* ace/os_include/setjmp.h:
+	* ace/os_include/signal.h:
+	* ace/os_include/spawn.h:
+	* ace/os_include/stdarg.h:
+	* ace/os_include/stdbool.h:
+	* ace/os_include/stddef.h:
+	* ace/os_include/stdint.h:
+	* ace/os_include/stdio.h:
+	* ace/os_include/stdlib.h:
+	* ace/os_include/string.h:
+	* ace/os_include/strings.h:
+	* ace/os_include/stropts.h:
+	* ace/os_include/syslog.h:
+	* ace/os_include/tar.h:
+	* ace/os_include/termios.h:
+	* ace/os_include/tgmath.h:
+	* ace/os_include/time.h:
+	* ace/os_include/trace.h:
+	* ace/os_include/ucontext.h:
+	* ace/os_include/ulimit.h:
+	* ace/os_include/unistd.h:
+	* ace/os_include/utime.h:
+	* ace/os_include/utmpx.h:
+	* ace/os_include/wchar.h:
+	* ace/os_include/wctype.h:
+	* ace/os_include/wordexp.h:
+	* ace/os_include/arpa/inet.h:
+	* ace/os_include/net/if.h:
+	* ace/os_include/netinet/in.h:
+	* ace/os_include/netinet/tcp.h:
+	* ace/os_include/sys/ipc.h:
+	* ace/os_include/sys/mman.h:
+	* ace/os_include/sys/msg.h:
+	* ace/os_include/sys/resource.h:
+	* ace/os_include/sys/select.h:
+	* ace/os_include/sys/sem.h:
+	* ace/os_include/sys/shm.h:
+	* ace/os_include/sys/socket.h:
+	* ace/os_include/sys/stat.h:
+	* ace/os_include/sys/statvfs.h:
+	* ace/os_include/sys/time.h:
+	* ace/os_include/sys/timeb.h:
+	* ace/os_include/sys/times.h:
+	* ace/os_include/sys/types.h:
+	* ace/os_include/sys/uio.h:
+	* ace/os_include/sys/un.h:
+	* ace/os_include/sys/utsname.h:
+	* ace/os_include/sys/wait.h:
+
+          Added new set of headers as part of the Subsetting effort.
+          These headers will be slowly introduced throughout ACE and
+          TAO.
+
 Thu Apr 17 10:52:17 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* ace/iosfwd.h:
@@ -137,7 +228,7 @@ Wed Apr 16 13:35:34 2003  Ossama Othman  <ossama@uci.edu>
           localized in ace/Basic_Types.h.  This reduces maintenance burden
           since a single location need be modified instead of multiple.
 
-Wed Apr 16 19:27:29 UTC 2003  Don Hinton  <dhinton@drestystems.com>
+Wed Apr 16 19:27:29 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         * ace/Get_Opt.{h,cpp}:
 
@@ -150,7 +241,7 @@ Wed Apr 16 19:27:29 UTC 2003  Don Hinton  <dhinton@drestystems.com>
           line text of the last option that was found (or not found in
           the case of an error).  This is especially useful in cases where
           the option was invalid and the caller wants to print out the
-          invalid value.
+          invalid value.  Resolves bug [1338].
 
           Enhanced dump() output.
 
@@ -163,7 +254,7 @@ Wed Apr 16 19:27:29 UTC 2003  Don Hinton  <dhinton@drestystems.com>
           Added the ability to have a default, or unnamed, key.  This
           is done with the help of a new validate_value_name() method
           which deals with the differences between Windows and everything
-          else.
+          else.  Resolves bug [1374].
 
         * ace/Configuration_Import_Export.cpp (import_config):
 
diff --git a/ace/os_include/aio.h b/ace/os_include/aio.h
new file mode 100644
index 00000000000..7112bc56a8b
--- /dev/null
+++ b/ace/os_include/aio.h
@@ -0,0 +1,37 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    aio.h 
+ *  
+ *  asynchronous input and output (REALTIME)
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_AIO_H
+#define ACE_OS_INCLUDE_AIO_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+// Inclusion of the <aio.h> header may make visible symbols defined in 
+// the headers <fcntl.h>, <signal.h>, <sys/types.h>, and <time.h>.
+
+#include "ace/os_include/signal.h" // for sigevent
+
+#if !defined (ACE_LACKS_AIO_H)
+# include /**/ <aio.h>
+#endif /* !ACE_LACKS_AIO_H */
+
+
+#endif /* ACE_OS_INCLUDE_AIO_H */
diff --git a/ace/os_include/arpa/inet.h b/ace/os_include/arpa/inet.h
new file mode 100644
index 00000000000..60d605aaf96
--- /dev/null
+++ b/ace/os_include/arpa/inet.h
@@ -0,0 +1,35 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    inet.h
+ *
+ *  definitions for internet operations
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_ARPA_INET_H
+#define ACE_OS_INCLUDE_ARPA_INET_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/netinet/in.h"
+
+#if !defined (ACE_LACKS_ARPA_INET_H)
+# include /**/ <arpa/inet.h>
+#endif /* !ACE_LACKS_ARPA_INET_H */
+
+// @todo move the ACE_HTONL, etc macros here
+
+#endif /* ACE_OS_INCLUDE_ARPA_INET_H */
diff --git a/ace/os_include/assert.h b/ace/os_include/assert.h
new file mode 100644
index 00000000000..fa4d285085d
--- /dev/null
+++ b/ace/os_include/assert.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    assert.h
+ *
+ *  verify program assertion
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_ASSERT_H
+#define ACE_OS_INCLUDE_ASSERT_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_ASSERT_H)
+# include /**/ <assert.h>
+#endif /* !ACE_LACKS_ASSERT_H */
+
+// @todo define assert macro if needed..
+
+#endif /* ACE_OS_INCLUDE_ASSERT_H */
diff --git a/ace/os_include/complex.h b/ace/os_include/complex.h
new file mode 100644
index 00000000000..f2b8b887218
--- /dev/null
+++ b/ace/os_include/complex.h
@@ -0,0 +1,32 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    complex.h
+ *
+ *  complex arithmetic
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_COMPLEX_H
+#define ACE_OS_INCLUDE_COMPLEX_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_COMPLEX_H)
+# include /**/ <complex.h>
+#endif /* !ACE_LACKS_COMPLEX_H */
+
+
+#endif /* ACE_OS_INCLUDE_COMPLEX_H */
diff --git a/ace/os_include/cpio.h b/ace/os_include/cpio.h
new file mode 100644
index 00000000000..e516796b5e1
--- /dev/null
+++ b/ace/os_include/cpio.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    cpio.h
+ *
+ *  cpio archive values
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_CPIO_H
+#define ACE_OS_INCLUDE_CPIO_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_CPIO_H)
+# include /**/ <cpio.h>
+#endif /* !ACE_LACKS_CPIO_H */
+
+#endif /* ACE_OS_INCLUDE_CPIO_H */
diff --git a/ace/os_include/ctype.h b/ace/os_include/ctype.h
new file mode 100644
index 00000000000..a6a96a49aa7
--- /dev/null
+++ b/ace/os_include/ctype.h
@@ -0,0 +1,35 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    ctype.h
+ *
+ *  character types
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_CTYPE_H
+#define ACE_OS_INCLUDE_CTYPE_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_CTYPE_H)
+# include /**/ <ctype.h>
+#endif /* !ACE_LACKS_CTYPE_H */
+
+// @todo move the is* and is* emulation methods in ACE_OS here
+// and let ACE_OS just call them.
+
+
+#endif /* ACE_OS_INCLUDE_CTYPE_H */
diff --git a/ace/os_include/dirent.h b/ace/os_include/dirent.h
new file mode 100644
index 00000000000..34871020897
--- /dev/null
+++ b/ace/os_include/dirent.h
@@ -0,0 +1,34 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    dirent.h
+ *
+ *  format of directory entries
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_DIRENT_H
+#define ACE_OS_INCLUDE_DIRENT_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_DIRENT_H)
+# include /**/ <dirent.h>
+#endif /* !ACE_LACKS_DIRENT_H */
+
+
+#endif /* ACE_OS_INCLUDE_DIRENT_H */
diff --git a/ace/os_include/dlfcn.h b/ace/os_include/dlfcn.h
new file mode 100644
index 00000000000..125d6cd16b5
--- /dev/null
+++ b/ace/os_include/dlfcn.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    dlfcn.h
+ *
+ *  dynamic linking
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_DLFCN_H
+#define ACE_OS_INCLUDE_DLFCN_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_DLFCN_H)
+# include /**/ <dlfcn.h>
+#endif /* !ACE_LACKS_DLFCN_H */
+
+#endif /* ACE_OS_INCLUDE_DLFCN_H */
diff --git a/ace/os_include/errno.h b/ace/os_include/errno.h
new file mode 100644
index 00000000000..1c4d29170a3
--- /dev/null
+++ b/ace/os_include/errno.h
@@ -0,0 +1,32 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    errno.h
+ *
+ *  system error numbers
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_ERRNO_H
+#define ACE_OS_INCLUDE_ERRNO_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_ERRNO_H)
+# include /**/ <errno.h>
+#endif /* !ACE_LACKS_ERRNO_H */
+
+
+#endif /* ACE_OS_INCLUDE_ERRNO_H */
diff --git a/ace/os_include/fcntl.h b/ace/os_include/fcntl.h
new file mode 100644
index 00000000000..ce5e66bb489
--- /dev/null
+++ b/ace/os_include/fcntl.h
@@ -0,0 +1,36 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    fcntl.h
+ *
+ *  file control options
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_FCNTL_H
+#define ACE_OS_INCLUDE_FCNTL_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/stat.h"
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_FCNTL_H)
+# include /**/ <fcntl.h>
+#endif /* !ACE_LACKS_FCNTL_H */
+
+// @todo move the O_xxx definitions here...
+
+#endif /* ACE_OS_INCLUDE_FCNTL_H */
diff --git a/ace/os_include/fenv.h b/ace/os_include/fenv.h
new file mode 100644
index 00000000000..b24709b1ece
--- /dev/null
+++ b/ace/os_include/fenv.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    fenv.h
+ *
+ *  floating-point environment
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_FENV_H
+#define ACE_OS_INCLUDE_FENV_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_FENV_H)
+# include /**/ <fenv.h>
+#endif /* !ACE_LACKS_FENV_H */
+
+#endif /* ACE_OS_INCLUDE_FENV_H */
diff --git a/ace/os_include/float.h b/ace/os_include/float.h
new file mode 100644
index 00000000000..d911af9d4c8
--- /dev/null
+++ b/ace/os_include/float.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    float.h
+ *
+ *  floating types
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_FLOAT_H
+#define ACE_OS_INCLUDE_FLOAT_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_FLOAT_H)
+# include /**/ <float.h>
+#endif /* !ACE_LACKS_FLOAT_H */
+
+#endif /* ACE_OS_INCLUDE_FLOAT_H */
diff --git a/ace/os_include/fmtmsg.h b/ace/os_include/fmtmsg.h
new file mode 100644
index 00000000000..41ab270d646
--- /dev/null
+++ b/ace/os_include/fmtmsg.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    fmtmsg.h
+ *
+ *  message display structures
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_FMTMSG_H
+#define ACE_OS_INCLUDE_FMTMSG_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_FMTMSG_H)
+# include /**/ <fmtmsg.h>
+#endif /* !ACE_LACKS_FMTMSG_H */
+
+#endif /* ACE_OS_INCLUDE_FMTMSG_H */
diff --git a/ace/os_include/fnmatch.h b/ace/os_include/fnmatch.h
new file mode 100644
index 00000000000..b809ac6340b
--- /dev/null
+++ b/ace/os_include/fnmatch.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    fnmatch.h
+ *
+ *  filename-matching types
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_FNMATCH_H
+#define ACE_OS_INCLUDE_FNMATCH_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_FNMATCH_H)
+# include /**/ <fnmatch.h>
+#endif /* !ACE_LACKS_FNMATCH_H */
+
+#endif /* ACE_OS_INCLUDE_FNMATCH_H */
diff --git a/ace/os_include/ftw.h b/ace/os_include/ftw.h
new file mode 100644
index 00000000000..9cbc3efd1f1
--- /dev/null
+++ b/ace/os_include/ftw.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    ftw.h
+ *
+ *  file tree traversal
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_FTW_H
+#define ACE_OS_INCLUDE_FTW_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/stat.h"
+
+#if !defined (ACE_LACKS_FTW_H)
+# include /**/ <ftw.h>
+#endif /* !ACE_LACKS_FTW_H */
+
+#endif /* ACE_OS_INCLUDE_FTW_H */
diff --git a/ace/os_include/glob.h b/ace/os_include/glob.h
new file mode 100644
index 00000000000..54ea481af7e
--- /dev/null
+++ b/ace/os_include/glob.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    glob.h
+ *
+ *  pathname pattern-matching types
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_GLOB_H
+#define ACE_OS_INCLUDE_GLOB_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_GLOB_H)
+# include /**/ <glob.h>
+#endif /* !ACE_LACKS_GLOB_H */
+
+#endif /* ACE_OS_INCLUDE_GLOB_H */
diff --git a/ace/os_include/grp.h b/ace/os_include/grp.h
new file mode 100644
index 00000000000..436ace6d084
--- /dev/null
+++ b/ace/os_include/grp.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    grp.h
+ *
+ *  group structure
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_GRP_H
+#define ACE_OS_INCLUDE_GRP_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h" // for gid_t
+
+#if !defined (ACE_LACKS_GRP_H)
+# include /**/ <grp.h>
+#endif /* !ACE_LACKS_GRP_H */
+
+#endif /* ACE_OS_INCLUDE_GRP_H */
diff --git a/ace/os_include/iconv.h b/ace/os_include/iconv.h
new file mode 100644
index 00000000000..3b3f4d0047a
--- /dev/null
+++ b/ace/os_include/iconv.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    iconv.h
+ *
+ *  codeset conversion facility
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_ICONV_H
+#define ACE_OS_INCLUDE_ICONV_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h" 
+
+#if !defined (ACE_LACKS_ICONV_H)
+# include /**/ <iconv.h>
+#endif /* !ACE_LACKS_ICONV_H */
+
+#endif /* ACE_OS_INCLUDE_ICONV_H */
diff --git a/ace/os_include/inttypes.h b/ace/os_include/inttypes.h
new file mode 100644
index 00000000000..29ac74ce875
--- /dev/null
+++ b/ace/os_include/inttypes.h
@@ -0,0 +1,36 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    inttypes.h
+ *
+ *  fixed size integer types
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_INTTYPES_H
+#define ACE_OS_INCLUDE_INTTYPES_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/stdint.h"
+
+#if !defined (ACE_LACKS_INTTYPES_H)
+# include /**/ <inttypes.h>
+#endif /* !ACE_LACKS_INTTYPES_H */
+
+// @todo if needbe, we can define the macros if they aren't available.
+
+
+#endif /* ACE_OS_INCLUDE_INTTYPES_H */
diff --git a/ace/os_include/iso646.h b/ace/os_include/iso646.h
new file mode 100644
index 00000000000..0f82c451417
--- /dev/null
+++ b/ace/os_include/iso646.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    iso646.h
+ *
+ *  alternative spellings
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_ISO646_H
+#define ACE_OS_INCLUDE_ISO646_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_ISO646_H)
+# include /**/ <iso646.h>
+#endif /* !ACE_LACKS_ISO646_H */
+
+#endif /* ACE_OS_INCLUDE_ISO646_H */
diff --git a/ace/os_include/langinfo.h b/ace/os_include/langinfo.h
new file mode 100644
index 00000000000..58ac3ed87af
--- /dev/null
+++ b/ace/os_include/langinfo.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    langinfo.h
+ *
+ *  language information constants
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_LANGINFO_H
+#define ACE_OS_INCLUDE_LANGINFO_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/nl_types.h"
+
+#if !defined (ACE_LACKS_LANGINFO_H)
+# include /**/ <langinfo.h>
+#endif /* !ACE_LACKS_LANGINFO_H */
+
+#endif /* ACE_OS_INCLUDE_LANGINFO_H */
diff --git a/ace/os_include/libgen.h b/ace/os_include/libgen.h
new file mode 100644
index 00000000000..592c8d63ddc
--- /dev/null
+++ b/ace/os_include/libgen.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    libgen.h
+ *
+ *  definitions for pattern matching functions
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_LIBGEN_H
+#define ACE_OS_INCLUDE_LIBGEN_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_LIBGEN_H)
+# include /**/ <libgen.h>
+#endif /* !ACE_LACKS_LIBGEN_H */
+
+#endif /* ACE_OS_INCLUDE_LIBGEN_H */
diff --git a/ace/os_include/limits.h b/ace/os_include/limits.h
new file mode 100644
index 00000000000..e71270081f9
--- /dev/null
+++ b/ace/os_include/limits.h
@@ -0,0 +1,34 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    limits.h
+ *
+ *  implementation-defined constants
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_LIMITS_H
+#define ACE_OS_INCLUDE_LIMITS_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/unistd.h"
+
+#if !defined (ACE_LACKS_LIMITS_H)
+# include /**/ <limits.h>
+#endif /* !ACE_LACKS_LIMITS_H */
+
+
+#endif /* ACE_OS_INCLUDE_LIMITS_H */
diff --git a/ace/os_include/local.h b/ace/os_include/local.h
new file mode 100644
index 00000000000..3c2107e7250
--- /dev/null
+++ b/ace/os_include/local.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    local.h
+ *
+ *  category macros
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_LOCAL_H
+#define ACE_OS_INCLUDE_LOCAL_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/stddef.h"
+
+#if !defined (ACE_LACKS_LOCAL_H)
+# include /**/ <local.h>
+#endif /* !ACE_LACKS_LOCAL_H */
+
+#endif /* ACE_OS_INCLUDE_LOCAL_H */
diff --git a/ace/os_include/math.h b/ace/os_include/math.h
new file mode 100644
index 00000000000..6fb95c59415
--- /dev/null
+++ b/ace/os_include/math.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    math.h
+ *
+ *  mathematical declarations
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_MATH_H
+#define ACE_OS_INCLUDE_MATH_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_MATH_H)
+# include /**/ <math.h>
+#endif /* !ACE_LACKS_MATH_H */
+
+#endif /* ACE_OS_INCLUDE_MATH_H */
diff --git a/ace/os_include/monetary.h b/ace/os_include/monetary.h
new file mode 100644
index 00000000000..bcc0ce403d9
--- /dev/null
+++ b/ace/os_include/monetary.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    monetary.h
+ *
+ *  monetary types
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_MONETARY_H
+#define ACE_OS_INCLUDE_MONETARY_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_MONETARY_H)
+# include /**/ <monetary.h>
+#endif /* !ACE_LACKS_MONETARY_H */
+
+#endif /* ACE_OS_INCLUDE_MONETARY_H */
diff --git a/ace/os_include/mqueue.h b/ace/os_include/mqueue.h
new file mode 100644
index 00000000000..b2ef0180037
--- /dev/null
+++ b/ace/os_include/mqueue.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    mqueue.h
+ *
+ *  message queues (REALTIME)
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_MQUEUE_H
+#define ACE_OS_INCLUDE_MQUEUE_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/signal.h"
+
+#if !defined (ACE_LACKS_MQUEUE_H)
+# include /**/ <mqueue.h>
+#endif /* !ACE_LACKS_MQUEUE_H */
+
+#endif /* ACE_OS_INCLUDE_MQUEUE_H */
diff --git a/ace/os_include/ndbm.h b/ace/os_include/ndbm.h
new file mode 100644
index 00000000000..cde3ccf10be
--- /dev/null
+++ b/ace/os_include/ndbm.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    ndbm.h
+ *
+ *  definitions for ndbm database operations
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_NDBM_H
+#define ACE_OS_INCLUDE_NDBM_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_NDBM_H)
+# include /**/ <ndbm.h>
+#endif /* !ACE_LACKS_NDBM_H */
+
+#endif /* ACE_OS_INCLUDE_NDBM_H */
diff --git a/ace/os_include/net/if.h b/ace/os_include/net/if.h
new file mode 100644
index 00000000000..4cdfd331f84
--- /dev/null
+++ b/ace/os_include/net/if.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    if.h
+ *
+ *  sockets local interfaces
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_NET_IF_H
+#define ACE_OS_INCLUDE_NET_IF_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_NET_IF_H)
+# include /**/ <net/if.h>
+#endif /* !ACE_LACKS_NET_IF_H */
+
+#endif /* ACE_OS_INCLUDE_NET_IF_H */
diff --git a/ace/os_include/netdb.h b/ace/os_include/netdb.h
new file mode 100644
index 00000000000..6466dc3ee0b
--- /dev/null
+++ b/ace/os_include/netdb.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    netdb.h
+ *
+ *  definitions for network database operations
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_NETDB_H
+#define ACE_OS_INCLUDE_NETDB_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/netinet/in.h"
+
+#if !defined (ACE_LACKS_NETDB_H)
+# include /**/ <netdb.h>
+#endif /* !ACE_LACKS_NETDB_H */
+
+#endif /* ACE_OS_INCLUDE_NETDB_H */
diff --git a/ace/os_include/netinet/in.h b/ace/os_include/netinet/in.h
new file mode 100644
index 00000000000..9952e01db07
--- /dev/null
+++ b/ace/os_include/netinet/in.h
@@ -0,0 +1,34 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    in.h
+ *
+ *  Internet address family
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_NETINET_IN_H
+#define ACE_OS_INCLUDE_NETINET_IN_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/inttypes.h"
+#include "ace/os_include/sys/socket.h"
+
+#if !defined (ACE_LACKS_NETINET_IN_H)
+# include /**/ <netinet/in.h>
+#endif /* !ACE_LACKS_NETINET_IN_H */
+
+#endif /* ACE_OS_INCLUDE_NETINET_IN_H */
diff --git a/ace/os_include/netinet/tcp.h b/ace/os_include/netinet/tcp.h
new file mode 100644
index 00000000000..ff564cf99fe
--- /dev/null
+++ b/ace/os_include/netinet/tcp.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    tcp.h
+ *
+ *  definitions for the Internet Transmission Control Protocol (TCP)
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_NETINET_TCP_H
+#define ACE_OS_INCLUDE_NETINET_TCP_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_NETINET_TCP_H)
+# include /**/ <netinet/tcp.h>
+#endif /* !ACE_LACKS_NETIINET_TCP_H */
+
+#endif /* ACE_OS_INCLUDE_NETINET_TCP_H */
diff --git a/ace/os_include/nl_types.h b/ace/os_include/nl_types.h
new file mode 100644
index 00000000000..d63b0e05f4f
--- /dev/null
+++ b/ace/os_include/nl_types.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    nl_types.h
+ *
+ *  data types
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_NL_TYPES_H
+#define ACE_OS_INCLUDE_NL_TYPES_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_NL_TYPES_H)
+# include /**/ <nl_types.h>
+#endif /* !ACE_LACKS_nl_types_H */
+
+#endif /* ACE_OS_INCLUDE_NL_TYPES_H */
diff --git a/ace/os_include/poll.h b/ace/os_include/poll.h
new file mode 100644
index 00000000000..c00140f60cd
--- /dev/null
+++ b/ace/os_include/poll.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    poll.h
+ *
+ *  definitions for the poll() function
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_POLL_H
+#define ACE_OS_INCLUDE_POLL_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_POLL_H)
+# include /**/ <poll.h>
+#endif /* !ACE_LACKS_POLL_H */
+
+#endif /* ACE_OS_INCLUDE_POLL_H */
diff --git a/ace/os_include/pthread.h b/ace/os_include/pthread.h
new file mode 100644
index 00000000000..4974da02042
--- /dev/null
+++ b/ace/os_include/pthread.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    pthread.h
+ *
+ *  threads
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_PTHREAD_H
+#define ACE_OS_INCLUDE_PTHREAD_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_PTHREAD_H)
+# include /**/ <pthread.h>
+#endif /* !ACE_LACKS_PTHREAD_H */
+
+#endif /* ACE_OS_INCLUDE_PTHREAD_H */
diff --git a/ace/os_include/pwd.h b/ace/os_include/pwd.h
new file mode 100644
index 00000000000..c38ab7b4418
--- /dev/null
+++ b/ace/os_include/pwd.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    pwd.h
+ *
+ *  password structure
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_PWD_H
+#define ACE_OS_INCLUDE_PWD_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_PWD_H)
+# include /**/ <pwd.h>
+#endif /* !ACE_LACKS_PWD_H */
+
+#endif /* ACE_OS_INCLUDE_PWD_H */
diff --git a/ace/os_include/regex.h b/ace/os_include/regex.h
new file mode 100644
index 00000000000..7bd38057c12
--- /dev/null
+++ b/ace/os_include/regex.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    regex.h
+ *
+ *  regular expression matching types
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_REGEX_H
+#define ACE_OS_INCLUDE_REGEX_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_REGEX_H)
+# include /**/ <regex.h>
+#endif /* !ACE_LACKS_REGEX_H */
+
+#endif /* ACE_OS_INCLUDE_REGEX_H */
diff --git a/ace/os_include/sched.h b/ace/os_include/sched.h
new file mode 100644
index 00000000000..01c4d107bc0
--- /dev/null
+++ b/ace/os_include/sched.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    sched.h
+ *
+ *  execution scheduling (REALTIME)
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SCHED_H
+#define ACE_OS_INCLUDE_SCHED_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/time.h"
+
+#if !defined (ACE_LACKS_SCHED_H)
+# include /**/ <sched.h>
+#endif /* !ACE_LACKS_SCHED_H */
+
+#endif /* ACE_OS_INCLUDE_SCHED_H */
diff --git a/ace/os_include/search.h b/ace/os_include/search.h
new file mode 100644
index 00000000000..82112ceeeee
--- /dev/null
+++ b/ace/os_include/search.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    search.h
+ *
+ *  search tables
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SEARCH_H
+#define ACE_OS_INCLUDE_SEARCH_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_SEARCH_H)
+# include /**/ <search.h>
+#endif /* !ACE_LACKS_SEARCH_H */
+
+#endif /* ACE_OS_INCLUDE_SEARCH_H */
diff --git a/ace/os_include/semaphore.h b/ace/os_include/semaphore.h
new file mode 100644
index 00000000000..9b2b786feec
--- /dev/null
+++ b/ace/os_include/semaphore.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    semaphore.h
+ *
+ *  semaphores (REALTIME)
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SEMAPHORE_H
+#define ACE_OS_INCLUDE_SEMAPHORE_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/time.h"
+
+#if !defined (ACE_LACKS_SEMAPHORE_H)
+# include /**/ <semaphore.h>
+#endif /* !ACE_LACKS_SEMAPHORE_H */
+
+#endif /* ACE_OS_INCLUDE_SEMAPHORE_H */
diff --git a/ace/os_include/setjmp.h b/ace/os_include/setjmp.h
new file mode 100644
index 00000000000..a39f9319689
--- /dev/null
+++ b/ace/os_include/setjmp.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    setjmp.h
+ *
+ *  stack environment declarations
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SETJMP_H
+#define ACE_OS_INCLUDE_SETJMP_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_SETJMP_H)
+# include /**/ <setjmp.h>
+#endif /* !ACE_LACKS_SETJMP_H */
+
+#endif /* ACE_OS_INCLUDE_SETJMP_H */
diff --git a/ace/os_include/signal.h b/ace/os_include/signal.h
new file mode 100644
index 00000000000..7acf2279051
--- /dev/null
+++ b/ace/os_include/signal.h
@@ -0,0 +1,35 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    signal.h
+ *
+ *  signals
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SIGNAL_H
+#define ACE_OS_INCLUDE_SIGNAL_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+#include "ace/os_include/ucontext.h"
+#include "ace/os_include/time.h"
+
+#if !defined (ACE_LACKS_SINGNAL_H)
+# include /**/ <signal.h>
+#endif /* !ACE_LACKS_SIGNAL_H */
+
+#endif /* ACE_OS_INCLUDE_SIGNAL_H */
diff --git a/ace/os_include/spawn.h b/ace/os_include/spawn.h
new file mode 100644
index 00000000000..08f2df89ec5
--- /dev/null
+++ b/ace/os_include/spawn.h
@@ -0,0 +1,35 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    spawn.h
+ *
+ *  spawn (ADVANCED REALTIME)
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SPAWN_H
+#define ACE_OS_INCLUDE_SPAWN_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/signal.h"
+#include "ace/os_include/sys/types.h"
+#include "ace/os_include/sched.h"
+
+#if !defined (ACE_LACKS_SPAWN_H)
+# include /**/ <spawn.h>
+#endif /* !ACE_LACKS_SPAWN_H */
+
+#endif /* ACE_OS_INCLUDE_SPAWN_H */
diff --git a/ace/os_include/stdarg.h b/ace/os_include/stdarg.h
new file mode 100644
index 00000000000..6c2559aa573
--- /dev/null
+++ b/ace/os_include/stdarg.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    stdarg.h
+ *
+ *  handle variable argument list
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_STDARG_H
+#define ACE_OS_INCLUDE_STDARG_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_STDARG_H)
+# include /**/ <stdarg.h>
+#endif /* !ACE_LACKS_STDARG_H */
+
+#endif /* ACE_OS_INCLUDE_STDARG_H */
diff --git a/ace/os_include/stdbool.h b/ace/os_include/stdbool.h
new file mode 100644
index 00000000000..8fda3c21ee4
--- /dev/null
+++ b/ace/os_include/stdbool.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    stdbool.h
+ *
+ *  boolean type and values
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_STDBOOL_H
+#define ACE_OS_INCLUDE_STDBOOL_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_STDBOOL_H)
+# include /**/ <stdbool.h>
+#endif /* !ACE_LACKS_STDBOOL_H */
+
+#endif /* ACE_OS_INCLUDE_STDBOOL_H */
diff --git a/ace/os_include/stddef.h b/ace/os_include/stddef.h
new file mode 100644
index 00000000000..38ee9b10207
--- /dev/null
+++ b/ace/os_include/stddef.h
@@ -0,0 +1,93 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    stddef.h
+ *
+ *  standard type definitions
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+// From http://www.UNIX-systems.org/single_unix_specification/
+
+#ifndef ACE_OS_INCLUDE_STDDEF_H
+#define ACE_OS_INCLUDE_STDDEF_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+// @todo move this to a windows config file
+// Add new macro ACE_LACKS_STDDEF_H
+#if defined (ACE_HAS_WINCE) && _WIN32_WCE < 400 
+# if !define (ACE_LACKS_STDDEF_H)
+#  define ACE_LACKS_STDDEF_H
+#  define ACE_LACKS_PTRDIFF_T
+# endif /* !ACE_LACKS_STDDEF_H */
+#endif /* ACE_HAS_WINCE && _WIN32_WCE < 400 */
+
+#if !defined (ACE_LACKS_STDDEF_H)
+# include /**/ <stddef.h>
+#endif /* !ACE_LACKS_STDDEF_H */
+
+// NULL pointer constant
+#if defined (ACE_LACKS_NULL)
+# undef NULL
+# if defined(__cplusplus)
+#  define NULL 0
+# else
+#  define NULL ((void *)0)
+# endif
+#endif /* ACE_LACKS_NULL */
+
+/*
+  Integer constant expression of type size_t, the value of which is the offset 
+  in bytes to the structure member (member-designator), from the beginning of 
+  its structure (type).
+*/
+#if defined (ACE_LACKS_OFFSETOF)
+# undef offsetof
+# define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#endif /* ACE_LACKS_OFFSETOF */
+
+//  Signed integer type of the result of subtracting two pointers.
+#if defined (ACE_LACKS_PTRDIFF_T)
+# if !defined (ACE_PTRDIFF_T_TYPE)
+#  define ACE_PTRDIFF_T_TYPE unsigned long
+# endif /* !ACE_PTRDIFF_T_TYPE */
+typedef ACE_PTRDIFF_T_TYPE ptrdiff_t;
+#endif /* ACE_LACKS_PTRDIFF_T */
+
+/*
+  Integer type whose range of values can represent distinct wide-character 
+  codes for all members of the largest character set specified among the 
+  locales supported by the compilation environment: the null character has 
+  the code value 0 and each member of the portable character set has a code 
+  value equal to its value when used as the lone character in an integer 
+  character constant.
+*/
+#if defined (ACE_LACKS_WCHAR_T)
+# if !defined (ACE_WCHAR_T_TYPE)
+#  define ACE_WCHAR_T_TYPE long;
+# endif /* !ACE_WCHAR_T_TYPE */
+typedef ACE_WCHAR_T_TYPE wchar_t;
+#endif /* ACE_LACKS_WCHAR_T */
+
+//  Unsigned integer type of the result of the sizeof operator.
+#if defined (ACE_LACKS_SIZE_T)
+# if !defined (ACE_SIZE_T_TYPE)
+#  define ACE_SIZE_T_TYPE unsigned int;
+# endif /* !ACE_SIZE_T_TYPE */
+typedef ACE_SIZE_T_TYPE size_t;
+#endif /* ACE_LACKS_SIZE_T */
+
+#endif /* ACE_OS_INCLUDE_STDDEF_H */
diff --git a/ace/os_include/stdint.h b/ace/os_include/stdint.h
new file mode 100644
index 00000000000..10c83da4631
--- /dev/null
+++ b/ace/os_include/stdint.h
@@ -0,0 +1,117 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    stdint.h
+ *
+ *  integer types
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_STDINT_H
+#define ACE_OS_INCLUDE_STDINT_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_STDINT_H)
+# include /**/ <stdint.h>
+#endif /* !ACE_LACKS_STDINT_H */
+
+
+/* Define required types if missing */
+
+#if defined (ACE_LACKS_INT8_T)
+# if !defined (ACE_INT8_T_TYPE)
+#  define ACE_INT8_T_TYPE char
+# endif /* !ACE_INT8_T_TYPE */
+typedef ACE_INT8_T_TYPE int8_t;
+#endif /* ACE_LACKS_INT8_T */
+
+#if defined (ACE_LACKS_UINT8_T)
+# if !defined (ACE_UINT8_T_TYPE)
+#  define ACE_UINT8_T_TYPE unsigned char
+# endif /* !ACE_UINT8_T_TYPE */
+typedef ACE_UINT8_T_TYPE int8_t;
+#endif /* ACE_LACKS_UINT8_T */
+
+#if defined (ACE_LACKS_INT16_T)
+# if !defined (ACE_INT16_T_TYPE)
+#  define ACE_INT16_T_TYPE short
+# endif /* !ACE_INT16_T_TYPE */
+typedef ACE_INT16_T_TYPE int16_t;
+#endif /* ACE_LACKS_INT16_T */
+
+#if defined (ACE_LACKS_UINT16_T)
+# if !defined (ACE_UINT16_T_TYPE)
+#  define ACE_UINT16_T_TYPE unsigned short
+# endif /* !ACE_UINT16_T_TYPE */
+typedef ACE_UINT16_T_TYPE int16_t;
+#endif /* ACE_LACKS_UINT16_T */
+
+#if defined (ACE_LACKS_INT32_T)
+# if !defined (ACE_INT32_T_TYPE)
+#  define ACE_INT32_T_TYPE long
+# endif /* !ACE_INT32_T_TYPE */
+typedef ACE_INT32_T_TYPE int32_t;
+#endif /* ACE_LACKS_INT32_T */
+
+#if defined (ACE_LACKS_UINT32_T)
+# if !defined (ACE_UINT32_T_TYPE)
+#  define ACE_UINT32_T_TYPE unsigned long
+# endif /* !ACE_UINT32_T_TYPE */
+typedef ACE_UINT32_T_TYPE int32_t;
+#endif /* ACE_LACKS_UIN32_T */
+
+// @todo pull in ACE class here
+// 64 bit will be a problem, but stub it out for now
+/*
+If an implementation provides integer types with width 64 that meet 
+these requirements, then the following types are required: int64_t uint64_t
+
+In particular, this will be the case if any of the following are true:
+
+The implementation supports the _POSIX_V6_ILP32_OFFBIG programming 
+environment and the application is being built in the 
+_POSIX_V6_ILP32_OFFBIG programming environment (see the Shell and 
+Utilities volume of IEEE Std 1003.1-2001, c99, Programming Environments).
+
+The implementation supports the _POSIX_V6_LP64_OFF64 programming 
+environment and the application is being built in the 
+_POSIX_V6_LP64_OFF64 programming environment.
+
+The implementation supports the _POSIX_V6_LPBIG_OFFBIG programming 
+environment and the application is being built in the 
+_POSIX_V6_LPBIG_OFFBIG programming environment.
+*/
+#if defined (ACE_LACKS_INT64_T)
+# if !defined (ACE_INT64_T_TYPE)
+#  define ACE_INT64_T_TYPE long
+# endif /* !ACE_INT64_T_TYPE */
+typedef ACE_INT64_T_TYPE int64_t;
+#endif /* ACE_LACKS_INT64_T */
+
+#if defined (ACE_LACKS_UINT64_T)
+# if !defined (ACE_UINT64_T_TYPE)
+#  define ACE_UINT64_T_TYPE unsigned long
+# endif /* !ACE_UINT64_T_TYPE */
+typedef ACE_UINT64_T_TYPE int64_t;
+#endif /* ACE_LACKS_UIN64_T */
+
+// @todo move the ACE_INT## typedefs here so that ACE_INT64 will
+// always be available.
+
+
+// @todo perhaps add macros
+
+#endif /* ACE_OS_INCLUDE_STDINT_H */
diff --git a/ace/os_include/stdio.h b/ace/os_include/stdio.h
new file mode 100644
index 00000000000..a4633ec6775
--- /dev/null
+++ b/ace/os_include/stdio.h
@@ -0,0 +1,34 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    stdio.h
+ *
+ *  standard buffered input/output
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_STDIO_H
+#define ACE_OS_INCLUDE_STDIO_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/stdarg.h"
+#include "ace/os_include/stddef.h"
+
+#if !defined (ACE_LACKS_STDIO_H)
+# include /**/ <stdio.h>
+#endif /* !ACE_LACKS_STDIO_H */
+
+#endif /* ACE_OS_INCLUDE_STDIO_H */
diff --git a/ace/os_include/stdlib.h b/ace/os_include/stdlib.h
new file mode 100644
index 00000000000..4bfdb654049
--- /dev/null
+++ b/ace/os_include/stdlib.h
@@ -0,0 +1,34 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    stdlib.h
+ *
+ *  standard library definitions
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_STDLIB_H
+#define ACE_OS_INCLUDE_STDLIB_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/stddef.h"
+#include "ace/os_include/sys/wait.h"
+
+#if !defined (ACE_LACKS_STDLIB_H)
+# include /**/ <stdlib.h>
+#endif /* !ACE_LACKS_STDLIB_H */
+
+#endif /* ACE_OS_INCLUDE_STDLIB_H */
diff --git a/ace/os_include/string.h b/ace/os_include/string.h
new file mode 100644
index 00000000000..135025b8004
--- /dev/null
+++ b/ace/os_include/string.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    string.h
+ *
+ *  string operations
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_STRING_H
+#define ACE_OS_INCLUDE_STRING_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/stddef.h"
+
+#if !defined (ACE_LACKS_STRING_H)
+# include /**/ <string.h>
+#endif /* !ACE_LACKS_STRING_H */
+
+#endif /* ACE_OS_INCLUDE_STRING_H */
diff --git a/ace/os_include/strings.h b/ace/os_include/strings.h
new file mode 100644
index 00000000000..efcd4737c67
--- /dev/null
+++ b/ace/os_include/strings.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    strings.h
+ *
+ *  string operations
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_STRINGS_H
+#define ACE_OS_INCLUDE_STRINGS_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/stddef.h"
+
+#if !defined (ACE_LACKS_STRINGS_H)
+# include /**/ <strings.h>
+#endif /* !ACE_LACKS_STRINGS_H */
+
+#endif /* ACE_OS_INCLUDE_STRINGS_H */
diff --git a/ace/os_include/stropts.h b/ace/os_include/stropts.h
new file mode 100644
index 00000000000..687cb2fe282
--- /dev/null
+++ b/ace/os_include/stropts.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    stropts.h
+ *
+ *  STREAMS interface (STREAMS)
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_STROPTS_H
+#define ACE_OS_INCLUDE_STROPTS_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/unistd.h"
+
+#if !defined (ACE_LACKS_STROPTS_H)
+# include /**/ <stropts.h>
+#endif /* !ACE_LACKS_STROPTS_H */
+
+#endif /* ACE_OS_INCLUDE_STROPTS_H */
diff --git a/ace/os_include/sys/ipc.h b/ace/os_include/sys/ipc.h
new file mode 100644
index 00000000000..eab59cc180b
--- /dev/null
+++ b/ace/os_include/sys/ipc.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    ipc.h
+ *
+ *  XSI interprocess communication access structure
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_IPC_H
+#define ACE_OS_INCLUDE_SYS_IPC_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_SYS_IPC_H)
+# include /**/ <sys/ipc.h>
+#endif /* !ACE_LACKS_SYS_IPC_H */
+
+#endif /* ACE_OS_INCLUDE_SYS_IPC_H */
diff --git a/ace/os_include/sys/mman.h b/ace/os_include/sys/mman.h
new file mode 100644
index 00000000000..8817c4a701d
--- /dev/null
+++ b/ace/os_include/sys/mman.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    mman.h
+ *
+ *  memory management declarations
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_MMAN_H
+#define ACE_OS_INCLUDE_SYS_MMAN_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_SYS_MMAN_H)
+# include /**/ <sys/mman.h>
+#endif /* !ACE_LACKS_SYS_MMAN_H */
+
+#endif /* ACE_OS_INCLUDE_SYS_MMAN_H */
diff --git a/ace/os_include/sys/msg.h b/ace/os_include/sys/msg.h
new file mode 100644
index 00000000000..205ca9ca624
--- /dev/null
+++ b/ace/os_include/sys/msg.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    msg.h
+ *
+ *  XSI message queue structures
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_MSG_H
+#define ACE_OS_INCLUDE_SYS_MSG_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/ipc.h"
+
+#if !defined (ACE_LACKS_SYS_MSG_H)
+# include /**/ <sys/msg.h>
+#endif /* !ACE_LACKS_SYS_MSG_H */
+
+#endif /* ACE_OS_INCLUDE_SYS_MSG_H */
diff --git a/ace/os_include/sys/resource.h b/ace/os_include/sys/resource.h
new file mode 100644
index 00000000000..b4ab3c925c7
--- /dev/null
+++ b/ace/os_include/sys/resource.h
@@ -0,0 +1,34 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    resource.h
+ *
+ *  definitions for XSI resource operations
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_RESOURCE_H
+#define ACE_OS_INCLUDE_SYS_RESOURCE_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/time.h"
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_SYS_RESOURCE_H)
+# include /**/ <sys/resource.h>
+#endif /* !ACE_LACKS_SYS_RESOURCE_H */
+
+#endif /* ACE_OS_INCLUDE_SYS_RESOURCE_H */
diff --git a/ace/os_include/sys/select.h b/ace/os_include/sys/select.h
new file mode 100644
index 00000000000..ac56385f507
--- /dev/null
+++ b/ace/os_include/sys/select.h
@@ -0,0 +1,34 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    select.h
+ *
+ *  select types
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_SELECT_H
+#define ACE_OS_INCLUDE_SYS_SELECT_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/time.h"
+#include "ace/os_include/signal.h"
+
+#if !defined (ACE_LACKS_SYS_SELECT_H)
+# include /**/ <sys/select.h>
+#endif /* !ACE_LACKS_SYS_SELECT_H */
+
+#endif /* ACE_OS_INCLUDE_SYS_SELECT_H */
diff --git a/ace/os_include/sys/sem.h b/ace/os_include/sys/sem.h
new file mode 100644
index 00000000000..062e8b6ebb3
--- /dev/null
+++ b/ace/os_include/sys/sem.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    sem.h
+ *
+ *  XSI semaphore facility
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_SEM_H
+#define ACE_OS_INCLUDE_SYS_SEM_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/ipc.h"
+
+#if !defined (ACE_LACKS_SYS_SEM_H)
+# include /**/ <sys/sem.h>
+#endif /* !ACE_LACKS_SYS_SEM_H */
+
+#endif /* ACE_OS_INCLUDE_SYS_SEM_H */
diff --git a/ace/os_include/sys/shm.h b/ace/os_include/sys/shm.h
new file mode 100644
index 00000000000..1afddba7522
--- /dev/null
+++ b/ace/os_include/sys/shm.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    shm.h
+ *
+ *  XSI shared memory facility
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_SHM_H
+#define ACE_OS_INCLUDE_SYS_SHM_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/ipc.h"
+
+#if !defined (ACE_LACKS_SYS_SHM_H)
+# include /**/ <sys/shm.h>
+#endif /* !ACE_LACKS_SYS_SHM_H */
+
+#endif /* ACE_OS_INCLUDE_SYS_SHM_H */
diff --git a/ace/os_include/sys/socket.h b/ace/os_include/sys/socket.h
new file mode 100644
index 00000000000..e2da5685a84
--- /dev/null
+++ b/ace/os_include/sys/socket.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    socket.h
+ *
+ *  main sockets header
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_SOCKET_H
+#define ACE_OS_INCLUDE_SYS_SOCKET_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/uio.h"
+
+#if !defined (ACE_LACKS_SYS_SOCKET_H)
+# include /**/ <sys/socket.h>
+#endif /* !ACE_LACKS_SYS_SOCKET_H */
+
+#endif /* ACE_OS_INCLUDE_SYS_SOCKET_H */
diff --git a/ace/os_include/sys/stat.h b/ace/os_include/sys/stat.h
new file mode 100644
index 00000000000..1323076df05
--- /dev/null
+++ b/ace/os_include/sys/stat.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    stat.h
+ *
+ *  data returned by the stat() function 
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_STAT_H
+#define ACE_OS_INCLUDE_SYS_STAT_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_SYS_STAT_H)
+# include /**/ <sys/stat.h>
+#endif /* !ACE_LACKS_SYS_STAT_H */
+
+#endif /* ACE_OS_INCLUDE_SYS_STAT_H */
diff --git a/ace/os_include/sys/statvfs.h b/ace/os_include/sys/statvfs.h
new file mode 100644
index 00000000000..c48dc4819e8
--- /dev/null
+++ b/ace/os_include/sys/statvfs.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    statvfs.h
+ *
+ *  VFS File System information structure
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_STATVFS_H
+#define ACE_OS_INCLUDE_SYS_STATVFS_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_SYS_STATVFS_H)
+# include /**/ <sys/statvfs.h>
+#endif /* !ACE_LACKS_SYS_STATVFS_H */
+
+#endif /* ACE_OS_INCLUDE_SYS_STATVFS_H */
diff --git a/ace/os_include/sys/time.h b/ace/os_include/sys/time.h
new file mode 100644
index 00000000000..5a14bc98fea
--- /dev/null
+++ b/ace/os_include/sys/time.h
@@ -0,0 +1,34 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    time.h
+ *
+ *  time types
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_TIME_H
+#define ACE_OS_INCLUDE_SYS_TIME_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+#include "ace/os_include/sys/select.h"
+
+#if !defined (ACE_LACKS_SYS_TIME_H)
+# include /**/ <sys/time.h>
+#endif /* !ACE_LACKS_SYS_TIME_H */
+
+#endif /* ACE_OS_INCLUDE_SYS_TIME_H */
diff --git a/ace/os_include/sys/timeb.h b/ace/os_include/sys/timeb.h
new file mode 100644
index 00000000000..1a52c98b7d7
--- /dev/null
+++ b/ace/os_include/sys/timeb.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    timeb.h
+ *
+ *  additional definitions for date and time
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_TIMEB_H
+#define ACE_OS_INCLUDE_SYS_TIMEB_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_SYS_TIMEB_H)
+# include /**/ <sys/timeb.h>
+#endif /* !ACE_LACKS_SYS_TIMEB_H */
+
+#endif /* ACE_OS_INCLUDE_TIMEB_H */
diff --git a/ace/os_include/sys/times.h b/ace/os_include/sys/times.h
new file mode 100644
index 00000000000..fd82c992c37
--- /dev/null
+++ b/ace/os_include/sys/times.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    times.h
+ *
+ *  file access and modification times structure
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_TIMES_H
+#define ACE_OS_INCLUDE_SYS_TIMES_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_SYS_TIMES_H)
+# include /**/ <sys/times.h>
+#endif /* !ACE_LACKS_SYS_TIMES_H */
+
+#endif /* ACE_OS_INCLUDE_SYS_TIMES_H */
diff --git a/ace/os_include/sys/types.h b/ace/os_include/sys/types.h
new file mode 100644
index 00000000000..d5c553d48c1
--- /dev/null
+++ b/ace/os_include/sys/types.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    types.h
+ *
+ *  data types
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_TYPES_H
+#define ACE_OS_INCLUDE_SYS_TYPES_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/stddef.h"
+
+#if !defined (ACE_LACKS_SYS_TYPES_H)
+# include /**/ <sys/types.h>
+#endif /* !ACE_LACKS_SYS_TYPES_H */
+
+#endif /* ACE_OS_INCLUDE_SYS_TYPES_H */
diff --git a/ace/os_include/sys/uio.h b/ace/os_include/sys/uio.h
new file mode 100644
index 00000000000..ad0002faf07
--- /dev/null
+++ b/ace/os_include/sys/uio.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    uio.h
+ *
+ *  definitions for vector I/O operations
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_UIO_H
+#define ACE_OS_INCLUDE_SYS_UIO_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_SYS_UIO_H)
+# include /**/ <sys/uio.h>
+#endif /* !ACE_LACKS_SYS_UIO_H */
+
+#endif /* ACE_OS_INCLUDE_SYS_UIO_H */
diff --git a/ace/os_include/sys/un.h b/ace/os_include/sys/un.h
new file mode 100644
index 00000000000..c27ad30fd49
--- /dev/null
+++ b/ace/os_include/sys/un.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    un.h
+ *
+ *  definitions for UNIX domain sockets
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_UN_H
+#define ACE_OS_INCLUDE_SYS_UN_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/socket.h"
+
+#if !defined (ACE_LACKS_SYS_UN_H)
+# include /**/ <sys/un.h>
+#endif /* !ACE_LACKS_SYS_UN_H */
+
+#endif /* ACE_OS_INCLUDE_SYS_UN_H */
diff --git a/ace/os_include/sys/utsname.h b/ace/os_include/sys/utsname.h
new file mode 100644
index 00000000000..f7b41a75572
--- /dev/null
+++ b/ace/os_include/sys/utsname.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    utsname.h
+ *
+ *  system name structure
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_UTSNAME_H
+#define ACE_OS_INCLUDE_SYS_UTSNAME_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_SYS_UTSNAME_H)
+# include /**/ <sys/utsname.h>
+#endif /* !ACE_LACKS_SYS_UTSNAME_H */
+
+#endif /* ACE_OS_INCLUDE_SYS_UTSNAME_H */
diff --git a/ace/os_include/sys/wait.h b/ace/os_include/sys/wait.h
new file mode 100644
index 00000000000..e4fece2d07a
--- /dev/null
+++ b/ace/os_include/sys/wait.h
@@ -0,0 +1,34 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    wait.h
+ *
+ *  declarations for waiting
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYS_WAIT_H
+#define ACE_OS_INCLUDE_SYS_WAIT_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/signal.h"
+#include "ace/os_include/sys/resource.h"
+
+#if !defined (ACE_LACKS_SYS_WAIT_H)
+# include /**/ <sys/wait.h>
+#endif /* !ACE_LACKS_SYS_WAIT_H */
+
+#endif /* ACE_OS_INCLUDE_SYS_WAIT_H */
diff --git a/ace/os_include/syslog.h b/ace/os_include/syslog.h
new file mode 100644
index 00000000000..f1144fa43bb
--- /dev/null
+++ b/ace/os_include/syslog.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    syslog.h
+ *
+ *  definitions for system error logging
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_SYSLOG_H
+#define ACE_OS_INCLUDE_SYSLOG_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_SYSLOG_H)
+# include /**/ <syslog.h>
+#endif /* !ACE_LACKS_SYSLOG_H */
+
+#endif /* ACE_OS_INCLUDE_SYSLOG_H */
diff --git a/ace/os_include/tar.h b/ace/os_include/tar.h
new file mode 100644
index 00000000000..b031178c927
--- /dev/null
+++ b/ace/os_include/tar.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    tar.h
+ *
+ *  extended tar definitions
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_TAR_H
+#define ACE_OS_INCLUDE_TAR_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_TAR_H)
+# include /**/ <tar.h>
+#endif /* !ACE_LACKS_TAR_H */
+
+#endif /* ACE_OS_INCLUDE_TAR_H */
diff --git a/ace/os_include/termios.h b/ace/os_include/termios.h
new file mode 100644
index 00000000000..6e3e5f526ad
--- /dev/null
+++ b/ace/os_include/termios.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    termios.h
+ *
+ *  define values for termios
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_TERMIOS_H
+#define ACE_OS_INCLUDE_TERMIOS_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_TERMIOS_H)
+# include /**/ <termios.h>
+#endif /* !ACE_LACKS_TERMIOS_H */
+
+#endif /* ACE_OS_INCLUDE_TERMIOS_H */
diff --git a/ace/os_include/tgmath.h b/ace/os_include/tgmath.h
new file mode 100644
index 00000000000..b4d206e539e
--- /dev/null
+++ b/ace/os_include/tgmath.h
@@ -0,0 +1,34 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    tgmath.h
+ *
+ *  type-generic macros
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_TGMATH_H
+#define ACE_OS_INCLUDE_TGMATH_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/math.h"
+#include "ace/os_include/complex.h"
+
+#if !defined (ACE_LACKS_TGMATH_H)
+# include /**/ <tgmath.h>
+#endif /* !ACE_LACKS_TGMATH_H */
+
+#endif /* ACE_OS_INCLUDE_TGMATH_H */
diff --git a/ace/os_include/time.h b/ace/os_include/time.h
new file mode 100644
index 00000000000..11f608d0586
--- /dev/null
+++ b/ace/os_include/time.h
@@ -0,0 +1,34 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    time.h
+ *
+ *  time types
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_TIME_H
+#define ACE_OS_INCLUDE_TIME_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+// @todo should we include anything from signal.h?
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_TIME_H)
+# include /**/ <time.h>
+#endif /* !ACE_LACKS_TIME_H */
+
+#endif /* ACE_OS_INCLUDE_TIME_H */
diff --git a/ace/os_include/trace.h b/ace/os_include/trace.h
new file mode 100644
index 00000000000..1a9f91a7626
--- /dev/null
+++ b/ace/os_include/trace.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    trace.h
+ *
+ *  tracing
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_TRACE_H
+#define ACE_OS_INCLUDE_TRACE_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_TRACE_H)
+# include /**/ <trace.h>
+#endif /* !ACE_LACKS_TRACE_H */
+
+#endif /* ACE_OS_INCLUDE_TRACE_H */
diff --git a/ace/os_include/ucontext.h b/ace/os_include/ucontext.h
new file mode 100644
index 00000000000..13680fc9216
--- /dev/null
+++ b/ace/os_include/ucontext.h
@@ -0,0 +1,35 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    ucontext.h
+ *
+ *  user context
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_UCONTEXT_H
+#define ACE_OS_INCLUDE_UCONTEXT_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+// @todo need to define sigset_t both here and in signal.h, but 
+// there is a circular dependancy since signal.h needs to include ucontext.h
+//#include "ace/os_include/signal.h"
+
+#if !defined (ACE_LACKS_UCONTEXT_H)
+# include /**/ <ucontext.h>
+#endif /* !ACE_LACKS_ucontext_H */
+
+#endif /* ACE_OS_INCLUDE_UCONTEXT_H */
diff --git a/ace/os_include/ulimit.h b/ace/os_include/ulimit.h
new file mode 100644
index 00000000000..fdab3e316a2
--- /dev/null
+++ b/ace/os_include/ulimit.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    ulimit.h
+ *
+ *  ulimit commands
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_ULIMIT_H
+#define ACE_OS_INCLUDE_ULIMIT_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (ACE_LACKS_ULIMIT_H)
+# include /**/ <ulimit.h>
+#endif /* !ACE_LACKS_ULIMIT_H */
+
+#endif /* ACE_OS_INCLUDE_ULIMIT_H */
diff --git a/ace/os_include/unistd.h b/ace/os_include/unistd.h
new file mode 100644
index 00000000000..9d8b493f5a4
--- /dev/null
+++ b/ace/os_include/unistd.h
@@ -0,0 +1,34 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    unistd.h
+ *
+ *  standard symbolic constants and types
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_UNISTD_H
+#define ACE_OS_INCLUDE_UNISTD_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+#include "ace/os_include/inttypes.h"
+
+#if !defined (ACE_LACKS_UNISTD_H)
+# include /**/ <unistd.h>
+#endif /* !ACE_LACKS_UNISTD_H */
+
+#endif /* ACE_OS_INCLUDE_UNISTD_H */
diff --git a/ace/os_include/utime.h b/ace/os_include/utime.h
new file mode 100644
index 00000000000..dae5f664fdb
--- /dev/null
+++ b/ace/os_include/utime.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    utime.h
+ *
+ *  access and modification times structure
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_UTIME_H
+#define ACE_OS_INCLUDE_UTIME_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/types.h"
+
+#if !defined (ACE_LACKS_UTIME_H)
+# include /**/ <utime.h>
+#endif /* !ACE_LACKS_UTIME_H */
+
+#endif /* ACE_OS_INCLUDE_UTIME_H */
diff --git a/ace/os_include/utmpx.h b/ace/os_include/utmpx.h
new file mode 100644
index 00000000000..5cc37398492
--- /dev/null
+++ b/ace/os_include/utmpx.h
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    utmpx.h
+ *
+ *  user accounting database definitions
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_UTMPX_H
+#define ACE_OS_INCLUDE_UTMPX_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/os_include/sys/time.h"
+
+#if !defined (ACE_LACKS_UTMPX_H)
+# include /**/ <utmpx.h>
+#endif /* !ACE_LACKS_UTMPX_H */
+
+#endif /* ACE_OS_INCLUDE_UTMPX_H */
diff --git a/ace/os_include/wchar.h b/ace/os_include/wchar.h
new file mode 100644
index 00000000000..f48423ae159
--- /dev/null
+++ b/ace/os_include/wchar.h
@@ -0,0 +1,38 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    wchar.h
+ *
+ *  wide-character handling
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_WCHAR_H
+#define ACE_OS_INCLUDE_WCHAR_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+// ctype.h, string.h, stdarg.h, stdio.h, stdlib.h, time.h
+#include "ace/os_include/stdio.h"
+#include "ace/os_include/stdlib.h"
+#include "ace/os_include/time.h"
+#include "ace/os_include/string.h"
+#include "ace/os_include/ctype.h"
+
+#if !defined (ACE_LACKS_WCHAR_H)
+# include /**/ <wchar.h>
+#endif /* !ACE_LACKS_WCHAR_H */
+
+#endif /* ACE_OS_INCLUDE_WCHAR_H */
diff --git a/ace/os_include/wctype.h b/ace/os_include/wctype.h
new file mode 100644
index 00000000000..c44192b9212
--- /dev/null
+++ b/ace/os_include/wctype.h
@@ -0,0 +1,34 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    wctype.h
+ *
+ *  wide-character classification and mapping utilities
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_WCTYPE_H
+#define ACE_OS_INCLUDE_WCTYPE_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+// ctype.h, string.h, stdarg.h, stdio.h, stdlib.h, time.h
+#include "ace/os_include/wchar.h"
+
+#if !defined (ACE_LACKS_WCTYPE_H)
+# include /**/ <wctype.h>
+#endif /* !ACE_LACKS_WCTYPE_H */
+
+#endif /* ACE_OS_INCLUDE_WCTYPE_H */
diff --git a/ace/os_include/wordexp.h b/ace/os_include/wordexp.h
new file mode 100644
index 00000000000..10c5d0712fe
--- /dev/null
+++ b/ace/os_include/wordexp.h
@@ -0,0 +1,34 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    wordexp.h
+ *
+ *  word-expansion types
+ *
+ *  $Id$
+ *
+ *  @author Don Hinton <dhinton@ieee.org>
+ *  @author This code was originally in various places including ace/OS.h.
+ */
+//=============================================================================
+
+#ifndef ACE_OS_INCLUDE_WORDEXP_H
+#define ACE_OS_INCLUDE_WORDEXP_H
+
+#include "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+// @todo make sure that size_t is in stddef.h and sys/types.h includes stddef.h
+#include "ace/os_include/stddef.h" // size_t
+
+#if !defined (ACE_LACKS_WORDEXP_H)
+# include /**/ <wordexp.h>
+#endif /* !ACE_LACKS_WORDEXP_H */
+
+#endif /* ACE_OS_INCLUDE_WORDEXP_H */