diff --git a/dix/dixutils.c b/dix/dixutils.c
index e037cdd715..00e056531b 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -469,6 +469,13 @@ InitBlockAndWakeupHandlers(void)
  * sleeps for input.
  */
 
+typedef struct _WorkQueue {
+    struct _WorkQueue *next;
+    Bool (*function) (ClientPtr pClient, void *closure);
+    ClientPtr client;
+    void *closure;
+} *WorkQueuePtr;
+
 WorkQueuePtr workQueue;
 static WorkQueuePtr *workQueueLast = &workQueue;
 
diff --git a/include/dix.h b/include/dix.h
index f8aa496ec2..f32c668036 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -98,8 +98,6 @@ typedef struct _Client *ClientPtr;
 #define _XTYPEDEF_CLIENTPTR
 #endif
 
-typedef struct _WorkQueue *WorkQueuePtr;
-
 extern _X_EXPORT ClientPtr clients[MAXCLIENTS];
 extern _X_EXPORT ClientPtr serverClient;
 extern _X_EXPORT int currentMaxClients;
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 2d6dae2f6a..6868cad0d6 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -118,15 +118,6 @@ typedef struct _Client {
     int req_fds;
 } ClientRec;
 
-typedef struct _WorkQueue {
-    struct _WorkQueue *next;
-    Bool (*function) (ClientPtr /* pClient */ ,
-                      void *    /* closure */
-        );
-    ClientPtr client;
-    void *closure;
-} WorkQueueRec;
-
 extern _X_EXPORT TimeStamp currentTime;
 
 extern _X_EXPORT int