diff --git a/arch/mips/mach-au1x00/au1x00_eth.c b/arch/mips/mach-au1x00/au1x00_eth.c
index 3f9f91eb0408e9426c5a82492570a55812d75e10..921686081ff2c5b80aba9b5b35f7db0e92df7e1c 100644
--- a/arch/mips/mach-au1x00/au1x00_eth.c
+++ b/arch/mips/mach-au1x00/au1x00_eth.c
@@ -43,7 +43,7 @@
 #include <net.h>
 #include <command.h>
 #include <asm/io.h>
-#include <asm/au1x00.h>
+#include <mach/au1x00.h>
 
 #if defined(CONFIG_CMD_MII)
 #include <miiphy.h>
diff --git a/arch/mips/mach-au1x00/au1x00_serial.c b/arch/mips/mach-au1x00/au1x00_serial.c
index 046350826a90c270d72452ab4f0cca4901d67219..47845049bb9cafc9f4abec163e68a04ee128b34b 100644
--- a/arch/mips/mach-au1x00/au1x00_serial.c
+++ b/arch/mips/mach-au1x00/au1x00_serial.c
@@ -11,7 +11,7 @@
 
 #include <config.h>
 #include <common.h>
-#include <asm/au1x00.h>
+#include <mach/au1x00.h>
 #include <serial.h>
 #include <linux/compiler.h>
 
diff --git a/arch/mips/mach-au1x00/au1x00_usb_ohci.c b/arch/mips/mach-au1x00/au1x00_usb_ohci.c
index 74bdb773032f10bac9a19d8d649f628436a919b7..42484e57121fbf1e84da8299d73b9c35e764b873 100644
--- a/arch/mips/mach-au1x00/au1x00_usb_ohci.c
+++ b/arch/mips/mach-au1x00/au1x00_usb_ohci.c
@@ -23,7 +23,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <asm/io.h>
-#include <asm/au1x00.h>
+#include <mach/au1x00.h>
 #include <usb.h>
 #include "au1x00_usb_ohci.h"
 
diff --git a/arch/mips/include/asm/au1x00.h b/arch/mips/mach-au1x00/include/mach/au1x00.h
similarity index 100%
rename from arch/mips/include/asm/au1x00.h
rename to arch/mips/mach-au1x00/include/mach/au1x00.h
diff --git a/board/dbau1x00/dbau1x00.c b/board/dbau1x00/dbau1x00.c
index bd20f6e4b0d691d2eea06e18cef44008c6639807..75e6f0ef5adeb6a82d97ffc204eb6aac11181dc7 100644
--- a/board/dbau1x00/dbau1x00.c
+++ b/board/dbau1x00/dbau1x00.c
@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <asm/au1x00.h>
+#include <mach/au1x00.h>
 #include <asm/mipsregs.h>
 #include <asm/io.h>
 
diff --git a/board/dbau1x00/lowlevel_init.S b/board/dbau1x00/lowlevel_init.S
index 842fb76e5873e768d0a11b518ecb0aa3a4cacf8a..409f8ee47701a3efe710cb190561deb13f95cf2c 100644
--- a/board/dbau1x00/lowlevel_init.S
+++ b/board/dbau1x00/lowlevel_init.S
@@ -1,8 +1,8 @@
 /* Memory sub-system initialization code */
 
 #include <config.h>
+#include <mach/au1x00.h>
 #include <asm/regdef.h>
-#include <asm/au1x00.h>
 #include <asm/mipsregs.h>
 
 #define AU1500_SYS_ADDR		0xB1900000
diff --git a/board/pb1x00/lowlevel_init.S b/board/pb1x00/lowlevel_init.S
index b145e438f07fac9d437c5aba01af07ccd86a7e9a..98d9536a7d70abb2fe10bc51dedd6713af69f87d 100644
--- a/board/pb1x00/lowlevel_init.S
+++ b/board/pb1x00/lowlevel_init.S
@@ -1,8 +1,8 @@
 /* Memory sub-system initialization code */
 
 #include <config.h>
+#include <mach/au1x00.h>
 #include <asm/regdef.h>
-#include <asm/au1x00.h>
 #include <asm/mipsregs.h>
 
 #define AU1500_SYS_ADDR		0xB1900000
diff --git a/board/pb1x00/pb1x00.c b/board/pb1x00/pb1x00.c
index 34814c47cb8ce3936a0d425b96abef42756ed4b8..eb92914a7986ef014c03896e5bcfbb2bc40ae495 100644
--- a/board/pb1x00/pb1x00.c
+++ b/board/pb1x00/pb1x00.c
@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <asm/au1x00.h>
+#include <mach/au1x00.h>
 #include <asm/mipsregs.h>
 #include <asm/io.h>