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.

48 files changed, 48 insertions, 48 deletions

diff --git a/cpukit/libcsupport/src/assoc.c b/cpukit/libcsupport/src/assoc.c
index 5a24bd43a7..845d9eb522 100644
--- a/cpukit/libcsupport/src/assoc.c
+++ b/cpukit/libcsupport/src/assoc.c
@@ -6,7 +6,7 @@
  */
 
 #include <rtems.h>
-#include "assoc.h"
+#include <rtems/assoc.h>
 
 #include <string.h>             /* strcat, strcmp */
 
diff --git a/cpukit/libcsupport/src/assocnamebad.c b/cpukit/libcsupport/src/assocnamebad.c
index e336c39cc7..7bb48c9a55 100644
--- a/cpukit/libcsupport/src/assocnamebad.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/base_fs.c b/cpukit/libcsupport/src/base_fs.c
index fb932b542d..cb888cab2c 100644
--- a/cpukit/libcsupport/src/base_fs.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/cfsetispeed.c b/cpukit/libcsupport/src/cfsetispeed.c
index af1a1b840c..9e195a0a90 100644
--- a/cpukit/libcsupport/src/cfsetispeed.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/cfsetospeed.c b/cpukit/libcsupport/src/cfsetospeed.c
index f6f6c5838c..36f2cf8ff6 100644
--- a/cpukit/libcsupport/src/cfsetospeed.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/chdir.c b/cpukit/libcsupport/src/chdir.c
index 46a6ad168b..722fafc4dd 100644
--- a/cpukit/libcsupport/src/chdir.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/chmod.c b/cpukit/libcsupport/src/chmod.c
index 4b7ab8c594..d8f7e53ac3 100644
--- a/cpukit/libcsupport/src/chmod.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/chown.c b/cpukit/libcsupport/src/chown.c
index c4dfe97ed0..2c1376d85e 100644
--- a/cpukit/libcsupport/src/chown.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/close.c b/cpukit/libcsupport/src/close.c
index 19149d3bfe..2b1fde2d48 100644
--- a/cpukit/libcsupport/src/close.c
+++ b/cpukit/libcsupport/src/close.c
@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int close(
   int  fd
diff --git a/cpukit/libcsupport/src/closedir.c b/cpukit/libcsupport/src/closedir.c
index 4d948ec95b..3ec944436e 100644
--- a/cpukit/libcsupport/src/closedir.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/dup2.c b/cpukit/libcsupport/src/dup2.c
index 21701bfd0d..6931933474 100644
--- a/cpukit/libcsupport/src/dup2.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/error.c b/cpukit/libcsupport/src/error.c
index 339f8eb374..246a630222 100644
--- a/cpukit/libcsupport/src/error.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/eval.c b/cpukit/libcsupport/src/eval.c
index 60c718d3b8..0bcc8e8194 100644
--- a/cpukit/libcsupport/src/eval.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/fchdir.c b/cpukit/libcsupport/src/fchdir.c
index 4a94afe20b..a937088b31 100644
--- a/cpukit/libcsupport/src/fchdir.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/fchmod.c b/cpukit/libcsupport/src/fchmod.c
index fbf4cbc0ac..9cb773831f 100644
--- a/cpukit/libcsupport/src/fchmod.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/fcntl.c b/cpukit/libcsupport/src/fcntl.c
index 72a03fa1c5..521fb93f33 100644
--- a/cpukit/libcsupport/src/fcntl.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/fdatasync.c b/cpukit/libcsupport/src/fdatasync.c
index 251573ef5d..a45388f019 100644
--- a/cpukit/libcsupport/src/fdatasync.c
+++ b/cpukit/libcsupport/src/fdatasync.c
@@ -13,7 +13,7 @@
 
 #include <unistd.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fdatasync(
   int     fd
diff --git a/cpukit/libcsupport/src/fpathconf.c b/cpukit/libcsupport/src/fpathconf.c
index 744551ec88..bfcb4cd417 100644
--- a/cpukit/libcsupport/src/fpathconf.c
+++ b/cpukit/libcsupport/src/fpathconf.c
@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 #include <unistd.h>
 #include <errno.h>
diff --git a/cpukit/libcsupport/src/fstat.c b/cpukit/libcsupport/src/fstat.c
index ad937c14fa..11d3ecb4d7 100644
--- a/cpukit/libcsupport/src/fstat.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/fsync.c b/cpukit/libcsupport/src/fsync.c
index f27309057f..7a4b384eba 100644
--- a/cpukit/libcsupport/src/fsync.c
+++ b/cpukit/libcsupport/src/fsync.c
@@ -13,7 +13,7 @@
 
 #include <unistd.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fsync(
   int     fd
diff --git a/cpukit/libcsupport/src/ftruncate.c b/cpukit/libcsupport/src/ftruncate.c
index 70587d257b..436a969d0f 100644
--- a/cpukit/libcsupport/src/ftruncate.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/getdents.c b/cpukit/libcsupport/src/getdents.c
index e260fe2489..e154b688d2 100644
--- a/cpukit/libcsupport/src/getdents.c
+++ b/cpukit/libcsupport/src/getdents.c
@@ -19,7 +19,7 @@
 
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int getdents(
   int   dd_fd,
diff --git a/cpukit/libcsupport/src/ioctl.c b/cpukit/libcsupport/src/ioctl.c
index 38d47da3d3..1046c88e29 100644
--- a/cpukit/libcsupport/src/ioctl.c
+++ b/cpukit/libcsupport/src/ioctl.c
@@ -14,7 +14,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 #include <unistd.h>
 
diff --git a/cpukit/libcsupport/src/libio.c b/cpukit/libcsupport/src/libio.c
index ad3f775ff5..66617700a3 100644
--- a/cpukit/libcsupport/src/libio.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/libio_sockets.c b/cpukit/libcsupport/src/libio_sockets.c
index ac15a2a5c2..fa08171019 100644
--- a/cpukit/libcsupport/src/libio_sockets.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/link.c b/cpukit/libcsupport/src/link.c
index 61bcd45e44..254c5bfef0 100644
--- a/cpukit/libcsupport/src/link.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/lseek.c b/cpukit/libcsupport/src/lseek.c
index cb2e329235..d8694eaa4d 100644
--- a/cpukit/libcsupport/src/lseek.c
+++ b/cpukit/libcsupport/src/lseek.c
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 off_t lseek(
   int     fd,
diff --git a/cpukit/libcsupport/src/malloc.c b/cpukit/libcsupport/src/malloc.c
index d3121f90b4..5c3c0c7586 100644
--- a/cpukit/libcsupport/src/malloc.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/mallocfreespace.c b/cpukit/libcsupport/src/mallocfreespace.c
index 28ef83278e..6e65981df8 100644
--- a/cpukit/libcsupport/src/mallocfreespace.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/mknod.c b/cpukit/libcsupport/src/mknod.c
index 98eb9ef36e..46ac50fdb1 100644
--- a/cpukit/libcsupport/src/mknod.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/mount.c b/cpukit/libcsupport/src/mount.c
index 253735b9fc..11770e1042 100644
--- a/cpukit/libcsupport/src/mount.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/newlibc.c b/cpukit/libcsupport/src/newlibc.c
index 6fa9d09221..2e68383867 100644
--- a/cpukit/libcsupport/src/newlibc.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/no_libc.c b/cpukit/libcsupport/src/no_libc.c
index 4a7e5d8c27..54ccb279af 100644
--- a/cpukit/libcsupport/src/no_libc.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/open.c b/cpukit/libcsupport/src/open.c
index 3b11209d20..c78dd83bce 100644
--- a/cpukit/libcsupport/src/open.c
+++ b/cpukit/libcsupport/src/open.c
@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 #include <unistd.h>
 
diff --git a/cpukit/libcsupport/src/read.c b/cpukit/libcsupport/src/read.c
index d724e16164..8ff65ebc15 100644
--- a/cpukit/libcsupport/src/read.c
+++ b/cpukit/libcsupport/src/read.c
@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 ssize_t read(
   int         fd,
diff --git a/cpukit/libcsupport/src/readlink.c b/cpukit/libcsupport/src/readlink.c
index 09afb1ca2d..adbb90eab2 100644
--- a/cpukit/libcsupport/src/readlink.c
+++ b/cpukit/libcsupport/src/readlink.c
@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int readlink(
   const char *pathname,
diff --git a/cpukit/libcsupport/src/rmdir.c b/cpukit/libcsupport/src/rmdir.c
index 87dacf775e..240a378a94 100644
--- a/cpukit/libcsupport/src/rmdir.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/stat.c b/cpukit/libcsupport/src/stat.c
index 26b9786d1c..a6dc2784b9 100644
--- a/cpukit/libcsupport/src/stat.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/symlink.c b/cpukit/libcsupport/src/symlink.c
index 59a894ea9f..3159eca020 100644
--- a/cpukit/libcsupport/src/symlink.c
+++ b/cpukit/libcsupport/src/symlink.c
@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int symlink(
   const char *actualpath,
diff --git a/cpukit/libcsupport/src/tcsetattr.c b/cpukit/libcsupport/src/tcsetattr.c
index d9a8426a3d..7b94afef51 100644
--- a/cpukit/libcsupport/src/tcsetattr.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/telldir.c b/cpukit/libcsupport/src/telldir.c
index 521138d648..ef71557699 100644
--- a/cpukit/libcsupport/src/telldir.c
+++ b/cpukit/libcsupport/src/telldir.c
@@ -17,7 +17,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 
 long telldir(
diff --git a/cpukit/libcsupport/src/ttyname.c b/cpukit/libcsupport/src/ttyname.c
index ceb6ed8121..90064936bb 100644
--- a/cpukit/libcsupport/src/ttyname.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/ttyname_r.c b/cpukit/libcsupport/src/ttyname_r.c
index 69ca36cc43..e78eb5ea36 100644
--- a/cpukit/libcsupport/src/ttyname_r.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/umask.c b/cpukit/libcsupport/src/umask.c
index c9f0b4851b..7fb059b9dd 100644
--- a/cpukit/libcsupport/src/umask.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/unlink.c b/cpukit/libcsupport/src/unlink.c
index e9eadd9453..99f132b902 100644
--- a/cpukit/libcsupport/src/unlink.c
+++ b/cpukit/libcsupport/src/unlink.c
@@ -13,7 +13,7 @@
 
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int unlink( 
   const char *path 
diff --git a/cpukit/libcsupport/src/unmount.c b/cpukit/libcsupport/src/unmount.c
index 17f7e4baa2..67fcf7d175 100644
--- a/cpukit/libcsupport/src/unmount.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/utime.c b/cpukit/libcsupport/src/utime.c
index 8d7d578bf2..ca1ed1980d 100644
--- a/cpukit/libcsupport/src/utime.c
+++ b/cpukit/libcsupport/src/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/cpukit/libcsupport/src/write.c b/cpukit/libcsupport/src/write.c
index aae273a340..9710237b5c 100644
--- a/cpukit/libcsupport/src/write.c
+++ b/cpukit/libcsupport/src/write.c
@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 
 /*