diff --git a/sys/include/net/gnrc/mac/types.h b/sys/include/net/gnrc/mac/types.h
index 6f0b3ead507fcdd794b7f1008d1a9dd426293533..dffcadb1433864bccb308d88545439661b684763 100644
--- a/sys/include/net/gnrc/mac/types.h
+++ b/sys/include/net/gnrc/mac/types.h
@@ -29,9 +29,9 @@
 #include <xtimer.h>
 #include <net/netdev2.h>
 #include <net/gnrc/netdev2.h>
-#include <net/gnrc/netif/hdr.h>
 #include <net/gnrc.h>
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/sys/include/net/gnrc/netdev2.h b/sys/include/net/gnrc/netdev2.h
index d879c5a6ee7091fca08c000c01fe165712df9f12..9221a83a1797dcc5c1f70461be5fae23b95ff43d 100644
--- a/sys/include/net/gnrc/netdev2.h
+++ b/sys/include/net/gnrc/netdev2.h
@@ -36,6 +36,7 @@
 #include "net/netdev2.h"
 #include "net/gnrc.h"
 #include "net/gnrc/mac/types.h"
+#include "net/ieee802154.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -106,7 +107,7 @@ typedef struct gnrc_netdev2 {
     /**
      * @brief device's l2 address
      */
-    uint8_t  l2_addr[GNRC_NETIF_HDR_L2ADDR_MAX_LEN];
+    uint8_t  l2_addr[IEEE802154_LONG_ADDRESS_LEN];
 
     /**
      * @brief device's l2 address length