diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 05e1c2696..ea2ac7d21 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -68,6 +68,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "dristruct.h"
 #include "mi.h"
 #include "mipointer.h"
+#include "xf86_os_support.h"
 #include "xf86_OSproc.h"
 #include "inputstr.h"
 #include "xf86VGAarbiter.h"
diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
index 67de2e925..40677ad7a 100644
--- a/hw/xfree86/os-support/shared/sigio.c
+++ b/hw/xfree86/os-support/shared/sigio.c
@@ -65,6 +65,7 @@
 #include <xserver_poll.h>
 #include "xf86.h"
 #include "xf86Priv.h"
+#include "xf86_os_support.h"
 #include "xf86_OSlib.h"
 #include "inputstr.h"
 
diff --git a/hw/xfree86/os-support/shared/sigiostubs.c b/hw/xfree86/os-support/shared/sigiostubs.c
index d1792e8ac..c56c42fa5 100644
--- a/hw/xfree86/os-support/shared/sigiostubs.c
+++ b/hw/xfree86/os-support/shared/sigiostubs.c
@@ -30,8 +30,10 @@
 #endif
 
 #include <X11/X.h>
+
 #include "xf86.h"
 #include "xf86Priv.h"
+#include "xf86_os_support.h"
 #include "xf86_OSlib.h"
 
 int
diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
index 9fbcf5d01..0e3362512 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -162,7 +162,6 @@ extern _X_EXPORT Bool xf86GARTCloseScreen(int screenNum);
    wrappers than to wrap each individual function called. */
 extern _X_EXPORT int xf86InstallSIGIOHandler(int fd, void (*f) (int, void *),
                                              void *);
-extern _X_EXPORT int xf86RemoveSIGIOHandler(int fd);
 
 #ifdef XSERVER_PLATFORM_BUS
 #include "hotplug.h"
diff --git a/hw/xfree86/os-support/xf86_os_support.h b/hw/xfree86/os-support/xf86_os_support.h
index ccb4d648d..ae0f651c3 100644
--- a/hw/xfree86/os-support/xf86_os_support.h
+++ b/hw/xfree86/os-support/xf86_os_support.h
@@ -27,5 +27,6 @@ void xf86InitVidMem(void);
 void xf86OSRingBell(int volume, int pitch, int duration);
 void xf86OSInputThreadInit(void);
 Bool xf86DeallocateGARTMemory(int screenNum, int key);
+int xf86RemoveSIGIOHandler(int fd);
 
 #endif /* _XSERVER_XF86_OS_SUPPORT */