diff --git a/drivers/at86rf231/at86rf231.c b/drivers/at86rf231/at86rf231.c
index dfd3ede56a..32bb3edf33 100644
--- a/drivers/at86rf231/at86rf231.c
+++ b/drivers/at86rf231/at86rf231.c
@@ -90,7 +90,7 @@ void at86rf231_rx_irq(void)
     at86rf231_rx_handler();
 }
 
-uint16_t at86rf231_set_address(uint16_t address)
+radio_address_t at86rf231_set_address(radio_address_t address)
 {
     radio_address = address;
 
@@ -100,7 +100,7 @@ uint16_t at86rf231_set_address(uint16_t address)
     return radio_address;
 }
 
-uint16_t at86rf231_get_address(void)
+radio_address_t at86rf231_get_address(void)
 {
     return radio_address;
 }
diff --git a/drivers/include/at86rf231.h b/drivers/include/at86rf231.h
index 263469b4b2..ee01c47778 100644
--- a/drivers/include/at86rf231.h
+++ b/drivers/include/at86rf231.h
@@ -4,6 +4,8 @@
 #include <stdio.h>
 #include <stdint.h>
 
+#include "radio/types.h"
+
 #include "ieee802154_frame.h"
 
 #include "at86rf231_arch.h"
@@ -42,8 +44,8 @@ uint8_t at86rf231_get_channel(void);
 uint16_t at86rf231_set_pan(uint16_t pan);
 uint16_t at86rf231_get_pan(void);
 
-uint16_t at86rf231_set_address(uint16_t address);
-uint16_t at86rf231_get_address(void);
+radio_address_t at86rf231_set_address(radio_address_t address);
+radio_address_t at86rf231_get_address(void);
 uint64_t at86rf231_get_address_long(void);
 uint64_t at86rf231_set_address_long(uint64_t address);