diff --git a/dix/dispatch.c b/dix/dispatch.c
index b3e5feacc..2f07a1f50 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3532,7 +3532,7 @@ CloseDownClient(ClientPtr client)
         }
         client->clientGone = TRUE;      /* so events aren't sent to client */
         if (ClientIsAsleep(client))
-            ClientSignal(client);
+            dixClientSignal(client);
         ProcessWorkQueueZombies();
         CloseDownConnection(client);
         output_pending_clear(client);
diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index 0f9078eda..ec5954486 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -331,4 +331,13 @@ void MarkClientException(ClientPtr pClient)
 Bool ClientSleep(ClientPtr pClient, ClientSleepProcPtr func, void *closure)
     _X_ATTRIBUTE_NONNULL_ARG(1,2);
 
+/*
+ * @brief signal to sleeping client there's work to do
+ *
+ * @param pClient   the client to signal to
+ * @return TRUE on success
+ */
+Bool dixClientSignal(ClientPtr pClient)
+    _X_ATTRIBUTE_NONNULL_ARG(1);
+
 #endif /* _XSERVER_DIX_PRIV_H */
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index dd617d99c..45d209584 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -2035,7 +2035,7 @@ static void verrorf(const char *f, va_list args)
 static const xfont2_client_funcs_rec xfont2_client_funcs = {
     .version = XFONT2_CLIENT_FUNCS_VERSION,
     .client_auth_generation = _client_auth_generation,
-    .client_signal = ClientSignal,
+    .client_signal = dixClientSignal,
     .delete_font_client_id = delete_font_client_id,
     .verrorf = verrorf,
     .find_old_font = find_old_font,
diff --git a/dix/dixutils.c b/dix/dixutils.c
index 3b98ced0e..b5df5cb32 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -581,8 +581,7 @@ ClientSleep(ClientPtr client, ClientSleepProcPtr function, void *closure)
     return TRUE;
 }
 
-Bool
-ClientSignal(ClientPtr client)
+Bool dixClientSignal(ClientPtr client)
 {
     SleepQueuePtr q;
 
diff --git a/doc/Xserver-spec.xml b/doc/Xserver-spec.xml
index 8862b31bf..f7dd8e917 100644
--- a/doc/Xserver-spec.xml
+++ b/doc/Xserver-spec.xml
@@ -1274,7 +1274,7 @@ making its way back to Dispatch()).  No more X requests will be processed
 for this client until ClientWakeup is called.
 <blockquote><programlisting>
 
-	Bool ClientSignal (client)
+	Bool dixClientSignal (client)
 		ClientPtr	client;
 
 </programlisting></blockquote>
@@ -4921,7 +4921,7 @@ mi and fb implementations.</para>
 <row><entry><function>ChangeWindowAttributes</function></entry><entry><literal>ddx</literal></entry><entry><para>Screen</para></entry></row>
 <row><entry><function>ClearToBackground</function></entry><entry><literal>ddx</literal></entry><entry><para>Window</para></entry></row>
 <row><entry><function>ClientAuthorized</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>
-<row><entry><function>ClientSignal</function></entry><entry><literal>dix</literal></entry><entry><para></para></entry></row>
+<row><entry><function>dixClientSignal</function></entry><entry><literal>dix</literal></entry><entry><para></para></entry></row>
 <row><entry><function>ClientSleep</function></entry><entry><literal>dix</literal></entry><entry><para></para></entry></row>
 <row><entry><function>ClientWakeup</function></entry><entry><literal>dix</literal></entry><entry><para></para></entry></row>
 <row><entry><function>ClipNotify</function></entry><entry><literal>ddx</literal></entry><entry><para>Screen</para></entry></row>
diff --git a/include/dix.h b/include/dix.h
index 179f16d26..efeeca709 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -219,11 +219,6 @@ extern _X_EXPORT Bool QueueWorkProc(Bool (*function)(ClientPtr clientUnused,
 typedef Bool (*ClientSleepProcPtr) (ClientPtr client,
                                     void *closure);
 
-#ifndef ___CLIENTSIGNAL_DEFINED___
-#define ___CLIENTSIGNAL_DEFINED___
-extern _X_EXPORT Bool ClientSignal(ClientPtr /*client */ );
-#endif                          /* ___CLIENTSIGNAL_DEFINED___ */
-
 #define CLIENT_SIGNAL_ANY ((void *)-1)
 extern _X_EXPORT int ClientSignalAll(ClientPtr /*client*/,
                                      ClientSleepProcPtr /*function*/,