--- ./arch/um/include/um_uaccess.h.fix	2004-02-05 16:45:10.000000000 +0100
+++ ./arch/um/include/um_uaccess.h	2004-02-08 17:36:00.000000000 +0100
@@ -10,11 +10,11 @@
 #include "choose-mode.h"
 
 #ifdef CONFIG_MODE_TT
-#include "../kernel/tt/include/uaccess.h"
+#include "uaccess-tt.h"
 #endif
 
 #ifdef CONFIG_MODE_SKAS
-#include "../kernel/skas/include/uaccess.h"
+#include "uaccess-skas.h"
 #endif
 
 #define access_ok(type, addr, size) \
--- ./arch/um/include/mode_kern.h.fix	2003-12-20 17:20:03.000000000 +0100
+++ ./arch/um/include/mode_kern.h	2004-02-08 17:36:00.000000000 +0100
@@ -9,11 +9,11 @@
 #include "linux/config.h"
 
 #ifdef CONFIG_MODE_TT
-#include "../kernel/tt/include/mode_kern.h"
+#include "mode_kern-tt.h"
 #endif
 
 #ifdef CONFIG_MODE_SKAS
-#include "../kernel/skas/include/mode_kern.h"
+#include "mode_kern-skas.h"
 #endif
 
 #endif
--- ./arch/um/include/mode.h.fix	2003-12-20 17:40:55.000000000 +0100
+++ ./arch/um/include/mode.h	2004-02-08 17:36:00.000000000 +0100
@@ -9,11 +9,11 @@
 #include "uml-config.h"
 
 #ifdef UML_CONFIG_MODE_TT
-#include "../kernel/tt/include/mode.h"
+#include "mode-tt.h"
 #endif
 
 #ifdef UML_CONFIG_MODE_SKAS
-#include "../kernel/skas/include/mode.h"
+#include "mode-skas.h"
 #endif
 
 #endif
--- ./arch/um/include/um_mmu.h.fix	2003-12-20 17:20:03.000000000 +0100
+++ ./arch/um/include/um_mmu.h	2004-02-08 17:36:00.000000000 +0100
@@ -10,11 +10,11 @@
 #include "choose-mode.h"
 
 #ifdef CONFIG_MODE_TT
-#include "../kernel/tt/include/mmu.h"
+#include "mmu-tt.h"
 #endif
 
 #ifdef CONFIG_MODE_SKAS
-#include "../kernel/skas/include/mmu.h"
+#include "mmu-skas.h"
 #endif
 
 typedef union {
--- ./arch/um/kernel/skas/exec_kern.c.fix	2003-12-20 17:20:03.000000000 +0100
+++ ./arch/um/kernel/skas/exec_kern.c	2004-02-08 18:08:57.000000000 +0100
@@ -12,7 +12,7 @@
 #include "asm/mmu_context.h"
 #include "tlb.h"
 #include "skas.h"
-#include "mmu.h"
+#include "um_mmu.h"
 #include "os.h"
 
 void flush_thread_skas(void)