diff --git a/Xext/shm.c b/Xext/shm.c
index a82fbcd39..725cafc33 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -45,6 +45,7 @@ in this Software without prior written authorization from The Open Group.
 #include "dix/dix_priv.h"
 #include "os/auth.h"
 #include "os/busfault.h"
+#include "os/client_priv.h"
 #include "os/osdep.h"
 
 #include "misc.h"
diff --git a/dri3/dri3_request.c b/dri3/dri3_request.c
index 91240be45..3da27b68f 100644
--- a/dri3/dri3_request.c
+++ b/dri3/dri3_request.c
@@ -24,6 +24,7 @@
 #include <unistd.h>
 
 #include "dix/dix_priv.h"
+#include "os/client_priv.h"
 
 #include "dri3_priv.h"
 #include <syncsrv.h>
diff --git a/include/os.h b/include/os.h
index 53f68670e..a9ef549cc 100644
--- a/include/os.h
+++ b/include/os.h
@@ -86,8 +86,6 @@ typedef struct _NewClientRec *NewClientPtr;
 
 extern _X_EXPORT int ReadFdFromClient(ClientPtr client);
 
-extern _X_EXPORT int WriteFdToClient(ClientPtr client, int fd, Bool do_close);
-
 extern _X_EXPORT Bool InsertFakeRequest(ClientPtr /*client */ ,
                                         char * /*data */ ,
                                         int /*count */ );
diff --git a/os/client_priv.h b/os/client_priv.h
index 9e7945a2c..c68a65fbe 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -43,5 +43,6 @@ const char *ClientAuthorized(struct _Client *client,
 Bool AddClientOnOpenFD(int fd);
 void ListenOnOpenFD(int fd, int noxauth);
 int ReadRequestFromClient(struct _Client *client);
+int WriteFdToClient(struct _Client *client, int fd, Bool do_close);
 
 #endif /* _XSERVER_DIX_CLIENT_PRIV_H */
diff --git a/randr/rrlease.c b/randr/rrlease.c
index 4d92b4af9..b6083cd2a 100644
--- a/randr/rrlease.c
+++ b/randr/rrlease.c
@@ -25,6 +25,7 @@
 
 #include "dix/dix_priv.h"
 #include "randr/randrstr_priv.h"
+#include "os/client_priv.h"
 
 #include "swaprep.h"