*/
#include "timer_at91.h"
-#include "at91sam7s.h"
-#include "sysirq.h"
+#include <io/arm.h>
+#include "sysirq_at91.h"
#include <cfg/macros.h> // BV()
#include <cfg/module.h>
-#include <cfg/cpu.h>
+#include <cpu/irq.h>
+#include <cpu/types.h>
/** HW dependent timer initialization */