diff -Naur -X exclude-files ac_clean/arch/um/drivers/chan_user.c ac/arch/um/drivers/chan_user.c
--- ac_clean/arch/um/drivers/chan_user.c	Thu May 10 15:54:55 2001
+++ ac/arch/um/drivers/chan_user.c	Sat May 12 20:25:38 2001
@@ -184,7 +184,8 @@
 	addr.sin_family = AF_INET;
 	addr.sin_port = htons(chan->data.sock.port);
 	addr.sin_addr.s_addr = htonl(INADDR_ANY);
-	if(bind(sock, &addr, sizeof(addr)) < 0)	return(-errno);
+	if(bind(sock, (struct sockaddr *) &addr, sizeof(addr)) < 0)
+		return(-errno);
 	if(listen(sock, 1) < 0)	return(-errno);
 	chan->data.sock.connected = 0;
 	chan->fd = sock;
diff -Naur -X exclude-files ac_clean/arch/um/drivers/umn_kern.c ac/arch/um/drivers/umn_kern.c
--- ac_clean/arch/um/drivers/umn_kern.c	Thu May 10 15:54:55 2001
+++ ac/arch/um/drivers/umn_kern.c	Sat May 12 20:26:05 2001
@@ -7,8 +7,7 @@
 #include "linux/netdevice.h"
 #include "linux/skbuff.h"
 #include "linux/if_arp.h"
-#include "linux/init.h"
-#include <linux/spinlock.h>
+#include "linux/spinlock.h"
 #include "umn.h"
 #include "user_util.h"
 #include "kern.h"
diff -Naur -X exclude-files ac_clean/arch/um/kernel/time.c ac/arch/um/kernel/time.c
--- ac_clean/arch/um/kernel/time.c	Sat May 12 20:01:09 2001
+++ ac/arch/um/kernel/time.c	Sat May 12 20:26:52 2001
@@ -3,22 +3,12 @@
  * Licensed under the GPL
  */
 
+#define _GNU_SOURCE /* to get timeradd and timersub */
+
 #include <stdio.h>
 #include <unistd.h>
 
-/* This mess is because timeradd and timersub are protected by __USE_GNU
- * on Debian systems
- */
-#ifndef __USE_GNU
-#define __REM_GNU
-#define __USE_GNU
-#include <sys/time.h>
-#endif
-#ifdef __REM_GNU
-#undef __USE_GNU
-#undef __REM_GNU
-#endif
-
+#include <time.h>
 #include <sys/time.h>
 #include <signal.h>
 #include <errno.h>
diff -Naur -X exclude-files ac_clean/arch/um/main.c ac/arch/um/main.c
--- ac_clean/arch/um/main.c	Thu May 10 15:54:55 2001
+++ ac/arch/um/main.c	Sat May 12 20:25:07 2001
@@ -9,9 +9,7 @@
 #include <termios.h>
 #include <string.h>
 #include <sys/resource.h>
-#include <linux/personality.h>
 #include "include/user_util.h"
-
 
 unsigned long stacksizelim;
 
diff -Naur -X exclude-files ac_clean/arch/um/ptproxy/ptrace.c ac/arch/um/ptproxy/ptrace.c
--- ac_clean/arch/um/ptproxy/ptrace.c	Thu May 10 15:54:55 2001
+++ ac/arch/um/ptproxy/ptrace.c	Sat May 12 20:27:21 2001
@@ -15,6 +15,8 @@
 #include <sys/ptrace.h>
 
 #include "ptproxy.h"
+#include "user_util.h"
+#include "debug.h"
 
 struct {
 	int op;