diff --git a/core/include/rb2/telegram.h b/core/include/rb2/telegram.h
index 217317d..ff562ca 100644
--- a/core/include/rb2/telegram.h
+++ b/core/include/rb2/telegram.h
@@ -39,11 +39,14 @@ struct	_rb2_request;
 struct	_rb2_listed_telegram;
 
 typedef struct	_rb2_addr		RB2_ADDR;
+typedef struct	_rb2_addr		rb2_addr_t;
+
 typedef struct	_rb2_telegram	RB2_TELEGRAM;
+typedef struct	_rb2_telegram	rb2_telegram_t;
+
 typedef union	_rb2_flags		RB2_FLAGS;
 typedef struct	_rb2_request	RB2_REQUEST;
 
-typedef struct	_rb2_telegram	rb2_telegram_t;
 typedef struct	_rb2_telegram_buffer
 								rb2_telegram_buffer_t;
 
diff --git a/cpu/at90can128/Makefile b/cpu/at90can128/Makefile
index 6f348bc..40b9b59 100755
--- a/cpu/at90can128/Makefile
+++ b/cpu/at90can128/Makefile
@@ -1,2 +1 @@
-SUBS+=avr/core avr/can avr/usart/at90
-
+DEPENDS=../../core ../../can ../../usart/at90
diff --git a/cpu/at90can128/src/at90can_timer0.c b/cpu/at90can128/src/at90can_timer0.c
index 48a66e9..14073ed 100644
--- a/cpu/at90can128/src/at90can_timer0.c
+++ b/cpu/at90can128/src/at90can_timer0.c
@@ -1,4 +1,6 @@
 #include <avr/io.h>
+#include <sys/cpu.h>
+#include <sys/systick.h>
 
 #ifdef __AVR_ATmega32__