diff --git a/common/rfb/SMsgWriterV3.h b/common/rfb/SMsgWriterV3.h
index 509bfdc..e86c828 100644
--- a/common/rfb/SMsgWriterV3.h
+++ b/common/rfb/SMsgWriterV3.h
@@ -20,6 +20,7 @@
 #define __RFB_SMSGWRITERV3_H__
 
 #include <list>
+#include <utility>
 
 #include <rfb/SMsgWriter.h>
 
@@ -35,7 +36,10 @@
     virtual void startMsg(int type);
     virtual void endMsg();
     virtual bool writeSetDesktopSize();
-    virtual bool writeExtendedDesktopSize(rdr::U16 error);
+    virtual bool writeExtendedDesktopSize();
+    virtual bool writeExtendedDesktopSize(rdr::U16 reason, rdr::U16 result,
+                                          int fb_width, int fb_height,
+                                          const ScreenSet& layout);
     virtual bool writeSetDesktopName();
     virtual void cursorChange(WriteSetCursorCallback* cb);
     virtual void writeSetCursor(int width, int height, const Point& hotspot,
@@ -57,9 +61,16 @@
     WriteSetCursorCallback* wsccb;
     bool needSetDesktopSize;
     bool needExtendedDesktopSize;
-    std::list<rdr::U16> edsErrors;
     bool needSetDesktopName;
     bool needLastRect;
+
+    typedef struct {
+      rdr::U16 reason, result;
+      int fb_width, fb_height;
+      ScreenSet layout;
+    } ExtendedDesktopSizeMsg;
+    std::list<ExtendedDesktopSizeMsg> extendedDesktopSizeMsgs;
+
   };
 }
 #endif