1 files changed, 2 insertions, 10 deletions
diff --git a/xfixes/disconnect.c b/xfixes/disconnect.c
index e412942b1..5b2945a4a 100644
--- a/xfixes/disconnect.c
+++ b/xfixes/disconnect.c
@@ -42,14 +42,11 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "dix/dix_priv.h"
 
 #include "xfixesint.h"
-#include "opaque.h"
 
 static DevPrivateKeyRec ClientDisconnectPrivateKeyRec;
 
@@ -69,6 +66,7 @@ ProcXFixesSetClientDisconnectMode(ClientPtr client)
     ClientDisconnectPtr pDisconnect = GetClientDisconnect(client);
 
     REQUEST(xXFixesSetClientDisconnectModeReq);
+    REQUEST_SIZE_MATCH(xXFixesSetClientDisconnectModeReq);
 
     pDisconnect->disconnect_mode = stuff->disconnect_mode;
 
@@ -79,10 +77,7 @@ int _X_COLD
 SProcXFixesSetClientDisconnectMode(ClientPtr client)
 {
     REQUEST(xXFixesSetClientDisconnectModeReq);
-
-    swaps(&stuff->length);
-
-    REQUEST_AT_LEAST_SIZE(xXFixesSetClientDisconnectModeReq);
+    REQUEST_SIZE_MATCH(xXFixesSetClientDisconnectModeReq);
 
     swapl(&stuff->disconnect_mode);
 
@@ -116,9 +111,6 @@ int _X_COLD
 SProcXFixesGetClientDisconnectMode(ClientPtr client)
 {
     REQUEST(xXFixesGetClientDisconnectModeReq);
-
-    swaps(&stuff->length);
-
     REQUEST_SIZE_MATCH(xXFixesGetClientDisconnectModeReq);
 
     return (*ProcXFixesVector[stuff->xfixesReqType]) (client);