diff --git a/src/bin/gdb/gdb/Jamfile b/src/bin/gdb/gdb/Jamfile
index 2699815a27..647582fbb3 100644
--- a/src/bin/gdb/gdb/Jamfile
+++ b/src/bin/gdb/gdb/Jamfile
@@ -261,8 +261,7 @@ BinCommand gdb : gdb.c :
 
 	libroot.so
 	libdebug.so
-	libbind.so
-	libsocket.so
+	libnetwork.so
 ;
 
 # build ADA lexer
diff --git a/src/bin/gdb/gdb/ser-tcp.c b/src/bin/gdb/gdb/ser-tcp.c
index a272f16f1c..201ba658d4 100644
--- a/src/bin/gdb/gdb/ser-tcp.c
+++ b/src/bin/gdb/gdb/ser-tcp.c
@@ -94,14 +94,14 @@ net_open (struct serial *scb, const char *name)
     }
 
   if (use_udp)
-    scb->fd = socket (PF_INET, SOCK_DGRAM, 0);
+    scb->fd = socket (AF_INET, SOCK_DGRAM, 0);
   else
-    scb->fd = socket (PF_INET, SOCK_STREAM, 0);
+    scb->fd = socket (AF_INET, SOCK_STREAM, 0);
 
   if (scb->fd < 0)
     return -1;
   
-  sockaddr.sin_family = PF_INET;
+  sockaddr.sin_family = AF_INET;
   sockaddr.sin_port = htons (port);
   memcpy (&sockaddr.sin_addr.s_addr, hostent->h_addr,
 	  sizeof (struct in_addr));