Fix the logic in blocking vs non-blocking pipes to children. It only

makes sense to change the blocking attributes of a pipe if we actually
are successful in creating the pipe.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59501 13f79535-47bb-0310-9956-ffa450edef68

52 files changed, 523 insertions, 448 deletions

diff --git a/file_io/unix/Makefile.in b/file_io/unix/Makefile.in
index 35bde522a..1962a20d2 100644
--- a/file_io/unix/Makefile.in
+++ b/file_io/unix/Makefile.in
@@ -57,33 +57,39 @@ depend:
 	    && rm Makefile.new
 
 # DO NOT REMOVE
-dir.o: dir.c fileio.h ../../include/apr_general.h \
- ../../include/apr_config.h ../../include/apr_errno.h \
- ../../include/apr_file_io.h ../../include/apr_lib.h \
- ../../include/apr_portable.h ../../include/apr_thread_proc.h \
- ../../include/apr_win.h ../../include/apr_network_io.h \
+dir.o: dir.c fileio.h ../../include/apr_config.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../include/apr_file_io.h \
+ ../../include/apr_lib.h ../../include/apr_portable.h \
+ ../../include/apr_thread_proc.h ../../include/apr_network_io.h \
  ../../include/apr_lock.h ../../include/apr_time.h
-fileacc.o: fileacc.c fileio.h ../../include/apr_general.h \
- ../../include/apr_config.h ../../include/apr_errno.h \
- ../../include/apr_file_io.h ../../include/apr_lib.h
-filedup.o: filedup.c fileio.h ../../include/apr_general.h \
- ../../include/apr_config.h ../../include/apr_errno.h \
- ../../include/apr_file_io.h ../../include/apr_lib.h
-filestat.o: filestat.c fileio.h ../../include/apr_general.h \
- ../../include/apr_config.h ../../include/apr_errno.h \
- ../../include/apr_file_io.h
-open.o: open.c fileio.h ../../include/apr_general.h \
- ../../include/apr_config.h ../../include/apr_errno.h \
- ../../include/apr_file_io.h ../../include/apr_portable.h \
- ../../include/apr_thread_proc.h ../../include/apr_win.h \
- ../../include/apr_network_io.h ../../include/apr_lock.h \
- ../../include/apr_time.h ../../include/apr_lib.h
-pipe.o: pipe.c fileio.h ../../include/apr_general.h \
- ../../include/apr_config.h ../../include/apr_errno.h \
- ../../include/apr_file_io.h ../../include/apr_lib.h
-readwrite.o: readwrite.c fileio.h ../../include/apr_general.h \
- ../../include/apr_config.h ../../include/apr_errno.h \
- ../../include/apr_file_io.h ../../include/apr_lib.h
-seek.o: seek.c fileio.h ../../include/apr_general.h \
- ../../include/apr_config.h ../../include/apr_errno.h \
- ../../include/apr_file_io.h
+fileacc.o: fileacc.c fileio.h ../../include/apr_config.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../include/apr_file_io.h \
+ ../../include/apr_lib.h
+filedup.o: filedup.c fileio.h ../../include/apr_config.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../include/apr_file_io.h \
+ ../../include/apr_lib.h
+filestat.o: filestat.c fileio.h ../../include/apr_config.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../include/apr_file_io.h \
+ ../../include/apr_lib.h
+open.o: open.c fileio.h ../../include/apr_config.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../include/apr_file_io.h \
+ ../../include/apr_lib.h ../../include/apr_portable.h \
+ ../../include/apr_thread_proc.h ../../include/apr_network_io.h \
+ ../../include/apr_lock.h ../../include/apr_time.h
+pipe.o: pipe.c fileio.h ../../include/apr_config.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../include/apr_file_io.h \
+ ../../include/apr_lib.h
+readwrite.o: readwrite.c fileio.h ../../include/apr_config.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../include/apr_file_io.h \
+ ../../include/apr_lib.h
+seek.o: seek.c fileio.h ../../include/apr_config.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../include/apr_file_io.h \
+ ../../include/apr_lib.h
diff --git a/file_io/unix/dir.c b/file_io/unix/dir.c
index 1970b000a..29a443a77 100644
--- a/file_io/unix/dir.c
+++ b/file_io/unix/dir.c
@@ -53,15 +53,7 @@
  *
  */
 
-#include <sys/types.h>
-#include <errno.h>
-#include <string.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include "fileio.h"
-#include "apr_file_io.h"
-#include "apr_lib.h"
 #include "apr_portable.h"
 
 static ap_status_t dir_cleanup(void *thedir)
diff --git a/file_io/unix/fileacc.c b/file_io/unix/fileacc.c
index 4a8087589..1acd7130a 100644
--- a/file_io/unix/fileacc.c
+++ b/file_io/unix/fileacc.c
@@ -54,12 +54,6 @@
  */
 
 #include "fileio.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include <errno.h>
-#include <string.h>
-#include <sys/types.h>
 
 /* A file to put ALL of the accessor functions for struct file_t types. */
 
diff --git a/file_io/unix/filedup.c b/file_io/unix/filedup.c
index 5de013171..700e65d63 100644
--- a/file_io/unix/filedup.c
+++ b/file_io/unix/filedup.c
@@ -54,11 +54,6 @@
  */
 
 #include "fileio.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include <string.h>
-#include <unistd.h>
 
 /* ***APRDOC********************************************************
  * ap_status_t ap_dupfile(ap_file_t **, ap_file_t *)
diff --git a/file_io/unix/fileio.h b/file_io/unix/fileio.h
index fd62fd7a5..b1efb3d72 100644
--- a/file_io/unix/fileio.h
+++ b/file_io/unix/fileio.h
@@ -56,19 +56,50 @@
 #ifndef FILE_IO_H
 #define FILE_IO_H
 
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <time.h>
-#include <dirent.h>
-#include <sys/uio.h>
-#include <stdio.h>
+#include "apr_config.h"
 #include "apr_general.h"
 #include "apr_file_io.h"
 #include "apr_errno.h"
+#include "apr_lib.h"
+
+/* System headers the file I/O library needs */
+#if HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+#if HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#if HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#if HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
 #ifdef BEOS
 #include <kernel/OS.h>
 #endif
+/* End System headers */
 
 struct file_t {
     ap_context_t *cntxt;
diff --git a/file_io/unix/open.c b/file_io/unix/open.c
index be5b2b773..ddca05c90 100644
--- a/file_io/unix/open.c
+++ b/file_io/unix/open.c
@@ -54,14 +54,7 @@
  */
 
 #include "fileio.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
 #include "apr_portable.h"
-#include "apr_lib.h"
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
 
 ap_status_t file_cleanup(void *thefile)
 {
diff --git a/file_io/unix/pipe.c b/file_io/unix/pipe.c
index 3eb65e906..016f3b2cb 100644
--- a/file_io/unix/pipe.c
+++ b/file_io/unix/pipe.c
@@ -54,15 +54,6 @@
  */
 
 #include "fileio.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 
 static ap_status_t pipenonblock(struct file_t *thefile)
 {
diff --git a/file_io/unix/readwrite.c b/file_io/unix/readwrite.c
index 14f64f710..7e74eaf23 100644
--- a/file_io/unix/readwrite.c
+++ b/file_io/unix/readwrite.c
@@ -54,26 +54,6 @@
  */
 
 #include "fileio.h"
-#include "apr_config.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_errno.h"
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 
 /* ***APRDOC********************************************************
  * ap_status_t ap_read(ap_file_t *, void *, ap_ssize_t *)
diff --git a/file_io/unix/seek.c b/file_io/unix/seek.c
index b2ab863c3..06b908f2e 100644
--- a/file_io/unix/seek.c
+++ b/file_io/unix/seek.c
@@ -54,10 +54,6 @@
  */
 
 #include "fileio.h"
-#include "apr_file_io.h"
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
 
 /* ***APRDOC********************************************************
  * ap_status_t ap_seek(ap_file_t *, ap_seek_where_t, ap_off_t *)
diff --git a/include/arch/unix/fileio.h b/include/arch/unix/fileio.h
index fd62fd7a5..b1efb3d72 100644
--- a/include/arch/unix/fileio.h
+++ b/include/arch/unix/fileio.h
@@ -56,19 +56,50 @@
 #ifndef FILE_IO_H
 #define FILE_IO_H
 
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <time.h>
-#include <dirent.h>
-#include <sys/uio.h>
-#include <stdio.h>
+#include "apr_config.h"
 #include "apr_general.h"
 #include "apr_file_io.h"
 #include "apr_errno.h"
+#include "apr_lib.h"
+
+/* System headers the file I/O library needs */
+#if HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+#if HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#if HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#if HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
 #ifdef BEOS
 #include <kernel/OS.h>
 #endif
+/* End System headers */
 
 struct file_t {
     ap_context_t *cntxt;
diff --git a/include/arch/unix/locks.h b/include/arch/unix/locks.h
index db006e18c..3a9317e9c 100644
--- a/include/arch/unix/locks.h
+++ b/include/arch/unix/locks.h
@@ -55,26 +55,46 @@
 #ifndef LOCKS_H
 #define LOCKS_H
 
+#include "apr_config.h"
+#include "apr_general.h"
+#include "apr_lib.h"
 #include "apr_lock.h"
-#include "apr_file_io.h"
 
-#if defined (USE_USLOCK_SERIALIZE)
+/* System headers required by Locks library */
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+#if HAVE_USLOCKS_H
 #include <uslocks.h>
-#elif defined (USE_SYSVSEM_SERIALIZE)
-#include <sys/file.h>
+#endif
+#if HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#if HAVE_SYS_IPC_H
 #include <sys/ipc.h>
+#endif
+#if HAVE_SYS_SEM_H
 #include <sys/sem.h>
-#elif defined (USE_FLOCK_SERIALIZE)
+#endif
+#if HAVE_SYS_FILE_H
 #include <sys/file.h>
+#endif
+#if HAVE_STDIO_H
 #include <stdio.h>
-#elif defined (USE_FCNTL_SERIALIZE)
-#include <stdio.h>
+#endif
+#if HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#if APR_HAS_THREADS && HAVE_PTHREAD_H
+
+#if APR_HAS_THREADS
+#if HAVE_PTHREAD_H
 #include <pthread.h>
 #endif
+#endif
+/* End System Headers */
 
 #ifndef HAVE_UNION_SEMUN
 /* it makes no sense, but this isn't defined on solaris */
diff --git a/include/arch/unix/misc.h b/include/arch/unix/misc.h
index 0bb09383e..558b1d524 100644
--- a/include/arch/unix/misc.h
+++ b/include/arch/unix/misc.h
@@ -56,11 +56,26 @@
 #ifndef MISC_H
 #define MISC_H
 
+#include "apr_config.h"
 #include "apr_general.h"
-#include "apr_file_io.h"
-#include "apr_errno.h"
+#include "apr_pools.h"
 #include "apr_getopt.h"
-
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+#endif
+ 
 typedef struct datastruct {
     void *data;
     char *key;
diff --git a/include/arch/unix/mmap.c b/include/arch/unix/mmap.c
index 49ada6027..445790c2f 100644
--- a/include/arch/unix/mmap.c
+++ b/include/arch/unix/mmap.c
@@ -52,25 +52,14 @@
  * project, please see <http://www.apache.org/>.
  *
  */
-
+#ifdef BEOS
+#include "../beos/mmap_h.h"
+#else
 #include "mmap_h.h"
-#include "fileio.h"
-#include "apr_mmap.h"
-#include "apr_general.h"
-#include "apr_portable.h"
-#include "apr_lib.h"
-#include "apr_errno.h"
-#include "apr_config.h"
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
 #endif
 
+#include "apr_portable.h"
+
 #if HAVE_MMAP
 
 ap_status_t mmap_cleanup(void *themmap)
diff --git a/include/arch/unix/networkio.h b/include/arch/unix/networkio.h
index e38c2c211..2cb64086f 100644
--- a/include/arch/unix/networkio.h
+++ b/include/arch/unix/networkio.h
@@ -59,10 +59,43 @@
 #include "apr_config.h"
 #include "apr_network_io.h"
 #include "apr_general.h"
-#include "apr_lock.h"
-#ifdef HAVE_POLL_H
+#include "apr_lib.h"
+
+/* System headers the network I/O library needs */
+#if HAVE_POLL_H
 #include <poll.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+#if HAVE_NETINET_TCP_H
+#include <netinet/tcp.h>
+#endif
+#if HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#if HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#if HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#if HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#if HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+/* End System Headers */
 
 struct socket_t {
     ap_context_t *cntxt;
diff --git a/include/arch/unix/threadproc.h b/include/arch/unix/threadproc.h
index 2a3339117..1fe877dc1 100644
--- a/include/arch/unix/threadproc.h
+++ b/include/arch/unix/threadproc.h
@@ -55,7 +55,26 @@
 #include "apr_config.h"
 #include "apr_thread_proc.h"
 #include "apr_file_io.h"
+#include "fileio.h"
+
+/* System headers required for thread/process library */
+#if HAVE_PTHREAD_H
 #include <pthread.h>
+#endif
+#if HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+#if HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+/* End System Headers */
+
 
 #ifndef THREAD_PROC_H
 #define THREAD_PROC_H
diff --git a/include/arch/win32/misc.h b/include/arch/win32/misc.h
index 0bb09383e..558b1d524 100644
--- a/include/arch/win32/misc.h
+++ b/include/arch/win32/misc.h
@@ -56,11 +56,26 @@
 #ifndef MISC_H
 #define MISC_H
 
+#include "apr_config.h"
 #include "apr_general.h"
-#include "apr_file_io.h"
-#include "apr_errno.h"
+#include "apr_pools.h"
 #include "apr_getopt.h"
-
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+#endif
+ 
 typedef struct datastruct {
     void *data;
     char *key;
diff --git a/lib/Makefile.in b/lib/Makefile.in
index e75a75600..98a61118f 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -62,32 +62,33 @@ depend:
 
 # DO NOT REMOVE
 apr_cpystrn.o: apr_cpystrn.c ../include/apr_config.h \
- ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
- ../include/apr_file_io.h
+ ../include/apr_lib.h ../include/apr_general.h ../include/apr.h \
+ ../include/apr_errno.h ../include/apr_file_io.h
 apr_execve.o: apr_execve.c ../include/apr_config.h
 apr_fnmatch.o: apr_fnmatch.c ../include/apr_config.h \
- ../include/apr_fnmatch.h ../include/apr_errno.h ../include/apr_lib.h \
- ../include/apr_general.h ../include/apr_file_io.h
-apr_getpass.o: apr_getpass.c ../include/apr_config.h \
- ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
+ ../include/apr_fnmatch.h ../include/apr_errno.h ../include/apr.h \
+ ../include/apr_lib.h ../include/apr_general.h \
  ../include/apr_file_io.h
+apr_getpass.o: apr_getpass.c ../include/apr_config.h \
+ ../include/apr_lib.h ../include/apr_general.h ../include/apr.h \
+ ../include/apr_errno.h ../include/apr_file_io.h
 apr_md5.o: apr_md5.c ../include/apr_config.h ../include/apr_md5.h \
- ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
- ../include/apr_file_io.h
+ ../include/apr_lib.h ../include/apr_general.h ../include/apr.h \
+ ../include/apr_errno.h ../include/apr_file_io.h
 apr_pools.o: apr_pools.c ../include/apr_config.h \
- ../include/apr_general.h ../include/apr_errno.h \
+ ../include/apr_general.h ../include/apr.h ../include/apr_errno.h \
  ../include/apr_pools.h ../include/apr_lib.h ../include/apr_file_io.h \
  ../include/apr_lock.h ../misc/unix/misc.h ../include/apr_getopt.h
 apr_signal.o: apr_signal.c ../include/apr_config.h \
- ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
- ../include/apr_file_io.h
+ ../include/apr_lib.h ../include/apr_general.h ../include/apr.h \
+ ../include/apr_errno.h ../include/apr_file_io.h
 apr_slack.o: apr_slack.c ../include/apr_config.h ../include/apr_lib.h \
- ../include/apr_general.h ../include/apr_errno.h \
+ ../include/apr_general.h ../include/apr.h ../include/apr_errno.h \
  ../include/apr_file_io.h
 apr_snprintf.o: apr_snprintf.c ../include/apr_config.h \
- ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
- ../include/apr_file_io.h
+ ../include/apr_lib.h ../include/apr_general.h ../include/apr.h \
+ ../include/apr_errno.h ../include/apr_file_io.h
 apr_tables.o: apr_tables.c ../include/apr_config.h \
- ../include/apr_general.h ../include/apr_errno.h \
+ ../include/apr_general.h ../include/apr.h ../include/apr_errno.h \
  ../include/apr_pools.h ../include/apr_lib.h ../include/apr_file_io.h \
  ../misc/unix/misc.h ../include/apr_getopt.h
diff --git a/locks/unix/Makefile.in b/locks/unix/Makefile.in
index 5ad1e195d..8619800f4 100644
--- a/locks/unix/Makefile.in
+++ b/locks/unix/Makefile.in
@@ -53,17 +53,17 @@ depend:
 	    && rm Makefile.new
 
 # DO NOT REMOVE
-crossproc.o: crossproc.c ../../include/apr_lock.h \
- ../../include/apr_general.h ../../include/apr_config.h \
+crossproc.o: crossproc.c locks.h ../../include/apr_config.h \
+ ../../include/apr_general.h ../../include/apr.h \
  ../../include/apr_errno.h ../../include/apr_lib.h \
- ../../include/apr_file_io.h locks.h
-intraproc.o: intraproc.c ../../include/apr_config.h \
- ../../include/apr_lock.h ../../include/apr_general.h \
+ ../../include/apr_file_io.h ../../include/apr_lock.h
+intraproc.o: intraproc.c locks.h ../../include/apr_config.h \
+ ../../include/apr_general.h ../../include/apr.h \
  ../../include/apr_errno.h ../../include/apr_lib.h \
- ../../include/apr_file_io.h locks.h
-locks.o: locks.c ../../include/apr_general.h \
- ../../include/apr_config.h ../../include/apr_errno.h \
+ ../../include/apr_file_io.h ../../include/apr_lock.h
+locks.o: locks.c locks.h ../../include/apr_config.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../include/apr_lib.h \
+ ../../include/apr_file_io.h ../../include/apr_lock.h \
  ../../include/apr_portable.h ../../include/apr_thread_proc.h \
- ../../include/apr_file_io.h ../../include/apr_win.h \
- ../../include/apr_network_io.h ../../include/apr_lock.h \
- ../../include/apr_time.h ../../include/apr_lib.h locks.h
+ ../../include/apr_network_io.h ../../include/apr_time.h
diff --git a/locks/unix/crossproc.c b/locks/unix/crossproc.c
index b5430fd03..24d3a6b5e 100644
--- a/locks/unix/crossproc.c
+++ b/locks/unix/crossproc.c
@@ -53,13 +53,7 @@
  *
  */
 
-#include "apr_config.h"
-#include "apr_lock.h"
-#include "apr_general.h"
-#include "apr_lib.h"
 #include "locks.h"
-#include <unistd.h>
-#include <sys/mman.h>
 
 #if defined (USE_SYSVSEM_SERIALIZE)  
 ap_status_t lock_cleanup(struct lock_t *lock)
diff --git a/locks/unix/intraproc.c b/locks/unix/intraproc.c
index 77a93b976..d71cbe360 100644
--- a/locks/unix/intraproc.c
+++ b/locks/unix/intraproc.c
@@ -52,10 +52,6 @@
  * project, please see <http://www.apache.org/>.
  *
  */
-#include "apr_config.h"
-#include "apr_lock.h"
-#include "apr_general.h"
-#include "apr_lib.h"
 #include "locks.h"
 
 #if APR_HAS_THREADS
diff --git a/locks/unix/locks.c b/locks/unix/locks.c
index a6ca4b16e..988ba7339 100644
--- a/locks/unix/locks.c
+++ b/locks/unix/locks.c
@@ -53,13 +53,8 @@
  *
  */
 
-#include "apr_config.h"
-#include "apr_general.h"
-#include "apr_portable.h"
-#include "apr_lib.h"
 #include "locks.h"
-#include <string.h>
-#include <unistd.h>
+#include "apr_portable.h"
 
 /* ***APRDOC********************************************************
  * ap_status_t ap_create_lock(ap_context_t *, ap_locktype_e, char *, 
diff --git a/locks/unix/locks.h b/locks/unix/locks.h
index db006e18c..3a9317e9c 100644
--- a/locks/unix/locks.h
+++ b/locks/unix/locks.h
@@ -55,26 +55,46 @@
 #ifndef LOCKS_H
 #define LOCKS_H
 
+#include "apr_config.h"
+#include "apr_general.h"
+#include "apr_lib.h"
 #include "apr_lock.h"
-#include "apr_file_io.h"
 
-#if defined (USE_USLOCK_SERIALIZE)
+/* System headers required by Locks library */
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+#if HAVE_USLOCKS_H
 #include <uslocks.h>
-#elif defined (USE_SYSVSEM_SERIALIZE)
-#include <sys/file.h>
+#endif
+#if HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#if HAVE_SYS_IPC_H
 #include <sys/ipc.h>
+#endif
+#if HAVE_SYS_SEM_H
 #include <sys/sem.h>
-#elif defined (USE_FLOCK_SERIALIZE)
+#endif
+#if HAVE_SYS_FILE_H
 #include <sys/file.h>
+#endif
+#if HAVE_STDIO_H
 #include <stdio.h>
-#elif defined (USE_FCNTL_SERIALIZE)
-#include <stdio.h>
+#endif
+#if HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#if APR_HAS_THREADS && HAVE_PTHREAD_H
+
+#if APR_HAS_THREADS
+#if HAVE_PTHREAD_H
 #include <pthread.h>
 #endif
+#endif
+/* End System Headers */
 
 #ifndef HAVE_UNION_SEMUN
 /* it makes no sense, but this isn't defined on solaris */
diff --git a/misc/unix/Makefile.in b/misc/unix/Makefile.in
index c05f8ff2f..467fa7a6b 100644
--- a/misc/unix/Makefile.in
+++ b/misc/unix/Makefile.in
@@ -51,10 +51,13 @@ depend:
 	    && rm Makefile.new
 
 # DO NOT REMOVE
-getopt.o: getopt.c misc.h ../../include/apr_general.h \
- ../../include/apr_config.h ../../include/apr_errno.h \
- ../../include/apr_file_io.h ../../include/apr_getopt.h
-start.o: start.c ../../include/apr_general.h \
- ../../include/apr_config.h ../../include/apr_errno.h \
- ../../include/apr_pools.h ../../include/apr_lib.h \
- ../../include/apr_file_io.h misc.h ../../include/apr_getopt.h
+getopt.o: getopt.c misc.h ../../include/apr_config.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../include/apr_pools.h \
+ ../../include/apr_lib.h ../../include/apr_file_io.h \
+ ../../include/apr_getopt.h
+start.o: start.c misc.h ../../include/apr_config.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../include/apr_pools.h \
+ ../../include/apr_lib.h ../../include/apr_file_io.h \
+ ../../include/apr_getopt.h
diff --git a/misc/unix/getopt.c b/misc/unix/getopt.c
index b3c1c47b4..d0af733af 100644
--- a/misc/unix/getopt.c
+++ b/misc/unix/getopt.c
@@ -31,9 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include "misc.h"
 
 int ap_opterr = 1,                      /* if error message should be printed */
diff --git a/misc/unix/misc.h b/misc/unix/misc.h
index 0bb09383e..558b1d524 100644
--- a/misc/unix/misc.h
+++ b/misc/unix/misc.h
@@ -56,11 +56,26 @@
 #ifndef MISC_H
 #define MISC_H
 
+#include "apr_config.h"
 #include "apr_general.h"
-#include "apr_file_io.h"
-#include "apr_errno.h"
+#include "apr_pools.h"
 #include "apr_getopt.h"
-
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+#endif
+ 
 typedef struct datastruct {
     void *data;
     char *key;
diff --git a/misc/unix/start.c b/misc/unix/start.c
index 019a63eeb..86815702d 100644
--- a/misc/unix/start.c
+++ b/misc/unix/start.c
@@ -53,19 +53,7 @@
  *
  */
 
-#include "apr_general.h"
-#include "apr_errno.h"
-#include "apr_pools.h"
 #include "misc.h"
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-#include <signal.h>
-#include <errno.h>
-#include <string.h>
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
 
 /* ***APRDOC********************************************************
  * ap_status_t ap_create_context(ap_context_t **, ap_context_t *)
diff --git a/mmap/unix/Makefile.in b/mmap/unix/Makefile.in
index 26b25c897..75510feef 100644
--- a/mmap/unix/Makefile.in
+++ b/mmap/unix/Makefile.in
@@ -50,17 +50,17 @@ depend:
 	    && rm Makefile.new
 
 # DO NOT REMOVE
-common.o: common.c ../../file_io/unix/fileio.h \
- ../../include/apr_general.h ../../include/apr_config.h \
- ../../include/apr_errno.h ../../include/apr_file_io.h \
- ../../include/apr_mmap.h ../../include/apr_network_io.h \
- ../../include/apr_portable.h ../../include/apr_thread_proc.h \
- ../../include/apr_win.h ../../include/apr_lock.h \
- ../../include/apr_time.h ../../include/apr_lib.h mmap_h.h
-mmap.o: mmap.c mmap_h.h ../../include/apr_general.h \
- ../../include/apr_config.h ../../include/apr_errno.h \
- ../../include/apr_mmap.h ../../include/apr_network_io.h \
- ../../include/apr_portable.h ../../include/apr_thread_proc.h \
- ../../include/apr_file_io.h ../../include/apr_win.h \
+common.o: common.c mmap_h.h ../../include/apr_config.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../include/apr_mmap.h \
+ ../../include/apr_network_io.h ../../include/apr_portable.h \
+ ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
+ ../../include/apr_lock.h ../../include/apr_time.h \
+ ../../file_io/unix/fileio.h ../../include/apr_lib.h
+mmap.o: mmap.c mmap_h.h ../../include/apr_config.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../include/apr_mmap.h \
+ ../../include/apr_network_io.h ../../include/apr_portable.h \
+ ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
  ../../include/apr_lock.h ../../include/apr_time.h \
  ../../file_io/unix/fileio.h ../../include/apr_lib.h
diff --git a/mmap/unix/common.c b/mmap/unix/common.c
index dc8342fa4..0be70c3a2 100644
--- a/mmap/unix/common.c
+++ b/mmap/unix/common.c
@@ -62,28 +62,10 @@
  *
  */
 
-#include "fileio.h"
-#include "apr_config.h"
-#include "apr_mmap.h"
-#include "apr_general.h"
-#include "apr_portable.h"
-#include "apr_lib.h"
-#include "apr_errno.h"
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
-
 #ifdef BEOS
 #include "../beos/mmap_h.h"
-#include <kernel/OS.h>
 #else
 #include "mmap_h.h"
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
 #endif
 
 #if HAVE_MMAP
diff --git a/mmap/unix/mmap.c b/mmap/unix/mmap.c
index 49ada6027..445790c2f 100644
--- a/mmap/unix/mmap.c
+++ b/mmap/unix/mmap.c
@@ -52,25 +52,14 @@
  * project, please see <http://www.apache.org/>.
  *
  */
-
+#ifdef BEOS
+#include "../beos/mmap_h.h"
+#else
 #include "mmap_h.h"
-#include "fileio.h"
-#include "apr_mmap.h"
-#include "apr_general.h"
-#include "apr_portable.h"
-#include "apr_lib.h"
-#include "apr_errno.h"
-#include "apr_config.h"
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
 #endif
 
+#include "apr_portable.h"
+
 #if HAVE_MMAP
 
 ap_status_t mmap_cleanup(void *themmap)
diff --git a/mmap/unix/mmap_h.h b/mmap/unix/mmap_h.h
index 96a7e9aa1..0f228df31 100644
--- a/mmap/unix/mmap_h.h
+++ b/mmap/unix/mmap_h.h
@@ -56,12 +56,34 @@
 #ifndef MMAP_H_H
 #define MMAP_H_H
 
+#include "apr_config.h"
 #include "apr_general.h"
 #include "apr_mmap.h"
 #include "apr_errno.h"
-#ifdef HAVE_SYS_STAT_H
+#include "fileio.h"
+#ifdef BEOS
+#include "../beos/mmap_h.h"
+#else
+#include "mmap_h.h"
+#endif
+
+/* System headers required for the mmap library */
+#ifdef BEOS
+#include <kernel/OS.h>
+#endif
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+#if HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
+#if HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
+/* End System Headers */
 
 struct mmap_t {
     ap_context_t *cntxt;
diff --git a/network_io/unix/Makefile.in b/network_io/unix/Makefile.in
index 745329996..6a8955ebc 100644
--- a/network_io/unix/Makefile.in
+++ b/network_io/unix/Makefile.in
@@ -54,25 +54,25 @@ depend:
 	    && rm Makefile.new
 
 # DO NOT REMOVE
-poll.o: poll.c networkio.h ../../include/apr_network_io.h \
- ../../include/apr_general.h ../../include/apr_config.h \
- ../../include/apr_errno.h ../../include/apr_lock.h \
- ../../include/apr_lib.h ../../include/apr_file_io.h
-sendrecv.o: sendrecv.c networkio.h ../../include/apr_network_io.h \
- ../../include/apr_general.h ../../include/apr_config.h \
- ../../include/apr_errno.h ../../include/apr_lock.h \
- ../../include/apr_lib.h ../../include/apr_file_io.h
-sockaddr.o: sockaddr.c networkio.h ../../include/apr_network_io.h \
- ../../include/apr_general.h ../../include/apr_config.h \
- ../../include/apr_errno.h ../../include/apr_lock.h \
- ../../include/apr_lib.h ../../include/apr_file_io.h
-sockets.o: sockets.c networkio.h ../../include/apr_network_io.h \
- ../../include/apr_general.h ../../include/apr_config.h \
- ../../include/apr_errno.h ../../include/apr_lock.h \
- ../../include/apr_portable.h ../../include/apr_thread_proc.h \
- ../../include/apr_file_io.h ../../include/apr_win.h \
- ../../include/apr_time.h ../../include/apr_lib.h
-sockopt.o: sockopt.c networkio.h ../../include/apr_network_io.h \
- ../../include/apr_general.h ../../include/apr_config.h \
- ../../include/apr_errno.h ../../include/apr_lock.h \
- ../../include/apr_lib.h ../../include/apr_file_io.h
+poll.o: poll.c networkio.h ../../include/apr_config.h \
+ ../../include/apr_network_io.h ../../include/apr_general.h \
+ ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \
+ ../../include/apr_file_io.h
+sendrecv.o: sendrecv.c networkio.h ../../include/apr_config.h \
+ ../../include/apr_network_io.h ../../include/apr_general.h \
+ ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \
+ ../../include/apr_file_io.h
+sockaddr.o: sockaddr.c networkio.h ../../include/apr_config.h \
+ ../../include/apr_network_io.h ../../include/apr_general.h \
+ ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \
+ ../../include/apr_file_io.h
+sockets.o: sockets.c networkio.h ../../include/apr_config.h \
+ ../../include/apr_network_io.h ../../include/apr_general.h \
+ ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \
+ ../../include/apr_file_io.h ../../include/apr_portable.h \
+ ../../include/apr_thread_proc.h ../../include/apr_lock.h \
+ ../../include/apr_time.h
+sockopt.o: sockopt.c networkio.h ../../include/apr_config.h \
+ ../../include/apr_network_io.h ../../include/apr_general.h \
+ ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \
+ ../../include/apr_file_io.h
diff --git a/network_io/unix/networkio.h b/network_io/unix/networkio.h
index e38c2c211..2cb64086f 100644
--- a/network_io/unix/networkio.h
+++ b/network_io/unix/networkio.h
@@ -59,10 +59,43 @@
 #include "apr_config.h"
 #include "apr_network_io.h"
 #include "apr_general.h"
-#include "apr_lock.h"
-#ifdef HAVE_POLL_H
+#include "apr_lib.h"
+
+/* System headers the network I/O library needs */
+#if HAVE_POLL_H
 #include <poll.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+#if HAVE_NETINET_TCP_H
+#include <netinet/tcp.h>
+#endif
+#if HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#if HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#if HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#if HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#if HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+/* End System Headers */
 
 struct socket_t {
     ap_context_t *cntxt;
diff --git a/network_io/unix/poll.c b/network_io/unix/poll.c
index a73c1b7fe..255cfa9a6 100644
--- a/network_io/unix/poll.c
+++ b/network_io/unix/poll.c
@@ -54,16 +54,6 @@
  */
 
 #include "networkio.h"
-#include "apr_config.h"
-#include "apr_network_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 
 #ifdef HAVE_POLL    /* We can just use poll to do our socket polling. */
 
diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c
index 3575a204e..1db9178bd 100644
--- a/network_io/unix/sendrecv.c
+++ b/network_io/unix/sendrecv.c
@@ -56,12 +56,6 @@
  */
 
 #include "networkio.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_network_io.h"
-#include "apr_lib.h"
-#include <sys/time.h>
-#include <unistd.h>
 
 /* ***APRDOC********************************************************
  * ap_status_t ap_send(ap_socket_t *, const char *, ap_ssize_t *, time_t)
diff --git a/network_io/unix/sockaddr.c b/network_io/unix/sockaddr.c
index 41df63e7f..6603099d7 100644
--- a/network_io/unix/sockaddr.c
+++ b/network_io/unix/sockaddr.c
@@ -54,17 +54,6 @@
  */
 
 #include "networkio.h"
-#include "apr_network_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include <errno.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-
 
 /* ***APRDOC********************************************************
  * ap_status_t ap_set_local_port(ap_socket_t *socket, ap_uint32_t port)
diff --git a/network_io/unix/sockets.c b/network_io/unix/sockets.c
index f070925a7..e40e80cc2 100644
--- a/network_io/unix/sockets.c
+++ b/network_io/unix/sockets.c
@@ -54,23 +54,7 @@
  */
 
 #include "networkio.h"
-#include "apr_network_io.h"
-#include "apr_general.h"
 #include "apr_portable.h"
-#include "apr_lib.h"
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-
-#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-ap_lock_t *lock_network = NULL;
-ap_lock_t *lock_inet = NULL;
-#endif
 
 static ap_status_t socket_cleanup(void *sock)
 {
diff --git a/network_io/unix/sockopt.c b/network_io/unix/sockopt.c
index 4d2b912f5..96746dac3 100644
--- a/network_io/unix/sockopt.c
+++ b/network_io/unix/sockopt.c
@@ -54,17 +54,6 @@
  */
 
 #include "networkio.h"
-#include "apr_network_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include <errno.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <netdb.h>
 
 static ap_status_t soblock(int sd)
 {
diff --git a/test/testargs.c b/test/testargs.c
index 2f5b6bfd6..628563552 100644
--- a/test/testargs.c
+++ b/test/testargs.c
@@ -81,7 +81,7 @@ int main(int argc, char * const argv[])
                 break;
             case 'd':
                 printf("option %c", data);
-                if (optarg) {
+                if (ap_optarg) {
                     printf(" with %s\n", ap_optarg);
                 }
                 else {
diff --git a/test/testmmap.c b/test/testmmap.c
index f7b4b61d4..722ef2437 100644
--- a/test/testmmap.c
+++ b/test/testmmap.c
@@ -53,6 +53,7 @@
  *
  */
 #include <stdio.h>
+#include <unistd.h>
 #include <string.h>
 #include "apr_mmap.h"
 #include "apr_errno.h"
@@ -69,7 +70,6 @@ int main()
 {
     ap_context_t *context;
     ap_mmap_t *themmap = NULL;
-    ap_status_t status = 0;
     ap_file_t *thefile;
     ap_int32_t flag = APR_READ;
     char *file1;
@@ -87,13 +87,6 @@ int main()
     getcwd(file1, PATH_LEN);
     strncat(file1,"/testmmap.c",11);  
 
-    fprintf(stdout,"Trying to mmap file.................");
-    if (ap_mmap_create(&themmap, file1, context) != APR_SUCCESS) {
-        fprintf(stderr,"Failed.\n");
-        exit (-1);
-    }
-    fprintf(stdout,"OK\n");
-    
     fprintf(stdout,"Trying to delete the mmap file......");
     if (ap_mmap_delete(themmap) != APR_SUCCESS) {
         fprintf(stderr,"Failed!\n");
@@ -111,7 +104,7 @@ int main()
     }
 
     fprintf(stdout,"Trying to mmap the open file........");
-    if (ap_mmap_open_create(&themmap, thefile, context) != APR_SUCCESS) {
+    if (ap_mmap_create(&themmap, thefile, 0, 0, context) != APR_SUCCESS) {
         fprintf(stderr,"Failed!\n");
         exit(-1);
     }
diff --git a/test/testproc.c b/test/testproc.c
index 5bd248817..0cd50c106 100644
--- a/test/testproc.c
+++ b/test/testproc.c
@@ -81,12 +81,14 @@ int main(int argc, char *argv[])
 
     ap_create_context(&context, NULL);
 
-    teststr = ap_pstrdup(context, "Whooo Hoooo\0");
 
     if (argc > 1) {
+        teststr = ap_palloc(context, 256);
+        teststr = fgets(teststr, 256, stdin);      
         fprintf(stdout, "%s", teststr);      
         exit(1);
     }
+    teststr = ap_pstrdup(context, "Whooo Hoooo\0");
 
     fprintf(stdout, "Creating directory for later use.......");
     if (ap_make_dir("proctest", APR_UREAD | APR_UWRITE | APR_UEXECUTE, context) != APR_SUCCESS) {
@@ -103,7 +105,8 @@ int main(int argc, char *argv[])
     fprintf(stdout, "OK.\n");
 
     fprintf(stdout, "Setting attr pipes, all three.......");
-    if (ap_setprocattr_io(attr, 1, 1, 0) != APR_SUCCESS) {
+    if (ap_setprocattr_io(attr, APR_FULL_BLOCK, 
+                          APR_CHILD_BLOCK, APR_NO_PIPE) != APR_SUCCESS) {
         fprintf(stderr, "Could not set pipes attr\n");
         exit(-1);
     }
@@ -134,6 +137,20 @@ int main(int argc, char *argv[])
     }
     fprintf(stdout, "OK.\n");
 
+    fprintf(stdout, "Grabbing child's stdin.......");
+    if (ap_get_childin(&testfile, newproc) != APR_SUCCESS) {
+        fprintf(stderr, "Could not get child's stdout\n");
+        exit(-1);
+    }
+    fprintf(stdout, "OK.\n");
+
+    length = 256;
+    fprintf(stdout, "Writing the data to child.......");
+    if (ap_write(testfile, teststr, &length) == APR_SUCCESS) {
+        fprintf(stdout,"OK\n");
+    }
+    else fprintf(stderr, "Write failed.\n");
+
     fprintf(stdout, "Grabbing child's stdout.......");
     if (ap_get_childout(&testfile, newproc) != APR_SUCCESS) {
         fprintf(stderr, "Could not get child's stdout\n");
diff --git a/threadproc/unix/Makefile.in b/threadproc/unix/Makefile.in
index f3b2130ea..743392192 100644
--- a/threadproc/unix/Makefile.in
+++ b/threadproc/unix/Makefile.in
@@ -58,30 +58,37 @@ depend:
 # DO NOT REMOVE
 proc.o: proc.c threadproc.h ../../include/apr_config.h \
  ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
- ../../include/apr_general.h ../../include/apr_errno.h \
- ../../include/apr_win.h ../../file_io/unix/fileio.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../file_io/unix/fileio.h \
  ../../include/apr_lib.h ../../include/apr_portable.h \
  ../../include/apr_network_io.h ../../include/apr_lock.h \
  ../../include/apr_time.h
 procsup.o: procsup.c threadproc.h ../../include/apr_config.h \
  ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
- ../../include/apr_general.h ../../include/apr_errno.h \
- ../../include/apr_win.h ../../file_io/unix/fileio.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../file_io/unix/fileio.h \
  ../../include/apr_lib.h
 signals.o: signals.c threadproc.h ../../include/apr_config.h \
  ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
- ../../include/apr_general.h ../../include/apr_errno.h \
- ../../include/apr_win.h ../../file_io/unix/fileio.h
-thread.o: thread.c ../../include/apr_config.h threadproc.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../file_io/unix/fileio.h \
+ ../../include/apr_lib.h
+thread.o: thread.c threadproc.h ../../include/apr_config.h \
  ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
- ../../include/apr_general.h ../../include/apr_errno.h \
- ../../include/apr_win.h ../../include/apr_portable.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../file_io/unix/fileio.h \
+ ../../include/apr_lib.h ../../include/apr_portable.h \
  ../../include/apr_network_io.h ../../include/apr_lock.h \
- ../../include/apr_time.h ../../include/apr_lib.h
-threadcancel.o: threadcancel.c
-threadpriv.o: threadpriv.c ../../include/apr_config.h threadproc.h \
+ ../../include/apr_time.h
+threadcancel.o: threadcancel.c threadproc.h ../../include/apr_config.h \
  ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
- ../../include/apr_general.h ../../include/apr_errno.h \
- ../../include/apr_win.h ../../include/apr_portable.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../file_io/unix/fileio.h \
+ ../../include/apr_lib.h
+threadpriv.o: threadpriv.c threadproc.h ../../include/apr_config.h \
+ ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../file_io/unix/fileio.h \
+ ../../include/apr_lib.h ../../include/apr_portable.h \
  ../../include/apr_network_io.h ../../include/apr_lock.h \
- ../../include/apr_time.h ../../include/apr_lib.h
+ ../../include/apr_time.h
diff --git a/threadproc/unix/proc.c b/threadproc/unix/proc.c
index d965faa81..d4e1bf5d7 100644
--- a/threadproc/unix/proc.c
+++ b/threadproc/unix/proc.c
@@ -54,17 +54,7 @@
  */
 
 #include "threadproc.h"
-#include "fileio.h"
-
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
 #include "apr_portable.h"
-#include <signal.h>
-#include <string.h>
-#include <sys/wait.h>
-#include <unistd.h>
 
 /* ***APRDOC********************************************************
  * ap_status_t ap_createprocattr_init(ap_procattr_t **, ap_context_t *)
@@ -110,47 +100,47 @@ ap_status_t ap_setprocattr_io(struct procattr_t *attr, ap_int32_t in,
     if (in != 0) {
         if ((status = ap_create_pipe(&attr->child_in, &attr->parent_in, 
                                    attr->cntxt)) != APR_SUCCESS) {
-            switch (in) {
-            case APR_FULL_BLOCK:
-                ap_block_pipe(attr->child_in);
-                ap_block_pipe(attr->parent_in);
-            case APR_PARENT_BLOCK:
-                ap_block_pipe(attr->parent_in);
-            case APR_CHILD_BLOCK:
-                ap_block_pipe(attr->child_in);
-            }
             return status;
         }
+        switch (in) {
+        case APR_FULL_BLOCK:
+            ap_block_pipe(attr->child_in);
+            ap_block_pipe(attr->parent_in);
+        case APR_PARENT_BLOCK:
+            ap_block_pipe(attr->parent_in);
+        case APR_CHILD_BLOCK:
+            ap_block_pipe(attr->child_in);
+        }
     } 
     if (out) {
         if ((status = ap_create_pipe(&attr->parent_out, &attr->child_out, 
                                    attr->cntxt)) != APR_SUCCESS) {
-            switch (out) {
-            case APR_FULL_BLOCK:
-                ap_block_pipe(attr->child_out);
-                ap_block_pipe(attr->parent_out);
-            case APR_PARENT_BLOCK:
-                ap_block_pipe(attr->parent_out);
-            case APR_CHILD_BLOCK:
-                ap_block_pipe(attr->child_out);
-            }
             return status;
         }
+        switch (out) {
+        case APR_FULL_BLOCK:
+            ap_block_pipe(attr->child_out);
+            ap_block_pipe(attr->parent_out);
+        case APR_PARENT_BLOCK:
+            ap_block_pipe(attr->parent_out);
+        case APR_CHILD_BLOCK:
+            ap_block_pipe(attr->child_out);
+        }
     } 
     if (err) {
         if ((status = ap_create_pipe(&attr->parent_err, &attr->child_err, 
                                    attr->cntxt)) != APR_SUCCESS) {
-            switch (err) {
-            case APR_FULL_BLOCK:
-                ap_block_pipe(attr->child_err);
-                ap_block_pipe(attr->parent_err);
-            case APR_PARENT_BLOCK:
-                ap_block_pipe(attr->parent_err);
-            case APR_CHILD_BLOCK:
-                ap_block_pipe(attr->child_err);
-            }
             return status;
         }
+        switch (err) {
+        case APR_FULL_BLOCK:
+            ap_block_pipe(attr->child_err);
+            ap_block_pipe(attr->parent_err);
+        case APR_PARENT_BLOCK:
+            ap_block_pipe(attr->parent_err);
+        case APR_CHILD_BLOCK:
+            ap_block_pipe(attr->child_err);
+        }
     } 
     return APR_SUCCESS;
 }
diff --git a/threadproc/unix/procsup.c b/threadproc/unix/procsup.c
index 1c2e10456..012cb407a 100644
--- a/threadproc/unix/procsup.c
+++ b/threadproc/unix/procsup.c
@@ -54,14 +54,6 @@
  */
 
 #include "threadproc.h"
-#include "fileio.h"
-
-#include "apr_config.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include <unistd.h>
 
 /* ***APRDOC********************************************************
  * ap_status_t ap_detach(ap_context_t *, ap_proc_t *)
diff --git a/threadproc/unix/signals.c b/threadproc/unix/signals.c
index 415401e17..90017d34e 100644
--- a/threadproc/unix/signals.c
+++ b/threadproc/unix/signals.c
@@ -54,13 +54,6 @@
  */
 
 #include "threadproc.h"
-#include "fileio.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include <signal.h>
-#include <string.h>
-#include <sys/wait.h>
 
 ap_status_t ap_kill(struct proc_t *proc, int sig)
 {
diff --git a/threadproc/unix/thread.c b/threadproc/unix/thread.c
index a36f35d81..c37dc1e4c 100644
--- a/threadproc/unix/thread.c
+++ b/threadproc/unix/thread.c
@@ -53,15 +53,10 @@
  *
  */
 
-#include "apr_config.h"
-
-#ifdef APR_HAS_THREADS
-
 #include "threadproc.h"
-#include "apr_thread_proc.h"
-#include "apr_general.h"
 #include "apr_portable.h"
-#include "apr_lib.h"
+
+#ifdef APR_HAS_THREADS
 
 #ifdef HAVE_PTHREAD_H
 /* ***APRDOC********************************************************
diff --git a/threadproc/unix/threadcancel.c b/threadproc/unix/threadcancel.c
index ff7f35a5a..90ced1d58 100644
--- a/threadproc/unix/threadcancel.c
+++ b/threadproc/unix/threadcancel.c
@@ -53,11 +53,8 @@
  *
  */
 
-#if APR_HAS_THREADS
-
 #include "threadproc.h"
-#include "apr_thread_proc.h"
-#include "apr_general.h"
+#if APR_HAS_THREADS
 
 #ifdef HAVE_PTHREAD_H
 
diff --git a/threadproc/unix/threadpriv.c b/threadproc/unix/threadpriv.c
index d1bc1a4e1..4e1cfbba9 100644
--- a/threadproc/unix/threadpriv.c
+++ b/threadproc/unix/threadpriv.c
@@ -53,13 +53,8 @@
  *
  */
 
-#include "apr_config.h"
 #include "threadproc.h"
-#include "apr_thread_proc.h"
-#include "apr_general.h"
-#include "apr_errno.h"
 #include "apr_portable.h"
-#include "apr_lib.h"
 
 #if APR_HAS_THREADS
 
diff --git a/threadproc/unix/threadproc.h b/threadproc/unix/threadproc.h
index 2a3339117..1fe877dc1 100644
--- a/threadproc/unix/threadproc.h
+++ b/threadproc/unix/threadproc.h
@@ -55,7 +55,26 @@
 #include "apr_config.h"
 #include "apr_thread_proc.h"
 #include "apr_file_io.h"
+#include "fileio.h"
+
+/* System headers required for thread/process library */
+#if HAVE_PTHREAD_H
 #include <pthread.h>
+#endif
+#if HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+#if HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+/* End System Headers */
+
 
 #ifndef THREAD_PROC_H
 #define THREAD_PROC_H
diff --git a/time/unix/Makefile.in b/time/unix/Makefile.in
index 52a6602f1..09c60d05a 100644
--- a/time/unix/Makefile.in
+++ b/time/unix/Makefile.in
@@ -51,13 +51,13 @@ depend:
 	    && rm Makefile.new
 
 # DO NOT REMOVE
-access.o: access.c atime.h ../../include/apr_time.h \
- ../../include/apr_general.h ../../include/apr_config.h \
- ../../include/apr_errno.h ../../include/apr_lib.h \
+access.o: access.c atime.h ../../include/apr_config.h \
+ ../../include/apr_time.h ../../include/apr_general.h \
+ ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \
  ../../include/apr_file_io.h
-time.o: time.c atime.h ../../include/apr_time.h \
- ../../include/apr_general.h ../../include/apr_config.h \
- ../../include/apr_errno.h ../../include/apr_lib.h \
+time.o: time.c atime.h ../../include/apr_config.h \
+ ../../include/apr_time.h ../../include/apr_general.h \
+ ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \
  ../../include/apr_file_io.h ../../include/apr_portable.h \
- ../../include/apr_thread_proc.h ../../include/apr_win.h \
- ../../include/apr_network_io.h ../../include/apr_lock.h
+ ../../include/apr_thread_proc.h ../../include/apr_network_io.h \
+ ../../include/apr_lock.h
diff --git a/time/unix/access.c b/time/unix/access.c
index 8ba88196f..d4cec2bb7 100644
--- a/time/unix/access.c
+++ b/time/unix/access.c
@@ -54,11 +54,6 @@
  */
 
 #include "atime.h"
-#include "apr_time.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include <errno.h>
-#include <string.h>
 
 /* ***APRDOC********************************************************
  * ap_status_t ap_get_curtime(ap_time_t *, ap_int64_t *)
diff --git a/time/unix/atime.h b/time/unix/atime.h
index 772150dce..9d2169deb 100644
--- a/time/unix/atime.h
+++ b/time/unix/atime.h
@@ -56,8 +56,15 @@
 #ifndef ATIME_H
 #define ATIME_H
 
+#include "apr_config.h"
 #include "apr_time.h"
+#include "apr_lib.h"
+
+/* System Headers required for time library */
+#if HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+/* End System Headers */
 
 struct atime_t {
     ap_context_t *cntxt;
diff --git a/time/unix/time.c b/time/unix/time.c
index b1cd80ae3..be094c4e5 100644
--- a/time/unix/time.c
+++ b/time/unix/time.c
@@ -54,13 +54,7 @@
  */
 
 #include "atime.h"
-#include "apr_time.h"
-#include "apr_general.h"
-#include "apr_lib.h"
 #include "apr_portable.h"
-#include <time.h>
-#include <errno.h>
-#include <string.h>
 
 /* ***APRDOC********************************************************
  * ap_status_t ap_make_time(ap_context_t *, ap_time_t *)