2000-11-01 Joel Sherrill <joel@OARcorp.com>

	* include/Makefile.am, include/rtems/libio_.h, libc/Makefile.am,
	libc/assoc.c, libc/assocnamebad.c, libc/base_fs.c, libc/cfsetispeed.c,
	libc/cfsetospeed.c, libc/chdir.c, libc/chmod.c, libc/chown.c,
	libc/close.c, libc/closedir.c, libc/dup2.c, libc/error.c, libc/eval.c,
	libc/fchdir.c, libc/fchmod.c, libc/fcntl.c, libc/fdatasync.c,
	libc/fpathconf.c, libc/fstat.c, libc/fsync.c, libc/ftruncate.c,
	libc/getdents.c, libc/ioctl.c, libc/libio.c, libc/libio_sockets.c,
	libc/link.c, libc/lseek.c, libc/malloc.c, libc/mallocfreespace.c,
	libc/mknod.c, libc/mount.c, libc/newlibc.c, libc/no_libc.c,
	libc/open.c, libc/read.c, libc/readlink.c, libc/rmdir.c, libc/stat.c,
	libc/symlink.c, libc/tcsetattr.c, libc/telldir.c, libc/ttyname.c,
	libc/ttyname_r.c, libc/umask.c, libc/unlink.c, libc/unmount.c,
	libc/utime.c, libc/write.c:
	assoc.h, error.h, libio_.h, libio.h, and libcsupport.h moved
	from libc to lib/include/rtems and now must be referenced as
	<rtems/XXX.h>.
	* include/rtems/Makefile.am, include/rtems/.cvsignore: New file.
	* include/rtems/assoc.h, include/rtems/error.h,
	include/rtems/libcsupport.h, include/rtems/libio.h,
	include/rtems/libio_.h: New/moved files.

54 files changed, 49 insertions, 1056 deletions

diff --git a/c/src/lib/libc/Makefile.am b/c/src/lib/libc/Makefile.am
index 72447d2094..717c2da633 100644
--- a/c/src/lib/libc/Makefile.am
+++ b/c/src/lib/libc/Makefile.am
@@ -56,34 +56,10 @@ C_FILES = $(COMMON_C_FILES) $(EMBEDDED_C_FILES)
 endif
 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
 
-H_FILES = libcsupport.h
-SYS_H_FILES =
-RTEMS_H_FILES = assoc.h error.h libio.h
-noinst_HEADERS = libio_.h
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems \
-    $(PROJECT_INCLUDE)/sys $(H_FILES:%=$(PROJECT_INCLUDE)/%) \
-    $(RTEMS_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) \
-    $(SYS_H_FILES:%=$(PROJECT_INCLUDE)/sys/%)
-
-$(PROJECT_INCLUDE):
-	@$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems:
-	@$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/sys:
-	@$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/rtems/%.h: %.h
-	$(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/sys/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
 OBJS = $(C_O_FILES)
@@ -105,6 +81,6 @@ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 DOC_FILES = TODO CASES
 
 EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \
-    $(UNIX_C_FILES) $(H_FILES) $(RTEMS_H_FILES) $(SYS_H_FILES)
+    $(UNIX_C_FILES)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libc/assoc.c b/c/src/lib/libc/assoc.c
index 5a24bd43a7..845d9eb522 100644
--- a/c/src/lib/libc/assoc.c
+++ b/c/src/lib/libc/assoc.c
@@ -6,7 +6,7 @@
  */
 
 #include <rtems.h>
-#include "assoc.h"
+#include <rtems/assoc.h>
 
 #include <string.h>             /* strcat, strcmp */
 
diff --git a/c/src/lib/libc/assoc.h b/c/src/lib/libc/assoc.h
deleted file mode 100644
index 1982d654ac..0000000000
--- a/c/src/lib/libc/assoc.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- *  Rtems associativity routines.  Mainly used to convert a value from
- *  one space to another (eg: our errno's to host errno's and v.v)
- *
- *
- *  $Id$
- */
-
-#ifndef _INCLUDE_ASSOC_H
-#define _INCLUDE_ASSOC_H
-
-typedef struct {
-    const char   *name;
-    unsigned32   local_value;
-    unsigned32   remote_value;
-} rtems_assoc_t;
-
-/*
- * Flag/marker for optional default value in each table
- */
-
-#define RTEMS_ASSOC_DEFAULT_NAME "(default)"
-
-const rtems_assoc_t *rtems_assoc_ptr_by_name(const rtems_assoc_t *, const char *);
-const rtems_assoc_t *rtems_assoc_ptr_by_value(const rtems_assoc_t *, unsigned32);
-const rtems_assoc_t *rtems_assoc_ptr_by_remote(const rtems_assoc_t *, unsigned32);
-
-unsigned32   rtems_assoc_remote_by_local(const rtems_assoc_t *, unsigned32);
-unsigned32   rtems_assoc_local_by_remote(const rtems_assoc_t *, unsigned32);
-unsigned32   rtems_assoc_remote_by_name(const rtems_assoc_t *, const char *);
-unsigned32   rtems_assoc_local_by_name(const rtems_assoc_t *, const char *);
-const char  *rtems_assoc_name_by_local(const rtems_assoc_t *, unsigned32);
-const char  *rtems_assoc_name_by_remote(const rtems_assoc_t *, unsigned32);
-
-unsigned32   rtems_assoc_remote_by_local_bitfield(const rtems_assoc_t *, unsigned32);
-char  *rtems_assoc_name_by_local_bitfield(const rtems_assoc_t *, unsigned32, char *);
-char  *rtems_assoc_name_by_remote_bitfield(const rtems_assoc_t *, unsigned32, char *);
-unsigned32   rtems_assoc_local_by_remote_bitfield(const rtems_assoc_t *, unsigned32);
-
-
-#endif /* ! _INCLUDE_ASSOC_H */
diff --git a/c/src/lib/libc/assocnamebad.c b/c/src/lib/libc/assocnamebad.c
index e336c39cc7..7bb48c9a55 100644
--- a/c/src/lib/libc/assocnamebad.c
+++ b/c/src/lib/libc/assocnamebad.c
@@ -6,7 +6,7 @@
  */
 
 #include <rtems.h>
-#include "assoc.h"
+#include <rtems/assoc.h>
 
 #include <stdio.h>              /* sprintf */
 #include <string.h>             /* strcat, strcmp */
diff --git a/c/src/lib/libc/base_fs.c b/c/src/lib/libc/base_fs.c
index fb932b542d..cb888cab2c 100644
--- a/c/src/lib/libc/base_fs.c
+++ b/c/src/lib/libc/base_fs.c
@@ -13,7 +13,7 @@
 
 #include <rtems.h>
 #include <rtems/libio.h>
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 /*
  *  Global information for the base file system.
diff --git a/c/src/lib/libc/cfsetispeed.c b/c/src/lib/libc/cfsetispeed.c
index af1a1b840c..9e195a0a90 100644
--- a/c/src/lib/libc/cfsetispeed.c
+++ b/c/src/lib/libc/cfsetispeed.c
@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <termios.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int cfsetispeed(
   struct termios *tp,
diff --git a/c/src/lib/libc/cfsetospeed.c b/c/src/lib/libc/cfsetospeed.c
index f6f6c5838c..36f2cf8ff6 100644
--- a/c/src/lib/libc/cfsetospeed.c
+++ b/c/src/lib/libc/cfsetospeed.c
@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <termios.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int cfsetospeed(
   struct termios *tp,
diff --git a/c/src/lib/libc/chdir.c b/c/src/lib/libc/chdir.c
index 46a6ad168b..722fafc4dd 100644
--- a/c/src/lib/libc/chdir.c
+++ b/c/src/lib/libc/chdir.c
@@ -16,7 +16,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int chdir(
   const char *pathname
diff --git a/c/src/lib/libc/chmod.c b/c/src/lib/libc/chmod.c
index 4b7ab8c594..d8f7e53ac3 100644
--- a/c/src/lib/libc/chmod.c
+++ b/c/src/lib/libc/chmod.c
@@ -18,7 +18,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int chmod(
   const char *path,
diff --git a/c/src/lib/libc/chown.c b/c/src/lib/libc/chown.c
index c4dfe97ed0..2c1376d85e 100644
--- a/c/src/lib/libc/chown.c
+++ b/c/src/lib/libc/chown.c
@@ -17,7 +17,7 @@
 #include <rtems.h>
 #include <rtems/libio.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int chown(
   const char *path,
diff --git a/c/src/lib/libc/close.c b/c/src/lib/libc/close.c
index 19149d3bfe..2b1fde2d48 100644
--- a/c/src/lib/libc/close.c
+++ b/c/src/lib/libc/close.c
@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int close(
   int  fd
diff --git a/c/src/lib/libc/closedir.c b/c/src/lib/libc/closedir.c
index 4d948ec95b..3ec944436e 100644
--- a/c/src/lib/libc/closedir.c
+++ b/c/src/lib/libc/closedir.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)closedir.c	5.9 (Berkeley) 2/23/91";
 #include <errno.h>
 
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 /*
  * close a directory.
diff --git a/c/src/lib/libc/dup2.c b/c/src/lib/libc/dup2.c
index 21701bfd0d..6931933474 100644
--- a/c/src/lib/libc/dup2.c
+++ b/c/src/lib/libc/dup2.c
@@ -14,7 +14,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int dup2(
   int fildes,
diff --git a/c/src/lib/libc/error.c b/c/src/lib/libc/error.c
index 339f8eb374..246a630222 100644
--- a/c/src/lib/libc/error.c
+++ b/c/src/lib/libc/error.c
@@ -43,7 +43,7 @@
 #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
 
-#include "error.h"
+#include <rtems/error.h>
 #include <rtems/assoc.h>
 
 #include <stdio.h>
diff --git a/c/src/lib/libc/error.h b/c/src/lib/libc/error.h
deleted file mode 100644
index de6e1715db..0000000000
--- a/c/src/lib/libc/error.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Defines and externs for rtems error reporting
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_ERROR_h
-#define __RTEMS_ERROR_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * rtems_error() and rtems_panic() support
- */
-
-#define RTEMS_ERROR_ERRNO  (1<<((sizeof(int) * 8) - 2)) /* hi bit; use 'errno' */
-#define RTEMS_ERROR_PANIC  (RTEMS_ERROR_ERRNO / 2)       /* err fatal; no return */
-#define RTEMS_ERROR_ABORT  (RTEMS_ERROR_ERRNO / 4)       /* err is fatal; panic */
-
-#define RTEMS_ERROR_MASK  (RTEMS_ERROR_ERRNO | RTEMS_ERROR_ABORT | \
-                             RTEMS_ERROR_PANIC) /* all */
-
-const char *rtems_status_text(rtems_status_code);
-int   rtems_error(int error_code, const char *printf_format, ...);
-#ifdef __GNUC__
-void  rtems_panic(const char *printf_format, ...);
-/*
- *  We should be able to use this attribute but gcc complains that
- *  rtems_panic does in fact return. :(
- *
- *      __attribute__ ((__noreturn__));
- */
-#else
-void  rtems_panic(const char *printf_format, ...);
-#endif
-
-extern int rtems_panic_in_progress;
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
-/* end of include file */
diff --git a/c/src/lib/libc/eval.c b/c/src/lib/libc/eval.c
index 60c718d3b8..0bcc8e8194 100644
--- a/c/src/lib/libc/eval.c
+++ b/c/src/lib/libc/eval.c
@@ -14,7 +14,7 @@
  */
 
 #include <rtems.h>
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int rtems_filesystem_evaluate_path(
   const char                        *pathname,
diff --git a/c/src/lib/libc/fchdir.c b/c/src/lib/libc/fchdir.c
index 4a94afe20b..a937088b31 100644
--- a/c/src/lib/libc/fchdir.c
+++ b/c/src/lib/libc/fchdir.c
@@ -17,7 +17,7 @@
 
 #include <rtems.h>
 #include <rtems/libio.h>
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fchdir(
   int       fd
diff --git a/c/src/lib/libc/fchmod.c b/c/src/lib/libc/fchmod.c
index fbf4cbc0ac..9cb773831f 100644
--- a/c/src/lib/libc/fchmod.c
+++ b/c/src/lib/libc/fchmod.c
@@ -17,7 +17,7 @@
 
 #include <rtems.h>
 #include <rtems/libio.h>
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fchmod(
   int       fd,
diff --git a/c/src/lib/libc/fcntl.c b/c/src/lib/libc/fcntl.c
index 72a03fa1c5..521fb93f33 100644
--- a/c/src/lib/libc/fcntl.c
+++ b/c/src/lib/libc/fcntl.c
@@ -16,7 +16,7 @@
 #include <errno.h>
 
 #include <rtems.h>
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fcntl(
   int fd,
diff --git a/c/src/lib/libc/fdatasync.c b/c/src/lib/libc/fdatasync.c
index 251573ef5d..a45388f019 100644
--- a/c/src/lib/libc/fdatasync.c
+++ b/c/src/lib/libc/fdatasync.c
@@ -13,7 +13,7 @@
 
 #include <unistd.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fdatasync(
   int     fd
diff --git a/c/src/lib/libc/fpathconf.c b/c/src/lib/libc/fpathconf.c
index 744551ec88..bfcb4cd417 100644
--- a/c/src/lib/libc/fpathconf.c
+++ b/c/src/lib/libc/fpathconf.c
@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 #include <unistd.h>
 #include <errno.h>
diff --git a/c/src/lib/libc/fstat.c b/c/src/lib/libc/fstat.c
index ad937c14fa..11d3ecb4d7 100644
--- a/c/src/lib/libc/fstat.c
+++ b/c/src/lib/libc/fstat.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fstat(
   int          fd,
diff --git a/c/src/lib/libc/fsync.c b/c/src/lib/libc/fsync.c
index f27309057f..7a4b384eba 100644
--- a/c/src/lib/libc/fsync.c
+++ b/c/src/lib/libc/fsync.c
@@ -13,7 +13,7 @@
 
 #include <unistd.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fsync(
   int     fd
diff --git a/c/src/lib/libc/ftruncate.c b/c/src/lib/libc/ftruncate.c
index 70587d257b..436a969d0f 100644
--- a/c/src/lib/libc/ftruncate.c
+++ b/c/src/lib/libc/ftruncate.c
@@ -14,7 +14,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int ftruncate(
   int     fd,
diff --git a/c/src/lib/libc/getdents.c b/c/src/lib/libc/getdents.c
index e260fe2489..e154b688d2 100644
--- a/c/src/lib/libc/getdents.c
+++ b/c/src/lib/libc/getdents.c
@@ -19,7 +19,7 @@
 
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int getdents(
   int   dd_fd,
diff --git a/c/src/lib/libc/ioctl.c b/c/src/lib/libc/ioctl.c
index 38d47da3d3..1046c88e29 100644
--- a/c/src/lib/libc/ioctl.c
+++ b/c/src/lib/libc/ioctl.c
@@ -14,7 +14,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 #include <unistd.h>
 
diff --git a/c/src/lib/libc/libcsupport.h b/c/src/lib/libc/libcsupport.h
deleted file mode 100644
index 4def1e82c5..0000000000
--- a/c/src/lib/libc/libcsupport.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  libcsupport.h
- *
- *  This include file contains the information regarding the
- *  RTEMS specific support for the standard C library.
- *
- *  COPYRIGHT (c) 1989-1999.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __LIBC_SUPPORT_h
-#define __LIBC_SUPPORT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <sys/types.h>
-
-void RTEMS_Malloc_Initialize(
-  void   *start,
-  size_t  length,
-  size_t  sbrk_amount
-);
-
-extern void malloc_dump(void);
-extern void malloc_walk(size_t source, size_t printf_enabled);
-extern void libc_init(int reentrant);
-extern int  host_errno(void);
-extern void fix_syscall_errno(void);
-extern size_t malloc_free_space();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/lib/libc/libio.c b/c/src/lib/libc/libio.c
index ad3f775ff5..66617700a3 100644
--- a/c/src/lib/libc/libio.c
+++ b/c/src/lib/libc/libio.c
@@ -13,7 +13,7 @@
  *  $Id$
  */
 
-#include "libio_.h"                   /* libio_.h pulls in rtems */
+#include <rtems/libio_.h>               /* libio_.h pulls in rtems */
 #include <rtems.h>
 #include <rtems/assoc.h>                /* assoc.h not included by rtems.h */
 
diff --git a/c/src/lib/libc/libio.h b/c/src/lib/libc/libio.h
deleted file mode 100644
index 1d4a2621d4..0000000000
--- a/c/src/lib/libc/libio.h
+++ /dev/null
@@ -1,579 +0,0 @@
-/*
- *  System call and file system interface definition
- *
- *  General purpose communication channel for RTEMS to allow UNIX/POSIX
- *  system call behavior under RTEMS.  Initially this supported only
- *  IO to devices but has since been enhanced to support networking
- *  and support for mounted file systems.
- *
- *  COPYRIGHT (c) 1989-1999.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef _RTEMS_LIBIO_H
-#define _RTEMS_LIBIO_H
-
-#include <rtems.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-
-/*
- *  Define data types which must be constructed using forward references.
- */
-
-typedef struct rtems_libio_tt rtems_libio_t;
-
-struct rtems_filesystem_location_info_tt;
-typedef struct rtems_filesystem_location_info_tt
-    rtems_filesystem_location_info_t;
-
-struct rtems_filesystem_mount_table_entry_tt;
-typedef struct rtems_filesystem_mount_table_entry_tt
-    rtems_filesystem_mount_table_entry_t;
-
-/*
- * Valid RTEMS file types.
- */
-typedef enum {
-  RTEMS_FILESYSTEM_DIRECTORY,
-  RTEMS_FILESYSTEM_DEVICE,
-  RTEMS_FILESYSTEM_HARD_LINK,
-  RTEMS_FILESYSTEM_SYM_LINK,
-  RTEMS_FILESYSTEM_MEMORY_FILE
-} rtems_filesystem_node_types_t;
-
-/*
- *  File Handler Operations Table
- */
-
-typedef int (*rtems_filesystem_open_t)(
-  rtems_libio_t *iop,
-  const char    *pathname,
-  unsigned32     flag,
-  unsigned32     mode
-);
-
-typedef int (*rtems_filesystem_close_t)(
-  rtems_libio_t *iop
-);
-
-typedef int (*rtems_filesystem_read_t)(
-  rtems_libio_t *iop,
-  void          *buffer,
-  unsigned32     count
-);
-
-typedef int (*rtems_filesystem_write_t)(
-  rtems_libio_t *iop,
-  const void    *buffer,
-  unsigned32    count
-);
-
-typedef int (*rtems_filesystem_ioctl_t)(
-  rtems_libio_t *iop,
-  unsigned32     command,
-  void          *buffer
-);
-
-typedef int (*rtems_filesystem_lseek_t)(
-  rtems_libio_t *iop,
-  off_t          length,
-  int            whence
-);
-
-typedef int (*rtems_filesystem_fstat_t)(
-  rtems_filesystem_location_info_t *loc,
-  struct stat                      *buf
-);
-
-typedef int (*rtems_filesystem_fchmod_t)(
-  rtems_filesystem_location_info_t *loc,
-  mode_t                            mode
-);
-
-typedef int (*rtems_filesystem_ftruncate_t)(
-  rtems_libio_t *iop,
-  off_t          length
-);
-
-typedef int (*rtems_filesystem_fpathconf_t)(
-  rtems_libio_t *iop,
-  int name
-);
-
-typedef int (*rtems_filesystem_fsync_t)(
-  rtems_libio_t *iop
-);
-
-typedef int (*rtems_filesystem_fdatasync_t)(
-  rtems_libio_t *iop
-);
-
-typedef int (*rtems_filesystem_fcntl_t)(
-  int            cmd,
-  rtems_libio_t *iop
-);
-
-typedef int (*rtems_filesystem_rmnod_t)(
- rtems_filesystem_location_info_t      *pathloc       /* IN */
-);
-
-typedef struct {
-    rtems_filesystem_open_t         open_h;
-    rtems_filesystem_close_t        close_h;
-    rtems_filesystem_read_t         read_h;
-    rtems_filesystem_write_t        write_h;
-    rtems_filesystem_ioctl_t        ioctl_h;
-    rtems_filesystem_lseek_t        lseek_h;
-    rtems_filesystem_fstat_t        fstat_h;
-    rtems_filesystem_fchmod_t       fchmod_h;
-    rtems_filesystem_ftruncate_t    ftruncate_h;
-    rtems_filesystem_fpathconf_t    fpathconf_h;
-    rtems_filesystem_fsync_t        fsync_h;
-    rtems_filesystem_fdatasync_t    fdatasync_h;
-    rtems_filesystem_fcntl_t        fcntl_h;
-    rtems_filesystem_rmnod_t        rmnod_h;
-} rtems_filesystem_file_handlers_r;
-
-/*
- *  File System Operations Table
- */
-
-/*
- *  XXX
- *  This routine does not allocate any space and rtems_filesystem_freenode_t 
- *  is not called by the generic after calling this routine.
- *  ie. node_access does not have to contain valid data when the 
- *      routine returns.
- */
-
-typedef int (*rtems_filesystem_mknod_t)(
-   const char                        *path,       /* IN */
-   mode_t                             mode,       /* IN */
-   dev_t                              dev,        /* IN */
-   rtems_filesystem_location_info_t  *pathloc     /* IN/OUT */
-);
-
-/*
- *  rtems_filesystem_freenode_t must be called by the generic after
- *  calling this routine
- */
-
-typedef int (*rtems_filesystem_evalpath_t)(
-  const char                        *pathname,      /* IN     */
-  int                                flags,         /* IN     */
-  rtems_filesystem_location_info_t  *pathloc        /* IN/OUT */
-);
-
-typedef int (*rtems_filesystem_evalmake_t)(
-   const char                       *path,       /* IN */
-   rtems_filesystem_location_info_t *pathloc,    /* IN/OUT */
-   const char                      **name        /* OUT    */
-);
-
-typedef int (*rtems_filesystem_link_t)(
- rtems_filesystem_location_info_t  *to_loc,      /* IN */
- rtems_filesystem_location_info_t  *parent_loc,  /* IN */
- const char                        *name         /* IN */
-);
-
-typedef int (*rtems_filesystem_unlink_t)(
- rtems_filesystem_location_info_t  *pathloc       /* IN */
-);
-
-typedef int (*rtems_filesystem_chown_t)(
- rtems_filesystem_location_info_t  *pathloc,       /* IN */
- uid_t                              owner,         /* IN */
- gid_t                              group          /* IN */
-);
-
-typedef int (*rtems_filesystem_freenode_t)(
- rtems_filesystem_location_info_t      *pathloc       /* IN */
-);
-
-typedef int (* rtems_filesystem_mount_t ) (
-   rtems_filesystem_mount_table_entry_t *mt_entry     /* in */
-);
-
-typedef int (* rtems_filesystem_fsmount_me_t )(
-   rtems_filesystem_mount_table_entry_t *mt_entry
-);
-
-typedef int (* rtems_filesystem_unmount_t ) (
-   rtems_filesystem_mount_table_entry_t *mt_entry     /* in */
-);
-
-typedef int (* rtems_filesystem_fsunmount_me_t ) (
-   rtems_filesystem_mount_table_entry_t *mt_entry    /* in */
-);
-
-typedef rtems_filesystem_node_types_t (* rtems_filesystem_node_type_t) (
-  rtems_filesystem_location_info_t    *pathloc      /* in */
-);
-
-typedef int (* rtems_filesystem_utime_t)(
-  rtems_filesystem_location_info_t  *pathloc,       /* IN */
-  time_t                             actime,        /* IN */
-  time_t                             modtime        /* IN */
-);
-
-typedef int (*rtems_filesystem_evaluate_link_t)(
-  rtems_filesystem_location_info_t *pathloc,     /* IN/OUT */
-  int                               flags        /* IN     */
-);
-
-typedef int (*rtems_filesystem_symlink_t)(
- rtems_filesystem_location_info_t  *loc,         /* IN */
- const char                        *link_name,   /* IN */
- const char                        *node_name
-);
-
-typedef int (*rtems_filesystem_readlink_t)(
- rtems_filesystem_location_info_t  *loc,     /* IN  */       
- char                              *buf,     /* OUT */       
- size_t                            bufsize    
-);
-
-/*
- * operations table that must be defined for every file system.
- */
-
-/*
- * File system types
- */
-typedef struct {
-    rtems_filesystem_evalpath_t      evalpath_h;
-    rtems_filesystem_evalmake_t      evalformake_h;
-    rtems_filesystem_link_t          link_h;
-    rtems_filesystem_unlink_t        unlink_h;
-    rtems_filesystem_node_type_t     node_type_h;
-    rtems_filesystem_mknod_t         mknod_h;
-    rtems_filesystem_chown_t         chown_h;
-    rtems_filesystem_freenode_t      freenod_h;
-    rtems_filesystem_mount_t         mount_h;
-    rtems_filesystem_fsmount_me_t    fsmount_me_h;
-    rtems_filesystem_unmount_t       unmount_h;
-    rtems_filesystem_fsunmount_me_t  fsunmount_me_h;
-    rtems_filesystem_utime_t         utime_h;
-    rtems_filesystem_evaluate_link_t eval_link_h;
-    rtems_filesystem_symlink_t       symlink_h;
-    rtems_filesystem_readlink_t      readlink_h;
-} rtems_filesystem_operations_table;
-
-/*
- * Structure used to determine a location/filesystem in the tree.
- */
-
-struct rtems_filesystem_location_info_tt
-{
-  void                                   *node_access;
-  rtems_filesystem_file_handlers_r       *handlers;
-  rtems_filesystem_operations_table      *ops;
-  rtems_filesystem_mount_table_entry_t   *mt_entry;
-};
-
-/*
- *  Structure used to contain file system specific information which
- *  is required to support fpathconf().
- */
-
-typedef struct {
-  int    link_max;
-  int    max_canon;
-  int    max_input;
-  int    name_max;
-  int    path_max;
-  int    pipe_buf;
-  int    posix_async_io;
-  int    posix_chown_restrictions;
-  int    posix_no_trunc;
-  int    posix_prio_io;
-  int    posix_sync_io;
-  int    posix_vdisable;
-} rtems_filesystem_limits_and_options_t;
-
-/*
- * Structure for a mount table entry.
- */
-
-struct rtems_filesystem_mount_table_entry_tt {
-  Chain_Node                             Node;
-  rtems_filesystem_location_info_t       mt_point_node;
-  rtems_filesystem_location_info_t       mt_fs_root;
-  int                                    options;
-  void                                  *fs_info;
-
-  rtems_filesystem_limits_and_options_t  pathconf_limits_and_options;
-
-  /*
-   *  When someone adds a mounted filesystem on a real device,
-   *  this will need to be used.
-   *
-   *  The best option long term for this is probably an open file descriptor.
-   */
-  char                                  *dev;
-};
-
-/*
- *  Valid RTEMS file systems options
- */
-
-typedef enum
-{
-  RTEMS_FILESYSTEM_READ_ONLY,
-  RTEMS_FILESYSTEM_READ_WRITE,
-  RTEMS_FILESYSTEM_BAD_OPTIONS
-} rtems_filesystem_options_t;
-
-
-/*
- *  An open file data structure, indexed by 'fd'
- *  TODO:
- *     should really have a separate per/file data structure that this
- *     points to (eg: size, offset, driver, pathname should be in that)
- */
-
-struct rtems_libio_tt {
-    rtems_driver_name_t              *driver;
-    off_t                             size;      /* size of file */
-    off_t                             offset;    /* current offset into file */
-    unsigned32                        flags;
-    rtems_filesystem_location_info_t  pathinfo;
-    Objects_Id                        sem;      
-    unsigned32                        data0;     /* private to "driver" */
-    void                             *data1;     /* ... */
-    void                             *file_info; /* used by file handlers */
-    rtems_filesystem_file_handlers_r *handlers;  /* type specific handlers */
-};
-
-/*
- *  param block for read/write
- *  Note: it must include 'offset' instead of using iop's offset since
- *        we can have multiple outstanding i/o's on a device.
- */
-
-typedef struct {
-    rtems_libio_t          *iop;
-    off_t                   offset;
-    unsigned8              *buffer;
-    unsigned32              count;
-    unsigned32              flags;
-    unsigned32              bytes_moved;
-} rtems_libio_rw_args_t;
-
-/*
- *  param block for open/close
- */
-
-typedef struct {
-    rtems_libio_t          *iop;
-    unsigned32              flags;
-    unsigned32              mode;
-} rtems_libio_open_close_args_t;
-
-/*
- *  param block for ioctl
- */
-
-typedef struct {
-    rtems_libio_t          *iop;
-    unsigned32              command;
-    void                   *buffer;
-    unsigned32              ioctl_return;
-} rtems_libio_ioctl_args_t;
-
-/*
- *  Values for 'flag'
- */
-
-#define LIBIO_FLAGS_NO_DELAY      0x0001  /* return immediately if no data */
-#define LIBIO_FLAGS_READ          0x0002  /* reading */
-#define LIBIO_FLAGS_WRITE         0x0004  /* writing */
-#define LIBIO_FLAGS_OPEN          0x0100  /* device is open */
-#define LIBIO_FLAGS_APPEND        0x0200  /* all writes append */
-#define LIBIO_FLAGS_CREATE        0x0400  /* create file */
-#define LIBIO_FLAGS_CLOSE_ON_EXEC 0x0800  /* close on process exec() */
-#define LIBIO_FLAGS_READ_WRITE    (LIBIO_FLAGS_READ | LIBIO_FLAGS_WRITE)
-
-void rtems_libio_init(void);
-
-/*
- *  External I/O handlers
- */
-
-typedef int (*rtems_libio_open_t)(
-  const char  *pathname,
-  unsigned32  flag,
-  unsigned32  mode
-);
-
-typedef int (*rtems_libio_close_t)(
-  int  fd
-);
-
-typedef int (*rtems_libio_read_t)(
-  int         fd,
-  void       *buffer,
-  unsigned32  count
-);
-
-typedef int (*rtems_libio_write_t)(
-  int         fd,
-  const void *buffer,
-  unsigned32  count
-);
-
-typedef int (*rtems_libio_ioctl_t)(
-  int         fd,
-  unsigned32  command,
-  void       *buffer
-);
-
-typedef int (*rtems_libio_lseek_t)(
-  int    fd,
-  off_t  offset,
-  int    whence
-);
-
-/*
- *  The following macros are used to build up the permissions sets
- *  used to check permissions.  These are similar in style to the
- *  mode_t bits and should stay compatible with them.
- */
-
-#define RTEMS_LIBIO_PERMS_READ   S_IROTH
-#define RTEMS_LIBIO_PERMS_WRITE  S_IWOTH
-#define RTEMS_LIBIO_PERMS_RDWR   (S_IROTH|S_IWOTH)
-#define RTEMS_LIBIO_PERMS_EXEC   S_IXOTH
-#define RTEMS_LIBIO_PERMS_SEARCH RTEMS_LIBIO_PERMS_EXEC
-#define RTEMS_LIBIO_PERMS_RWX    S_IRWXO
-
-/*
- *  Macros
- */
-
-#define rtems_filesystem_make_dev_t( _major, _minor ) \
-  ((((dev_t)(_major)) << 32) | (dev_t)(_minor))
-
-#define rtems_filesystem_dev_major_t( _dev ) \
-  (rtems_device_major_number) ((_dev) >> 32)
-
-#define rtems_filesystem_dev_minor_t( _dev ) \
-  (rtems_device_minor_number) ((_dev) & 0xFFFFFFFF)
-
-#define rtems_filesystem_split_dev_t( _dev, _major, _minor ) \
-  do { \
-    (_major) = rtems_filesystem_dev_major_t ( _dev ); \
-    (_minor) = rtems_filesystem_dev_minor_t( _dev ); \
-  } while(0)
-
-/*
- * Verifies that the permission flag is valid.
- */
-#define rtems_libio_is_valid_perms( _perm )     \
- (~ ((~RTEMS_LIBIO_PERMS_RWX) & _perm ))
-
-
-/*
- *  Prototypes for filesystem
- */
-
-void rtems_filesystem_initialize( void );
-
-
-/*
- * Callbacks from TERMIOS routines to device-dependent code
- */
-
-#include <termios.h>
-
-typedef struct rtems_termios_callbacks {
-  int    (*firstOpen)(int major, int minor, void *arg);
-  int    (*lastClose)(int major, int minor, void *arg);
-  int    (*pollRead)(int minor);
-  int    (*write)(int minor, const char *buf, int len);
-  int    (*setAttributes)(int minor, const struct termios *t);
-  int    (*stopRemoteTx)(int minor);
-  int    (*startRemoteTx)(int minor);
-  int    outputUsesInterrupts;
-} rtems_termios_callbacks;
-
-/*
- *  Device-independent TERMIOS routines
- */
-
-void rtems_termios_initialize (void);
-
-rtems_status_code rtems_termios_open (
-  rtems_device_major_number      major,
-  rtems_device_minor_number      minor,
-  void                          *arg,
-  const rtems_termios_callbacks *callbacks
-);
-
-rtems_status_code rtems_termios_close(
-  void *arg
-);
-
-rtems_status_code rtems_termios_read(
-  void *arg
-);
-
-rtems_status_code rtems_termios_write(
-  void *arg
-);
-
-rtems_status_code rtems_termios_ioctl(
-  void *arg
-);
-
-int rtems_termios_enqueue_raw_characters(
-  void *ttyp,
-  char *buf,
-  int   len
-);
-
-int rtems_termios_dequeue_characters(
-  void *ttyp,
-  int   len
-);
-
-void rtems_termios_reserve_resources(
-  rtems_configuration_table *configuration,
-  rtems_unsigned32           number_of_devices
-);
-
-int unmount(
-  const char *mount_path
-);
-
-int mount(
-  rtems_filesystem_mount_table_entry_t **mt_entry,
-  rtems_filesystem_operations_table    *fs_ops,
-  rtems_filesystem_options_t            fsoptions,
-  char                                 *device,
-  char                                 *mount_point
-);
-
-/*
- *  Boot Time Mount Table Structure
- */
-
-typedef struct {
-  rtems_filesystem_operations_table     *fs_ops;
-  rtems_filesystem_options_t             fsoptions;
-  char                                  *device;
-  char                                  *mount_point;
-} rtems_filesystem_mount_table_t;
-
-extern rtems_filesystem_mount_table_t *rtems_filesystem_mount_table;
-extern int                             rtems_filesystem_mount_table_size;
-
-#endif /* _RTEMS_LIBIO_H */
diff --git a/c/src/lib/libc/libio_.h b/c/src/lib/libc/libio_.h
deleted file mode 100644
index e840c74a1b..0000000000
--- a/c/src/lib/libc/libio_.h
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- *  Libio Internal Information
- *
- *  COPYRIGHT (c) 1989-1999.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __LIBIO__h
-#define __LIBIO__h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems.h>
-#include <rtems/libio.h>                /* include before standard IO */
-#include <rtems/assoc.h>                /* assoc.h not included by rtems.h */
-
-#include <stdio.h>                      /* O_RDONLY, et.al. */
-#include <fcntl.h>                      /* O_RDONLY, et.al. */
-#include <assert.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#if ! defined(O_NDELAY)
-# if defined(solaris2)
-#  define O_NDELAY O_NONBLOCK
-# elif defined(RTEMS_NEWLIB)
-#  define O_NDELAY _FNBIO
-# endif
-#endif
-
-#if !defined(ENOTSUP)
-#define ENOTSUP EOPNOTSUPP
-#endif
-
-#include <errno.h>
-#include <string.h>                     /* strcmp */
-#include <unistd.h>
-#include <stdlib.h>                     /* calloc() */
-
-/*
- *  Semaphore to protect the io table
- */
-
-#define RTEMS_LIBIO_SEM         rtems_build_name('L', 'B', 'I', 'O')
-#define RTEMS_LIBIO_IOP_SEM(n)  rtems_build_name('L', 'B', 'I', n)
-
-extern rtems_id                          rtems_libio_semaphore;
-extern rtems_filesystem_file_handlers_r  rtems_filesystem_null_handlers;
-
-/*
- *  File descriptor Table Information
- */
-
-extern unsigned32      rtems_libio_number_iops;
-extern rtems_libio_t  *rtems_libio_iops;
-extern rtems_libio_t  *rtems_libio_last_iop;
-extern rtems_libio_t *rtems_libio_iop_freelist;
-
-/*
- *  Default mode for all files.
- */
-
-extern mode_t    rtems_filesystem_umask;
-
-/*
- *  set_errno_and_return_minus_one
- *
- *  Macro to ease common way to return an error.
- */
-
-#ifndef set_errno_and_return_minus_one
-#define set_errno_and_return_minus_one( _error ) \
-  do { errno = (_error); return -1; } while(0)
-#endif
-
-/*
- *  rtems_libio_iop
- *
- *  Macro to return the file descriptor pointer.
- */
-
-#define rtems_libio_iop(_fd) \
-  ((((unsigned32)(_fd)) < rtems_libio_number_iops) ? \
-         &rtems_libio_iops[_fd] : 0)
-
-/*  
- *  rtems_libio_check_is_open
- *  
- *  Macro to check if a file descriptor is actually open.
- */
-
-#define rtems_libio_check_is_open(_iop) \
-  do {                                               \
-      if (((_iop)->flags & LIBIO_FLAGS_OPEN) == 0) { \
-          errno = EBADF;                             \
-          return -1;                                 \
-      }                                              \
-  } while (0)
-
-/*
- *  rtems_libio_check_fd
- *
- *  Macro to check if a file descriptor number is valid.
- */
-
-#define rtems_libio_check_fd(_fd) \
-  do {                                                     \
-      if ((unsigned32) (_fd) >= rtems_libio_number_iops) { \
-          errno = EBADF;                                   \
-          return -1;                                       \
-      }                                                    \
-  } while (0)
-
-/*
- *  rtems_libio_check_buffer
- *
- *  Macro to check if a buffer pointer is valid.
- */
-
-#define rtems_libio_check_buffer(_buffer) \
-  do {                                    \
-      if ((_buffer) == 0) {               \
-          errno = EINVAL;                 \
-          return -1;                      \
-      }                                   \
-  } while (0)
-
-/*
- *  rtems_libio_check_count
- *
- *  Macro to check if a count or length is valid.
- */
-
-#define rtems_libio_check_count(_count) \
-  do {                                  \
-      if ((_count) == 0) {              \
-          return 0;                     \
-      }                                 \
-  } while (0)
-
-/*
- *  rtems_libio_check_permissions
- *
- *  Macro to check if a file descriptor is open for this operation.
- */
-
-#define rtems_libio_check_permissions(_iop, _flag)    \
-  do {                                                \
-      if (((_iop)->flags & (_flag)) == 0) {           \
-            set_errno_and_return_minus_one( EINVAL ); \
-            return -1;                                \
-      }                                               \
-  } while (0)
-
-/*
- *  rtems_filesystem_freenode
- *
- *  Macro to free a node.
- */
-
-#define rtems_filesystem_freenode( _node ) \
-  do { \
-    if ( (_node)->ops->freenod_h ) \
-      (*(_node)->ops->freenod_h)( (_node) ); \
-  } while (0)
-
-/*
- *  rtems_filesystem_is_separator
- *
- *  Macro to determine if a character is a path name separator.
- *
- *  NOTE:  This macro handles MS-DOS and UNIX style names.
- */
-
-#define rtems_filesystem_is_separator( _ch ) \
-   ( ((_ch) == '/') || ((_ch) == '\\') || ((_ch) == '\0'))
-
-/*
- *  rtems_filesystem_get_start_loc
- *
- *  Macro to determine if path is absolute or relative.
- */
-
-#define rtems_filesystem_get_start_loc( _path, _index, _loc )  \
-  do {                                                         \
-    if ( rtems_filesystem_is_separator( (_path)[ 0 ] ) ) {     \
-      *(_loc) = rtems_filesystem_root;                         \
-      *(_index) = 1;                                           \
-    } else {                                                   \
-      *(_loc) = rtems_filesystem_current;                      \
-      *(_index) = 0;                                           \
-    }                                                          \
-  } while (0)
-
-#define rtems_filesystem_get_sym_start_loc( _path, _index, _loc )  \
-  do {                                                         \
-    if ( rtems_filesystem_is_separator( (_path)[ 0 ] ) ) {     \
-      *(_loc) = rtems_filesystem_root;                         \
-      *(_index) = 1;                                           \
-    } else {                                                   \
-      *(_index) = 0;                                           \
-    }                                                          \
-  } while (0)
-
-
-/*
- *  External structures
- */
-
-extern rtems_filesystem_location_info_t rtems_filesystem_current;
-extern rtems_filesystem_location_info_t rtems_filesystem_root;
-extern nlink_t                          rtems_filesystem_link_counts;
-
-
-/*
- *  File Descriptor Routine Prototypes
- */
-
-rtems_libio_t *rtems_libio_allocate(void);
-
-unsigned32 rtems_libio_fcntl_flags(
-  unsigned32 fcntl_flags
-);
-
-unsigned32 rtems_libio_to_fcntl_flags(
-  unsigned32 flags
-);
-
-void rtems_libio_free(
-  rtems_libio_t *iop
-);
-
-int rtems_libio_is_open_files_in_fs(
-  rtems_filesystem_mount_table_entry_t *mt_entry
-);
-
-int rtems_libio_is_file_open(
-  void  *node_access
-);
-
-/*
- *  File System Routine Prototypes
- */
-
-int rtems_filesystem_evaluate_path(
-  const char                        *pathname,
-  int                                flags,
-  rtems_filesystem_location_info_t  *pathloc,
-  int                                follow_link
-);
-
-void rtems_filesystem_initialize();
-
-int init_fs_mount_table();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
-
-
-
diff --git a/c/src/lib/libc/libio_sockets.c b/c/src/lib/libc/libio_sockets.c
index ac15a2a5c2..fa08171019 100644
--- a/c/src/lib/libc/libio_sockets.c
+++ b/c/src/lib/libc/libio_sockets.c
@@ -12,7 +12,7 @@
  *  $Id$
  */
 
-#include "libio_.h"                   /* libio_.h pulls in rtems */
+#include <rtems/libio_.h>             /* libio_.h pulls in rtems */
 #include <rtems.h>
 
 #include <errno.h>
diff --git a/c/src/lib/libc/link.c b/c/src/lib/libc/link.c
index 61bcd45e44..254c5bfef0 100644
--- a/c/src/lib/libc/link.c
+++ b/c/src/lib/libc/link.c
@@ -15,7 +15,7 @@
 #include <rtems/libio.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int link(
   const char *existing,
diff --git a/c/src/lib/libc/lseek.c b/c/src/lib/libc/lseek.c
index cb2e329235..d8694eaa4d 100644
--- a/c/src/lib/libc/lseek.c
+++ b/c/src/lib/libc/lseek.c
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 off_t lseek(
   int     fd,
diff --git a/c/src/lib/libc/malloc.c b/c/src/lib/libc/malloc.c
index d3121f90b4..5c3c0c7586 100644
--- a/c/src/lib/libc/malloc.c
+++ b/c/src/lib/libc/malloc.c
@@ -14,7 +14,7 @@
 
 #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
-#include "libcsupport.h"
+#include <rtems/libcsupport.h>
 #ifdef RTEMS_NEWLIB
 #include <sys/reent.h>
 #endif
diff --git a/c/src/lib/libc/mallocfreespace.c b/c/src/lib/libc/mallocfreespace.c
index 28ef83278e..6e65981df8 100644
--- a/c/src/lib/libc/mallocfreespace.c
+++ b/c/src/lib/libc/mallocfreespace.c
@@ -14,7 +14,7 @@
 
 #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
-#include "libcsupport.h"
+#include <rtems/libcsupport.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/c/src/lib/libc/mknod.c b/c/src/lib/libc/mknod.c
index 98eb9ef36e..46ac50fdb1 100644
--- a/c/src/lib/libc/mknod.c
+++ b/c/src/lib/libc/mknod.c
@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int mknod(
   const char *pathname,
diff --git a/c/src/lib/libc/mount.c b/c/src/lib/libc/mount.c
index 253735b9fc..11770e1042 100644
--- a/c/src/lib/libc/mount.c
+++ b/c/src/lib/libc/mount.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 Chain_Control rtems_filesystem_mount_table_control;
 
diff --git a/c/src/lib/libc/newlibc.c b/c/src/lib/libc/newlibc.c
index 6fa9d09221..2e68383867 100644
--- a/c/src/lib/libc/newlibc.c
+++ b/c/src/lib/libc/newlibc.c
@@ -17,7 +17,7 @@
 #include <rtems.h>
 
 #if defined(RTEMS_NEWLIB)
-#include <libcsupport.h>
+#include <rtems/libcsupport.h>
 #include <stdlib.h>             /* for free() */
 #include <string.h>             /* for memset() */
 
diff --git a/c/src/lib/libc/no_libc.c b/c/src/lib/libc/no_libc.c
index 4a7e5d8c27..54ccb279af 100644
--- a/c/src/lib/libc/no_libc.c
+++ b/c/src/lib/libc/no_libc.c
@@ -16,7 +16,7 @@
 #include <rtems.h>
 #if !defined(RTEMS_NEWLIB) && !defined(RTEMS_UNIX)
 
-#include "libcsupport.h"
+#include <rtems/libcsupport.h>
 
 #include <stdlib.h>             /* for free() */
 
diff --git a/c/src/lib/libc/open.c b/c/src/lib/libc/open.c
index 3b11209d20..c78dd83bce 100644
--- a/c/src/lib/libc/open.c
+++ b/c/src/lib/libc/open.c
@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 #include <unistd.h>
 
diff --git a/c/src/lib/libc/read.c b/c/src/lib/libc/read.c
index d724e16164..8ff65ebc15 100644
--- a/c/src/lib/libc/read.c
+++ b/c/src/lib/libc/read.c
@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 ssize_t read(
   int         fd,
diff --git a/c/src/lib/libc/readlink.c b/c/src/lib/libc/readlink.c
index 09afb1ca2d..adbb90eab2 100644
--- a/c/src/lib/libc/readlink.c
+++ b/c/src/lib/libc/readlink.c
@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int readlink(
   const char *pathname,
diff --git a/c/src/lib/libc/rmdir.c b/c/src/lib/libc/rmdir.c
index 87dacf775e..240a378a94 100644
--- a/c/src/lib/libc/rmdir.c
+++ b/c/src/lib/libc/rmdir.c
@@ -17,7 +17,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int rmdir(
   const char *pathname
diff --git a/c/src/lib/libc/stat.c b/c/src/lib/libc/stat.c
index 26b9786d1c..a6dc2784b9 100644
--- a/c/src/lib/libc/stat.c
+++ b/c/src/lib/libc/stat.c
@@ -36,7 +36,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int _STAT_NAME(
   const char  *path,
diff --git a/c/src/lib/libc/symlink.c b/c/src/lib/libc/symlink.c
index 59a894ea9f..3159eca020 100644
--- a/c/src/lib/libc/symlink.c
+++ b/c/src/lib/libc/symlink.c
@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int symlink(
   const char *actualpath,
diff --git a/c/src/lib/libc/tcsetattr.c b/c/src/lib/libc/tcsetattr.c
index d9a8426a3d..7b94afef51 100644
--- a/c/src/lib/libc/tcsetattr.c
+++ b/c/src/lib/libc/tcsetattr.c
@@ -21,7 +21,7 @@
 /* #include <sys/ioctl.h> */
 
 #include <rtems/libio.h>
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int tcsetattr(
   int             fd,
diff --git a/c/src/lib/libc/telldir.c b/c/src/lib/libc/telldir.c
index 521138d648..ef71557699 100644
--- a/c/src/lib/libc/telldir.c
+++ b/c/src/lib/libc/telldir.c
@@ -17,7 +17,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 
 long telldir(
diff --git a/c/src/lib/libc/ttyname.c b/c/src/lib/libc/ttyname.c
index ceb6ed8121..90064936bb 100644
--- a/c/src/lib/libc/ttyname.c
+++ b/c/src/lib/libc/ttyname.c
@@ -14,7 +14,7 @@
 #include <_syslist.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 
 int ttyname_r(
diff --git a/c/src/lib/libc/ttyname_r.c b/c/src/lib/libc/ttyname_r.c
index 69ca36cc43..e78eb5ea36 100644
--- a/c/src/lib/libc/ttyname_r.c
+++ b/c/src/lib/libc/ttyname_r.c
@@ -50,7 +50,7 @@ static char sccsid[] = "@(#)ttyname.c	5.10 (Berkeley) 5/6/91";
 #include <_syslist.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 /*
  *  ttyname_r() - POSIX 1003.1b 4.7.2 - Demetermine Terminal Device Name
diff --git a/c/src/lib/libc/umask.c b/c/src/lib/libc/umask.c
index c9f0b4851b..7fb059b9dd 100644
--- a/c/src/lib/libc/umask.c
+++ b/c/src/lib/libc/umask.c
@@ -14,7 +14,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 mode_t umask(
   mode_t cmask
diff --git a/c/src/lib/libc/unlink.c b/c/src/lib/libc/unlink.c
index e9eadd9453..99f132b902 100644
--- a/c/src/lib/libc/unlink.c
+++ b/c/src/lib/libc/unlink.c
@@ -13,7 +13,7 @@
 
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int unlink( 
   const char *path 
diff --git a/c/src/lib/libc/unmount.c b/c/src/lib/libc/unmount.c
index 17f7e4baa2..67fcf7d175 100644
--- a/c/src/lib/libc/unmount.c
+++ b/c/src/lib/libc/unmount.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 /*
  *  Data structures and routines private to mount/unmount pair.
diff --git a/c/src/lib/libc/utime.c b/c/src/lib/libc/utime.c
index 8d7d578bf2..ca1ed1980d 100644
--- a/c/src/lib/libc/utime.c
+++ b/c/src/lib/libc/utime.c
@@ -15,7 +15,7 @@
 #include <utime.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int utime(
   const char           *path,
diff --git a/c/src/lib/libc/write.c b/c/src/lib/libc/write.c
index aae273a340..9710237b5c 100644
--- a/c/src/lib/libc/write.c
+++ b/c/src/lib/libc/write.c
@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 
 /*