diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index 750e9c915815..6bf2155e7979 100644
--- a/sys/compat/svr4/svr4_stream.c
+++ b/sys/compat/svr4/svr4_stream.c
@@ -46,7 +46,6 @@
 #include <sys/filedesc.h>
 #include <sys/fcntl.h>
 #include <sys/filio.h>
-#include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/un.h>
diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c
index 0979db99ebde..4f61e5c1b893 100644
--- a/sys/dev/bktr/bktr_i2c.c
+++ b/sys/dev/bktr/bktr_i2c.c
@@ -41,7 +41,12 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/uio.h>
+
+#if __FreeBSD_version >= 500014
+#include <sys/selinfo.h>
+#else
 #include <sys/select.h>
+#endif
 
 #if (__FreeBSD_version < 500000)
 #include <machine/clock.h>              /* for DELAY */
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index dbf72cca754a..926857482aec 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -50,7 +50,7 @@
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/poll.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/uio.h>
 #include <sys/mouse.h>
 
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index 8b096195b0a1..086e0c048022 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -45,7 +45,7 @@
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/poll.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/uio.h>
 #include <sys/bus.h>
 
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index dbf72cca754a..926857482aec 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -50,7 +50,7 @@
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/poll.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/uio.h>
 #include <sys/mouse.h>
 
diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c
index 212c06427448..037e9431045a 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c
@@ -146,7 +146,7 @@
 #include <sys/conf.h>
 #include <sys/uio.h>
 #include <sys/syslog.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/poll.h>
 #include <sys/bus.h>
 #define MIN(a,b)	((a)<(b)?(a):(b))
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index 3aef6cb3bcfb..156260ef1ec7 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -58,7 +58,11 @@
 #include <sys/conf.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
+#if __FreeBSD_version >= 500014
+#include <sys/selinfo.h>
+#else
 #include <sys/select.h>
+#endif
 #include <net/if.h>
 
 #ifdef __NetBSD__
diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c
index 3b8ee54ce115..56eeab93117b 100644
--- a/sys/pc98/pc98/mse.c
+++ b/sys/pc98/pc98/mse.c
@@ -50,7 +50,7 @@
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/poll.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/uio.h>
 
 #include <machine/bus.h>