6 files changed, 1 insertions, 15 deletions
diff --git a/file_io/os2/dir.c b/file_io/os2/dir.c
index fc7c43223..61a21269c 100644
--- a/file_io/os2/dir.c
+++ b/file_io/os2/dir.c
@@ -58,9 +58,6 @@
 #include "apr_strings.h"
 #include <string.h>
 
-#define INCL_DOS
-#include <os2.h>
-
 static apr_status_t dir_cleanup(void *thedir)
 {
     apr_dir_t *dir = thedir;
diff --git a/file_io/os2/filedup.c b/file_io/os2/filedup.c
index ee52fcddb..8bece3dce 100644
--- a/file_io/os2/filedup.c
+++ b/file_io/os2/filedup.c
@@ -58,9 +58,6 @@
 #include "apr_strings.h"
 #include <string.h>
 
-#define INCL_DOS
-#include <os2.h>
-
 apr_status_t apr_dupfile(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p)
 {
     int rv;
diff --git a/file_io/os2/filestat.c b/file_io/os2/filestat.c
index 8a28e1769..ec055908a 100644
--- a/file_io/os2/filestat.c
+++ b/file_io/os2/filestat.c
@@ -58,7 +58,6 @@
 #include "apr_file_io.h"
 #include "apr_lib.h"
 #include <sys/time.h>
-#include <os2.h>
 
 
 static void FS3_to_finfo(apr_finfo_t *finfo, FILESTATUS3 *fstatus)
diff --git a/file_io/os2/maperrorcode.c b/file_io/os2/maperrorcode.c
index 5fa398151..36cba058d 100644
--- a/file_io/os2/maperrorcode.c
+++ b/file_io/os2/maperrorcode.c
@@ -57,9 +57,7 @@
 #include "apr_file_io.h"
 #include <errno.h>
 #include <string.h>
-#include <os2.h>
-#include "../../network_io/os2/os2calls.h"
-
+#include "apr_errno.h"
 
 static int errormap[][2] = {
     { NO_ERROR,                   APR_SUCCESS      },
diff --git a/file_io/os2/readwrite.c b/file_io/os2/readwrite.c
index 282766a43..f6dbd0255 100644
--- a/file_io/os2/readwrite.c
+++ b/file_io/os2/readwrite.c
@@ -59,7 +59,6 @@
 #include "apr_file_io.h"
 #include "apr_lib.h"
 
-#include <os2.h>
 #include <malloc.h>
 
 apr_status_t apr_read(apr_file_t *thefile, void *buf, apr_size_t *nbytes)
diff --git a/file_io/os2/seek.c b/file_io/os2/seek.c
index fa1d6792b..076fe93bc 100644
--- a/file_io/os2/seek.c
+++ b/file_io/os2/seek.c
@@ -58,10 +58,6 @@
 #include <string.h>
 #include <io.h>
 
-#define INCL_DOS
-#include <os2.h>
-
-
 
 static apr_status_t setptr(apr_file_t *thefile, unsigned long pos )
 {