diff --git a/src/network/poll.c b/src/network/poll.c
index 0de7da02b0..c1ca90022a 100644
--- a/src/network/poll.c
+++ b/src/network/poll.c
@@ -71,18 +71,27 @@ int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
     abort ();
 }
 
-#elif defined (WIN32)
+#elif defined (WIN32) || defined(__OS2__)
 
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#ifndef __OS2__
 #ifdef FD_SETSIZE
 /* No, it's not as simple as #undef FD_SETSIZE */
 # error Header inclusion order compromised!
 #endif
 #define FD_SETSIZE 0
+#endif
 #include <vlc_network.h>
 
+#ifdef __OS2__
+#include <sys/time.h>
+#include <sys/select.h>
+
+#define SOCKET unsigned
+#endif
+
 int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
 {
     size_t setsize = sizeof (fd_set) + nfds * sizeof (SOCKET);