diff --git a/mongoose.c b/mongoose.c
index 99d3c9b7..ff996417 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -4393,38 +4393,6 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
     FreeRTOS_FD_CLR(c->fd, mgr->ss,
                     eSELECT_READ | eSELECT_EXCEPT | eSELECT_WRITE);
   }
-#elif MG_ENABLE_POLL
-  size_t i = 0, n = 0;
-  for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) n++;
-  struct pollfd fds[n == 0 ? 1 : n];  // Avoid zero-length VLA
-
-  memset(fds, 0, sizeof(fds));
-  for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next, i++) {
-    if (c->is_closing || c->is_resolving || FD(c) == INVALID_SOCKET) {
-      // No valid socket yet, ignore
-    } else {
-      fds[i].fd = FD(c);
-      fds[i].events |= POLLIN;
-      if (c->is_connecting || (c->send.len > 0 && c->is_tls_hs == 0)) {
-        fds[i].events |= POLLOUT;
-      }
-    }
-  }
-
-  if (poll(fds, n, ms) < 0) {
-    MG_ERROR(("poll failed, errno: %d", MG_SOCK_ERRNO));
-  } else {
-    i = 0;
-    for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next, i++) {
-      if (c->is_closing || c->is_resolving || FD(c) == INVALID_SOCKET) {
-        // No valid socket yet, ignore
-      } else {
-        c->is_readable = (unsigned) (fds[i].revents & POLLIN ? true : false);
-        c->is_writable = (unsigned) (fds[i].revents & POLLOUT ? true : false);
-        fds[i].revents = 0;
-      }
-    }
-  }
 #else
   struct timeval tv = {ms / 1000, (ms % 1000) * 1000}, tv_zero = {0, 0};
   struct mg_connection *c;
diff --git a/mongoose.h b/mongoose.h
index 52ceef7b..36d1f97f 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -436,11 +436,7 @@ extern int SockSet(SOCKET hSock, int Type, int Prop, void *pbuf, int size);
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if defined(MG_ENABLE_POLL) && MG_ENABLE_POLL
-#include <poll.h>
-#else
 #include <sys/select.h>
-#endif
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -582,10 +578,6 @@ int sscanf(const char *, const char *, ...);
 #define MG_ENABLE_MIP 0
 #endif
 
-#ifndef MG_ENABLE_POLL
-#define MG_ENABLE_POLL 0
-#endif
-
 #ifndef MG_ENABLE_FATFS
 #define MG_ENABLE_FATFS 0
 #endif
diff --git a/src/arch_unix.h b/src/arch_unix.h
index 424257dc..dd696e22 100644
--- a/src/arch_unix.h
+++ b/src/arch_unix.h
@@ -22,11 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if defined(MG_ENABLE_POLL) && MG_ENABLE_POLL
-#include <poll.h>
-#else
 #include <sys/select.h>
-#endif
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>
diff --git a/src/config.h b/src/config.h
index 6dda7931..0d68c468 100644
--- a/src/config.h
+++ b/src/config.h
@@ -4,10 +4,6 @@
 #define MG_ENABLE_MIP 0
 #endif
 
-#ifndef MG_ENABLE_POLL
-#define MG_ENABLE_POLL 0
-#endif
-
 #ifndef MG_ENABLE_FATFS
 #define MG_ENABLE_FATFS 0
 #endif
diff --git a/src/sock.c b/src/sock.c
index 5148d895..700067be 100644
--- a/src/sock.c
+++ b/src/sock.c
@@ -475,38 +475,6 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
     FreeRTOS_FD_CLR(c->fd, mgr->ss,
                     eSELECT_READ | eSELECT_EXCEPT | eSELECT_WRITE);
   }
-#elif MG_ENABLE_POLL
-  size_t i = 0, n = 0;
-  for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) n++;
-  struct pollfd fds[n == 0 ? 1 : n];  // Avoid zero-length VLA
-
-  memset(fds, 0, sizeof(fds));
-  for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next, i++) {
-    if (c->is_closing || c->is_resolving || FD(c) == INVALID_SOCKET) {
-      // No valid socket yet, ignore
-    } else {
-      fds[i].fd = FD(c);
-      fds[i].events |= POLLIN;
-      if (c->is_connecting || (c->send.len > 0 && c->is_tls_hs == 0)) {
-        fds[i].events |= POLLOUT;
-      }
-    }
-  }
-
-  if (poll(fds, n, ms) < 0) {
-    MG_ERROR(("poll failed, errno: %d", MG_SOCK_ERRNO));
-  } else {
-    i = 0;
-    for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next, i++) {
-      if (c->is_closing || c->is_resolving || FD(c) == INVALID_SOCKET) {
-        // No valid socket yet, ignore
-      } else {
-        c->is_readable = (unsigned) (fds[i].revents & POLLIN ? true : false);
-        c->is_writable = (unsigned) (fds[i].revents & POLLOUT ? true : false);
-        fds[i].revents = 0;
-      }
-    }
-  }
 #else
   struct timeval tv = {ms / 1000, (ms % 1000) * 1000}, tv_zero = {0, 0};
   struct mg_connection *c;