diff --git a/iscsi-scst/usr/iscsi_scstd.c b/iscsi-scst/usr/iscsi_scstd.c
index bd8c51125..80df257c1 100644
--- a/iscsi-scst/usr/iscsi_scstd.c
+++ b/iscsi-scst/usr/iscsi_scstd.c
@@ -25,7 +25,7 @@
 #include <netdb.h>
 #include <signal.h>
 
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/iscsi-scst/usr/iscsid.h b/iscsi-scst/usr/iscsid.h
index dbb911d74..278d942df 100644
--- a/iscsi-scst/usr/iscsid.h
+++ b/iscsi-scst/usr/iscsid.h
@@ -19,7 +19,7 @@
 
 #include <search.h>
 #include <sys/types.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <assert.h>
 #include <netdb.h>
 #include <syslog.h>
diff --git a/usr/events/events.c b/usr/events/events.c
index 5cc1ca561..5f0151e05 100644
--- a/usr/events/events.c
+++ b/usr/events/events.c
@@ -17,7 +17,7 @@
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/user.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/ioctl.h>
 
 #include <pthread.h>
diff --git a/usr/fileio/common.c b/usr/fileio/common.c
index 830d7aa96..caea6b296 100644
--- a/usr/fileio/common.c
+++ b/usr/fileio/common.c
@@ -27,7 +27,7 @@
 #include <inttypes.h>
 
 #include <sys/ioctl.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 #include <arpa/inet.h>
 
diff --git a/usr/fileio/fileio.c b/usr/fileio/fileio.c
index 140ba7b65..56962bcd1 100644
--- a/usr/fileio/fileio.c
+++ b/usr/fileio/fileio.c
@@ -30,7 +30,7 @@
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/user.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/ioctl.h>
 
 #include <pthread.h>
diff --git a/usr/stpgd/stpgd_main.c b/usr/stpgd/stpgd_main.c
index 584df5bab..04027f0bb 100644
--- a/usr/stpgd/stpgd_main.c
+++ b/usr/stpgd/stpgd_main.c
@@ -9,9 +9,10 @@
 #include <malloc.h>
 #include <inttypes.h>
 #include <sys/wait.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/ioctl.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <pthread.h>
 #include <unistd.h>
 #include <syslog.h>