2 files changed, 9 insertions, 8 deletions
diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c
index 1132c9fc23..206b185e96 100644
--- a/lib/erl_interface/src/connect/ei_connect.c
+++ b/lib/erl_interface/src/connect/ei_connect.c
@@ -21,6 +21,8 @@
  * Purpose: Connect to any node at any host. (EI version)
  */
 
+#include "eidef.h"
+
 #include <stdlib.h>
 #include <sys/types.h>
 #include <fcntl.h>
@@ -40,10 +42,8 @@
 #include <inetLib.h>
 
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/times.h>
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h> 
@@ -53,7 +53,6 @@
 
 #else /* some other unix */
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/times.h>
 
 #if TIME_WITH_SYS_TIME
@@ -84,7 +83,6 @@
 #include <ctype.h>
 #include <stddef.h>
 
-#include "eidef.h"
 #include "eiext.h"
 #include "ei_portio.h"
 #include "ei_internal.h"
diff --git a/lib/erl_interface/src/misc/ei_portio.c b/lib/erl_interface/src/misc/ei_portio.c
index 726b1af82d..368c56546b 100644
--- a/lib/erl_interface/src/misc/ei_portio.c
+++ b/lib/erl_interface/src/misc/ei_portio.c
@@ -19,6 +19,9 @@
  *
 
  */
+
+#include "eidef.h"
+
 #ifdef __WIN32__
 #include <winsock2.h>
 #include <windows.h>
@@ -47,10 +50,8 @@ static unsigned long param_one = 1;
 #include <taskLib.h>
 #include <inetLib.h>
 #include <selectLib.h>
-#include <sys/types.h>
 #include <ioLib.h>
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h> 
@@ -65,7 +66,6 @@ static unsigned long param_one = 1;
 
 #else /* other unix */
 #include <stdlib.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -86,6 +86,7 @@ static unsigned long param_one = 1;
 
 /* common includes */
 
+#include <sys/types.h>
 #include <stdio.h> 
 #include <stdlib.h>
 #include <string.h>
@@ -94,7 +95,9 @@ static unsigned long param_one = 1;
 #else
 #include <time.h>
 #endif
-#include "eidef.h"
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
 #include "ei_portio.h"
 #include "ei_internal.h"