diff --git a/arch/arm/mach-at91/board-gsia18s.c b/arch/arm/mach-at91/board-gsia18s.c
index 842add7acd6669d3bccd8471bc55f7084d35c904..23a2fa17ab296842937877a2614042442ef94416 100644
--- a/arch/arm/mach-at91/board-gsia18s.c
+++ b/arch/arm/mach-at91/board-gsia18s.c
@@ -31,13 +31,13 @@
 #include <asm/mach/arch.h>
 
 #include <mach/at91sam9_smc.h>
-#include <mach/gsia18s.h>
-#include <mach/stamp9g20.h>
 
 #include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"
+#include "gsia18s.h"
+#include "stamp9g20.h"
 
 static void __init gsia18s_init_early(void)
 {
diff --git a/arch/arm/mach-at91/board-pcontrol-g20.c b/arch/arm/mach-at91/board-pcontrol-g20.c
index 977fa7860569e7716853dad4a735175080609d8d..0299554495ddb4b2a8cce40aead3827adc0d32d2 100644
--- a/arch/arm/mach-at91/board-pcontrol-g20.c
+++ b/arch/arm/mach-at91/board-pcontrol-g20.c
@@ -30,12 +30,12 @@
 #include <asm/mach/arch.h>
 
 #include <mach/at91sam9_smc.h>
-#include <mach/stamp9g20.h>
 
 #include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"
+#include "stamp9g20.h"
 
 
 static void __init pcontrol_g20_init_early(void)
diff --git a/arch/arm/mach-at91/include/mach/gsia18s.h b/arch/arm/mach-at91/gsia18s.h
similarity index 100%
rename from arch/arm/mach-at91/include/mach/gsia18s.h
rename to arch/arm/mach-at91/gsia18s.h
diff --git a/arch/arm/mach-at91/include/mach/stamp9g20.h b/arch/arm/mach-at91/stamp9g20.h
similarity index 100%
rename from arch/arm/mach-at91/include/mach/stamp9g20.h
rename to arch/arm/mach-at91/stamp9g20.h