2 files changed, 19 insertions, 21 deletions
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c
index 7ef985dc41..b62e9a0306 100644
--- a/erts/emulator/drivers/common/efile_drv.c
+++ b/erts/emulator/drivers/common/efile_drv.c
@@ -99,7 +99,16 @@
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
+
+#ifndef __OSE__
+#include <ctype.h>
+#include <sys/types.h>
 #include <stdlib.h>
+#else
+#include "ctype.h"
+#include "sys/types.h"
+#include "stdlib.h"
+#endif
 
 /* Need (NON)BLOCKING macros for sendfile */
 #ifndef WANT_NONBLOCKING
@@ -113,8 +122,7 @@
 #include "erl_threads.h"
 #include "gzio.h"
 #include "dtrace-wrapper.h" 
-#include <ctype.h>
-#include <sys/types.h>
+
 
 void erl_exit(int n, char *fmt, ...);
 
diff --git a/erts/emulator/sys/ose/sys.c b/erts/emulator/sys/ose/sys.c
index ba8851e203..a62d7c150b 100644
--- a/erts/emulator/sys/ose/sys.c
+++ b/erts/emulator/sys/ose/sys.c
@@ -20,29 +20,19 @@
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
+#include "sys/time.h"
+#include "time.h"
+#include "sys/uio.h"
+#include "termios.h"
+#include "ctype.h"
+#include "termios.h"
 
-#ifdef ISC32
-#define _POSIX_SOURCE
-#define _XOPEN_SOURCE
-#endif
-
-#include <sys/time.h>
-#include <time.h>
-
-#include <sys/uio.h>
-#include <termios.h>
-#include <ctype.h>
-
-#ifdef ISC32
-#include <sys/bsdtypes.h>
-#endif
-
-#include <termios.h>
 #ifdef HAVE_FCNTL_H
-#include <fcntl.h>
+#include "fcntl.h"
 #endif
+
 #ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
+#include "sys/ioctl.h"
 #endif
 
 #define ERTS_WANT_BREAK_HANDLING