diff --git a/include/curl/multi.h b/include/curl/multi.h
index 61842039d..925d5c007 100644
--- a/include/curl/multi.h
+++ b/include/curl/multi.h
@@ -55,7 +55,7 @@
 /* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish
    libc5-based Linux systems. Only include it on system that are known to
    require it! */
-#if defined(_AIX) || defined(NETWARE) || defined(__NetBSD__)
+#if defined(_AIX) || defined(NETWARE) || defined(__NetBSD__) || defined(_MINIX)
 #include <sys/select.h>
 #endif
 
diff --git a/lib/if2ip.c b/lib/if2ip.c
index 479428f80..f2631a7ba 100644
--- a/lib/if2ip.c
+++ b/lib/if2ip.c
@@ -33,9 +33,13 @@
 
 #include "if2ip.h"
 
+/*
+ * This test can probably be simplified to #if defined(SIOCGIFADDR) and
+ * moved after the following includes.
+ */
 #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \
     !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \
-    !defined(_AMIGASF)
+    !defined(_AMIGASF) && !defined(_MINIX)
 
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>