diff --git a/include/os.h b/include/os.h
index 423346aaa..53f68670e 100644
--- a/include/os.h
+++ b/include/os.h
@@ -84,8 +84,6 @@ typedef struct _NewClientRec *NewClientPtr;
 #include <stdio.h>
 #include <stdarg.h>
 
-extern _X_EXPORT int ReadRequestFromClient(ClientPtr /*client */ );
-
 extern _X_EXPORT int ReadFdFromClient(ClientPtr client);
 
 extern _X_EXPORT int WriteFdToClient(ClientPtr client, int fd, Bool do_close);
diff --git a/os/client_priv.h b/os/client_priv.h
index fd1d9cea7..9e7945a2c 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -42,5 +42,6 @@ const char *ClientAuthorized(struct _Client *client,
                              char *auth_string);
 Bool AddClientOnOpenFD(int fd);
 void ListenOnOpenFD(int fd, int noxauth);
+int ReadRequestFromClient(struct _Client *client);
 
 #endif /* _XSERVER_DIX_CLIENT_PRIV_H */
diff --git a/os/io.c b/os/io.c
index 521c852e4..17fba5602 100644
--- a/os/io.c
+++ b/os/io.c
@@ -75,9 +75,10 @@ SOFTWARE.
 
 #include "dix/dix_priv.h"
 #include "os/bug_priv.h"
+#include "os/client_priv.h"
+#include "os/osdep.h"
 
 #include "os.h"
-#include "osdep.h"
 #include "opaque.h"
 #include "dixstruct.h"
 #include "misc.h"