diff --git a/dix/grabs.c b/dix/grabs.c
index 917d9aac7..ceb50e544 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -58,6 +58,7 @@ SOFTWARE.
 #include "dix/dixgrabs_priv.h"
 #include "dix/exevents_priv.h"
 #include "os/auth.h"
+#include "os/client_priv.h"
 
 #include "misc.h"
 #include "windowstr.h"
@@ -66,7 +67,6 @@ SOFTWARE.
 #include "xace.h"
 #include "exglobals.h"
 #include "inpututils.h"
-#include "client.h"
 
 #define BITMASK(i) (((Mask)1) << ((i) & 31))
 #define MASKIDX(i) ((i) >> 5)
diff --git a/dix/window.c b/dix/window.c
index c71db06c5..7728e020b 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -108,6 +108,7 @@ Equipment Corporation.
 #include "dix/property_priv.h"
 #include "dix/selection_priv.h"
 #include "os/auth.h"
+#include "os/client_priv.h"
 #include "os/screensaver.h"
 
 #include "misc.h"
diff --git a/hw/xwayland/xwayland-xtest.c b/hw/xwayland/xwayland-xtest.c
index 5541fecef..0bb65399b 100644
--- a/hw/xwayland/xwayland-xtest.c
+++ b/hw/xwayland/xwayland-xtest.c
@@ -32,6 +32,7 @@
 
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
+#include "os/client_priv.h"
 
 #include <inputstr.h>
 #include <inpututils.h>
diff --git a/include/client.h b/include/client.h
index 1f3d9065f..d71dc8d05 100644
--- a/include/client.h
+++ b/include/client.h
@@ -30,15 +30,7 @@
 #include <dix-config.h>
 #endif                          /* HAVE_DIX_CONFIG_H */
 
-#include <sys/types.h>
-#include <X11/Xfuncproto.h>
-
 struct _Client;
 typedef struct _ClientId *ClientIdPtr;
 
-/* Query cached client IDs. Exported on purpose for drivers. */
-extern _X_EXPORT pid_t GetClientPid(struct _Client *client);
-extern _X_EXPORT const char *GetClientCmdName(struct _Client *client);
-extern _X_EXPORT const char *GetClientCmdArgs(struct _Client *client);
-
 #endif                          /* CLIENT_H */
diff --git a/os/access.c b/os/access.c
index bacdee432..700e3f1f3 100644
--- a/os/access.c
+++ b/os/access.c
@@ -176,6 +176,7 @@ SOFTWARE.
 #include <X11/Xos_r.h>
 
 #include "os/auth.h"
+#include "os/client_priv.h"
 
 #include "dixstruct.h"
 #include "osdep.h"
diff --git a/os/client_priv.h b/os/client_priv.h
index 27dc4f36b..03dbd4099 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -29,4 +29,9 @@ void ReleaseClientIds(struct _Client *client);
 pid_t DetermineClientPid(struct _Client *client);
 void DetermineClientCmd(pid_t, const char **cmdname, const char **cmdargs);
 
+/* Query cached client IDs. Exported on purpose for drivers. */
+pid_t GetClientPid(struct _Client *client);
+const char *GetClientCmdName(struct _Client *client);
+const char *GetClientCmdArgs(struct _Client *client);
+
 #endif /* _XSERVER_DIX_CLIENT_PRIV_H */