diff --git a/kernel/wr_pstats/wr_pstats.c b/kernel/wr_pstats/wr_pstats.c
index 9084b3560918f9987929f0865229090f5dc78660..1842c71ac5c6c90c8d805e7eb15a9771bff38262 100644
--- a/kernel/wr_pstats/wr_pstats.c
+++ b/kernel/wr_pstats/wr_pstats.c
@@ -29,6 +29,12 @@
 #include <linux/moduleparam.h>
 #include <linux/netdevice.h>
 
+/*
+ * Ugly trick to be able to use headers that have been moved out
+ * from mach/ directory
+ */
+#include <mach/../../at91_aic.h>
+
 #include "../wbgen-regs/pstats-regs.h"
 #include "wr_pstats.h"
 
diff --git a/kernel/wr_rtu/wr_rtu.c b/kernel/wr_rtu/wr_rtu.c
index 248a4ac632ec98f457f56b16d31a08e1fff1b105..5dd9d683c62e49c056f2bfda4e77f113ee528bd7 100644
--- a/kernel/wr_rtu/wr_rtu.c
+++ b/kernel/wr_rtu/wr_rtu.c
@@ -40,6 +40,12 @@
 #include <linux/spinlock.h>
 #include <linux/io.h>
 
+/*
+ * Ugly trick to be able to use headers that have been moved out
+ * from mach/ directory
+ */
+#include <mach/../../at91_aic.h>
+
 #include "../wbgen-regs/rtu-regs.h"
 #include "wr_rtu.h"
 
diff --git a/kernel/wr_vic/wr_vic.c b/kernel/wr_vic/wr_vic.c
index a9841b93157e153ea192f38b3a4847256f255a7a..b226e1a3e80aae4d97e1d8608311a39ae10afe24 100644
--- a/kernel/wr_vic/wr_vic.c
+++ b/kernel/wr_vic/wr_vic.c
@@ -19,6 +19,13 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <mach/at91sam9g45.h>
+/*
+ * Ugly trick to be able to use headers that have been moved out
+ * from mach/ directory
+ */
+#include <mach/../../at91_aic.h>
+
 #define DRV_NAME "wr_vic"
 #define PFX DRV_NAME ": "