diff --git a/[refs] b/[refs]
index ad4f292f3e76..dd4fb91c45ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18c413e27e1585358cedc22e450847e3240006ff
+refs/heads/master: b4b86416712d79a77cdc53756751b3b91fbb7a3d
diff --git a/trunk/arch/x86/mach-visws/setup_visws.c b/trunk/arch/x86/mach-visws/setup_visws.c
index bbc149f78a4b..e95e9499c8cd 100644
--- a/trunk/arch/x86/mach-visws/setup_visws.c
+++ b/trunk/arch/x86/mach-visws/setup_visws.c
@@ -8,6 +8,8 @@
 #include <linux/init.h>
 #include <linux/smp.h>
 
+#include <asm/visws/cobalt.h>
+#include <asm/visws/piix4.h>
 #include <asm/arch_hooks.h>
 #include <asm/fixmap.h>
 #include <asm/reboot.h>
@@ -18,8 +20,6 @@
 
 #include <mach_ipi.h>
 
-#include "cobalt.h"
-#include "piix4.h"
 #include "mach_apic.h"
 
 #include <linux/init.h>
diff --git a/trunk/arch/x86/mach-visws/traps.c b/trunk/arch/x86/mach-visws/traps.c
index 8a160ec147f7..e5e6492c2676 100644
--- a/trunk/arch/x86/mach-visws/traps.c
+++ b/trunk/arch/x86/mach-visws/traps.c
@@ -7,10 +7,10 @@
 #include <linux/pci_ids.h>
 
 #include <asm/io.h>
-#include <asm/arch_hooks.h>
 #include <asm/apic.h>
-#include "cobalt.h"
-#include "lithium.h"
+#include <asm/arch_hooks.h>
+#include <asm/visws/cobalt.h>
+#include <asm/visws/lithium.h>
 
 
 #define A01234 (LI_INTA_0 | LI_INTA_1 | LI_INTA_2 | LI_INTA_3 | LI_INTA_4)
diff --git a/trunk/arch/x86/mach-visws/visws_apic.c b/trunk/arch/x86/mach-visws/visws_apic.c
index d8b2cfd85d92..6c02c8d09932 100644
--- a/trunk/arch/x86/mach-visws/visws_apic.c
+++ b/trunk/arch/x86/mach-visws/visws_apic.c
@@ -22,8 +22,7 @@
 #include <asm/apic.h>
 #include <asm/i8259.h>
 #include <asm/irq_vectors.h>
-
-#include "cobalt.h"
+#include <asm/visws/cobalt.h>
 
 static DEFINE_SPINLOCK(cobalt_lock);
 
diff --git a/trunk/arch/x86/pci/visws.c b/trunk/arch/x86/pci/visws.c
index 9b883890c0b2..1a7bed492bb1 100644
--- a/trunk/arch/x86/pci/visws.c
+++ b/trunk/arch/x86/pci/visws.c
@@ -9,8 +9,8 @@
 #include <linux/init.h>
 
 #include <asm/setup.h>
-#include "cobalt.h"
-#include "lithium.h"
+#include <asm/visws/cobalt.h>
+#include <asm/visws/lithium.h>
 
 #include "pci.h"
 
diff --git a/trunk/include/asm-x86/mach-visws/cobalt.h b/trunk/include/asm-x86/visws/cobalt.h
similarity index 100%
rename from trunk/include/asm-x86/mach-visws/cobalt.h
rename to trunk/include/asm-x86/visws/cobalt.h
diff --git a/trunk/include/asm-x86/mach-visws/lithium.h b/trunk/include/asm-x86/visws/lithium.h
similarity index 100%
rename from trunk/include/asm-x86/mach-visws/lithium.h
rename to trunk/include/asm-x86/visws/lithium.h
diff --git a/trunk/include/asm-x86/mach-visws/piix4.h b/trunk/include/asm-x86/visws/piix4.h
similarity index 100%
rename from trunk/include/asm-x86/mach-visws/piix4.h
rename to trunk/include/asm-x86/visws/piix4.h