diff --git a/[refs] b/[refs]
index bcb3c5b1095f..598227f6480c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 878fa89f97954337d1dc41f0ccc3a8b5f89cfbc7
+refs/heads/master: f0166e5e3cdab66d5a31f796ce18e21fd3ce99dc
diff --git a/trunk/drivers/ieee802154/fakehard.c b/trunk/drivers/ieee802154/fakehard.c
index 9ec07e8552f2..8a52e6efa239 100644
--- a/trunk/drivers/ieee802154/fakehard.c
+++ b/trunk/drivers/ieee802154/fakehard.c
@@ -26,10 +26,10 @@
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
 
-#include <net/ieee802154/af_ieee802154.h>
-#include <net/ieee802154/netdevice.h>
-#include <net/ieee802154/mac_def.h>
-#include <net/ieee802154/nl802154.h>
+#include <net/af_ieee802154.h>
+#include <net/ieee802154_netdev.h>
+#include <net/ieee802154.h>
+#include <net/nl802154.h>
 
 /**
  * fake_get_pan_id - Retrieve the PAN ID of the device.
diff --git a/trunk/include/net/ieee802154/af_ieee802154.h b/trunk/include/net/af_ieee802154.h
similarity index 100%
rename from trunk/include/net/ieee802154/af_ieee802154.h
rename to trunk/include/net/af_ieee802154.h
diff --git a/trunk/include/net/ieee802154/mac_def.h b/trunk/include/net/ieee802154.h
similarity index 98%
rename from trunk/include/net/ieee802154/mac_def.h
rename to trunk/include/net/ieee802154.h
index 8cb684635650..d52685defb11 100644
--- a/trunk/include/net/ieee802154/mac_def.h
+++ b/trunk/include/net/ieee802154.h
@@ -23,8 +23,8 @@
  * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  */
 
-#ifndef IEEE802154_MAC_DEF_H
-#define IEEE802154_MAC_DEF_H
+#ifndef NET_IEEE802154_H
+#define NET_IEEE802154_H
 
 #define IEEE802154_FC_TYPE_BEACON	0x0	/* Frame is beacon */
 #define	IEEE802154_FC_TYPE_DATA		0x1	/* Frame is data */
diff --git a/trunk/include/net/ieee802154/netdevice.h b/trunk/include/net/ieee802154_netdev.h
similarity index 100%
rename from trunk/include/net/ieee802154/netdevice.h
rename to trunk/include/net/ieee802154_netdev.h
diff --git a/trunk/include/net/ieee802154/nl802154.h b/trunk/include/net/nl802154.h
similarity index 100%
rename from trunk/include/net/ieee802154/nl802154.h
rename to trunk/include/net/nl802154.h
diff --git a/trunk/net/ieee802154/af_ieee802154.c b/trunk/net/ieee802154/af_ieee802154.c
index 3bb6bdb1dac1..69c8d9207aa7 100644
--- a/trunk/net/ieee802154/af_ieee802154.c
+++ b/trunk/net/ieee802154/af_ieee802154.c
@@ -34,8 +34,8 @@
 #include <net/tcp_states.h>
 #include <net/route.h>
 
-#include <net/ieee802154/af_ieee802154.h>
-#include <net/ieee802154/netdevice.h>
+#include <net/af_ieee802154.h>
+#include <net/ieee802154_netdev.h>
 
 #include "af802154.h"
 
diff --git a/trunk/net/ieee802154/dgram.c b/trunk/net/ieee802154/dgram.c
index 14d39840dd62..53dd912d52b4 100644
--- a/trunk/net/ieee802154/dgram.c
+++ b/trunk/net/ieee802154/dgram.c
@@ -26,9 +26,9 @@
 #include <linux/if_arp.h>
 #include <linux/list.h>
 #include <net/sock.h>
-#include <net/ieee802154/af_ieee802154.h>
-#include <net/ieee802154/mac_def.h>
-#include <net/ieee802154/netdevice.h>
+#include <net/af_ieee802154.h>
+#include <net/ieee802154.h>
+#include <net/ieee802154_netdev.h>
 
 #include <asm/ioctls.h>
 
diff --git a/trunk/net/ieee802154/netlink.c b/trunk/net/ieee802154/netlink.c
index 27eda9fdf3c2..a615b9d13212 100644
--- a/trunk/net/ieee802154/netlink.c
+++ b/trunk/net/ieee802154/netlink.c
@@ -27,9 +27,9 @@
 #include <net/netlink.h>
 #include <net/genetlink.h>
 #include <linux/nl802154.h>
-#include <net/ieee802154/af_ieee802154.h>
-#include <net/ieee802154/nl802154.h>
-#include <net/ieee802154/netdevice.h>
+#include <net/af_ieee802154.h>
+#include <net/nl802154.h>
+#include <net/ieee802154_netdev.h>
 
 static unsigned int ieee802154_seq_num;
 
diff --git a/trunk/net/ieee802154/raw.c b/trunk/net/ieee802154/raw.c
index fca44d59f97e..ea8d1f15206e 100644
--- a/trunk/net/ieee802154/raw.c
+++ b/trunk/net/ieee802154/raw.c
@@ -26,7 +26,7 @@
 #include <linux/if_arp.h>
 #include <linux/list.h>
 #include <net/sock.h>
-#include <net/ieee802154/af_ieee802154.h>
+#include <net/af_ieee802154.h>
 
 #include "af802154.h"