1 files changed, 8 insertions, 8 deletions
diff --git a/common/rfb/ServerParams.h b/common/rfb/ServerParams.h
index d730b891..6be9acd6 100644
--- a/common/rfb/ServerParams.h
+++ b/common/rfb/ServerParams.h
@@ -25,12 +25,12 @@
 
 #include <string>
 
-#include <rfb/Cursor.h>
-#include <rfb/PixelFormat.h>
-#include <rfb/ScreenSet.h>
-
 namespace rfb {
 
+  class Cursor;
+  class PixelFormat;
+  struct ScreenSet;
+
   class ServerParams {
   public:
     ServerParams();
@@ -55,11 +55,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(); }
@@ -85,9 +85,9 @@ namespace rfb {
 
     int width_;
     int height_;
-    ScreenSet screenLayout_;
+    ScreenSet* screenLayout_;
 
-    PixelFormat pf_;
+    PixelFormat* pf_;
     std::string name_;
     Cursor* cursor_;
     unsigned int ledState_;