Moved net/rime.h to net/rime/rime.h

apps/collect-view/collect-view.c

@@ -39,7 +39,7 @@
 
 #include "contiki.h"
 #include "net/rime/collect-neighbor.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/timesynch.h"
 #include "collect-view.h"
 

apps/deluge/deluge.c

@@ -41,7 +41,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "cfs/cfs.h"
 #include "loader/elfloader.h"
 #include "lib/crc16.h"

apps/deluge/deluge.h

@@ -40,7 +40,7 @@
 #ifndef DELUGE_H
 #define DELUGE_H
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 PROCESS_NAME(deluge_process);
 

apps/powertrace/powertrace.c

@@ -41,7 +41,7 @@
 #include "contiki-lib.h"
 #include "sys/compower.h"
 #include "powertrace.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include <stdio.h>
 #include <string.h>

apps/serial-shell/serial-shell.c

@@ -45,7 +45,7 @@
 #include "shell.h"
 
 #include "dev/serial-line.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include <stdio.h>
 #include <string.h>

apps/shell/shell-download.c

@@ -41,7 +41,7 @@
 #include "contiki.h"
 #include "shell.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "cfs/cfs.h"
 
 #include "dev/leds.h"

apps/shell/shell-netfile.c

@@ -39,7 +39,7 @@
 
 #include "contiki.h"
 #include "shell-netfile.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/rudolph0.h"
 #include "dev/leds.h"
 

apps/shell/shell-netperf.c

@@ -39,7 +39,7 @@
 
 #include "contiki.h"
 #include "shell-netperf.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "contiki-conf.h"
 
 #include <stdio.h>

apps/shell/shell-rime-debug-runicast.c

@@ -45,7 +45,7 @@
 
 #include "lib/random.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/route.h"
 #include "net/rime/trickle.h"
 

apps/shell/shell-rime-debug.c

@@ -45,7 +45,7 @@
 
 #include "lib/random.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/route.h"
 #include "net/rime/trickle.h"
 

apps/shell/shell-rime-neighbors.c

@@ -39,7 +39,7 @@
 
 #include <string.h>
 #include "shell.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 PROCESS(shell_neighbors_process, "neighbors");
 SHELL_COMMAND(neighbors_command,

apps/shell/shell-rime-netcmd.c

@@ -46,7 +46,7 @@
 #include "lib/crc16.h"
 #include "lib/random.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/route.h"
 #include "net/rime/trickle.h"
 

apps/shell/shell-rime-ping.c

@@ -39,7 +39,7 @@
 
 
 #include "shell.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include <string.h>
 #include <stdio.h>

apps/shell/shell-rime-sendcmd.c

@@ -39,7 +39,7 @@
 #include "lib/crc16.h"
 #include "lib/random.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/unicast.h"
 
 #include "net/rime/timesynch.h"

apps/shell/shell-rime-sniff.c

@@ -38,7 +38,7 @@
  */
 
 #include "shell.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 static uint8_t sniff_for_attributes;
 

apps/shell/shell-rime-unicast.c

@@ -45,7 +45,7 @@
 
 #include "lib/random.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/route.h"
 #include "net/rime/trickle.h"
 

apps/shell/shell-rime.c

@@ -46,7 +46,7 @@
 #include "lib/crc16.h"
 #include "lib/random.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/netstack.h"
 #include "net/rime/route.h"
 

apps/shell/shell-rsh.c

@@ -40,7 +40,7 @@
 #include "contiki.h"
 #include "shell.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/meshconn.h"
 
 #include <stdio.h>

apps/shell/shell-sendtest.c

@@ -39,7 +39,7 @@
 
 #include "contiki.h"
 #include "shell-ps.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include <stdio.h>
 #include <string.h>

apps/shell/shell-sky.c

@@ -42,7 +42,7 @@
 
 #include "dev/watchdog.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/netstack.h"
 #include "cc2420.h"
 #include "dev/leds.h"

apps/shell/shell.c

@@ -45,7 +45,7 @@
 #include "contiki.h"
 #include "contiki-lib.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include "shell.h"
 

core/contiki-net.h

@@ -54,7 +54,7 @@
 
 #include "net/ip/psock.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include "net/netstack.h"
 

core/lib/print-stats.c

@@ -39,7 +39,7 @@
 
 #include "lib/print-stats.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "sys/energest.h"
 
 #include <stdio.h>

core/net/ipv4/uip-over-mesh.h

@@ -42,7 +42,7 @@
 
 #include "net/ip/uip.h"
 #include "net/ipv4/uip-fw.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 void uip_over_mesh_init(uint16_t channels);
 uint8_t uip_over_mesh_send(void);

core/net/ipv6/sicslowpan.c

@@ -63,7 +63,7 @@
 #include "net/ip/tcpip.h"
 #include "net/ip/uip.h"
 #include "net/ipv6/uip-ds6.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/ipv6/sicslowpan.h"
 #include "net/netstack.h"
 

core/net/mac/contikimac/contikimac.c

@@ -47,7 +47,7 @@
 #include "net/mac/mac-sequence.h"
 #include "net/mac/contikimac/contikimac.h"
 #include "net/netstack.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "sys/compower.h"
 #include "sys/pt.h"
 #include "sys/rtimer.h"

core/net/mac/cxmac/cxmac.c

@@ -45,7 +45,7 @@
 #include "net/netstack.h"
 #include "lib/random.h"
 #include "net/mac/cxmac/cxmac.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/timesynch.h"
 #include "sys/compower.h"
 #include "sys/pt.h"

core/net/mac/mac-sequence.c

@@ -47,7 +47,7 @@
 #include "contiki-net.h"
 #include "net/mac/mac-sequence.h"
 #include "net/packetbuf.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 struct seqno {
   rimeaddr_t sender;

core/net/packetbuf.c

@@ -46,7 +46,7 @@
 
 #include "contiki-net.h"
 #include "net/packetbuf.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 struct packetbuf_attr packetbuf_attrs[PACKETBUF_NUM_ATTRS];
 struct packetbuf_addr packetbuf_addrs[PACKETBUF_NUM_ADDRS];

core/net/rime/abc.c

@@ -46,7 +46,7 @@
  */
 
 #include "contiki-net.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 
 #define DEBUG 0

core/net/rime/broadcast-announcement.c

@@ -44,7 +44,7 @@
 
 #include "contiki.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/announcement.h"
 #include "net/rime/broadcast.h"
 #include "lib/random.h"

core/net/rime/chameleon-bitopt.c

@@ -38,7 +38,7 @@
 
 #include "net/rime/chameleon.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include <string.h>
 

core/net/rime/chameleon-raw.c

@@ -40,7 +40,7 @@
 #include <string.h>
 
 #include "net/rime/chameleon.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 /* This option enables an optimization where the link addresses are
    left to the MAC RDC and not encoded in the Chameleon header.

core/net/rime/chameleon.c

@@ -39,7 +39,7 @@
 
 #include "net/rime/chameleon.h"
 #include "net/rime/channel.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "lib/list.h"
 
 #include <stdio.h>

core/net/rime/channel.c

@@ -38,7 +38,7 @@
  */
 
 #include "net/rime/chameleon.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "lib/list.h"
 
 LIST(channel_list);

core/net/rime/collect.c

@@ -44,7 +44,7 @@
 
 #include "contiki.h"
 #include "net/netstack.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/collect.h"
 #include "net/rime/collect-neighbor.h"
 #include "net/rime/collect-link-estimate.h"

core/net/rime/ipolite.c

@@ -42,7 +42,7 @@
  *         Adam Dunkels <adam@sics.se>
  */
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/ipolite.h"
 #include "lib/random.h"
 

core/net/rime/mesh.c

@@ -43,7 +43,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/route.h"
 #include "net/rime/mesh.h"
 

core/net/rime/multihop.c

@@ -43,7 +43,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/multihop.h"
 #include "net/rime/route.h"
 

core/net/rime/neighbor-discovery.c

@@ -44,7 +44,7 @@
 
 #include "contiki.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/neighbor-discovery.h"
 
 #include "dev/radio-sensor.h"

core/net/rime/polite-announcement.c

@@ -45,7 +45,7 @@
 #include "contiki.h"
 
 #include "lib/list.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/announcement.h"
 #include "net/rime/ipolite.h"
 

core/net/rime/polite.c

@@ -42,7 +42,7 @@
  *         Adam Dunkels <adam@sics.se>
  */
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/polite.h"
 #include "lib/random.h"
 

core/net/rime/rime.c

@@ -51,7 +51,7 @@
 #endif
 
 #include "net/netstack.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/chameleon.h"
 #include "net/rime/route.h"
 #include "net/rime/announcement.h"

core/net/rime/rmh.c

@@ -43,7 +43,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/rmh.h"
 
 struct data_hdr {

core/net/rime/route-discovery.c

@@ -43,7 +43,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/route.h"
 #include "net/rime/route-discovery.h"
 

core/net/rime/rucb.c

@@ -38,7 +38,7 @@
  */
 
 #include "net/rime/rucb.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include <string.h>
 
 #define MAX_TRANSMISSIONS 8

core/net/rime/rudolph0.c

@@ -44,7 +44,7 @@
 
 #include <stddef.h> /* for offsetof */
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/rudolph0.h"
 
 #define STEADY_TIME CLOCK_SECOND * 2

core/net/rime/rudolph1.c

@@ -45,7 +45,7 @@
 #include <stdio.h>
 #include <stddef.h> /* for offsetof */
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/rudolph1.h"
 #include "cfs/cfs.h"
 

core/net/rime/rudolph2.c

@@ -51,7 +51,7 @@
 #include <stdio.h>
 #include <stddef.h> /* for offsetof */
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/polite.h"
 #include "net/rime/rudolph2.h"
 #include "cfs/cfs.h"

core/net/rime/runicast.c

@@ -44,7 +44,7 @@
  */
 
 #include "net/rime/runicast.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include <string.h>
 
 

core/net/rime/stbroadcast.c

@@ -44,7 +44,7 @@
  */
 
 #include "net/rime/stbroadcast.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include <string.h>
 
 /*---------------------------------------------------------------------------*/

core/net/rime/stunicast.c

@@ -43,7 +43,7 @@
  */
 
 #include "net/rime/stunicast.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include <string.h>
 
 #define DEBUG 0

core/net/rime/timesynch.c

@@ -45,7 +45,7 @@
 
 #include "contiki.h"
 #include "lib/random.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/timesynch.h"
 #include <string.h>
 

core/net/rime/unicast.c

@@ -43,7 +43,7 @@
  *         Adam Dunkels <adam@sics.se>
  */
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/unicast.h"
 #include <string.h>
 

examples/antelope/netdb/netdb-client.c

@@ -39,7 +39,7 @@
 
 #include "contiki.h"
 #include "dev/serial-line.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/mesh.h"
 
 #include "antelope.h"

examples/antelope/netdb/netdb-server.c

@@ -41,7 +41,7 @@
 #include "dev/serial-line.h"
 #include "dev/sht11/sht11.h"
 #include "lib/random.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/mesh.h"
 
 #include "antelope.h"

examples/example-shell/example-shell.c

@@ -41,7 +41,7 @@
 #include "shell.h"
 #include "serial-shell.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "dev/leds.h"
 #include "net/rime/timesynch.h"
 

examples/powertrace/example-powertrace.c

@@ -38,7 +38,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "random.h"
 
 #include "powertrace.h"

examples/rime/example-abc.c

@@ -38,7 +38,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "random.h"
 
 #include "dev/button-sensor.h"

examples/rime/example-announcement.c

@@ -38,7 +38,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include "net/rime/announcement.h"
 

examples/rime/example-broadcast.c

@@ -38,7 +38,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "random.h"
 
 #include "dev/button-sensor.h"

examples/rime/example-collect.c

@@ -39,7 +39,7 @@
 
 #include "contiki.h"
 #include "lib/random.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/collect.h"
 #include "dev/leds.h"
 #include "dev/button-sensor.h"

examples/rime/example-mesh.c

@@ -38,7 +38,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/mesh.h"
 
 #include "dev/button-sensor.h"

examples/rime/example-multihop.c

@@ -71,7 +71,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "lib/list.h"
 #include "lib/memb.h"
 #include "lib/random.h"

examples/rime/example-neighbors.c

@@ -56,7 +56,7 @@
 #include "lib/list.h"
 #include "lib/memb.h"
 #include "lib/random.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include <stdio.h>
 

examples/rime/example-rudolph2.c

@@ -38,7 +38,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/rudolph2.h"
 
 #include "dev/button-sensor.h"

examples/rime/example-runicast.c

@@ -40,7 +40,7 @@
 #include <stdio.h>
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include "lib/list.h"
 #include "lib/memb.h"

examples/rime/example-unicast.c

@@ -38,7 +38,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include "dev/button-sensor.h"
 

examples/sensinode/broadcast-rime.c

@@ -37,7 +37,7 @@
  *         Adam Dunkels <adam@sics.se>
  */
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "lib/random.h"
 #include "net/rime/rimestats.h"
 #include "dev/leds.h"

examples/sensinode/cc2431-location-engine/blind-node.c

@@ -55,7 +55,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "cc2431_loc_eng.h"
 #include "cc2430_sfr.h"
 

examples/sensinode/sensors/sensors-example.c

@@ -81,7 +81,7 @@
 
 #include "contiki.h"
 #include "contiki-conf.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "dev/leds.h"
 #include "dev/watchdog.h"
 #include "lib/random.h"

examples/sky-ip/sky-telnet-server.c

@@ -43,7 +43,7 @@
 
 #include "contiki.h"
 #include "contiki-net.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include <stdio.h>
 
 /*---------------------------------------------------------------------------*/

examples/sky-ip/telnet-webserver.c

@@ -43,7 +43,7 @@
 
 #include "contiki.h"
 #include "contiki-net.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include <stdio.h>
 
 /*---------------------------------------------------------------------------*/

examples/sky-ip/telnet.c

@@ -42,7 +42,7 @@
 
 #include "contiki.h"
 #include "contiki-net.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include <stdio.h>
 
 /*---------------------------------------------------------------------------*/

examples/sky-shell-exec/sky-shell-exec.c

@@ -36,7 +36,7 @@
 
 #include "dev/watchdog.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "cc2420.h"
 #include "dev/leds.h"
 #include "dev/light.h"

examples/sky-shell/sky-shell.c

@@ -42,7 +42,7 @@
 #include "serial-shell.h"
 #include "collect-view.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 /*---------------------------------------------------------------------------*/
 PROCESS(sky_shell_process, "Sky Contiki shell");

examples/sky/radio-test.c

@@ -44,7 +44,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "dev/leds.h"
 #include "dev/button-sensor.h"
 #include "cc2420.h"

examples/sky/rssi-scanner.c

@@ -39,7 +39,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/netstack.h"
 
 #include "dev/leds.h"

examples/sky/sky-collect.c

@@ -39,7 +39,7 @@
 
 #include "contiki.h"
 #include "net/netstack.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/collect.h"
 #include "net/rime/collect-neighbor.h"
 #include "net/rime/timesynch.h"

examples/z1/rssi_scanner/rssi-scanner.c

@@ -39,7 +39,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/netstack.h"
 
 #include "dev/leds.h"

examples/z1/tutorials/example-unicast-temp.c

@@ -38,7 +38,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include "dev/button-sensor.h"
 

examples/z1/tutorials/example-unicast2.c

@@ -38,7 +38,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include "dev/button-sensor.h"
 

platform/avr-atmega128rfa1/contiki-main.c

@@ -88,7 +88,7 @@
 #include "net/rime/rime-udp.h"
 #endif
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 /* Track interrupt flow through mac, rdc and radio driver */
 //#define DEBUGFLOWSIZE 32

platform/avr-raven/contiki-raven-main.c

@@ -106,7 +106,7 @@ unsigned char debugflowsize,debugflow[DEBUGFLOWSIZE];
 #include "net/rime/rime-udp.h"
 #endif
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include "params.h"
 

platform/avr-ravenusb/sicslow_ethernet.c

@@ -226,7 +226,7 @@
 #include "uip.h"
 #include "uip_arp.h" //For ethernet header structure
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "sicslowpan.h"
 #include "sicslow_ethernet.h"
 #if !RF230BB

platform/cc2530dk/contiki-main.c

@@ -16,7 +16,7 @@
 #include "dev/button-sensor.h"
 #include "dev/adc-sensor.h"
 #include "dev/leds-arch.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/netstack.h"
 #include "net/mac/frame802154.h"
 #include "debug.h"

platform/cooja/contiki-cooja-main.c

@@ -49,7 +49,7 @@
 #include "lib/random.h"
 #include "lib/simEnvChange.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/netstack.h"
 
 #include "dev/serial-line.h"

platform/exp5438/contiki-exp5438-main.c

@@ -46,7 +46,7 @@
 #include "lib/sensors.h"
 #include "net/mac/frame802154.h"
 #include "net/netstack.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "sys/autostart.h"
 
 #include "sys/node-id.h"

platform/iris/contiki-iris-main.c

@@ -45,7 +45,7 @@
 
 #include "contiki.h"
 #include "contiki-lib.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "dev/leds.h"
 #include "dev/rs232.h"
 #include "dev/watchdog.h"

platform/mbxxx/contiki-main.c

@@ -69,7 +69,7 @@
 #include "dev/stm32w-radio.h"
 #include "net/netstack.h"
 #include "net/rimeaddr.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/rime-udp.h"
 #include "net/ip/uip.h"
 

platform/micaz/contiki-micaz-main.c

@@ -45,7 +45,7 @@
 
 #include "contiki.h"
 #include "contiki-lib.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "dev/leds.h"
 #include "dev/rs232.h"
 #include "dev/watchdog.h"

platform/native/contiki-main.c

@@ -58,7 +58,7 @@
 #include "net/ipv6/uip-ds6.h"
 #endif /* WITH_UIP6 */
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #ifdef SELECT_CONF_MAX
 #define SELECT_MAX SELECT_CONF_MAX

platform/sensinode/contiki-sensinode-main.c

@@ -12,7 +12,7 @@
 #include "dev/cc2430_rf.h"
 #include "dev/watchdog.h"
 #include "dev/lpm.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/netstack.h"
 #include "net/mac/frame802154.h"
 #include "debug.h"

platform/sky/contiki-sky-main.c

@@ -47,7 +47,7 @@
 #include "net/ipv6/uip-ds6.h"
 #endif /* WITH_UIP6 */
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include "sys/node-id.h"
 #include "cfs-coffee-arch.h"

platform/wismote/contiki-wismote-main.c

@@ -48,7 +48,7 @@
 #include "net/ipv6/uip-ds6.h"
 #endif /* WITH_UIP6 */
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include "sys/node-id.h"
 #include "sys/autostart.h"

platform/z1/contiki-z1-main.c

@@ -51,7 +51,7 @@
 #include "net/ipv6/uip-ds6.h"
 #endif /* WITH_UIP6 */
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include "sys/node-id.h"
 #include "cfs-coffee-arch.h"

tools/sky/uip6-bridge/sicslow_ethernet.c

@@ -145,7 +145,7 @@
 
 #include "uip.h"
 #include "uip_arp.h" /* For ethernet header structure */
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/ipv6/sicslowpan.h"
 #include "sicslow_ethernet.h"
 

tools/stm32w/uip6_bridge/sicslow_ethernet.c

@@ -150,7 +150,7 @@
 
 #include "net/ip/uip.h"
 #include "net/ipv4/uip_arp.h" /* For ethernet header structure */
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/ipv6/sicslowpan.h"
 #include "sicslow_ethernet.h"
 #include "dev/stm32w-radio.h"