diff --git a/src/main/main.c b/src/main/main.c
index a027088d0..25abd4e69 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -9,6 +9,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h> /* OS/2 needs this after sys/types.h */
+#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h> /* OS/2 needs this after sys/types.h */
 #endif
diff --git a/src/network/connection.c b/src/network/connection.c
index c3a0e374f..b35c31ebb 100644
--- a/src/network/connection.c
+++ b/src/network/connection.c
@@ -10,6 +10,11 @@
 #include <unistd.h>
 #endif
 
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h> /* OS/2 needs this after sys/types.h */
+#endif
+
 #include "elinks.h"
 
 #include "cache/cache.h"
diff --git a/src/network/ssl/ssl.c b/src/network/ssl/ssl.c
index 8c43655b5..dbc506c66 100644
--- a/src/network/ssl/ssl.c
+++ b/src/network/ssl/ssl.c
@@ -20,6 +20,10 @@
 #endif
 
 #include <limits.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h> /* OS/2 needs this after sys/types.h */
+#endif
 
 #include "elinks.h"
 
diff --git a/src/protocol/file/file.c b/src/protocol/file/file.c
index d02767d9b..39ca2f4f7 100644
--- a/src/protocol/file/file.c
+++ b/src/protocol/file/file.c
@@ -9,6 +9,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h> /* OS/2 needs this after sys/types.h */
+#endif
 #include <sys/stat.h> /* OS/2 needs this after sys/types.h */
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h> /* OS/2 needs this after sys/types.h */
diff --git a/src/protocol/file/mailcap.c b/src/protocol/file/mailcap.c
index 59dc0dc3f..03499f524 100644
--- a/src/protocol/file/mailcap.c
+++ b/src/protocol/file/mailcap.c
@@ -8,6 +8,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h> /* OS/2 needs this after sys/types.h */
+#endif
 #include <sys/stat.h> /* OS/2 needs this after sys/types.h */
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h> /* OS/2 needs this after sys/types.h */
diff --git a/src/protocol/http/http.c b/src/protocol/http/http.c
index 307352687..0676b8bb0 100644
--- a/src/protocol/http/http.c
+++ b/src/protocol/http/http.c
@@ -8,6 +8,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h> /* OS/2 needs this after sys/types.h */
+#endif
 #include <limits.h>
 
 #include "elinks.h"