diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index a4e324059..ba6e90887 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -406,4 +406,20 @@ void SendGraphicsExpose(ClientPtr pClient, RegionPtr pRegion, XID drawable,
                         BYTE majorOpcode, CARD16 minorOpcode)
     _X_ATTRIBUTE_NONNULL_ARG(1);
 
+/*
+ * @brief alter the SaveSet of a window (see automatic reparenting when client gone)
+ *
+ * @param pClient pointer to client structure
+ * @param pWindow pointer to window structure whose SaveSet is changed
+ * @param mode    what to do when client goes away
+ * @param toRoot  TRUE to reparent to root when parent's client gone
+ * @param map     TRUE if window shall remain mapped
+ * @return X return code
+ */
+XRetCode AlterSaveSetForClient(ClientPtr pClient,
+                               WindowPtr pWin,
+                               unsigned mode,
+                               Bool toRoot,
+                               Bool map);
+
 #endif /* _XSERVER_DIX_PRIV_H */
diff --git a/dix/dixutils.c b/dix/dixutils.c
index b5df5cb32..90d591de6 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -243,7 +243,7 @@ dixLookupClient(ClientPtr *pClient, XID rid, ClientPtr client, Mask access)
     return rc;
 }
 
-int
+XRetCode
 AlterSaveSetForClient(ClientPtr client, WindowPtr pWin, unsigned mode,
                       Bool toRoot, Bool map)
 {
diff --git a/include/dix.h b/include/dix.h
index 3f39883e1..d9cf17723 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -179,12 +179,6 @@ extern _X_EXPORT int dixLookupFontable(FontPtr *result,
 
 extern _X_EXPORT void NoopDDA(void);
 
-extern _X_EXPORT int AlterSaveSetForClient(ClientPtr /*client */ ,
-                                           WindowPtr /*pWin */ ,
-                                           unsigned /*mode */ ,
-                                           Bool /*toRoot */ ,
-                                           Bool /*map */ );
-
 extern _X_EXPORT void BlockHandler(void *timeout);
 
 extern _X_EXPORT void WakeupHandler(int result);