diff --git a/examples/rime/example-collect.c b/examples/rime/example-collect.c
index ac52b34fd..656f37add 100644
--- a/examples/rime/example-collect.c
+++ b/examples/rime/example-collect.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-collect.c,v 1.1 2008/01/25 18:00:50 adamdunkels Exp $
+ * $Id: example-collect.c,v 1.2 2008/02/24 22:15:46 adamdunkels Exp $
  */
 
 /**
@@ -86,7 +86,7 @@ PROCESS_THREAD(depth_blink_process, ev, data)
 }
 /*---------------------------------------------------------------------------*/
 static void
-recv(rimeaddr_t *originator, u8_t seqno, u8_t hops)
+recv(rimeaddr_t *originator, uint8_t seqno, uint8_t hops)
 {
   printf("Sink got message from %d.%d, seqno %d, hops %d: len %d '%s'\n",
 	 originator->u8[0], originator->u8[1],
diff --git a/examples/rime/example-mh.c b/examples/rime/example-mh.c
index 35e0c1907..f88717883 100644
--- a/examples/rime/example-mh.c
+++ b/examples/rime/example-mh.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-mh.c,v 1.1 2008/01/25 18:00:50 adamdunkels Exp $
+ * $Id: example-mh.c,v 1.2 2008/02/24 22:15:46 adamdunkels Exp $
  */
 
 /**
@@ -57,7 +57,7 @@ recv(struct mh_conn *c, rimeaddr_t *sender)
 }
 static rimeaddr_t *
 forward(struct mh_conn *c, rimeaddr_t *originator, rimeaddr_t *dest,
-	rimeaddr_t *prevhop, u8_t hops)
+	rimeaddr_t *prevhop, uint8_t hops)
 {
   printf("Forwarding message '%s'\n", (char *)rimebuf_dataptr());
   return NULL;
diff --git a/examples/rime/example-rudolph1.c b/examples/rime/example-rudolph1.c
index 5c2ac14ce..287cc9934 100644
--- a/examples/rime/example-rudolph1.c
+++ b/examples/rime/example-rudolph1.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-rudolph1.c,v 1.1 2008/01/25 18:00:51 adamdunkels Exp $
+ * $Id: example-rudolph1.c,v 1.2 2008/02/24 22:15:46 adamdunkels Exp $
  */
 
 /**
@@ -139,7 +139,7 @@ static void
 log_queuelen(struct rtimer *t, void *ptr)
 {
 #if NETSIM
-  extern u8_t queuebuf_len, queuebuf_ref_len;
+  extern uint8_t queuebuf_len, queuebuf_ref_len;
   node_log("%d %d\n",
 	   queuebuf_len,
 	   queuebuf_ref_len);
diff --git a/examples/sky/sky-collect.c b/examples/sky/sky-collect.c
index 887acc6e7..7550093cf 100644
--- a/examples/sky/sky-collect.c
+++ b/examples/sky/sky-collect.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sky-collect.c,v 1.2 2008/01/08 08:05:34 adamdunkels Exp $
+ * $Id: sky-collect.c,v 1.3 2008/02/24 22:16:32 adamdunkels Exp $
  */
 
 /**
@@ -164,7 +164,7 @@ do_rssi(void)
 }
 /*---------------------------------------------------------------------------*/
 static void
-recv(rimeaddr_t *originator, u8_t seqno, u8_t hops)
+recv(rimeaddr_t *originator, uint8_t seqno, uint8_t hops)
 {
   struct sky_collect_msg *msg;
   
diff --git a/examples/sky/tcprudolph0.c b/examples/sky/tcprudolph0.c
index e290089c5..cdd87f050 100644
--- a/examples/sky/tcprudolph0.c
+++ b/examples/sky/tcprudolph0.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: tcprudolph0.c,v 1.9 2007/12/16 14:37:02 adamdunkels Exp $
+ * @(#)$Id: tcprudolph0.c,v 1.10 2008/02/24 22:16:32 adamdunkels Exp $
  */
 
 #include <stdio.h>
@@ -63,8 +63,8 @@ AUTOSTART_PROCESSES(&tcp_loader_process);
 
 static
 struct codeprop_state {
-  u16_t addr;
-  u16_t len;
+  uint16_t addr;
+  uint16_t len;
   struct pt tcpthread_pt;
   int fd;
 } s;