diff --git a/libio/ChangeLog b/libio/ChangeLog
index b05db013c2f1..798a5d3c890f 100644
--- a/libio/ChangeLog
+++ b/libio/ChangeLog
@@ -1,3 +1,12 @@
+Mon Apr 12 19:22:44 1999  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* filedoalloc.c (_POSIX_SOURCE): Remove definition.
+	* fileops.c (_POSIX_SOURCE): Likewise.
+	* iopopen.c (_POSIX_SOURCE): Likewise.
+	* procbuf.cc (_POSIX_SOURCE): Likewise.
+	* libioP.h (_POSIX_SOURCE): And define it here.
+	* stdiostream.cc: Include libioP.h before others.
+
 Fri Apr  2 15:11:58 1999  H.J. Lu  (hjl@gnu.org)
 
 	* libio/configure.in (gxx_include_dir): Handle it.
diff --git a/libio/filedoalloc.c b/libio/filedoalloc.c
index 5c62280c14bb..52b554400c21 100644
--- a/libio/filedoalloc.c
+++ b/libio/filedoalloc.c
@@ -42,9 +42,6 @@
 
 /* Modified for GNU iostream by Per Bothner 1991, 1992. */
 
-#ifndef _POSIX_SOURCE
-# define _POSIX_SOURCE
-#endif
 #include "libioP.h"
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/libio/fileops.c b/libio/fileops.c
index c4406340704b..54e13d3f18fe 100644
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -25,9 +25,6 @@
    General Public License.  */
 
 
-#ifndef _POSIX_SOURCE
-# define _POSIX_SOURCE
-#endif
 #include "libioP.h"
 #include <fcntl.h>
 #include <sys/types.h>
diff --git a/libio/iopopen.c b/libio/iopopen.c
index 59d4fc3f0ed2..58f97495c11b 100644
--- a/libio/iopopen.c
+++ b/libio/iopopen.c
@@ -24,9 +24,6 @@
    other reasons why the executable file might be covered by the GNU
    General Public License.  */
 
-#ifndef _POSIX_SOURCE
-# define _POSIX_SOURCE
-#endif
 #include "libioP.h"
 #if _IO_HAVE_SYS_WAIT
 #include <signal.h>
diff --git a/libio/libioP.h b/libio/libioP.h
index d41c46619f0a..36fa1e007ded 100644
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -23,6 +23,10 @@
    other reasons why the executable file might be covered by the GNU
    General Public License.  */
 
+#ifndef _POSIX_SOURCE
+# define _POSIX_SOURCE
+#endif
+
 #include <errno.h>
 #ifndef __set_errno
 # define __set_errno(Val) errno = (Val)
diff --git a/libio/procbuf.cc b/libio/procbuf.cc
index 1c79ce4ce0f7..eb6d50e7797f 100644
--- a/libio/procbuf.cc
+++ b/libio/procbuf.cc
@@ -28,7 +28,6 @@ the executable file might be covered by the GNU General Public License. */
 #pragma implementation
 #endif
 
-#define _POSIX_SOURCE
 #include "libioP.h"
 #include "procbuf.h"
 
diff --git a/libio/stdiostream.cc b/libio/stdiostream.cc
index bc9bef08ab67..ee0907b209f4 100644
--- a/libio/stdiostream.cc
+++ b/libio/stdiostream.cc
@@ -28,8 +28,8 @@ the executable file might be covered by the GNU General Public License. */
 #pragma implementation
 #endif
 
-#include <stdiostream.h>
 #include "libioP.h"
+#include <stdiostream.h>
 
 // A stdiobuf is "tied" to a FILE object (as used by the stdio package).
 // Thus a stdiobuf is always synchronized with the corresponding FILE,