diff -Naur -X exclude-files ac_clean/arch/um/Makefile ac/arch/um/Makefile
--- ac_clean/arch/um/Makefile	Thu May 10 15:54:55 2001
+++ ac/arch/um/Makefile	Sat May 12 18:40:52 2001
@@ -53,8 +53,8 @@
 		$(ARCH_DIR)/main.o vmlinux.o -L/usr/lib
 	rm -f $(ARCH_DIR)/link.ld
 
-USER_CFLAGS = $(patsubst -I%,,$(CFLAGS))
-USER_CFLAGS += -I../include
+USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))
+USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) -I../include
 
 $(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c
 	$(CC) -D__KERNEL__ $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff -Naur -X exclude-files ac_clean/arch/um/drivers/Makefile ac/arch/um/drivers/Makefile
--- ac_clean/arch/um/drivers/Makefile	Thu May 10 15:54:55 2001
+++ ac/arch/um/drivers/Makefile	Sat May 12 18:41:40 2001
@@ -10,9 +10,8 @@
 
 EXTRA_CFLAGS = -I../include
 
-USER_CFLAGS = $(patsubst -I%,,$(CFLAGS))
-USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS))
-USER_CFLAGS += $(EXTRA_CFLAGS)
+USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))
+USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(EXTRA_CFLAGS)
 
 CFLAGS_stdio_console.o := $(CFLAGS)
 CFLAGS_stdio_console_user.o := $(USER_CFLAGS)
diff -Naur -X exclude-files ac_clean/arch/um/fs/hostfs/Makefile ac/arch/um/fs/hostfs/Makefile
--- ac_clean/arch/um/fs/hostfs/Makefile	Thu May 10 15:54:55 2001
+++ ac/arch/um/fs/hostfs/Makefile	Sat May 12 18:42:20 2001
@@ -5,6 +5,7 @@
 
 EXTRA_CFLAGS += -I../../include
 USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))
+USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS))
 
 O_TARGET :=
 obj-y   := 
diff -Naur -X exclude-files ac_clean/arch/um/kernel/Makefile ac/arch/um/kernel/Makefile
--- ac_clean/arch/um/kernel/Makefile	Thu May 10 15:54:55 2001
+++ ac/arch/um/kernel/Makefile	Sat May 12 18:43:39 2001
@@ -11,7 +11,7 @@
 EXTRA_CFLAGS += -I../include
 
 USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))
-USER_CFLAGS += -I../include
+USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(EXTRA_CFLAGS)
 
 UNMAP_CFLAGS := $(patsubst -pg -DPROFILING,,$(USER_CFLAGS))
 UNMAP_CFLAGS := $(patsubst -fprofile-arcs -ftest-coverage,,$(UNMAP_CFLAGS))
@@ -30,32 +30,32 @@
 all: $(OBJ) unmap_fin.o
 
 exec_user.o: exec_user.c
-	$(CC) -D__KERNEL__ $(USER_CFLAGS) -c -o $@ $<
+	$(CC) $(USER_CFLAGS) -c -o $@ $<
 
 process.o: process.c
-	$(CC) -D__KERNEL__ $(USER_CFLAGS) -c -o $@ $<
+	$(CC) $(USER_CFLAGS) -c -o $@ $<
 
 syscall_user.o: syscall_user.c
-	$(CC) -D__KERNEL__ $(USER_CFLAGS) -c -o $@ $<
+	$(CC) $(USER_CFLAGS) -c -o $@ $<
 
 trap_user.o: trap_user.c
-	$(CC) -D__KERNEL__ $(USER_CFLAGS) -c -o $@ $<
+	$(CC) $(USER_CFLAGS) -c -o $@ $<
 
 signal_user.o: signal_user.c
-	$(CC) -D__KERNEL__ $(USER_CFLAGS) -c -o $@ $<
+	$(CC) $(USER_CFLAGS) -c -o $@ $<
 
 time.o: time.c
-	$(CC) -D__KERNEL__ $(USER_CFLAGS) -c -o $@ $<
+	$(CC) $(USER_CFLAGS) -c -o $@ $<
 
 user_util.o: user_util.c
-	$(CC) -D__KERNEL__ $(USER_CFLAGS) -c -o $@ $<
+	$(CC) $(USER_CFLAGS) -c -o $@ $<
 
 irq_user.o: irq_user.c
-	$(CC) -D__KERNEL__ $(USER_CFLAGS) -c -o $@ $<
+	$(CC) $(USER_CFLAGS) -c -o $@ $<
 
 unmap.o: unmap.c
 	echo $(UNMAP_CFLAGS)
-	$(CC) -D__KERNEL__ $(UNMAP_CFLAGS) -c -o $@ $<
+	$(CC) $(UNMAP_CFLAGS) -c -o $@ $<
 
 unmap_fin.o : unmap.o
 	ld -r -o $@ $< -lc -L/usr/lib
diff -Naur -X exclude-files ac_clean/arch/um/kernel/syscall_user.c ac/arch/um/kernel/syscall_user.c
--- ac_clean/arch/um/kernel/syscall_user.c	Thu May 10 15:54:55 2001
+++ ac/arch/um/kernel/syscall_user.c	Sat May 12 18:56:37 2001
@@ -28,6 +28,11 @@
 #include "user.h"
 #include "sysdep/ptrace.h"
 
+/* XXX Bogus */
+#define ERESTARTSYS	512
+#define ERESTARTNOINTR	513
+#define ERESTARTNOHAND	514
+
 struct {
 	int syscall;
 	int pid;
diff -Naur -X exclude-files ac_clean/arch/um/ptproxy/Makefile ac/arch/um/ptproxy/Makefile
--- ac_clean/arch/um/ptproxy/Makefile	Thu May 10 15:54:55 2001
+++ ac/arch/um/ptproxy/Makefile	Sat May 12 18:46:19 2001
@@ -2,9 +2,9 @@
 
 OBJS = proxy.o ptrace.o sysdep.o wait.o
 
-USER_CFLAGS = $(patsubst -I%,,$(CFLAGS))
+USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))
 USER_CFLAGS := $(patsubst -U$(SUBARCH),,$(USER_CFLAGS))
-USER_CFLAGS += -I../include 
+USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) -I../include
 
 all: $(LIB)
 
@@ -13,16 +13,16 @@
 	ar cr $@ $^
 
 proxy.o: proxy.c
-	$(CC) -D__KERNEL__ $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+	$(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
 
 ptrace.o: ptrace.c
-	$(CC) -D__KERNEL__ $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+	$(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
 
 sysdep.o: sysdep.c
-	$(CC) -D__KERNEL__ $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+	$(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
 
 wait.o: wait.c
-	$(CC) -D__KERNEL__ $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+	$(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
 
 clean:
 	rm -f *.o core child ptproxy
diff -Naur -X exclude-files ac_clean/arch/um/sys-i386/Makefile ac/arch/um/sys-i386/Makefile
--- ac_clean/arch/um/sys-i386/Makefile	Thu May 10 15:54:55 2001
+++ ac/arch/um/sys-i386/Makefile	Sat May 12 18:48:22 2001
@@ -3,10 +3,10 @@
 OBJS = checksum.o ldt.o old-checksum.o ptrace.o semaphore.o sigcontext.o
 OX_OBJS = ksyms.o
 
-USER_CFLAGS = $(patsubst -I%,,$(CFLAGS))
-USER_CFLAGS += -I../include
+EXTRA_CFLAGS = -I../include
 
-CFLAGS += -I../include
+USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))
+USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(EXTRA_CFLAGS)
 
 SYMLINKS = semaphore.c old-checksum.c checksum.S
 
@@ -17,10 +17,10 @@
 	$(LD) $(LINKFLAGS) --start-group $^ --end-group -o $@
 
 sigcontext.o: sigcontext.c
-	$(CC) -D__KERNEL__ $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+	$(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
 
 ldt.o: ldt.c
-	$(CC) -D__KERNEL__ $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+	$(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
 
 checksum.S old-checksum.c: 
 	-rm -f $@