1 files changed, 12 insertions, 10 deletions
diff --git a/common/rfb/ClientParams.h b/common/rfb/ClientParams.h
index f715c47f..0910181b 100644
--- a/common/rfb/ClientParams.h
+++ b/common/rfb/ClientParams.h
@@ -28,12 +28,14 @@
 
 #include <stdint.h>
 
-#include <rfb/Cursor.h>
-#include <rfb/PixelFormat.h>
-#include <rfb/ScreenSet.h>
+#include <core/Rect.h>
 
 namespace rfb {
 
+  class Cursor;
+  class PixelFormat;
+  struct ScreenSet;
+
   const int subsampleUndefined = -1;
   const int subsampleNone = 0;
   const int subsampleGray = 1;
@@ -66,11 +68,11 @@ namespace rfb {
 
     int width() const { return width_; }
     int height() const { return height_; }
-    const ScreenSet& screenLayout() const { return screenLayout_; }
+    const ScreenSet& screenLayout() const { return *screenLayout_; }
     void setDimensions(int width, int height);
     void setDimensions(int width, int height, const ScreenSet& layout);
 
-    const PixelFormat& pf() const { return pf_; }
+    const PixelFormat& pf() const { return *pf_; }
     void setPF(const PixelFormat& pf);
 
     const char* name() const { return name_.c_str(); }
@@ -79,8 +81,8 @@ namespace rfb {
     const Cursor& cursor() const { return *cursor_; }
     void setCursor(const Cursor& cursor);
 
-    const Point& cursorPos() const { return cursorPos_; }
-    void setCursorPos(const Point& pos);
+    const core::Point& cursorPos() const { return cursorPos_; }
+    void setCursorPos(const core::Point& pos);
 
     bool supportsEncoding(int32_t encoding) const;
 
@@ -112,12 +114,12 @@ namespace rfb {
 
     int width_;
     int height_;
-    ScreenSet screenLayout_;
+    ScreenSet* screenLayout_;
 
-    PixelFormat pf_;
+    PixelFormat* pf_;
     std::string name_;
     Cursor* cursor_;
-    Point cursorPos_;
+    core::Point cursorPos_;
     std::set<int32_t> encodings_;
     unsigned int ledState_;
     uint32_t clipFlags;