diff --git a/hw/xwayland/xwayland-shm.c b/hw/xwayland/xwayland-shm.c
index 65c88ead5..faca5224e 100644
--- a/hw/xwayland/xwayland-shm.c
+++ b/hw/xwayland/xwayland-shm.c
@@ -36,6 +36,8 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "os/osdep.h"
+
 #include "fb.h"
 #include "pixmapstr.h"
 
diff --git a/include/os.h b/include/os.h
index 451750fe3..d93e7fe7d 100644
--- a/include/os.h
+++ b/include/os.h
@@ -708,9 +708,6 @@ LogPrintMarkers(void);
 extern _X_EXPORT void
 xorg_backtrace(void);
 
-extern _X_EXPORT int
-os_move_fd(int fd);
-
 #include <signal.h>
 
 #if defined(WIN32) && !defined(__CYGWIN__)
diff --git a/miext/sync/misyncshm.c b/miext/sync/misyncshm.c
index 27bf07db1..3ecb0a878 100644
--- a/miext/sync/misyncshm.c
+++ b/miext/sync/misyncshm.c
@@ -24,16 +24,19 @@
 #include <dix-config.h>
 #endif
 
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <X11/xshmfence.h>
+
+#include "os/osdep.h"
+
 #include "scrnintstr.h"
 #include "misync.h"
 #include "misyncstr.h"
 #include "misyncshm.h"
 #include "misyncfd.h"
 #include "pixmapstr.h"
-#include <sys/mman.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <X11/xshmfence.h>
 
 static DevPrivateKeyRec syncShmFencePrivateKey;
 
diff --git a/os/osdep.h b/os/osdep.h
index bc89576ba..26d430bf1 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -221,4 +221,7 @@ static inline void uname(struct utsname *uts) {
 
 void AutoResetServer(int sig);
 
+/* clone fd so it gets out of our select mask */
+int os_move_fd(int fd);
+
 #endif                          /* _OSDEP_H_ */