1 files changed, 13 insertions, 10 deletions
diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h
index 8c543db7..37f5b1b5 100644
--- a/unix/xserver/hw/vnc/XserverDesktop.h
+++ b/unix/xserver/hw/vnc/XserverDesktop.h
@@ -31,11 +31,13 @@
 
 #include <stdint.h>
 
+#include <core/Timer.h>
+
 #include <rfb/SDesktop.h>
 #include <rfb/PixelBuffer.h>
-#include <rfb/Configuration.h>
-#include <rfb/Timer.h>
+
 #include <unixcommon.h>
+
 #include "vncInput.h"
 
 namespace rfb {
@@ -45,7 +47,7 @@ namespace rfb {
 namespace network { class SocketListener; class Socket; }
 
 class XserverDesktop : public rfb::SDesktop, public rfb::FullFramePixelBuffer,
-                       public rfb::Timer::Callback {
+                       public core::Timer::Callback {
 public:
 
   XserverDesktop(int screenIndex,
@@ -71,8 +73,8 @@ public:
   void setCursor(int width, int height, int hotX, int hotY,
                  const unsigned char *rgbaData);
   void setCursorPos(int x, int y, bool warped);
-  void add_changed(const rfb::Region &region);
-  void add_copied(const rfb::Region &dest, const rfb::Point &delta);
+  void add_changed(const core::Region& region);
+  void add_copied(const core::Region& dest, const core::Point& delta);
   void handleSocketEvent(int fd, bool read, bool write);
   void blockHandler(int* timeout);
   void addClient(network::Socket* sock, bool reverse, bool viewOnly);
@@ -95,7 +97,8 @@ public:
   void terminate() override;
   void queryConnection(network::Socket* sock,
                        const char* userName) override;
-  void pointerEvent(const rfb::Point& pos, uint16_t buttonMask) override;
+  void pointerEvent(const core::Point& pos,
+                    uint16_t buttonMask) override;
   void keyEvent(uint32_t keysym, uint32_t keycode, bool down) override;
   unsigned int setScreenLayout(int fb_width, int fb_height,
                                const rfb::ScreenSet& layout) override;
@@ -105,7 +108,7 @@ public:
   void handleClipboardData(const char* data) override;
 
   // rfb::PixelBuffer callbacks
-  void grabRegion(const rfb::Region& r) override;
+  void grabRegion(const core::Region& r) override;
 
 protected:
   bool handleListenerEvent(int fd,
@@ -115,7 +118,7 @@ protected:
                          rfb::VNCServer* sockserv,
                          bool read, bool write);
 
-  void handleTimeout(rfb::Timer* t) override;
+  void handleTimeout(core::Timer* t) override;
 
 private:
 
@@ -128,12 +131,12 @@ private:
   network::Socket* queryConnectSocket;
   std::string queryConnectAddress;
   std::string queryConnectUsername;
-  rfb::Timer queryConnectTimer;
+  core::Timer queryConnectTimer;
 
   OutputIdMap outputIdMap;
 
   std::map<uint64_t, uint64_t> pendingMsc;
 
-  rfb::Point oldCursorPos;
+  core::Point oldCursorPos;
 };
 #endif