diff --git a/library/GNUmakefile.68k b/library/GNUmakefile.68k
index 60aa5bf..0fd7b06 100644
--- a/library/GNUmakefile.68k
+++ b/library/GNUmakefile.68k
@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.68k,v 1.61 2005-06-18 07:23:16 obarthel Exp $
+# $Id: GNUmakefile.68k,v 1.62 2005-06-20 07:43:59 obarthel Exp $
 #
 # :ts=8
 #
@@ -483,6 +483,7 @@ UNIX_LIB = \
 	stdio_record_locking.o \
 	stdio_remove.o \
 	stdio_rename.o \
+	stdlib_main.o \
 	stdlib_mkdtemp.o \
 	stdlib_mkstemp.o \
 	stdlib_mktemp.o \
diff --git a/library/GNUmakefile.os4 b/library/GNUmakefile.os4
index c107b0c..7091ebf 100644
--- a/library/GNUmakefile.os4
+++ b/library/GNUmakefile.os4
@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.os4,v 1.67 2005-06-18 07:23:16 obarthel Exp $
+# $Id: GNUmakefile.os4,v 1.68 2005-06-20 07:43:59 obarthel Exp $
 #
 # :ts=8
 #
@@ -495,6 +495,7 @@ UNIX_LIB = \
 	stdio_record_locking.o \
 	stdio_remove.o \
 	stdio_rename.o \
+	stdlib_main.o \
 	stdlib_mkdtemp.o \
 	stdlib_mkstemp.o \
 	stdlib_mktemp.o \
diff --git a/library/socket_accept.c b/library/socket_accept.c
index ff278da..c9efb7b 100644
--- a/library/socket_accept.c
+++ b/library/socket_accept.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_accept.c,v 1.11 2005-04-24 08:46:37 obarthel Exp $
+ * $Id: socket_accept.c,v 1.12 2005-06-20 07:43:59 obarthel Exp $
  *
  * :ts=4
  *
@@ -48,7 +48,7 @@
 /****************************************************************************/
 
 int
-accept(int sockfd,struct sockaddr *cliaddr,int *addrlen)
+accept(int sockfd,struct sockaddr *cliaddr,socklen_t *addrlen)
 {
 	struct SignalSemaphore * lock = NULL;
 	struct fd * fd = NULL;
diff --git a/library/socket_connect.c b/library/socket_connect.c
index 9c91ae3..421cdd2 100644
--- a/library/socket_connect.c
+++ b/library/socket_connect.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_connect.c,v 1.5 2005-04-24 08:46:37 obarthel Exp $
+ * $Id: socket_connect.c,v 1.6 2005-06-20 07:43:59 obarthel Exp $
  *
  * :ts=4
  *
@@ -48,7 +48,7 @@
 /****************************************************************************/
 
 int
-connect(int sockfd,struct sockaddr *name,int namelen)
+connect(int sockfd,struct sockaddr *name,socklen_t namelen)
 {
 	struct fd * fd;
 	int result = ERROR;
diff --git a/library/socket_gethostbyaddr.c b/library/socket_gethostbyaddr.c
index e20c4b7..9ae9f41 100644
--- a/library/socket_gethostbyaddr.c
+++ b/library/socket_gethostbyaddr.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_gethostbyaddr.c,v 1.3 2005-02-03 16:56:15 obarthel Exp $
+ * $Id: socket_gethostbyaddr.c,v 1.4 2005-06-20 07:43:59 obarthel Exp $
  *
  * :ts=4
  *
@@ -48,7 +48,7 @@
 /****************************************************************************/
 
 struct hostent *
-gethostbyaddr(const char *addr, int len, int type)
+gethostbyaddr(const char *addr, socklen_t len, int type)
 {
 	struct hostent *result = NULL;
 
diff --git a/library/socket_getpeername.c b/library/socket_getpeername.c
index a593b24..1f6b4f5 100644
--- a/library/socket_getpeername.c
+++ b/library/socket_getpeername.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_getpeername.c,v 1.5 2005-04-24 08:46:37 obarthel Exp $
+ * $Id: socket_getpeername.c,v 1.6 2005-06-20 07:43:59 obarthel Exp $
  *
  * :ts=4
  *
@@ -48,7 +48,7 @@
 /****************************************************************************/
 
 int
-getpeername(int sockfd,struct sockaddr *name,int *namelen)
+getpeername(int sockfd,struct sockaddr *name,socklen_t *namelen)
 {
 	struct fd * fd;
 	int result = ERROR;
diff --git a/library/socket_getsockname.c b/library/socket_getsockname.c
index 68df1b5..7fc22b1 100644
--- a/library/socket_getsockname.c
+++ b/library/socket_getsockname.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_getsockname.c,v 1.5 2005-04-24 08:46:37 obarthel Exp $
+ * $Id: socket_getsockname.c,v 1.6 2005-06-20 07:43:59 obarthel Exp $
  *
  * :ts=4
  *
@@ -48,7 +48,7 @@
 /****************************************************************************/
 
 int
-getsockname(int sockfd,struct sockaddr *name,int *namelen)
+getsockname(int sockfd,struct sockaddr *name,socklen_t *namelen)
 {
 	struct fd * fd;
 	int result = ERROR;
diff --git a/library/socket_getsockopt.c b/library/socket_getsockopt.c
index 3c34a8d..202553e 100644
--- a/library/socket_getsockopt.c
+++ b/library/socket_getsockopt.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_getsockopt.c,v 1.5 2005-04-24 08:46:37 obarthel Exp $
+ * $Id: socket_getsockopt.c,v 1.6 2005-06-20 07:43:59 obarthel Exp $
  *
  * :ts=4
  *
@@ -48,7 +48,7 @@
 /****************************************************************************/
 
 int
-getsockopt(int sockfd,int level,int optname,void *optval,int *optlen)
+getsockopt(int sockfd,int level,int optname,void *optval,socklen_t *optlen)
 {
 	struct fd * fd;
 	int result = ERROR;
diff --git a/library/socket_recvfrom.c b/library/socket_recvfrom.c
index e262539..272291c 100644
--- a/library/socket_recvfrom.c
+++ b/library/socket_recvfrom.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_recvfrom.c,v 1.5 2005-04-24 08:46:37 obarthel Exp $
+ * $Id: socket_recvfrom.c,v 1.6 2005-06-20 07:43:59 obarthel Exp $
  *
  * :ts=4
  *
@@ -48,7 +48,7 @@
 /****************************************************************************/
 
 int
-recvfrom(int sockfd,void *buff,int len,int flags,struct sockaddr *from,int *fromlen)
+recvfrom(int sockfd,void *buff,int len,int flags,struct sockaddr *from,socklen_t *fromlen)
 {
 	struct fd * fd;
 	int result = ERROR;
diff --git a/library/socket_sendto.c b/library/socket_sendto.c
index 07dd303..06b504b 100644
--- a/library/socket_sendto.c
+++ b/library/socket_sendto.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_sendto.c,v 1.7 2005-04-24 08:46:37 obarthel Exp $
+ * $Id: socket_sendto.c,v 1.8 2005-06-20 07:43:59 obarthel Exp $
  *
  * :ts=4
  *
@@ -48,7 +48,7 @@
 /****************************************************************************/
 
 int
-sendto(int sockfd,const void *buff,int len,int flags,struct sockaddr *to,int tolen)
+sendto(int sockfd,const void *buff,int len,int flags,struct sockaddr *to,socklen_t tolen)
 {
 	struct fd * fd;
 	int result = ERROR;
diff --git a/library/socket_setsockopt.c b/library/socket_setsockopt.c
index efc238d..b822b8c 100644
--- a/library/socket_setsockopt.c
+++ b/library/socket_setsockopt.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_setsockopt.c,v 1.7 2005-04-24 08:46:37 obarthel Exp $
+ * $Id: socket_setsockopt.c,v 1.8 2005-06-20 07:43:59 obarthel Exp $
  *
  * :ts=4
  *
@@ -48,7 +48,7 @@
 /****************************************************************************/
 
 int
-setsockopt(int sockfd,int level,int optname,const void *optval,int optlen)
+setsockopt(int sockfd,int level,int optname,const void *optval,socklen_t optlen)
 {
 	struct fd * fd;
 	int result = ERROR;