diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx
index 78e1cc0..da0874f 100644
--- a/unix/x0vncserver/x0vncserver.cxx
+++ b/unix/x0vncserver/x0vncserver.cxx
@@ -46,6 +46,7 @@
 
 #include <x0vncserver/Geometry.h>
 #include <x0vncserver/Image.h>
+#include <x0vncserver/XPixelBuffer.h>
 #include <x0vncserver/PollingManager.h>
 #include <x0vncserver/PollingScheduler.h>
 
@@ -133,27 +134,6 @@
 };
 
 
-//
-// XPixelBuffer is a modification of FullFramePixelBuffer that does
-// not always return buffer width in getStride().
-//
-
-class XPixelBuffer : public FullFramePixelBuffer
-{
-public:
-  XPixelBuffer(const PixelFormat& pf, int width, int height,
-               rdr::U8* data_, ColourMap* cm, int stride_) :
-    FullFramePixelBuffer(pf, width, height, data_, cm), stride(stride_)
-  {
-  }
-
-  virtual int getStride() const { return stride; }
-
-protected:
-  int stride;
-};
-
-
 class XDesktop : public SDesktop, public ColourMap
 {
 public: