diff --git a/apps/collect-view/collect-view.h b/apps/collect-view/collect-view.h
index 259fec370..a647ab826 100644
--- a/apps/collect-view/collect-view.h
+++ b/apps/collect-view/collect-view.h
@@ -2,7 +2,7 @@
 #define COLLECT_VIEW_H
 
 #include "contiki-conf.h"
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 #include "net/rime/collect.h"
 
 struct collect_view_data_msg {
diff --git a/core/net/Makefile.core-net b/core/net/Makefile.core-net
index 2f33a84b7..508bd490f 100644
--- a/core/net/Makefile.core-net
+++ b/core/net/Makefile.core-net
@@ -1,4 +1,4 @@
-core-net_src = netstack.c  packetbuf.c  packetqueue.c	queuebuf.c nbr-table.c
+core-net_src = netstack.c  packetbuf.c  packetqueue.c	queuebuf.c nbr-table.c rimeaddr.c
 
 MODULES += core/net/mac
 include $(CONTIKI)/core/net/mac/Makefile.core-net-mac
diff --git a/core/net/ipv6/uip-ds6-nbr.c b/core/net/ipv6/uip-ds6-nbr.c
index 1e2027fa9..fb03e3c12 100644
--- a/core/net/ipv6/uip-ds6-nbr.c
+++ b/core/net/ipv6/uip-ds6-nbr.c
@@ -47,7 +47,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include "lib/list.h"
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 #include "net/packetbuf.h"
 #include "net/ipv6/uip-ds6-nbr.h"
 
diff --git a/core/net/mac/frame802154.h b/core/net/mac/frame802154.h
index 1103027d0..1c0189194 100644
--- a/core/net/mac/frame802154.h
+++ b/core/net/mac/frame802154.h
@@ -62,7 +62,7 @@
 #define FRAME_802154_H
 
 #include "contiki-conf.h"
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 
 #ifdef IEEE802154_CONF_PANID
 #define IEEE802154_PANID           IEEE802154_CONF_PANID
diff --git a/core/net/mac/phase.h b/core/net/mac/phase.h
index c605d7565..99e3d7672 100644
--- a/core/net/mac/phase.h
+++ b/core/net/mac/phase.h
@@ -40,7 +40,7 @@
 #ifndef PHASE_H
 #define PHASE_H
 
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 #include "sys/timer.h"
 #include "sys/rtimer.h"
 #include "lib/list.h"
diff --git a/core/net/nbr-table.h b/core/net/nbr-table.h
index 13130519b..6a65e1fae 100644
--- a/core/net/nbr-table.h
+++ b/core/net/nbr-table.h
@@ -36,7 +36,7 @@
 #define NBR_TABLE_H_
 
 #include "contiki.h"
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 #include "net/netstack.h"
 
 /* Neighbor table size */
diff --git a/core/net/packetbuf.h b/core/net/packetbuf.h
index 12d7b49d5..f321b0ca0 100644
--- a/core/net/packetbuf.h
+++ b/core/net/packetbuf.h
@@ -53,7 +53,7 @@
 #define PACKETBUF_H_
 
 #include "contiki-conf.h"
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 
 /**
  * \brief      The size of the packetbuf, in bytes
diff --git a/core/net/rime.h b/core/net/rime.h
index 1087f7482..bfa86b725 100644
--- a/core/net/rime.h
+++ b/core/net/rime.h
@@ -55,7 +55,7 @@
 #include "net/rime/polite-announcement.h"
 #include "net/rime/polite.h"
 #include "net/queuebuf.h"
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 #include "net/packetbuf.h"
 #include "net/rime/rimestats.h"
 #include "net/rime/rmh.h"
diff --git a/core/net/rime/Makefile.core-net-rime b/core/net/rime/Makefile.core-net-rime
index a18a3e84b..e42fcbd7f 100644
--- a/core/net/rime/Makefile.core-net-rime
+++ b/core/net/rime/Makefile.core-net-rime
@@ -1,5 +1,5 @@
 RIME_CHAMELEON = chameleon.c channel.c chameleon-raw.c chameleon-bitopt.c
-RIME_BASE      = rimeaddr.c rime.c timesynch.c \
+RIME_BASE      = rime.c timesynch.c \
                  rimestats.c announcement.c polite-announcement.c \
                  broadcast-announcement.c
 RIME_SINGLEHOP = broadcast.c stbroadcast.c unicast.c stunicast.c \
diff --git a/core/net/rime/announcement.h b/core/net/rime/announcement.h
index e9809249a..e44f92319 100644
--- a/core/net/rime/announcement.h
+++ b/core/net/rime/announcement.h
@@ -66,7 +66,7 @@
 #ifndef ANNOUNCEMENT_H_
 #define ANNOUNCEMENT_H_
 
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 
 struct announcement;
 
diff --git a/core/net/rime/broadcast.h b/core/net/rime/broadcast.h
index 440564d95..f92fb758a 100644
--- a/core/net/rime/broadcast.h
+++ b/core/net/rime/broadcast.h
@@ -66,7 +66,7 @@
 #define BROADCAST_H_
 
 #include "net/rime/abc.h"
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 
 struct broadcast_conn;
 
diff --git a/core/net/rime/collect-neighbor.h b/core/net/rime/collect-neighbor.h
index cc6d11d49..a0a256ef7 100644
--- a/core/net/rime/collect-neighbor.h
+++ b/core/net/rime/collect-neighbor.h
@@ -51,7 +51,7 @@
 #ifndef COLLECT_NEIGHBOR_H_
 #define COLLECT_NEIGHBOR_H_
 
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 #include "net/rime/collect-link-estimate.h"
 #include "lib/list.h"
 
diff --git a/core/net/rime/multihop.h b/core/net/rime/multihop.h
index ccb5d5845..e18e5aaef 100644
--- a/core/net/rime/multihop.h
+++ b/core/net/rime/multihop.h
@@ -71,7 +71,7 @@
 #define MULTIHOP_H_
 
 #include "net/rime/unicast.h"
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 
 struct multihop_conn;
 
diff --git a/core/net/rime/rmh.h b/core/net/rime/rmh.h
index a1216af33..cd4bcab59 100644
--- a/core/net/rime/rmh.h
+++ b/core/net/rime/rmh.h
@@ -66,7 +66,7 @@
 #define RMH_H_
 
 #include "net/rime/runicast.h"
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 
 struct rmh_conn;
 
diff --git a/core/net/rime/route.h b/core/net/rime/route.h
index caa65ba70..bc6824d11 100644
--- a/core/net/rime/route.h
+++ b/core/net/rime/route.h
@@ -51,7 +51,7 @@
 #ifndef ROUTE_H_
 #define ROUTE_H_
 
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 
 struct route_entry {
   struct route_entry *next;
diff --git a/core/net/rime/rimeaddr.c b/core/net/rimeaddr.c
similarity index 98%
rename from core/net/rime/rimeaddr.c
rename to core/net/rimeaddr.c
index d0293018b..8bc43eb47 100644
--- a/core/net/rime/rimeaddr.c
+++ b/core/net/rimeaddr.c
@@ -42,7 +42,7 @@
  *         Adam Dunkels <adam@sics.se>
  */
 
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 #include <string.h>
 
 rimeaddr_t rimeaddr_node_addr;
diff --git a/core/net/rime/rimeaddr.h b/core/net/rimeaddr.h
similarity index 100%
rename from core/net/rime/rimeaddr.h
rename to core/net/rimeaddr.h
diff --git a/cpu/cc2538/dev/cc2538-rf.c b/cpu/cc2538/dev/cc2538-rf.c
index 226d8be9f..bfaa81858 100644
--- a/cpu/cc2538/dev/cc2538-rf.c
+++ b/cpu/cc2538/dev/cc2538-rf.c
@@ -41,7 +41,7 @@
 #include "sys/rtimer.h"
 #include "net/packetbuf.h"
 #include "net/rime/rimestats.h"
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 #include "net/netstack.h"
 #include "sys/energest.h"
 #include "dev/cc2538-rf.h"
diff --git a/cpu/cc2538/ieee-addr.c b/cpu/cc2538/ieee-addr.c
index dd5a391da..bf63a8114 100644
--- a/cpu/cc2538/ieee-addr.c
+++ b/cpu/cc2538/ieee-addr.c
@@ -36,7 +36,7 @@
  * Driver for the cc2538 IEEE addresses
  */
 #include "contiki-conf.h"
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 #include "ieee-addr.h"
 
 #include <stdint.h>
diff --git a/cpu/cc2538/usb/usb-serial.c b/cpu/cc2538/usb/usb-serial.c
index 46bcee29e..b27ba7d70 100644
--- a/cpu/cc2538/usb/usb-serial.c
+++ b/cpu/cc2538/usb/usb-serial.c
@@ -46,7 +46,7 @@
  */
 #include "contiki.h"
 #include "sys/process.h"
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 #include "usb-api.h"
 #include "usb.h"
 #include "usb-arch.h"
diff --git a/cpu/cc253x/dev/cc2530-rf.c b/cpu/cc253x/dev/cc2530-rf.c
index 25b16ea84..4a5ccc9fb 100644
--- a/cpu/cc253x/dev/cc2530-rf.c
+++ b/cpu/cc253x/dev/cc2530-rf.c
@@ -46,7 +46,7 @@
 
 #include "net/packetbuf.h"
 #include "net/rime/rimestats.h"
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 #include "net/netstack.h"
 
 #include <string.h>
diff --git a/examples/ipv6/rpl-collect/collect-common.h b/examples/ipv6/rpl-collect/collect-common.h
index 2c5eff394..3211bec15 100644
--- a/examples/ipv6/rpl-collect/collect-common.h
+++ b/examples/ipv6/rpl-collect/collect-common.h
@@ -39,7 +39,7 @@
 #define COLLECT_COMMON_H_
 
 #include "contiki.h"
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 
 void collect_common_net_init(void);
 void collect_common_net_print(void);
diff --git a/examples/ipv6/rpl-collect/udp-sink.c b/examples/ipv6/rpl-collect/udp-sink.c
index 4f73c93f0..c26ead298 100644
--- a/examples/ipv6/rpl-collect/udp-sink.c
+++ b/examples/ipv6/rpl-collect/udp-sink.c
@@ -32,7 +32,7 @@
 #include "contiki-net.h"
 #include "net/ip/uip.h"
 #include "net/rpl/rpl.h"
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 
 #include "net/netstack.h"
 #include "dev/button-sensor.h"
diff --git a/platform/econotag/main.c b/platform/econotag/main.c
index 1646914fe..2e20a5ffa 100644
--- a/platform/econotag/main.c
+++ b/platform/econotag/main.c
@@ -39,7 +39,7 @@
 /* contiki */
 #include "contiki.h"
 #include "dev/button-sensor.h"
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 #include "net/netstack.h"
 
 /* mc1322x */
diff --git a/platform/mbxxx/contiki-main.c b/platform/mbxxx/contiki-main.c
index 3e1369f31..287fed7fe 100644
--- a/platform/mbxxx/contiki-main.c
+++ b/platform/mbxxx/contiki-main.c
@@ -68,7 +68,7 @@
 
 #include "dev/stm32w-radio.h"
 #include "net/netstack.h"
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 #include "net/rime.h"
 #include "net/rime/rime-udp.h"
 #include "net/ip/uip.h"
diff --git a/tools/stm32w/uip6_bridge/dev/slip.c b/tools/stm32w/uip6_bridge/dev/slip.c
index a4ba4869d..56fe77526 100644
--- a/tools/stm32w/uip6_bridge/dev/slip.c
+++ b/tools/stm32w/uip6_bridge/dev/slip.c
@@ -36,7 +36,7 @@
 #include <string.h>
 #include "contiki.h"
 
-#include "net/rime/rimeaddr.h"
+#include "net/rimeaddr.h"
 #include "sys/ctimer.h"
 
 #include "net/ip/uip.h"