diff --git a/ieee802154/common/ieee802154_addrparse.c b/ieee802154/common/ieee802154_addrparse.c
index 457209ef8..cfd50e80b 100644
--- a/ieee802154/common/ieee802154_addrparse.c
+++ b/ieee802154/common/ieee802154_addrparse.c
@@ -41,7 +41,8 @@
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
-#include <nuttx/wireless/ieee802154/ieee802154.h>
+
+#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
 #include <nuttx/wireless/ieee802154/ieee802154_mac.h>
 #include "ieee802154/ieee802154.h"
 
@@ -102,7 +103,7 @@ int ieee802154_addrparse(FAR struct ieee802154_packet_s *packet,
       {
         /* If PANID compression, src PAN ID is same as dest */
       
-        if(frame_ctrl & IEEE802154_FRAMECTRL_INTRA)
+        if(frame_ctrl & IEEE802154_FRAMECTRL_PANIDCOMP)
           {
             src->ia_panid = dest->ia_panid;
           }
diff --git a/ieee802154/common/ieee802154_addrstore.c b/ieee802154/common/ieee802154_addrstore.c
index de29df535..671f039c0 100644
--- a/ieee802154/common/ieee802154_addrstore.c
+++ b/ieee802154/common/ieee802154_addrstore.c
@@ -41,7 +41,8 @@
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
-#include <nuttx/wireless/ieee802154/ieee802154.h>
+
+#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
 #include <nuttx/wireless/ieee802154/ieee802154_mac.h>
 #include "ieee802154/ieee802154.h"
 
@@ -102,7 +103,7 @@ int ieee802154_addrstore(FAR struct ieee802154_packet_s *packet,
 
   /* Clear the PAN ID Compression Field */
 
-  frame_ctrl &= ~IEEE802154_FRAMECTRL_INTRA;
+  frame_ctrl &= ~IEEE802154_FRAMECTRL_PANIDCOMP;
 
   if( (dest != NULL && dest->ia_mode != IEEE802154_ADDRMODE_NONE) &&
       (src != NULL && src->ia_mode != IEEE802154_ADDRMODE_NONE) )
@@ -111,7 +112,7 @@ int ieee802154_addrstore(FAR struct ieee802154_packet_s *packet,
 
       if( dest->ia_panid == src->ia_panid)
         {
-          frame_ctrl |= IEEE802154_FRAMECTRL_INTRA;
+          frame_ctrl |= IEEE802154_FRAMECTRL_PANIDCOMP;
         }
     }
 
@@ -131,7 +132,7 @@ int ieee802154_addrstore(FAR struct ieee802154_packet_s *packet,
     {
       /* Add src pan id if it was not compressed before */
 
-      if(!(frame_ctrl & IEEE802154_FRAMECTRL_INTRA))
+      if(!(frame_ctrl & IEEE802154_FRAMECTRL_PANIDCOMP))
         {
           memcpy(packet->data+index, &src->ia_panid, 2);
           index += 2; /*skip src pan id*/
diff --git a/ieee802154/common/ieee802154_addrtostr.c b/ieee802154/common/ieee802154_addrtostr.c
index fa4686a71..bd2e8c998 100644
--- a/ieee802154/common/ieee802154_addrtostr.c
+++ b/ieee802154/common/ieee802154_addrtostr.c
@@ -40,7 +40,8 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <nuttx/wireless/ieee802154/ieee802154.h>
+
+#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
 #include "ieee802154/ieee802154.h"
 
 /****************************************************************************
diff --git a/ieee802154/common/ieee802154_getcca.c b/ieee802154/common/ieee802154_getcca.c
index 3d2ea4fc8..a006c3d64 100644
--- a/ieee802154/common/ieee802154_getcca.c
+++ b/ieee802154/common/ieee802154_getcca.c
@@ -42,7 +42,7 @@
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/wireless/ieee802154/ieee802154.h>
+
 #include <nuttx/wireless/ieee802154/ieee802154_radio.h>
 #include "ieee802154/ieee802154.h"
 
diff --git a/ieee802154/common/ieee802154_getchan.c b/ieee802154/common/ieee802154_getchan.c
index 55f24dcc4..c829ceeb1 100644
--- a/ieee802154/common/ieee802154_getchan.c
+++ b/ieee802154/common/ieee802154_getchan.c
@@ -42,7 +42,7 @@
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/wireless/ieee802154/ieee802154.h>
+
 #include <nuttx/wireless/ieee802154/ieee802154_radio.h>
 #include "ieee802154/ieee802154.h"
 
@@ -52,7 +52,7 @@
 
 int ieee802154_getchan(int fd, FAR uint8_t *chan)
 {
-  int ret = ioctl(fd, PHY802154IOC_GET_CHAN, (unsigned long)chan );
+  int ret = ioctl(fd, PHY802154IOC_GET_CHAN, (unsigned long)chan);
   if (ret < 0)
     {
       printf("PHY802154IOC_GET_CHAN failed\n");
diff --git a/ieee802154/common/ieee802154_setcca.c b/ieee802154/common/ieee802154_setcca.c
index d96b88119..50457ac3b 100644
--- a/ieee802154/common/ieee802154_setcca.c
+++ b/ieee802154/common/ieee802154_setcca.c
@@ -42,7 +42,7 @@
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/wireless/ieee802154/ieee802154.h>
+
 #include <nuttx/wireless/ieee802154/ieee802154_radio.h>
 #include "ieee802154/ieee802154.h"
 
diff --git a/ieee802154/coord/coord_main.c b/ieee802154/coord/coord_main.c
index 33a3cce04..e3e8c7d32 100644
--- a/ieee802154/coord/coord_main.c
+++ b/ieee802154/coord/coord_main.c
@@ -68,7 +68,7 @@
 #include <errno.h>
 #include <signal.h>
 
-#include <nuttx/wireless/ieee802154/ieee802154.h>
+#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
 #include <nuttx/wireless/ieee802154/ieee802154_mac.h>
 
 #include "ieee802154/ieee802154.h"
diff --git a/ieee802154/i8sak/i8sak_main.c b/ieee802154/i8sak/i8sak_main.c
index 0de1f0c15..679d16f4c 100644
--- a/ieee802154/i8sak/i8sak_main.c
+++ b/ieee802154/i8sak/i8sak_main.c
@@ -59,7 +59,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/wireless/ieee802154/ieee802154.h>
+
 #include <nuttx/wireless/ieee802154/ieee802154_radio.h>
 #include <nuttx/wireless/ieee802154/ieee802154_mac.h>
 #include "ieee802154/ieee802154.h"
diff --git a/include/ieee802154/ieee802154.h b/include/ieee802154/ieee802154.h
index 0fceb7430..99a39cccd 100644
--- a/include/ieee802154/ieee802154.h
+++ b/include/ieee802154/ieee802154.h
@@ -38,8 +38,9 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <nuttx/wireless/ieee802154/ieee802154.h>
+
 #include <nuttx/wireless/ieee802154/ieee802154_radio.h>
+#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
 
 int ieee802154_setchan   (int fd, uint8_t chan);
 int ieee802154_getchan   (int fd, FAR uint8_t *chan);