diff -Naur -X exclude-files ac_cur/arch/um/drivers/ubd.c ac/arch/um/drivers/ubd.c
--- ac_cur/arch/um/drivers/ubd.c	Tue Oct 30 18:27:12 2001
+++ ac/arch/um/drivers/ubd.c	Tue Oct 30 19:29:29 2001
@@ -20,10 +20,13 @@
 #include "asm/segment.h"
 #include "asm/uaccess.h"
 #include "asm/irq.h"
+#include "asm/types.h"
 #include "user_util.h"
 #include "kern_util.h"
 #include "kern.h"
 #include "mconsole_kern.h"
+
+extern __u64 file_size(char *file);
 
 static int ubd_open(struct inode * inode, struct file * filp);
 static int ubd_release(struct inode * inode, struct file * file);
diff -Naur -X exclude-files ac_cur/arch/um/include/user_util.h ac/arch/um/include/user_util.h
--- ac_cur/arch/um/include/user_util.h	Tue Oct 30 18:27:12 2001
+++ ac/arch/um/include/user_util.h	Tue Oct 30 19:02:21 2001
@@ -6,7 +6,6 @@
 #ifndef __USER_UTIL_H__
 #define __USER_UTIL_H__
 
-#include "asm/types.h"
 #include "sysdep/ptrace.h"
 
 extern int grantpt(int __fd);
@@ -49,7 +48,6 @@
 		    char *x_out, char *p_out);
 extern void close_maps(void *fd);
 extern unsigned long get_brk(void);
-extern __u64 file_size(char *file);
 extern void stop(void);
 extern int proc_start_thread(unsigned long ip, unsigned long sp);
 extern void stack_protections(unsigned long address);
diff -Naur -X exclude-files ac_cur/arch/um/kernel/Makefile ac/arch/um/kernel/Makefile
--- ac_cur/arch/um/kernel/Makefile	Tue Oct 30 18:27:12 2001
+++ ac/arch/um/kernel/Makefile	Tue Oct 30 18:55:20 2001
@@ -6,7 +6,7 @@
 	sysrq.o sys_call_table.o time.o time_kern.o tlb.o trap_kern.o \
 	trap_user.o uaccess_user.o um_arch.o umid.o user_util.o
 
-OX_OBJS = ksyms.o process_kern.o signal_kern.o user_syms.o
+export-objs = ksyms.o process_kern.o signal_kern.o user_syms.o
 
 UNMAP_CFLAGS := $(patsubst -pg -DPROFILING,,$(USER_CFLAGS))
 UNMAP_CFLAGS := $(patsubst -fprofile-arcs -ftest-coverage,,$(UNMAP_CFLAGS))
@@ -64,12 +64,12 @@
 unmap_fin.o : unmap.o
 	ld -r -o $@ $< -lc -L/usr/lib
 
-$(OBJ): $(OBJS) $(OX_OBJS)
+$(OBJ): $(OBJS) $(export-objs)
 	rm -f $@
 	$(LD) $(LINKFLAGS) --start-group $^ --end-group -o $@
 
 clean:
-	rm -f $(OBJS) $(OX_OBJS)
+	rm -f $(OBJS) $(export-objs)
 
 modules:
 
diff -Naur -X exclude-files ac_cur/arch/um/kernel/um_arch.c ac/arch/um/kernel/um_arch.c
--- ac_cur/arch/um/kernel/um_arch.c	Tue Oct 30 18:27:12 2001
+++ ac/arch/um/kernel/um_arch.c	Tue Oct 30 19:26:03 2001
@@ -21,6 +21,7 @@
 #include "asm/elf.h"
 #include "asm/user.h"
 #include "asm/delay.h"
+#include "asm/types.h"
 #include "ubd_user.h"
 #include "asm/current.h"
 #include "user_util.h"
@@ -29,6 +30,8 @@
 #include "mprot.h"
 #include "mem_user.h"
 #include "umid.h"
+
+extern __u64 file_size(char *file);
 
 unsigned long _stext;
 
diff -Naur -X exclude-files ac_cur/arch/um/kernel/user_util.c ac/arch/um/kernel/user_util.c
--- ac_cur/arch/um/kernel/user_util.c	Tue Oct 30 18:27:12 2001
+++ ac/arch/um/kernel/user_util.c	Tue Oct 30 19:26:21 2001
@@ -13,6 +13,7 @@
 #include <sys/ptrace.h>
 #include <sys/mount.h>
 #include <sys/utsname.h>
+#include <asm/types.h>
 #include <ctype.h>
 #include <signal.h>
 #include <wait.h>
diff -Naur -X exclude-files ac_cur/arch/um/sys-i386/Makefile ac/arch/um/sys-i386/Makefile
--- ac_cur/arch/um/sys-i386/Makefile	Tue Oct 30 18:27:12 2001
+++ ac/arch/um/sys-i386/Makefile	Tue Oct 30 19:28:21 2001
@@ -2,13 +2,13 @@
 
 OBJS = checksum.o ldt.o old-checksum.o ptrace.o ptrace_user.o semaphore.o \
        sigcontext.o syscalls.o sysrq.o
-OX_OBJS = ksyms.o
+export-objs = ksyms.o
 
 SYMLINKS = semaphore.c old-checksum.c checksum.S
 
 all: $(OBJ)
 
-$(OBJ): $(OBJS) $(OX_OBJS)
+$(OBJ): $(OBJS) $(export-objs)
 	rm -f $@
 	$(LD) $(LINKFLAGS) --start-group $^ --end-group -o $@
 
@@ -30,7 +30,7 @@
 	-ln -s $(TOPDIR)/arch/i386/kernel/$@ $@
 
 clean:
-	rm -f $(OBJS) $(OX_OBJS)
+	rm -f $(OBJS) $(export-objs)
 
 fastdep: