--- a/CHANGES.html	Thu Dec 16 21:00:18 2010 -0500
+++ b/CHANGES.html	Fri Dec 17 12:48:13 2010 -0500
@@ -84,13 +84,13 @@
 
 <li><b>Socket::GetSocketType ()</b>
 <p>This is analogous to getsockopt(SO_TYPE). ipv4-raw-socket, ipv6-raw-socket,
-  and packet-socket return SOCK_RAW. tcp-socket and nsc-tcp-socket return
-  SOCK_STREAM. udp-socket returns SOCK_DGRAM.</p></li>
+  and packet-socket return NS3_SOCK_RAW. tcp-socket and nsc-tcp-socket return
+  NS3_SOCK_STREAM. udp-socket returns NS3_SOCK_DGRAM.</p></li>
 
 <li><b>BulkSendApplication</b>
 <p>Sends data as fast as possible up to MaxBytes or unlimited if MaxBytes is 
 zero.  Think OnOff, but without the "off" and without the variable data rate. 
-This application only works with SOCK_STREAM and SOCK_SEQPACKET sockets, 
+This application only works with NS3_SOCK_STREAM and NS3_SOCK_SEQPACKET sockets, 
 for example TCP sockets and not UDP sockets. A helper class exists to 
 facilitate creating BulkSendApplications. The API for the helper class 
 is similar to existing application helper classes, for example, OnOff.

--- a/src/applications/bulk-send/bulk-send-application.cc	Thu Dec 16 21:00:18 2010 -0500
+++ b/src/applications/bulk-send/bulk-send-application.cc	Fri Dec 17 12:48:13 2010 -0500
@@ -117,9 +117,9 @@
     {
       m_socket = Socket::CreateSocket (GetNode (), m_tid);
 
-      // Fatal error if socket type is not SOCK_STREAM or SOCK_SEQPACKET
-      if (m_socket->GetSocketType () != Socket::SOCK_STREAM &&
-          m_socket->GetSocketType () != Socket::SOCK_SEQPACKET)
+      // Fatal error if socket type is not NS3_SOCK_STREAM or NS3_SOCK_SEQPACKET
+      if (m_socket->GetSocketType () != Socket::NS3_SOCK_STREAM &&
+          m_socket->GetSocketType () != Socket::NS3_SOCK_SEQPACKET)
         {
           NS_FATAL_ERROR ("Using BulkSend with an incompatible socket type. "
                           "BulkSend requires SOCK_STREAM or SOCK_SEQPACKET. "

--- a/src/internet-stack/ipv4-raw-socket-impl.cc	Thu Dec 16 21:00:18 2010 -0500
+++ b/src/internet-stack/ipv4-raw-socket-impl.cc	Fri Dec 17 12:48:13 2010 -0500
@@ -84,7 +84,7 @@
 enum Socket::SocketType
 Ipv4RawSocketImpl::GetSocketType (void) const
 {
-  return SOCK_RAW;
+  return NS3_SOCK_RAW;
 }
 
 Ptr<Node> 

--- a/src/internet-stack/ipv6-raw-socket-impl.cc	Thu Dec 16 21:00:18 2010 -0500
+++ b/src/internet-stack/ipv6-raw-socket-impl.cc	Fri Dec 17 12:48:13 2010 -0500
@@ -99,7 +99,7 @@
 
 enum Socket::SocketType Ipv6RawSocketImpl::GetSocketType () const
 {
-  return SOCK_RAW;
+  return NS3_SOCK_RAW;
 }
 
 int Ipv6RawSocketImpl::Bind (const Address& address)

--- a/src/internet-stack/ipv6-raw-socket-impl.h	Thu Dec 16 21:00:18 2010 -0500
+++ b/src/internet-stack/ipv6-raw-socket-impl.h	Fri Dec 17 12:48:13 2010 -0500
@@ -69,7 +69,7 @@
   virtual enum Socket::SocketErrno GetErrno () const;
 
   /**
-   * \brief Get socket type (SOCK_RAW)
+   * \brief Get socket type (NS3_SOCK_RAW)
    * \return socket type
    */
   virtual enum Socket::SocketType GetSocketType () const;

--- a/src/internet-stack/nsc-tcp-socket-impl.cc	Thu Dec 16 21:00:18 2010 -0500
+++ b/src/internet-stack/nsc-tcp-socket-impl.cc	Fri Dec 17 12:48:13 2010 -0500
@@ -174,7 +174,7 @@
 enum Socket::SocketType
 NscTcpSocketImpl::GetSocketType (void) const
 {
-  return SOCK_STREAM;
+  return NS3_SOCK_STREAM;
 }
 
 Ptr<Node>

--- a/src/internet-stack/tcp-socket-impl.cc	Thu Dec 16 21:00:18 2010 -0500
+++ b/src/internet-stack/tcp-socket-impl.cc	Fri Dec 17 12:48:13 2010 -0500
@@ -233,7 +233,7 @@
 enum Socket::SocketType
 TcpSocketImpl::GetSocketType (void) const
 {
-  return SOCK_STREAM;
+  return NS3_SOCK_STREAM;
 }
 
 Ptr<Node>

--- a/src/internet-stack/udp-socket-impl.cc	Thu Dec 16 21:00:18 2010 -0500
+++ b/src/internet-stack/udp-socket-impl.cc	Fri Dec 17 12:48:13 2010 -0500
@@ -119,7 +119,7 @@
 enum Socket::SocketType
 UdpSocketImpl::GetSocketType (void) const
 {
-  return SOCK_DGRAM;
+  return NS3_SOCK_DGRAM;
 }
 
 Ptr<Node>

--- a/src/node/packet-socket.cc	Thu Dec 16 21:00:18 2010 -0500
+++ b/src/node/packet-socket.cc	Fri Dec 17 12:48:13 2010 -0500
@@ -92,7 +92,7 @@
 enum Socket::SocketType
 PacketSocket::GetSocketType (void) const
 {
-  return SOCK_RAW;
+  return NS3_SOCK_RAW;
 }
 
 Ptr<Node>

--- a/src/node/socket.h	Thu Dec 16 21:00:18 2010 -0500
+++ b/src/node/socket.h	Fri Dec 17 12:48:13 2010 -0500
@@ -86,10 +86,10 @@
   };
 
   enum SocketType {
-    SOCK_STREAM,
-    SOCK_SEQPACKET,
-    SOCK_DGRAM,
-    SOCK_RAW
+    NS3_SOCK_STREAM,
+    NS3_SOCK_SEQPACKET,
+    NS3_SOCK_DGRAM,
+    NS3_SOCK_RAW
   };
 
   /**