diff --git a/Xext/xtest.c b/Xext/xtest.c
index bec191e49..05ac0e967 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -40,6 +40,7 @@
 #include "dix/exevents_priv.h"
 #include "mi/mi_priv.h"
 #include "mi/mipointer_priv.h"
+#include "os/client_priv.h"
 #include "os/osdep.h"
 
 #include "misc.h"
diff --git a/glx/glxext.c b/glx/glxext.c
index 467fdd542..216dea98d 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -31,6 +31,9 @@
 #include <dix-config.h>
 
 #include <string.h>
+
+#include "os/client_priv.h"
+
 #include "glxserver.h"
 #include <windowstr.h>
 #include <propertyst.h>
diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index 6eb846187..f4fa19edb 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -35,6 +35,9 @@
 #endif
 
 #include <errno.h>
+
+#include "os/client_priv.h"
+
 #ifdef WITH_LIBDRM
 #include <xf86drm.h>
 #endif
diff --git a/hw/xwayland/xwayland-drm-lease.c b/hw/xwayland/xwayland-drm-lease.c
index 224ad4c73..30d363b59 100644
--- a/hw/xwayland/xwayland-drm-lease.c
+++ b/hw/xwayland/xwayland-drm-lease.c
@@ -26,6 +26,8 @@
 
 #include <xwayland-config.h>
 
+#include "os/client_priv.h"
+
 #ifdef WITH_LIBDRM
 #include <xf86drm.h>
 #include <xf86drmMode.h>
diff --git a/include/os.h b/include/os.h
index 668c0e61d..facfa7047 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 void ResetCurrentRequest(ClientPtr /*client */ );
-
 extern _X_EXPORT void FlushAllOutput(void);
 
 extern _X_EXPORT void FlushIfCriticalOutputPending(void);
diff --git a/os/client_priv.h b/os/client_priv.h
index de18d07cb..90f0e1afe 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -8,6 +8,7 @@
 
 #include <sys/types.h>
 #include <X11/Xdefs.h>
+#include <X11/Xfuncproto.h>
 
 /* Client IDs. Use GetClientPid, GetClientCmdName and GetClientCmdArgs
  * instead of accessing the fields directly. */
@@ -46,4 +47,7 @@ int ReadRequestFromClient(struct _Client *client);
 int WriteFdToClient(struct _Client *client, int fd, Bool do_close);
 Bool InsertFakeRequest(struct _Client *client, char *data, int count);
 
+/* exported only for DRI module, but should not be used by external drivers */
+_X_EXPORT void ResetCurrentRequest(struct _Client *client);
+
 #endif /* _XSERVER_DIX_CLIENT_PRIV_H */