diff --git a/hw/xfree86/drivers/modesetting/pageflip.c b/hw/xfree86/drivers/modesetting/pageflip.c
index f0b8d5919..86849a070 100644
--- a/hw/xfree86/drivers/modesetting/pageflip.c
+++ b/hw/xfree86/drivers/modesetting/pageflip.c
@@ -26,7 +26,8 @@
 
 #include <errno.h>
 
-#include <xserver_poll.h>
+#include "os/xserver_poll.h"
+
 #include <xf86drm.h>
 
 #include "driver.h"
diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c
index ee2b2154a..b5a9c87fd 100644
--- a/hw/xfree86/os-support/shared/posix_tty.c
+++ b/hw/xfree86/os-support/shared/posix_tty.c
@@ -59,7 +59,8 @@
 #include <errno.h>
 #include <X11/X.h>
 
-#include <xserver_poll.h>
+#include "os/xserver_poll.h"
+
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
index 40677ad7a..760a39b32 100644
--- a/hw/xfree86/os-support/shared/sigio.c
+++ b/hw/xfree86/os-support/shared/sigio.c
@@ -61,8 +61,8 @@
 #include <X11/X.h>
 
 #include "os/osdep.h"
+#include "os/xserver_poll.h"
 
-#include <xserver_poll.h>
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_os_support.h"
diff --git a/hw/xfree86/os-support/solaris/sun_bell.c b/hw/xfree86/os-support/solaris/sun_bell.c
index d08474516..e374ed826 100644
--- a/hw/xfree86/os-support/solaris/sun_bell.c
+++ b/hw/xfree86/os-support/solaris/sun_bell.c
@@ -29,7 +29,8 @@
 #include <sys/uio.h>
 #include <limits.h>
 #include <math.h>
-#include <xserver_poll.h>
+
+#include "os/xserver_poll.h"
 
 #include "xf86.h"
 #include "xf86Priv.h"
diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index 287fe8b06..bc89106f8 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -37,6 +37,7 @@
 #include <X11/Xatom.h>
 
 #include "os/osdep.h"
+#include "os/xserver_poll.h"
 
 #include <micmap.h>
 #include <misyncshm.h>
@@ -46,7 +47,6 @@
 #include <propertyst.h>
 #include <inputstr.h>
 #include <xacestr.h>
-#include <xserver_poll.h>
 
 #include "xwayland-cursor.h"
 #include "xwayland-screen.h"
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index cbd2437d6..20ccc31a9 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -39,6 +39,7 @@
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
+#include "os/xserver_poll.h"
 
 #include <selection.h>
 #include <micmap.h>
@@ -48,7 +49,6 @@
 #include <glx_extinit.h>
 #include <opaque.h>
 #include <os.h>
-#include <xserver_poll.h>
 #include <propertyst.h>
 #include <version-config.h>
 
diff --git a/os/ospoll.c b/os/ospoll.c
index c68aabc87..71410a2e2 100644
--- a/os/ospoll.c
+++ b/os/ospoll.c
@@ -24,10 +24,13 @@
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <X11/X.h>
+#include <X11/Xproto.h>
+
+#include "os/xserver_poll.h"
+
 #include "misc.h"               /* for typedef of pointer */
 #include "ospoll.h"
 #include "list.h"
diff --git a/os/xserver_poll.c b/os/xserver_poll.c
index 1927dfa10..ff31b7890 100644
--- a/os/xserver_poll.c
+++ b/os/xserver_poll.c
@@ -82,12 +82,13 @@
 #include <sys/time.h>                        /* time definitions */
 #include <assert.h>                          /* assertion macros */
 #include <string.h>                          /* string functions */
-#include "xserver_poll.h"
 
 #if defined(WIN32) && !defined(__CYGWIN__)
 #include <X11/Xwinsock.h>
 #endif
 
+#include "os/xserver_poll.h"
+
 /*---------------------------------------------------------------------------*\
 				  Macros
 \*---------------------------------------------------------------------------*/
diff --git a/include/xserver_poll.h b/os/xserver_poll.h
similarity index 100%
rename from include/xserver_poll.h
rename to os/xserver_poll.h