diff --git a/library/GNUmakefile.os4 b/library/GNUmakefile.os4
index 447e23e..c154c13 100644
--- a/library/GNUmakefile.os4
+++ b/library/GNUmakefile.os4
@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.os4,v 1.75 2005-10-09 12:32:18 obarthel Exp $
+# $Id: GNUmakefile.os4,v 1.76 2005-10-11 09:28:29 obarthel Exp $
 #
 # :ts=8
 #
@@ -54,41 +54,39 @@ endif
 # General build rules for all object files and the individual libraries
 %.o : %.c
 	@echo "Compiling $<"
-	@$(CC) -c $(CFLAGS) $<
+	@$(CC) -c $(CFLAGS) $< 2>&1 | tee -a compiler.log
 
 $(LIBC_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):c]"
-	@$(CC) -o $(LIBC_OBJS)/$*.o -c $(CFLAGS) $<
+	@$(CC) -o $(LIBC_OBJS)/$*.o -c $(CFLAGS) $< 2>&1 | tee -a compiler.log
 
 $(LIBUNIX_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):unix]"
-	@$(CC) -o $(LIBUNIX_OBJS)/$*.o -c $(CFLAGS) -DUNIX_PATH_SEMANTICS $<
+	@$(CC) -o $(LIBUNIX_OBJS)/$*.o -c $(CFLAGS) -DUNIX_PATH_SEMANTICS $< 2>&1 | tee -a compiler.log
 
 $(LIBM_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):m]"
-	@$(CC) -o $(LIBM_OBJS)/$*.o -c $(CFLAGS) $(FLOAT_TYPE) $<
+	@$(CC) -o $(LIBM_OBJS)/$*.o -c $(CFLAGS) $(FLOAT_TYPE) $< 2>&1 | tee -a compiler.log
 
 $(LIBNET_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):net]"
-	@$(CC) -o $(LIBNET_OBJS)/$*.o -c $(CFLAGS) -I$(NET_INCLUDE) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT $<
+	@$(CC) -o $(LIBNET_OBJS)/$*.o -c $(CFLAGS) -I$(NET_INCLUDE) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT $< 2>&1 | tee -a compiler.log
 
 $(LIBDEBUG_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):debug]"
-	@$(CC) -o $(LIBDEBUG_OBJS)/$*.o -c $(CFLAGS) $<
+	@$(CC) -o $(LIBDEBUG_OBJS)/$*.o -c $(CFLAGS) $< 2>&1 | tee -a compiler.log
 
 $(LIBAMIGA_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):amiga]"
-	@$(CC) -o $(LIBAMIGA_OBJS)/$*.o -c $(CFLAGS) $<
+	@$(CC) -o $(LIBAMIGA_OBJS)/$*.o -c $(CFLAGS) $< 2>&1 | tee -a compiler.log
 
 $(LIBPROFILE_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):profile]"
-	@$(CC) -o $(LIBPROFILE_OBJS)/$*.o  -c $(CFLAGS) $<
+	@$(CC) -o $(LIBPROFILE_OBJS)/$*.o  -c $(CFLAGS) $< 2>&1 | tee -a compiler.log
 
 $(LIBPROFILE_OBJS)/%.o : %.S
 	@echo "Assembling $< [$(TYPE):profile]"
-	@$(CC) -o $(LIBPROFILE_OBJS)/$*.o -Wa,-mregnames -c $(CFLAGS) $<
-
-
+	@$(CC) -o $(LIBPROFILE_OBJS)/$*.o -Wa,-mregnames -c $(CFLAGS) $< 2>&1 | tee -a compiler.log
 
 ##############################################################################
 
@@ -1234,4 +1232,3 @@ baserel/crtbegin.o : crtbegin.c
 baserel/crtend.o : crtend.c
 	@echo "Assembling $<"
 	@$(CC) -o baserel/crtend.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -mbaserel -DBASEREL_DATA crtend.c
-
diff --git a/library/crt0.S b/library/crt0.S
index e8ae5c8..2cff0b6 100644
--- a/library/crt0.S
+++ b/library/crt0.S
@@ -1,12 +1,12 @@
 //
-//	$Id: crt0.S,v 1.5 2005-08-26 12:39:33 obarthel Exp $
+//	$Id: crt0.S,v 1.6 2005-10-11 09:28:29 obarthel Exp $
 //
 //	:ts=4
 //
 
 	.text
 
-	.globl  main	| This enforces linkage against the main() function
+	.globl  main	/* This enforces linkage against the main() function */
 	.globl  _main
 	.globl  _start
 
diff --git a/library/include/sys/socket.h b/library/include/sys/socket.h
index d14999c..ad8b12e 100644
--- a/library/include/sys/socket.h
+++ b/library/include/sys/socket.h
@@ -1,5 +1,5 @@
 /*
- * $Id: socket.h,v 1.1 2005-10-09 12:32:18 obarthel Exp $
+ * $Id: socket.h,v 1.2 2005-10-11 09:28:29 obarthel Exp $
  *
  * :ts=4
  *
@@ -52,7 +52,7 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif #endif /* __cplusplus */
+#endif /* __cplusplus */
 
 /****************************************************************************/
 
diff --git a/library/termios_tcsetattr.c b/library/termios_tcsetattr.c
index f482453..61dbad8 100755
--- a/library/termios_tcsetattr.c
+++ b/library/termios_tcsetattr.c
@@ -1,5 +1,5 @@
 /*
- * $Id: termios_tcsetattr.c,v 1.2 2005-07-06 18:48:53 obarthel Exp $
+ * $Id: termios_tcsetattr.c,v 1.3 2005-10-11 09:28:29 obarthel Exp $
  *
  * :ts=4
  *
@@ -135,7 +135,7 @@ int
 tcsetattr(int file_descriptor,int how,struct termios *tios)
 {
 	int result = ERROR;
-	struct fd *fd;
+	struct fd *fd = NULL;
 	struct termios new_tios;
 	int type;
 
diff --git a/library/uio_readv.c b/library/uio_readv.c
index 87627d3..44c0966 100644
--- a/library/uio_readv.c
+++ b/library/uio_readv.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uio_readv.c,v 1.4 2005-07-06 18:48:53 obarthel Exp $
+ * $Id: uio_readv.c,v 1.5 2005-10-11 09:28:29 obarthel Exp $
  *
  * :ts=4
  *
@@ -55,7 +55,7 @@ readv(int file_descriptor,const struct iovec *iov,int vec_count)
 	ssize_t total_num_bytes_read;
 	ssize_t part_num_bytes_read;
 	ssize_t num_bytes_read;
-	struct fd * fd;
+	struct fd * fd = NULL;
 	int i;
 
 	ENTER();