diff --git a/src/internet-node/tcp-socket-impl.cc b/src/internet-node/tcp-socket-impl.cc
index 5edc19109..26ad2dc0a 100644
--- a/src/internet-node/tcp-socket-impl.cc
+++ b/src/internet-node/tcp-socket-impl.cc
@@ -90,7 +90,7 @@ TcpSocketImpl::GetTypeId ()
 }
 
 TcpSocketImpl::TcpSocketImpl(const TcpSocketImpl& sock)
-  : Socket(sock), //copy the base class callbacks
+  : TcpSocket(sock), //copy the base class callbacks
     m_skipRetxResched (sock.m_skipRetxResched),
     m_dupAckCount (sock.m_dupAckCount),
     m_delAckCount (0),
diff --git a/src/internet-node/tcp-socket-impl.h b/src/internet-node/tcp-socket-impl.h
index e2f9d75f6..0171f2e6d 100644
--- a/src/internet-node/tcp-socket-impl.h
+++ b/src/internet-node/tcp-socket-impl.h
@@ -24,7 +24,7 @@
 #include <queue>
 #include "ns3/callback.h"
 #include "ns3/traced-value.h"
-#include "ns3/socket.h"
+#include "ns3/tcp-socket.h"
 #include "ns3/ptr.h"
 #include "ns3/ipv4-address.h"
 #include "ns3/event-id.h"
@@ -42,7 +42,7 @@ class Packet;
 class TcpL4Protocol;
 class TcpHeader;
 
-class TcpSocketImpl : public Socket
+class TcpSocketImpl : public TcpSocket
 {
 public:
   static TypeId GetTypeId (void);
diff --git a/src/node/wscript b/src/node/wscript
index 6d0974263..2f91f1e2a 100644
--- a/src/node/wscript
+++ b/src/node/wscript
@@ -27,6 +27,7 @@ def build(bld):
         'packet-socket.cc',
         'udp-socket.cc',
         'udp-socket-factory.cc',
+        'tcp-socket.cc',
         'tcp-socket-factory.cc',
         'ipv4.cc',
         'application.cc',
@@ -60,6 +61,7 @@ def build(bld):
         'packet-socket-factory.h',
         'udp-socket.h',
         'udp-socket-factory.h',
+        'tcp-socket.h',
         'tcp-socket-factory.h',
         'ipv4.h',
         'application.h',