diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 12992914c..60bcb593f 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -314,8 +314,6 @@ struct pcvtid {
 /* Generic                                                                */
 /**************************************************************************/
 
-#include <sys/wait.h>           /* May need to adjust this for other OSs */
-
 /* For PATH_MAX */
 #include "misc.h"
 
diff --git a/os/backtrace.c b/os/backtrace.c
index 8025bffae..e4cb91b1c 100644
--- a/os/backtrace.c
+++ b/os/backtrace.c
@@ -27,9 +27,14 @@
 
 #include "os.h"
 #include "misc.h"
+
 #include <errno.h>
 #include <string.h>
 
+#ifndef WIN32
+#include <sys/wait.h>
+#endif
+
 #ifdef HAVE_LIBUNWIND
 
 #define UNW_LOCAL_ONLY