diff --git a/unix/x0vncserver/Geometry.h b/unix/x0vncserver/Geometry.h
index 9caeeba..98bafb2 100644
--- a/unix/x0vncserver/Geometry.h
+++ b/unix/x0vncserver/Geometry.h
@@ -26,8 +26,6 @@
 #include <rfb/Rect.h>
 #include <rfb/Configuration.h>
 
-using namespace rfb;
-
 class Geometry
 {
 public:
@@ -43,18 +41,18 @@
   int offsetTop() const { return m_rect.tl.y; }
 
   // Return the same information as a Rect structure.
-  const Rect& getRect() const { return m_rect; }
+  const rfb::Rect& getRect() const { return m_rect; }
 
 protected:
   // Parse a string, extract size and coordinates,
   // and return that rectangle clipped to m_rect.
-  Rect parseString(const char *arg) const;
+  rfb::Rect parseString(const char *arg) const;
 
-  static StringParameter m_geometryParam;
+  static rfb::StringParameter m_geometryParam;
 
   int m_fullWidth;
   int m_fullHeight;
-  Rect m_rect;
+  rfb::Rect m_rect;
 };
 
 #endif // __GEOMETRY_H__