diff --git a/examples/osd/rpl-border-router/border-router.c b/examples/osd/rpl-border-router/border-router.c
index 28bd23064..91cd0e380 100644
--- a/examples/osd/rpl-border-router/border-router.c
+++ b/examples/osd/rpl-border-router/border-router.c
@@ -38,8 +38,8 @@
 #include "contiki.h"
 #include "contiki-lib.h"
 #include "contiki-net.h"
-#include "net/uip.h"
-#include "net/uip-ds6.h"
+#include "net/ip/uip.h"
+#include "net/ipv6/uip-ds6.h"
 #include "net/rpl/rpl.h"
 
 #include "net/netstack.h"
@@ -54,7 +54,7 @@
 #include "dev/leds.h"
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 uint16_t dag_id[] = {0x1111, 0x1100, 0, 0, 0, 0, 0, 0x0011};
 
diff --git a/examples/osd/rpl-border-router/slip-bridge.c b/examples/osd/rpl-border-router/slip-bridge.c
index ebf4f3c36..52b4a4060 100644
--- a/examples/osd/rpl-border-router/slip-bridge.c
+++ b/examples/osd/rpl-border-router/slip-bridge.c
@@ -38,8 +38,8 @@
  *         Nicolas Tsiftes <nvt@sics.se>
  */
 
-#include "net/uip.h"
-#include "net/uip-ds6.h"
+#include "net/ip/uip.h"
+#include "net/ipv6/uip-ds6.h"
 #include "dev/slip.h"
 #include "dev/uart1.h"
 #include <string.h>
@@ -47,7 +47,7 @@
 #define UIP_IP_BUF        ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
 
 #define DEBUG DEBUG_PRINT
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 void set_prefix_64(uip_ipaddr_t *);
 
diff --git a/platform/osd-merkur/params.c b/platform/osd-merkur/params.c
index 9e22d412d..4b0252387 100644
--- a/platform/osd-merkur/params.c
+++ b/platform/osd-merkur/params.c
@@ -168,7 +168,7 @@ params_get_channel(void) {
 uint8_t
 params_get_eui64(uint8_t *eui64) {
   cli();
-  eeprom_read_block ((void *)eui64, &eemem_mac_address, sizeof(rimeaddr_t));
+  eeprom_read_block ((void *)eui64, &eemem_mac_address, sizeof(linkaddr_t));
   sei();
 #if CONTIKI_CONF_RANDOM_MAC
   return randomeui64;
@@ -208,7 +208,7 @@ params_get_channel() {
 }
 uint8_t
 params_get_eui64(uint8_t *eui64) {
-  size_t size = sizeof(rimeaddr_t); 
+  size_t size = sizeof(linkaddr_t); 
   if(settings_get(SETTINGS_KEY_EUI64, 0, (unsigned char*)eui64, &size) == SETTINGS_STATUS_OK) {
     PRINTD("<-Get EUI64 MAC\n");
     return 0;