diff --git a/Xext/xace.c b/Xext/xace.c
index 5051b832c..2ceea394d 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -20,6 +20,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dix-config.h>
 
 #include <stdarg.h>
+
+#include "os/client_priv.h"
+
 #include "scrnintstr.h"
 #include "extnsionst.h"
 #include "pixmapstr.h"
diff --git a/include/os.h b/include/os.h
index 560c7bd96..eab28747b 100644
--- a/include/os.h
+++ b/include/os.h
@@ -252,9 +252,6 @@ PrivsElevated(void);
 extern _X_EXPORT int
 GetClientFd(ClientPtr);
 
-extern _X_EXPORT Bool
-ClientIsLocal(ClientPtr client);
-
 /* stuff for ReplyCallback */
 extern _X_EXPORT CallbackListPtr ReplyCallback;
 typedef struct {
diff --git a/os/access.c b/os/access.c
index 44d6c2430..98095a5a1 100644
--- a/os/access.c
+++ b/os/access.c
@@ -175,9 +175,9 @@ SOFTWARE.
 
 #include "os/auth.h"
 #include "os/client_priv.h"
+#include "os/osdep.h"
 
 #include "dixstruct.h"
-#include "osdep.h"
 
 #include "xace.h"
 #include "xdmcp.h"
diff --git a/os/client_priv.h b/os/client_priv.h
index c84cc35ea..abbda2b9d 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -7,6 +7,7 @@
 #define _XSERVER_DIX_CLIENT_PRIV_H
 
 #include <sys/types.h>
+#include <X11/Xdefs.h>
 
 /* Client IDs. Use GetClientPid, GetClientCmdName and GetClientCmdArgs
  * instead of accessing the fields directly. */
@@ -32,4 +33,6 @@ pid_t GetClientPid(struct _Client *client);
 const char *GetClientCmdName(struct _Client *client);
 const char *GetClientCmdArgs(struct _Client *client);
 
+Bool ClientIsLocal(struct _Client *client);
+
 #endif /* _XSERVER_DIX_CLIENT_PRIV_H */