1 files changed, 6 insertions, 11 deletions
diff --git a/cpp/src/qpid/sys/Socket.h b/cpp/src/qpid/sys/Socket.h
index 0ebfc0c330..cab95654ad 100644
--- a/cpp/src/qpid/sys/Socket.h
+++ b/cpp/src/qpid/sys/Socket.h
@@ -21,25 +21,22 @@
  * under the License.
  *
  */
+#include "IOHandle.h"
+
 #include <string>
-#include "qpid/sys/Time.h"
 
 struct sockaddr;
 
 namespace qpid {
 namespace sys {
 
-class SocketPrivate;
-class Socket
-{
-	friend class Poller;
-
-	SocketPrivate* const impl;
+class Duration;
 
+class Socket : public IOHandle
+{
 public:
     /** Create a socket wrapper for descriptor. */
     Socket();
-    ~Socket();
 
     /** Create an initialized TCP socket */
     void createTcp() const;
@@ -106,10 +103,8 @@ public:
     int read(void *buf, size_t count) const;
     int write(const void *buf, size_t count) const;
 
-    int toFd() const;
-    
 private:
-	Socket(SocketPrivate*);
+	Socket(IOHandlePrivate*);
 };
 
 }}