rename apr_arch_fileio.h to apr_arch_file_io.h for consistency

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

71 files changed, 67 insertions, 67 deletions

diff --git a/apr.dsp b/apr.dsp
index e6274c6ef..2eaca5b33 100644
--- a/apr.dsp
+++ b/apr.dsp
@@ -399,7 +399,7 @@ SOURCE=.\include\arch\win32\apr_arch_dso.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\arch\win32\apr_arch_fileio.h
+SOURCE=.\include\arch\win32\apr_arch_file_io.h
 # End Source File
 # Begin Source File
 
diff --git a/dso/win32/dso.c b/dso/win32/dso.c
index 44a220128..900a0d0cb 100644
--- a/dso/win32/dso.c
+++ b/dso/win32/dso.c
@@ -55,7 +55,7 @@
 #include "apr_arch_dso.h"
 #include "apr_strings.h"
 #include "apr_private.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_arch_utf8.h"
 
 #if APR_HAS_DSO
diff --git a/file_io/netware/filestat.c b/file_io/netware/filestat.c
index 9b87573b2..6b691a9d1 100644
--- a/file_io/netware/filestat.c
+++ b/file_io/netware/filestat.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "fsio.h"
 #include "nks/dirio.h"
 #include "apr_file_io.h"
diff --git a/file_io/netware/filesys.c b/file_io/netware/filesys.c
index 6be9110d6..30a160047 100644
--- a/file_io/netware/filesys.c
+++ b/file_io/netware/filesys.c
@@ -53,7 +53,7 @@
  */
 
 #include "apr.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_strings.h"
 
 apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p)
diff --git a/file_io/netware/flock.c b/file_io/netware/flock.c
index 8430dc7bb..6fb2681cd 100644
--- a/file_io/netware/flock.c
+++ b/file_io/netware/flock.c
@@ -53,7 +53,7 @@
  */
 
 #include <nks/fsio.h>
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 
 
 apr_status_t apr_file_lock(apr_file_t *thefile, int type)
diff --git a/file_io/netware/pipe.c b/file_io/netware/pipe.c
index 1029e1fab..43b5a7e22 100644
--- a/file_io/netware/pipe.c
+++ b/file_io/netware/pipe.c
@@ -56,7 +56,7 @@
 #include <nks/fsio.h>
 #include <nks/errno.h>
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_strings.h"
 #include "apr_portable.h"
 
diff --git a/file_io/os2/dir.c b/file_io/os2/dir.c
index a79f74a3b..cf4b461f4 100644
--- a/file_io/os2/dir.c
+++ b/file_io/os2/dir.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_lib.h"
 #include "apr_strings.h"
diff --git a/file_io/os2/filedup.c b/file_io/os2/filedup.c
index 323fc0876..10e8566eb 100644
--- a/file_io/os2/filedup.c
+++ b/file_io/os2/filedup.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_lib.h"
 #include "apr_strings.h"
diff --git a/file_io/os2/filestat.c b/file_io/os2/filestat.c
index 4e3aa6928..cfb232e4a 100644
--- a/file_io/os2/filestat.c
+++ b/file_io/os2/filestat.c
@@ -54,7 +54,7 @@
 
 #define INCL_DOS
 #define INCL_DOSERRORS
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_lib.h"
 #include <sys/time.h>
diff --git a/file_io/os2/filesys.c b/file_io/os2/filesys.c
index df7c8f8ee..88e7105b6 100644
--- a/file_io/os2/filesys.c
+++ b/file_io/os2/filesys.c
@@ -53,7 +53,7 @@
  */
 
 #include "apr.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_strings.h"
 #include "apr_lib.h"
 #include <ctype.h>
diff --git a/file_io/os2/flock.c b/file_io/os2/flock.c
index 1bcee8f0d..09855859c 100644
--- a/file_io/os2/flock.c
+++ b/file_io/os2/flock.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 
 APR_DECLARE(apr_status_t) apr_file_lock(apr_file_t *thefile, int type)
 {
diff --git a/file_io/os2/maperrorcode.c b/file_io/os2/maperrorcode.c
index 5224f50f3..2bd359843 100644
--- a/file_io/os2/maperrorcode.c
+++ b/file_io/os2/maperrorcode.c
@@ -53,7 +53,7 @@
  */
 
 #define INCL_DOSERRORS
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include <errno.h>
 #include <string.h>
diff --git a/file_io/os2/open.c b/file_io/os2/open.c
index 66203ff0f..29c40e1cd 100644
--- a/file_io/os2/open.c
+++ b/file_io/os2/open.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_lib.h"
 #include "apr_portable.h"
diff --git a/file_io/os2/pipe.c b/file_io/os2/pipe.c
index 8de90075f..ebd0d4cb4 100644
--- a/file_io/os2/pipe.c
+++ b/file_io/os2/pipe.c
@@ -53,7 +53,7 @@
  */
 
 #define INCL_DOSERRORS
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_general.h"
 #include "apr_lib.h"
diff --git a/file_io/os2/readwrite.c b/file_io/os2/readwrite.c
index cb73a5d1b..c3f2caf8a 100644
--- a/file_io/os2/readwrite.c
+++ b/file_io/os2/readwrite.c
@@ -55,7 +55,7 @@
 #define INCL_DOS
 #define INCL_DOSERRORS
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_lib.h"
 #include "apr_strings.h"
diff --git a/file_io/os2/seek.c b/file_io/os2/seek.c
index 38625d998..605d0b7e1 100644
--- a/file_io/os2/seek.c
+++ b/file_io/os2/seek.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_lib.h"
 #include <string.h>
diff --git a/file_io/unix/copy.c b/file_io/unix/copy.c
index 966c7e753..3aa03ef58 100644
--- a/file_io/unix/copy.c
+++ b/file_io/unix/copy.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 
 static apr_status_t apr_file_transfer_contents(const char *from_path,
diff --git a/file_io/unix/dir.c b/file_io/unix/dir.c
index ac5beec1f..d8eafee55 100644
--- a/file_io/unix/dir.c
+++ b/file_io/unix/dir.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_strings.h"
 #include "apr_portable.h"
 #if APR_HAVE_SYS_SYSLIMITS_H
diff --git a/file_io/unix/fileacc.c b/file_io/unix/fileacc.c
index a442acb0a..2140c8b1e 100644
--- a/file_io/unix/fileacc.c
+++ b/file_io/unix/fileacc.c
@@ -53,7 +53,7 @@
  */
 
 #include "apr_strings.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 
 /* A file to put ALL of the accessor functions for apr_file_t types. */
 
diff --git a/file_io/unix/filedup.c b/file_io/unix/filedup.c
index 67ac48949..7083286fe 100644
--- a/file_io/unix/filedup.c
+++ b/file_io/unix/filedup.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_strings.h"
 #include "apr_portable.h"
 #include "apr_thread_mutex.h"
diff --git a/file_io/unix/filepath.c b/file_io/unix/filepath.c
index d2baabedb..f273621aa 100644
--- a/file_io/unix/filepath.c
+++ b/file_io/unix/filepath.c
@@ -53,7 +53,7 @@
  */
 
 #include "apr.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_strings.h"
 #define APR_WANT_STRFUNC
diff --git a/file_io/unix/filestat.c b/file_io/unix/filestat.c
index 2448d2347..26deb1413 100644
--- a/file_io/unix/filestat.c
+++ b/file_io/unix/filestat.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_general.h"
 #include "apr_strings.h"
diff --git a/file_io/unix/flock.c b/file_io/unix/flock.c
index c1ba8844f..290293159 100644
--- a/file_io/unix/flock.c
+++ b/file_io/unix/flock.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 
 #if APR_HAVE_FCNTL_H
 #include <fcntl.h>
diff --git a/file_io/unix/mktemp.c b/file_io/unix/mktemp.c
index 553d6b4d8..0c2676c19 100644
--- a/file_io/unix/mktemp.c
+++ b/file_io/unix/mktemp.c
@@ -87,7 +87,7 @@
 #include "apr_private.h"
 #include "apr_file_io.h" /* prototype of apr_mkstemp() */
 #include "apr_strings.h" /* prototype of apr_mkstemp() */
-#include "apr_arch_fileio.h" /* prototype of apr_mkstemp() */
+#include "apr_arch_file_io.h" /* prototype of apr_mkstemp() */
 #include "apr_portable.h" /* for apr_os_file_put() */
 
 #ifndef HAVE_MKSTEMP
diff --git a/file_io/unix/open.c b/file_io/unix/open.c
index dc7acf65a..ce2ffff40 100644
--- a/file_io/unix/open.c
+++ b/file_io/unix/open.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_strings.h"
 #include "apr_portable.h"
 #include "apr_thread_mutex.h"
diff --git a/file_io/unix/pipe.c b/file_io/unix/pipe.c
index 9c7698624..8b6fe6b34 100644
--- a/file_io/unix/pipe.c
+++ b/file_io/unix/pipe.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_strings.h"
 #include "apr_portable.h"
 
diff --git a/file_io/unix/readwrite.c b/file_io/unix/readwrite.c
index 46bb9b165..db412ec06 100644
--- a/file_io/unix/readwrite.c
+++ b/file_io/unix/readwrite.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_strings.h"
 #include "apr_thread_mutex.h"
 #include "apr_support.h"
diff --git a/file_io/unix/seek.c b/file_io/unix/seek.c
index 374ab35e7..708d81ab5 100644
--- a/file_io/unix/seek.c
+++ b/file_io/unix/seek.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 
 static apr_status_t setptr(apr_file_t *thefile, unsigned long pos )
 {
diff --git a/file_io/win32/dir.c b/file_io/win32/dir.c
index 4b86ad427..ee8e38c49 100644
--- a/file_io/win32/dir.c
+++ b/file_io/win32/dir.c
@@ -53,7 +53,7 @@
  */
 
 #include "apr.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_strings.h"
 #include "apr_portable.h"
diff --git a/file_io/win32/filedup.c b/file_io/win32/filedup.c
index 7e1b01135..e2c37034f 100644
--- a/file_io/win32/filedup.c
+++ b/file_io/win32/filedup.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "win32/apr_arch_fileio.h"
+#include "win32/apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_general.h"
 #include "apr_strings.h"
diff --git a/file_io/win32/filepath.c b/file_io/win32/filepath.c
index f1400cb7a..f8b53d1be 100644
--- a/file_io/win32/filepath.c
+++ b/file_io/win32/filepath.c
@@ -53,7 +53,7 @@
  */
 
 #include "apr.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_strings.h"
 #include "apr_lib.h"
 #include <string.h>
diff --git a/file_io/win32/filestat.c b/file_io/win32/filestat.c
index a06d1383c..a7f922d9c 100644
--- a/file_io/win32/filestat.c
+++ b/file_io/win32/filestat.c
@@ -55,7 +55,7 @@
 #include "apr.h"
 #include <aclapi.h>
 #include "apr_private.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_general.h"
 #include "apr_strings.h"
diff --git a/file_io/win32/filesys.c b/file_io/win32/filesys.c
index b67d4fef6..a4c5177bb 100644
--- a/file_io/win32/filesys.c
+++ b/file_io/win32/filesys.c
@@ -53,7 +53,7 @@
  */
 
 #include "apr.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_strings.h"
 
 /* Win32 Exceptions:
diff --git a/file_io/win32/flock.c b/file_io/win32/flock.c
index 386d811bb..0629ac921 100644
--- a/file_io/win32/flock.c
+++ b/file_io/win32/flock.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 
 APR_DECLARE(apr_status_t) apr_file_lock(apr_file_t *thefile, int type)
 {
diff --git a/file_io/win32/open.c b/file_io/win32/open.c
index c75d78821..2d59ee423 100644
--- a/file_io/win32/open.c
+++ b/file_io/win32/open.c
@@ -53,7 +53,7 @@
  */
 
 #include "apr_private.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_general.h"
 #include "apr_strings.h"
diff --git a/file_io/win32/pipe.c b/file_io/win32/pipe.c
index 9f8401f17..2e8776611 100644
--- a/file_io/win32/pipe.c
+++ b/file_io/win32/pipe.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "win32/apr_arch_fileio.h"
+#include "win32/apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_general.h"
 #include "apr_strings.h"
diff --git a/file_io/win32/readwrite.c b/file_io/win32/readwrite.c
index a61f36877..eda1a5899 100644
--- a/file_io/win32/readwrite.c
+++ b/file_io/win32/readwrite.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "win32/apr_arch_fileio.h"
+#include "win32/apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_general.h"
 #include "apr_strings.h"
diff --git a/file_io/win32/seek.c b/file_io/win32/seek.c
index 105eb7962..3809a1083 100644
--- a/file_io/win32/seek.c
+++ b/file_io/win32/seek.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "win32/apr_arch_fileio.h"
+#include "win32/apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include <errno.h>
 #include <string.h>
diff --git a/include/arch/beos/apr_arch_threadproc.h b/include/arch/beos/apr_arch_threadproc.h
index c8583b8ed..67c9e5fc6 100644
--- a/include/arch/beos/apr_arch_threadproc.h
+++ b/include/arch/beos/apr_arch_threadproc.h
@@ -53,7 +53,7 @@
  */
 
 #include "apr_thread_proc.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_thread_proc.h"
 #include "apr_general.h"
diff --git a/include/arch/netware/apr_arch_fileio.h b/include/arch/netware/apr_arch_file_io.h
index 7779c2c20..7779c2c20 100644
--- a/include/arch/netware/apr_arch_fileio.h
+++ b/include/arch/netware/apr_arch_file_io.h
diff --git a/include/arch/os2/apr_arch_fileio.h b/include/arch/os2/apr_arch_file_io.h
index 3fb44bdd6..3fb44bdd6 100644
--- a/include/arch/os2/apr_arch_fileio.h
+++ b/include/arch/os2/apr_arch_file_io.h
diff --git a/include/arch/unix/apr_arch_fileio.h b/include/arch/unix/apr_arch_file_io.h
index de5a49faf..de5a49faf 100644
--- a/include/arch/unix/apr_arch_fileio.h
+++ b/include/arch/unix/apr_arch_file_io.h
diff --git a/include/arch/unix/apr_arch_proc_mutex.h b/include/arch/unix/apr_arch_proc_mutex.h
index fc0a06359..0b52288cf 100644
--- a/include/arch/unix/apr_arch_proc_mutex.h
+++ b/include/arch/unix/apr_arch_proc_mutex.h
@@ -63,7 +63,7 @@
 #include "apr_pools.h"
 #include "apr_portable.h"
 #include "apr_file_io.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 
 /* System headers required by Locks library */
 #if APR_HAVE_SYS_TYPES_H
diff --git a/include/arch/unix/apr_arch_threadproc.h b/include/arch/unix/apr_arch_threadproc.h
index 380ad5deb..002c8f701 100644
--- a/include/arch/unix/apr_arch_threadproc.h
+++ b/include/arch/unix/apr_arch_threadproc.h
@@ -56,7 +56,7 @@
 #include "apr_private.h"
 #include "apr_thread_proc.h"
 #include "apr_file_io.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 
 /* System headers required for thread/process library */
 #if APR_HAVE_PTHREAD_H
diff --git a/include/arch/win32/apr_arch_fileio.h b/include/arch/win32/apr_arch_file_io.h
index 717dbaefa..717dbaefa 100644
--- a/include/arch/win32/apr_arch_fileio.h
+++ b/include/arch/win32/apr_arch_file_io.h
diff --git a/libapr.dsp b/libapr.dsp
index a6f24f0ee..2bb5c0a00 100644
--- a/libapr.dsp
+++ b/libapr.dsp
@@ -405,7 +405,7 @@ SOURCE=.\include\arch\win32\apr_arch_dso.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\arch\win32\apr_arch_fileio.h
+SOURCE=.\include\arch\win32\apr_arch_file_io.h
 # End Source File
 # Begin Source File
 
diff --git a/locks/os2/proc_mutex.c b/locks/os2/proc_mutex.c
index 2009532b6..23f0bdd69 100644
--- a/locks/os2/proc_mutex.c
+++ b/locks/os2/proc_mutex.c
@@ -57,7 +57,7 @@
 #include "apr_strings.h"
 #include "apr_portable.h"
 #include "apr_arch_proc_mutex.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include <string.h>
 #include <stddef.h>
 
diff --git a/locks/os2/thread_cond.c b/locks/os2/thread_cond.c
index 9f317370f..439885d8b 100644
--- a/locks/os2/thread_cond.c
+++ b/locks/os2/thread_cond.c
@@ -58,7 +58,7 @@
 #include "apr_portable.h"
 #include "apr_arch_thread_mutex.h"
 #include "apr_arch_thread_cond.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include <string.h>
 
 APR_DECLARE(apr_status_t) apr_thread_cond_create(apr_thread_cond_t **cond,
diff --git a/locks/os2/thread_mutex.c b/locks/os2/thread_mutex.c
index 3f0d7fa61..f0d335201 100644
--- a/locks/os2/thread_mutex.c
+++ b/locks/os2/thread_mutex.c
@@ -57,7 +57,7 @@
 #include "apr_strings.h"
 #include "apr_portable.h"
 #include "apr_arch_thread_mutex.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include <string.h>
 #include <stddef.h>
 
diff --git a/locks/os2/thread_rwlock.c b/locks/os2/thread_rwlock.c
index 99b7f3be1..de76db06d 100644
--- a/locks/os2/thread_rwlock.c
+++ b/locks/os2/thread_rwlock.c
@@ -57,7 +57,7 @@
 #include "apr_strings.h"
 #include "apr_portable.h"
 #include "apr_arch_thread_rwlock.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include <string.h>
 
 static apr_status_t thread_rwlock_cleanup(void *therwlock)
diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c
index e1b205928..67656d867 100644
--- a/locks/unix/proc_mutex.c
+++ b/locks/unix/proc_mutex.c
@@ -55,7 +55,7 @@
 #include "apr.h"
 #include "apr_strings.h"
 #include "apr_arch_proc_mutex.h"
-#include "apr_arch_fileio.h" /* for apr_mkstemp() */
+#include "apr_arch_file_io.h" /* for apr_mkstemp() */
 
 APR_DECLARE(apr_status_t) apr_proc_mutex_destroy(apr_proc_mutex_t *mutex)
 {
diff --git a/misc/unix/otherchild.c b/misc/unix/otherchild.c
index cd7b7526f..eb47228ea 100644
--- a/misc/unix/otherchild.c
+++ b/misc/unix/otherchild.c
@@ -58,7 +58,7 @@
 
 #include "apr_arch_misc.h"
 #include "apr_arch_threadproc.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #ifdef HAVE_TIME_H
 #include <sys/time.h>
 #endif
diff --git a/misc/win32/apr_app.c b/misc/win32/apr_app.c
index 9f2b01c41..acd49c6de 100644
--- a/misc/win32/apr_app.c
+++ b/misc/win32/apr_app.c
@@ -75,7 +75,7 @@
 #include "ShellAPI.h"
 #include "crtdbg.h"
 #include "wchar.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "assert.h"
 #include "apr_private.h"
 #include "apr_arch_misc.h"
diff --git a/misc/win32/internal.c b/misc/win32/internal.c
index f0f79950a..5f49a2bc6 100644
--- a/misc/win32/internal.c
+++ b/misc/win32/internal.c
@@ -55,7 +55,7 @@
 #include "apr_private.h"
 
 #include "apr_arch_misc.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include <crtdbg.h>
 #include <assert.h>
 
diff --git a/misc/win32/misc.c b/misc/win32/misc.c
index 67d03061d..4e2389c59 100644
--- a/misc/win32/misc.c
+++ b/misc/win32/misc.c
@@ -55,7 +55,7 @@
 #include "apr_private.h"
 #include "apr_arch_misc.h"
 #include "crtdbg.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "assert.h"
 #include "apr_lib.h"
 
diff --git a/misc/win32/start.c b/misc/win32/start.c
index 0190b96b6..b2910add1 100644
--- a/misc/win32/start.c
+++ b/misc/win32/start.c
@@ -60,7 +60,7 @@
 
 #include "apr_arch_misc.h"       /* for WSAHighByte / WSALowByte */
 #include "wchar.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "crtdbg.h"
 #include "assert.h"
 
diff --git a/mmap/unix/mmap.c b/mmap/unix/mmap.c
index dcb08040f..e557f615d 100644
--- a/mmap/unix/mmap.c
+++ b/mmap/unix/mmap.c
@@ -58,7 +58,7 @@
 #include "apr_strings.h"
 #include "apr_mmap.h"
 #include "apr_errno.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_portable.h"
 
 /* System headers required for the mmap library */
diff --git a/mmap/win32/mmap.c b/mmap/win32/mmap.c
index b47b64b39..993ef5fbf 100644
--- a/mmap/win32/mmap.c
+++ b/mmap/win32/mmap.c
@@ -57,7 +57,7 @@
 #include "apr_general.h"
 #include "apr_mmap.h"
 #include "apr_errno.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_portable.h"
 #include "apr_strings.h"
 
diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c
index cff70c283..82d7af52e 100644
--- a/network_io/unix/sendrecv.c
+++ b/network_io/unix/sendrecv.c
@@ -57,7 +57,7 @@
 
 #if APR_HAS_SENDFILE
 /* This file is needed to allow us access to the apr_file_t internals. */
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #endif /* APR_HAS_SENDFILE */
 
 /* sys/sysctl.h is only needed on FreeBSD for include_hdrs_in_length() */
diff --git a/network_io/win32/sendrecv.c b/network_io/win32/sendrecv.c
index 6f71956d1..c400d58a6 100644
--- a/network_io/win32/sendrecv.c
+++ b/network_io/win32/sendrecv.c
@@ -57,7 +57,7 @@
 #include "apr_general.h"
 #include "apr_network_io.h"
 #include "apr_lib.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #if APR_HAVE_TIME_H
 #include <time.h>
 #endif
diff --git a/poll/unix/poll.c b/poll/unix/poll.c
index 516bd6c4c..20df62199 100644
--- a/poll/unix/poll.c
+++ b/poll/unix/poll.c
@@ -57,7 +57,7 @@
 #include "apr_time.h"
 #include "apr_portable.h"
 #include "apr_arch_networkio.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #if HAVE_POLL_H
 #include <poll.h>
 #endif
diff --git a/poll/unix/pollacc.c b/poll/unix/pollacc.c
index a2e73759b..2473b0d79 100644
--- a/poll/unix/pollacc.c
+++ b/poll/unix/pollacc.c
@@ -55,7 +55,7 @@
 #include "apr.h"
 #include "apr_poll.h"
 #include "apr_arch_networkio.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #if HAVE_POLL_H
 #include <poll.h>
 #endif
diff --git a/shmem/win32/shm.c b/shmem/win32/shm.c
index 7451a6cf1..2f1ea94df 100644
--- a/shmem/win32/shm.c
+++ b/shmem/win32/shm.c
@@ -56,7 +56,7 @@
 #include "apr_errno.h"
 #include "apr_file_io.h"
 #include "apr_shm.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 
 typedef struct memblock_t {
     apr_size_t size;
diff --git a/support/unix/waitio.c b/support/unix/waitio.c
index d5d9985ca..de72b7e9c 100644
--- a/support/unix/waitio.c
+++ b/support/unix/waitio.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_arch_networkio.h"
 #include "apr_poll.h"
 #include "apr_errno.h"
diff --git a/threadproc/netware/proc.c b/threadproc/netware/proc.c
index 849637b5a..782e05bbd 100644
--- a/threadproc/netware/proc.c
+++ b/threadproc/netware/proc.c
@@ -53,7 +53,7 @@
  */
 
 #include "apr_arch_threadproc.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_strings.h"
 #include "apr_portable.h"
 
diff --git a/threadproc/os2/proc.c b/threadproc/os2/proc.c
index 86aec468d..75b4237bf 100644
--- a/threadproc/os2/proc.c
+++ b/threadproc/os2/proc.c
@@ -56,7 +56,7 @@
 #define INCL_DOSERRORS
 
 #include "apr_arch_threadproc.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include "apr_private.h"
 #include "apr_thread_proc.h"
 #include "apr_file_io.h"
diff --git a/threadproc/os2/thread.c b/threadproc/os2/thread.c
index fe13ac0f2..52a485647 100644
--- a/threadproc/os2/thread.c
+++ b/threadproc/os2/thread.c
@@ -59,7 +59,7 @@
 #include "apr_general.h"
 #include "apr_lib.h"
 #include "apr_portable.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #include <stdlib.h>
 
 APR_DECLARE(apr_status_t) apr_threadattr_create(apr_threadattr_t **new, apr_pool_t *pool)
diff --git a/threadproc/os2/threadpriv.c b/threadproc/os2/threadpriv.c
index 1e8cfe14e..f8bd470a3 100644
--- a/threadproc/os2/threadpriv.c
+++ b/threadproc/os2/threadpriv.c
@@ -58,7 +58,7 @@
 #include "apr_general.h"
 #include "apr_errno.h"
 #include "apr_lib.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 
 APR_DECLARE(apr_status_t) apr_threadkey_private_create(apr_threadkey_t **key,
                                                        void (*dest)(void *), 
diff --git a/threadproc/win32/proc.c b/threadproc/win32/proc.c
index 21392ce14..d67e28f14 100644
--- a/threadproc/win32/proc.c
+++ b/threadproc/win32/proc.c
@@ -53,7 +53,7 @@
  */
 
 #include "win32/apr_arch_threadproc.h"
-#include "win32/apr_arch_fileio.h"
+#include "win32/apr_arch_file_io.h"
 
 #include "apr_thread_proc.h"
 #include "apr_file_io.h"
diff --git a/threadproc/win32/signals.c b/threadproc/win32/signals.c
index 54c45f4e5..49d59d485 100644
--- a/threadproc/win32/signals.c
+++ b/threadproc/win32/signals.c
@@ -53,7 +53,7 @@
  */
 
 #include "win32/apr_arch_threadproc.h"
-#include "win32/apr_arch_fileio.h"
+#include "win32/apr_arch_file_io.h"
 #include "apr_thread_proc.h"
 #include "apr_file_io.h"
 #include "apr_general.h"
diff --git a/user/win32/userinfo.c b/user/win32/userinfo.c
index eea131210..84df21322 100644
--- a/user/win32/userinfo.c
+++ b/user/win32/userinfo.c
@@ -56,7 +56,7 @@
 #include "apr_strings.h"
 #include "apr_portable.h"
 #include "apr_user.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
 #if APR_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif