diff --git a/mongoose.c b/mongoose.c
index 1798365b..99d3c9b7 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -3926,7 +3926,6 @@ struct mg_connection *mg_sntp_connect(struct mg_mgr *mgr, const char *url,
 
 
 
-
 #if MG_ENABLE_SOCKET
 #if MG_ARCH == MG_ARCH_WIN32 && MG_ENABLE_WINSOCK
 #define MG_SOCK_ERRNO WSAGetLastError()
diff --git a/mongoose.h b/mongoose.h
index e0178675..b260d721 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -436,7 +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 MG_ENABLE_POLL
+#if defined(MG_ENABLE_POLL) && MG_ENABLE_POLL
 #include <poll.h>
 #else
 #include <sys/select.h>
diff --git a/src/arch_unix.h b/src/arch_unix.h
index 548c1e54..424257dc 100644
--- a/src/arch_unix.h
+++ b/src/arch_unix.h
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if MG_ENABLE_POLL
+#if defined(MG_ENABLE_POLL) && MG_ENABLE_POLL
 #include <poll.h>
 #else
 #include <sys/select.h>
diff --git a/src/sock.c b/src/sock.c
index 87ea3aee..5148d895 100644
--- a/src/sock.c
+++ b/src/sock.c
@@ -1,4 +1,3 @@
-#include "arch.h"
 #include "dns.h"
 #include "event.h"
 #include "log.h"