diff --git a/rfb/rfbclient.h b/rfb/rfbclient.h
index f3bd11d..9b8f3c3 100644
--- a/rfb/rfbclient.h
+++ b/rfb/rfbclient.h
@@ -192,9 +192,6 @@ typedef struct _rfbClient {
 	rfbPixelFormat format;
 	rfbServerInitMsg si;
 
-	/* listen.c */
-        int listenSock;
-
 	/* sockets.c */
 #define RFB_BUF_SIZE 8192
 	char buf[RFB_BUF_SIZE];
@@ -273,7 +270,6 @@ typedef struct _rfbClient {
 	SoftCursorLockAreaProc SoftCursorLockArea;
 	SoftCursorUnlockScreenProc SoftCursorUnlockScreen;
 	GotFrameBufferUpdateProc GotFrameBufferUpdate;
-	FinishedFrameBufferUpdateProc FinishedFrameBufferUpdate;
 	/** the pointer returned by GetPassword will be freed after use! */
 	GetPasswordProc GetPassword;
 	MallocFrameBufferProc MallocFrameBuffer;
@@ -325,6 +321,11 @@ typedef struct _rfbClient {
 
         /** hook to handle xvp server messages */
 	HandleXvpMsgProc           HandleXvpMsg;
+
+	/* listen.c */
+        int listenSock;
+
+	FinishedFrameBufferUpdateProc FinishedFrameBufferUpdate;
 } rfbClient;
 
 /* cursor.c */