diff --git a/Xext/shm.c b/Xext/shm.c
index 071bd1a41..00cf12a0b 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -43,6 +43,9 @@ in this Software without prior written authorization from The Open Group.
 #include <fcntl.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "os/busfault.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -59,7 +62,6 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xfuncproto.h>
 #include <sys/mman.h>
 #include "protocol-versions.h"
-#include "busfault.h"
 
 /* Needed for Solaris cross-zone shared memory extension */
 #ifdef HAVE_SHMCTL64
diff --git a/os/WaitFor.c b/os/WaitFor.c
index a388cd573..b08b44040 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -65,6 +65,7 @@ SOFTWARE.
 #include <X11/X.h>
 
 #include "dix/dix_priv.h"
+#include "os/busfault.h"
 
 #include "misc.h"
 #include "osdep.h"
@@ -73,7 +74,6 @@ SOFTWARE.
 #ifdef DPMSExtension
 #include "dpmsproc.h"
 #endif
-#include "busfault.h"
 
 #ifdef WIN32
 /* Error codes from windows sockets differ from fileio error codes  */
diff --git a/os/busfault.c b/os/busfault.c
index a2d433a2e..7e6d4612e 100644
--- a/os/busfault.c
+++ b/os/busfault.c
@@ -26,8 +26,10 @@
 
 #include <X11/Xos.h>
 #include <X11/Xdefs.h>
+
+#include "os/busfault.h"
+
 #include "misc.h"
-#include <busfault.h>
 #include <list.h>
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/include/busfault.h b/os/busfault.h
similarity index 98%
rename from include/busfault.h
rename to os/busfault.h
index f89a5833e..d31d046fc 100644
--- a/include/busfault.h
+++ b/os/busfault.h
@@ -25,6 +25,8 @@
 
 #include <dix-config.h>
 
+#include <X11/Xdefs.h>
+
 #ifdef HAVE_SIGACTION
 
 #include <sys/types.h>
diff --git a/os/osinit.c b/os/osinit.c
index db8427ba9..9d4e5bbc2 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -63,6 +63,8 @@ SOFTWARE.
 #include <execinfo.h>
 #endif
 
+#include "os/busfault.h"
+
 #include "misc.h"
 
 #include "dixstruct.h"
@@ -158,8 +160,6 @@ OsSigHandler(int signo)
 }
 #endif /* !WIN32 || __CYGWIN__ */
 
-#include "busfault.h"
-
 void
 OsInit(void)
 {