diff --git a/dix/dixstruct_priv.h b/dix/dixstruct_priv.h
index 0601448f5e..e4cb82792c 100644
--- a/dix/dixstruct_priv.h
+++ b/dix/dixstruct_priv.h
@@ -6,7 +6,8 @@
 #ifndef _XSERVER_DIXSTRUCT_PRIV_H
 #define _XSERVER_DIXSTRUCT_PRIV_H
 
-#include "client.h"
+#include <X11/Xmd.h>
+
 #include "dix.h"
 #include "resource.h"
 #include "cursor.h"
@@ -14,7 +15,6 @@
 #include "pixmap.h"
 #include "privates.h"
 #include "dixstruct.h"
-#include <X11/Xmd.h>
 
 static inline void
 SetReqFds(ClientPtr client, int req_fds) {
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 98830e003a..22b698529f 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -218,7 +218,6 @@ cat > sdksyms.c << EOF
 #include "closure.h"
 #include "colormap.h"
 #include "colormapst.h"
-#include "client.h"
 #include "cursor.h"
 #include "cursorstr.h"
 #include "dix.h"
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 11f69e9ef2..a4dbea09ff 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -27,8 +27,6 @@ SOFTWARE.
 #include <X11/Xmd.h>
 
 #include "callback.h"
-
-#include "client.h"
 #include "dix.h"
 #include "resource.h"
 #include "cursor.h"
@@ -36,6 +34,9 @@ SOFTWARE.
 #include "pixmap.h"
 #include "privates.h"
 
+struct _Client;
+typedef struct _ClientId *ClientIdPtr;
+
 /*
  * 	direct-mapped hash table, used by resource manager to store
  *      translation from client ids to server addresses.
diff --git a/include/meson.build b/include/meson.build
index f8f7a9be0e..82f67eb118 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -432,7 +432,6 @@ if build_xorg
         [
             'Xprintf.h',
             'callback.h',
-            'client.h',
             'closure.h',
             'colormap.h',
             'colormapst.h',