5 files changed, 10 insertions, 12 deletions
diff --git a/cpukit/posix/src/getegid.c b/cpukit/posix/src/getegid.c
index c7c48603b5..8fcec2f6a7 100644
--- a/cpukit/posix/src/getegid.c
+++ b/cpukit/posix/src/getegid.c
@@ -14,11 +14,10 @@
 #include <rtems/system.h>
 #include <rtems/score/object.h>
 #include <rtems/seterr.h>
-
-#include <rtems/libio_.h>
+#include <rtems/userenv.h>
 
 /*
- * MACRO in libio_.h
+ * MACRO in userenv.h
 gid_t _POSIX_types_Egid = 0;
 */
 
diff --git a/cpukit/posix/src/geteuid.c b/cpukit/posix/src/geteuid.c
index 9e58615446..bf996d3913 100644
--- a/cpukit/posix/src/geteuid.c
+++ b/cpukit/posix/src/geteuid.c
@@ -15,10 +15,10 @@
 #include <rtems/score/object.h>
 #include <rtems/seterr.h>
 
-#include <rtems/libio_.h>
+#include <rtems/userenv.h>
 
 /*
- * MACRO in libio_.h
+ * MACRO in userenv.h
 uid_t _POSIX_types_Euid = 0;
 */
 
diff --git a/cpukit/posix/src/getgid.c b/cpukit/posix/src/getgid.c
index 24bd88a2b4..94af978376 100644
--- a/cpukit/posix/src/getgid.c
+++ b/cpukit/posix/src/getgid.c
@@ -15,10 +15,10 @@
 #include <rtems/score/object.h>
 #include <rtems/seterr.h>
 
-#include <rtems/libio_.h>
+#include <rtems/userenv.h>
 
 /*
- * MACRO in libio_.h
+ * MACRO in userenv.h
  * 
 gid_t _POSIX_types_Gid = 0;
 */
diff --git a/cpukit/posix/src/getlogin.c b/cpukit/posix/src/getlogin.c
index 08a16c6430..cd394224b2 100644
--- a/cpukit/posix/src/getlogin.c
+++ b/cpukit/posix/src/getlogin.c
@@ -14,9 +14,8 @@
 #include <rtems/system.h>
 #include <rtems/score/object.h>
 #include <rtems/seterr.h>
+#include <rtems/userenv.h>
 
-#include <rtems/libio_.h>
-#include <string.h>
 #include <unistd.h>
 #include <pwd.h>
 
@@ -28,7 +27,7 @@
  */
 
 /*
- * MACRO in libio_.h
+ * MACRO in userenv.h
  * 
 static char _POSIX_types_Getlogin_buffer[ LOGIN_NAME_MAX ];
 */
diff --git a/cpukit/posix/src/getuid.c b/cpukit/posix/src/getuid.c
index aafc818c01..f37ea30960 100644
--- a/cpukit/posix/src/getuid.c
+++ b/cpukit/posix/src/getuid.c
@@ -15,10 +15,10 @@
 #include <rtems/score/object.h>
 #include <rtems/seterr.h>
 
-#include <rtems/libio_.h>
+#include <rtems/userenv.h>
 
 /* 
- * MACRO in libio_.h 
+ * MACRO in userenv.h 
  *
 uid_t _POSIX_types_Uid = 0;
 */