diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index 248aaf1bb..069270219 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -29,6 +29,7 @@
 #include <X11/keysym.h>
 
 #include "mi/mipointer_priv.h"
+#include "os/client_priv.h"
 #include "os/osdep.h"
 
 #include "ephyr.h"
diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index a3e930135..297d9b9c8 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -19,6 +19,7 @@ is" without express or implied warranty.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 
+#include "os/client_priv.h"
 #include "os/osdep.h"
 
 #include "screenint.h"
diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index 55304569e..308879213 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -39,6 +39,7 @@
 
 #include "dix/input_priv.h"
 #include "dix/property_priv.h"
+#include "os/client_priv.h"
 #include "os/osdep.h"
 #include "os/xserver_poll.h"
 
diff --git a/include/os.h b/include/os.h
index 51b0201d3..3f2bdfbc0 100644
--- a/include/os.h
+++ b/include/os.h
@@ -91,8 +91,6 @@ extern _X_EXPORT void SetCriticalOutputPending(void);
 extern _X_EXPORT int WriteToClient(ClientPtr /*who */ , int /*count */ ,
                                    const void * /*buf */ );
 
-extern _X_EXPORT void CloseWellKnownConnections(void);
-
 typedef void (*NotifyFdProcPtr)(int fd, int ready, void *data);
 
 #define X_NOTIFY_NONE   0x0
diff --git a/os/client_priv.h b/os/client_priv.h
index a0ab14fda..88da283da 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -52,6 +52,7 @@ void ResetOsBuffers(void);
 void NotifyParentProcess(void);
 void CreateWellKnownSockets(void);
 void ResetWellKnownSockets(void);
+void CloseWellKnownConnections(void);
 
 /* exported only for DRI module, but should not be used by external drivers */
 _X_EXPORT void ResetCurrentRequest(struct _Client *client);
diff --git a/os/utils.c b/os/utils.c
index 4f74e2d64..fbf91c3c1 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -78,6 +78,7 @@ __stdcall unsigned long GetTickCount(void);
 #include <X11/Xtrans/Xtrans.h>
 
 #include "os/audit.h"
+#include "os/client_priv.h"
 
 #include "input.h"
 #include "dixfont.h"