diff --git a/apps/about/about-dsc.c b/apps/about/about-dsc.c
index efbde9287f6..f8415d8995c 100644
--- a/apps/about/about-dsc.c
+++ b/apps/about/about-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: about-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $
  *
  */
 
diff --git a/apps/about/about-dsc.h b/apps/about/about-dsc.h
index f592a69d20e..83cae0f9087 100644
--- a/apps/about/about-dsc.h
+++ b/apps/about/about-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: about-dsc.h,v 1.1 2006/06/17 22:41:10 adamdunkels Exp $
  *
  */
 #ifndef __ABOUT_DSC_H__
diff --git a/apps/about/about.c b/apps/about/about.c
index 1babdea50db..2c5a0e08db6 100644
--- a/apps/about/about.c
+++ b/apps/about/about.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: about.c,v 1.4 2008/02/08 22:48:28 oliverschmidt Exp $
  *
  */
 
diff --git a/apps/antelope/debug.h b/apps/antelope/debug.h
index edb39b8ed36..e9d9ecf7184 100644
--- a/apps/antelope/debug.h
+++ b/apps/antelope/debug.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: uip-debug.h,v 1.1 2010/04/30 13:20:57 joxe Exp $
  */
 /**
  * \file
diff --git a/apps/calc/calc-dsc.c b/apps/calc/calc-dsc.c
index 0e14cab2678..081793d94b8 100644
--- a/apps/calc/calc-dsc.c
+++ b/apps/calc/calc-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: calc-dsc.c,v 1.3 2007/09/06 01:36:11 matsutsuka Exp $
  *
  */
 
diff --git a/apps/calc/calc-dsc.h b/apps/calc/calc-dsc.h
index 98f414737cc..48be8da3150 100644
--- a/apps/calc/calc-dsc.h
+++ b/apps/calc/calc-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: calc-dsc.h,v 1.1 2006/06/17 22:41:10 adamdunkels Exp $
  *
  */
 #ifndef __CALC_DSC_H__
diff --git a/apps/calc/calc.c b/apps/calc/calc.c
index f1fc27d6c14..e49696efba7 100644
--- a/apps/calc/calc.c
+++ b/apps/calc/calc.c
@@ -29,7 +29,6 @@
  *
  * This an example program for the Contiki desktop OS
  *
- * $Id: calc.c,v 1.5 2008/02/08 22:48:47 oliverschmidt Exp $
  *
  */
 
diff --git a/apps/codeprop/codeprop-tmp.c b/apps/codeprop/codeprop-tmp.c
index a6a4dfc287e..42bf46e42a9 100644
--- a/apps/codeprop/codeprop-tmp.c
+++ b/apps/codeprop/codeprop-tmp.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: codeprop-tmp.c,v 1.6 2010/10/19 18:29:03 adamdunkels Exp $
  */
 
 /** \addtogroup esb
diff --git a/apps/codeprop/codeprop-tmp.h b/apps/codeprop/codeprop-tmp.h
index 8dfcbf44492..510925b9daf 100644
--- a/apps/codeprop/codeprop-tmp.h
+++ b/apps/codeprop/codeprop-tmp.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: codeprop-tmp.h,v 1.1 2006/06/18 07:44:36 adamdunkels Exp $
  */
 #ifndef __CODEPROP_H__
 #define __CODEPROP_H__
diff --git a/apps/codeprop/codeprop.c b/apps/codeprop/codeprop.c
index f0b8226676d..f7f4ca7251b 100644
--- a/apps/codeprop/codeprop.c
+++ b/apps/codeprop/codeprop.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: codeprop.c,v 1.2 2010/10/19 18:29:03 adamdunkels Exp $
  */
 
 /** \addtogroup esb
diff --git a/apps/codeprop/codeprop.h b/apps/codeprop/codeprop.h
index 5ead82cb885..a30d13f98a3 100644
--- a/apps/codeprop/codeprop.h
+++ b/apps/codeprop/codeprop.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: codeprop.h,v 1.2 2007/03/18 13:15:01 ksb Exp $
  */
 #ifndef __CODEPROP_H__
 #define __CODEPROP_H__
diff --git a/apps/codeprop/tcp_loader.c b/apps/codeprop/tcp_loader.c
index 700ee549596..9c94384ce0d 100644
--- a/apps/codeprop/tcp_loader.c
+++ b/apps/codeprop/tcp_loader.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: tcp_loader.c,v 1.4 2010/10/19 18:29:03 adamdunkels Exp $
  */
 
 #include <stdio.h>
diff --git a/apps/codeprop/tcp_loader2.c b/apps/codeprop/tcp_loader2.c
index 4b861473d08..58fda871eb8 100644
--- a/apps/codeprop/tcp_loader2.c
+++ b/apps/codeprop/tcp_loader2.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: tcp_loader2.c,v 1.3 2010/10/19 18:29:03 adamdunkels Exp $
  */
 
 #include <stdio.h>
diff --git a/apps/collect-view/collect-view.c b/apps/collect-view/collect-view.c
index 331256365f1..aa3d1e2c724 100644
--- a/apps/collect-view/collect-view.c
+++ b/apps/collect-view/collect-view.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: collect-view.c,v 1.4 2010/10/24 21:03:52 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/deluge/deluge.c b/apps/deluge/deluge.c
index 8aaed5a907f..d20875ecbca 100644
--- a/apps/deluge/deluge.c
+++ b/apps/deluge/deluge.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: deluge.c,v 1.10 2010/06/14 18:58:45 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/deluge/deluge.h b/apps/deluge/deluge.h
index ec68cdfce7a..b0de04a95c3 100644
--- a/apps/deluge/deluge.h
+++ b/apps/deluge/deluge.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: deluge.h,v 1.4 2010/04/12 14:39:53 nvt-se Exp $
  */
 
 /**
diff --git a/apps/dhcp/dhcp-dsc.c b/apps/dhcp/dhcp-dsc.c
index 1fb156e85f8..ea7513e8b12 100644
--- a/apps/dhcp/dhcp-dsc.c
+++ b/apps/dhcp/dhcp-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: dhcp-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $
  *
  */
 
diff --git a/apps/dhcp/dhcp-dsc.h b/apps/dhcp/dhcp-dsc.h
index e52d307581f..bced638a809 100644
--- a/apps/dhcp/dhcp-dsc.h
+++ b/apps/dhcp/dhcp-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: dhcp-dsc.h,v 1.1 2006/06/17 22:41:10 adamdunkels Exp $
  *
  */
 #ifndef __DHCP_DSC_H__
diff --git a/apps/directory/directory-dsc.c b/apps/directory/directory-dsc.c
index 35fad106ed6..4ef9a353dea 100644
--- a/apps/directory/directory-dsc.c
+++ b/apps/directory/directory-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: directory-dsc.c,v 1.3 2007/09/06 01:36:11 matsutsuka Exp $
  *
  */
 
diff --git a/apps/directory/directory-dsc.h b/apps/directory/directory-dsc.h
index 60110d618bc..4c959c88810 100644
--- a/apps/directory/directory-dsc.h
+++ b/apps/directory/directory-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: directory-dsc.h,v 1.1 2006/06/17 22:41:10 adamdunkels Exp $
  *
  */
 #ifndef __DIRECTORY_DSC_H__
diff --git a/apps/directory/directory.c b/apps/directory/directory.c
index 1c5443f6d68..18de41e2950 100644
--- a/apps/directory/directory.c
+++ b/apps/directory/directory.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: directory.c,v 1.6 2008/02/08 22:49:29 oliverschmidt Exp $
  *
  */
 
diff --git a/apps/email/email-dsc.c b/apps/email/email-dsc.c
index 80c566a7bd4..790573e1043 100644
--- a/apps/email/email-dsc.c
+++ b/apps/email/email-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: email-dsc.c,v 1.3 2007/09/06 01:36:11 matsutsuka Exp $
  *
  */
 
diff --git a/apps/email/email-dsc.h b/apps/email/email-dsc.h
index 65de9ff57fc..c1508b4d0e9 100644
--- a/apps/email/email-dsc.h
+++ b/apps/email/email-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: email-dsc.h,v 1.1 2006/06/17 22:41:11 adamdunkels Exp $
  *
  */
 #ifndef __EMAIL_DSC_H__
diff --git a/apps/email/email.c b/apps/email/email.c
index 3b0acec2e90..7601550414d 100644
--- a/apps/email/email.c
+++ b/apps/email/email.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: email.c,v 1.8 2010/05/31 15:22:08 nifi Exp $
  *
  */
 
diff --git a/apps/email/email.h b/apps/email/email.h
index a2aeb7edb09..64ef9dd28f9 100644
--- a/apps/email/email.h
+++ b/apps/email/email.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: email.h,v 1.2 2008/11/06 08:30:23 adamdunkels Exp $
  *
  */
 #ifndef __EMAIL_H__
diff --git a/apps/email/smtp-socket.c b/apps/email/smtp-socket.c
index 01ae545273b..ccf56eea4f5 100644
--- a/apps/email/smtp-socket.c
+++ b/apps/email/smtp-socket.c
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: smtp-socket.c,v 1.5 2010/10/19 18:29:03 adamdunkels Exp $
  */
 #include "smtp.h"
 
diff --git a/apps/email/smtp-strings.c b/apps/email/smtp-strings.c
index 67295392e58..8305599a5b8 100644
--- a/apps/email/smtp-strings.c
+++ b/apps/email/smtp-strings.c
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: smtp-strings.c,v 1.1 2006/06/17 22:41:11 adamdunkels Exp $
  */
 const char smtp_220[4] = 
 /* "220" */
diff --git a/apps/email/smtp-strings.h b/apps/email/smtp-strings.h
index 74cb5da4666..15b56915905 100644
--- a/apps/email/smtp-strings.h
+++ b/apps/email/smtp-strings.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: smtp-strings.h,v 1.1 2006/06/17 22:41:11 adamdunkels Exp $
  */
 extern const char smtp_220[4];
 extern const char smtp_helo[6];
diff --git a/apps/email/smtp.h b/apps/email/smtp.h
index 84c31958c7f..e0ea74604ac 100644
--- a/apps/email/smtp.h
+++ b/apps/email/smtp.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: smtp.h,v 1.3 2010/05/31 15:22:08 nifi Exp $
  *
  */
 #ifndef __SMTP_H__
diff --git a/apps/ftp/ftp-dsc.c b/apps/ftp/ftp-dsc.c
index fb826a278e0..254cc46cf76 100644
--- a/apps/ftp/ftp-dsc.c
+++ b/apps/ftp/ftp-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: ftp-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $
  *
  */
 
diff --git a/apps/ftp/ftp-dsc.h b/apps/ftp/ftp-dsc.h
index 52418c3606c..b06d7836d13 100644
--- a/apps/ftp/ftp-dsc.h
+++ b/apps/ftp/ftp-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: ftp-dsc.h,v 1.1 2006/06/17 22:41:11 adamdunkels Exp $
  *
  */
 #ifndef __FTP_DSC_H__
diff --git a/apps/ftp/ftp.c b/apps/ftp/ftp.c
index 719e535cd78..45f24df1ea5 100644
--- a/apps/ftp/ftp.c
+++ b/apps/ftp/ftp.c
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: ftp.c,v 1.10 2010/10/19 18:29:03 adamdunkels Exp $
  */
 /* Note to self: It would be nice to have a "View" option in the download dialog. */
 
diff --git a/apps/ftp/ftp.h b/apps/ftp/ftp.h
index 8707eba46b6..a78c96cdfdd 100644
--- a/apps/ftp/ftp.h
+++ b/apps/ftp/ftp.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: ftp.h,v 1.1 2008/11/06 08:30:23 adamdunkels Exp $
  *
  */
 #ifndef __FTP_H__
diff --git a/apps/ftp/ftpc.c b/apps/ftp/ftpc.c
index 81b1e1468f5..d9413170dcf 100644
--- a/apps/ftp/ftpc.c
+++ b/apps/ftp/ftpc.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: ftpc.c,v 1.6 2010/10/19 22:30:13 oliverschmidt Exp $
  */
 #include "contiki.h"
 #include "ftpc.h"
diff --git a/apps/ftp/ftpc.h b/apps/ftp/ftpc.h
index f1f60392df9..b8bd4e3144b 100644
--- a/apps/ftp/ftpc.h
+++ b/apps/ftp/ftpc.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: ftpc.h,v 1.2 2010/05/31 15:22:08 nifi Exp $
  */
 #ifndef __FTPC_H__
 #define __FTPC_H__
diff --git a/apps/irc/irc-dsc.c b/apps/irc/irc-dsc.c
index 0878b18c052..78e2c5b1ad3 100644
--- a/apps/irc/irc-dsc.c
+++ b/apps/irc/irc-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: irc-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $
  *
  */
 
diff --git a/apps/irc/irc-dsc.h b/apps/irc/irc-dsc.h
index 5efa4dd4c46..a17431965bc 100644
--- a/apps/irc/irc-dsc.h
+++ b/apps/irc/irc-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: irc-dsc.h,v 1.1 2006/06/17 22:41:11 adamdunkels Exp $
  *
  */
 #ifndef __IRC_DSC_H__
diff --git a/apps/irc/irc.c b/apps/irc/irc.c
index 799ab6e3a6a..ba46a369f8f 100644
--- a/apps/irc/irc.c
+++ b/apps/irc/irc.c
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: irc.c,v 1.11 2010/05/31 15:22:08 nifi Exp $
  */
 
 #include <string.h>
diff --git a/apps/irc/irc.h b/apps/irc/irc.h
index 0d555df3587..a70a4c22d5d 100644
--- a/apps/irc/irc.h
+++ b/apps/irc/irc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: irc.h,v 1.1 2008/11/06 08:30:23 adamdunkels Exp $
  *
  */
 #ifndef __IRC_H__
diff --git a/apps/irc/ircc.c b/apps/irc/ircc.c
index 7027a104f45..67ad59f31a7 100644
--- a/apps/irc/ircc.c
+++ b/apps/irc/ircc.c
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: ircc.c,v 1.5 2010/10/19 18:29:03 adamdunkels Exp $
  */
 
 #include "contiki.h"
diff --git a/apps/irc/ircc.h b/apps/irc/ircc.h
index 4f8b567a2a9..7f0985fb32f 100644
--- a/apps/irc/ircc.h
+++ b/apps/irc/ircc.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: ircc.h,v 1.2 2008/11/28 00:14:57 adamdunkels Exp $
  */
 #ifndef __IRCC_H__
 #define __IRCC_H__
diff --git a/apps/netconf/netconf-dsc.c b/apps/netconf/netconf-dsc.c
index 026e8a20d26..8aa2807e42d 100644
--- a/apps/netconf/netconf-dsc.c
+++ b/apps/netconf/netconf-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: netconf-dsc.c,v 1.3 2007/09/06 01:36:11 matsutsuka Exp $
  *
  */
 
diff --git a/apps/netconf/netconf-dsc.h b/apps/netconf/netconf-dsc.h
index 485a3bd09a7..8cd788cddce 100644
--- a/apps/netconf/netconf-dsc.h
+++ b/apps/netconf/netconf-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: netconf-dsc.h,v 1.1 2006/06/17 22:41:11 adamdunkels Exp $
  *
  */
 #ifndef __NETCONF_DSC_H__
diff --git a/apps/netconf/netconf.c b/apps/netconf/netconf.c
index 59ba3aa474a..8249d35ec56 100644
--- a/apps/netconf/netconf.c
+++ b/apps/netconf/netconf.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: netconf.c,v 1.9 2010/05/31 15:22:08 nifi Exp $
  *
  */
 
diff --git a/apps/powertrace/powertrace.c b/apps/powertrace/powertrace.c
index 0b50c8a745e..9c2c2cbff52 100644
--- a/apps/powertrace/powertrace.c
+++ b/apps/powertrace/powertrace.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: powertrace.c,v 1.8 2010/10/06 18:40:21 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/powertrace/powertrace.h b/apps/powertrace/powertrace.h
index cb1d29d4d47..210fa2915c6 100644
--- a/apps/powertrace/powertrace.h
+++ b/apps/powertrace/powertrace.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: powertrace.h,v 1.4 2010/03/29 21:49:07 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/process-list/process-list-dsc.c b/apps/process-list/process-list-dsc.c
index e2826f8a74c..01164f52566 100644
--- a/apps/process-list/process-list-dsc.c
+++ b/apps/process-list/process-list-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: process-list-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $
  *
  */
 
diff --git a/apps/process-list/process-list-dsc.h b/apps/process-list/process-list-dsc.h
index e13469df90a..82d5f8495ee 100644
--- a/apps/process-list/process-list-dsc.h
+++ b/apps/process-list/process-list-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: process-list-dsc.h,v 1.1 2006/06/17 22:41:12 adamdunkels Exp $
  *
  */
 #ifndef __PROCESSES_DSC_H__
diff --git a/apps/process-list/process-list.c b/apps/process-list/process-list.c
index d968d6cb7c5..780a457fe25 100644
--- a/apps/process-list/process-list.c
+++ b/apps/process-list/process-list.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: process-list.c,v 1.8 2008/02/08 22:51:27 oliverschmidt Exp $
  *
  */
 
diff --git a/apps/program-handler/program-handler.c b/apps/program-handler/program-handler.c
index 532e9bd87e4..6a6f2c090b5 100644
--- a/apps/program-handler/program-handler.c
+++ b/apps/program-handler/program-handler.c
@@ -43,7 +43,6 @@
  *
  * This file is part of the Contiki desktop OS
  *
- * $Id: program-handler.c,v 1.10 2008/02/15 17:31:44 oliverschmidt Exp $
  *
  */
 
diff --git a/apps/program-handler/program-handler.h b/apps/program-handler/program-handler.h
index e896789f493..855b614b37a 100644
--- a/apps/program-handler/program-handler.h
+++ b/apps/program-handler/program-handler.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: program-handler.h,v 1.3 2007/11/30 11:15:03 oliverschmidt Exp $
  *
  */
 #ifndef __PROGRAM_HANDLER_H__
diff --git a/apps/serial-shell/serial-shell.h b/apps/serial-shell/serial-shell.h
index 913ca77060b..1ee6386290a 100644
--- a/apps/serial-shell/serial-shell.h
+++ b/apps/serial-shell/serial-shell.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: serial-shell.h,v 1.1 2008/07/09 20:53:30 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/servreg-hack/servreg-hack.c b/apps/servreg-hack/servreg-hack.c
index fdc68f23818..3d3ca240925 100644
--- a/apps/servreg-hack/servreg-hack.c
+++ b/apps/servreg-hack/servreg-hack.c
@@ -31,7 +31,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: servreg-hack.c,v 1.3 2010/10/19 18:29:03 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/servreg-hack/servreg-hack.h b/apps/servreg-hack/servreg-hack.h
index 57657d381e8..e80cb50d689 100644
--- a/apps/servreg-hack/servreg-hack.h
+++ b/apps/servreg-hack/servreg-hack.h
@@ -51,7 +51,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: servreg-hack.h,v 1.1 2010/06/15 19:00:28 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/gui-shell.c b/apps/shell/gui-shell.c
index 91c5ab65f08..3771538f4bb 100644
--- a/apps/shell/gui-shell.c
+++ b/apps/shell/gui-shell.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki desktop OS.
  *
- * $Id: gui-shell.c,v 1.6 2008/11/10 22:10:32 oliverschmidt Exp $
  *
  */
 
diff --git a/apps/shell/shell-base64.c b/apps/shell/shell-base64.c
index 91d28016192..ca723748c3d 100644
--- a/apps/shell/shell-base64.c
+++ b/apps/shell/shell-base64.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-base64.c,v 1.1 2010/02/03 20:37:29 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-base64.h b/apps/shell/shell-base64.h
index e9f798a3b28..9d4eeabe43b 100644
--- a/apps/shell/shell-base64.h
+++ b/apps/shell/shell-base64.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-base64.h,v 1.1 2010/02/03 20:37:29 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-blink.c b/apps/shell/shell-blink.c
index f6adcd90e08..7c9b10012c4 100644
--- a/apps/shell/shell-blink.c
+++ b/apps/shell/shell-blink.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-blink.c,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-blink.h b/apps/shell/shell-blink.h
index 195c8781e0f..24547408d83 100644
--- a/apps/shell/shell-blink.h
+++ b/apps/shell/shell-blink.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-blink.h,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-checkpoint.c b/apps/shell/shell-checkpoint.c
index 9fa49c844f8..3a6bf308b26 100644
--- a/apps/shell/shell-checkpoint.c
+++ b/apps/shell/shell-checkpoint.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-checkpoint.c,v 1.2 2009/10/27 10:46:24 fros4943 Exp $
  */
 
 #include "contiki.h"
diff --git a/apps/shell/shell-checkpoint.h b/apps/shell/shell-checkpoint.h
index 7daf2d92f84..3ba06b6fdad 100644
--- a/apps/shell/shell-checkpoint.h
+++ b/apps/shell/shell-checkpoint.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-checkpoint.h,v 1.1 2009/02/04 17:49:15 fros4943 Exp $
  */
 
 #ifndef __SHELL_CHECKPOINT_H__
diff --git a/apps/shell/shell-coffee.c b/apps/shell/shell-coffee.c
index b1681ad9e98..9f97b95b3c3 100644
--- a/apps/shell/shell-coffee.c
+++ b/apps/shell/shell-coffee.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-coffee.c,v 1.3 2008/11/24 15:18:27 nvt-se Exp $
  */
 
 /**
diff --git a/apps/shell/shell-coffee.h b/apps/shell/shell-coffee.h
index 0bf8fef9cb9..a9496cf4f61 100644
--- a/apps/shell/shell-coffee.h
+++ b/apps/shell/shell-coffee.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-coffee.h,v 1.1 2008/07/03 17:56:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-collect-view.c b/apps/shell/shell-collect-view.c
index cc87e090226..879441590bb 100644
--- a/apps/shell/shell-collect-view.c
+++ b/apps/shell/shell-collect-view.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-collect-view.c,v 1.2 2010/10/24 21:04:39 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-collect-view.h b/apps/shell/shell-collect-view.h
index 96f0595a295..39e3e28c752 100644
--- a/apps/shell/shell-collect-view.h
+++ b/apps/shell/shell-collect-view.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-collect-view.h,v 1.1 2010/10/20 15:21:43 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-crc.c b/apps/shell/shell-crc.c
index a60043253c3..38a6b8f6d60 100644
--- a/apps/shell/shell-crc.c
+++ b/apps/shell/shell-crc.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-text.c,v 1.7 2010/09/13 13:29:47 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-download.c b/apps/shell/shell-download.c
index 5b5749d5e1a..82bb157f4cf 100644
--- a/apps/shell/shell-download.c
+++ b/apps/shell/shell-download.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-download.c,v 1.3 2009/11/08 19:42:59 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-download.h b/apps/shell/shell-download.h
index 8e8d61202af..bed99e157cb 100644
--- a/apps/shell/shell-download.h
+++ b/apps/shell/shell-download.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-download.h,v 1.1 2009/04/16 14:33:47 fros4943 Exp $
  */
 
 #ifndef __SHELL_DOWNLOAD_H__
diff --git a/apps/shell/shell-dsc.c b/apps/shell/shell-dsc.c
index 24426345c14..03606736842 100644
--- a/apps/shell/shell-dsc.c
+++ b/apps/shell/shell-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: shell-dsc.c,v 1.3 2007/09/06 01:36:10 matsutsuka Exp $
  *
  */
 
diff --git a/apps/shell/shell-dsc.h b/apps/shell/shell-dsc.h
index b89c8772f92..90e6c550722 100644
--- a/apps/shell/shell-dsc.h
+++ b/apps/shell/shell-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: shell-dsc.h,v 1.1 2006/06/17 22:41:12 adamdunkels Exp $
  *
  */
 #ifndef __SHELL_DSC_H__
diff --git a/apps/shell/shell-exec.c b/apps/shell/shell-exec.c
index 7587e239abf..1f5bbf38386 100644
--- a/apps/shell/shell-exec.c
+++ b/apps/shell/shell-exec.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-exec.c,v 1.4 2009/03/26 12:22:52 fros4943 Exp $
  */
 
 /**
diff --git a/apps/shell/shell-exec.h b/apps/shell/shell-exec.h
index 77212e1b2d3..bcc100d17e1 100644
--- a/apps/shell/shell-exec.h
+++ b/apps/shell/shell-exec.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-exec.h,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-file.c b/apps/shell/shell-file.c
index d9e746c9351..07f6f3d5dc1 100644
--- a/apps/shell/shell-file.c
+++ b/apps/shell/shell-file.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-file.c,v 1.14 2010/04/12 13:21:58 nvt-se Exp $
  */
 
 /**
diff --git a/apps/shell/shell-file.h b/apps/shell/shell-file.h
index b5e8e54dfcf..0e356030657 100644
--- a/apps/shell/shell-file.h
+++ b/apps/shell/shell-file.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-file.h,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-httpd.c b/apps/shell/shell-httpd.c
index 2ef0fabe7e7..c2f10de86a9 100644
--- a/apps/shell/shell-httpd.c
+++ b/apps/shell/shell-httpd.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-httpd.c,v 1.1 2008/11/09 12:37:26 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-httpd.h b/apps/shell/shell-httpd.h
index e17460b4ca9..4ce71cc0d1e 100644
--- a/apps/shell/shell-httpd.h
+++ b/apps/shell/shell-httpd.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-httpd.h,v 1.1 2008/11/09 12:37:26 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-irc.c b/apps/shell/shell-irc.c
index e03f715bad3..8dfd241f6bf 100644
--- a/apps/shell/shell-irc.c
+++ b/apps/shell/shell-irc.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: shell-irc.c,v 1.2 2010/05/31 15:22:08 nifi Exp $
  */
 
 #include <string.h>
diff --git a/apps/shell/shell-irc.h b/apps/shell/shell-irc.h
index 7f64a73b485..8190d2a41af 100644
--- a/apps/shell/shell-irc.h
+++ b/apps/shell/shell-irc.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-irc.h,v 1.1 2008/11/28 00:16:15 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-memdebug.c b/apps/shell/shell-memdebug.c
index e1dbeed9a18..9c6be22a948 100644
--- a/apps/shell/shell-memdebug.c
+++ b/apps/shell/shell-memdebug.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-memdebug.c,v 1.1 2010/02/02 15:28:53 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-memdebug.h b/apps/shell/shell-memdebug.h
index 0bae580f010..a9361a7a804 100644
--- a/apps/shell/shell-memdebug.h
+++ b/apps/shell/shell-memdebug.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-memdebug.h,v 1.1 2010/02/02 15:28:53 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-netfile.c b/apps/shell/shell-netfile.c
index e5a76e386f0..75e8e30a76c 100644
--- a/apps/shell/shell-netfile.c
+++ b/apps/shell/shell-netfile.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-netfile.c,v 1.8 2009/02/27 14:28:02 nvt-se Exp $
  */
 
 /**
diff --git a/apps/shell/shell-netfile.h b/apps/shell/shell-netfile.h
index 6e7b39027f9..e87a714bb2d 100644
--- a/apps/shell/shell-netfile.h
+++ b/apps/shell/shell-netfile.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-netfile.h,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-netperf.c b/apps/shell/shell-netperf.c
index 1cdd215589d..1fa4643e26b 100644
--- a/apps/shell/shell-netperf.c
+++ b/apps/shell/shell-netperf.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-netperf.c,v 1.6 2010/02/18 20:56:12 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-netperf.h b/apps/shell/shell-netperf.h
index df5ba746936..25cd555867a 100644
--- a/apps/shell/shell-netperf.h
+++ b/apps/shell/shell-netperf.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-netperf.h,v 1.1 2009/11/03 22:52:39 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-netstat.c b/apps/shell/shell-netstat.c
index 8f066a0a4a1..d109c4bd1f1 100644
--- a/apps/shell/shell-netstat.c
+++ b/apps/shell/shell-netstat.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: shell-netstat.c,v 1.2 2010/10/19 18:29:03 adamdunkels Exp $
  */
 
 #include <string.h>
diff --git a/apps/shell/shell-netstat.h b/apps/shell/shell-netstat.h
index 2bc5ecafe61..256ab6f28dd 100644
--- a/apps/shell/shell-netstat.h
+++ b/apps/shell/shell-netstat.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-netstat.h,v 1.1 2009/05/10 21:02:24 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-ping.c b/apps/shell/shell-ping.c
index 4568e286172..0fea8bb90b0 100644
--- a/apps/shell/shell-ping.c
+++ b/apps/shell/shell-ping.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: shell-ping.c,v 1.6 2011/01/12 22:58:34 nifi Exp $
  */
 
 #include <string.h>
diff --git a/apps/shell/shell-ping.h b/apps/shell/shell-ping.h
index c1d1baa2c32..b77b8f1af2a 100644
--- a/apps/shell/shell-ping.h
+++ b/apps/shell/shell-ping.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-ping.h,v 1.1 2009/03/06 00:29:33 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-power.c b/apps/shell/shell-power.c
index 880a4fa6e43..c4414c9a121 100644
--- a/apps/shell/shell-power.c
+++ b/apps/shell/shell-power.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-power.c,v 1.1 2009/03/05 21:12:03 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-power.h b/apps/shell/shell-power.h
index 56cae90f51e..e4f89f9d6b6 100644
--- a/apps/shell/shell-power.h
+++ b/apps/shell/shell-power.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-power.h,v 1.1 2009/03/05 21:12:03 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-powertrace.c b/apps/shell/shell-powertrace.c
index b9ee7793609..6d6ac90b255 100644
--- a/apps/shell/shell-powertrace.c
+++ b/apps/shell/shell-powertrace.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-powertrace.c,v 1.1 2010/10/12 11:34:49 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-powertrace.h b/apps/shell/shell-powertrace.h
index b5b465ef48a..7963d7f9966 100644
--- a/apps/shell/shell-powertrace.h
+++ b/apps/shell/shell-powertrace.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-powertrace.h,v 1.1 2010/10/12 11:34:49 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-profile.c b/apps/shell/shell-profile.c
index 46a39b25114..ad921504ff8 100644
--- a/apps/shell/shell-profile.c
+++ b/apps/shell/shell-profile.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-profile.c,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-profile.h b/apps/shell/shell-profile.h
index d0d268918ac..202a6036f22 100644
--- a/apps/shell/shell-profile.h
+++ b/apps/shell/shell-profile.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-profile.h,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-ps.c b/apps/shell/shell-ps.c
index 673369515a8..dd544ddfe19 100644
--- a/apps/shell/shell-ps.c
+++ b/apps/shell/shell-ps.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-ps.c,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-ps.h b/apps/shell/shell-ps.h
index d9213e56770..c8437a8b251 100644
--- a/apps/shell/shell-ps.h
+++ b/apps/shell/shell-ps.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-ps.h,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-reboot.c b/apps/shell/shell-reboot.c
index ded90cf5ff8..acf98d83a56 100644
--- a/apps/shell/shell-reboot.c
+++ b/apps/shell/shell-reboot.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-reboot.c,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-reboot.h b/apps/shell/shell-reboot.h
index 446e4a52376..6761dccb6d1 100644
--- a/apps/shell/shell-reboot.h
+++ b/apps/shell/shell-reboot.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-reboot.h,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rime-debug-runicast.c b/apps/shell/shell-rime-debug-runicast.c
index 1a792c599b5..1ab08cc2320 100644
--- a/apps/shell/shell-rime-debug-runicast.c
+++ b/apps/shell/shell-rime-debug-runicast.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime-debug-runicast.c,v 1.3 2010/03/19 13:24:26 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rime-debug-runicast.h b/apps/shell/shell-rime-debug-runicast.h
index 1cf75a39a7c..a8e54e10550 100644
--- a/apps/shell/shell-rime-debug-runicast.h
+++ b/apps/shell/shell-rime-debug-runicast.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime-debug-runicast.h,v 1.1 2010/01/31 19:35:12 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rime-debug.c b/apps/shell/shell-rime-debug.c
index 688bf8e45f8..fd83c07234b 100644
--- a/apps/shell/shell-rime-debug.c
+++ b/apps/shell/shell-rime-debug.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime-debug.c,v 1.5 2010/03/19 13:24:26 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rime-debug.h b/apps/shell/shell-rime-debug.h
index 1ad0855de77..d19521b0584 100644
--- a/apps/shell/shell-rime-debug.h
+++ b/apps/shell/shell-rime-debug.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime-debug.h,v 1.1 2008/07/04 08:23:00 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rime-neighbors.c b/apps/shell/shell-rime-neighbors.c
index 7d99af28874..85b04880575 100644
--- a/apps/shell/shell-rime-neighbors.c
+++ b/apps/shell/shell-rime-neighbors.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime-neighbors.c,v 1.4 2010/03/25 08:55:20 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rime-neighbors.h b/apps/shell/shell-rime-neighbors.h
index 73b777cf852..6929b3a706a 100644
--- a/apps/shell/shell-rime-neighbors.h
+++ b/apps/shell/shell-rime-neighbors.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime-neighbors.h,v 1.1 2009/05/10 21:04:06 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rime-netcmd.c b/apps/shell/shell-rime-netcmd.c
index 404d9383fc2..763088091df 100644
--- a/apps/shell/shell-rime-netcmd.c
+++ b/apps/shell/shell-rime-netcmd.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime-netcmd.c,v 1.9 2010/03/19 13:24:26 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rime-netcmd.h b/apps/shell/shell-rime-netcmd.h
index 92af343ab60..c21da643b50 100644
--- a/apps/shell/shell-rime-netcmd.h
+++ b/apps/shell/shell-rime-netcmd.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime-netcmd.h,v 1.1 2008/02/05 20:35:21 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rime-ping.c b/apps/shell/shell-rime-ping.c
index ff8869d0105..d146c8cda07 100644
--- a/apps/shell/shell-rime-ping.c
+++ b/apps/shell/shell-rime-ping.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime-ping.c,v 1.9 2009/03/31 17:39:36 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rime-ping.h b/apps/shell/shell-rime-ping.h
index 913638f449c..e807aa757fc 100644
--- a/apps/shell/shell-rime-ping.h
+++ b/apps/shell/shell-rime-ping.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime-ping.h,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rime-sendcmd.c b/apps/shell/shell-rime-sendcmd.c
index 781771c220c..80a427cbc51 100644
--- a/apps/shell/shell-rime-sendcmd.c
+++ b/apps/shell/shell-rime-sendcmd.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime-sendcmd.c,v 1.2 2009/11/08 19:43:00 adamdunkels Exp $
  */
 
 #include "contiki.h"
diff --git a/apps/shell/shell-rime-sendcmd.h b/apps/shell/shell-rime-sendcmd.h
index 60f8d7f9b34..e24d797ece4 100644
--- a/apps/shell/shell-rime-sendcmd.h
+++ b/apps/shell/shell-rime-sendcmd.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime-sendcmd.h,v 1.1 2009/04/16 14:33:47 fros4943 Exp $
  */
 
 #ifndef __SHELL_RIME_SENDCMD_H__
diff --git a/apps/shell/shell-rime-sniff.c b/apps/shell/shell-rime-sniff.c
index aa2d9cf7552..44cb82c6374 100644
--- a/apps/shell/shell-rime-sniff.c
+++ b/apps/shell/shell-rime-sniff.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime-sniff.c,v 1.3 2009/03/12 21:58:20 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rime-sniff.h b/apps/shell/shell-rime-sniff.h
index cc95e656b91..de0369e63ce 100644
--- a/apps/shell/shell-rime-sniff.h
+++ b/apps/shell/shell-rime-sniff.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime-sniff.h,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rime-unicast.c b/apps/shell/shell-rime-unicast.c
index f9db35a1c8f..16d44fc729a 100644
--- a/apps/shell/shell-rime-unicast.c
+++ b/apps/shell/shell-rime-unicast.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime-unicast.c,v 1.4 2010/03/19 13:24:26 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rime-unicast.h b/apps/shell/shell-rime-unicast.h
index d9afe6a9940..bfec8920905 100644
--- a/apps/shell/shell-rime-unicast.h
+++ b/apps/shell/shell-rime-unicast.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime-unicast.h,v 1.1 2009/05/10 21:04:40 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rime.c b/apps/shell/shell-rime.c
index 0403e3ecf79..0d20b774f55 100644
--- a/apps/shell/shell-rime.c
+++ b/apps/shell/shell-rime.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime.c,v 1.27 2010/10/12 11:36:42 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rime.h b/apps/shell/shell-rime.h
index 545ec32492f..86be38c8a5f 100644
--- a/apps/shell/shell-rime.h
+++ b/apps/shell/shell-rime.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime.h,v 1.7 2010/09/13 13:29:30 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rsh.c b/apps/shell/shell-rsh.c
index 95a13b83eb2..e74d882c9c4 100644
--- a/apps/shell/shell-rsh.c
+++ b/apps/shell/shell-rsh.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rsh.c,v 1.3 2009/03/12 21:58:20 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-rsh.h b/apps/shell/shell-rsh.h
index 06704bab5da..2bfd7530527 100644
--- a/apps/shell/shell-rsh.h
+++ b/apps/shell/shell-rsh.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rsh.h,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-run.c b/apps/shell/shell-run.c
index 5c6bc769645..95f1e1038ac 100644
--- a/apps/shell/shell-run.c
+++ b/apps/shell/shell-run.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-run.c,v 1.1 2008/02/08 12:49:54 oliverschmidt Exp $
  */
 
 #include <string.h>
diff --git a/apps/shell/shell-run.h b/apps/shell/shell-run.h
index 4fc8ad97fe9..cd6e009530c 100644
--- a/apps/shell/shell-run.h
+++ b/apps/shell/shell-run.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-run.h,v 1.1 2008/02/08 12:49:54 oliverschmidt Exp $
  */
 
 #ifndef __SHELL_RUN_H__
diff --git a/apps/shell/shell-sendtest.c b/apps/shell/shell-sendtest.c
index 2fa7213a0a5..e518fbc7738 100644
--- a/apps/shell/shell-sendtest.c
+++ b/apps/shell/shell-sendtest.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-sendtest.c,v 1.6 2009/11/03 10:04:23 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-sendtest.h b/apps/shell/shell-sendtest.h
index 91c7ccd0104..9a15c12a167 100644
--- a/apps/shell/shell-sendtest.h
+++ b/apps/shell/shell-sendtest.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-sendtest.h,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-sensortweet.c b/apps/shell/shell-sensortweet.c
index edaba505322..4cc539398fc 100644
--- a/apps/shell/shell-sensortweet.c
+++ b/apps/shell/shell-sensortweet.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-sensortweet.c,v 1.2 2009/09/09 21:06:51 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-sensortweet.h b/apps/shell/shell-sensortweet.h
index 0d53a12853a..a907c346554 100644
--- a/apps/shell/shell-sensortweet.h
+++ b/apps/shell/shell-sensortweet.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-sensortweet.h,v 1.1 2009/05/11 17:11:37 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-sky.c b/apps/shell/shell-sky.c
index 52063be7e42..17883fc271c 100644
--- a/apps/shell/shell-sky.c
+++ b/apps/shell/shell-sky.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-sky.c,v 1.17 2010/10/12 11:34:08 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-sky.h b/apps/shell/shell-sky.h
index da46a04df2e..3f962c79806 100644
--- a/apps/shell/shell-sky.h
+++ b/apps/shell/shell-sky.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-sky.h,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-tcpsend.c b/apps/shell/shell-tcpsend.c
index 166cb5b0863..cd1be1411ff 100644
--- a/apps/shell/shell-tcpsend.c
+++ b/apps/shell/shell-tcpsend.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: shell-tcpsend.c,v 1.5 2010/05/31 15:22:08 nifi Exp $
  */
 
 #include <string.h>
diff --git a/apps/shell/shell-tcpsend.h b/apps/shell/shell-tcpsend.h
index 620dfc2a1dc..867fb0552b1 100644
--- a/apps/shell/shell-tcpsend.h
+++ b/apps/shell/shell-tcpsend.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-tcpsend.h,v 1.1 2009/03/06 00:29:33 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-text.c b/apps/shell/shell-text.c
index 67c816adc78..c9fd8822370 100644
--- a/apps/shell/shell-text.c
+++ b/apps/shell/shell-text.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-text.c,v 1.7 2010/09/13 13:29:47 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-text.h b/apps/shell/shell-text.h
index 4606d1946cd..71705f030ce 100644
--- a/apps/shell/shell-text.h
+++ b/apps/shell/shell-text.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-text.h,v 1.2 2010/02/03 20:37:29 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-time.c b/apps/shell/shell-time.c
index 4999354cd1b..eb7ceec7c64 100644
--- a/apps/shell/shell-time.c
+++ b/apps/shell/shell-time.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-time.c,v 1.9 2010/10/20 15:18:49 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-time.h b/apps/shell/shell-time.h
index bd62689b9b3..85b4bffe6b7 100644
--- a/apps/shell/shell-time.h
+++ b/apps/shell/shell-time.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-time.h,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-tweet.c b/apps/shell/shell-tweet.c
index 93a9185a107..ca6f96a7380 100644
--- a/apps/shell/shell-tweet.c
+++ b/apps/shell/shell-tweet.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-tweet.c,v 1.1 2009/05/11 17:10:55 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-tweet.h b/apps/shell/shell-tweet.h
index b6cf2980367..4b73418dd90 100644
--- a/apps/shell/shell-tweet.h
+++ b/apps/shell/shell-tweet.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-tweet.h,v 1.1 2009/05/11 17:10:55 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-udpsend.c b/apps/shell/shell-udpsend.c
index 1d3de33e71d..3568aa86e7f 100644
--- a/apps/shell/shell-udpsend.c
+++ b/apps/shell/shell-udpsend.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: shell-udpsend.c,v 1.7 2010/10/19 18:29:03 adamdunkels Exp $
  */
 
 #include <string.h>
diff --git a/apps/shell/shell-udpsend.h b/apps/shell/shell-udpsend.h
index 137509f19a8..92a26cbe91c 100644
--- a/apps/shell/shell-udpsend.h
+++ b/apps/shell/shell-udpsend.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-udpsend.h,v 1.1 2009/03/06 00:29:33 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-vars.c b/apps/shell/shell-vars.c
index 1957ffc5129..42948f5aa9a 100644
--- a/apps/shell/shell-vars.c
+++ b/apps/shell/shell-vars.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-vars.c,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-vars.h b/apps/shell/shell-vars.h
index 5b109dd2e8d..72d7208729a 100644
--- a/apps/shell/shell-vars.h
+++ b/apps/shell/shell-vars.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-vars.h,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell-wget.c b/apps/shell/shell-wget.c
index 401807fb1e5..c2986d1a060 100644
--- a/apps/shell/shell-wget.c
+++ b/apps/shell/shell-wget.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-wget.c,v 1.3 2010/06/09 08:36:43 nifi Exp $
  */
 
 /**
diff --git a/apps/shell/shell-wget.h b/apps/shell/shell-wget.h
index 6153cb7d367..2a97113cd8f 100644
--- a/apps/shell/shell-wget.h
+++ b/apps/shell/shell-wget.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-wget.h,v 1.1 2008/11/09 12:36:23 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell.c b/apps/shell/shell.c
index 4d5018d76b1..7efecdf5f5d 100644
--- a/apps/shell/shell.c
+++ b/apps/shell/shell.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell.c,v 1.13 2009/03/02 20:44:15 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/shell/shell.h b/apps/shell/shell.h
index 786ae54adbd..684036020b4 100644
--- a/apps/shell/shell.h
+++ b/apps/shell/shell.h
@@ -48,7 +48,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell.h,v 1.24 2010/10/20 15:21:43 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/telnet/simpletelnet.c b/apps/telnet/simpletelnet.c
index cbd744dd781..bbc43d43599 100644
--- a/apps/telnet/simpletelnet.c
+++ b/apps/telnet/simpletelnet.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: simpletelnet.c,v 1.7 2010/10/19 18:29:03 adamdunkels Exp $
  *
  */
 
diff --git a/apps/telnet/simpletelnet.h b/apps/telnet/simpletelnet.h
index e362b1a43c2..6eb09bdb71b 100644
--- a/apps/telnet/simpletelnet.h
+++ b/apps/telnet/simpletelnet.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: simpletelnet.h,v 1.3 2007/11/17 22:27:09 oliverschmidt Exp $
  *
  */
 #ifndef __SIMPLETELNET_H__
diff --git a/apps/telnet/telnet-dsc.c b/apps/telnet/telnet-dsc.c
index 93df5f7c7b3..68b58001a1b 100644
--- a/apps/telnet/telnet-dsc.c
+++ b/apps/telnet/telnet-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: telnet-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $
  *
  */
 
diff --git a/apps/telnet/telnet-dsc.h b/apps/telnet/telnet-dsc.h
index 14ee95fbaeb..e32e3e6982c 100644
--- a/apps/telnet/telnet-dsc.h
+++ b/apps/telnet/telnet-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: telnet-dsc.h,v 1.1 2006/06/17 22:41:12 adamdunkels Exp $
  *
  */
 #ifndef __TELNET_DSC_H__
diff --git a/apps/telnet/telnet.c b/apps/telnet/telnet.c
index 95ee9d05907..f6859e55877 100644
--- a/apps/telnet/telnet.c
+++ b/apps/telnet/telnet.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: telnet.c,v 1.3 2010/10/19 18:29:03 adamdunkels Exp $
  *
  */
 
diff --git a/apps/telnet/telnet.h b/apps/telnet/telnet.h
index 638b0c4f4c3..482d7f9343d 100644
--- a/apps/telnet/telnet.h
+++ b/apps/telnet/telnet.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: telnet.h,v 1.2 2009/03/05 23:56:56 adamdunkels Exp $
  *
  */
 #ifndef __TELNET_H__
diff --git a/apps/telnetd/telnetd-dsc.c b/apps/telnetd/telnetd-dsc.c
index 9ff99dec5b9..16e3c57df79 100644
--- a/apps/telnetd/telnetd-dsc.c
+++ b/apps/telnetd/telnetd-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: telnetd-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $
  *
  */
 
diff --git a/apps/telnetd/telnetd-dsc.h b/apps/telnetd/telnetd-dsc.h
index 1501f6fbd1b..01389ce6108 100644
--- a/apps/telnetd/telnetd-dsc.h
+++ b/apps/telnetd/telnetd-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: telnetd-dsc.h,v 1.1 2006/06/17 22:41:13 adamdunkels Exp $
  *
  */
 #ifndef __TELNETD_DSC_H__
diff --git a/apps/telnetd/telnetd-gui.c b/apps/telnetd/telnetd-gui.c
index 5d9285fa858..cab0740ca92 100644
--- a/apps/telnetd/telnetd-gui.c
+++ b/apps/telnetd/telnetd-gui.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki desktop OS.
  *
- * $Id: telnetd-gui.c,v 1.6 2008/11/10 22:10:33 oliverschmidt Exp $
  *
  */
 
diff --git a/apps/telnetd/telnetd.c b/apps/telnetd/telnetd.c
index d994629dbe8..e0967e6c232 100644
--- a/apps/telnetd/telnetd.c
+++ b/apps/telnetd/telnetd.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki desktop OS.
  *
- * $Id: telnetd.c,v 1.14 2010/10/19 18:29:03 adamdunkels Exp $
  *
  */
 
diff --git a/apps/telnetd/telnetd.h b/apps/telnetd/telnetd.h
index c8bbe8eb4bc..3c9d6c0151d 100644
--- a/apps/telnetd/telnetd.h
+++ b/apps/telnetd/telnetd.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: telnetd.h,v 1.4 2008/02/09 17:15:58 oliverschmidt Exp $
  *
  */
 #ifndef __TELNETD_H__
diff --git a/apps/twitter/twitter.c b/apps/twitter/twitter.c
index f5675355f40..30d396aba8c 100644
--- a/apps/twitter/twitter.c
+++ b/apps/twitter/twitter.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: twitter.c,v 1.3 2010/10/19 18:29:03 adamdunkels Exp $
  */
 
 /**
diff --git a/apps/twitter/twitter.h b/apps/twitter/twitter.h
index b07422b0f69..0088821b856 100644
--- a/apps/twitter/twitter.h
+++ b/apps/twitter/twitter.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: twitter.h,v 1.1 2009/05/11 16:57:49 adamdunkels Exp $
  */
 
 #ifndef __TWITTER_H__
diff --git a/apps/vnc/vnc-draw.h b/apps/vnc/vnc-draw.h
index ec806a3b90f..e8a25339681 100644
--- a/apps/vnc/vnc-draw.h
+++ b/apps/vnc/vnc-draw.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki VNC client.
  *
- * $Id: vnc-draw.h,v 1.1 2006/06/17 23:08:35 adamdunkels Exp $
  *
  */
 
diff --git a/apps/vnc/vnc-dsc.c b/apps/vnc/vnc-dsc.c
index 90262f2b7b7..df1d1fbe83a 100644
--- a/apps/vnc/vnc-dsc.c
+++ b/apps/vnc/vnc-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: vnc-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $
  *
  */
 
diff --git a/apps/vnc/vnc-dsc.h b/apps/vnc/vnc-dsc.h
index 2eff72c1544..e55d8dfd621 100644
--- a/apps/vnc/vnc-dsc.h
+++ b/apps/vnc/vnc-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: vnc-dsc.h,v 1.1 2006/06/17 23:08:35 adamdunkels Exp $
  *
  */
 #ifndef __VNC_DSC_H__
diff --git a/apps/vnc/vnc-viewer.c b/apps/vnc/vnc-viewer.c
index b4cd36878d7..946a63852ec 100644
--- a/apps/vnc/vnc-viewer.c
+++ b/apps/vnc/vnc-viewer.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: vnc-viewer.c,v 1.4 2010/10/19 18:29:03 adamdunkels Exp $
  *
  */
 
diff --git a/apps/vnc/vnc-viewer.h b/apps/vnc/vnc-viewer.h
index 2ae97c682ea..a2e9176c88e 100644
--- a/apps/vnc/vnc-viewer.h
+++ b/apps/vnc/vnc-viewer.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki VNC client.
  *
- * $Id: vnc-viewer.h,v 1.2 2007/08/30 14:39:17 matsutsuka Exp $
  *
  */
 
diff --git a/apps/vnc/vnc.c b/apps/vnc/vnc.c
index 2618f423f10..8a1f53ef54e 100644
--- a/apps/vnc/vnc.c
+++ b/apps/vnc/vnc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki VNC client
  *
- * $Id: vnc.c,v 1.2 2010/05/31 15:22:08 nifi Exp $
  *
  */
 
diff --git a/apps/vnc/vnc.h b/apps/vnc/vnc.h
index 5015ba623f6..5be0ff890ce 100644
--- a/apps/vnc/vnc.h
+++ b/apps/vnc/vnc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki VNC client.
  *
- * $Id: vnc.h,v 1.1 2006/06/17 23:08:35 adamdunkels Exp $
  *
  */
 #ifndef __VNC_H__
diff --git a/apps/webbrowser/htmlparser.c b/apps/webbrowser/htmlparser.c
index ed5c53e741c..c336401911e 100644
--- a/apps/webbrowser/htmlparser.c
+++ b/apps/webbrowser/htmlparser.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment 
  *
- * $Id: htmlparser.c,v 1.8 2007/11/30 21:53:50 oliverschmidt Exp $
  *
  */
 
diff --git a/apps/webbrowser/htmlparser.h b/apps/webbrowser/htmlparser.h
index 6a4e70275d2..3e5678f85d2 100644
--- a/apps/webbrowser/htmlparser.h
+++ b/apps/webbrowser/htmlparser.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment 
  *
- * $Id: htmlparser.h,v 1.2 2006/10/06 21:14:28 oliverschmidt Exp $
  *
  */
 #ifndef __HTMLPARSER_H__
diff --git a/apps/webbrowser/webclient.c b/apps/webbrowser/webclient.c
index 3c68d39f52f..f5e6ca5083c 100644
--- a/apps/webbrowser/webclient.c
+++ b/apps/webbrowser/webclient.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the "contiki" web browser.
  *
- * $Id: webclient.c,v 1.11 2010/10/19 18:29:03 adamdunkels Exp $
  *
  */
 
diff --git a/apps/webbrowser/webclient.h b/apps/webbrowser/webclient.h
index 40821690c08..2be57aa9ca4 100644
--- a/apps/webbrowser/webclient.h
+++ b/apps/webbrowser/webclient.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the "contiki" web browser.
  *
- * $Id: webclient.h,v 1.2 2010/06/14 14:08:17 nifi Exp $
  *
  */
 #ifndef __WEBCLIENT_H__
diff --git a/apps/webbrowser/www-dsc.c b/apps/webbrowser/www-dsc.c
index f4cf170c34a..f6a03e240f7 100644
--- a/apps/webbrowser/www-dsc.c
+++ b/apps/webbrowser/www-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: www-dsc.c,v 1.3 2007/09/06 01:36:11 matsutsuka Exp $
  *
  */
 
diff --git a/apps/webbrowser/www-dsc.h b/apps/webbrowser/www-dsc.h
index 7eda2f05138..ee204673515 100644
--- a/apps/webbrowser/www-dsc.h
+++ b/apps/webbrowser/www-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: www-dsc.h,v 1.1 2006/06/17 22:41:14 adamdunkels Exp $
  *
  */
 #ifndef __WWW_DSC_H__
diff --git a/apps/webbrowser/www.c b/apps/webbrowser/www.c
index 9159690193e..279f882bcea 100644
--- a/apps/webbrowser/www.c
+++ b/apps/webbrowser/www.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: www.c,v 1.14 2010/07/21 21:03:06 oliverschmidt Exp $
  *
  */
 
diff --git a/apps/webbrowser/www.h b/apps/webbrowser/www.h
index 61e1a7ae493..1627361efe2 100644
--- a/apps/webbrowser/www.h
+++ b/apps/webbrowser/www.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: www.h,v 1.4 2008/11/09 10:58:06 adamdunkels Exp $
  *
  */
 #ifndef __WWW_H__
diff --git a/apps/webserver-nano/httpd-cfs.c b/apps/webserver-nano/httpd-cfs.c
index db4233ee612..b346987b3e2 100644
--- a/apps/webserver-nano/httpd-cfs.c
+++ b/apps/webserver-nano/httpd-cfs.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-cfs.c,v 1.26 2011/01/25 20:13:41 oliverschmidt Exp $
  */
 
 #include <stdio.h>
diff --git a/apps/webserver-nano/httpd-cfs.h b/apps/webserver-nano/httpd-cfs.h
index 8f8fc1203c4..f99e2271d62 100644
--- a/apps/webserver-nano/httpd-cfs.h
+++ b/apps/webserver-nano/httpd-cfs.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd-cfs.h,v 1.3 2010/04/11 20:10:12 oliverschmidt Exp $
  *
  */
 
diff --git a/apps/webserver-nano/httpd-cgi.h b/apps/webserver-nano/httpd-cgi.h
index f6cae6291a4..21b337a828b 100644
--- a/apps/webserver-nano/httpd-cgi.h
+++ b/apps/webserver-nano/httpd-cgi.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd-cgi.h,v 1.3 2008/10/14 11:07:57 adamdunkels Exp $
  *
  */
 
diff --git a/apps/webserver-nano/httpd-fsdata.h b/apps/webserver-nano/httpd-fsdata.h
index c77fdd65d75..5d27e299da6 100644
--- a/apps/webserver-nano/httpd-fsdata.h
+++ b/apps/webserver-nano/httpd-fsdata.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-fsdata.h,v 1.1 2006/06/17 22:41:14 adamdunkels Exp $
  */
 #ifndef __HTTPD_FSDATA_H__
 #define __HTTPD_FSDATA_H__
diff --git a/apps/webserver-nano/urlconv.c b/apps/webserver-nano/urlconv.c
index 29585c89538..3d5e583df7d 100644
--- a/apps/webserver-nano/urlconv.c
+++ b/apps/webserver-nano/urlconv.c
@@ -30,7 +30,6 @@
  *
  * Author: Kajtar Zsolt <soci@c64.rulez.org>
  *
- * $Id: urlconv.c,v 1.4 2010/09/29 09:35:56 oliverschmidt Exp $
  */
 
 #include <string.h>
diff --git a/apps/webserver-nano/urlconv.h b/apps/webserver-nano/urlconv.h
index 23d6bfe5125..75090a090f0 100644
--- a/apps/webserver-nano/urlconv.h
+++ b/apps/webserver-nano/urlconv.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: urlconv.h,v 1.3 2010/08/30 19:44:38 oliverschmidt Exp $
  */
 
 #ifndef __URLCONV_H__
diff --git a/apps/webserver-nano/webserver-dsc.c b/apps/webserver-nano/webserver-dsc.c
index 9292db7fec0..b7ec008061b 100644
--- a/apps/webserver-nano/webserver-dsc.c
+++ b/apps/webserver-nano/webserver-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: webserver-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $
  *
  */
 
diff --git a/apps/webserver-nano/webserver-dsc.h b/apps/webserver-nano/webserver-dsc.h
index 5abd496c374..c329f41d8f1 100644
--- a/apps/webserver-nano/webserver-dsc.h
+++ b/apps/webserver-nano/webserver-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: webserver-dsc.h,v 1.1 2006/06/17 22:41:14 adamdunkels Exp $
  *
  */
 #ifndef __WEBSERVER_DSC_H__
diff --git a/apps/webserver-nano/webserver-nogui.h b/apps/webserver-nano/webserver-nogui.h
index b362a8d29d9..7f18670163f 100644
--- a/apps/webserver-nano/webserver-nogui.h
+++ b/apps/webserver-nano/webserver-nogui.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: webserver-nogui.h,v 1.4 2008/10/14 11:07:57 adamdunkels Exp $
  *
  */
 #ifndef __WEBSERVER_NOGUI_H__
diff --git a/apps/webserver-nano/webserver.c b/apps/webserver-nano/webserver.c
index 8e6b8e9aa10..f63e40a8ea1 100644
--- a/apps/webserver-nano/webserver.c
+++ b/apps/webserver-nano/webserver.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: webserver.c,v 1.5 2008/02/08 22:53:32 oliverschmidt Exp $
  *
  */
 
diff --git a/apps/webserver-nano/webserver.h b/apps/webserver-nano/webserver.h
index ead46dc53ef..fe9f255a12f 100644
--- a/apps/webserver-nano/webserver.h
+++ b/apps/webserver-nano/webserver.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki operating system
  *
- * $Id: webserver.h,v 1.2 2007/04/23 21:19:55 oliverschmidt Exp $
  *
  */
 #ifndef __WEBSERVER_H__
diff --git a/apps/webserver/httpd-cfs.c b/apps/webserver/httpd-cfs.c
index db4233ee612..b346987b3e2 100644
--- a/apps/webserver/httpd-cfs.c
+++ b/apps/webserver/httpd-cfs.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-cfs.c,v 1.26 2011/01/25 20:13:41 oliverschmidt Exp $
  */
 
 #include <stdio.h>
diff --git a/apps/webserver/httpd-cfs.h b/apps/webserver/httpd-cfs.h
index 8f8fc1203c4..f99e2271d62 100644
--- a/apps/webserver/httpd-cfs.h
+++ b/apps/webserver/httpd-cfs.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd-cfs.h,v 1.3 2010/04/11 20:10:12 oliverschmidt Exp $
  *
  */
 
diff --git a/apps/webserver/httpd-cgi.c b/apps/webserver/httpd-cgi.c
index c069f531a5b..f1cf87bbf21 100644
--- a/apps/webserver/httpd-cgi.c
+++ b/apps/webserver/httpd-cgi.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd-cgi.c,v 1.16 2010/10/19 18:29:03 adamdunkels Exp $
  *
  */
 
diff --git a/apps/webserver/httpd-cgi.h b/apps/webserver/httpd-cgi.h
index f6cae6291a4..21b337a828b 100644
--- a/apps/webserver/httpd-cgi.h
+++ b/apps/webserver/httpd-cgi.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd-cgi.h,v 1.3 2008/10/14 11:07:57 adamdunkels Exp $
  *
  */
 
diff --git a/apps/webserver/httpd-fs.c b/apps/webserver/httpd-fs.c
index c09131099e4..569d23e3be9 100644
--- a/apps/webserver/httpd-fs.c
+++ b/apps/webserver/httpd-fs.c
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-fs.c,v 1.5 2008/10/14 11:07:57 adamdunkels Exp $
  */
 
 #include "contiki-net.h"
diff --git a/apps/webserver/httpd-fs.h b/apps/webserver/httpd-fs.h
index f61b691ae8c..c8cab68d376 100644
--- a/apps/webserver/httpd-fs.h
+++ b/apps/webserver/httpd-fs.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-fs.h,v 1.3 2008/10/14 11:07:57 adamdunkels Exp $
  */
 #ifndef __HTTPD_FS_H__
 #define __HTTPD_FS_H__
diff --git a/apps/webserver/httpd-fsdata.h b/apps/webserver/httpd-fsdata.h
index c77fdd65d75..5d27e299da6 100644
--- a/apps/webserver/httpd-fsdata.h
+++ b/apps/webserver/httpd-fsdata.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-fsdata.h,v 1.1 2006/06/17 22:41:14 adamdunkels Exp $
  */
 #ifndef __HTTPD_FSDATA_H__
 #define __HTTPD_FSDATA_H__
diff --git a/apps/webserver/httpd.c b/apps/webserver/httpd.c
index 59533b09536..d9c67e369fe 100644
--- a/apps/webserver/httpd.c
+++ b/apps/webserver/httpd.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd.c,v 1.20 2010/12/14 22:45:22 dak664 Exp $
  */
  
 #include <stdio.h>
diff --git a/apps/webserver/httpd.h b/apps/webserver/httpd.h
index 21a5baf483d..8b0e99818cc 100644
--- a/apps/webserver/httpd.h
+++ b/apps/webserver/httpd.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd.h,v 1.6 2009/08/12 18:23:37 dak664 Exp $
  *
  */
 
diff --git a/apps/webserver/urlconv.c b/apps/webserver/urlconv.c
index 29585c89538..3d5e583df7d 100644
--- a/apps/webserver/urlconv.c
+++ b/apps/webserver/urlconv.c
@@ -30,7 +30,6 @@
  *
  * Author: Kajtar Zsolt <soci@c64.rulez.org>
  *
- * $Id: urlconv.c,v 1.4 2010/09/29 09:35:56 oliverschmidt Exp $
  */
 
 #include <string.h>
diff --git a/apps/webserver/urlconv.h b/apps/webserver/urlconv.h
index 23d6bfe5125..75090a090f0 100644
--- a/apps/webserver/urlconv.h
+++ b/apps/webserver/urlconv.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: urlconv.h,v 1.3 2010/08/30 19:44:38 oliverschmidt Exp $
  */
 
 #ifndef __URLCONV_H__
diff --git a/apps/webserver/webserver-dsc.c b/apps/webserver/webserver-dsc.c
index 11233765060..0a61f925158 100644
--- a/apps/webserver/webserver-dsc.c
+++ b/apps/webserver/webserver-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: webserver-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $
  *
  */
 
diff --git a/apps/webserver/webserver-dsc.h b/apps/webserver/webserver-dsc.h
index 5abd496c374..c329f41d8f1 100644
--- a/apps/webserver/webserver-dsc.h
+++ b/apps/webserver/webserver-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: webserver-dsc.h,v 1.1 2006/06/17 22:41:14 adamdunkels Exp $
  *
  */
 #ifndef __WEBSERVER_DSC_H__
diff --git a/apps/webserver/webserver-nogui.c b/apps/webserver/webserver-nogui.c
index 37b139f5653..ba2f5c9e531 100644
--- a/apps/webserver/webserver-nogui.c
+++ b/apps/webserver/webserver-nogui.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS.
  *
- * $Id: webserver-nogui.c,v 1.7 2009/08/12 18:23:37 dak664 Exp $
  *
  */
 
diff --git a/apps/webserver/webserver-nogui.h b/apps/webserver/webserver-nogui.h
index b362a8d29d9..7f18670163f 100644
--- a/apps/webserver/webserver-nogui.h
+++ b/apps/webserver/webserver-nogui.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: webserver-nogui.h,v 1.4 2008/10/14 11:07:57 adamdunkels Exp $
  *
  */
 #ifndef __WEBSERVER_NOGUI_H__
diff --git a/apps/webserver/webserver.c b/apps/webserver/webserver.c
index 8e6b8e9aa10..f63e40a8ea1 100644
--- a/apps/webserver/webserver.c
+++ b/apps/webserver/webserver.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: webserver.c,v 1.5 2008/02/08 22:53:32 oliverschmidt Exp $
  *
  */
 
diff --git a/apps/webserver/webserver.h b/apps/webserver/webserver.h
index ead46dc53ef..fe9f255a12f 100644
--- a/apps/webserver/webserver.h
+++ b/apps/webserver/webserver.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki operating system
  *
- * $Id: webserver.h,v 1.2 2007/04/23 21:19:55 oliverschmidt Exp $
  *
  */
 #ifndef __WEBSERVER_H__
diff --git a/core/cfs/cfs-eeprom.c b/core/cfs/cfs-eeprom.c
index fd7f43a40c7..a0a8af6eaf6 100644
--- a/core/cfs/cfs-eeprom.c
+++ b/core/cfs/cfs-eeprom.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: cfs-eeprom.c,v 1.11 2009/07/23 16:13:48 dak664 Exp $
  */
 
 #include "cfs/cfs.h"
diff --git a/core/cfs/cfs-posix-dir.c b/core/cfs/cfs-posix-dir.c
index 092973ece29..3423167d90c 100644
--- a/core/cfs/cfs-posix-dir.c
+++ b/core/cfs/cfs-posix-dir.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: cfs-posix-dir.c,v 1.2 2008/03/29 13:54:56 oliverschmidt Exp $
  */
 
 #include <stdio.h>
diff --git a/core/cfs/cfs-posix.c b/core/cfs/cfs-posix.c
index 23b41789d49..1ee1b99df53 100644
--- a/core/cfs/cfs-posix.c
+++ b/core/cfs/cfs-posix.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: cfs-posix.c,v 1.15 2009/08/10 09:50:55 nvt-se Exp $
  */
 
 #include <stdio.h>
diff --git a/core/cfs/cfs-ram.c b/core/cfs/cfs-ram.c
index b12108447b8..e5675396de6 100644
--- a/core/cfs/cfs-ram.c
+++ b/core/cfs/cfs-ram.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: cfs-ram.c,v 1.10 2009/02/27 14:25:38 nvt-se Exp $
  */
 
 #include <string.h>
diff --git a/core/cfs/cfs-xmem.c b/core/cfs/cfs-xmem.c
index ef48b8cefea..98433728275 100644
--- a/core/cfs/cfs-xmem.c
+++ b/core/cfs/cfs-xmem.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: cfs-xmem.c,v 1.11 2009/02/27 14:25:38 nvt-se Exp $
  */
 
 #include "cfs/cfs.h"
diff --git a/core/cfs/cfs.h b/core/cfs/cfs.h
index 17bf002367b..b5de4723565 100644
--- a/core/cfs/cfs.h
+++ b/core/cfs/cfs.h
@@ -54,7 +54,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: cfs.h,v 1.18 2009/03/01 12:28:39 oliverschmidt Exp $
  */
 #ifndef __CFS_H__
 #define __CFS_H__
diff --git a/core/contiki-lib.h b/core/contiki-lib.h
index 2451227d4f2..efacd954a9c 100644
--- a/core/contiki-lib.h
+++ b/core/contiki-lib.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: contiki-lib.h,v 1.1 2006/06/17 22:41:15 adamdunkels Exp $
  */
 #ifndef __CONTIKI_LIB_H__
 #define __CONTIKI_LIB_H__
diff --git a/core/contiki-net.h b/core/contiki-net.h
index 9f443bd5c95..935e2a21116 100644
--- a/core/contiki-net.h
+++ b/core/contiki-net.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: contiki-net.h,v 1.8 2010/03/15 16:54:35 nifi Exp $
  */
 #ifndef __CONTIKI_NET_H__
 #define __CONTIKI_NET_H__
diff --git a/core/contiki-version.h b/core/contiki-version.h
index 6f0e5e28c5e..ee296482199 100644
--- a/core/contiki-version.h
+++ b/core/contiki-version.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: contiki-version.h,v 1.10 2010/11/02 10:55:32 adamdunkels Exp $
  */
 #ifndef __CONTIKI_VERSION__
 #define __CONTIKI_VERSION__
diff --git a/core/contiki.h b/core/contiki.h
index 84b3ba23135..bc4279190e5 100644
--- a/core/contiki.h
+++ b/core/contiki.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: contiki.h,v 1.6 2010/06/14 07:34:36 adamdunkels Exp $
  */
 #ifndef __CONTIKI_H__
 #define __CONTIKI_H__
diff --git a/core/ctk/ctk-conio.c b/core/ctk/ctk-conio.c
index a27d944d949..7bf4e804d46 100644
--- a/core/ctk/ctk-conio.c
+++ b/core/ctk/ctk-conio.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the "ctk" console GUI toolkit for cc65
  *
- * $Id: ctk-conio.c,v 1.14 2010/07/20 22:19:23 oliverschmidt Exp $
  *
  */
 
diff --git a/core/ctk/ctk-conio.h b/core/ctk/ctk-conio.h
index 869bd179f87..df4073c627f 100644
--- a/core/ctk/ctk-conio.h
+++ b/core/ctk/ctk-conio.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the "ctk" console GUI toolkit for cc65
  *
- * $Id: ctk-conio.h,v 1.1 2006/06/17 22:41:15 adamdunkels Exp $
  *
  */
 
diff --git a/core/ctk/ctk-draw.h b/core/ctk/ctk-draw.h
index 39f8c06f5d9..bdd72d7175a 100644
--- a/core/ctk/ctk-draw.h
+++ b/core/ctk/ctk-draw.h
@@ -45,7 +45,6 @@
  *
  * This file is part of the Contiki desktop OS.
  *
- * $Id: ctk-draw.h,v 1.2 2006/08/26 23:56:18 oliverschmidt Exp $
  *
  */
 
diff --git a/core/ctk/ctk-mouse.h b/core/ctk/ctk-mouse.h
index 1139d07e4cd..6742f40e9b7 100644
--- a/core/ctk/ctk-mouse.h
+++ b/core/ctk/ctk-mouse.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the "ctk" console GUI toolkit for cc65
  *
- * $Id: ctk-mouse.h,v 1.2 2009/02/27 08:18:54 oliverschmidt Exp $
  *
  */
 #ifndef __CTK_MOUSE_H__
diff --git a/core/ctk/ctk-vncarch.h b/core/ctk/ctk-vncarch.h
index a29d5c5b14b..7082005d8ec 100644
--- a/core/ctk/ctk-vncarch.h
+++ b/core/ctk/ctk-vncarch.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the "ctk" console GUI toolkit for cc65
  *
- * $Id: ctk-vncarch.h,v 1.1 2006/06/17 22:41:16 adamdunkels Exp $
  *
  */
 #ifndef __CTK_VNCARCH_H__
diff --git a/core/ctk/ctk-vncfont.h b/core/ctk/ctk-vncfont.h
index b083fbb7898..bd277bd3e56 100644
--- a/core/ctk/ctk-vncfont.h
+++ b/core/ctk/ctk-vncfont.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki VNC server
  *
- * $Id: ctk-vncfont.h,v 1.1 2006/06/17 22:41:16 adamdunkels Exp $
  *
  */
 #ifndef __CTK_VNCFONT_H__
diff --git a/core/ctk/ctk-vncserver.c b/core/ctk/ctk-vncserver.c
index b04d5b61f00..ad7330325c5 100644
--- a/core/ctk/ctk-vncserver.c
+++ b/core/ctk/ctk-vncserver.c
@@ -41,7 +41,6 @@
  *
  * This file is part of the "ctk" console GUI toolkit for cc65
  *
- * $Id: ctk-vncserver.c,v 1.3 2010/10/19 18:29:04 adamdunkels Exp $
  *
  */
 
diff --git a/core/ctk/ctk-vncserver.h b/core/ctk/ctk-vncserver.h
index d20533b2f84..1b09a8cb3b6 100644
--- a/core/ctk/ctk-vncserver.h
+++ b/core/ctk/ctk-vncserver.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the "ctk" console GUI toolkit for cc65
  *
- * $Id: ctk-vncserver.h,v 1.2 2007/03/21 23:18:49 adamdunkels Exp $
  *
  */
 #ifndef __CTK_VNCSERVER_H__
diff --git a/core/ctk/ctk.c b/core/ctk/ctk.c
index 500659d5008..9bba40fe941 100644
--- a/core/ctk/ctk.c
+++ b/core/ctk/ctk.c
@@ -44,7 +44,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ctk.c,v 1.26 2010/09/09 20:21:26 oliverschmidt Exp $
  *
  */
 
diff --git a/core/ctk/ctk.h b/core/ctk/ctk.h
index 55b2fc203e2..150b15edf0a 100644
--- a/core/ctk/ctk.h
+++ b/core/ctk/ctk.h
@@ -43,7 +43,6 @@
  *
  * This file is part of the Contiki desktop OS.
  *
- * $Id: ctk.h,v 1.9 2009/02/28 10:43:30 oliverschmidt Exp $
  *
  */
 
diff --git a/core/ctk/vnc-out.c b/core/ctk/vnc-out.c
index de8691778bb..e4ffc10fd3b 100644
--- a/core/ctk/vnc-out.c
+++ b/core/ctk/vnc-out.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: vnc-out.c,v 1.3 2010/10/19 18:29:04 adamdunkels Exp $
  *
  */
 
diff --git a/core/ctk/vnc-out.h b/core/ctk/vnc-out.h
index c1707e784d1..e7187ad48f8 100644
--- a/core/ctk/vnc-out.h
+++ b/core/ctk/vnc-out.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: vnc-out.h,v 1.1 2006/06/17 22:41:16 adamdunkels Exp $
  *
  */
 
diff --git a/core/ctk/vnc-server.c b/core/ctk/vnc-server.c
index ad4624dddd0..40aa1414b93 100644
--- a/core/ctk/vnc-server.c
+++ b/core/ctk/vnc-server.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: vnc-server.c,v 1.3 2010/10/19 18:29:04 adamdunkels Exp $
  *
  */
 
diff --git a/core/ctk/vnc-server.h b/core/ctk/vnc-server.h
index b609a6891d4..1e0d6d24a65 100644
--- a/core/ctk/vnc-server.h
+++ b/core/ctk/vnc-server.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: vnc-server.h,v 1.1 2006/06/17 22:41:16 adamdunkels Exp $
  *
  */
 
diff --git a/core/dev/battery-sensor.h b/core/dev/battery-sensor.h
index 3b6a53ee899..606e83e0ec6 100644
--- a/core/dev/battery-sensor.h
+++ b/core/dev/battery-sensor.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: battery-sensor.h,v 1.1 2007/11/13 20:36:40 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/core/dev/button-sensor.h b/core/dev/button-sensor.h
index 75ae46fc389..8154ade1cf5 100644
--- a/core/dev/button-sensor.h
+++ b/core/dev/button-sensor.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: button-sensor.h,v 1.1 2007/03/15 21:42:09 adamdunkels Exp $
  */
 #ifndef __BUTTON_SENSOR_H__
 #define __BUTTON_SENSOR_H__
diff --git a/core/dev/cc2420-aes.c b/core/dev/cc2420-aes.c
index 6ed4020f7eb..9e464c4af08 100644
--- a/core/dev/cc2420-aes.c
+++ b/core/dev/cc2420-aes.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: cc2420-aes.c,v 1.5 2010/06/24 11:25:55 nifi Exp $
  */
 
 /**
diff --git a/core/dev/cc2420-aes.h b/core/dev/cc2420-aes.h
index a8d068d1917..bf909808618 100644
--- a/core/dev/cc2420-aes.h
+++ b/core/dev/cc2420-aes.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: cc2420-aes.h,v 1.3 2010/03/15 23:04:54 nifi Exp $
  */
 
 /**
diff --git a/core/dev/cc2420.c b/core/dev/cc2420.c
index 4cbd0aec7e9..3e685721505 100644
--- a/core/dev/cc2420.c
+++ b/core/dev/cc2420.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: cc2420.c,v 1.63 2011/01/09 21:09:28 adamdunkels Exp $
  */
 /*
  * This code is almost device independent and should be easy to port.
diff --git a/core/dev/cc2420.h b/core/dev/cc2420.h
index c23e0207f97..57ee01ed499 100644
--- a/core/dev/cc2420.h
+++ b/core/dev/cc2420.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: cc2420.h,v 1.14 2010/12/16 22:39:50 adamdunkels Exp $
  */
 
 /**
diff --git a/core/dev/cc2420_const.h b/core/dev/cc2420_const.h
index e32c89cf993..cc52e7bb874 100644
--- a/core/dev/cc2420_const.h
+++ b/core/dev/cc2420_const.h
@@ -28,7 +28,6 @@
  *
  */
 
-/* @(#)$Id: cc2420_const.h,v 1.4 2010/06/24 09:28:12 nifi Exp $ */
 
 #ifndef CC2420_CONST_H
 #define CC2420_CONST_H
diff --git a/core/dev/ds2411.c b/core/dev/ds2411.c
index 34299a92d7d..124d7a8d003 100644
--- a/core/dev/ds2411.c
+++ b/core/dev/ds2411.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: ds2411.c,v 1.5 2010/08/25 18:35:52 nifi Exp $
  */
 /*
  * Device driver for the Dallas Semiconductor DS2411 chip. Heavily
diff --git a/core/dev/ds2411.h b/core/dev/ds2411.h
index 1fd32350e45..8cece23f653 100644
--- a/core/dev/ds2411.h
+++ b/core/dev/ds2411.h
@@ -28,10 +28,8 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: ds2411.h,v 1.1 2006/06/17 22:41:16 adamdunkels Exp $
  */
 /* -*- C -*- */
-/* @(#)$Id: ds2411.h,v 1.1 2006/06/17 22:41:16 adamdunkels Exp $ */
 
 #ifndef DS2411_H
 #define DS2411_H
diff --git a/core/dev/eeprom.h b/core/dev/eeprom.h
index e3f810c8cab..a09baaa9e19 100644
--- a/core/dev/eeprom.h
+++ b/core/dev/eeprom.h
@@ -45,7 +45,6 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $Id: eeprom.h,v 1.1 2006/06/17 22:41:16 adamdunkels Exp $
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
diff --git a/core/dev/leds.c b/core/dev/leds.c
index f0d1e8fc567..1f8dcfa3438 100644
--- a/core/dev/leds.c
+++ b/core/dev/leds.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: leds.c,v 1.7 2009/02/24 21:30:20 adamdunkels Exp $
  */
 
 #include "dev/leds.h"
diff --git a/core/dev/leds.h b/core/dev/leds.h
index dcb947e3640..1417cbc667d 100644
--- a/core/dev/leds.h
+++ b/core/dev/leds.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: leds.h,v 1.1 2006/06/17 22:41:16 adamdunkels Exp $
  */
 /**
  * \addtogroup dev
diff --git a/core/dev/radio-sensor.h b/core/dev/radio-sensor.h
index 14c1721e1de..488d9753347 100644
--- a/core/dev/radio-sensor.h
+++ b/core/dev/radio-sensor.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: radio-sensor.h,v 1.1 2007/03/15 21:27:09 adamdunkels Exp $
  */
 #ifndef __RADIO_SENSOR_H__
 #define __RADIO_SENSOR_H__
diff --git a/core/dev/radio.h b/core/dev/radio.h
index f4e6bdd094a..faa1e40d64e 100644
--- a/core/dev/radio.h
+++ b/core/dev/radio.h
@@ -42,7 +42,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: radio.h,v 1.8 2010/03/30 23:00:22 adamdunkels Exp $
  */
 
 /**
diff --git a/core/dev/rom.h b/core/dev/rom.h
index db1d59eaf57..1cb65d3db61 100644
--- a/core/dev/rom.h
+++ b/core/dev/rom.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: rom.h,v 1.1 2006/06/17 22:41:17 adamdunkels Exp $
  */
 
 #ifndef ROM_H
diff --git a/core/dev/serial-line.c b/core/dev/serial-line.c
index fa9cd45c5e2..6c54331d894 100644
--- a/core/dev/serial-line.c
+++ b/core/dev/serial-line.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: serial-line.c,v 1.4 2010/02/23 18:26:26 adamdunkels Exp $
  */
 #include "dev/serial-line.h"
 #include <string.h> /* for memcpy() */
diff --git a/core/dev/serial-line.h b/core/dev/serial-line.h
index 7cccdaa3452..0ddb347555b 100644
--- a/core/dev/serial-line.h
+++ b/core/dev/serial-line.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: serial-line.h,v 1.1 2009/03/17 15:56:33 adamdunkels Exp $
  */
 /**
  * \file
diff --git a/core/dev/sht11-sensor.c b/core/dev/sht11-sensor.c
index 5c59017e204..9968416d7bd 100644
--- a/core/dev/sht11-sensor.c
+++ b/core/dev/sht11-sensor.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: sht11-sensor.c,v 1.2 2010/01/15 08:51:21 adamdunkels Exp $
  */
 
 #include <stdlib.h>
diff --git a/core/dev/sht11-sensor.h b/core/dev/sht11-sensor.h
index 6618a387768..30442369dda 100644
--- a/core/dev/sht11-sensor.h
+++ b/core/dev/sht11-sensor.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: sht11-sensor.h,v 1.2 2010/01/15 08:51:21 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/core/dev/sht11.c b/core/dev/sht11.c
index 815bf6aa5f3..d8abc7e685d 100644
--- a/core/dev/sht11.c
+++ b/core/dev/sht11.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: sht11.c,v 1.3 2008/11/10 21:10:36 adamdunkels Exp $
  */
 
 /*
diff --git a/core/dev/sht11.h b/core/dev/sht11.h
index 2dcecc96a62..1aa3197c539 100644
--- a/core/dev/sht11.h
+++ b/core/dev/sht11.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: sht11.h,v 1.2 2008/07/08 08:23:47 adamdunkels Exp $
  */
 
 #ifndef SHT11_H
diff --git a/core/dev/slip.c b/core/dev/slip.c
index d6a1c4fb0ae..9535c05b727 100644
--- a/core/dev/slip.c
+++ b/core/dev/slip.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: slip.c,v 1.12 2010/12/23 22:38:47 dak664 Exp $
  */
 
 
diff --git a/core/dev/slip.h b/core/dev/slip.h
index 847ce26bcc0..756611c2cdd 100644
--- a/core/dev/slip.h
+++ b/core/dev/slip.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: slip.h,v 1.5 2008/02/24 21:00:53 adamdunkels Exp $
  */
 
 #ifndef __SLIP_H__
diff --git a/core/dev/spi.h b/core/dev/spi.h
index c8ee20b7f23..189178e1620 100644
--- a/core/dev/spi.h
+++ b/core/dev/spi.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: spi.h,v 1.8 2010/06/23 10:15:28 joxe Exp $
  */
 
 /**
diff --git a/core/dev/watchdog.h b/core/dev/watchdog.h
index c50664b150a..b0281a1d70a 100644
--- a/core/dev/watchdog.h
+++ b/core/dev/watchdog.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: watchdog.h,v 1.3 2008/01/07 14:42:35 adamdunkels Exp $
  */
 #ifndef __WATCHDOG_H__
 #define __WATCHDOG_H__
diff --git a/core/dev/xmem.h b/core/dev/xmem.h
index be761020ace..235cb8607ef 100644
--- a/core/dev/xmem.h
+++ b/core/dev/xmem.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: xmem.h,v 1.2 2008/07/03 23:12:10 adamdunkels Exp $
  */
 
 #ifndef XMEM_H
diff --git a/core/lib/assert.c b/core/lib/assert.c
index 288c9d5f13b..8268f15e1e1 100644
--- a/core/lib/assert.c
+++ b/core/lib/assert.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: assert.c,v 1.1 2006/08/11 13:37:21 bg- Exp $
  */
 
 #include <stdio.h>
diff --git a/core/lib/assert.h b/core/lib/assert.h
index 5e934ed7257..da9fd8f9b4d 100644
--- a/core/lib/assert.h
+++ b/core/lib/assert.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: assert.h,v 1.2 2007/06/01 15:36:00 bg- Exp $
  */
 
 #ifndef ASSERT_H
diff --git a/core/lib/crc16.c b/core/lib/crc16.c
index 209211bb307..22a6651030e 100644
--- a/core/lib/crc16.c
+++ b/core/lib/crc16.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: crc16.c,v 1.4 2009/05/14 12:05:04 nvt-se Exp $
  */
 
 /** \addtogroup crc16
diff --git a/core/lib/crc16.h b/core/lib/crc16.h
index 1153a0c9ece..72010c7063a 100644
--- a/core/lib/crc16.h
+++ b/core/lib/crc16.h
@@ -50,7 +50,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: crc16.h,v 1.4 2008/10/15 14:17:28 nvt-se Exp $
  */
 #ifndef __CRC16_H__
 #define __CRC16_H__
diff --git a/core/lib/ctk-filedialog.c b/core/lib/ctk-filedialog.c
index 56b79acbb42..cc88366a1ae 100644
--- a/core/lib/ctk-filedialog.c
+++ b/core/lib/ctk-filedialog.c
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: ctk-filedialog.c,v 1.2 2007/08/30 14:39:18 matsutsuka Exp $
  */
 
 #include "contiki.h"
diff --git a/core/lib/ctk-filedialog.h b/core/lib/ctk-filedialog.h
index 6db32a2770b..796f39f6d75 100644
--- a/core/lib/ctk-filedialog.h
+++ b/core/lib/ctk-filedialog.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: ctk-filedialog.h,v 1.2 2007/08/30 14:39:18 matsutsuka Exp $
  */
 #ifndef __CTK_FILEDIALOG_H__
 #define __CTK_FILEDIALOG_H__
diff --git a/core/lib/ctk-textentry-checkbox.c b/core/lib/ctk-textentry-checkbox.c
index da8d08c81c2..87d88915bf7 100644
--- a/core/lib/ctk-textentry-checkbox.c
+++ b/core/lib/ctk-textentry-checkbox.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ctk-textentry-checkbox.c,v 1.1 2006/06/17 22:41:17 adamdunkels Exp $
  *
  */
 
diff --git a/core/lib/ctk-textentry-checkbox.h b/core/lib/ctk-textentry-checkbox.h
index 13fdd681ae4..5bf133adc41 100644
--- a/core/lib/ctk-textentry-checkbox.h
+++ b/core/lib/ctk-textentry-checkbox.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: ctk-textentry-checkbox.h,v 1.1 2006/06/17 22:41:17 adamdunkels Exp $
  *
  */
 #ifndef __CTK_TEXTENTRY_CHECKBOX_H__
diff --git a/core/lib/ctk-textentry-cmdline.c b/core/lib/ctk-textentry-cmdline.c
index a0735153203..3f003ee71f8 100644
--- a/core/lib/ctk-textentry-cmdline.c
+++ b/core/lib/ctk-textentry-cmdline.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ctk-textentry-cmdline.c,v 1.3 2009/02/24 21:30:02 adamdunkels Exp $
  *
  */
 
diff --git a/core/lib/ctk-textentry-cmdline.h b/core/lib/ctk-textentry-cmdline.h
index 7fe532cb704..6a904b3fa30 100644
--- a/core/lib/ctk-textentry-cmdline.h
+++ b/core/lib/ctk-textentry-cmdline.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: ctk-textentry-cmdline.h,v 1.2 2009/02/24 21:30:02 adamdunkels Exp $
  *
  */
 #ifndef __CTK_TEXTENTRY_CMDLINE_H__
diff --git a/core/lib/ctk-textentry-multiline.c b/core/lib/ctk-textentry-multiline.c
index 6256d715533..970910f517c 100644
--- a/core/lib/ctk-textentry-multiline.c
+++ b/core/lib/ctk-textentry-multiline.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ctk-textentry-multiline.c,v 1.2 2006/08/21 21:59:59 oliverschmidt Exp $
  *
  */
 
diff --git a/core/lib/ctk-textentry-multiline.h b/core/lib/ctk-textentry-multiline.h
index cf32d24d2ae..2a2ba825ac1 100644
--- a/core/lib/ctk-textentry-multiline.h
+++ b/core/lib/ctk-textentry-multiline.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: ctk-textentry-multiline.h,v 1.1 2006/06/17 22:41:17 adamdunkels Exp $
  *
  */
 #ifndef __CTK_TEXTENTRY_MULTILINE_H__
diff --git a/core/lib/gcr.c b/core/lib/gcr.c
index b768f96ca95..1fba2f40b18 100644
--- a/core/lib/gcr.c
+++ b/core/lib/gcr.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: gcr.c,v 1.2 2011/01/07 11:55:36 nifi Exp $
  */
 
 /**
diff --git a/core/lib/gcr.h b/core/lib/gcr.h
index c62ee044439..69139619f74 100644
--- a/core/lib/gcr.h
+++ b/core/lib/gcr.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: gcr.h,v 1.1 2006/10/05 09:23:41 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/core/lib/libconio.c b/core/lib/libconio.c
index 13754a3cc06..bb4a068a358 100644
--- a/core/lib/libconio.c
+++ b/core/lib/libconio.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: libconio.c,v 1.2 2007/09/09 12:24:44 matsutsuka Exp $
  *
  */
 
diff --git a/core/lib/libconio.h b/core/lib/libconio.h
index 53bc85be00c..b60260472d6 100644
--- a/core/lib/libconio.h
+++ b/core/lib/libconio.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: libconio.h,v 1.2 2008/10/15 14:17:28 nvt-se Exp $
  *
  */
 
diff --git a/core/lib/list.c b/core/lib/list.c
index c3704169229..b8d4942d03d 100644
--- a/core/lib/list.c
+++ b/core/lib/list.c
@@ -43,7 +43,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: list.c,v 1.5 2010/06/15 18:54:27 adamdunkels Exp $
  */
 #include "lib/list.h"
 
diff --git a/core/lib/list.h b/core/lib/list.h
index ae5f3a13423..cd305efed71 100644
--- a/core/lib/list.h
+++ b/core/lib/list.h
@@ -64,7 +64,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: list.h,v 1.5 2010/09/13 13:31:00 adamdunkels Exp $
  */
 #ifndef __LIST_H__
 #define __LIST_H__
diff --git a/core/lib/me.c b/core/lib/me.c
index 3d706b53233..33f487a8335 100644
--- a/core/lib/me.c
+++ b/core/lib/me.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: me.c,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
  */
 
 /** \addtogroup me
diff --git a/core/lib/me.h b/core/lib/me.h
index 0849558d817..a1440fc3450 100644
--- a/core/lib/me.h
+++ b/core/lib/me.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: me.h,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
  */
 
 /** \addtogroup lib
diff --git a/core/lib/me_tabs.c b/core/lib/me_tabs.c
index 7846c31fde2..dab8d6038fd 100644
--- a/core/lib/me_tabs.c
+++ b/core/lib/me_tabs.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: me_tabs.c,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
  */
 const unsigned short me_encode_tab[256] = {
 0x5555, 0x5556, 0x5559, 0x555a, 0x5565, 0x5566, 0x5569, 0x556a, 0x5595, 
diff --git a/core/lib/me_tabs.h b/core/lib/me_tabs.h
index 6dce73af5ef..35acae6981f 100644
--- a/core/lib/me_tabs.h
+++ b/core/lib/me_tabs.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: me_tabs.h,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
  */
 #ifndef __ME_TABS_H__
 #define __ME_TABS_H__
diff --git a/core/lib/memb.c b/core/lib/memb.c
index cf60f4beb0b..f074144354b 100644
--- a/core/lib/memb.c
+++ b/core/lib/memb.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: memb.c,v 1.4 2009/04/06 21:18:03 adamdunkels Exp $
  */
 
 /**
diff --git a/core/lib/memb.h b/core/lib/memb.h
index 21a5b8b47af..fc8c3bd7c89 100644
--- a/core/lib/memb.h
+++ b/core/lib/memb.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: memb.h,v 1.6 2009/04/06 21:18:04 adamdunkels Exp $
  */
 
 /**
diff --git a/core/lib/mmem.c b/core/lib/mmem.c
index 52e580fad55..a6ff1b59cdd 100644
--- a/core/lib/mmem.c
+++ b/core/lib/mmem.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: mmem.c,v 1.2 2006/12/22 17:14:06 barner Exp $
  */
 
 /**
diff --git a/core/lib/mmem.h b/core/lib/mmem.h
index 8735c2d708e..24a54f5132f 100644
--- a/core/lib/mmem.h
+++ b/core/lib/mmem.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: mmem.h,v 1.2 2008/10/15 14:17:28 nvt-se Exp $
  */
 /**
  * \addtogroup mem
diff --git a/core/lib/petsciiconv.c b/core/lib/petsciiconv.c
index 93056fefc4a..873c7c2c749 100644
--- a/core/lib/petsciiconv.c
+++ b/core/lib/petsciiconv.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: petsciiconv.c,v 1.2 2010/01/31 23:46:19 oliverschmidt Exp $
  *
  */
 
diff --git a/core/lib/petsciiconv.h b/core/lib/petsciiconv.h
index 3b15fc2e9ba..4d9e517796f 100644
--- a/core/lib/petsciiconv.h
+++ b/core/lib/petsciiconv.h
@@ -44,7 +44,6 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: petsciiconv.h,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
  *
  */
 #ifndef __PETSCIICONV_H__
diff --git a/core/lib/print-stats.c b/core/lib/print-stats.c
index 30bd5e21415..37cf442d66f 100644
--- a/core/lib/print-stats.c
+++ b/core/lib/print-stats.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: print-stats.c,v 1.5 2010/03/09 14:14:36 nvt-se Exp $
  */
 
 /**
diff --git a/core/lib/print-stats.h b/core/lib/print-stats.h
index 16f36da114c..5996b735982 100644
--- a/core/lib/print-stats.h
+++ b/core/lib/print-stats.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: print-stats.h,v 1.1 2007/09/27 22:22:40 adamdunkels Exp $
  */
 
 /**
diff --git a/core/lib/random.c b/core/lib/random.c
index 91db6c7b702..c291ae117a4 100644
--- a/core/lib/random.c
+++ b/core/lib/random.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: random.c,v 1.5 2010/12/13 16:52:02 dak664 Exp $
  */
 
 
diff --git a/core/lib/random.h b/core/lib/random.h
index d63cb55b027..1428c6fd70f 100644
--- a/core/lib/random.h
+++ b/core/lib/random.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: random.h,v 1.2 2010/12/13 16:52:02 dak664 Exp $
  */
 #ifndef __RANDOM_H__
 #define __RANDOM_H__
diff --git a/core/lib/ringbuf.c b/core/lib/ringbuf.c
index 28d225236dc..a10127c17ad 100644
--- a/core/lib/ringbuf.c
+++ b/core/lib/ringbuf.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ringbuf.c,v 1.2 2010/06/15 13:31:22 nifi Exp $
  */
 
 /**
diff --git a/core/lib/ringbuf.h b/core/lib/ringbuf.h
index 0c6f92d83f6..876d184125e 100644
--- a/core/lib/ringbuf.h
+++ b/core/lib/ringbuf.h
@@ -41,7 +41,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ringbuf.h,v 1.1 2009/03/01 20:23:56 adamdunkels Exp $
  */
 
 /**
diff --git a/core/lib/sensors.c b/core/lib/sensors.c
index 85018552c1a..ccfbdad5eff 100644
--- a/core/lib/sensors.c
+++ b/core/lib/sensors.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: sensors.c,v 1.5 2010/01/14 20:04:38 nifi Exp $
  */
 /* exeperimental code, will be renamed to sensors.c when done */
 
diff --git a/core/lib/sensors.h b/core/lib/sensors.h
index 6872ae9f15b..80d0103a7ee 100644
--- a/core/lib/sensors.h
+++ b/core/lib/sensors.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: sensors.h,v 1.9 2010/02/23 18:27:04 adamdunkels Exp $
  */
 
 #ifndef __SENSORS_H__
diff --git a/core/lib/strncasecmp.c b/core/lib/strncasecmp.c
index b280cde437f..2f1c1d4ba07 100644
--- a/core/lib/strncasecmp.c
+++ b/core/lib/strncasecmp.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: strncasecmp.c,v 1.2 2008/10/15 14:17:28 nvt-se Exp $
  *
  */
 
diff --git a/core/loader/cle.c b/core/loader/cle.c
index 2255c369247..0e06b14fbcf 100644
--- a/core/loader/cle.c
+++ b/core/loader/cle.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: cle.c,v 1.7 2007/06/04 17:48:19 bg- Exp $
  */
 
 /*
diff --git a/core/loader/cle.h b/core/loader/cle.h
index 0d4a755a494..d22a56bb878 100644
--- a/core/loader/cle.h
+++ b/core/loader/cle.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: cle.h,v 1.7 2007/06/04 17:47:56 bg- Exp $
  */
 
 #ifndef CLE_H
diff --git a/core/loader/cle_avr.c b/core/loader/cle_avr.c
index 43aea3a82c9..ac7b1e8d733 100644
--- a/core/loader/cle_avr.c
+++ b/core/loader/cle_avr.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: cle_avr.c,v 1.3 2007/06/04 17:50:25 bg- Exp $
  */
 
 /*
diff --git a/core/loader/cle_msp430.c b/core/loader/cle_msp430.c
index 3278578136d..ae3d3127644 100644
--- a/core/loader/cle_msp430.c
+++ b/core/loader/cle_msp430.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: cle_msp430.c,v 1.2 2007/06/04 17:48:32 bg- Exp $
  */
 
 /*
diff --git a/core/loader/cmod.c b/core/loader/cmod.c
index c028480205b..d3ed3a5b5b5 100644
--- a/core/loader/cmod.c
+++ b/core/loader/cmod.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: cmod.c,v 1.4 2007/05/28 16:22:15 bg- Exp $
  */
 
 #include <stdio.h>
diff --git a/core/loader/cmod.h b/core/loader/cmod.h
index 3a8bac97edb..ecfa44745c2 100644
--- a/core/loader/cmod.h
+++ b/core/loader/cmod.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: cmod.h,v 1.3 2007/04/26 12:54:13 bg- Exp $
  */
 
 #ifndef CMOD_H
diff --git a/core/loader/dlloader.c b/core/loader/dlloader.c
index 57e0589972e..88987bbfba0 100644
--- a/core/loader/dlloader.c
+++ b/core/loader/dlloader.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: dlloader.c,v 1.2 2008/02/07 15:53:43 oliverschmidt Exp $
  */
 #include <dlfcn.h>
 #include <stddef.h>
diff --git a/core/loader/dlloader.h b/core/loader/dlloader.h
index d4341db9037..580caf4e53e 100644
--- a/core/loader/dlloader.h
+++ b/core/loader/dlloader.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: dlloader.h,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
  */
 #ifndef __DLLOADER_H__
 #define __DLLOADER_H__
diff --git a/core/loader/elf32.h b/core/loader/elf32.h
index 3a68f96cf90..e2863f345de 100644
--- a/core/loader/elf32.h
+++ b/core/loader/elf32.h
@@ -26,10 +26,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: elf32.h,v 1.1 2006/12/01 15:12:27 bg- Exp $
  */
 
-/* @(#)$Id: elf32.h,v 1.1 2006/12/01 15:12:27 bg- Exp $ */
 
 #ifndef ELF32_H
 #define ELF32_H
diff --git a/core/loader/elfloader-arch.h b/core/loader/elfloader-arch.h
index bb54d6140a3..2d1b54122cf 100644
--- a/core/loader/elfloader-arch.h
+++ b/core/loader/elfloader-arch.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: elfloader-arch.h,v 1.4 2007/03/24 15:21:34 oliverschmidt Exp $
  */
 /**
  * \addtogroup elfloader
diff --git a/core/loader/elfloader-msp430.c b/core/loader/elfloader-msp430.c
index 9b8add125f5..d0a1076403b 100644
--- a/core/loader/elfloader-msp430.c
+++ b/core/loader/elfloader-msp430.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: elfloader-msp430.c,v 1.5 2009/03/26 12:25:05 fros4943 Exp $
  */
 #include "elfloader-arch.h"
 
diff --git a/core/loader/elfloader-stub.c b/core/loader/elfloader-stub.c
index c59678d88a9..61e5be73511 100644
--- a/core/loader/elfloader-stub.c
+++ b/core/loader/elfloader-stub.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: elfloader-stub.c,v 1.3 2007/11/17 10:46:41 adamdunkels Exp $
  */
 #include "elfloader-arch.h"
 
diff --git a/core/loader/elfloader-x86.c b/core/loader/elfloader-x86.c
index 5279ed5279c..77745bb8d06 100644
--- a/core/loader/elfloader-x86.c
+++ b/core/loader/elfloader-x86.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: elfloader-x86.c,v 1.3 2009/02/27 14:28:02 nvt-se Exp $
  */
 #include "elfloader-arch.h"
 #include <sys/mman.h>
diff --git a/core/loader/elfloader.c b/core/loader/elfloader.c
index ebddb2f0115..8a04c095bd8 100644
--- a/core/loader/elfloader.c
+++ b/core/loader/elfloader.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: elfloader.c,v 1.10 2009/02/27 14:28:02 nvt-se Exp $
  */
 
 #include "contiki.h"
diff --git a/core/loader/elfloader.h b/core/loader/elfloader.h
index 0c1f7f4ab1c..3df4914a7b5 100644
--- a/core/loader/elfloader.h
+++ b/core/loader/elfloader.h
@@ -70,7 +70,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: elfloader.h,v 1.4 2010/04/26 14:02:07 fros4943 Exp $
  */
 #ifndef __ELFLOADER_H__
 #define __ELFLOADER_H__
diff --git a/core/loader/elfloader_compat.c b/core/loader/elfloader_compat.c
index bbc0a88b933..a672844903d 100644
--- a/core/loader/elfloader_compat.c
+++ b/core/loader/elfloader_compat.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: elfloader_compat.c,v 1.7 2008/02/07 15:53:43 oliverschmidt Exp $
  */
 
 /*
diff --git a/core/loader/elfloader_compat.h b/core/loader/elfloader_compat.h
index 45c45347d0f..ad334d22fb6 100644
--- a/core/loader/elfloader_compat.h
+++ b/core/loader/elfloader_compat.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: elfloader_compat.h,v 1.1 2006/12/20 13:38:33 bg- Exp $
  */
 #ifndef __ELFLOADER_H__
 #define __ELFLOADER_H__
diff --git a/core/loader/sym.c b/core/loader/sym.c
index 1c571641950..b4fa759f48e 100644
--- a/core/loader/sym.c
+++ b/core/loader/sym.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: sym.c,v 1.1 2007/04/25 15:33:54 bg- Exp $
  */
 
 #ifdef __AVR__
diff --git a/core/loader/sym.h b/core/loader/sym.h
index cd70ef51a02..c16d09b1bbb 100644
--- a/core/loader/sym.h
+++ b/core/loader/sym.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: sym.h,v 1.1 2007/04/25 15:33:29 bg- Exp $
  */
 
 #ifndef SYM_H
diff --git a/core/loader/symbols-def.h b/core/loader/symbols-def.h
index 50bee6bebb8..3dd07627334 100644
--- a/core/loader/symbols-def.h
+++ b/core/loader/symbols-def.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: symbols-def.h,v 1.3 2007/01/12 13:55:04 bg- Exp $
  */
 #ifndef __SYMBOLS_DEF_H__
 #define __SYMBOLS_DEF_H__
diff --git a/core/loader/symbols.h b/core/loader/symbols.h
index e1e811e5a3e..bfb0897ed68 100644
--- a/core/loader/symbols.h
+++ b/core/loader/symbols.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: symbols.h,v 1.5 2007/01/30 18:04:59 bg- Exp $
  */
 #ifndef __SYMBOLS_H__
 #define __SYMBOLS_H__
diff --git a/core/loader/symtab-avr.c b/core/loader/symtab-avr.c
index 173e3f60d52..f46aad8f9e6 100644
--- a/core/loader/symtab-avr.c
+++ b/core/loader/symtab-avr.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: symtab-avr.c,v 1.3 2007/01/24 16:13:50 adamdunkels Exp $
  */
 
 #include <stdio.h>
diff --git a/core/loader/symtab.c b/core/loader/symtab.c
index d76a2719bb8..f88b9a97d57 100644
--- a/core/loader/symtab.c
+++ b/core/loader/symtab.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: symtab.c,v 1.7 2007/01/24 16:13:50 adamdunkels Exp $
  */
 
 #include "symtab.h"
diff --git a/core/loader/symtab.h b/core/loader/symtab.h
index f01eb6b8587..9f89b2b8e94 100644
--- a/core/loader/symtab.h
+++ b/core/loader/symtab.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: symtab.h,v 1.4 2007/01/12 13:55:05 bg- Exp $
  */
 #ifndef __SYMTAB_H__
 #define __SYMTAB_H__
diff --git a/core/net/dhcpc.c b/core/net/dhcpc.c
index 5b2db719fbd..97a86fd968f 100644
--- a/core/net/dhcpc.c
+++ b/core/net/dhcpc.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: dhcpc.c,v 1.9 2010/10/19 18:29:04 adamdunkels Exp $
  */
 
 #include <stdio.h>
diff --git a/core/net/dhcpc.h b/core/net/dhcpc.h
index 87e02f7a3dc..4f8bf51a051 100644
--- a/core/net/dhcpc.h
+++ b/core/net/dhcpc.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: dhcpc.h,v 1.4 2007/03/16 12:16:16 bg- Exp $
  */
 #ifndef __DHCPC_H__
 #define __DHCPC_H__
diff --git a/core/net/hc.c b/core/net/hc.c
index ef2a48d5087..d193c7e7eb6 100644
--- a/core/net/hc.c
+++ b/core/net/hc.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: hc.c,v 1.5 2010/10/19 18:29:04 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/hc.h b/core/net/hc.h
index b05560910eb..21e5e842875 100644
--- a/core/net/hc.h
+++ b/core/net/hc.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: hc.h,v 1.3 2009/03/17 20:28:44 nvt-se Exp $
  */
 /**
  * \file
diff --git a/core/net/mac/contikimac.h b/core/net/mac/contikimac.h
index e329216240a..6bd2ab9df5b 100644
--- a/core/net/mac/contikimac.h
+++ b/core/net/mac/contikimac.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: contikimac.h,v 1.3 2010/02/23 20:09:11 nifi Exp $
  */
 
 /**
diff --git a/core/net/mac/csma.c b/core/net/mac/csma.c
index 3a1c6114258..157032ace24 100644
--- a/core/net/mac/csma.c
+++ b/core/net/mac/csma.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: csma.c,v 1.27 2011/01/25 14:24:38 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/mac/csma.h b/core/net/mac/csma.h
index 219c7d7e767..b069847e98a 100644
--- a/core/net/mac/csma.h
+++ b/core/net/mac/csma.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: csma.h,v 1.1 2010/01/25 11:46:44 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/mac/ctdma_mac.c b/core/net/mac/ctdma_mac.c
index ad81a4e9799..80c5d4de6cd 100644
--- a/core/net/mac/ctdma_mac.c
+++ b/core/net/mac/ctdma_mac.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ctdma_mac.c,v 1.6 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 #include "contiki.h"
diff --git a/core/net/mac/ctdma_mac.h b/core/net/mac/ctdma_mac.h
index 2e156530430..c10c430baee 100644
--- a/core/net/mac/ctdma_mac.h
+++ b/core/net/mac/ctdma_mac.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ctdma_mac.h,v 1.2 2009/06/22 11:14:11 nifi Exp $
  */
 
 #ifndef __CTDMA_MAC_H__
diff --git a/core/net/mac/cxmac.h b/core/net/mac/cxmac.h
index 67a8a1ea1fd..21f157a0a64 100644
--- a/core/net/mac/cxmac.h
+++ b/core/net/mac/cxmac.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: cxmac.h,v 1.5 2010/02/23 20:09:11 nifi Exp $
  */
 
 /**
diff --git a/core/net/mac/frame802154.c b/core/net/mac/frame802154.c
index a3df4a569b2..345a779dbc6 100644
--- a/core/net/mac/frame802154.c
+++ b/core/net/mac/frame802154.c
@@ -44,7 +44,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: frame802154.c,v 1.4 2010/02/18 21:00:28 adamdunkels Exp $
 */
 /*
  *  \brief This file is where the main functions that relate to frame
diff --git a/core/net/mac/frame802154.h b/core/net/mac/frame802154.h
index 8f086880212..861b646a41d 100644
--- a/core/net/mac/frame802154.h
+++ b/core/net/mac/frame802154.h
@@ -54,7 +54,6 @@
  *  This file converts to and from a structure to a packed 802.15.4
  *  frame.
  *
- *    $Id: frame802154.h,v 1.3 2010/02/18 21:00:28 adamdunkels Exp $
 */
 
 
diff --git a/core/net/mac/framer-802154.c b/core/net/mac/framer-802154.c
index 7580f87b0c6..67a7a700a39 100644
--- a/core/net/mac/framer-802154.c
+++ b/core/net/mac/framer-802154.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: framer-802154.c,v 1.12 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/mac/framer-802154.h b/core/net/mac/framer-802154.h
index 116b3e9b603..49a2368a88b 100644
--- a/core/net/mac/framer-802154.h
+++ b/core/net/mac/framer-802154.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: framer-802154.h,v 1.1 2009/10/19 18:30:03 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/mac/framer-nullmac.c b/core/net/mac/framer-nullmac.c
index 10e5eb2887b..533094b26d1 100644
--- a/core/net/mac/framer-nullmac.c
+++ b/core/net/mac/framer-nullmac.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: framer-nullmac.c,v 1.2 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/mac/framer-nullmac.h b/core/net/mac/framer-nullmac.h
index 1e13416ca96..9936cccacea 100644
--- a/core/net/mac/framer-nullmac.h
+++ b/core/net/mac/framer-nullmac.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: framer-nullmac.h,v 1.1 2009/10/19 18:30:03 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/mac/framer.h b/core/net/mac/framer.h
index d13478bcfdd..00594e10de6 100644
--- a/core/net/mac/framer.h
+++ b/core/net/mac/framer.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: framer.h,v 1.2 2010/03/01 13:30:23 nifi Exp $
  */
 
 /**
diff --git a/core/net/mac/lpp.c b/core/net/mac/lpp.c
index 4cd26971f7b..54e2b964919 100644
--- a/core/net/mac/lpp.c
+++ b/core/net/mac/lpp.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: lpp.c,v 1.40 2010/12/02 15:55:17 dak664 Exp $
  */
 
 /**
diff --git a/core/net/mac/lpp.h b/core/net/mac/lpp.h
index 7ba4c31a74c..416d224d801 100644
--- a/core/net/mac/lpp.h
+++ b/core/net/mac/lpp.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: lpp.h,v 1.3 2010/02/23 20:09:11 nifi Exp $
  */
 
 /**
diff --git a/core/net/mac/mac.c b/core/net/mac/mac.c
index b207744cbdb..c79b7566501 100644
--- a/core/net/mac/mac.c
+++ b/core/net/mac/mac.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: mac.c,v 1.2 2010/02/23 18:49:58 adamdunkels Exp $
  */
 
 #include "net/mac/mac.h"
diff --git a/core/net/mac/mac.h b/core/net/mac/mac.h
index 2e0fd83d1f1..4dcc2c1de33 100644
--- a/core/net/mac/mac.h
+++ b/core/net/mac/mac.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: mac.h,v 1.14 2010/10/03 20:37:32 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/mac/nullmac.c b/core/net/mac/nullmac.c
index b9d4c0509e8..785770c5845 100644
--- a/core/net/mac/nullmac.c
+++ b/core/net/mac/nullmac.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: nullmac.c,v 1.15 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/mac/nullmac.h b/core/net/mac/nullmac.h
index 3ddc1a9b336..44820b3f0e4 100644
--- a/core/net/mac/nullmac.h
+++ b/core/net/mac/nullmac.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: nullmac.h,v 1.4 2010/02/18 21:48:39 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/mac/nullrdc-noframer.c b/core/net/mac/nullrdc-noframer.c
index 8b0d7bbad90..562b5cbca23 100644
--- a/core/net/mac/nullrdc-noframer.c
+++ b/core/net/mac/nullrdc-noframer.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: nullrdc-noframer.c,v 1.1 2010/11/23 18:11:00 nifi Exp $
  */
 
 /**
diff --git a/core/net/mac/nullrdc-noframer.h b/core/net/mac/nullrdc-noframer.h
index 846e1bcf640..8ba2cd45862 100644
--- a/core/net/mac/nullrdc-noframer.h
+++ b/core/net/mac/nullrdc-noframer.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: nullrdc-noframer.h,v 1.1 2010/11/23 18:11:00 nifi Exp $
  */
 
 /**
diff --git a/core/net/mac/nullrdc.c b/core/net/mac/nullrdc.c
index 9579261264d..6d0bf1a67cb 100644
--- a/core/net/mac/nullrdc.c
+++ b/core/net/mac/nullrdc.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: nullrdc.c,v 1.4 2010/11/23 18:11:00 nifi Exp $
  */
 
 /**
diff --git a/core/net/mac/nullrdc.h b/core/net/mac/nullrdc.h
index 3861ee0d29f..f58cf5b56b6 100644
--- a/core/net/mac/nullrdc.h
+++ b/core/net/mac/nullrdc.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: nullrdc.h,v 1.3 2010/11/23 18:11:00 nifi Exp $
  */
 
 /**
diff --git a/core/net/mac/rdc.h b/core/net/mac/rdc.h
index 333728c9757..fe732eac300 100644
--- a/core/net/mac/rdc.h
+++ b/core/net/mac/rdc.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rdc.h,v 1.1 2010/02/23 20:09:11 nifi Exp $
  */
 
 /**
diff --git a/core/net/mac/sicslowmac.c b/core/net/mac/sicslowmac.c
index 52d7aa86c33..b77cd86b3e0 100644
--- a/core/net/mac/sicslowmac.c
+++ b/core/net/mac/sicslowmac.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sicslowmac.c,v 1.8 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 
diff --git a/core/net/mac/sicslowmac.h b/core/net/mac/sicslowmac.h
index f0b780c82f0..b96797d7088 100644
--- a/core/net/mac/sicslowmac.h
+++ b/core/net/mac/sicslowmac.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sicslowmac.h,v 1.2 2010/02/23 20:09:11 nifi Exp $
  */
 
 /**
diff --git a/core/net/mac/tdma_mac.c b/core/net/mac/tdma_mac.c
index 40ed8a796b1..ad1ea370ce9 100644
--- a/core/net/mac/tdma_mac.c
+++ b/core/net/mac/tdma_mac.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: tdma_mac.c,v 1.8 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 #include "contiki.h"
diff --git a/core/net/mac/tdma_mac.h b/core/net/mac/tdma_mac.h
index da3dfc8a17f..0ff1a06cd06 100644
--- a/core/net/mac/tdma_mac.h
+++ b/core/net/mac/tdma_mac.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: tdma_mac.h,v 1.2 2008/11/12 12:42:41 fros4943 Exp $
  */
 
 #ifndef __TDMA_MAC_H__
diff --git a/core/net/mac/xmac.h b/core/net/mac/xmac.h
index 80376f563dd..8510b9effb5 100644
--- a/core/net/mac/xmac.h
+++ b/core/net/mac/xmac.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: xmac.h,v 1.9 2010/02/23 20:09:11 nifi Exp $
  */
 
 /**
diff --git a/core/net/neighbor-info.c b/core/net/neighbor-info.c
index b0492e1ea5f..dc232cf02a2 100644
--- a/core/net/neighbor-info.c
+++ b/core/net/neighbor-info.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: neighbor-info.c,v 1.18 2010/12/15 14:35:07 nvt-se Exp $
  */
 /**
  * \file
diff --git a/core/net/neighbor-info.h b/core/net/neighbor-info.h
index f5e12ed0295..4bfed1ade24 100644
--- a/core/net/neighbor-info.h
+++ b/core/net/neighbor-info.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: neighbor-info.h,v 1.4 2010/10/22 13:50:13 nvt-se Exp $
  */
 /**
  * \file
diff --git a/core/net/netstack.c b/core/net/netstack.c
index c5f6e4060c6..35e7f2c48e6 100644
--- a/core/net/netstack.c
+++ b/core/net/netstack.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: netstack.c,v 1.1 2010/02/18 23:15:26 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/netstack.h b/core/net/netstack.h
index 96f56a2b2c8..aa5f7be1e14 100644
--- a/core/net/netstack.h
+++ b/core/net/netstack.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: netstack.h,v 1.6 2010/10/03 20:37:32 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/packetbuf.c b/core/net/packetbuf.c
index 26f7c4d7eb0..06f2c003715 100644
--- a/core/net/packetbuf.c
+++ b/core/net/packetbuf.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: packetbuf.c,v 1.1 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/packetbuf.h b/core/net/packetbuf.h
index 50f766e3ddd..da16bd5e201 100644
--- a/core/net/packetbuf.h
+++ b/core/net/packetbuf.h
@@ -40,7 +40,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: packetbuf.h,v 1.2 2010/12/16 22:41:43 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/packetqueue.c b/core/net/packetqueue.c
index 9169974da7e..1cf1c694fb4 100644
--- a/core/net/packetqueue.c
+++ b/core/net/packetqueue.c
@@ -32,7 +32,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: packetqueue.c,v 1.1 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/packetqueue.h b/core/net/packetqueue.h
index abbcc531c92..45ccc980b8d 100644
--- a/core/net/packetqueue.h
+++ b/core/net/packetqueue.h
@@ -41,7 +41,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: packetqueue.h,v 1.1 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/psock.c b/core/net/psock.c
index 2300e69201c..fa488f724b2 100644
--- a/core/net/psock.c
+++ b/core/net/psock.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: psock.c,v 1.12 2010/06/15 14:19:22 nifi Exp $
  */
 
 #include <string.h>
diff --git a/core/net/psock.h b/core/net/psock.h
index d46b90956c0..0fb9233cdc1 100644
--- a/core/net/psock.h
+++ b/core/net/psock.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: psock.h,v 1.8 2010/06/15 14:19:22 nifi Exp $
  */
 
 /**
diff --git a/core/net/queuebuf.c b/core/net/queuebuf.c
index 8c4a9d6e483..077378d96cd 100644
--- a/core/net/queuebuf.c
+++ b/core/net/queuebuf.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: queuebuf.c,v 1.5 2010/11/25 08:43:59 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/queuebuf.h b/core/net/queuebuf.h
index bdb44e6e798..d171ef0433c 100644
--- a/core/net/queuebuf.h
+++ b/core/net/queuebuf.h
@@ -41,7 +41,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: queuebuf.h,v 1.4 2010/11/25 08:43:59 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rawpacket-udp.c b/core/net/rawpacket-udp.c
index 8088daf222c..974a4a8f3ee 100644
--- a/core/net/rawpacket-udp.c
+++ b/core/net/rawpacket-udp.c
@@ -28,7 +28,6 @@ c/*
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rawpacket-udp.c,v 1.4 2010/10/19 18:29:04 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rawpacket-udp.h b/core/net/rawpacket-udp.h
index 6d3a3940294..e38f350a42d 100644
--- a/core/net/rawpacket-udp.h
+++ b/core/net/rawpacket-udp.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rawpacket-udp.h,v 1.1 2006/10/22 12:31:46 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rawpacket.h b/core/net/rawpacket.h
index 1d9d06c2121..1e30a814f42 100644
--- a/core/net/rawpacket.h
+++ b/core/net/rawpacket.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rawpacket.h,v 1.1 2006/10/22 12:31:46 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/resolv.c b/core/net/resolv.c
index c5b750d575d..c75bcc94ca3 100644
--- a/core/net/resolv.c
+++ b/core/net/resolv.c
@@ -57,7 +57,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: resolv.c,v 1.10 2010/10/19 18:29:04 adamdunkels Exp $
  *
  */
 
diff --git a/core/net/resolv.h b/core/net/resolv.h
index 8d55d163163..85b666645e2 100644
--- a/core/net/resolv.h
+++ b/core/net/resolv.h
@@ -34,7 +34,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: resolv.h,v 1.4 2010/05/31 15:22:08 nifi Exp $
  *
  */
 #ifndef __RESOLV_H__
diff --git a/core/net/rime.h b/core/net/rime.h
index 8db7b935ecf..225c0112a88 100644
--- a/core/net/rime.h
+++ b/core/net/rime.h
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rime.h,v 1.30 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/abc.c b/core/net/rime/abc.c
index 3903d9fd4bc..01dc377ff66 100644
--- a/core/net/rime/abc.c
+++ b/core/net/rime/abc.c
@@ -36,7 +36,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: abc.c,v 1.20 2010/02/23 18:38:05 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/abc.h b/core/net/rime/abc.h
index 5c982f4b125..b31a3668416 100644
--- a/core/net/rime/abc.h
+++ b/core/net/rime/abc.h
@@ -46,7 +46,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: abc.h,v 1.17 2010/06/14 19:19:17 adamdunkels Exp $
  */
 /**
  * \file
diff --git a/core/net/rime/announcement.c b/core/net/rime/announcement.c
index a4792acdf4d..46f1b4385e5 100644
--- a/core/net/rime/announcement.c
+++ b/core/net/rime/announcement.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: announcement.c,v 1.6 2010/06/15 19:22:25 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/announcement.h b/core/net/rime/announcement.h
index 0bf20614342..46b59b651f8 100644
--- a/core/net/rime/announcement.h
+++ b/core/net/rime/announcement.h
@@ -54,7 +54,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: announcement.h,v 1.8 2010/03/25 08:49:56 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/broadcast-announcement.c b/core/net/rime/broadcast-announcement.c
index d7540a5a294..e6297225da3 100644
--- a/core/net/rime/broadcast-announcement.c
+++ b/core/net/rime/broadcast-announcement.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: broadcast-announcement.c,v 1.7 2010/10/11 23:43:01 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/broadcast-announcement.h b/core/net/rime/broadcast-announcement.h
index af5b28cef4c..1ec070a197e 100644
--- a/core/net/rime/broadcast-announcement.h
+++ b/core/net/rime/broadcast-announcement.h
@@ -47,7 +47,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: broadcast-announcement.h,v 1.2 2010/10/11 23:44:24 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/broadcast.c b/core/net/rime/broadcast.c
index 4f22eecc192..a3c724a4f0f 100644
--- a/core/net/rime/broadcast.c
+++ b/core/net/rime/broadcast.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: broadcast.c,v 1.3 2010/02/23 18:38:05 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/broadcast.h b/core/net/rime/broadcast.h
index 8b1dfd471a1..169f8cb0291 100644
--- a/core/net/rime/broadcast.h
+++ b/core/net/rime/broadcast.h
@@ -53,7 +53,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: broadcast.h,v 1.5 2010/02/23 18:38:05 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/chameleon-bitopt.h b/core/net/rime/chameleon-bitopt.h
index 2f167f96a6d..83968215d42 100644
--- a/core/net/rime/chameleon-bitopt.h
+++ b/core/net/rime/chameleon-bitopt.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: chameleon-bitopt.h,v 1.2 2008/07/03 07:38:52 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/chameleon-raw.h b/core/net/rime/chameleon-raw.h
index 3c24f209566..bcdd147458f 100644
--- a/core/net/rime/chameleon-raw.h
+++ b/core/net/rime/chameleon-raw.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: chameleon-raw.h,v 1.3 2008/07/03 07:37:51 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/chameleon.c b/core/net/rime/chameleon.c
index eb790b0c752..60ab8763f97 100644
--- a/core/net/rime/chameleon.c
+++ b/core/net/rime/chameleon.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: chameleon.c,v 1.10 2010/05/28 06:18:39 nifi Exp $
  */
 
 /**
diff --git a/core/net/rime/chameleon.h b/core/net/rime/chameleon.h
index 739903783cb..e63859bf429 100644
--- a/core/net/rime/chameleon.h
+++ b/core/net/rime/chameleon.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: chameleon.h,v 1.4 2010/05/28 06:18:39 nifi Exp $
  */
 
 /**
diff --git a/core/net/rime/channel.c b/core/net/rime/channel.c
index 835c43a226c..9e8fa7b157c 100644
--- a/core/net/rime/channel.c
+++ b/core/net/rime/channel.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: channel.c,v 1.3 2010/06/15 19:22:25 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/channel.h b/core/net/rime/channel.h
index 46b68379350..f96a8f05788 100644
--- a/core/net/rime/channel.h
+++ b/core/net/rime/channel.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: channel.h,v 1.3 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/collect-link-estimate.c b/core/net/rime/collect-link-estimate.c
index 50b0ac40e6e..02bd53e7aba 100644
--- a/core/net/rime/collect-link-estimate.c
+++ b/core/net/rime/collect-link-estimate.c
@@ -32,7 +32,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: collect-link-estimate.c,v 1.6 2011/01/09 21:14:22 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/collect-link-estimate.h b/core/net/rime/collect-link-estimate.h
index 5f6ac603450..c7b0cc73bc6 100644
--- a/core/net/rime/collect-link-estimate.h
+++ b/core/net/rime/collect-link-estimate.h
@@ -42,7 +42,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: collect-link-estimate.h,v 1.4 2011/01/09 21:14:22 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/collect-neighbor.c b/core/net/rime/collect-neighbor.c
index b63d2106e0f..775c4221874 100644
--- a/core/net/rime/collect-neighbor.c
+++ b/core/net/rime/collect-neighbor.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: collect-neighbor.c,v 1.10 2011/01/10 15:08:52 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/collect-neighbor.h b/core/net/rime/collect-neighbor.h
index 91f1a2b5907..1e71755466d 100644
--- a/core/net/rime/collect-neighbor.h
+++ b/core/net/rime/collect-neighbor.h
@@ -39,7 +39,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: collect-neighbor.h,v 1.6 2010/10/11 23:38:46 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/collect.h b/core/net/rime/collect.h
index b44e8a4cfec..3f2fccc1c00 100644
--- a/core/net/rime/collect.h
+++ b/core/net/rime/collect.h
@@ -47,7 +47,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: collect.h,v 1.26 2011/01/09 23:48:33 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/ipolite.c b/core/net/rime/ipolite.c
index 3598bca2c0f..af49ecad5db 100644
--- a/core/net/rime/ipolite.c
+++ b/core/net/rime/ipolite.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ipolite.c,v 1.17 2010/02/23 18:38:05 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/ipolite.h b/core/net/rime/ipolite.h
index 65beb3d6dca..ebd1ec1d712 100644
--- a/core/net/rime/ipolite.h
+++ b/core/net/rime/ipolite.h
@@ -81,7 +81,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ipolite.h,v 1.12 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/mesh.c b/core/net/rime/mesh.c
index bb11f1a2ab7..0ceecb49be7 100644
--- a/core/net/rime/mesh.c
+++ b/core/net/rime/mesh.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: mesh.c,v 1.20 2009/12/18 14:57:15 nvt-se Exp $
  */
 
 /**
diff --git a/core/net/rime/mesh.h b/core/net/rime/mesh.h
index 7787a328e11..1bcf9f34e0d 100644
--- a/core/net/rime/mesh.h
+++ b/core/net/rime/mesh.h
@@ -49,7 +49,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: mesh.h,v 1.16 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/multihop.c b/core/net/rime/multihop.c
index c46f1be2025..e1215fbee95 100644
--- a/core/net/rime/multihop.c
+++ b/core/net/rime/multihop.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: multihop.c,v 1.7 2009/11/08 19:40:17 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/multihop.h b/core/net/rime/multihop.h
index 070a148b895..9fba72328da 100644
--- a/core/net/rime/multihop.h
+++ b/core/net/rime/multihop.h
@@ -58,7 +58,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: multihop.h,v 1.6 2009/03/24 07:15:04 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/neighbor-discovery.c b/core/net/rime/neighbor-discovery.c
index 4b60e51efbd..c4e0cddf1a3 100644
--- a/core/net/rime/neighbor-discovery.c
+++ b/core/net/rime/neighbor-discovery.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: neighbor-discovery.c,v 1.19 2010/03/19 13:21:48 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/neighbor-discovery.h b/core/net/rime/neighbor-discovery.h
index 55ad0f50732..d4745c1dc47 100644
--- a/core/net/rime/neighbor-discovery.h
+++ b/core/net/rime/neighbor-discovery.h
@@ -47,7 +47,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: neighbor-discovery.h,v 1.12 2010/06/18 08:28:56 nifi Exp $
  */
 
 /**
diff --git a/core/net/rime/netflood.c b/core/net/rime/netflood.c
index 9dab13f2786..3d392a6d5bc 100644
--- a/core/net/rime/netflood.c
+++ b/core/net/rime/netflood.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: netflood.c,v 1.6 2010/01/25 13:54:06 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/netflood.h b/core/net/rime/netflood.h
index 43f579d98ba..6bc777f7ae4 100644
--- a/core/net/rime/netflood.h
+++ b/core/net/rime/netflood.h
@@ -62,7 +62,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: netflood.h,v 1.7 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/polite-announcement.c b/core/net/rime/polite-announcement.c
index f7a7b52416f..a5c7d9ec343 100644
--- a/core/net/rime/polite-announcement.c
+++ b/core/net/rime/polite-announcement.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: polite-announcement.c,v 1.16 2010/06/16 10:10:10 nifi Exp $
  */
 
 /**
diff --git a/core/net/rime/polite-announcement.h b/core/net/rime/polite-announcement.h
index 2197f08c533..32f7b3663d1 100644
--- a/core/net/rime/polite-announcement.h
+++ b/core/net/rime/polite-announcement.h
@@ -47,7 +47,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: polite-announcement.h,v 1.2 2010/03/19 13:17:31 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/polite.c b/core/net/rime/polite.c
index bbefaab4fec..f1cb464b63d 100644
--- a/core/net/rime/polite.c
+++ b/core/net/rime/polite.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: polite.c,v 1.10 2010/02/23 18:38:05 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/polite.h b/core/net/rime/polite.h
index e924e8c598a..286eb1dcac0 100644
--- a/core/net/rime/polite.h
+++ b/core/net/rime/polite.h
@@ -81,7 +81,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: polite.h,v 1.10 2010/06/18 08:28:56 nifi Exp $
  */
 
 /**
diff --git a/core/net/rime/rime-udp.c b/core/net/rime/rime-udp.c
index c59d41cdab6..18ac72913db 100644
--- a/core/net/rime/rime-udp.c
+++ b/core/net/rime/rime-udp.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rime-udp.c,v 1.7 2010/10/19 18:29:04 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/rime-udp.h b/core/net/rime/rime-udp.h
index 1e3f544ee0a..7c449a1bd25 100644
--- a/core/net/rime/rime-udp.h
+++ b/core/net/rime/rime-udp.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rime-udp.h,v 1.2 2010/02/18 21:48:39 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/rime.c b/core/net/rime/rime.c
index 2d49cc37189..49172e57ae6 100644
--- a/core/net/rime/rime.c
+++ b/core/net/rime/rime.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rime.c,v 1.31 2010/10/03 20:10:22 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/rimeaddr.c b/core/net/rime/rimeaddr.c
index a409509cc89..80899f8024a 100644
--- a/core/net/rime/rimeaddr.c
+++ b/core/net/rime/rimeaddr.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rimeaddr.c,v 1.9 2008/11/30 18:26:57 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/rimeaddr.h b/core/net/rime/rimeaddr.h
index c46f6b37e45..962b4389c68 100644
--- a/core/net/rime/rimeaddr.h
+++ b/core/net/rime/rimeaddr.h
@@ -42,7 +42,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rimeaddr.h,v 1.6 2009/05/26 13:58:53 nvt-se Exp $
  */
 
 /**
diff --git a/core/net/rime/rimestats.c b/core/net/rime/rimestats.c
index 41bd152d8d9..82dc1734857 100644
--- a/core/net/rime/rimestats.c
+++ b/core/net/rime/rimestats.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rimestats.c,v 1.1 2007/05/22 20:48:41 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/rimestats.h b/core/net/rime/rimestats.h
index 93dc6c5d591..3fd9b06b7e3 100644
--- a/core/net/rime/rimestats.h
+++ b/core/net/rime/rimestats.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rimestats.h,v 1.1 2007/05/22 20:48:41 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/rmh.c b/core/net/rime/rmh.c
index 1cce74bb9ad..a3a05b45788 100644
--- a/core/net/rime/rmh.c
+++ b/core/net/rime/rmh.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rmh.c,v 1.10 2009/11/08 19:40:17 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/rmh.h b/core/net/rime/rmh.h
index 6c9b0752909..f23c5ac3a51 100644
--- a/core/net/rime/rmh.h
+++ b/core/net/rime/rmh.h
@@ -53,7 +53,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rmh.h,v 1.8 2009/11/08 19:40:17 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/route-discovery.c b/core/net/rime/route-discovery.c
index 8f3fe8b51f5..215b1ae7d0a 100644
--- a/core/net/rime/route-discovery.c
+++ b/core/net/rime/route-discovery.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: route-discovery.c,v 1.20 2010/01/27 08:12:56 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/route-discovery.h b/core/net/rime/route-discovery.h
index 43c0c702361..dd8c7c46519 100644
--- a/core/net/rime/route-discovery.h
+++ b/core/net/rime/route-discovery.h
@@ -45,7 +45,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: route-discovery.h,v 1.11 2010/06/18 08:28:56 nifi Exp $
  */
 
 /**
diff --git a/core/net/rime/route.c b/core/net/rime/route.c
index 231b5ebe27c..f6b0684b2af 100644
--- a/core/net/rime/route.c
+++ b/core/net/rime/route.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: route.c,v 1.18 2010/06/15 19:22:25 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/route.h b/core/net/rime/route.h
index d61fb67c8e8..6e24b872d56 100644
--- a/core/net/rime/route.h
+++ b/core/net/rime/route.h
@@ -39,7 +39,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: route.h,v 1.12 2009/08/20 20:27:17 oliverschmidt Exp $
  */
 
 /**
diff --git a/core/net/rime/rucb.c b/core/net/rime/rucb.c
index 2ec350f5483..3fd00120780 100644
--- a/core/net/rime/rucb.c
+++ b/core/net/rime/rucb.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rucb.c,v 1.11 2009/11/08 19:40:18 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/rucb.h b/core/net/rime/rucb.h
index 8fe3dd92acd..f4007e1a2a0 100644
--- a/core/net/rime/rucb.h
+++ b/core/net/rime/rucb.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rucb.h,v 1.4 2009/11/08 19:40:18 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/rudolph0.c b/core/net/rime/rudolph0.c
index 6766bc56050..d7456636084 100644
--- a/core/net/rime/rudolph0.c
+++ b/core/net/rime/rudolph0.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rudolph0.c,v 1.11 2009/03/12 21:58:21 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/rudolph0.h b/core/net/rime/rudolph0.h
index 28fabc9a4c9..ade55f8e39f 100644
--- a/core/net/rime/rudolph0.h
+++ b/core/net/rime/rudolph0.h
@@ -47,7 +47,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rudolph0.h,v 1.10 2008/06/30 08:28:53 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/rudolph1.c b/core/net/rime/rudolph1.c
index a74b205bbc7..c195946f5ee 100644
--- a/core/net/rime/rudolph1.c
+++ b/core/net/rime/rudolph1.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rudolph1.c,v 1.14 2010/01/25 13:54:06 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/rudolph1.h b/core/net/rime/rudolph1.h
index 299d6481767..6276322bd05 100644
--- a/core/net/rime/rudolph1.h
+++ b/core/net/rime/rudolph1.h
@@ -47,7 +47,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rudolph1.h,v 1.9 2010/06/18 08:28:56 nifi Exp $
  */
 
 /**
diff --git a/core/net/rime/rudolph2.c b/core/net/rime/rudolph2.c
index d049db783f4..8c096890293 100644
--- a/core/net/rime/rudolph2.c
+++ b/core/net/rime/rudolph2.c
@@ -39,7 +39,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rudolph2.c,v 1.7 2009/03/12 21:58:21 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/rudolph2.h b/core/net/rime/rudolph2.h
index 9c4e945fa61..0f88209c4c1 100644
--- a/core/net/rime/rudolph2.h
+++ b/core/net/rime/rudolph2.h
@@ -47,7 +47,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rudolph2.h,v 1.5 2010/06/18 08:28:56 nifi Exp $
  */
 
 /**
diff --git a/core/net/rime/runicast.c b/core/net/rime/runicast.c
index 946fef0e7b1..88a98c17600 100644
--- a/core/net/rime/runicast.c
+++ b/core/net/rime/runicast.c
@@ -34,7 +34,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: runicast.c,v 1.12 2010/03/26 12:29:29 nifi Exp $
  */
 
 /**
diff --git a/core/net/rime/runicast.h b/core/net/rime/runicast.h
index b691ca798b8..84cc90f02fe 100644
--- a/core/net/rime/runicast.h
+++ b/core/net/rime/runicast.h
@@ -66,7 +66,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: runicast.h,v 1.7 2010/03/19 13:22:08 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/stbroadcast.c b/core/net/rime/stbroadcast.c
index 3c07bc3ae74..fa56b9bc9d9 100644
--- a/core/net/rime/stbroadcast.c
+++ b/core/net/rime/stbroadcast.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: stbroadcast.c,v 1.3 2009/11/08 19:40:18 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/stbroadcast.h b/core/net/rime/stbroadcast.h
index daaf487b65f..8fc24f995ad 100644
--- a/core/net/rime/stbroadcast.h
+++ b/core/net/rime/stbroadcast.h
@@ -48,7 +48,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: stbroadcast.h,v 1.4 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/stunicast.c b/core/net/rime/stunicast.c
index 554e81da04b..cf399241739 100644
--- a/core/net/rime/stunicast.c
+++ b/core/net/rime/stunicast.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: stunicast.c,v 1.6 2010/04/30 07:29:31 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/stunicast.h b/core/net/rime/stunicast.h
index cdd8f7b95bc..24a900e9aad 100644
--- a/core/net/rime/stunicast.h
+++ b/core/net/rime/stunicast.h
@@ -60,7 +60,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: stunicast.h,v 1.7 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/timesynch.c b/core/net/rime/timesynch.c
index 5a184ce6b1c..154ecd822a3 100644
--- a/core/net/rime/timesynch.c
+++ b/core/net/rime/timesynch.c
@@ -34,7 +34,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: timesynch.c,v 1.11 2010/12/16 22:47:38 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/timesynch.h b/core/net/rime/timesynch.h
index 8e867cd45de..f8b12f535c8 100644
--- a/core/net/rime/timesynch.h
+++ b/core/net/rime/timesynch.h
@@ -55,7 +55,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: timesynch.h,v 1.4 2008/07/01 21:02:51 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/trickle.c b/core/net/rime/trickle.c
index 43836a124c6..75c2be870c7 100644
--- a/core/net/rime/trickle.c
+++ b/core/net/rime/trickle.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: trickle.c,v 1.18 2009/11/08 19:40:18 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/trickle.h b/core/net/rime/trickle.h
index f2428b7ce4b..a3430c43299 100644
--- a/core/net/rime/trickle.h
+++ b/core/net/rime/trickle.h
@@ -45,7 +45,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: trickle.h,v 1.13 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/unicast.c b/core/net/rime/unicast.c
index a4f37a9da3d..4ca3785d9bb 100644
--- a/core/net/rime/unicast.c
+++ b/core/net/rime/unicast.c
@@ -34,7 +34,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: unicast.c,v 1.4 2010/02/23 18:38:05 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/unicast.h b/core/net/rime/unicast.h
index c6667405a54..1df37b6dd79 100644
--- a/core/net/rime/unicast.h
+++ b/core/net/rime/unicast.h
@@ -50,7 +50,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: unicast.h,v 1.6 2010/02/23 18:38:05 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/sicslowpan.c b/core/net/sicslowpan.c
index 7a5cdccdda3..c0ceb641efd 100644
--- a/core/net/sicslowpan.c
+++ b/core/net/sicslowpan.c
@@ -32,7 +32,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sicslowpan.c,v 1.52 2011/01/04 20:22:21 joxe Exp $
  */
 /**
  * \file
diff --git a/core/net/sicslowpan.h b/core/net/sicslowpan.h
index c79ed2803e5..f4a3bc56245 100644
--- a/core/net/sicslowpan.h
+++ b/core/net/sicslowpan.h
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sicslowpan.h,v 1.13 2010/03/26 10:28:51 joxe Exp $
  */
 /**
  * \file
diff --git a/core/net/slipdev.c b/core/net/slipdev.c
index 63b07953835..2ee528fd0fd 100644
--- a/core/net/slipdev.c
+++ b/core/net/slipdev.c
@@ -53,7 +53,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: slipdev.c,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
  *
  */
 
diff --git a/core/net/slipdev.h b/core/net/slipdev.h
index cc2c4463378..4026162ee01 100644
--- a/core/net/slipdev.h
+++ b/core/net/slipdev.h
@@ -39,7 +39,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: slipdev.h,v 1.2 2009/03/17 20:28:44 nvt-se Exp $
  *
  */
 
diff --git a/core/net/tcpdump.c b/core/net/tcpdump.c
index 66cf68d6d47..6883cfec33c 100644
--- a/core/net/tcpdump.c
+++ b/core/net/tcpdump.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: tcpdump.c,v 1.3 2010/10/19 18:29:04 adamdunkels Exp $
  */
 
 #include "contiki-net.h"
diff --git a/core/net/tcpdump.h b/core/net/tcpdump.h
index c49a7322c71..c86595dfb5c 100644
--- a/core/net/tcpdump.h
+++ b/core/net/tcpdump.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: tcpdump.h,v 1.3 2007/08/06 13:14:09 nifi Exp $
  */
 #ifndef __TCPDUMP_H__
 #define __TCPDUMP_H__
diff --git a/core/net/tcpip.h b/core/net/tcpip.h
index 1ff5060cec0..705fe455489 100644
--- a/core/net/tcpip.h
+++ b/core/net/tcpip.h
@@ -62,7 +62,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: tcpip.h,v 1.17 2010/10/19 18:29:04 adamdunkels Exp $
  */
 #ifndef __TCPIP_H__
 #define __TCPIP_H__
diff --git a/core/net/uaodv-def.h b/core/net/uaodv-def.h
index 9c60a229b08..87592a6cd25 100644
--- a/core/net/uaodv-def.h
+++ b/core/net/uaodv-def.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: uaodv-def.h,v 1.5 2007/05/28 16:33:19 bg- Exp $
  */
 
 /**
diff --git a/core/net/uaodv-rt.c b/core/net/uaodv-rt.c
index b3f667d165f..4fae933222d 100644
--- a/core/net/uaodv-rt.c
+++ b/core/net/uaodv-rt.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: uaodv-rt.c,v 1.8 2010/10/19 18:29:04 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/uaodv-rt.h b/core/net/uaodv-rt.h
index f94d03a9269..cae943fdfb3 100644
--- a/core/net/uaodv-rt.h
+++ b/core/net/uaodv-rt.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: uaodv-rt.h,v 1.4 2007/05/09 13:45:16 bg- Exp $
  */
 
 /**
diff --git a/core/net/uaodv.c b/core/net/uaodv.c
index e01fe8c2324..89de47f43d7 100644
--- a/core/net/uaodv.c
+++ b/core/net/uaodv.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: uaodv.c,v 1.38 2010/10/19 18:29:04 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/uaodv.h b/core/net/uaodv.h
index fc3cd093474..3b60ffd4f36 100644
--- a/core/net/uaodv.h
+++ b/core/net/uaodv.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: uaodv.h,v 1.3 2007/12/13 10:04:59 fros4943 Exp $
  */
 
 /**
diff --git a/core/net/uip-debug.h b/core/net/uip-debug.h
index 8015c03f159..8a24f395d89 100644
--- a/core/net/uip-debug.h
+++ b/core/net/uip-debug.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: uip-debug.h,v 1.1 2010/04/30 13:20:57 joxe Exp $
  */
 /**
  * \file
diff --git a/core/net/uip-fw-drv.c b/core/net/uip-fw-drv.c
index 0163fd57133..7cc78bf0098 100644
--- a/core/net/uip-fw-drv.c
+++ b/core/net/uip-fw-drv.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: uip-fw-drv.c,v 1.4 2007/05/23 22:17:08 oliverschmidt Exp $
  */
 
 #include "net/uip-fw.h"
diff --git a/core/net/uip-fw-drv.h b/core/net/uip-fw-drv.h
index 300d62130e1..ecc5f54e7de 100644
--- a/core/net/uip-fw-drv.h
+++ b/core/net/uip-fw-drv.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: uip-fw-drv.h,v 1.1 2007/05/20 21:29:40 oliverschmidt Exp $
  */
 #ifndef __UIP_FW_DRV_H__
 #define __UIP_FW_DRV_H__
diff --git a/core/net/uip-fw.c b/core/net/uip-fw.c
index bb42f2490db..3c668890d68 100644
--- a/core/net/uip-fw.c
+++ b/core/net/uip-fw.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: uip-fw.c,v 1.12 2010/10/19 18:29:04 adamdunkels Exp $
  */
 /**
  * \addtogroup uip
diff --git a/core/net/uip-fw.h b/core/net/uip-fw.h
index 244b93e6f6a..a77adf761b7 100644
--- a/core/net/uip-fw.h
+++ b/core/net/uip-fw.h
@@ -41,7 +41,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: uip-fw.h,v 1.4 2009/03/15 20:29:04 nvt-se Exp $
  */
 #ifndef __UIP_FW_H__
 #define __UIP_FW_H__
diff --git a/core/net/uip-neighbor.c b/core/net/uip-neighbor.c
index 7e74714b209..6d996a0f87c 100644
--- a/core/net/uip-neighbor.c
+++ b/core/net/uip-neighbor.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: uip-neighbor.c,v 1.3 2008/11/09 12:16:05 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/uip-neighbor.h b/core/net/uip-neighbor.h
index d894469c4a9..7fa7b4a357d 100644
--- a/core/net/uip-neighbor.h
+++ b/core/net/uip-neighbor.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: uip-neighbor.h,v 1.2 2006/08/09 16:13:40 bg- Exp $
  */
 
 /**
diff --git a/core/net/uip-over-mesh.c b/core/net/uip-over-mesh.c
index 8655188ab62..cf204ee2771 100644
--- a/core/net/uip-over-mesh.c
+++ b/core/net/uip-over-mesh.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: uip-over-mesh.c,v 1.19 2010/03/31 09:38:42 fros4943 Exp $
  */
 
 /**
diff --git a/core/net/uip-over-mesh.h b/core/net/uip-over-mesh.h
index 43eb5dd8ef5..248d75c4593 100644
--- a/core/net/uip-over-mesh.h
+++ b/core/net/uip-over-mesh.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: uip-over-mesh.h,v 1.3 2008/11/09 12:20:56 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/uip-split.c b/core/net/uip-split.c
index e84cc53eafd..cbcc48e1584 100644
--- a/core/net/uip-split.c
+++ b/core/net/uip-split.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: uip-split.c,v 1.3 2010/01/25 13:53:15 adamdunkels Exp $
  */
 
 #include <string.h>
diff --git a/core/net/uip-split.h b/core/net/uip-split.h
index a8d4e9d8920..2cea7203fb3 100644
--- a/core/net/uip-split.h
+++ b/core/net/uip-split.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: uip-split.h,v 1.1 2006/06/17 22:41:19 adamdunkels Exp $
  */
 /**
  * \addtogroup uip
diff --git a/core/net/uip-udp-packet.c b/core/net/uip-udp-packet.c
index 5a7e814e94b..8e9369ab787 100644
--- a/core/net/uip-udp-packet.c
+++ b/core/net/uip-udp-packet.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: uip-udp-packet.c,v 1.7 2009/10/18 22:02:01 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/uip-udp-packet.h b/core/net/uip-udp-packet.h
index c7fe4664743..70a4a0fc3d6 100644
--- a/core/net/uip-udp-packet.h
+++ b/core/net/uip-udp-packet.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: uip-udp-packet.h,v 1.3 2009/10/18 22:02:01 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/uip.c b/core/net/uip.c
index 444ee308ba6..24047e1d1fb 100644
--- a/core/net/uip.c
+++ b/core/net/uip.c
@@ -41,7 +41,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uip.c,v 1.30 2010/10/19 18:29:04 adamdunkels Exp $
  *
  */
 
diff --git a/core/net/uip.h b/core/net/uip.h
index 3724d441830..3a5ab0fe101 100644
--- a/core/net/uip.h
+++ b/core/net/uip.h
@@ -47,7 +47,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uip.h,v 1.35 2010/10/19 18:29:04 adamdunkels Exp $
  *
  */
 
diff --git a/core/net/uip6.c b/core/net/uip6.c
index 021cbf888b8..f17444b2990 100644
--- a/core/net/uip6.c
+++ b/core/net/uip6.c
@@ -41,7 +41,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uip6.c,v 1.25 2011/01/04 22:11:37 joxe Exp $
  *
  */
 
diff --git a/core/net/uip_arch.h b/core/net/uip_arch.h
index 7a5b369c2f5..b035ee3ef19 100644
--- a/core/net/uip_arch.h
+++ b/core/net/uip_arch.h
@@ -54,7 +54,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uip_arch.h,v 1.1 2006/06/17 22:41:19 adamdunkels Exp $
  *
  */
 
diff --git a/core/net/uip_arp.c b/core/net/uip_arp.c
index 0d6c4b454f6..e1484901ab3 100644
--- a/core/net/uip_arp.c
+++ b/core/net/uip_arp.c
@@ -54,7 +54,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uip_arp.c,v 1.8 2010/12/14 22:45:22 dak664 Exp $
  *
  */
 
diff --git a/core/net/uip_arp.h b/core/net/uip_arp.h
index e499db834fd..a500fd4ceb5 100644
--- a/core/net/uip_arp.h
+++ b/core/net/uip_arp.h
@@ -45,7 +45,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uip_arp.h,v 1.2 2006/08/26 23:58:45 oliverschmidt Exp $
  *
  */
 
diff --git a/core/net/uiplib.c b/core/net/uiplib.c
index 7ca55bb365b..88911d2bcc2 100644
--- a/core/net/uiplib.c
+++ b/core/net/uiplib.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the uIP TCP/IP stack and the Contiki operating system.
  *
- * $Id: uiplib.c,v 1.3 2010/12/14 22:45:22 dak664 Exp $
  *
  */
 
diff --git a/core/net/uiplib.h b/core/net/uiplib.h
index e147af351c5..508c83db4a7 100644
--- a/core/net/uiplib.h
+++ b/core/net/uiplib.h
@@ -37,7 +37,6 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: uiplib.h,v 1.3 2010/05/31 15:22:08 nifi Exp $
  *
  */
 #ifndef __UIPLIB_H__
diff --git a/core/net/uipopt.h b/core/net/uipopt.h
index cbad2c3b536..ab31737ca86 100644
--- a/core/net/uipopt.h
+++ b/core/net/uipopt.h
@@ -58,7 +58,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uipopt.h,v 1.14 2010/12/24 00:39:04 dak664 Exp $
  *
  */
 
diff --git a/core/sys/arg.c b/core/sys/arg.c
index 48594bc46db..080dea9bb59 100644
--- a/core/sys/arg.c
+++ b/core/sys/arg.c
@@ -60,7 +60,6 @@
  *
  * This file is part of the Contiki desktop OS
  *
- * $Id: arg.c,v 1.2 2006/08/14 23:39:23 oliverschmidt Exp $
  *
  */
 
diff --git a/core/sys/arg.h b/core/sys/arg.h
index 4abcb820d7b..df1ceb67d55 100644
--- a/core/sys/arg.h
+++ b/core/sys/arg.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop OS
  *
- * $Id: arg.h,v 1.1 2006/06/17 22:41:19 adamdunkels Exp $
  *
  */
 #ifndef __ARG_H__
diff --git a/core/sys/autostart.c b/core/sys/autostart.c
index 8bd2ccfa429..a0d8a77b43b 100644
--- a/core/sys/autostart.c
+++ b/core/sys/autostart.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: autostart.c,v 1.3 2007/11/18 12:27:45 ksb Exp $
  */
 
 /**
diff --git a/core/sys/autostart.h b/core/sys/autostart.h
index c457bb4d21f..46c3333b83e 100644
--- a/core/sys/autostart.h
+++ b/core/sys/autostart.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: autostart.h,v 1.5 2008/02/10 11:17:33 oliverschmidt Exp $
  */
 
 /**
diff --git a/core/sys/cc.h b/core/sys/cc.h
index 7250f6a875d..f4a6105a1af 100644
--- a/core/sys/cc.h
+++ b/core/sys/cc.h
@@ -39,7 +39,6 @@
  *
  * This file is part of the Contiki desktop OS
  *
- * $Id: cc.h,v 1.6 2008/07/02 08:35:29 adamdunkels Exp $
  *
  */
 #ifndef __CC_H__
diff --git a/core/sys/compower.c b/core/sys/compower.c
index 0872d6b39b6..b920c3e70e6 100644
--- a/core/sys/compower.c
+++ b/core/sys/compower.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: compower.c,v 1.5 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
diff --git a/core/sys/compower.h b/core/sys/compower.h
index b5797a0557e..60866f660bc 100644
--- a/core/sys/compower.h
+++ b/core/sys/compower.h
@@ -42,7 +42,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: compower.h,v 1.2 2009/03/12 21:58:21 adamdunkels Exp $
  */
 
 /**
diff --git a/core/sys/ctimer.c b/core/sys/ctimer.c
index ffcde952df3..e6090a9a8eb 100644
--- a/core/sys/ctimer.c
+++ b/core/sys/ctimer.c
@@ -33,7 +33,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ctimer.c,v 1.1 2010/06/14 07:34:36 adamdunkels Exp $
  */
 
 /**
diff --git a/core/sys/ctimer.h b/core/sys/ctimer.h
index cf027fcc83e..bc7bf2f985d 100644
--- a/core/sys/ctimer.h
+++ b/core/sys/ctimer.h
@@ -42,7 +42,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ctimer.h,v 1.2 2010/06/14 07:35:53 adamdunkels Exp $
  */
 
 /**
diff --git a/core/sys/dsc.h b/core/sys/dsc.h
index 29892343e57..75ba4d9a97b 100644
--- a/core/sys/dsc.h
+++ b/core/sys/dsc.h
@@ -56,7 +56,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: dsc.h,v 1.4 2008/10/14 12:46:39 nvt-se Exp $
  *
  */
 #ifndef __DSC_H__
diff --git a/core/sys/energest.c b/core/sys/energest.c
index b7e59c271c2..5b0f6cb8697 100644
--- a/core/sys/energest.c
+++ b/core/sys/energest.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: energest.c,v 1.2 2008/09/29 11:44:37 joxe Exp $
  */
 
 /**
diff --git a/core/sys/energest.h b/core/sys/energest.h
index 550f5eac943..70b46ab6cb0 100644
--- a/core/sys/energest.h
+++ b/core/sys/energest.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: energest.h,v 1.5 2009/10/20 20:19:27 adamdunkels Exp $
  */
 
 /**
diff --git a/core/sys/etimer.c b/core/sys/etimer.c
index 089ddbc8b69..0f8fba4b337 100644
--- a/core/sys/etimer.c
+++ b/core/sys/etimer.c
@@ -42,7 +42,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: etimer.c,v 1.3 2007/10/07 19:59:27 joxe Exp $
  */
 
 #include "contiki-conf.h"
diff --git a/core/sys/etimer.h b/core/sys/etimer.h
index a965089b9eb..f46e24c13ed 100644
--- a/core/sys/etimer.h
+++ b/core/sys/etimer.h
@@ -58,7 +58,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: etimer.h,v 1.3 2008/02/07 23:04:35 oliverschmidt Exp $
  */
 #ifndef __ETIMER_H__
 #define __ETIMER_H__
diff --git a/core/sys/lc-addrlabels.h b/core/sys/lc-addrlabels.h
index 10578bedbbe..b7f7028e492 100644
--- a/core/sys/lc-addrlabels.h
+++ b/core/sys/lc-addrlabels.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: lc-addrlabels.h,v 1.1 2006/06/17 22:41:20 adamdunkels Exp $
  */
 
 /**
diff --git a/core/sys/lc-switch.h b/core/sys/lc-switch.h
index 6939004af04..6ffb6c76330 100644
--- a/core/sys/lc-switch.h
+++ b/core/sys/lc-switch.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: lc-switch.h,v 1.3 2008/10/14 12:46:39 nvt-se Exp $
  */
 
 /**
diff --git a/core/sys/lc.h b/core/sys/lc.h
index 33c472c9abf..2da0e4a9e2b 100644
--- a/core/sys/lc.h
+++ b/core/sys/lc.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: lc.h,v 1.1 2006/06/17 22:41:20 adamdunkels Exp $
  */
 
 /**
diff --git a/core/sys/loader.h b/core/sys/loader.h
index 88e4762b062..3b8656636e2 100644
--- a/core/sys/loader.h
+++ b/core/sys/loader.h
@@ -49,7 +49,6 @@
  *
  * This file is part of the Contiki desktop OS
  *
- * $Id: loader.h,v 1.2 2008/10/14 12:46:39 nvt-se Exp $
  *
  */
 #ifndef __LOADER_H__
diff --git a/core/sys/log.h b/core/sys/log.h
index 2460210fac9..93aecb7650e 100644
--- a/core/sys/log.h
+++ b/core/sys/log.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: log.h,v 1.1 2006/06/17 22:41:20 adamdunkels Exp $
  */
 #ifndef __LOG_H__
 #define __LOG_H__
diff --git a/core/sys/mt.c b/core/sys/mt.c
index bf3bd46e4cc..cfa8a39a5ec 100644
--- a/core/sys/mt.c
+++ b/core/sys/mt.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: mt.c,v 1.7 2009/09/03 12:57:58 nvt-se Exp $
  */
 
 /**
diff --git a/core/sys/mt.h b/core/sys/mt.h
index 29dbe6ef4d4..4d53fff4ad1 100644
--- a/core/sys/mt.h
+++ b/core/sys/mt.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: mt.h,v 1.6 2008/10/14 12:46:39 nvt-se Exp $
  */
 
 /** \addtogroup sys
diff --git a/core/sys/process.c b/core/sys/process.c
index 70adf673c43..8a7496d75d4 100644
--- a/core/sys/process.c
+++ b/core/sys/process.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: process.c,v 1.12 2010/10/20 22:24:46 adamdunkels Exp $
  */
 
 /**
diff --git a/core/sys/process.h b/core/sys/process.h
index 4aadf9ca7b1..63fa75e14b5 100644
--- a/core/sys/process.h
+++ b/core/sys/process.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: process.h,v 1.17 2010/09/14 18:55:04 dak664 Exp $
  */
 
 /**
diff --git a/core/sys/procinit.c b/core/sys/procinit.c
index 169b0cff48e..dfac1bf006a 100644
--- a/core/sys/procinit.c
+++ b/core/sys/procinit.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: procinit.c,v 1.1 2006/06/17 22:41:20 adamdunkels Exp $
  */
 
 #include "contiki.h"
diff --git a/core/sys/procinit.h b/core/sys/procinit.h
index b590560eecd..134b8d7d672 100644
--- a/core/sys/procinit.h
+++ b/core/sys/procinit.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: procinit.h,v 1.2 2007/08/22 10:49:48 ksb Exp $
  */
 #ifndef __PROCINIT_H__
 #define __PROCINIT_H__
diff --git a/core/sys/profile-aggregates.c b/core/sys/profile-aggregates.c
index 4cd3bc232ae..93855474c36 100644
--- a/core/sys/profile-aggregates.c
+++ b/core/sys/profile-aggregates.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: profile-aggregates.c,v 1.4 2007/11/18 12:27:45 ksb Exp $
  */
 
 /**
diff --git a/core/sys/profile.c b/core/sys/profile.c
index 9f16c0b31f7..bff83c81381 100644
--- a/core/sys/profile.c
+++ b/core/sys/profile.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: profile.c,v 1.4 2008/01/17 12:19:26 adamdunkels Exp $
  */
 
 /**
diff --git a/core/sys/profile.h b/core/sys/profile.h
index bd9c3226e60..9bf6866db7c 100644
--- a/core/sys/profile.h
+++ b/core/sys/profile.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: profile.h,v 1.3 2008/01/17 12:19:26 adamdunkels Exp $
  */
 
 /**
diff --git a/core/sys/pt-sem.h b/core/sys/pt-sem.h
index 01234ff3603..3f8a4f9e966 100644
--- a/core/sys/pt-sem.h
+++ b/core/sys/pt-sem.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: pt-sem.h,v 1.2 2008/10/14 12:46:39 nvt-se Exp $
  */
 
 /**
diff --git a/core/sys/rtimer.c b/core/sys/rtimer.c
index eb92625d6c6..60b8b37c1e9 100644
--- a/core/sys/rtimer.c
+++ b/core/sys/rtimer.c
@@ -42,7 +42,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: rtimer.c,v 1.7 2010/01/19 13:08:24 adamdunkels Exp $
  */
 
 #include "sys/rtimer.h"
diff --git a/core/sys/rtimer.h b/core/sys/rtimer.h
index db7c053eaac..113dc7dedf6 100644
--- a/core/sys/rtimer.h
+++ b/core/sys/rtimer.h
@@ -48,7 +48,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: rtimer.h,v 1.12 2010/09/13 20:46:02 nifi Exp $
  */
 #ifndef __RTIMER_H__
 #define __RTIMER_H__
diff --git a/core/sys/stimer.c b/core/sys/stimer.c
index 4307b80220b..0e13651d869 100644
--- a/core/sys/stimer.c
+++ b/core/sys/stimer.c
@@ -42,7 +42,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>, Nicolas Tsiftes <nvt@sics.se>
  *
- * $Id: stimer.c,v 1.3 2010/03/15 15:53:57 joxe Exp $
  */
 
 #include "contiki-conf.h"
diff --git a/core/sys/stimer.h b/core/sys/stimer.h
index 84279f711e5..16711e60404 100644
--- a/core/sys/stimer.h
+++ b/core/sys/stimer.h
@@ -64,7 +64,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>, Nicolas Tsiftes <nvt@sics.se>
  *
- * $Id: stimer.h,v 1.4 2010/03/15 15:53:57 joxe Exp $
  */
 #ifndef __STIMER_H__
 #define __STIMER_H__
diff --git a/core/sys/subprocess.h b/core/sys/subprocess.h
index b92527548a7..9f2761810c5 100644
--- a/core/sys/subprocess.h
+++ b/core/sys/subprocess.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: subprocess.h,v 1.1 2006/09/26 20:53:27 adamdunkels Exp $
  */
 
 /**
diff --git a/core/sys/timer.c b/core/sys/timer.c
index 9fcb54b0632..d13b61f9860 100644
--- a/core/sys/timer.c
+++ b/core/sys/timer.c
@@ -42,7 +42,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: timer.c,v 1.8 2010/06/21 19:07:24 joxe Exp $
  */
 
 #include "contiki-conf.h"
diff --git a/core/sys/timer.h b/core/sys/timer.h
index 40f2be80b89..88a45850f71 100644
--- a/core/sys/timer.h
+++ b/core/sys/timer.h
@@ -69,7 +69,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: timer.h,v 1.2 2008/09/21 08:58:05 adamdunkels Exp $
  */
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/core/sys/timetable-aggregate.c b/core/sys/timetable-aggregate.c
index 391f472ddff..fb647f3ce48 100644
--- a/core/sys/timetable-aggregate.c
+++ b/core/sys/timetable-aggregate.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: timetable-aggregate.c,v 1.2 2008/03/13 14:27:34 fros4943 Exp $
  */
 
 /**
diff --git a/core/sys/timetable-aggregate.h b/core/sys/timetable-aggregate.h
index 24477c54cc2..969f81c0de1 100644
--- a/core/sys/timetable-aggregate.h
+++ b/core/sys/timetable-aggregate.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: timetable-aggregate.h,v 1.2 2008/03/13 14:27:34 fros4943 Exp $
  */
 
 /**
diff --git a/core/sys/timetable.c b/core/sys/timetable.c
index fe30ac16617..40766a62c7a 100644
--- a/core/sys/timetable.c
+++ b/core/sys/timetable.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: timetable.c,v 1.4 2010/04/06 19:10:21 anthony-a Exp $
  */
 
 /**
diff --git a/core/sys/timetable.h b/core/sys/timetable.h
index 7b5fca00b67..350d3d950d9 100644
--- a/core/sys/timetable.h
+++ b/core/sys/timetable.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: timetable.h,v 1.2 2008/02/28 22:11:30 oliverschmidt Exp $
  */
 
 /**
diff --git a/cpu/6502/6502def.h b/cpu/6502/6502def.h
index ea9d272d5b1..e452ed7ea5e 100644
--- a/cpu/6502/6502def.h
+++ b/cpu/6502/6502def.h
@@ -30,7 +30,6 @@
  *
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * @(#)$Id: 6502def.h,v 1.27 2010/10/22 20:28:58 oliverschmidt Exp $
  */
 
 #ifndef __6502DEF_H__
diff --git a/cpu/6502/ctk/ctk-mouse.c b/cpu/6502/ctk/ctk-mouse.c
index cc233063114..e7a94cdea70 100644
--- a/cpu/6502/ctk/ctk-mouse.c
+++ b/cpu/6502/ctk/ctk-mouse.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: ctk-mouse.c,v 1.3 2009/10/18 09:33:08 oliverschmidt Exp $
  */
 
 #include <mouse.h>
diff --git a/cpu/6502/dhcp/dhcp-client.c b/cpu/6502/dhcp/dhcp-client.c
index d74da6a504d..7a94d8580fe 100644
--- a/cpu/6502/dhcp/dhcp-client.c
+++ b/cpu/6502/dhcp/dhcp-client.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: dhcp-client.c,v 1.5 2010/10/31 22:51:17 oliverschmidt Exp $
  *
  */
 
diff --git a/cpu/6502/lib/config.c b/cpu/6502/lib/config.c
index 3c025a2fde1..b32f4a02a1d 100644
--- a/cpu/6502/lib/config.c
+++ b/cpu/6502/lib/config.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: config.c,v 1.7 2010/09/29 21:48:54 oliverschmidt Exp $
  */
 
 #include <stdlib.h>
diff --git a/cpu/6502/lib/config.h b/cpu/6502/lib/config.h
index 122a376eb11..4abc9f22d1b 100644
--- a/cpu/6502/lib/config.h
+++ b/cpu/6502/lib/config.h
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: config.h,v 1.2 2007/12/21 01:04:29 oliverschmidt Exp $
  */
 
 #ifndef __CONFIG_H__
diff --git a/cpu/6502/lib/error.c b/cpu/6502/lib/error.c
index 1dd3e9686a3..84e3734e85f 100644
--- a/cpu/6502/lib/error.c
+++ b/cpu/6502/lib/error.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: error.c,v 1.3 2007/12/16 13:05:23 oliverschmidt Exp $
  */
 
 #include <stdlib.h>
diff --git a/cpu/6502/lib/error.h b/cpu/6502/lib/error.h
index 001021c5da5..5f4ef04b7f8 100644
--- a/cpu/6502/lib/error.h
+++ b/cpu/6502/lib/error.h
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: error.h,v 1.1 2007/11/27 18:17:47 oliverschmidt Exp $
  */
 
 #ifndef __ERROR_H__
diff --git a/cpu/6502/lib/log.c b/cpu/6502/lib/log.c
index 0032eb94583..ab95fc52aa9 100644
--- a/cpu/6502/lib/log.c
+++ b/cpu/6502/lib/log.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: log.c,v 1.4 2007/12/16 13:11:01 oliverschmidt Exp $
  */
 
 #include <unistd.h>
diff --git a/cpu/6502/lib/pfs.h b/cpu/6502/lib/pfs.h
index 21e1364b84a..a47e6d1d090 100644
--- a/cpu/6502/lib/pfs.h
+++ b/cpu/6502/lib/pfs.h
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: pfs.h,v 1.1 2010/03/27 14:46:08 oliverschmidt Exp $
  */
 
 #ifndef __PFS_H__
diff --git a/cpu/6502/lib/unload.c b/cpu/6502/lib/unload.c
index 6e065e60f1d..8c6f34e142e 100644
--- a/cpu/6502/lib/unload.c
+++ b/cpu/6502/lib/unload.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: unload.c,v 1.1 2010/02/04 23:52:30 oliverschmidt Exp $
  */
 
 #include <stdlib.h>
diff --git a/cpu/6502/lib/unload.h b/cpu/6502/lib/unload.h
index eac12101318..9dcfbda153d 100644
--- a/cpu/6502/lib/unload.h
+++ b/cpu/6502/lib/unload.h
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: unload.h,v 1.1 2010/02/04 23:52:30 oliverschmidt Exp $
  */
 
 #ifndef __UNLOAD_H__
diff --git a/cpu/6502/net/ethernet-drv.c b/cpu/6502/net/ethernet-drv.c
index 1433040c316..dc1018b5e33 100644
--- a/cpu/6502/net/ethernet-drv.c
+++ b/cpu/6502/net/ethernet-drv.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: ethernet-drv.c,v 1.3 2010/10/19 18:29:04 adamdunkels Exp $
  */
 
 #include <stdio.h>
diff --git a/cpu/6502/net/ethernet-drv.h b/cpu/6502/net/ethernet-drv.h
index 080d762c5b9..abc5c8776db 100644
--- a/cpu/6502/net/ethernet-drv.h
+++ b/cpu/6502/net/ethernet-drv.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  * 
- * $Id: ethernet-drv.h,v 1.1 2007/11/20 21:10:20 oliverschmidt Exp $
  */
 
 #ifndef __ETHERNET_DRV_H__
diff --git a/cpu/6502/net/ethernet.c b/cpu/6502/net/ethernet.c
index cfa80aa7dfa..3f0b69dc239 100644
--- a/cpu/6502/net/ethernet.c
+++ b/cpu/6502/net/ethernet.c
@@ -30,7 +30,6 @@
  *
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * @(#)$Id: ethernet.c,v 1.7 2010/09/28 23:02:16 oliverschmidt Exp $
  */
 
 #include <modload.h>
diff --git a/cpu/6502/net/ethernet.h b/cpu/6502/net/ethernet.h
index 05b7578a27d..6d6e5f84d52 100644
--- a/cpu/6502/net/ethernet.h
+++ b/cpu/6502/net/ethernet.h
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: ethernet.h,v 1.2 2007/12/21 01:13:44 oliverschmidt Exp $
  */
 
 #ifndef __ETHERNET_H__
diff --git a/cpu/6502/net/uip_arch.c b/cpu/6502/net/uip_arch.c
index 1666c514493..ae75db322be 100644
--- a/cpu/6502/net/uip_arch.c
+++ b/cpu/6502/net/uip_arch.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uip_arch.c,v 1.2 2010/05/30 10:12:30 oliverschmidt Exp $
  *
  */
 
diff --git a/cpu/6502/sys/clock.c b/cpu/6502/sys/clock.c
index cfa4a778a11..c23e14f65fb 100644
--- a/cpu/6502/sys/clock.c
+++ b/cpu/6502/sys/clock.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: clock.c,v 1.2 2008/07/12 14:44:37 oliverschmidt Exp $
  */
 
 #include <time.h>
diff --git a/cpu/6502/sys/lc.h b/cpu/6502/sys/lc.h
index 8abe61e1f3d..fc894b531c0 100644
--- a/cpu/6502/sys/lc.h
+++ b/cpu/6502/sys/lc.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>, Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: lc.h,v 1.1 2006/12/31 14:26:03 oliverschmidt Exp $
  */
 /* Local continuations: a form of continuation that only works locally
    within a function.
diff --git a/cpu/6502/sys/mtarch.c b/cpu/6502/sys/mtarch.c
index 5a397e69c27..b0e2710af6f 100644
--- a/cpu/6502/sys/mtarch.c
+++ b/cpu/6502/sys/mtarch.c
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: mtarch.c,v 1.1 2007/12/15 00:14:19 oliverschmidt Exp $
  */
 
 #include <string.h>
diff --git a/cpu/6502/sys/mtarch.h b/cpu/6502/sys/mtarch.h
index a1b777de441..8656a4eb7c7 100644
--- a/cpu/6502/sys/mtarch.h
+++ b/cpu/6502/sys/mtarch.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: mtarch.h,v 1.1 2007/12/15 00:14:19 oliverschmidt Exp $
  */
 
 #ifndef __MTARCH_H__
diff --git a/cpu/6502/sys/rtimer-arch.h b/cpu/6502/sys/rtimer-arch.h
index 6f45d698b43..03e1db418e4 100644
--- a/cpu/6502/sys/rtimer-arch.h
+++ b/cpu/6502/sys/rtimer-arch.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  * 
- * $Id: rtimer-arch.h,v 1.4 2010/04/05 15:13:50 oliverschmidt Exp $
  */
 
 #ifndef __RTIMER_ARCH_H__
diff --git a/cpu/arm/at91sam7s/loader/codeprop-otf.c b/cpu/arm/at91sam7s/loader/codeprop-otf.c
index f676d8d2243..2ffbe2556b6 100644
--- a/cpu/arm/at91sam7s/loader/codeprop-otf.c
+++ b/cpu/arm/at91sam7s/loader/codeprop-otf.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: codeprop-otf.c,v 1.2 2010/10/19 18:29:04 adamdunkels Exp $
  */
 
 /** \addtogroup esb
diff --git a/cpu/arm/at91sam7s/loader/codeprop-otf.h b/cpu/arm/at91sam7s/loader/codeprop-otf.h
index 546e7dd1b5c..14965b73404 100644
--- a/cpu/arm/at91sam7s/loader/codeprop-otf.h
+++ b/cpu/arm/at91sam7s/loader/codeprop-otf.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: codeprop-otf.h,v 1.1 2009/07/11 14:18:50 ksb Exp $
  */
 #ifndef __CODEPROP_H__
 #define __CODEPROP_H__
diff --git a/cpu/arm/at91sam7s/loader/elfloader-arch-otf.h b/cpu/arm/at91sam7s/loader/elfloader-arch-otf.h
index d67c280a45a..d44695099fd 100644
--- a/cpu/arm/at91sam7s/loader/elfloader-arch-otf.h
+++ b/cpu/arm/at91sam7s/loader/elfloader-arch-otf.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: elfloader-arch-otf.h,v 1.1 2009/07/11 14:18:50 ksb Exp $
  */
 /**
  * \addtogroup elfloader
diff --git a/cpu/arm/at91sam7s/loader/elfloader-otf.c b/cpu/arm/at91sam7s/loader/elfloader-otf.c
index b39749f15cf..8cf8342ecc1 100644
--- a/cpu/arm/at91sam7s/loader/elfloader-otf.c
+++ b/cpu/arm/at91sam7s/loader/elfloader-otf.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: elfloader-otf.c,v 1.1 2009/07/11 14:18:50 ksb Exp $
  */
 
 #include "contiki.h"
diff --git a/cpu/arm/common/usb/cdc-eth/dhcps.c b/cpu/arm/common/usb/cdc-eth/dhcps.c
index 3fb619d3710..caaf7842596 100644
--- a/cpu/arm/common/usb/cdc-eth/dhcps.c
+++ b/cpu/arm/common/usb/cdc-eth/dhcps.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: dhcps.c,v 1.2 2010/10/19 18:29:04 adamdunkels Exp $
  */
 
 #include <stdio.h>
diff --git a/cpu/avr/avrdef.h b/cpu/avr/avrdef.h
index 4cb3eaa0145..2c343402217 100644
--- a/cpu/avr/avrdef.h
+++ b/cpu/avr/avrdef.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: avrdef.h,v 1.2 2007/12/11 17:21:14 joxe Exp $
  */
 
 #ifndef AVRDEF_H
diff --git a/cpu/avr/cc2420_spi.c b/cpu/avr/cc2420_spi.c
index 28384aadc3c..bb9f8684533 100644
--- a/cpu/avr/cc2420_spi.c
+++ b/cpu/avr/cc2420_spi.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: cc2420_spi.c,v 1.2 2010/06/23 10:44:41 joxe Exp $
  */
 
 #include <avr/io.h>
diff --git a/cpu/avr/dev/eeprom.c b/cpu/avr/dev/eeprom.c
index 66775efd086..5d0433ce61a 100644
--- a/cpu/avr/dev/eeprom.c
+++ b/cpu/avr/dev/eeprom.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: eeprom.c,v 1.2 2006/12/22 17:02:24 barner Exp $
  */
 
 #include "dev/eeprom.h"
diff --git a/cpu/avr/dev/rtl8019-drv.c b/cpu/avr/dev/rtl8019-drv.c
index fbcf81854a8..0e1015e5937 100644
--- a/cpu/avr/dev/rtl8019-drv.c
+++ b/cpu/avr/dev/rtl8019-drv.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: rtl8019-drv.c,v 1.3 2010/10/19 18:29:04 adamdunkels Exp $
  *
  */
 
diff --git a/cpu/avr/dev/rtl8019-drv.h b/cpu/avr/dev/rtl8019-drv.h
index f11a86e28f2..77cb0576a2a 100644
--- a/cpu/avr/dev/rtl8019-drv.h
+++ b/cpu/avr/dev/rtl8019-drv.h
@@ -31,7 +31,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: rtl8019-drv.h,v 1.2 2007/05/26 23:05:36 oliverschmidt Exp $
  *
  */
 #ifndef __RTL8019_DRV_H__
diff --git a/cpu/avr/dev/usb/config.h b/cpu/avr/dev/usb/config.h
index 0014b3a5caf..2848208b089 100644
--- a/cpu/avr/dev/usb/config.h
+++ b/cpu/avr/dev/usb/config.h
@@ -19,7 +19,6 @@
  * $Revision: 1.1 $
  * $RCSfile: config.h,v $
  * $Date: 2008/10/14 20:16:36 $  \n
- * $Id: config.h,v 1.1 2008/10/14 20:16:36 c_oflynn Exp $
  ******************************************************************************/
 /* Copyright (c) 2008  ATMEL Corporation
    All rights reserved.
diff --git a/cpu/avr/dev/usb/pll_drv.h b/cpu/avr/dev/usb/pll_drv.h
index 9677b62be84..6a35ca0558a 100644
--- a/cpu/avr/dev/usb/pll_drv.h
+++ b/cpu/avr/dev/usb/pll_drv.h
@@ -19,7 +19,6 @@
  * $Revision: 1.1 $
  * $RCSfile: pll_drv.h,v $
  * $Date: 2008/10/14 20:16:36 $  \n
- * $Id: pll_drv.h,v 1.1 2008/10/14 20:16:36 c_oflynn Exp $
  ******************************************************************************/
 /* Copyright (c) 2008  ATMEL Corporation
    All rights reserved.
diff --git a/cpu/avr/leds-arch.c b/cpu/avr/leds-arch.c
index 23c4dc58d2b..f9b6924d40f 100644
--- a/cpu/avr/leds-arch.c
+++ b/cpu/avr/leds-arch.c
@@ -31,7 +31,6 @@
  *
  * This is a dummy non-functional dummy implementation.
  *
- * $Id: leds-arch.c,v 1.1 2006/12/22 17:05:31 barner Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/cpu/avr/minileds.c b/cpu/avr/minileds.c
index ab4e0a03b86..e708e6bbfcd 100644
--- a/cpu/avr/minileds.c
+++ b/cpu/avr/minileds.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: minileds.c,v 1.1 2006/12/22 17:05:31 barner Exp $
  *
  /**
  * \file
diff --git a/cpu/avr/mtarch.h b/cpu/avr/mtarch.h
index eeed5a46d86..a311667b243 100644
--- a/cpu/avr/mtarch.h
+++ b/cpu/avr/mtarch.h
@@ -37,7 +37,6 @@
  * \author
  *         Simon Barner <barner@in.tum.de>
  *
- * @(#)$Id: mtarch.h,v 1.2 2006/12/22 16:55:53 barner Exp $
  */
 
 #ifndef __MTARCH_H__
diff --git a/cpu/avr/radio/ieee-manager/ieee-15-4-manager.c b/cpu/avr/radio/ieee-manager/ieee-15-4-manager.c
index 09a725fe0d3..2364630c881 100644
--- a/cpu/avr/radio/ieee-manager/ieee-15-4-manager.c
+++ b/cpu/avr/radio/ieee-manager/ieee-15-4-manager.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ieee-15-4-manager.c,v 1.2 2008/10/14 18:38:09 c_oflynn Exp $
  */
 
 /**
diff --git a/cpu/avr/radio/ieee-manager/ieee-15-4-manager.h b/cpu/avr/radio/ieee-manager/ieee-15-4-manager.h
index 38a2d4b551a..ba5705ae02b 100644
--- a/cpu/avr/radio/ieee-manager/ieee-15-4-manager.h
+++ b/cpu/avr/radio/ieee-manager/ieee-15-4-manager.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ieee-15-4-manager.h,v 1.2 2008/10/14 18:38:09 c_oflynn Exp $
  */
 /**
  *  \addtogroup rf230mac
diff --git a/cpu/avr/radio/mac/sicslowmac.c b/cpu/avr/radio/mac/sicslowmac.c
index e1029f2ae0a..e54c3990b80 100644
--- a/cpu/avr/radio/mac/sicslowmac.c
+++ b/cpu/avr/radio/mac/sicslowmac.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sicslowmac.c,v 1.9 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 
diff --git a/cpu/avr/radio/mac/sicslowmac.h b/cpu/avr/radio/mac/sicslowmac.h
index d8f3a6b0a33..9edb0f393ca 100644
--- a/cpu/avr/radio/mac/sicslowmac.h
+++ b/cpu/avr/radio/mac/sicslowmac.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sicslowmac.h,v 1.3 2008/10/14 18:36:07 c_oflynn Exp $
  */
 
 /**
diff --git a/cpu/avr/radio/rf230/at86rf230_registermap.h b/cpu/avr/radio/rf230/at86rf230_registermap.h
index e94af554fb2..5c46705631b 100644
--- a/cpu/avr/radio/rf230/at86rf230_registermap.h
+++ b/cpu/avr/radio/rf230/at86rf230_registermap.h
@@ -1,7 +1,6 @@
 /**
  * @file
  * @brief This file contains the register definitions for the AT86RF230.
- * $Id: at86rf230_registermap.h,v 1.2 2008/10/14 18:37:28 c_oflynn Exp $
  */
 /*   Copyright (c) 2008, Swedish Institute of Computer Science
   All rights reserved. 
diff --git a/cpu/avr/radio/rf230/frame.c b/cpu/avr/radio/rf230/frame.c
index 405a8a9b2ae..51c25f9d597 100644
--- a/cpu/avr/radio/rf230/frame.c
+++ b/cpu/avr/radio/rf230/frame.c
@@ -39,7 +39,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: frame.c,v 1.4 2008/12/10 21:26:05 c_oflynn Exp $
 */
 /*
  *  \brief This file is where the main functions that relate to frame
diff --git a/cpu/avr/radio/rf230/frame.h b/cpu/avr/radio/rf230/frame.h
index b51c0bc54f3..8efd5fa0f23 100644
--- a/cpu/avr/radio/rf230/frame.h
+++ b/cpu/avr/radio/rf230/frame.h
@@ -49,7 +49,6 @@
  *  This file converts to and from a structure to a packed 802.15.4
  *  frame.
  *
- *    $Id: frame.h,v 1.2 2008/10/14 18:37:28 c_oflynn Exp $
 */
 
 
diff --git a/cpu/avr/radio/rf230/hal.c b/cpu/avr/radio/rf230/hal.c
index 73398a087d8..6e295f3049d 100644
--- a/cpu/avr/radio/rf230/hal.c
+++ b/cpu/avr/radio/rf230/hal.c
@@ -37,7 +37,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: hal.c,v 1.2 2008/10/14 18:37:28 c_oflynn Exp $
 */
 
 /**
diff --git a/cpu/avr/radio/rf230/hal.h b/cpu/avr/radio/rf230/hal.h
index f7c80d7074c..7e55b7b2b36 100644
--- a/cpu/avr/radio/rf230/hal.h
+++ b/cpu/avr/radio/rf230/hal.h
@@ -47,7 +47,6 @@
  *  \file
  *  \brief This file contains low-level radio driver code.
  *
- *   $Id: hal.h,v 1.5 2010/02/26 21:15:28 dak664 Exp $
 */
 
 #ifndef HAL_AVR_H
diff --git a/cpu/avr/radio/rf230/radio.c b/cpu/avr/radio/rf230/radio.c
index b95a792fad2..294ac927bc8 100644
--- a/cpu/avr/radio/rf230/radio.c
+++ b/cpu/avr/radio/rf230/radio.c
@@ -36,7 +36,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: radio.c,v 1.5 2010/02/12 18:00:30 dak664 Exp $
 */
 
 /**
diff --git a/cpu/avr/radio/rf230/radio.h b/cpu/avr/radio/rf230/radio.h
index 091ba017cb2..056c375e4bc 100644
--- a/cpu/avr/radio/rf230/radio.h
+++ b/cpu/avr/radio/rf230/radio.h
@@ -45,7 +45,6 @@
  *  \file
  *  \brief This file contains radio driver code.
  *
- *   $Id: radio.h,v 1.2 2008/10/14 18:37:28 c_oflynn Exp $
  */
 
 #ifndef RADIO_H
diff --git a/cpu/avr/radio/rf230bb/at86rf230_registermap.h b/cpu/avr/radio/rf230bb/at86rf230_registermap.h
index 4a0fd875202..1ca9d51303f 100644
--- a/cpu/avr/radio/rf230bb/at86rf230_registermap.h
+++ b/cpu/avr/radio/rf230bb/at86rf230_registermap.h
@@ -1,7 +1,6 @@
 /**
  * @file
  * @brief This file contains the register definitions for the AT86RF230.
- * $Id: at86rf230_registermap.h,v 1.2 2010/03/02 16:29:59 dak664 Exp $
  */
 /*   Copyright (c) 2008, Swedish Institute of Computer Science
   All rights reserved. 
diff --git a/cpu/avr/radio/rf230bb/hal.h b/cpu/avr/radio/rf230bb/hal.h
index 4b4753471e2..4669d224efe 100644
--- a/cpu/avr/radio/rf230bb/hal.h
+++ b/cpu/avr/radio/rf230bb/hal.h
@@ -49,7 +49,6 @@
  *  \file
  *  \brief This file contains low-level radio driver code.
  *
- *   $Id: hal.h,v 1.5 2010/12/03 20:42:01 dak664 Exp $
 */
 
 #ifndef HAL_AVR_H
diff --git a/cpu/avr/rtimer-arch.c b/cpu/avr/rtimer-arch.c
index 2a38e66191f..d1d97af7e43 100644
--- a/cpu/avr/rtimer-arch.c
+++ b/cpu/avr/rtimer-arch.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rtimer-arch.c,v 1.10 2010/02/28 21:29:19 dak664 Exp $
  */
 
 /**
diff --git a/cpu/avr/slip_uart1.c b/cpu/avr/slip_uart1.c
index af9cc068583..e4942fcfd88 100644
--- a/cpu/avr/slip_uart1.c
+++ b/cpu/avr/slip_uart1.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: slip_uart1.c,v 1.1 2007/02/02 13:13:16 bg- Exp $
  */
 
 /*
diff --git a/cpu/cc2430/dev/bus.c b/cpu/cc2430/dev/bus.c
index 299cc677c83..4d858446676 100644
--- a/cpu/cc2430/dev/bus.c
+++ b/cpu/cc2430/dev/bus.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: bus.c,v 1.2 2010/01/25 23:12:09 anthony-a Exp $
  */
 
 /**
diff --git a/cpu/cc2430/dev/bus.h b/cpu/cc2430/dev/bus.h
index b6aec167169..88cffdf94d0 100644
--- a/cpu/cc2430/dev/bus.h
+++ b/cpu/cc2430/dev/bus.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: bus.h,v 1.3 2010/01/25 23:13:04 anthony-a Exp $
  */
 
 /**
diff --git a/cpu/cc2430/dev/hwconf.h b/cpu/cc2430/dev/hwconf.h
index b468cc9ccea..1063bf1a8ed 100644
--- a/cpu/cc2430/dev/hwconf.h
+++ b/cpu/cc2430/dev/hwconf.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: hwconf.h,v 1.2 2010/01/25 23:12:09 anthony-a Exp $
  */
 #ifndef __HWCONF_H__
 #define __HWCONF_H__
diff --git a/cpu/cc2430/rtimer-arch.h b/cpu/cc2430/rtimer-arch.h
index 89579b37a83..c44046c6206 100644
--- a/cpu/cc2430/rtimer-arch.h
+++ b/cpu/cc2430/rtimer-arch.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rtimer-arch.h,v 1.1 2009/09/08 20:07:35 zdshelby Exp $
  */
 
 /**
diff --git a/cpu/cc253x/rtimer-arch.h b/cpu/cc253x/rtimer-arch.h
index d261a95e9f3..548628c5836 100644
--- a/cpu/cc253x/rtimer-arch.h
+++ b/cpu/cc253x/rtimer-arch.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rtimer-arch.h,v 1.1 2009/09/08 20:07:35 zdshelby Exp $
  */
 
 /**
diff --git a/cpu/mc1322x/lib/i2c.c b/cpu/mc1322x/lib/i2c.c
index 893dc31f079..4d4e0fc9d83 100644
--- a/cpu/mc1322x/lib/i2c.c
+++ b/cpu/mc1322x/lib/i2c.c
@@ -27,7 +27,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
  */
 
 #include "i2c.h"
diff --git a/cpu/mc1322x/lib/include/i2c.h b/cpu/mc1322x/lib/include/i2c.h
index 36d89f35219..896102fbf32 100644
--- a/cpu/mc1322x/lib/include/i2c.h
+++ b/cpu/mc1322x/lib/include/i2c.h
@@ -27,7 +27,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
  */
 
 #ifndef I2C_H
diff --git a/cpu/mc1322x/mtarch.h b/cpu/mc1322x/mtarch.h
index 04c6f194421..540e2b8cfe8 100644
--- a/cpu/mc1322x/mtarch.h
+++ b/cpu/mc1322x/mtarch.h
@@ -41,7 +41,6 @@
  * \author
  *         Simon Barner <barner@in.tum.de>
  *
- * @(#)$Id: mtarch.h,v 1.1 2010/06/09 14:43:22 maralvira Exp $
  */
 
 #ifndef __MTARCH_H__
diff --git a/cpu/msp430/button.c b/cpu/msp430/button.c
index 6a29275bbfe..9e9467d58c0 100644
--- a/cpu/msp430/button.c
+++ b/cpu/msp430/button.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: button.c,v 1.2 2006/08/17 15:41:13 bg- Exp $
  */
 
 #include "contiki.h"
diff --git a/cpu/msp430/cc2420-arch-sfd.c b/cpu/msp430/cc2420-arch-sfd.c
index 856a5d2e083..a71015b9eb7 100644
--- a/cpu/msp430/cc2420-arch-sfd.c
+++ b/cpu/msp430/cc2420-arch-sfd.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: cc2420-arch-sfd.c,v 1.5 2010/12/16 22:49:12 adamdunkels Exp $
  */
 
 #include "contiki.h"
diff --git a/cpu/msp430/cc2420-arch-sfd.h b/cpu/msp430/cc2420-arch-sfd.h
index 2574509bdff..15c124ca664 100644
--- a/cpu/msp430/cc2420-arch-sfd.h
+++ b/cpu/msp430/cc2420-arch-sfd.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: cc2420-arch-sfd.h,v 1.3 2010/01/26 10:20:16 adamdunkels Exp $
  */
 #ifndef CC2420_ARCH_SFD_H
 #define CC2420_ARCH_SFD_H
diff --git a/cpu/msp430/cc2420-arch.c b/cpu/msp430/cc2420-arch.c
index e6ad9657a17..7b429e0c04e 100644
--- a/cpu/msp430/cc2420-arch.c
+++ b/cpu/msp430/cc2420-arch.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: cc2420-arch.c,v 1.10 2010/12/16 22:49:33 adamdunkels Exp $
  */
 
 #include "contiki.h"
diff --git a/cpu/msp430/dev/button.h b/cpu/msp430/dev/button.h
index 4542fcacc43..96752850afe 100644
--- a/cpu/msp430/dev/button.h
+++ b/cpu/msp430/dev/button.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: button.h,v 1.1 2006/06/17 22:41:21 adamdunkels Exp $
  */
 
 #ifndef BUTTON_H
diff --git a/cpu/msp430/dev/flash.h b/cpu/msp430/dev/flash.h
index 447c87793a9..99986be236a 100644
--- a/cpu/msp430/dev/flash.h
+++ b/cpu/msp430/dev/flash.h
@@ -31,7 +31,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: flash.h,v 1.1 2006/06/17 22:41:21 adamdunkels Exp $
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
diff --git a/cpu/msp430/dev/hwconf.h b/cpu/msp430/dev/hwconf.h
index 70098cbb481..d30937d7303 100644
--- a/cpu/msp430/dev/hwconf.h
+++ b/cpu/msp430/dev/hwconf.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: hwconf.h,v 1.3 2010/01/14 20:05:58 nifi Exp $
  */
 #ifndef __HWCONF_H__
 #define __HWCONF_H__
diff --git a/cpu/msp430/dev/lpm.h b/cpu/msp430/dev/lpm.h
index f68d7b2070c..6268d7ada89 100644
--- a/cpu/msp430/dev/lpm.h
+++ b/cpu/msp430/dev/lpm.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: lpm.h,v 1.1 2006/06/17 22:41:21 adamdunkels Exp $
  */
 #ifndef __LPM_H__
 #define __LPM_H__
diff --git a/cpu/msp430/dev/uart0.h b/cpu/msp430/dev/uart0.h
index 7b56927300c..9aef3a58362 100644
--- a/cpu/msp430/dev/uart0.h
+++ b/cpu/msp430/dev/uart0.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: uart0.h,v 1.1 2010/08/24 16:23:20 joxe Exp $
  */
 
 /**
diff --git a/cpu/msp430/dev/uart1.h b/cpu/msp430/dev/uart1.h
index fce43e60f23..f58764502eb 100644
--- a/cpu/msp430/dev/uart1.h
+++ b/cpu/msp430/dev/uart1.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: uart1.h,v 1.4 2009/01/31 12:46:57 joxe Exp $
  */
 
 /**
diff --git a/cpu/msp430/f1xxx/rtimer-arch.c b/cpu/msp430/f1xxx/rtimer-arch.c
index a1ef89a6fc1..95a4b937569 100644
--- a/cpu/msp430/f1xxx/rtimer-arch.c
+++ b/cpu/msp430/f1xxx/rtimer-arch.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rtimer-arch.c,v 1.17 2010/11/27 15:27:20 nifi Exp $
  */
 
 /**
diff --git a/cpu/msp430/f1xxx/uart1.c b/cpu/msp430/f1xxx/uart1.c
index 123b542ad4d..946d2724a7a 100644
--- a/cpu/msp430/f1xxx/uart1.c
+++ b/cpu/msp430/f1xxx/uart1.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: uart1.c,v 1.24 2011/01/19 20:44:20 joxe Exp $
  */
 
 /*
diff --git a/cpu/msp430/f2xxx/uart0.c b/cpu/msp430/f2xxx/uart0.c
index 5e3447df890..938fe9c4cb1 100644
--- a/cpu/msp430/f2xxx/uart0.c
+++ b/cpu/msp430/f2xxx/uart0.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: uart0x.c,v 1.1 2010/08/24 16:23:20 joxe Exp $
  */
 
 /*
diff --git a/cpu/msp430/f2xxx/uart1.c b/cpu/msp430/f2xxx/uart1.c
index b2ab64101bc..3085663bfdd 100644
--- a/cpu/msp430/f2xxx/uart1.c
+++ b/cpu/msp430/f2xxx/uart1.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: uart1x.c,v 1.1 2010/08/24 16:23:20 joxe Exp $
  */
 
 /*
diff --git a/cpu/msp430/flash.c b/cpu/msp430/flash.c
index 7e16052c38b..b9b76f78eaa 100644
--- a/cpu/msp430/flash.c
+++ b/cpu/msp430/flash.c
@@ -29,7 +29,6 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $Id: flash.c,v 1.3 2010/11/15 21:52:54 adamdunkels Exp $
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
diff --git a/cpu/msp430/loader-arch.c b/cpu/msp430/loader-arch.c
index b05166101ce..d03d078f826 100644
--- a/cpu/msp430/loader-arch.c
+++ b/cpu/msp430/loader-arch.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: loader-arch.c,v 1.2 2010/10/19 18:29:04 adamdunkels Exp $
  */
 
 #include "contiki.h"
diff --git a/cpu/msp430/lpm.c b/cpu/msp430/lpm.c
index 19507b726f2..9f9a0f9656a 100644
--- a/cpu/msp430/lpm.c
+++ b/cpu/msp430/lpm.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: lpm.c,v 1.1 2006/06/17 22:41:21 adamdunkels Exp $
  */
 #include "dev/lpm.h"
 
diff --git a/cpu/msp430/minileds.c b/cpu/msp430/minileds.c
index 0a68ea88dc2..3a2a6eabfd8 100644
--- a/cpu/msp430/minileds.c
+++ b/cpu/msp430/minileds.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: minileds.c,v 1.1 2006/09/27 09:32:08 bg- Exp $
  */
 
 /*
diff --git a/cpu/msp430/mtarch.c b/cpu/msp430/mtarch.c
index 59e9f06949e..0ecd5d9c027 100644
--- a/cpu/msp430/mtarch.c
+++ b/cpu/msp430/mtarch.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: mtarch.c,v 1.6 2008/11/21 10:28:32 fros4943 Exp $
  */
 
 #include <stdio.h>
diff --git a/cpu/msp430/rom.c b/cpu/msp430/rom.c
index c45faeb41ad..e48e9fbf6f8 100644
--- a/cpu/msp430/rom.c
+++ b/cpu/msp430/rom.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: rom.c,v 1.2 2006/12/01 15:06:42 bg- Exp $
  */
 
 #include "contiki.h"
diff --git a/cpu/msp430/rtimer-arch.h b/cpu/msp430/rtimer-arch.h
index 9faca158923..2912789e2fb 100644
--- a/cpu/msp430/rtimer-arch.h
+++ b/cpu/msp430/rtimer-arch.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rtimer-arch.h,v 1.9 2010/12/16 22:50:21 adamdunkels Exp $
  */
 
 /**
diff --git a/cpu/msp430/slip_uart0.c b/cpu/msp430/slip_uart0.c
index 81c086b1630..c7b003f0689 100644
--- a/cpu/msp430/slip_uart0.c
+++ b/cpu/msp430/slip_uart0.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: slip_uart0.c,v 1.1 2010/08/24 16:23:20 joxe Exp $
  */
 
 /*
diff --git a/cpu/msp430/slip_uart1.c b/cpu/msp430/slip_uart1.c
index 615488e08fe..3a4c238c936 100644
--- a/cpu/msp430/slip_uart1.c
+++ b/cpu/msp430/slip_uart1.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: slip_uart1.c,v 1.8 2008/02/03 20:59:35 adamdunkels Exp $
  */
 
 /*
diff --git a/cpu/msp430/uip-ipchksum.c b/cpu/msp430/uip-ipchksum.c
index c32359f6d9e..80a616ffeae 100644
--- a/cpu/msp430/uip-ipchksum.c
+++ b/cpu/msp430/uip-ipchksum.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: uip-ipchksum.c,v 1.4 2007/04/04 11:53:07 bg- Exp $
  */
 
 /**
diff --git a/cpu/msp430/watchdog.c b/cpu/msp430/watchdog.c
index b38db161d2d..53263ffb714 100644
--- a/cpu/msp430/watchdog.c
+++ b/cpu/msp430/watchdog.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: watchdog.c,v 1.12 2010/11/12 15:54:41 nifi Exp $
  */
 
 #include "contiki.h"
diff --git a/cpu/native/mtarch.c b/cpu/native/mtarch.c
index a774e3ba5e3..da557449b04 100644
--- a/cpu/native/mtarch.c
+++ b/cpu/native/mtarch.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: mtarch.c,v 1.2 2007/04/03 18:37:15 oliverschmidt Exp $
  */
 
 #include "sys/mt.h"
diff --git a/cpu/native/mtarch.h b/cpu/native/mtarch.h
index 92493a9e1a1..e53d52366bd 100644
--- a/cpu/native/mtarch.h
+++ b/cpu/native/mtarch.h
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: mtarch.h,v 1.1 2007/04/03 00:40:51 oliverschmidt Exp $
  */
 
 #ifndef __MTARCH_H__
diff --git a/cpu/native/net/tapdev-drv.c b/cpu/native/net/tapdev-drv.c
index 89dd9630b8f..0e4c0a29de0 100644
--- a/cpu/native/net/tapdev-drv.c
+++ b/cpu/native/net/tapdev-drv.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: tapdev-drv.c,v 1.6 2010/10/19 18:29:04 adamdunkels Exp $
  */
 
 #include "contiki-net.h"
diff --git a/cpu/native/net/tapdev-drv.h b/cpu/native/net/tapdev-drv.h
index c5def8bf086..25014ea298a 100644
--- a/cpu/native/net/tapdev-drv.h
+++ b/cpu/native/net/tapdev-drv.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: tapdev-drv.h,v 1.1 2007/05/20 21:32:24 oliverschmidt Exp $
  */
 
 #ifndef __TAPDEV_DRV_H__
diff --git a/cpu/native/net/tapdev.c b/cpu/native/net/tapdev.c
index f00785d125b..cc294d7a764 100644
--- a/cpu/native/net/tapdev.c
+++ b/cpu/native/net/tapdev.c
@@ -31,7 +31,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: tapdev.c,v 1.2 2007/05/20 21:32:24 oliverschmidt Exp $
  */
 
 #include <fcntl.h>
diff --git a/cpu/native/net/tapdev.h b/cpu/native/net/tapdev.h
index 0c9005fb638..c18b405ecf6 100644
--- a/cpu/native/net/tapdev.h
+++ b/cpu/native/net/tapdev.h
@@ -31,7 +31,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: tapdev.h,v 1.2 2007/05/20 21:32:24 oliverschmidt Exp $
  */
 
 #ifndef __TAPDEV_H__
diff --git a/cpu/native/net/tapdev6.c b/cpu/native/net/tapdev6.c
index b63f1ac46de..e687ada106e 100644
--- a/cpu/native/net/tapdev6.c
+++ b/cpu/native/net/tapdev6.c
@@ -31,7 +31,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: tapdev6.c,v 1.4 2010/10/19 18:29:04 adamdunkels Exp $
  */
 
 
diff --git a/cpu/native/net/tapdev6.h b/cpu/native/net/tapdev6.h
index 8e025caa025..4e7fe0f6302 100644
--- a/cpu/native/net/tapdev6.h
+++ b/cpu/native/net/tapdev6.h
@@ -31,7 +31,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: tapdev6.h,v 1.1 2008/10/14 09:47:15 julienabeille Exp $
  *
  */
 #ifndef __TAPDEV_H__
diff --git a/cpu/native/net/wpcap-drv.h b/cpu/native/net/wpcap-drv.h
index d3f78e96945..57587a2362a 100644
--- a/cpu/native/net/wpcap-drv.h
+++ b/cpu/native/net/wpcap-drv.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  * 
- * $Id: wpcap-drv.h,v 1.1 2007/05/20 21:32:25 oliverschmidt Exp $
  */
 
 #ifndef __WPCAP_DRV_H__
diff --git a/cpu/native/net/wpcap.h b/cpu/native/net/wpcap.h
index 31ca0d763de..e5b641f88b9 100644
--- a/cpu/native/net/wpcap.h
+++ b/cpu/native/net/wpcap.h
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: wpcap.h,v 1.3 2009/08/08 19:51:25 dak664 Exp $
  */
 
 #ifndef __WPCAP_H__
diff --git a/cpu/native/rtimer-arch.c b/cpu/native/rtimer-arch.c
index d25eb7b23bd..2dab7efb629 100644
--- a/cpu/native/rtimer-arch.c
+++ b/cpu/native/rtimer-arch.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rtimer-arch.c,v 1.3 2008/02/09 14:02:12 oliverschmidt Exp $
  */
 
 /**
diff --git a/cpu/native/rtimer-arch.h b/cpu/native/rtimer-arch.h
index f334f5acd21..32d1547fc81 100644
--- a/cpu/native/rtimer-arch.h
+++ b/cpu/native/rtimer-arch.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rtimer-arch.h,v 1.4 2010/04/05 15:10:06 oliverschmidt Exp $
  */
 
 /**
diff --git a/cpu/native/watchdog.c b/cpu/native/watchdog.c
index 6aa44e19618..1ac6245b64a 100644
--- a/cpu/native/watchdog.c
+++ b/cpu/native/watchdog.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: watchdog.c,v 1.2 2008/07/04 03:03:41 nvt-se Exp $
  */
 
 #include "dev/watchdog.h"
diff --git a/cpu/stm32w108/clock.c b/cpu/stm32w108/clock.c
index b817ca70a7d..52ff38366b9 100644
--- a/cpu/stm32w108/clock.c
+++ b/cpu/stm32w108/clock.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: clock.c,v 1.1 2010/10/25 09:03:38 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/cpu/stm32w108/dev/stm32w-radio.c b/cpu/stm32w108/dev/stm32w-radio.c
index 883099d3e7d..667ea87381c 100644
--- a/cpu/stm32w108/dev/stm32w-radio.c
+++ b/cpu/stm32w108/dev/stm32w-radio.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: stm32w-radio.c,v 1.2 2010/10/27 14:05:23 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/cpu/stm32w108/dev/stm32w-radio.h b/cpu/stm32w108/dev/stm32w-radio.h
index dfb0a49cf94..b8b14407b2c 100644
--- a/cpu/stm32w108/dev/stm32w-radio.h
+++ b/cpu/stm32w108/dev/stm32w-radio.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: stm32w-radio.h,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 
 /**
diff --git a/cpu/stm32w108/dev/uart1.h b/cpu/stm32w108/dev/uart1.h
index f49f85b21c1..c43707653d9 100644
--- a/cpu/stm32w108/dev/uart1.h
+++ b/cpu/stm32w108/dev/uart1.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: uart1.h,v 1.2 2011/01/17 09:22:24 salvopitru Exp $
  */
 
 /**
diff --git a/cpu/stm32w108/leds-arch.c b/cpu/stm32w108/leds-arch.c
index 5ef2ce481f8..38acbcfb669 100644
--- a/cpu/stm32w108/leds-arch.c
+++ b/cpu/stm32w108/leds-arch.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: leds-arch.c,v 1.1 2010/10/25 09:03:38 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/cpu/stm32w108/rand.c b/cpu/stm32w108/rand.c
index ef1f3b8f1ff..e09444a9c75 100644
--- a/cpu/stm32w108/rand.c
+++ b/cpu/stm32w108/rand.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: rand.c,v 1.3 2011/01/17 10:08:14 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/cpu/stm32w108/rtimer-arch.c b/cpu/stm32w108/rtimer-arch.c
index 3c341e3ac87..5b3a8cbf4ca 100644
--- a/cpu/stm32w108/rtimer-arch.c
+++ b/cpu/stm32w108/rtimer-arch.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: rtimer-arch.c,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/cpu/stm32w108/rtimer-arch.h b/cpu/stm32w108/rtimer-arch.h
index 71718877cb2..b8c15561b5b 100644
--- a/cpu/stm32w108/rtimer-arch.h
+++ b/cpu/stm32w108/rtimer-arch.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: rtimer-arch.h,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 
 /**
diff --git a/cpu/stm32w108/slip_uart1.c b/cpu/stm32w108/slip_uart1.c
index d8ba0894a7c..02c06b5ec05 100644
--- a/cpu/stm32w108/slip_uart1.c
+++ b/cpu/stm32w108/slip_uart1.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: slip_uart1.c,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/cpu/stm32w108/uip_arch.c b/cpu/stm32w108/uip_arch.c
index 55fa3d52838..0ab4a500cb9 100644
--- a/cpu/stm32w108/uip_arch.c
+++ b/cpu/stm32w108/uip_arch.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uip_arch.c,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/cpu/stm32w108/watchdog.c b/cpu/stm32w108/watchdog.c
index 43770adc655..5a29472e752 100644
--- a/cpu/stm32w108/watchdog.c
+++ b/cpu/stm32w108/watchdog.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: watchdog.c,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/cpu/z80/dev/rs232.c b/cpu/z80/dev/rs232.c
index 2493f48ca92..630069bb8cf 100644
--- a/cpu/z80/dev/rs232.c
+++ b/cpu/z80/dev/rs232.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: rs232.c,v 1.5 2009/03/17 20:20:45 adamdunkels Exp $
  *
  */
 /*
diff --git a/cpu/z80/dev/rs232.h b/cpu/z80/dev/rs232.h
index 30062febbb5..15eec048097 100644
--- a/cpu/z80/dev/rs232.h
+++ b/cpu/z80/dev/rs232.h
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
  *
- * $Id: rs232.h,v 1.4 2007/09/29 03:58:38 matsutsuka Exp $
  *
  */
 /*
diff --git a/cpu/z80/lib/libconio_z80.c b/cpu/z80/lib/libconio_z80.c
index e35f9d075b9..a54c1cbc7d9 100644
--- a/cpu/z80/lib/libconio_z80.c
+++ b/cpu/z80/lib/libconio_z80.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: libconio_z80.c,v 1.1 2007/09/19 12:48:26 matsutsuka Exp $
  *
  */
  /*
diff --git a/cpu/z80/lib/libconio_z80.h b/cpu/z80/lib/libconio_z80.h
index 82e33989aad..a3198f27e66 100644
--- a/cpu/z80/lib/libconio_z80.h
+++ b/cpu/z80/lib/libconio_z80.h
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: libconio_z80.h,v 1.1 2007/09/19 12:48:26 matsutsuka Exp $
  *
  */
  /*
diff --git a/cpu/z80/lib/log-conio.c b/cpu/z80/lib/log-conio.c
index 9ccf42cc188..7f404afeaf7 100644
--- a/cpu/z80/lib/log-conio.c
+++ b/cpu/z80/lib/log-conio.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: log-conio.c,v 1.2 2007/09/09 13:41:50 matsutsuka Exp $
  *
  */
  /*
diff --git a/cpu/z80/lib/strcasecmp.c b/cpu/z80/lib/strcasecmp.c
index 567e0a4693f..dc0e844b3f4 100644
--- a/cpu/z80/lib/strcasecmp.c
+++ b/cpu/z80/lib/strcasecmp.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: strcasecmp.c,v 1.1 2007/09/09 12:20:59 matsutsuka Exp $
  *
  */
  /*
diff --git a/cpu/z80/lib/strcasecmp.h b/cpu/z80/lib/strcasecmp.h
index bd7497586ba..833151b4554 100644
--- a/cpu/z80/lib/strcasecmp.h
+++ b/cpu/z80/lib/strcasecmp.h
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: strcasecmp.h,v 1.1 2007/09/09 12:20:59 matsutsuka Exp $
  *
  */
  /*
diff --git a/cpu/z80/loader/mef.c b/cpu/z80/loader/mef.c
index 3b7a7403c06..2bde4c45f31 100644
--- a/cpu/z80/loader/mef.c
+++ b/cpu/z80/loader/mef.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: mef.c,v 1.1 2007/11/28 06:13:24 matsutsuka Exp $
  *
  */
  
diff --git a/cpu/z80/loader/mef.h b/cpu/z80/loader/mef.h
index f00c86c5f5b..1a5866de4b4 100644
--- a/cpu/z80/loader/mef.h
+++ b/cpu/z80/loader/mef.h
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: mef.h,v 1.1 2007/11/28 06:13:24 matsutsuka Exp $
  *
  */
  
diff --git a/cpu/z80/uip_arch.c b/cpu/z80/uip_arch.c
index 739d57cc471..31388242c5f 100644
--- a/cpu/z80/uip_arch.c
+++ b/cpu/z80/uip_arch.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: uip_arch.c,v 1.3 2010/10/19 18:29:04 adamdunkels Exp $
  *
  */
  /*
diff --git a/cpu/z80/z80def.h b/cpu/z80/z80def.h
index 60f8d524d4a..d39857f93ce 100644
--- a/cpu/z80/z80def.h
+++ b/cpu/z80/z80def.h
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: z80def.h,v 1.8 2009/12/16 06:47:17 matsutsuka Exp $
  *
  */
 
diff --git a/examples/cc2530dk/border-router/slip-bridge.c b/examples/cc2530dk/border-router/slip-bridge.c
index dc8db1ab9d9..7fded5322a7 100644
--- a/examples/cc2530dk/border-router/slip-bridge.c
+++ b/examples/cc2530dk/border-router/slip-bridge.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: slip-bridge.c,v 1.3 2010/06/08 19:53:49 nifi Exp $
  */
 
 /**
diff --git a/examples/cc2530dk/udp-ipv6/project-conf.h b/examples/cc2530dk/udp-ipv6/project-conf.h
index 990a0208237..7df716ebda2 100644
--- a/examples/cc2530dk/udp-ipv6/project-conf.h
+++ b/examples/cc2530dk/udp-ipv6/project-conf.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id$
  */
 
 /**
diff --git a/examples/collect/collect-view-shell.c b/examples/collect/collect-view-shell.c
index 92980bb469a..74e12e48797 100644
--- a/examples/collect/collect-view-shell.c
+++ b/examples/collect/collect-view-shell.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: collect-view-shell.c,v 1.1 2010/11/12 17:46:56 nifi Exp $
  */
 
 /**
diff --git a/examples/email/email-client.c b/examples/email/email-client.c
index 2d93ac84118..7e6d39cc92e 100644
--- a/examples/email/email-client.c
+++ b/examples/email/email-client.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: email-client.c,v 1.1 2010/01/31 21:46:39 oliverschmidt Exp $
  */
 
 #include "contiki-net.h"
diff --git a/examples/esb/beeper.c b/examples/esb/beeper.c
index 47d8cc2d340..d5aa557540c 100644
--- a/examples/esb/beeper.c
+++ b/examples/esb/beeper.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: beeper.c,v 1.3 2010/01/14 18:18:51 nifi Exp $
  */
 #include "contiki-esb.h"
 
diff --git a/examples/esb/blinker.c b/examples/esb/blinker.c
index bc4cfde49c7..5288e5f1615 100644
--- a/examples/esb/blinker.c
+++ b/examples/esb/blinker.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: blinker.c,v 1.3 2010/01/14 18:18:51 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/examples/esb/fft-test.c b/examples/esb/fft-test.c
index 6f553300f53..10fd99ab487 100644
--- a/examples/esb/fft-test.c
+++ b/examples/esb/fft-test.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: fft-test.c,v 1.3 2010/01/14 18:18:51 nifi Exp $
  *
  * -----------------------------------------------------------------
  * fft-test - a test program that use the sound sensor for sampling
diff --git a/examples/esb/radio-test.c b/examples/esb/radio-test.c
index 93100ab847c..a0b0a599b95 100644
--- a/examples/esb/radio-test.c
+++ b/examples/esb/radio-test.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: radio-test.c,v 1.2 2009/03/12 21:58:21 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/examples/example-shell/example-shell.c b/examples/example-shell/example-shell.c
index bf959c07e5c..55118e6a4e3 100644
--- a/examples/example-shell/example-shell.c
+++ b/examples/example-shell/example-shell.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-shell.c,v 1.3 2010/02/03 20:37:52 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/ftp/ftp-client.c b/examples/ftp/ftp-client.c
index ec70c06454f..9ccb2cbdd32 100644
--- a/examples/ftp/ftp-client.c
+++ b/examples/ftp/ftp-client.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ftp-client.c,v 1.1 2010/10/16 10:36:20 oliverschmidt Exp $
  */
 
 #include "contiki-net.h"
diff --git a/examples/hello-world/hello-world.c b/examples/hello-world/hello-world.c
index 3d315c2244d..30724140e1e 100644
--- a/examples/hello-world/hello-world.c
+++ b/examples/hello-world/hello-world.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: hello-world.c,v 1.1 2006/10/02 21:46:46 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/ipv6/json-ws/json-ws-udp.c b/examples/ipv6/json-ws/json-ws-udp.c
index 8d158747fd3..d948e2bd8c0 100644
--- a/examples/ipv6/json-ws/json-ws-udp.c
+++ b/examples/ipv6/json-ws/json-ws-udp.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: dmacro.dm,v 1.11 2006/03/18 19:43:52 nfi Exp $
  */
 
 /**
diff --git a/examples/ipv6/rpl-border-router/httpd-simple.c b/examples/ipv6/rpl-border-router/httpd-simple.c
index f34d5312ad4..115e54d4565 100644
--- a/examples/ipv6/rpl-border-router/httpd-simple.c
+++ b/examples/ipv6/rpl-border-router/httpd-simple.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: httpd-simple.c,v 1.5 2010/10/19 18:29:04 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/ipv6/rpl-border-router/project-conf.h b/examples/ipv6/rpl-border-router/project-conf.h
index 863552544ba..e928a759f91 100644
--- a/examples/ipv6/rpl-border-router/project-conf.h
+++ b/examples/ipv6/rpl-border-router/project-conf.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: project-conf.h,v 1.1 2010/10/21 18:23:44 joxe Exp $
  */
 
 #ifndef __PROJECT_ROUTER_CONF_H__
diff --git a/examples/ipv6/rpl-border-router/slip-bridge.c b/examples/ipv6/rpl-border-router/slip-bridge.c
index 3b4d26af7b9..c7d718501cf 100644
--- a/examples/ipv6/rpl-border-router/slip-bridge.c
+++ b/examples/ipv6/rpl-border-router/slip-bridge.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: slip-bridge.c,v 1.6 2011/01/17 20:05:51 joxe Exp $
  */
 
 /**
diff --git a/examples/ipv6/rpl-collect/collect-common.h b/examples/ipv6/rpl-collect/collect-common.h
index 02f0d801edd..32019d4cd1a 100644
--- a/examples/ipv6/rpl-collect/collect-common.h
+++ b/examples/ipv6/rpl-collect/collect-common.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: collect-common.h,v 1.1 2010/11/03 15:36:38 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/ipv6/sky-websense/project-conf.h b/examples/ipv6/sky-websense/project-conf.h
index 4a9a8ee8de3..9fbc2068637 100644
--- a/examples/ipv6/sky-websense/project-conf.h
+++ b/examples/ipv6/sky-websense/project-conf.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: project-conf.h,v 1.1 2010/11/03 15:46:41 adamdunkels Exp $
  */
 
 #ifndef __PROJECT_RPL_WEB_CONF_H__
diff --git a/examples/ipv6/sky-websense/sky-websense.c b/examples/ipv6/sky-websense/sky-websense.c
index 30abba27142..1949a190f0b 100644
--- a/examples/ipv6/sky-websense/sky-websense.c
+++ b/examples/ipv6/sky-websense/sky-websense.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: sky-websense.c,v 1.3 2010/06/08 13:27:06 nifi Exp $
  */
 
 /**
diff --git a/examples/ipv6/sky-websense/websense-remote.c b/examples/ipv6/sky-websense/websense-remote.c
index 50ac8f7cf14..75737b4848b 100644
--- a/examples/ipv6/sky-websense/websense-remote.c
+++ b/examples/ipv6/sky-websense/websense-remote.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: websense-remote.c,v 1.2 2010/06/14 14:12:43 nifi Exp $
  */
 
 /**
diff --git a/examples/ipv6/sky-websense/wget.c b/examples/ipv6/sky-websense/wget.c
index 59be94edff9..857c79a1531 100644
--- a/examples/ipv6/sky-websense/wget.c
+++ b/examples/ipv6/sky-websense/wget.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: wget.c,v 1.2 2010/06/14 14:12:43 nifi Exp $
  */
 
 /**
diff --git a/examples/ipv6/sky-websense/wget.h b/examples/ipv6/sky-websense/wget.h
index c5b023def24..12e8fbc7236 100644
--- a/examples/ipv6/sky-websense/wget.h
+++ b/examples/ipv6/sky-websense/wget.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: wget.h,v 1.2 2010/06/14 14:12:43 nifi Exp $
  */
 
 /**
diff --git a/examples/ipv6/slip-radio/no-framer.c b/examples/ipv6/slip-radio/no-framer.c
index 327a3f761d1..413e58cb0e3 100644
--- a/examples/ipv6/slip-radio/no-framer.c
+++ b/examples/ipv6/slip-radio/no-framer.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: framer-nullmac.c,v 1.2 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/irc/irc-client.c b/examples/irc/irc-client.c
index dd4745c0070..da28f9440a0 100644
--- a/examples/irc/irc-client.c
+++ b/examples/irc/irc-client.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: irc-client.c,v 1.1 2010/01/31 18:28:43 oliverschmidt Exp $
  */
 
 #include "contiki-net.h"
diff --git a/examples/jcreate/announce-blink.c b/examples/jcreate/announce-blink.c
index daa772fe58d..d8457b79ddd 100644
--- a/examples/jcreate/announce-blink.c
+++ b/examples/jcreate/announce-blink.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: announce-blink.c,v 1.3 2010/05/03 22:02:59 nifi Exp $
  */
 
 /**
diff --git a/examples/jcreate/example-ext-sensor.c b/examples/jcreate/example-ext-sensor.c
index a5657f7a8f1..4d12cd5280b 100644
--- a/examples/jcreate/example-ext-sensor.c
+++ b/examples/jcreate/example-ext-sensor.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-ext-sensor.c,v 1.2 2010/05/03 22:02:59 nifi Exp $
  */
 
 /**
diff --git a/examples/jcreate/jcreate-shell.c b/examples/jcreate/jcreate-shell.c
index 00772390f6f..f7489c8fa70 100644
--- a/examples/jcreate/jcreate-shell.c
+++ b/examples/jcreate/jcreate-shell.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: jcreate-shell.c,v 1.6 2010/05/03 22:02:59 nifi Exp $
  */
 
 /**
diff --git a/examples/mb851/acc-sensor/acc-example.c b/examples/mb851/acc-sensor/acc-example.c
index 663af6df629..21e19738154 100644
--- a/examples/mb851/acc-sensor/acc-example.c
+++ b/examples/mb851/acc-sensor/acc-example.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: acc-example.c,v 1.1 2010/10/25 13:34:28 salvopitru Exp $
  */
 
 /**
diff --git a/examples/mb851/button/test-button.c b/examples/mb851/button/test-button.c
index ca2245a6ac6..e427ab2ffef 100644
--- a/examples/mb851/button/test-button.c
+++ b/examples/mb851/button/test-button.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: test-button.c,v 1.1 2010/10/25 13:34:29 salvopitru Exp $
  */
 
 /**
diff --git a/examples/mb851/coffee-test/coffee-test.c b/examples/mb851/coffee-test/coffee-test.c
index 56d060462d9..49d0823a3ae 100644
--- a/examples/mb851/coffee-test/coffee-test.c
+++ b/examples/mb851/coffee-test/coffee-test.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: coffee-test.c,v 1.1 2010/11/10 11:20:44 salvopitru Exp $
  */
 
 /**
diff --git a/examples/mb851/mb851-shell/mb851-shell.c b/examples/mb851/mb851-shell/mb851-shell.c
index 8ed4aff5578..26a1c8ba483 100644
--- a/examples/mb851/mb851-shell/mb851-shell.c
+++ b/examples/mb851/mb851-shell/mb851-shell.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: mb851-shell.c,v 1.3 2010/12/15 14:50:29 salvopitru Exp $
  */
 
 /**
diff --git a/examples/mb851/mb851-websense/mb851-websense.c b/examples/mb851/mb851-websense/mb851-websense.c
index 9937c1e5771..3e92c05be7c 100644
--- a/examples/mb851/mb851-websense/mb851-websense.c
+++ b/examples/mb851/mb851-websense/mb851-websense.c
@@ -27,7 +27,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: mb851-websense.c,v 1.1 2011/01/17 10:58:04 salvopitru Exp $
  */
 
 /**
diff --git a/examples/mb851/mb851-websense/project-conf.h b/examples/mb851/mb851-websense/project-conf.h
index a151f6be811..ff0ef145dae 100644
--- a/examples/mb851/mb851-websense/project-conf.h
+++ b/examples/mb851/mb851-websense/project-conf.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: project-conf.h,v 1.1 2011/01/17 10:58:04 salvopitru Exp $
  */
 
 #ifndef __PROJECT_RPL_WEB_CONF_H__
diff --git a/examples/mb851/shell-exec/hello-world.c b/examples/mb851/shell-exec/hello-world.c
index 4e10a749717..bc11ab91ffa 100644
--- a/examples/mb851/shell-exec/hello-world.c
+++ b/examples/mb851/shell-exec/hello-world.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: hello-world.c,v 1.1 2010/12/15 15:33:30 salvopitru Exp $
  */
 
 /**
diff --git a/examples/mb851/shell-exec/shell-exec-test.c b/examples/mb851/shell-exec/shell-exec-test.c
index fcee41166ee..39ece9af677 100644
--- a/examples/mb851/shell-exec/shell-exec-test.c
+++ b/examples/mb851/shell-exec/shell-exec-test.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-exec-test.c,v 1.1 2010/12/15 15:33:30 salvopitru Exp $
  */
 
 #include "contiki.h"
diff --git a/examples/mb851/telnet-server/telnet-server.c b/examples/mb851/telnet-server/telnet-server.c
index 3f52c090111..8cfe99a7711 100644
--- a/examples/mb851/telnet-server/telnet-server.c
+++ b/examples/mb851/telnet-server/telnet-server.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: telnet-server.c,v 1.1 2010/10/25 13:34:29 salvopitru Exp $
  */
 
 /**
diff --git a/examples/mb851/temperature/temp-sensor.c b/examples/mb851/temperature/temp-sensor.c
index cb05899d830..05cf68b0f30 100644
--- a/examples/mb851/temperature/temp-sensor.c
+++ b/examples/mb851/temperature/temp-sensor.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: temp-sensor.c,v 1.1 2010/10/25 13:34:29 salvopitru Exp $
  */
 
 /**
diff --git a/examples/mb851/webserver-ajax/ajax-cgi.c b/examples/mb851/webserver-ajax/ajax-cgi.c
index a9679c071ff..75e5d198351 100644
--- a/examples/mb851/webserver-ajax/ajax-cgi.c
+++ b/examples/mb851/webserver-ajax/ajax-cgi.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: ajax-cgi.c,v 1.1 2010/10/25 13:34:29 salvopitru Exp $
  *
  */
 
diff --git a/examples/mb851/webserver-ajax/httpd-fs.c b/examples/mb851/webserver-ajax/httpd-fs.c
index a563bcb2c33..70d45a5a24b 100644
--- a/examples/mb851/webserver-ajax/httpd-fs.c
+++ b/examples/mb851/webserver-ajax/httpd-fs.c
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-fs.c,v 1.1 2010/10/25 13:34:29 salvopitru Exp $
  */
 
 #include "contiki-net.h"
diff --git a/examples/multi-threading/multi-threading.c b/examples/multi-threading/multi-threading.c
index d8439f5bce1..a46b2327b56 100644
--- a/examples/multi-threading/multi-threading.c
+++ b/examples/multi-threading/multi-threading.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: multi-threading.c,v 1.5 2010/02/10 07:59:42 oliverschmidt Exp $
  */
 
 /**
diff --git a/examples/netperf/netperf-shell.c b/examples/netperf/netperf-shell.c
index 4c168596ee9..43087f7f354 100644
--- a/examples/netperf/netperf-shell.c
+++ b/examples/netperf/netperf-shell.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: netperf-shell.c,v 1.3 2010/09/14 07:17:21 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/powertrace/example-powertrace.c b/examples/powertrace/example-powertrace.c
index 9f97bbb213b..895c3c7cb0d 100644
--- a/examples/powertrace/example-powertrace.c
+++ b/examples/powertrace/example-powertrace.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-powertrace.c,v 1.1 2010/02/20 14:15:45 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/rime/example-abc.c b/examples/rime/example-abc.c
index 1df6c0f50f4..3a844836e90 100644
--- a/examples/rime/example-abc.c
+++ b/examples/rime/example-abc.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-abc.c,v 1.7 2009/06/09 19:31:55 fros4943 Exp $
  */
 
 /**
diff --git a/examples/rime/example-announcement.c b/examples/rime/example-announcement.c
index 1c171de24b2..125d69fa021 100644
--- a/examples/rime/example-announcement.c
+++ b/examples/rime/example-announcement.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-announcement.c,v 1.3 2011/01/07 23:23:31 nvt-se Exp $
  */
 
 /**
diff --git a/examples/rime/example-broadcast.c b/examples/rime/example-broadcast.c
index c99cc0fb4c5..07ea2d3400a 100644
--- a/examples/rime/example-broadcast.c
+++ b/examples/rime/example-broadcast.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-broadcast.c,v 1.3 2010/11/06 15:03:48 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/rime/example-collect.c b/examples/rime/example-collect.c
index cb53d3e11ed..6f4953465bc 100644
--- a/examples/rime/example-collect.c
+++ b/examples/rime/example-collect.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-collect.c,v 1.16 2011/01/10 15:11:44 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/rime/example-mesh.c b/examples/rime/example-mesh.c
index f139e5dbc5f..4596ca54a9b 100644
--- a/examples/rime/example-mesh.c
+++ b/examples/rime/example-mesh.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-mesh.c,v 1.7 2010/01/15 10:24:35 nifi Exp $
  */
 
 /**
diff --git a/examples/rime/example-multihop.c b/examples/rime/example-multihop.c
index 568c278e23e..fb64b5a81ae 100644
--- a/examples/rime/example-multihop.c
+++ b/examples/rime/example-multihop.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-multihop.c,v 1.7 2010/01/15 10:24:36 nifi Exp $
  */
 
 /**
diff --git a/examples/rime/example-neighbors.c b/examples/rime/example-neighbors.c
index 6a4feee8e9b..9126d343be6 100644
--- a/examples/rime/example-neighbors.c
+++ b/examples/rime/example-neighbors.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-neighbors.c,v 1.1 2010/12/14 10:07:28 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/rime/example-rucb.c b/examples/rime/example-rucb.c
index b457d5292e1..7134e3cdd73 100644
--- a/examples/rime/example-rucb.c
+++ b/examples/rime/example-rucb.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-rucb.c,v 1.7 2010/01/15 10:24:37 nifi Exp $
  */
 
 /**
diff --git a/examples/rime/example-rudolph0.c b/examples/rime/example-rudolph0.c
index d718129a8d4..196340f1c37 100644
--- a/examples/rime/example-rudolph0.c
+++ b/examples/rime/example-rudolph0.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-rudolph0.c,v 1.5 2010/01/15 10:24:37 nifi Exp $
  */
 
 /**
diff --git a/examples/rime/example-rudolph1.c b/examples/rime/example-rudolph1.c
index 89843a9e6e2..f4cb74e656f 100644
--- a/examples/rime/example-rudolph1.c
+++ b/examples/rime/example-rudolph1.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-rudolph1.c,v 1.7 2010/01/15 10:24:37 nifi Exp $
  */
 
 /**
diff --git a/examples/rime/example-rudolph2.c b/examples/rime/example-rudolph2.c
index 84d10ffbf03..425e69ddf0a 100644
--- a/examples/rime/example-rudolph2.c
+++ b/examples/rime/example-rudolph2.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-rudolph2.c,v 1.8 2010/11/15 21:50:02 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/rime/example-runicast.c b/examples/rime/example-runicast.c
index 86fd0923612..c0a3b8ec9a0 100644
--- a/examples/rime/example-runicast.c
+++ b/examples/rime/example-runicast.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-runicast.c,v 1.7 2009/12/18 15:26:35 nifi Exp $
  */
 
 /**
diff --git a/examples/rime/example-trickle.c b/examples/rime/example-trickle.c
index 6929fa7dd8b..61d2d7edde3 100644
--- a/examples/rime/example-trickle.c
+++ b/examples/rime/example-trickle.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-trickle.c,v 1.5 2010/01/15 10:24:37 nifi Exp $
  */
 
 /**
diff --git a/examples/rime/example-unicast.c b/examples/rime/example-unicast.c
index 4aab878b333..496841ed25f 100644
--- a/examples/rime/example-unicast.c
+++ b/examples/rime/example-unicast.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-unicast.c,v 1.5 2010/02/02 16:36:46 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/sensinode/border-router/slip-bridge.c b/examples/sensinode/border-router/slip-bridge.c
index 82ec4092007..bfa8afbc9de 100644
--- a/examples/sensinode/border-router/slip-bridge.c
+++ b/examples/sensinode/border-router/slip-bridge.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: slip-bridge.c,v 1.3 2010/06/08 19:53:49 nifi Exp $
  */
 
 /**
diff --git a/examples/sensinode/broadcast-rime.c b/examples/sensinode/broadcast-rime.c
index adcb479ebc2..d46c5cb5fa5 100644
--- a/examples/sensinode/broadcast-rime.c
+++ b/examples/sensinode/broadcast-rime.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-broadcast.c,v 1.2 2009/11/19 17:29:41 nifi Exp $
  */
 
 /**
diff --git a/examples/sensinode/udp-ipv6/project-conf.h b/examples/sensinode/udp-ipv6/project-conf.h
index 672ac522b59..fafe10a2fb5 100644
--- a/examples/sensinode/udp-ipv6/project-conf.h
+++ b/examples/sensinode/udp-ipv6/project-conf.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id$
  */
 
 /**
diff --git a/examples/servreg-hack/example-servreg-client.c b/examples/servreg-hack/example-servreg-client.c
index 5657a015597..0ea55d8acbb 100644
--- a/examples/servreg-hack/example-servreg-client.c
+++ b/examples/servreg-hack/example-servreg-client.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-servreg-client.c,v 1.1 2010/06/15 19:00:28 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/servreg-hack/example-servreg-server.c b/examples/servreg-hack/example-servreg-server.c
index 5a6f7686d6d..7af624f9abd 100644
--- a/examples/servreg-hack/example-servreg-server.c
+++ b/examples/servreg-hack/example-servreg-server.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-servreg-server.c,v 1.1 2010/06/15 19:00:28 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/sky-ip/ajax-cgi.c b/examples/sky-ip/ajax-cgi.c
index a1e32381fb4..e1a83544177 100644
--- a/examples/sky-ip/ajax-cgi.c
+++ b/examples/sky-ip/ajax-cgi.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: ajax-cgi.c,v 1.7 2010/04/09 13:19:05 nifi Exp $
  *
  */
 
diff --git a/examples/sky-ip/httpd-fs.c b/examples/sky-ip/httpd-fs.c
index 3c6cc7f6108..70d45a5a24b 100644
--- a/examples/sky-ip/httpd-fs.c
+++ b/examples/sky-ip/httpd-fs.c
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-fs.c,v 1.2 2009/05/11 17:38:29 adamdunkels Exp $
  */
 
 #include "contiki-net.h"
diff --git a/examples/sky-ip/sky-telnet-server.c b/examples/sky-ip/sky-telnet-server.c
index 3cd350a1990..41324a6b46f 100644
--- a/examples/sky-ip/sky-telnet-server.c
+++ b/examples/sky-ip/sky-telnet-server.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sky-telnet-server.c,v 1.2 2009/06/26 09:51:18 fros4943 Exp $
  */
 
 /**
diff --git a/examples/sky-ip/sky-webserver.c b/examples/sky-ip/sky-webserver.c
index 2124fe004f5..fe1af73a73a 100644
--- a/examples/sky-ip/sky-webserver.c
+++ b/examples/sky-ip/sky-webserver.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sky-webserver.c,v 1.1 2008/05/29 20:17:48 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/sky-ip/telnet-tweet.c b/examples/sky-ip/telnet-tweet.c
index 37542c40398..b025e50c65b 100644
--- a/examples/sky-ip/telnet-tweet.c
+++ b/examples/sky-ip/telnet-tweet.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: telnet-tweet.c,v 1.2 2010/02/03 20:05:19 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/sky-ip/telnet-webserver.c b/examples/sky-ip/telnet-webserver.c
index 5333a16c1d9..7678ce06bb6 100644
--- a/examples/sky-ip/telnet-webserver.c
+++ b/examples/sky-ip/telnet-webserver.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: telnet-webserver.c,v 1.2 2010/02/03 20:05:20 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/sky-shell-exec/hello-world.c b/examples/sky-shell-exec/hello-world.c
index fadf5167c7b..bc11ab91ffa 100644
--- a/examples/sky-shell-exec/hello-world.c
+++ b/examples/sky-shell-exec/hello-world.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: hello-world.c,v 1.1 2009/03/26 12:46:19 fros4943 Exp $
  */
 
 /**
diff --git a/examples/sky-shell-exec/sky-shell-exec.c b/examples/sky-shell-exec/sky-shell-exec.c
index 90ea6e71b47..5580c58f229 100644
--- a/examples/sky-shell-exec/sky-shell-exec.c
+++ b/examples/sky-shell-exec/sky-shell-exec.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sky-shell-exec.c,v 1.3 2010/03/29 12:48:39 fros4943 Exp $
  */
 
 #include "contiki.h"
diff --git a/examples/sky-shell-webserver/sky-shell-webserver.c b/examples/sky-shell-webserver/sky-shell-webserver.c
index fb4aa9da06d..708f53d5e0f 100644
--- a/examples/sky-shell-webserver/sky-shell-webserver.c
+++ b/examples/sky-shell-webserver/sky-shell-webserver.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sky-shell-webserver.c,v 1.4 2010/02/03 20:42:23 adamdunkels Exp $
  */
 
 #include "contiki.h"
diff --git a/examples/sky-shell/sky-checkpoint.c b/examples/sky-shell/sky-checkpoint.c
index a732d5437e2..3969729222e 100644
--- a/examples/sky-shell/sky-checkpoint.c
+++ b/examples/sky-shell/sky-checkpoint.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sky-checkpoint.c,v 1.5 2010/03/29 09:50:44 fros4943 Exp $
  */
 
 /**
diff --git a/examples/sky-shell/sky-shell.c b/examples/sky-shell/sky-shell.c
index ef0712aad3d..5ccba54fcf0 100644
--- a/examples/sky-shell/sky-shell.c
+++ b/examples/sky-shell/sky-shell.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sky-shell.c,v 1.27 2010/11/12 13:17:45 nifi Exp $
  */
 
 /**
diff --git a/examples/sky-shell/sky-upload.c b/examples/sky-shell/sky-upload.c
index ba87506df48..3132de58b6f 100644
--- a/examples/sky-shell/sky-upload.c
+++ b/examples/sky-shell/sky-upload.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sky-upload.c,v 1.2 2008/07/03 23:32:19 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/sky/radio-test.c b/examples/sky/radio-test.c
index 2f44d612404..9d13ec44785 100644
--- a/examples/sky/radio-test.c
+++ b/examples/sky/radio-test.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: radio-test.c,v 1.6 2010/01/15 10:32:36 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/examples/sky/rssi-scanner.c b/examples/sky/rssi-scanner.c
index c30a33a1718..bbc8b00f0a7 100644
--- a/examples/sky/rssi-scanner.c
+++ b/examples/sky/rssi-scanner.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rssi-scanner.c,v 1.3 2011/01/12 20:00:48 joxe Exp $
  */
 
 /**
diff --git a/examples/sky/sky-collect.c b/examples/sky/sky-collect.c
index 2a41a5a0b84..25ce36f33dc 100644
--- a/examples/sky/sky-collect.c
+++ b/examples/sky/sky-collect.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sky-collect.c,v 1.13 2010/09/14 06:47:08 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/sky/tcprudolph0.c b/examples/sky/tcprudolph0.c
index c23444c3225..3deaa0944df 100644
--- a/examples/sky/tcprudolph0.c
+++ b/examples/sky/tcprudolph0.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: tcprudolph0.c,v 1.13 2010/10/19 18:29:05 adamdunkels Exp $
  */
 
 #include <stdio.h>
diff --git a/examples/sky/test-button.c b/examples/sky/test-button.c
index 03ddb74f016..9ccb448eac9 100644
--- a/examples/sky/test-button.c
+++ b/examples/sky/test-button.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: test-button.c,v 1.6 2010/02/03 09:54:38 joxe Exp $
  */
 
 /**
diff --git a/examples/sky/test-cfs.c b/examples/sky/test-cfs.c
index e0af1979470..68c91e72053 100644
--- a/examples/sky/test-cfs.c
+++ b/examples/sky/test-cfs.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: test-cfs.c,v 1.5 2009/09/21 14:14:46 nifi Exp $
  */
 
 /**
diff --git a/examples/sky/test-coffee.c b/examples/sky/test-coffee.c
index c4c9e9a0bb0..b4152b2a8c3 100644
--- a/examples/sky/test-coffee.c
+++ b/examples/sky/test-coffee.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: test-coffee.c,v 1.12 2009/09/17 14:32:57 nvt-se Exp $
  */
 
 /**
diff --git a/examples/sky/test-deluge.c b/examples/sky/test-deluge.c
index bf3efd2230c..7d95b103b2a 100644
--- a/examples/sky/test-deluge.c
+++ b/examples/sky/test-deluge.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: test-deluge.c,v 1.3 2009/04/07 15:14:17 nvt-se Exp $
  */
 
 /**
diff --git a/examples/telnet-server/telnet-server.c b/examples/telnet-server/telnet-server.c
index 587ab790b05..a0862886e9d 100644
--- a/examples/telnet-server/telnet-server.c
+++ b/examples/telnet-server/telnet-server.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: telnet-server.c,v 1.4 2009/03/01 23:37:49 oliverschmidt Exp $
  */
 
 /**
diff --git a/examples/test-ipv6/tapdev.h b/examples/test-ipv6/tapdev.h
index 822f694da21..fa5ddfbee18 100644
--- a/examples/test-ipv6/tapdev.h
+++ b/examples/test-ipv6/tapdev.h
@@ -31,7 +31,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: tapdev.h,v 1.1 2006/06/17 22:41:24 adamdunkels Exp $
  *
  */
 #ifndef __TAPDEV_H__
diff --git a/examples/test-ipv6/tapdev6.c b/examples/test-ipv6/tapdev6.c
index 679d2517e4a..0a5fab26dd8 100644
--- a/examples/test-ipv6/tapdev6.c
+++ b/examples/test-ipv6/tapdev6.c
@@ -31,7 +31,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: tapdev6.c,v 1.2 2006/08/10 19:22:23 bg- Exp $
  */
 
 
diff --git a/examples/test-ipv6/testv6.c b/examples/test-ipv6/testv6.c
index 6d55ef13244..49c39443231 100644
--- a/examples/test-ipv6/testv6.c
+++ b/examples/test-ipv6/testv6.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: testv6.c,v 1.4 2010/10/19 18:29:05 adamdunkels Exp $
  */
 
 #include "contiki-net.h"
diff --git a/examples/udp-stream/project-conf.h b/examples/udp-stream/project-conf.h
index 7e7034686b7..f562287f562 100644
--- a/examples/udp-stream/project-conf.h
+++ b/examples/udp-stream/project-conf.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: project-conf.h,v 1.1 2010/10/28 13:11:08 simonduq Exp $
  */
 
 #ifndef __PROJECT_H__
diff --git a/examples/udp-stream/udp-stream.c b/examples/udp-stream/udp-stream.c
index c53e72e91e3..986fe5e6ebd 100644
--- a/examples/udp-stream/udp-stream.c
+++ b/examples/udp-stream/udp-stream.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: hello-world.c,v 1.1 2006/10/02 21:46:46 simonduq Exp $
  */
 
 /**
diff --git a/examples/webbrowser/webbrowser.c b/examples/webbrowser/webbrowser.c
index a2bdbd4409b..0453fe0d27e 100644
--- a/examples/webbrowser/webbrowser.c
+++ b/examples/webbrowser/webbrowser.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: webbrowser.c,v 1.1 2007/12/15 22:05:34 oliverschmidt Exp $
  */
 
 #include "contiki-net.h"
diff --git a/examples/webserver-ipv6-raven/webserver6.c b/examples/webserver-ipv6-raven/webserver6.c
index a77ed47bdde..f1586aa653d 100644
--- a/examples/webserver-ipv6-raven/webserver6.c
+++ b/examples/webserver-ipv6-raven/webserver6.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: webserver6.c,v 1.1 2008/10/14 22:04:16 c_oflynn Exp $
  */
 
 #include "webserver-nogui.h"
diff --git a/examples/webserver-ipv6/webserver6.c b/examples/webserver-ipv6/webserver6.c
index 66933dd6b15..f1586aa653d 100644
--- a/examples/webserver-ipv6/webserver6.c
+++ b/examples/webserver-ipv6/webserver6.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: webserver6.c,v 1.1 2008/10/14 10:01:53 julienabeille Exp $
  */
 
 #include "webserver-nogui.h"
diff --git a/examples/webserver/webserver-example.c b/examples/webserver/webserver-example.c
index 9603df66daf..7b4a4a20758 100644
--- a/examples/webserver/webserver-example.c
+++ b/examples/webserver/webserver-example.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: webserver-example.c,v 1.1 2006/06/17 22:41:25 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/wget/wget.c b/examples/wget/wget.c
index dfb33622012..b1f94be636a 100644
--- a/examples/wget/wget.c
+++ b/examples/wget/wget.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: wget.c,v 1.4 2010/10/31 22:43:06 oliverschmidt Exp $
  *
  */
 
diff --git a/examples/z1/ipv6/z1-websense/project-conf.h b/examples/z1/ipv6/z1-websense/project-conf.h
index 66c46768875..72f9fa25cf7 100644
--- a/examples/z1/ipv6/z1-websense/project-conf.h
+++ b/examples/z1/ipv6/z1-websense/project-conf.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: project-conf.h,v 1.1 2010/11/03 15:46:41 adamdunkels Exp $
  */
 
 #ifndef __PROJECT_RPL_WEB_CONF_H__
diff --git a/examples/z1/ipv6/z1-websense/websense-remote.c b/examples/z1/ipv6/z1-websense/websense-remote.c
index aad3022f71b..7323293ca92 100644
--- a/examples/z1/ipv6/z1-websense/websense-remote.c
+++ b/examples/z1/ipv6/z1-websense/websense-remote.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: websense-remote.c,v 1.2 2010/06/14 14:12:43 nifi Exp $
  */
 
 /**
diff --git a/examples/z1/ipv6/z1-websense/wget.c b/examples/z1/ipv6/z1-websense/wget.c
index 2a7c0241c26..75eb7cfd6ee 100644
--- a/examples/z1/ipv6/z1-websense/wget.c
+++ b/examples/z1/ipv6/z1-websense/wget.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: wget.c,v 1.2 2010/06/14 14:12:43 nifi Exp $
  */
 
 /**
diff --git a/examples/z1/ipv6/z1-websense/wget.h b/examples/z1/ipv6/z1-websense/wget.h
index c5b023def24..12e8fbc7236 100644
--- a/examples/z1/ipv6/z1-websense/wget.h
+++ b/examples/z1/ipv6/z1-websense/wget.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: wget.h,v 1.2 2010/06/14 14:12:43 nifi Exp $
  */
 
 /**
diff --git a/examples/z1/rssi_scanner/rssi-scanner.c b/examples/z1/rssi_scanner/rssi-scanner.c
index f9976e71adc..77353a29899 100644
--- a/examples/z1/rssi_scanner/rssi-scanner.c
+++ b/examples/z1/rssi_scanner/rssi-scanner.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rssi-scanner.c,v 1.2 2009/04/25 22:38:00 joxe Exp $
  */
 
 /**
diff --git a/examples/z1/test-phidgets.c b/examples/z1/test-phidgets.c
index 8846b2d1118..2ad9ee000f7 100644
--- a/examples/z1/test-phidgets.c
+++ b/examples/z1/test-phidgets.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: test-phidgets.c,v 1.1 2010/08/27 12:51:41 joxe Exp $
  */
 
 /**
diff --git a/examples/z1/test-sht11.c b/examples/z1/test-sht11.c
index 326976873b5..9bf48d04b93 100644
--- a/examples/z1/test-sht11.c
+++ b/examples/z1/test-sht11.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: test-sht11.c,v 1.3 2011/02/27 07:39:55 enricmcalvo $
  */
 
 /**
diff --git a/examples/z1/tutorials/example-unicast-temp.c b/examples/z1/tutorials/example-unicast-temp.c
index 69c86442e0e..2ba5dc51ba4 100644
--- a/examples/z1/tutorials/example-unicast-temp.c
+++ b/examples/z1/tutorials/example-unicast-temp.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-unicast.c,v 1.5 2010/02/02 16:36:46 adamdunkels Exp $
  */
 
 /**
diff --git a/examples/z1/tutorials/example-unicast2.c b/examples/z1/tutorials/example-unicast2.c
index 10ec10c336b..b6b63be8110 100644
--- a/examples/z1/tutorials/example-unicast2.c
+++ b/examples/z1/tutorials/example-unicast2.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: example-unicast.c,v 1.5 2010/02/02 16:36:46 adamdunkels Exp $
  */
 
 /**
diff --git a/platform/apple2enh/contiki-conf.h b/platform/apple2enh/contiki-conf.h
index b8d28ce3c0b..dd17f1ee22f 100644
--- a/platform/apple2enh/contiki-conf.h
+++ b/platform/apple2enh/contiki-conf.h
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: contiki-conf.h,v 1.23 2010/10/16 10:41:46 oliverschmidt Exp $
  */
 
 #ifndef __CONTIKI_CONF_H__
diff --git a/platform/apple2enh/contiki-main.c b/platform/apple2enh/contiki-main.c
index 31539aa090c..e901e7f7889 100644
--- a/platform/apple2enh/contiki-main.c
+++ b/platform/apple2enh/contiki-main.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: contiki-main.c,v 1.23 2010/10/27 22:17:39 oliverschmidt Exp $
  */
 
 #include "contiki-net.h"
diff --git a/platform/apple2enh/lib/error.c b/platform/apple2enh/lib/error.c
index 40a25168005..2c5d5572e26 100644
--- a/platform/apple2enh/lib/error.c
+++ b/platform/apple2enh/lib/error.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: error.c,v 1.2 2007/12/16 13:12:49 oliverschmidt Exp $
  */
 
 #include <stdlib.h>
diff --git a/platform/apple2enh/sys/clock.c b/platform/apple2enh/sys/clock.c
index ef169ae7f9c..e17cc922fc6 100644
--- a/platform/apple2enh/sys/clock.c
+++ b/platform/apple2enh/sys/clock.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: clock.c,v 1.3 2008/07/12 14:46:03 oliverschmidt Exp $
  */
 
 #include <apple2.h>
diff --git a/platform/atari/contiki-conf.h b/platform/atari/contiki-conf.h
index 3444fac45d0..903eb266612 100644
--- a/platform/atari/contiki-conf.h
+++ b/platform/atari/contiki-conf.h
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: contiki-conf.h,v 1.5 2010/11/01 19:44:34 oliverschmidt Exp $
  */
 
 #ifndef __CONTIKI_CONF_H__
diff --git a/platform/atari/contiki-main.c b/platform/atari/contiki-main.c
index 6c5c8116cc2..1cdacd11f25 100644
--- a/platform/atari/contiki-main.c
+++ b/platform/atari/contiki-main.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: contiki-main.c,v 1.5 2010/10/27 22:17:39 oliverschmidt Exp $
  */
 
 #include "contiki-net.h"
diff --git a/platform/atari/lib/error.c b/platform/atari/lib/error.c
index b06b0ed0699..2c5d5572e26 100644
--- a/platform/atari/lib/error.c
+++ b/platform/atari/lib/error.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: error.c,v 1.1 2010/09/29 21:11:21 oliverschmidt Exp $
  */
 
 #include <stdlib.h>
diff --git a/platform/avr-atmega128rfa1/apps/raven-lcd-interface/raven-lcd.c b/platform/avr-atmega128rfa1/apps/raven-lcd-interface/raven-lcd.c
index c4668f7d3d6..c9364f0be89 100644
--- a/platform/avr-atmega128rfa1/apps/raven-lcd-interface/raven-lcd.c
+++ b/platform/avr-atmega128rfa1/apps/raven-lcd-interface/raven-lcd.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: raven-lcd.c,v 1.11 2010/12/22 17:09:03 dak664 Exp $
 */
 
 /**
diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cfs.c b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cfs.c
index df46826d12c..4c991f187c3 100644
--- a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cfs.c
+++ b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cfs.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-cfs.c,v 1.2 2010/10/19 18:29:05 adamdunkels Exp $
  */
 
 #include <string.h>
diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cfs.h b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cfs.h
index a488ecd5350..868c39d036d 100644
--- a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cfs.h
+++ b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cfs.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd-cfs.h,v 1.1 2009/03/12 19:15:25 adamdunkels Exp $
  *
  */
 
diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.c b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.c
index 36a47a6611c..8bf7687c7f9 100644
--- a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.c
+++ b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd-cgi.c,v 1.13 2010/12/23 19:41:07 dak664 Exp $
  *
  */
 #include <util/delay.h>
diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.h b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.h
index 5ec87162dfc..acd2f6aede9 100644
--- a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.h
+++ b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd-cgi.h,v 1.3 2010/02/12 16:42:59 dak664 Exp $
  *
  */
 
diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fs.c b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fs.c
index 21b0d7cdcfc..700c90e0538 100644
--- a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fs.c
+++ b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fs.c
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-fs.c,v 1.4 2009/07/24 15:41:52 dak664 Exp $
  */
 
 #include "contiki-net.h"
diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fs.h b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fs.h
index fc0893d5500..cf354019e58 100644
--- a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fs.h
+++ b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fs.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-fs.h,v 1.3 2009/07/23 16:16:07 dak664 Exp $
  */
 #ifndef __HTTPD_FS_H__
 #define __HTTPD_FS_H__
diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fsdata.h b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fsdata.h
index f269ad75a2d..16c0ec48e4a 100644
--- a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fsdata.h
+++ b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fsdata.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-fsdata.h,v 1.2 2009/06/19 17:11:28 dak664 Exp $
  */
 #ifndef __HTTPD_FSDATA_H__
 #define __HTTPD_FSDATA_H__
diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd.c b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd.c
index af2f1cd3528..da588412006 100644
--- a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd.c
+++ b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd.c,v 1.6 2010/12/20 20:06:06 dak664 Exp $
  */
 
 #include <string.h>
diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd.h b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd.h
index 8336eee52bd..73842cb0b0c 100644
--- a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd.h
+++ b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd.h,v 1.4 2009/07/24 15:41:52 dak664 Exp $
  *
  */
 
diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-dsc.c b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-dsc.c
index 5fd0922d93f..0a61f925158 100644
--- a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-dsc.c
+++ b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: webserver-dsc.c,v 1.1 2009/03/12 19:15:25 adamdunkels Exp $
  *
  */
 
diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-dsc.h b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-dsc.h
index a70cb9dfa96..c329f41d8f1 100644
--- a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-dsc.h
+++ b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: webserver-dsc.h,v 1.1 2009/03/12 19:15:25 adamdunkels Exp $
  *
  */
 #ifndef __WEBSERVER_DSC_H__
diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-nogui.c b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-nogui.c
index 84c93f05613..557e08560ae 100644
--- a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-nogui.c
+++ b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-nogui.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS.
  *
- * $Id: webserver-nogui.c,v 1.3 2010/02/09 14:41:18 dak664 Exp $
  *
  */
 
diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-nogui.h b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-nogui.h
index e34692fd4a7..825dfb96fd6 100644
--- a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-nogui.h
+++ b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-nogui.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: webserver-nogui.h,v 1.1 2009/03/12 19:15:25 adamdunkels Exp $
  *
  */
 #ifndef __WEBSERVER_NOGUI_H__
diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver.c b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver.c
index 62923cc1b6d..f63e40a8ea1 100644
--- a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver.c
+++ b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: webserver.c,v 1.1 2009/03/12 19:15:25 adamdunkels Exp $
  *
  */
 
diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver.h b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver.h
index 71c6b339ba2..fe9f255a12f 100644
--- a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver.h
+++ b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki operating system
  *
- * $Id: webserver.h,v 1.1 2009/03/12 19:15:25 adamdunkels Exp $
  *
  */
 #ifndef __WEBSERVER_H__
diff --git a/platform/avr-raven/apps/raven-webserver/httpd-cfs.c b/platform/avr-raven/apps/raven-webserver/httpd-cfs.c
index df46826d12c..4c991f187c3 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd-cfs.c
+++ b/platform/avr-raven/apps/raven-webserver/httpd-cfs.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-cfs.c,v 1.2 2010/10/19 18:29:05 adamdunkels Exp $
  */
 
 #include <string.h>
diff --git a/platform/avr-raven/apps/raven-webserver/httpd-cfs.h b/platform/avr-raven/apps/raven-webserver/httpd-cfs.h
index a488ecd5350..868c39d036d 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd-cfs.h
+++ b/platform/avr-raven/apps/raven-webserver/httpd-cfs.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd-cfs.h,v 1.1 2009/03/12 19:15:25 adamdunkels Exp $
  *
  */
 
diff --git a/platform/avr-raven/apps/raven-webserver/httpd-cgi.c b/platform/avr-raven/apps/raven-webserver/httpd-cgi.c
index f271c3738f1..793aefbe3d4 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd-cgi.c
+++ b/platform/avr-raven/apps/raven-webserver/httpd-cgi.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd-cgi.c,v 1.13 2010/12/23 19:41:07 dak664 Exp $
  *
  */
 /* Line endings in git repository are LF instead of CR-LF ? */
diff --git a/platform/avr-raven/apps/raven-webserver/httpd-cgi.h b/platform/avr-raven/apps/raven-webserver/httpd-cgi.h
index 5ec87162dfc..acd2f6aede9 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd-cgi.h
+++ b/platform/avr-raven/apps/raven-webserver/httpd-cgi.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd-cgi.h,v 1.3 2010/02/12 16:42:59 dak664 Exp $
  *
  */
 
diff --git a/platform/avr-raven/apps/raven-webserver/httpd-fs.c b/platform/avr-raven/apps/raven-webserver/httpd-fs.c
index 21b0d7cdcfc..700c90e0538 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd-fs.c
+++ b/platform/avr-raven/apps/raven-webserver/httpd-fs.c
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-fs.c,v 1.4 2009/07/24 15:41:52 dak664 Exp $
  */
 
 #include "contiki-net.h"
diff --git a/platform/avr-raven/apps/raven-webserver/httpd-fs.h b/platform/avr-raven/apps/raven-webserver/httpd-fs.h
index fc0893d5500..cf354019e58 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd-fs.h
+++ b/platform/avr-raven/apps/raven-webserver/httpd-fs.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-fs.h,v 1.3 2009/07/23 16:16:07 dak664 Exp $
  */
 #ifndef __HTTPD_FS_H__
 #define __HTTPD_FS_H__
diff --git a/platform/avr-raven/apps/raven-webserver/httpd-fsdata.h b/platform/avr-raven/apps/raven-webserver/httpd-fsdata.h
index f269ad75a2d..16c0ec48e4a 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd-fsdata.h
+++ b/platform/avr-raven/apps/raven-webserver/httpd-fsdata.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-fsdata.h,v 1.2 2009/06/19 17:11:28 dak664 Exp $
  */
 #ifndef __HTTPD_FSDATA_H__
 #define __HTTPD_FSDATA_H__
diff --git a/platform/avr-raven/apps/raven-webserver/httpd.c b/platform/avr-raven/apps/raven-webserver/httpd.c
index 1327ca6ad8b..2ce88ccabcf 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd.c
+++ b/platform/avr-raven/apps/raven-webserver/httpd.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd.c,v 1.6 2010/12/20 20:06:06 dak664 Exp $
  */
 
 #include <string.h>
diff --git a/platform/avr-raven/apps/raven-webserver/httpd.h b/platform/avr-raven/apps/raven-webserver/httpd.h
index 8336eee52bd..73842cb0b0c 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd.h
+++ b/platform/avr-raven/apps/raven-webserver/httpd.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd.h,v 1.4 2009/07/24 15:41:52 dak664 Exp $
  *
  */
 
diff --git a/platform/avr-raven/apps/raven-webserver/webserver-dsc.c b/platform/avr-raven/apps/raven-webserver/webserver-dsc.c
index 5fd0922d93f..0a61f925158 100644
--- a/platform/avr-raven/apps/raven-webserver/webserver-dsc.c
+++ b/platform/avr-raven/apps/raven-webserver/webserver-dsc.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: webserver-dsc.c,v 1.1 2009/03/12 19:15:25 adamdunkels Exp $
  *
  */
 
diff --git a/platform/avr-raven/apps/raven-webserver/webserver-dsc.h b/platform/avr-raven/apps/raven-webserver/webserver-dsc.h
index a70cb9dfa96..c329f41d8f1 100644
--- a/platform/avr-raven/apps/raven-webserver/webserver-dsc.h
+++ b/platform/avr-raven/apps/raven-webserver/webserver-dsc.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: webserver-dsc.h,v 1.1 2009/03/12 19:15:25 adamdunkels Exp $
  *
  */
 #ifndef __WEBSERVER_DSC_H__
diff --git a/platform/avr-raven/apps/raven-webserver/webserver-nogui.c b/platform/avr-raven/apps/raven-webserver/webserver-nogui.c
index 84c93f05613..557e08560ae 100644
--- a/platform/avr-raven/apps/raven-webserver/webserver-nogui.c
+++ b/platform/avr-raven/apps/raven-webserver/webserver-nogui.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS.
  *
- * $Id: webserver-nogui.c,v 1.3 2010/02/09 14:41:18 dak664 Exp $
  *
  */
 
diff --git a/platform/avr-raven/apps/raven-webserver/webserver-nogui.h b/platform/avr-raven/apps/raven-webserver/webserver-nogui.h
index e34692fd4a7..825dfb96fd6 100644
--- a/platform/avr-raven/apps/raven-webserver/webserver-nogui.h
+++ b/platform/avr-raven/apps/raven-webserver/webserver-nogui.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: webserver-nogui.h,v 1.1 2009/03/12 19:15:25 adamdunkels Exp $
  *
  */
 #ifndef __WEBSERVER_NOGUI_H__
diff --git a/platform/avr-raven/apps/raven-webserver/webserver.c b/platform/avr-raven/apps/raven-webserver/webserver.c
index 62923cc1b6d..f63e40a8ea1 100644
--- a/platform/avr-raven/apps/raven-webserver/webserver.c
+++ b/platform/avr-raven/apps/raven-webserver/webserver.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: webserver.c,v 1.1 2009/03/12 19:15:25 adamdunkels Exp $
  *
  */
 
diff --git a/platform/avr-raven/apps/raven-webserver/webserver.h b/platform/avr-raven/apps/raven-webserver/webserver.h
index 71c6b339ba2..fe9f255a12f 100644
--- a/platform/avr-raven/apps/raven-webserver/webserver.h
+++ b/platform/avr-raven/apps/raven-webserver/webserver.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki operating system
  *
- * $Id: webserver.h,v 1.1 2009/03/12 19:15:25 adamdunkels Exp $
  *
  */
 #ifndef __WEBSERVER_H__
diff --git a/platform/avr-ravenusb/httpd-simple-avr.c b/platform/avr-ravenusb/httpd-simple-avr.c
index a82921342be..0080b428047 100644
--- a/platform/avr-ravenusb/httpd-simple-avr.c
+++ b/platform/avr-ravenusb/httpd-simple-avr.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: httpd-simple-avr.c,v 1.8 2010/12/04 21:32:35 dak664 Exp $
  */
 
 /**
diff --git a/platform/c128/cfs/cfs-cbm-dir.c b/platform/c128/cfs/cfs-cbm-dir.c
index d72f84294b5..7ea8079d49e 100644
--- a/platform/c128/cfs/cfs-cbm-dir.c
+++ b/platform/c128/cfs/cfs-cbm-dir.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: cfs-cbm-dir.c,v 1.2 2010/10/26 18:56:39 oliverschmidt Exp $
  */
 
 #include <string.h>
diff --git a/platform/c128/contiki-conf.h b/platform/c128/contiki-conf.h
index e60f76734ba..fd6b595f409 100644
--- a/platform/c128/contiki-conf.h
+++ b/platform/c128/contiki-conf.h
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: contiki-conf.h,v 1.17 2010/10/23 13:48:06 oliverschmidt Exp $
  */
 
 #ifndef __CONTIKI_CONF_H__
diff --git a/platform/c128/contiki-main.c b/platform/c128/contiki-main.c
index 7ce943dc8c3..b0e90aaa450 100644
--- a/platform/c128/contiki-main.c
+++ b/platform/c128/contiki-main.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: contiki-main.c,v 1.10 2010/10/27 22:17:39 oliverschmidt Exp $
  */
 
 #include <string.h>
diff --git a/platform/c64/cfs/cfs-cbm-dir.c b/platform/c64/cfs/cfs-cbm-dir.c
index d72f84294b5..7ea8079d49e 100644
--- a/platform/c64/cfs/cfs-cbm-dir.c
+++ b/platform/c64/cfs/cfs-cbm-dir.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: cfs-cbm-dir.c,v 1.2 2010/10/26 18:56:39 oliverschmidt Exp $
  */
 
 #include <string.h>
diff --git a/platform/c64/contiki-conf.h b/platform/c64/contiki-conf.h
index 5d5c0ce469c..bca63d8cc60 100644
--- a/platform/c64/contiki-conf.h
+++ b/platform/c64/contiki-conf.h
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: contiki-conf.h,v 1.27 2010/10/23 13:48:06 oliverschmidt Exp $
  */
 
 #ifndef __CONTIKI_CONF_H__
diff --git a/platform/c64/contiki-main.c b/platform/c64/contiki-main.c
index dee2a72cd58..8f9de438817 100644
--- a/platform/c64/contiki-main.c
+++ b/platform/c64/contiki-main.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: contiki-main.c,v 1.25 2010/10/27 22:17:39 oliverschmidt Exp $
  */
 
 #include <string.h>
diff --git a/platform/cc2530dk/dev/slip-arch.c b/platform/cc2530dk/dev/slip-arch.c
index 1b0437494f2..f9eccbaa86c 100644
--- a/platform/cc2530dk/dev/slip-arch.c
+++ b/platform/cc2530dk/dev/slip-arch.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: slip_uart1.c,v 1.8 2008/02/03 20:59:35 adamdunkels Exp $
  */
 
 /*
diff --git a/platform/cooja/cfs/cfs-cooja.c b/platform/cooja/cfs/cfs-cooja.c
index 13bf84c9f55..0119ea5a0b6 100644
--- a/platform/cooja/cfs/cfs-cooja.c
+++ b/platform/cooja/cfs/cfs-cooja.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: cfs-cooja.c,v 1.12 2010/11/15 21:44:37 adamdunkels Exp $
  */
 #include <string.h>
 #include "lib/simEnvChange.h"
diff --git a/platform/cooja/contiki-conf.h b/platform/cooja/contiki-conf.h
index cc6bd0896be..3c6154ed2d2 100644
--- a/platform/cooja/contiki-conf.h
+++ b/platform/cooja/contiki-conf.h
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: contiki-conf.h,v 1.17 2010/03/31 10:22:33 fros4943 Exp $
  *
  */
 
diff --git a/platform/cooja/contiki-cooja-main.c b/platform/cooja/contiki-cooja-main.c
index 9cdec2b8bd3..d5a2db42e83 100644
--- a/platform/cooja/contiki-cooja-main.c
+++ b/platform/cooja/contiki-cooja-main.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: contiki-cooja-main.c,v 1.9 2010/09/24 12:59:06 fros4943 Exp $
  */
 
 /**
diff --git a/platform/cooja/dev/beep.c b/platform/cooja/dev/beep.c
index 2ef56b42bf0..e479998efed 100644
--- a/platform/cooja/dev/beep.c
+++ b/platform/cooja/dev/beep.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: beep.c,v 1.1 2006/08/21 12:11:18 fros4943 Exp $
  */
 
 #include "dev/beep.h"
diff --git a/platform/cooja/dev/beep.h b/platform/cooja/dev/beep.h
index fbe6bcab898..31647b9a104 100644
--- a/platform/cooja/dev/beep.h
+++ b/platform/cooja/dev/beep.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: beep.h,v 1.1 2006/08/21 12:11:19 fros4943 Exp $
  */
 
 #ifndef __BEEP_H__
diff --git a/platform/cooja/dev/button-sensor.c b/platform/cooja/dev/button-sensor.c
index 8d9b343be3c..90f2dd26cdf 100644
--- a/platform/cooja/dev/button-sensor.c
+++ b/platform/cooja/dev/button-sensor.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: button-sensor.c,v 1.6 2010/01/14 19:12:31 nifi Exp $
  */
 
 #include "lib/sensors.h"
diff --git a/platform/cooja/dev/button-sensor.h b/platform/cooja/dev/button-sensor.h
index 89749e6b0a9..11d0cbcbb70 100644
--- a/platform/cooja/dev/button-sensor.h
+++ b/platform/cooja/dev/button-sensor.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: button-sensor.h,v 1.2 2007/03/20 20:09:17 adamdunkels Exp $
  */
 
 #ifndef __BUTTON_SENSOR_H__
diff --git a/platform/cooja/dev/cooja-radio.c b/platform/cooja/dev/cooja-radio.c
index ca955229147..e7cdce6dd50 100644
--- a/platform/cooja/dev/cooja-radio.c
+++ b/platform/cooja/dev/cooja-radio.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: cooja-radio.c,v 1.15 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 #include <stdio.h>
diff --git a/platform/cooja/dev/cooja-radio.h b/platform/cooja/dev/cooja-radio.h
index 413e21e7e94..7c3f5e31f50 100644
--- a/platform/cooja/dev/cooja-radio.h
+++ b/platform/cooja/dev/cooja-radio.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: cooja-radio.h,v 1.6 2010/03/09 08:11:05 fros4943 Exp $
  */
 
 #ifndef __COOJA_RADIO_H__
diff --git a/platform/cooja/dev/ip.c b/platform/cooja/dev/ip.c
index 917e4a6b7b6..b05af08a08f 100644
--- a/platform/cooja/dev/ip.c
+++ b/platform/cooja/dev/ip.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ip.c,v 1.2 2009/04/01 18:11:48 fros4943 Exp $
  */
 
 #include "dev/ip.h"
diff --git a/platform/cooja/dev/ip.h b/platform/cooja/dev/ip.h
index f9b33ca357a..8a03223fcba 100644
--- a/platform/cooja/dev/ip.h
+++ b/platform/cooja/dev/ip.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ip.h,v 1.1 2006/08/21 12:11:19 fros4943 Exp $
  */
 
 #ifndef __IP_H__
diff --git a/platform/cooja/dev/leds-arch.c b/platform/cooja/dev/leds-arch.c
index 12344309ce1..db91e9baa53 100644
--- a/platform/cooja/dev/leds-arch.c
+++ b/platform/cooja/dev/leds-arch.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: leds-arch.c,v 1.1 2006/08/21 12:11:20 fros4943 Exp $
  */
 
 #include "dev/leds.h"
diff --git a/platform/cooja/dev/moteid.c b/platform/cooja/dev/moteid.c
index 36a67b1fc4d..02321563f69 100644
--- a/platform/cooja/dev/moteid.c
+++ b/platform/cooja/dev/moteid.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: moteid.c,v 1.3 2010/05/02 09:42:15 fros4943 Exp $
  */
 
 #include "dev/moteid.h"
diff --git a/platform/cooja/dev/moteid.h b/platform/cooja/dev/moteid.h
index 2d9f2c6c657..95def929a44 100644
--- a/platform/cooja/dev/moteid.h
+++ b/platform/cooja/dev/moteid.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: moteid.h,v 1.1 2006/08/21 12:11:19 fros4943 Exp $
  */
 
 #ifndef __MOTEID_H__
diff --git a/platform/cooja/dev/pir-sensor.c b/platform/cooja/dev/pir-sensor.c
index 39dc4bbcd75..8e3b4e045c1 100644
--- a/platform/cooja/dev/pir-sensor.c
+++ b/platform/cooja/dev/pir-sensor.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: pir-sensor.c,v 1.2 2010/01/14 19:12:31 nifi Exp $
  */
 
 #include "dev/pir-sensor.h"
diff --git a/platform/cooja/dev/pir-sensor.h b/platform/cooja/dev/pir-sensor.h
index bb27d848892..a88fd7849bc 100644
--- a/platform/cooja/dev/pir-sensor.h
+++ b/platform/cooja/dev/pir-sensor.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: pir-sensor.h,v 1.2 2010/01/14 19:12:31 nifi Exp $
  */
 
 #ifndef __PIR_H__
diff --git a/platform/cooja/dev/rs232.c b/platform/cooja/dev/rs232.c
index 3eb25b1a9de..a52b9a1306d 100644
--- a/platform/cooja/dev/rs232.c
+++ b/platform/cooja/dev/rs232.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: rs232.c,v 1.4 2009/04/23 09:02:06 fros4943 Exp $
  */
 
 #include "lib/sensors.h"
diff --git a/platform/cooja/dev/rs232.h b/platform/cooja/dev/rs232.h
index 166243a24f2..0c52fc355ab 100644
--- a/platform/cooja/dev/rs232.h
+++ b/platform/cooja/dev/rs232.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: rs232.h,v 1.1 2006/08/21 12:11:19 fros4943 Exp $
  */
 
 /** \addtogroup esb
diff --git a/platform/cooja/dev/vib-sensor.c b/platform/cooja/dev/vib-sensor.c
index c94512dcaa5..56d915d61d5 100644
--- a/platform/cooja/dev/vib-sensor.c
+++ b/platform/cooja/dev/vib-sensor.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: vib-sensor.c,v 1.2 2010/01/14 19:12:31 nifi Exp $
  */
 
 #include "dev/vib-sensor.h"
diff --git a/platform/cooja/dev/vib-sensor.h b/platform/cooja/dev/vib-sensor.h
index b6ea09f0725..79acf5dff13 100644
--- a/platform/cooja/dev/vib-sensor.h
+++ b/platform/cooja/dev/vib-sensor.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: vib-sensor.h,v 1.3 2010/01/14 20:02:55 nifi Exp $
  */
 
 #ifndef __VIB_H__
diff --git a/platform/cooja/dev/watchdog.c b/platform/cooja/dev/watchdog.c
index 7cca370bc78..a30fc0fc870 100644
--- a/platform/cooja/dev/watchdog.c
+++ b/platform/cooja/dev/watchdog.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: watchdog.c,v 1.1 2010/03/23 12:07:03 adamdunkels Exp $
  */
 
  /* Dummy watchdog routines for the Raven 1284p */
diff --git a/platform/cooja/lib/simEnvChange.c b/platform/cooja/lib/simEnvChange.c
index 6d40a2ed90a..c9fbd438f7c 100644
--- a/platform/cooja/lib/simEnvChange.c
+++ b/platform/cooja/lib/simEnvChange.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: simEnvChange.c,v 1.9 2010/03/09 08:14:31 fros4943 Exp $
  */
 
 #include "lib/simEnvChange.h"
diff --git a/platform/cooja/lib/simEnvChange.h b/platform/cooja/lib/simEnvChange.h
index cb1cf3ef0fe..b9f700d71ba 100644
--- a/platform/cooja/lib/simEnvChange.h
+++ b/platform/cooja/lib/simEnvChange.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: simEnvChange.h,v 1.9 2010/03/09 08:14:31 fros4943 Exp $
  */
 
 #ifndef __SIMENVCHANGE_H__
diff --git a/platform/cooja/mtarch.c b/platform/cooja/mtarch.c
index 6e30f44a846..832043ac7fb 100644
--- a/platform/cooja/mtarch.c
+++ b/platform/cooja/mtarch.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: mtarch.c,v 1.1 2007/05/19 14:47:17 fros4943 Exp $
  */
 
 #include "mtarch.h"
diff --git a/platform/cooja/mtarch.h b/platform/cooja/mtarch.h
index c094c62b4d3..04e6817a473 100644
--- a/platform/cooja/mtarch.h
+++ b/platform/cooja/mtarch.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  * 
- * $Id: mtarch.h,v 1.1 2007/05/19 14:47:17 fros4943 Exp $
  */
 
 #ifndef __MTARCH_H__
diff --git a/platform/cooja/net/init-net.h b/platform/cooja/net/init-net.h
index 8ae2c34c924..8b67708f004 100644
--- a/platform/cooja/net/init-net.h
+++ b/platform/cooja/net/init-net.h
@@ -29,7 +29,6 @@
  * This file is part of the Configurable Sensor Network Application
  * Architecture for sensor nodes running the Contiki operating system.
  *
- * $Id: init-net.h,v 1.1 2007/05/18 13:49:15 fros4943 Exp $
  *
  */
 
diff --git a/platform/cooja/net/radio-uip-uaodv.c b/platform/cooja/net/radio-uip-uaodv.c
index 1e4546fbd1b..05cecd22554 100644
--- a/platform/cooja/net/radio-uip-uaodv.c
+++ b/platform/cooja/net/radio-uip-uaodv.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: radio-uip-uaodv.c,v 1.10 2010/10/19 18:29:05 adamdunkels Exp $
  */
 
 #include "radio-uip-uaodv.h"
diff --git a/platform/cooja/net/radio-uip-uaodv.h b/platform/cooja/net/radio-uip-uaodv.h
index 3aa3ace1c18..c5471365fd5 100644
--- a/platform/cooja/net/radio-uip-uaodv.h
+++ b/platform/cooja/net/radio-uip-uaodv.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: radio-uip-uaodv.h,v 1.1 2007/05/19 14:25:43 fros4943 Exp $
  */
 
 #ifndef __RADIO_UIP_UAODV_H__
diff --git a/platform/cooja/net/uip-driver.c b/platform/cooja/net/uip-driver.c
index bfca5cdbe61..7a3d3267d01 100644
--- a/platform/cooja/net/uip-driver.c
+++ b/platform/cooja/net/uip-driver.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uip-driver.c,v 1.2 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
diff --git a/platform/cooja/net/uip-driver.h b/platform/cooja/net/uip-driver.h
index a9f7e016cb9..c067f647bf8 100644
--- a/platform/cooja/net/uip-driver.h
+++ b/platform/cooja/net/uip-driver.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uip-driver.h,v 1.1 2010/03/10 12:15:52 fros4943 Exp $
  */
 
 /**
diff --git a/platform/cooja/netstack-conf-example.h b/platform/cooja/netstack-conf-example.h
index d2e53c79e29..261c8ffd2e6 100644
--- a/platform/cooja/netstack-conf-example.h
+++ b/platform/cooja/netstack-conf-example.h
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: netstack-conf-example.h,v 1.1 2010/03/10 07:35:49 fros4943 Exp $
  *
  */
 
diff --git a/platform/cooja/node-id.h b/platform/cooja/node-id.h
index f671ef91c8c..ccff77a0733 100644
--- a/platform/cooja/node-id.h
+++ b/platform/cooja/node-id.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: node-id.h,v 1.2 2007/11/25 22:48:35 fros4943 Exp $
  * 
  */
 
diff --git a/platform/cooja/rtimer-arch.c b/platform/cooja/rtimer-arch.c
index 6d16e561e16..dff66fdc706 100644
--- a/platform/cooja/rtimer-arch.c
+++ b/platform/cooja/rtimer-arch.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rtimer-arch.c,v 1.4 2010/03/23 13:13:17 fros4943 Exp $
  */
 
 #include <signal.h>
diff --git a/platform/cooja/rtimer-arch.h b/platform/cooja/rtimer-arch.h
index 4c5cbd27c09..65acb38567a 100644
--- a/platform/cooja/rtimer-arch.h
+++ b/platform/cooja/rtimer-arch.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rtimer-arch.h,v 1.3 2010/03/23 13:13:17 fros4943 Exp $
  */
 
 #ifndef __RTIMER_ARCH_H__
diff --git a/platform/cooja/sys/clock.c b/platform/cooja/sys/clock.c
index 5c5ca390017..381315d417d 100644
--- a/platform/cooja/sys/clock.c
+++ b/platform/cooja/sys/clock.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: clock.c,v 1.4 2009/09/04 13:59:37 nvt-se Exp $
  */
 
 #include "contiki-conf.h"
diff --git a/platform/cooja/sys/cooja_mt.c b/platform/cooja/sys/cooja_mt.c
index 434a5b83c66..3ccc5c169ae 100644
--- a/platform/cooja/sys/cooja_mt.c
+++ b/platform/cooja/sys/cooja_mt.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: cooja_mt.c,v 1.2 2009/09/03 12:57:57 nvt-se Exp $
  */
 /*
  * This file is ripped from mt.c of the Contiki Multi-threading library.
diff --git a/platform/cooja/sys/cooja_mt.h b/platform/cooja/sys/cooja_mt.h
index 177684791ef..7316b41e35d 100644
--- a/platform/cooja/sys/cooja_mt.h
+++ b/platform/cooja/sys/cooja_mt.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: cooja_mt.h,v 1.1 2006/09/29 14:32:38 fros4943 Exp $
  */
 /*
  * This file is ripped from mt.h of the Contiki Multi-threading library.
diff --git a/platform/cooja/sys/cooja_mtarch.c b/platform/cooja/sys/cooja_mtarch.c
index 477b9cea545..8d73ad0882a 100644
--- a/platform/cooja/sys/cooja_mtarch.c
+++ b/platform/cooja/sys/cooja_mtarch.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: cooja_mtarch.c,v 1.7 2009/03/13 14:42:06 fros4943 Exp $
  */
 
 #include <stddef.h>
diff --git a/platform/cooja/sys/log.c b/platform/cooja/sys/log.c
index ee2224921ee..7f6a836e354 100644
--- a/platform/cooja/sys/log.c
+++ b/platform/cooja/sys/log.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: log.c,v 1.8 2010/01/25 12:34:05 fros4943 Exp $
  */
 
 #include <stdio.h>
diff --git a/platform/cooja/testapps/hello-world.c b/platform/cooja/testapps/hello-world.c
index 47e17440a7f..6cfe9f7f154 100644
--- a/platform/cooja/testapps/hello-world.c
+++ b/platform/cooja/testapps/hello-world.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: hello-world.c,v 1.2 2008/10/03 09:39:38 fros4943 Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/cooja/testapps/testbutton.c b/platform/cooja/testapps/testbutton.c
index efb75e3a2b6..099ce57577d 100644
--- a/platform/cooja/testapps/testbutton.c
+++ b/platform/cooja/testapps/testbutton.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: testbutton.c,v 1.3 2010/01/14 19:19:50 nifi Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/cooja/testapps/testcfs.c b/platform/cooja/testapps/testcfs.c
index d0248a58c65..9c6ffa9f46b 100644
--- a/platform/cooja/testapps/testcfs.c
+++ b/platform/cooja/testapps/testcfs.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: testcfs.c,v 1.3 2009/03/02 09:44:07 fros4943 Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/cooja/testapps/testctimer.c b/platform/cooja/testapps/testctimer.c
index 2929775cf0f..2f2ed8d4c01 100644
--- a/platform/cooja/testapps/testctimer.c
+++ b/platform/cooja/testapps/testctimer.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: testctimer.c,v 1.3 2010/06/14 18:58:45 adamdunkels Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/cooja/testapps/testetimer.c b/platform/cooja/testapps/testetimer.c
index a1e28a553d4..d486995d4f4 100644
--- a/platform/cooja/testapps/testetimer.c
+++ b/platform/cooja/testapps/testetimer.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: testetimer.c,v 1.2 2008/10/03 09:39:38 fros4943 Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/cooja/testapps/testsensors.c b/platform/cooja/testapps/testsensors.c
index 0a0b6167ea9..6860084c71f 100644
--- a/platform/cooja/testapps/testsensors.c
+++ b/platform/cooja/testapps/testsensors.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: testsensors.c,v 1.4 2010/03/10 07:35:09 fros4943 Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/cooja/testapps/testserial.c b/platform/cooja/testapps/testserial.c
index ad8135484ca..d5604b6fc2d 100644
--- a/platform/cooja/testapps/testserial.c
+++ b/platform/cooja/testapps/testserial.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: testserial.c,v 1.6 2009/04/01 13:46:16 fros4943 Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/cooja/testapps/testuaodv.c b/platform/cooja/testapps/testuaodv.c
index edd4593db4b..be7a0fa2d8e 100644
--- a/platform/cooja/testapps/testuaodv.c
+++ b/platform/cooja/testapps/testuaodv.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: testuaodv.c,v 1.4 2010/10/19 18:29:05 adamdunkels Exp $
  */
 
 #include <stdlib.h>
diff --git a/platform/cooja/testapps/testuip.c b/platform/cooja/testapps/testuip.c
index 95d931420b8..aa92d65ed78 100644
--- a/platform/cooja/testapps/testuip.c
+++ b/platform/cooja/testapps/testuip.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: testuip.c,v 1.4 2010/01/14 19:19:50 nifi Exp $
  */
 
 #include <stdlib.h>
diff --git a/platform/esb/apps/beeper.c b/platform/esb/apps/beeper.c
index 7fe46c942df..c0e7b99270d 100644
--- a/platform/esb/apps/beeper.c
+++ b/platform/esb/apps/beeper.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: beeper.c,v 1.3 2010/01/15 10:37:04 nifi Exp $
  */
 #include "contiki-esb.h"
 
diff --git a/platform/esb/apps/burn-nodeid.c b/platform/esb/apps/burn-nodeid.c
index 0ed6b7ff6c0..99afb0a9699 100644
--- a/platform/esb/apps/burn-nodeid.c
+++ b/platform/esb/apps/burn-nodeid.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: burn-nodeid.c,v 1.3 2007/11/28 19:53:09 nifi Exp $
  */
 
 /**
diff --git a/platform/esb/apps/fader.c b/platform/esb/apps/fader.c
index 16b2d0d126b..78e471e9b0b 100644
--- a/platform/esb/apps/fader.c
+++ b/platform/esb/apps/fader.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: fader.c,v 1.1 2006/06/18 07:48:48 adamdunkels Exp $
  */
 
 #include "contiki-esb.h"
diff --git a/platform/esb/apps/fader.h b/platform/esb/apps/fader.h
index afe65ee98c4..95c82dde2a2 100644
--- a/platform/esb/apps/fader.h
+++ b/platform/esb/apps/fader.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: fader.h,v 1.1 2006/06/18 07:48:48 adamdunkels Exp $
  */
 #ifndef __FADER_H__
 #define __FADER_H__
diff --git a/platform/esb/apps/helloworld.c b/platform/esb/apps/helloworld.c
index 705ce5b0f6b..ffc18a87f9b 100644
--- a/platform/esb/apps/helloworld.c
+++ b/platform/esb/apps/helloworld.c
@@ -29,7 +29,6 @@
  * This file is part of the Configurable Sensor Network Application
  * Architecture for sensor nodes running the Contiki operating system.
  *
- * $Id: helloworld.c,v 1.1 2006/06/18 07:48:48 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/esb/apps/pinger.c b/platform/esb/apps/pinger.c
index 1dd9205857f..4e6a807d1de 100644
--- a/platform/esb/apps/pinger.c
+++ b/platform/esb/apps/pinger.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: pinger.c,v 1.3 2010/10/19 18:29:05 adamdunkels Exp $
  */
 
 #include "contiki-esb.h"
diff --git a/platform/esb/apps/pinger.h b/platform/esb/apps/pinger.h
index b3fee4370c5..7af1b744085 100644
--- a/platform/esb/apps/pinger.h
+++ b/platform/esb/apps/pinger.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: pinger.h,v 1.1 2006/06/18 07:48:48 adamdunkels Exp $
  */
 #ifndef __PINGER_H__
 #define __PINGER_H__
diff --git a/platform/esb/apps/radio-sniffer.c b/platform/esb/apps/radio-sniffer.c
index 41d7c85ec96..8bd4b93d11a 100644
--- a/platform/esb/apps/radio-sniffer.c
+++ b/platform/esb/apps/radio-sniffer.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: radio-sniffer.c,v 1.3 2007/08/07 11:20:11 nifi Exp $
  */
 
 /**
diff --git a/platform/esb/apps/radio-sniffer.h b/platform/esb/apps/radio-sniffer.h
index 9cb57460ff9..93d9adc6659 100644
--- a/platform/esb/apps/radio-sniffer.h
+++ b/platform/esb/apps/radio-sniffer.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: radio-sniffer.h,v 1.1 2006/10/09 10:08:40 adamdunkels Exp $
  */
 
 /**
diff --git a/platform/esb/apps/radio-test.c b/platform/esb/apps/radio-test.c
index 32eecddebef..ae03e1bdc1a 100644
--- a/platform/esb/apps/radio-test.c
+++ b/platform/esb/apps/radio-test.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: radio-test.c,v 1.3 2010/10/19 18:29:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/esb/apps/sensor-output.c b/platform/esb/apps/sensor-output.c
index fa4b79d75d4..632b604b358 100644
--- a/platform/esb/apps/sensor-output.c
+++ b/platform/esb/apps/sensor-output.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: sensor-output.c,v 1.4 2010/01/15 10:37:04 nifi Exp $
  */
 #include "contiki-esb.h"
 
diff --git a/platform/esb/apps/sensor-output.h b/platform/esb/apps/sensor-output.h
index 32f4cb82950..5c31d2d6260 100644
--- a/platform/esb/apps/sensor-output.h
+++ b/platform/esb/apps/sensor-output.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: sensor-output.h,v 1.1 2006/06/18 07:48:48 adamdunkels Exp $
  */
 #ifndef __SENSOR_OUTPUT_H__
 #define __SENSOR_OUTPUT_H__
diff --git a/platform/esb/apps/test-receiver.c b/platform/esb/apps/test-receiver.c
index d8d921c00dc..5f315a715fb 100644
--- a/platform/esb/apps/test-receiver.c
+++ b/platform/esb/apps/test-receiver.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: test-receiver.c,v 1.2 2010/10/19 18:29:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/esb/apps/test-sender.c b/platform/esb/apps/test-sender.c
index 57fa0c2e987..7881c27049c 100644
--- a/platform/esb/apps/test-sender.c
+++ b/platform/esb/apps/test-sender.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: test-sender.c,v 1.2 2010/10/19 18:29:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/esb/contiki-esb-default-init-apps.c b/platform/esb/contiki-esb-default-init-apps.c
index 0489d011c40..94ac86ad4c0 100644
--- a/platform/esb/contiki-esb-default-init-apps.c
+++ b/platform/esb/contiki-esb-default-init-apps.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: contiki-esb-default-init-apps.c,v 1.1 2006/06/17 22:41:27 adamdunkels Exp $
  */
 void
 init_apps(void)
diff --git a/platform/esb/contiki-esb-default-init-lowlevel.c b/platform/esb/contiki-esb-default-init-lowlevel.c
index 24eaf6ca290..4a34e543929 100644
--- a/platform/esb/contiki-esb-default-init-lowlevel.c
+++ b/platform/esb/contiki-esb-default-init-lowlevel.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: contiki-esb-default-init-lowlevel.c,v 1.2 2006/10/06 07:49:31 adamdunkels Exp $
  */
 #include "contiki-esb.h"
 #include "dev/esb-sensors.h"
diff --git a/platform/esb/contiki-esb-main.c b/platform/esb/contiki-esb-main.c
index d052f453b10..718b99c2a8f 100644
--- a/platform/esb/contiki-esb-main.c
+++ b/platform/esb/contiki-esb-main.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: contiki-esb-main.c,v 1.19 2010/06/21 15:15:12 nifi Exp $
  */
 
 #include <stdio.h>
diff --git a/platform/esb/contiki-esb.h b/platform/esb/contiki-esb.h
index f16faf18d13..0101318efa6 100644
--- a/platform/esb/contiki-esb.h
+++ b/platform/esb/contiki-esb.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: contiki-esb.h,v 1.6 2010/03/02 22:40:39 nifi Exp $
  */
 #ifndef __CONTIKI_ESB_H__
 #define __CONTIKI_ESB_H__
diff --git a/platform/esb/core.c b/platform/esb/core.c
index abc55fcc23c..069edad02ec 100644
--- a/platform/esb/core.c
+++ b/platform/esb/core.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: core.c,v 1.1 2006/06/17 22:41:27 adamdunkels Exp $
  */
 #include "contiki-esb.h"
 #include "codeprop-tmp.h"
diff --git a/platform/esb/dev/battery-sensor.c b/platform/esb/dev/battery-sensor.c
index 09a15543ab5..3a807b98c51 100644
--- a/platform/esb/dev/battery-sensor.c
+++ b/platform/esb/dev/battery-sensor.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: battery-sensor.c,v 1.6 2010/02/08 00:00:45 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/esb/dev/battery-sensor.h b/platform/esb/dev/battery-sensor.h
index 122c275ee45..12c8fdc84c6 100644
--- a/platform/esb/dev/battery-sensor.h
+++ b/platform/esb/dev/battery-sensor.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: battery-sensor.h,v 1.3 2006/06/18 08:07:30 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/esb/dev/beep.c b/platform/esb/dev/beep.c
index f16e2a90c50..80256cc9ef6 100644
--- a/platform/esb/dev/beep.c
+++ b/platform/esb/dev/beep.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: beep.c,v 1.4 2006/07/07 06:36:38 nifi Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/esb/dev/beep.h b/platform/esb/dev/beep.h
index 0d3652a7b10..8f17a7f6c11 100644
--- a/platform/esb/dev/beep.h
+++ b/platform/esb/dev/beep.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: beep.h,v 1.4 2006/07/07 06:36:38 nifi Exp $
  */
 /**
  * \addtogroup esb
diff --git a/platform/esb/dev/button-sensor.c b/platform/esb/dev/button-sensor.c
index eb6a81f8a21..ccd62c21f93 100644
--- a/platform/esb/dev/button-sensor.c
+++ b/platform/esb/dev/button-sensor.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: button-sensor.c,v 1.5 2010/02/08 00:00:45 nifi Exp $
  */
 
 #include "dev/button-sensor.h"
diff --git a/platform/esb/dev/ctsrts-sensor.c b/platform/esb/dev/ctsrts-sensor.c
index 22c82e93063..e01afe6e76f 100644
--- a/platform/esb/dev/ctsrts-sensor.c
+++ b/platform/esb/dev/ctsrts-sensor.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: ctsrts-sensor.c,v 1.4 2010/02/08 00:00:45 nifi Exp $
  */
 
 /**
diff --git a/platform/esb/dev/ctsrts-sensor.h b/platform/esb/dev/ctsrts-sensor.h
index 5690fef39ce..798d1a69f3b 100644
--- a/platform/esb/dev/ctsrts-sensor.h
+++ b/platform/esb/dev/ctsrts-sensor.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: ctsrts-sensor.h,v 1.2 2010/01/14 17:39:35 nifi Exp $
  */
 
 /**
diff --git a/platform/esb/dev/ds1629.h b/platform/esb/dev/ds1629.h
index d5472a898a8..a0120fb7eca 100644
--- a/platform/esb/dev/ds1629.h
+++ b/platform/esb/dev/ds1629.h
@@ -29,7 +29,6 @@
  * This file is part of the Configurable Sensor Network Application
  * Architecture for sensor nodes running the Contiki operating system.
  *
- * $Id: ds1629.h,v 1.1 2006/06/18 07:49:33 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/esb/dev/eeprom.c b/platform/esb/dev/eeprom.c
index e7d20d7f9b2..fb63f4a9cc9 100644
--- a/platform/esb/dev/eeprom.c
+++ b/platform/esb/dev/eeprom.c
@@ -29,7 +29,6 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $Id: eeprom.c,v 1.1 2006/06/18 07:49:33 adamdunkels Exp $
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
diff --git a/platform/esb/dev/esb-sensors.c b/platform/esb/dev/esb-sensors.c
index 4ce1e05e46c..01901dec167 100644
--- a/platform/esb/dev/esb-sensors.c
+++ b/platform/esb/dev/esb-sensors.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: esb-sensors.c,v 1.3 2010/01/14 17:39:35 nifi Exp $
  */
 
 /**
diff --git a/platform/esb/dev/esb-sensors.h b/platform/esb/dev/esb-sensors.h
index 03ad8d9e580..599fe65a0f5 100644
--- a/platform/esb/dev/esb-sensors.h
+++ b/platform/esb/dev/esb-sensors.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: esb-sensors.h,v 1.1 2006/06/18 07:49:33 adamdunkels Exp $
  */
 
 /**
diff --git a/platform/esb/dev/ir.h b/platform/esb/dev/ir.h
index 12c56be969d..f806c1d5542 100644
--- a/platform/esb/dev/ir.h
+++ b/platform/esb/dev/ir.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: ir.h,v 1.1 2006/06/18 07:49:33 adamdunkels Exp $
  */
 #ifndef __IR_H__
 #define __IR_H__
diff --git a/platform/esb/dev/irq.c b/platform/esb/dev/irq.c
index bf5ef664964..20823f27b78 100644
--- a/platform/esb/dev/irq.c
+++ b/platform/esb/dev/irq.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: irq.c,v 1.4 2010/01/14 17:39:35 nifi Exp $
  */
 #include "contiki.h"
 #include "lib/sensors.h"
diff --git a/platform/esb/dev/irq.h b/platform/esb/dev/irq.h
index 71e6db6e6a7..0f1b94132f8 100644
--- a/platform/esb/dev/irq.h
+++ b/platform/esb/dev/irq.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: irq.h,v 1.3 2010/01/14 17:39:35 nifi Exp $
  */
 #ifndef __IRQ_H__
 #define __IRQ_H__
diff --git a/platform/esb/dev/pir-sensor.c b/platform/esb/dev/pir-sensor.c
index 9ebe9a2acb9..1e9b1e977ce 100644
--- a/platform/esb/dev/pir-sensor.c
+++ b/platform/esb/dev/pir-sensor.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: pir-sensor.c,v 1.4 2010/02/08 00:00:45 nifi Exp $
  */
 
 #include "dev/pir-sensor.h"
diff --git a/platform/esb/dev/pir-sensor.h b/platform/esb/dev/pir-sensor.h
index be0a56eab6e..fb32e256d85 100644
--- a/platform/esb/dev/pir-sensor.h
+++ b/platform/esb/dev/pir-sensor.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: pir-sensor.h,v 1.3 2010/01/14 17:39:35 nifi Exp $
  */
 #ifndef __PIR_SENSOR_H__
 #define __PIR_SENSOR_H__
diff --git a/platform/esb/dev/radio-sensor.c b/platform/esb/dev/radio-sensor.c
index 351a6f65a22..185bd4218ef 100644
--- a/platform/esb/dev/radio-sensor.c
+++ b/platform/esb/dev/radio-sensor.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: radio-sensor.c,v 1.5 2010/02/08 00:00:45 nifi Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/esb/dev/rs232-putchar.c b/platform/esb/dev/rs232-putchar.c
index 98830a26bb7..fae8e9adc98 100644
--- a/platform/esb/dev/rs232-putchar.c
+++ b/platform/esb/dev/rs232-putchar.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: rs232-putchar.c,v 1.1 2006/10/09 09:19:02 nifi Exp $
  */
 
 #include "dev/rs232.h"
diff --git a/platform/esb/dev/rs232.c b/platform/esb/dev/rs232.c
index 239ee31813c..8f1ed2ffa79 100644
--- a/platform/esb/dev/rs232.c
+++ b/platform/esb/dev/rs232.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: rs232.c,v 1.3 2007/08/07 11:06:14 nifi Exp $
  */
 
 /** \addtogroup esbrs232
diff --git a/platform/esb/dev/rs232.h b/platform/esb/dev/rs232.h
index 2bb7cbd7ce1..6f7c0383a90 100644
--- a/platform/esb/dev/rs232.h
+++ b/platform/esb/dev/rs232.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: rs232.h,v 1.2 2007/03/25 17:20:43 adamdunkels Exp $
  */
 
 /** \addtogroup esb
diff --git a/platform/esb/dev/sound-sensor.c b/platform/esb/dev/sound-sensor.c
index 5fc2fa822e4..6ac1347543a 100644
--- a/platform/esb/dev/sound-sensor.c
+++ b/platform/esb/dev/sound-sensor.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: sound-sensor.c,v 1.5 2010/02/08 00:00:45 nifi Exp $
  */
 #include "contiki.h"
 #include "dev/sound-sensor.h"
diff --git a/platform/esb/dev/sound-sensor.h b/platform/esb/dev/sound-sensor.h
index 4a63b453253..48d4e27cd24 100644
--- a/platform/esb/dev/sound-sensor.h
+++ b/platform/esb/dev/sound-sensor.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: sound-sensor.h,v 1.3 2010/01/14 17:39:35 nifi Exp $
  */
 #ifndef __SOUND_SENSOR_H__
 #define __SOUND_SENSOR_H__
diff --git a/platform/esb/dev/temperature-sensor.c b/platform/esb/dev/temperature-sensor.c
index ab21bb7edd6..9bb1ff5328d 100644
--- a/platform/esb/dev/temperature-sensor.c
+++ b/platform/esb/dev/temperature-sensor.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: temperature-sensor.c,v 1.3 2010/02/08 00:00:45 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/esb/dev/temperature-sensor.h b/platform/esb/dev/temperature-sensor.h
index 4b76ce4bc2b..6aa37c42eda 100644
--- a/platform/esb/dev/temperature-sensor.h
+++ b/platform/esb/dev/temperature-sensor.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: temperature-sensor.h,v 1.1 2006/06/18 07:49:33 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/esb/dev/tr1001-gcr.c b/platform/esb/dev/tr1001-gcr.c
index 4defcc9bfa2..d751babf255 100644
--- a/platform/esb/dev/tr1001-gcr.c
+++ b/platform/esb/dev/tr1001-gcr.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: tr1001-gcr.c,v 1.15 2010/03/02 22:40:39 nifi Exp $
  */
 /**
  * \addtogroup esb
diff --git a/platform/esb/dev/tr1001.c b/platform/esb/dev/tr1001.c
index de6ded2f1fd..5bee9515fa8 100644
--- a/platform/esb/dev/tr1001.c
+++ b/platform/esb/dev/tr1001.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: tr1001.c,v 1.13 2010/03/02 22:40:39 nifi Exp $
  */
 /**
  * \addtogroup esb
diff --git a/platform/esb/dev/tr1001.h b/platform/esb/dev/tr1001.h
index a775684d60f..f9421b27efb 100644
--- a/platform/esb/dev/tr1001.h
+++ b/platform/esb/dev/tr1001.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: tr1001.h,v 1.9 2010/03/02 22:40:39 nifi Exp $
  */
 #ifndef __TR1001_H__
 #define __TR1001_H__
diff --git a/platform/esb/dev/vib-sensor.c b/platform/esb/dev/vib-sensor.c
index 6564d0009c0..95a29da60e1 100644
--- a/platform/esb/dev/vib-sensor.c
+++ b/platform/esb/dev/vib-sensor.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: vib-sensor.c,v 1.5 2010/02/08 00:00:45 nifi Exp $
  */
 
 #include "dev/vib-sensor.h"
diff --git a/platform/esb/dev/vib-sensor.h b/platform/esb/dev/vib-sensor.h
index 6eb283c6a93..53cf70b5618 100644
--- a/platform/esb/dev/vib-sensor.h
+++ b/platform/esb/dev/vib-sensor.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: vib-sensor.h,v 1.3 2010/01/14 17:39:35 nifi Exp $
  */
 #ifndef __VIB_SENSOR_H__
 #define __VIB_SENSOR_H__
diff --git a/platform/esb/loader/loader-arch.h b/platform/esb/loader/loader-arch.h
index 20e6d691f04..260062d5a87 100644
--- a/platform/esb/loader/loader-arch.h
+++ b/platform/esb/loader/loader-arch.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: loader-arch.h,v 1.1 2006/06/21 13:39:11 nifi Exp $
  */
 #ifndef __LOADER_ARCH_H__
 #define __LOADER_ARCH_H__
diff --git a/platform/esb/net/uip-driver.c b/platform/esb/net/uip-driver.c
index 6b4efdf7e0f..27dac8703a2 100644
--- a/platform/esb/net/uip-driver.c
+++ b/platform/esb/net/uip-driver.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uip-driver.c,v 1.2 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
diff --git a/platform/esb/net/uip-driver.h b/platform/esb/net/uip-driver.h
index a0e6940206d..c067f647bf8 100644
--- a/platform/esb/net/uip-driver.h
+++ b/platform/esb/net/uip-driver.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uip-driver.h,v 1.1 2010/03/02 22:40:39 nifi Exp $
  */
 
 /**
diff --git a/platform/esb/node-id.c b/platform/esb/node-id.c
index 86f9ebc53df..4771bc42f75 100644
--- a/platform/esb/node-id.c
+++ b/platform/esb/node-id.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: node-id.c,v 1.1 2006/10/06 07:47:02 adamdunkels Exp $
  */
 
 /**
diff --git a/platform/esb/node-id.h b/platform/esb/node-id.h
index 6784939e4b6..2ee66888127 100644
--- a/platform/esb/node-id.h
+++ b/platform/esb/node-id.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: node-id.h,v 1.2 2006/10/06 07:47:03 adamdunkels Exp $
  */
 
 #ifndef __NODE_ID_H__
diff --git a/platform/exp5438/blink.c b/platform/exp5438/blink.c
index d9698a196f8..22dd274df15 100644
--- a/platform/exp5438/blink.c
+++ b/platform/exp5438/blink.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: blink.c,v 1.1 2008/01/23 20:34:37 adamdunkels Exp $
  */
 
 /**
diff --git a/platform/exp5438/cc2420-arch.c b/platform/exp5438/cc2420-arch.c
index 044e894dd04..b1c586b165c 100644
--- a/platform/exp5438/cc2420-arch.c
+++ b/platform/exp5438/cc2420-arch.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: cc2420-arch.c,v 1.9 2010/06/23 10:19:15 joxe Exp $
  */
 
 
diff --git a/platform/exp5438/clock.c b/platform/exp5438/clock.c
index 4d0896ba969..7a0dcaf723e 100644
--- a/platform/exp5438/clock.c
+++ b/platform/exp5438/clock.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: clock.c,v 1.25 2010/04/04 12:29:50 adamdunkels Exp $
  */
 
 #include "contiki-conf.h"
diff --git a/platform/exp5438/contiki-conf.h b/platform/exp5438/contiki-conf.h
index 050ce1c0a01..09061e81744 100644
--- a/platform/exp5438/contiki-conf.h
+++ b/platform/exp5438/contiki-conf.h
@@ -1,5 +1,4 @@
 /* -*- C -*- */
-/* @(#)$Id: contiki-conf.h,v 1.91 2011/01/09 21:04:14 adamdunkels Exp $ */
 
 #ifndef CONTIKI_CONF_H
 #define CONTIKI_CONF_H
diff --git a/platform/exp5438/contiki-exp5438-main.c b/platform/exp5438/contiki-exp5438-main.c
index f411ae6972c..0e8bda1d64e 100644
--- a/platform/exp5438/contiki-exp5438-main.c
+++ b/platform/exp5438/contiki-exp5438-main.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: contiki-z1-main.c,v 1.4 2010/08/26 22:08:11 nifi Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/exp5438/flash.c b/platform/exp5438/flash.c
index 6f9ca6da620..c11d5af2d86 100644
--- a/platform/exp5438/flash.c
+++ b/platform/exp5438/flash.c
@@ -29,7 +29,6 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $Id: flash.c,v 1.3 2010/11/15 21:52:54 adamdunkels Exp $
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
diff --git a/platform/exp5438/leds-arch.c b/platform/exp5438/leds-arch.c
index 63cd532622d..d4dda9e08de 100644
--- a/platform/exp5438/leds-arch.c
+++ b/platform/exp5438/leds-arch.c
@@ -29,7 +29,6 @@
  * This file is part of the Configurable Sensor Network Application
  * Architecture for sensor nodes running the Contiki operating system.
  *
- * $Id: leds-arch.c,v 1.1 2006/06/17 22:41:21 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/exp5438/msp430.c b/platform/exp5438/msp430.c
index 9c91aa6c2ef..838b41c1207 100644
--- a/platform/exp5438/msp430.c
+++ b/platform/exp5438/msp430.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: msp430.c,v 1.1 2010/08/24 16:26:38 joxe Exp $
  */
 #include "contiki.h"
 #include "dev/watchdog.h"
diff --git a/platform/exp5438/node-id.c b/platform/exp5438/node-id.c
index 2ec0fffd023..65fc1aac34b 100644
--- a/platform/exp5438/node-id.c
+++ b/platform/exp5438/node-id.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: node-id.c,v 1.2 2010/08/26 22:08:11 nifi Exp $
  */
 
 /**
diff --git a/platform/exp5438/node-id.h b/platform/exp5438/node-id.h
index f77bd368b72..b31fbab6b42 100644
--- a/platform/exp5438/node-id.h
+++ b/platform/exp5438/node-id.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: node-id.h,v 1.1 2010/08/24 16:26:38 joxe Exp $
  */
 
 #ifndef __NODE_ID_H__
diff --git a/platform/exp5438/platform-conf.h b/platform/exp5438/platform-conf.h
index 5d853a6863d..1574dd3506b 100644
--- a/platform/exp5438/platform-conf.h
+++ b/platform/exp5438/platform-conf.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: platform-conf.h,v 1.1 2010/08/24 16:26:38 joxe Exp $
  */
 
 /**
diff --git a/platform/exp5438/rtimer-arch.c b/platform/exp5438/rtimer-arch.c
index 24867a9f24a..242ae10f18f 100644
--- a/platform/exp5438/rtimer-arch.c
+++ b/platform/exp5438/rtimer-arch.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rtimer-arch.c,v 1.17 2010/11/27 15:27:20 nifi Exp $
  */
 
 /**
diff --git a/platform/exp5438/spix.c b/platform/exp5438/spix.c
index 4789317752c..3ca66a708ce 100644
--- a/platform/exp5438/spix.c
+++ b/platform/exp5438/spix.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: spix.c,v 1.1 2010/08/24 16:23:20 joxe Exp $
  */
 
 #include "contiki-conf.h"
diff --git a/platform/exp5438/uart1x.c b/platform/exp5438/uart1x.c
index 3c1b41b998c..bd212f27dc0 100644
--- a/platform/exp5438/uart1x.c
+++ b/platform/exp5438/uart1x.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: uart1x.c,v 1.1 2010/08/24 16:23:20 joxe Exp $
  */
 
 /*
diff --git a/platform/exp5438/watchdog.c b/platform/exp5438/watchdog.c
index 4a5b222d7d9..ec09f501c97 100644
--- a/platform/exp5438/watchdog.c
+++ b/platform/exp5438/watchdog.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: watchdog.c,v 1.12 2010/11/12 15:54:41 nifi Exp $
  */
 
 #include "contiki-conf.h"
diff --git a/platform/iris/platform-conf.h b/platform/iris/platform-conf.h
index f31087944af..4f79499bda1 100644
--- a/platform/iris/platform-conf.h
+++ b/platform/iris/platform-conf.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: platform-conf.h,v 1.1 2010/06/23 10:25:54 joxe Exp $
  */
 
 /**
diff --git a/platform/jcreate/contiki-jcreate-platform.c b/platform/jcreate/contiki-jcreate-platform.c
index 1cc2f15b6d4..8d81ceef643 100644
--- a/platform/jcreate/contiki-jcreate-platform.c
+++ b/platform/jcreate/contiki-jcreate-platform.c
@@ -30,7 +30,6 @@
  *
  * Author: Niclas Finne <nfi@sics.se>, Joakim Eriksson <joakime@sics.se>
  *
- * $Id: contiki-jcreate-platform.c,v 1.1 2010/05/03 21:57:35 nifi Exp $
  */
 
 #include "dev/battery-sensor.h"
diff --git a/platform/jcreate/dev/acc-sensor.c b/platform/jcreate/dev/acc-sensor.c
index b845cb3735d..bf7de196346 100644
--- a/platform/jcreate/dev/acc-sensor.c
+++ b/platform/jcreate/dev/acc-sensor.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: acc-sensor.c,v 1.2 2010/08/25 19:34:42 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/jcreate/dev/acc-sensor.h b/platform/jcreate/dev/acc-sensor.h
index 0c0632529c1..bf31d195501 100644
--- a/platform/jcreate/dev/acc-sensor.h
+++ b/platform/jcreate/dev/acc-sensor.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: acc-sensor.h,v 1.2 2010/08/25 19:34:42 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/jcreate/dev/ext-sensor.c b/platform/jcreate/dev/ext-sensor.c
index 58524dc49ad..a034448cbef 100644
--- a/platform/jcreate/dev/ext-sensor.c
+++ b/platform/jcreate/dev/ext-sensor.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ext-sensor.c,v 1.2 2010/08/25 19:34:42 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/jcreate/dev/ext-sensor.h b/platform/jcreate/dev/ext-sensor.h
index 7cb843cc0ff..c2c9f36e5c6 100644
--- a/platform/jcreate/dev/ext-sensor.h
+++ b/platform/jcreate/dev/ext-sensor.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ext-sensor.h,v 1.1 2010/05/03 21:57:35 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/jcreate/leds-arch.c b/platform/jcreate/leds-arch.c
index d8ff39406e1..4f4dc748c92 100644
--- a/platform/jcreate/leds-arch.c
+++ b/platform/jcreate/leds-arch.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: leds-arch.c,v 1.1 2010/05/03 21:57:35 nifi Exp $
  */
 
 /**
diff --git a/platform/mb851/apps/shell-sensors.c b/platform/mb851/apps/shell-sensors.c
index 9ff6b917f59..1f822cbfd94 100644
--- a/platform/mb851/apps/shell-sensors.c
+++ b/platform/mb851/apps/shell-sensors.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-sensors.c,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
  
  /**
diff --git a/platform/mb851/apps/shell-sensors.h b/platform/mb851/apps/shell-sensors.h
index a61562ffa9d..4c4fc8fffef 100644
--- a/platform/mb851/apps/shell-sensors.h
+++ b/platform/mb851/apps/shell-sensors.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-sensors.h,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 
 /**
diff --git a/platform/mb851/contiki-conf.h b/platform/mb851/contiki-conf.h
index 06763b8f715..5b6d37a1f0e 100644
--- a/platform/mb851/contiki-conf.h
+++ b/platform/mb851/contiki-conf.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: contiki-conf.h,v 1.2 2010/10/27 14:05:24 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/mb851/contiki-init-net.c b/platform/mb851/contiki-init-net.c
index 500ad6f096e..76ad078fe3f 100644
--- a/platform/mb851/contiki-init-net.c
+++ b/platform/mb851/contiki-init-net.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: contiki-init-net.c,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/mb851/contiki-main.c b/platform/mb851/contiki-main.c
index d65f023ec4f..75a125dc984 100644
--- a/platform/mb851/contiki-main.c
+++ b/platform/mb851/contiki-main.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: contiki-main.c,v 1.2 2010/10/27 14:05:24 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/mb851/dev/acc-sensor.c b/platform/mb851/dev/acc-sensor.c
index 032c7465d75..387ae3a1247 100644
--- a/platform/mb851/dev/acc-sensor.c
+++ b/platform/mb851/dev/acc-sensor.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: acc-sensor.c,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/mb851/dev/acc-sensor.h b/platform/mb851/dev/acc-sensor.h
index 9092db742b0..4809c192fbc 100644
--- a/platform/mb851/dev/acc-sensor.h
+++ b/platform/mb851/dev/acc-sensor.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: acc-sensor.h,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/mb851/dev/button-sensor.c b/platform/mb851/dev/button-sensor.c
index 756995f0464..d1bb69d1359 100644
--- a/platform/mb851/dev/button-sensor.c
+++ b/platform/mb851/dev/button-sensor.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: button-sensor.c,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/mb851/dev/temperature-sensor.c b/platform/mb851/dev/temperature-sensor.c
index 197bf6ae9cf..0f25494b4fc 100644
--- a/platform/mb851/dev/temperature-sensor.c
+++ b/platform/mb851/dev/temperature-sensor.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: temperature-sensor.c,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/mb851/dev/temperature-sensor.h b/platform/mb851/dev/temperature-sensor.h
index ba0402b9a7c..56b58e48731 100644
--- a/platform/mb851/dev/temperature-sensor.h
+++ b/platform/mb851/dev/temperature-sensor.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: temperature-sensor.h,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/mbxxx/apps/shell-sensors.c b/platform/mbxxx/apps/shell-sensors.c
index 9ff6b917f59..1f822cbfd94 100644
--- a/platform/mbxxx/apps/shell-sensors.c
+++ b/platform/mbxxx/apps/shell-sensors.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-sensors.c,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
  
  /**
diff --git a/platform/mbxxx/apps/shell-sensors.h b/platform/mbxxx/apps/shell-sensors.h
index a61562ffa9d..4c4fc8fffef 100644
--- a/platform/mbxxx/apps/shell-sensors.h
+++ b/platform/mbxxx/apps/shell-sensors.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-sensors.h,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 
 /**
diff --git a/platform/mbxxx/contiki-conf.h b/platform/mbxxx/contiki-conf.h
index e39be6c6af0..f830b87c403 100644
--- a/platform/mbxxx/contiki-conf.h
+++ b/platform/mbxxx/contiki-conf.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: contiki-conf.h,v 1.2 2010/10/27 14:05:24 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/mbxxx/dev/acc-sensor.c b/platform/mbxxx/dev/acc-sensor.c
index 93dab123f14..fc201a12a7e 100644
--- a/platform/mbxxx/dev/acc-sensor.c
+++ b/platform/mbxxx/dev/acc-sensor.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: acc-sensor.c,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/mbxxx/dev/acc-sensor.h b/platform/mbxxx/dev/acc-sensor.h
index 9092db742b0..4809c192fbc 100644
--- a/platform/mbxxx/dev/acc-sensor.h
+++ b/platform/mbxxx/dev/acc-sensor.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: acc-sensor.h,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/mbxxx/dev/button-sensor.c b/platform/mbxxx/dev/button-sensor.c
index 5dafe4f2baa..562bad12367 100644
--- a/platform/mbxxx/dev/button-sensor.c
+++ b/platform/mbxxx/dev/button-sensor.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: button-sensor.c,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/mbxxx/dev/leds-arch.c b/platform/mbxxx/dev/leds-arch.c
index 51c756c1f60..bfc685aeb0a 100644
--- a/platform/mbxxx/dev/leds-arch.c
+++ b/platform/mbxxx/dev/leds-arch.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: leds-arch.c,v 1.1 2010/10/25 09:03:38 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/mbxxx/dev/temperature-sensor.c b/platform/mbxxx/dev/temperature-sensor.c
index 6014543612a..937582eeb49 100644
--- a/platform/mbxxx/dev/temperature-sensor.c
+++ b/platform/mbxxx/dev/temperature-sensor.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: temperature-sensor.c,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/mbxxx/dev/temperature-sensor.h b/platform/mbxxx/dev/temperature-sensor.h
index ba0402b9a7c..56b58e48731 100644
--- a/platform/mbxxx/dev/temperature-sensor.h
+++ b/platform/mbxxx/dev/temperature-sensor.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: temperature-sensor.h,v 1.1 2010/10/25 09:03:39 salvopitru Exp $
  */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/micaz/platform-conf.h b/platform/micaz/platform-conf.h
index 2be1483f848..ebf459031f1 100644
--- a/platform/micaz/platform-conf.h
+++ b/platform/micaz/platform-conf.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: platform-conf.h,v 1.1 2010/06/23 10:25:54 joxe Exp $
  */
 
 /**
diff --git a/platform/minimal-net/clock.c b/platform/minimal-net/clock.c
index 88188d76b52..1e3cfe7b2cc 100644
--- a/platform/minimal-net/clock.c
+++ b/platform/minimal-net/clock.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: clock.c,v 1.2 2008/07/10 17:10:39 adamdunkels Exp $
  */
 
 /**
diff --git a/platform/minimal-net/contiki-conf.h b/platform/minimal-net/contiki-conf.h
index ea61ac464da..89b3f517a4f 100644
--- a/platform/minimal-net/contiki-conf.h
+++ b/platform/minimal-net/contiki-conf.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: contiki-conf.h,v 1.10 2010/03/18 20:11:54 dak664 Exp $
  */
 
 #ifndef __CONTIKI_CONF_H__
diff --git a/platform/minimal-net/leds-arch.c b/platform/minimal-net/leds-arch.c
index 1b533e834eb..1308c57dc15 100644
--- a/platform/minimal-net/leds-arch.c
+++ b/platform/minimal-net/leds-arch.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: leds-arch.c,v 1.1 2006/06/17 22:55:44 adamdunkels Exp $
  */
 
 /**
diff --git a/platform/msb430/apps/acc-test.c b/platform/msb430/apps/acc-test.c
index fe5be0ab8f5..09cf968429b 100644
--- a/platform/msb430/apps/acc-test.c
+++ b/platform/msb430/apps/acc-test.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: acc-test.c,v 1.1 2008/03/27 13:08:35 nvt-se Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/msb430/apps/sd-test.c b/platform/msb430/apps/sd-test.c
index a5cb1db7f8b..53acd9eb9c0 100644
--- a/platform/msb430/apps/sd-test.c
+++ b/platform/msb430/apps/sd-test.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sd-test.c,v 1.8 2009/11/11 14:59:34 nvt-se Exp $
  */
 
 /**
diff --git a/platform/msb430/apps/test-abc.c b/platform/msb430/apps/test-abc.c
index c03046414cb..30f3c959c00 100644
--- a/platform/msb430/apps/test-abc.c
+++ b/platform/msb430/apps/test-abc.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: test-abc.c,v 1.5 2010/02/05 11:52:37 nvt-se Exp $
  */
 
 /**
diff --git a/platform/msb430/apps/test-sht11.c b/platform/msb430/apps/test-sht11.c
index ac34b97a7c2..7ceb6fe1322 100644
--- a/platform/msb430/apps/test-sht11.c
+++ b/platform/msb430/apps/test-sht11.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: test-sht11.c,v 1.2 2007/10/22 13:07:00 nvt-se Exp $
  */
 
 /**
diff --git a/platform/msb430/dev/cc1020-uip.c b/platform/msb430/dev/cc1020-uip.c
index 683e8422252..78f18c4e953 100644
--- a/platform/msb430/dev/cc1020-uip.c
+++ b/platform/msb430/dev/cc1020-uip.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: cc1020-uip.c,v 1.1 2007/12/17 13:33:09 nvt-se Exp $
  */
 
 /**
diff --git a/platform/msb430/dev/cc1020-uip.h b/platform/msb430/dev/cc1020-uip.h
index 0d5e8b59f16..652b40b3d61 100644
--- a/platform/msb430/dev/cc1020-uip.h
+++ b/platform/msb430/dev/cc1020-uip.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: cc1020-uip.h,v 1.1 2007/12/17 13:33:09 nvt-se Exp $
  */
 #ifndef CC1020_UIP_H
 #define CC1020_UIP_H
diff --git a/platform/msb430/dev/dma.h b/platform/msb430/dev/dma.h
index 45b7fbb9493..cabcad4d77b 100644
--- a/platform/msb430/dev/dma.h
+++ b/platform/msb430/dev/dma.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: dma.h,v 1.6 2007/12/17 15:26:47 nvt-se Exp $
  */
 
 #ifndef DMA_H
diff --git a/platform/msb430/dev/rs232.c b/platform/msb430/dev/rs232.c
index 75f711eb600..44a2998130e 100644
--- a/platform/msb430/dev/rs232.c
+++ b/platform/msb430/dev/rs232.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: rs232.c,v 1.9 2009/06/29 12:46:50 nvt-se Exp $
  */
 
 /** \addtogroup esbrs232
diff --git a/platform/msb430/dev/rs232.h b/platform/msb430/dev/rs232.h
index e8660ddd077..59f1ffe3368 100644
--- a/platform/msb430/dev/rs232.h
+++ b/platform/msb430/dev/rs232.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: rs232.h,v 1.6 2009/06/29 12:46:50 nvt-se Exp $
  */
 
 /** \addtogroup esb
diff --git a/platform/msb430/loader/loader-arch.h b/platform/msb430/loader/loader-arch.h
index e7777bf411a..260062d5a87 100644
--- a/platform/msb430/loader/loader-arch.h
+++ b/platform/msb430/loader/loader-arch.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: loader-arch.h,v 1.1 2007/06/28 12:54:05 nvt-se Exp $
  */
 #ifndef __LOADER_ARCH_H__
 #define __LOADER_ARCH_H__
diff --git a/platform/msb430/node-id.c b/platform/msb430/node-id.c
index a2fd2939f08..f45ea528bcc 100644
--- a/platform/msb430/node-id.c
+++ b/platform/msb430/node-id.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: node-id.c,v 1.4 2009/08/24 15:44:45 nifi Exp $
  */
 
 #include "node-id.h"
diff --git a/platform/msb430/node-id.h b/platform/msb430/node-id.h
index 7d5bb4567e7..6c3a2d9c720 100644
--- a/platform/msb430/node-id.h
+++ b/platform/msb430/node-id.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: node-id.h,v 1.3 2007/09/14 19:24:45 nvt-se Exp $
  */
 
 #ifndef NODE_ID_H
diff --git a/platform/native/clock.c b/platform/native/clock.c
index 86e7bac6f34..2cfed7d2345 100644
--- a/platform/native/clock.c
+++ b/platform/native/clock.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: clock.c,v 1.3 2009/09/09 21:11:24 adamdunkels Exp $
  */
 
 /**
diff --git a/platform/native/contiki-conf.h b/platform/native/contiki-conf.h
index 036b05e6681..d916350d528 100644
--- a/platform/native/contiki-conf.h
+++ b/platform/native/contiki-conf.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: contiki-conf.h,v 1.12 2009/09/09 21:11:24 adamdunkels Exp $
  */
 
 #ifndef __CONTIKI_CONF_H__
diff --git a/platform/native/dev/beep.c b/platform/native/dev/beep.c
index 680001f29f7..64b8b439f66 100644
--- a/platform/native/dev/beep.c
+++ b/platform/native/dev/beep.c
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: beep.c,v 1.1 2006/06/17 22:41:31 adamdunkels Exp $
  */
 #include <stdio.h>
 #include "dev/beep.h"
diff --git a/platform/native/dev/beep.h b/platform/native/dev/beep.h
index f4a61bed3d1..5dec6317958 100644
--- a/platform/native/dev/beep.h
+++ b/platform/native/dev/beep.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: beep.h,v 1.2 2006/07/07 06:38:53 nifi Exp $
  */
 /**
  * \addtogroup esb
diff --git a/platform/native/dev/dummy-sensors.c b/platform/native/dev/dummy-sensors.c
index 4244dd3b48e..de84c7427f4 100644
--- a/platform/native/dev/dummy-sensors.c
+++ b/platform/native/dev/dummy-sensors.c
@@ -29,7 +29,6 @@
  * This file is part of the Configurable Sensor Network Application
  * Architecture for sensor nodes running the Contiki operating system.
  *
- * $Id: dummy-sensors.c,v 1.2 2010/01/14 20:15:55 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/native/dev/eeprom.c b/platform/native/dev/eeprom.c
index 94b86baa574..04090235441 100644
--- a/platform/native/dev/eeprom.c
+++ b/platform/native/dev/eeprom.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: eeprom.c,v 1.1 2006/06/17 22:41:31 adamdunkels Exp $
  */
 #include "dev/eeprom.h"
 #include "node.h"
diff --git a/platform/native/dev/leds-arch.c b/platform/native/dev/leds-arch.c
index cd7a8ccab59..1308c57dc15 100644
--- a/platform/native/dev/leds-arch.c
+++ b/platform/native/dev/leds-arch.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: leds-arch.c,v 1.1 2006/06/17 22:41:31 adamdunkels Exp $
  */
 
 /**
diff --git a/platform/native/dev/temperature-sensor.h b/platform/native/dev/temperature-sensor.h
index 8636d9f946a..b7e37b404ce 100644
--- a/platform/native/dev/temperature-sensor.h
+++ b/platform/native/dev/temperature-sensor.h
@@ -29,7 +29,6 @@
  * This file is part of the Configurable Sensor Network Application
  * Architecture for sensor nodes running the Contiki operating system.
  *
- * $Id: temperature-sensor.h,v 1.1 2006/06/17 22:41:31 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/native/dev/vib-sensor.c b/platform/native/dev/vib-sensor.c
index 688fb701ddd..d5494142dee 100644
--- a/platform/native/dev/vib-sensor.c
+++ b/platform/native/dev/vib-sensor.c
@@ -29,7 +29,6 @@
  * This file is part of the Configurable Sensor Network Application
  * Architecture for sensor nodes running the Contiki operating system.
  *
- * $Id: vib-sensor.c,v 1.2 2010/01/14 15:38:56 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/native/dev/vib-sensor.h b/platform/native/dev/vib-sensor.h
index 30523c1043b..63829973aa8 100644
--- a/platform/native/dev/vib-sensor.h
+++ b/platform/native/dev/vib-sensor.h
@@ -29,7 +29,6 @@
  * This file is part of the Configurable Sensor Network Application
  * Architecture for sensor nodes running the Contiki operating system.
  *
- * $Id: vib-sensor.h,v 1.1 2006/06/17 22:41:31 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/native/dev/xmem.c b/platform/native/dev/xmem.c
index 24f48b72dfa..d1b5f2dc8ab 100644
--- a/platform/native/dev/xmem.c
+++ b/platform/native/dev/xmem.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: xmem.c,v 1.2 2008/07/09 09:37:50 adamdunkels Exp $
  */
 
 #include "contiki-conf.h"
diff --git a/platform/pc-6001/apps/multithread/mt-test.c b/platform/pc-6001/apps/multithread/mt-test.c
index 441445e5f85..c43d1b096d5 100644
--- a/platform/pc-6001/apps/multithread/mt-test.c
+++ b/platform/pc-6001/apps/multithread/mt-test.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: mt-test.c,v 1.3 2009/12/11 14:59:45 matsutsuka Exp $
  */
 
 /**
diff --git a/platform/pc-6001/apps/tinysample/tinysample-dsc.c b/platform/pc-6001/apps/tinysample/tinysample-dsc.c
index 376566968f0..4aafc710770 100644
--- a/platform/pc-6001/apps/tinysample/tinysample-dsc.c
+++ b/platform/pc-6001/apps/tinysample/tinysample-dsc.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: tinysample-dsc.c,v 1.1 2007/09/11 12:12:59 matsutsuka Exp $
  */
 
 /**
diff --git a/platform/pc-6001/apps/tinysample/tinysample-dsc.h b/platform/pc-6001/apps/tinysample/tinysample-dsc.h
index 1d093efa596..aab795b704a 100644
--- a/platform/pc-6001/apps/tinysample/tinysample-dsc.h
+++ b/platform/pc-6001/apps/tinysample/tinysample-dsc.h
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: tinysample-dsc.h,v 1.1 2007/09/11 12:12:59 matsutsuka Exp $
  */
 
 /**
diff --git a/platform/pc-6001/apps/tinysample/tinysample.c b/platform/pc-6001/apps/tinysample/tinysample.c
index 1e98905776b..457156e6de1 100644
--- a/platform/pc-6001/apps/tinysample/tinysample.c
+++ b/platform/pc-6001/apps/tinysample/tinysample.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: tinysample.c,v 1.2 2007/11/28 09:37:11 matsutsuka Exp $
  */
 
 /**
diff --git a/platform/pc-6001/apps/webserver-mini/httpd-cfs.c b/platform/pc-6001/apps/webserver-mini/httpd-cfs.c
index 18fe4aeb7be..389e7e82a62 100644
--- a/platform/pc-6001/apps/webserver-mini/httpd-cfs.c
+++ b/platform/pc-6001/apps/webserver-mini/httpd-cfs.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-cfs.c,v 1.2 2010/10/19 18:29:05 adamdunkels Exp $
  */
 
 #include <string.h>
diff --git a/platform/pc-6001/apps/webserver-mini/httpd-cfs.h b/platform/pc-6001/apps/webserver-mini/httpd-cfs.h
index 54a78e65061..868c39d036d 100644
--- a/platform/pc-6001/apps/webserver-mini/httpd-cfs.h
+++ b/platform/pc-6001/apps/webserver-mini/httpd-cfs.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd-cfs.h,v 1.1 2007/11/28 09:40:13 matsutsuka Exp $
  *
  */
 
diff --git a/platform/pc-6001/apps/webserver-mini/httpd-cgi.c b/platform/pc-6001/apps/webserver-mini/httpd-cgi.c
index a11643a0537..ec4ed0095fb 100644
--- a/platform/pc-6001/apps/webserver-mini/httpd-cgi.c
+++ b/platform/pc-6001/apps/webserver-mini/httpd-cgi.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd-cgi.c,v 1.2 2010/10/19 18:29:05 adamdunkels Exp $
  *
  */
 
diff --git a/platform/pc-6001/apps/webserver-mini/httpd-cgi.h b/platform/pc-6001/apps/webserver-mini/httpd-cgi.h
index da04c149141..21b337a828b 100644
--- a/platform/pc-6001/apps/webserver-mini/httpd-cgi.h
+++ b/platform/pc-6001/apps/webserver-mini/httpd-cgi.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd-cgi.h,v 1.1 2007/11/28 09:40:13 matsutsuka Exp $
  *
  */
 
diff --git a/platform/pc-6001/apps/webserver-mini/httpd-fs.c b/platform/pc-6001/apps/webserver-mini/httpd-fs.c
index 8b05717ed20..a07b79b7de3 100644
--- a/platform/pc-6001/apps/webserver-mini/httpd-fs.c
+++ b/platform/pc-6001/apps/webserver-mini/httpd-fs.c
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-fs.c,v 1.1 2007/11/28 09:40:13 matsutsuka Exp $
  */
 
 #include "contiki-net.h"
diff --git a/platform/pc-6001/apps/webserver-mini/httpd-fs.h b/platform/pc-6001/apps/webserver-mini/httpd-fs.h
index 7ec27c03212..c8cab68d376 100644
--- a/platform/pc-6001/apps/webserver-mini/httpd-fs.h
+++ b/platform/pc-6001/apps/webserver-mini/httpd-fs.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-fs.h,v 1.1 2007/11/28 09:40:13 matsutsuka Exp $
  */
 #ifndef __HTTPD_FS_H__
 #define __HTTPD_FS_H__
diff --git a/platform/pc-6001/apps/webserver-mini/httpd-fsdata.h b/platform/pc-6001/apps/webserver-mini/httpd-fsdata.h
index e4cc902c90c..5d27e299da6 100644
--- a/platform/pc-6001/apps/webserver-mini/httpd-fsdata.h
+++ b/platform/pc-6001/apps/webserver-mini/httpd-fsdata.h
@@ -30,7 +30,6 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd-fsdata.h,v 1.1 2007/11/28 09:40:13 matsutsuka Exp $
  */
 #ifndef __HTTPD_FSDATA_H__
 #define __HTTPD_FSDATA_H__
diff --git a/platform/pc-6001/apps/webserver-mini/httpd.c b/platform/pc-6001/apps/webserver-mini/httpd.c
index 20d6b464ce5..c9058b2a950 100644
--- a/platform/pc-6001/apps/webserver-mini/httpd.c
+++ b/platform/pc-6001/apps/webserver-mini/httpd.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd.c,v 1.2 2010/10/19 18:29:05 adamdunkels Exp $
  */
 
 #include <string.h>
diff --git a/platform/pc-6001/apps/webserver-mini/httpd.h b/platform/pc-6001/apps/webserver-mini/httpd.h
index 0b54011fd32..68d5e6fc667 100644
--- a/platform/pc-6001/apps/webserver-mini/httpd.h
+++ b/platform/pc-6001/apps/webserver-mini/httpd.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: httpd.h,v 1.1 2007/11/28 09:40:13 matsutsuka Exp $
  *
  */
 
diff --git a/platform/pc-6001/apps/webserver-mini/webserver-nogui.c b/platform/pc-6001/apps/webserver-mini/webserver-nogui.c
index bd993954095..b8c9df13922 100644
--- a/platform/pc-6001/apps/webserver-mini/webserver-nogui.c
+++ b/platform/pc-6001/apps/webserver-mini/webserver-nogui.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS.
  *
- * $Id: webserver-nogui.c,v 1.1 2007/11/28 09:40:13 matsutsuka Exp $
  *
  */
 
diff --git a/platform/pc-6001/apps/webserver-mini/webserver-nogui.h b/platform/pc-6001/apps/webserver-mini/webserver-nogui.h
index d46ba78736a..5518006151f 100644
--- a/platform/pc-6001/apps/webserver-mini/webserver-nogui.h
+++ b/platform/pc-6001/apps/webserver-mini/webserver-nogui.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: webserver-nogui.h,v 1.1 2007/11/28 09:40:13 matsutsuka Exp $
  *
  */
 #ifndef __WEBSERVER_NOGUI_H__
diff --git a/platform/pc-6001/contiki-client-main.c b/platform/pc-6001/contiki-client-main.c
index d056880f491..ae09e9196c0 100644
--- a/platform/pc-6001/contiki-client-main.c
+++ b/platform/pc-6001/contiki-client-main.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: contiki-client-main.c,v 1.2 2007/11/28 06:14:11 matsutsuka Exp $
  *
  */
 
diff --git a/platform/pc-6001/contiki-conf.h b/platform/pc-6001/contiki-conf.h
index 1b7de158658..d0760d9c363 100644
--- a/platform/pc-6001/contiki-conf.h
+++ b/platform/pc-6001/contiki-conf.h
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: contiki-conf.h,v 1.6 2008/02/15 16:51:06 oliverschmidt Exp $
  *
  */
 
diff --git a/platform/pc-6001/contiki-desktop-main.c b/platform/pc-6001/contiki-desktop-main.c
index 4154dc62d95..5389e3d96dd 100644
--- a/platform/pc-6001/contiki-desktop-main.c
+++ b/platform/pc-6001/contiki-desktop-main.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: contiki-desktop-main.c,v 1.1 2009/12/16 06:47:18 matsutsuka Exp $
  *
  */
 
diff --git a/platform/pc-6001/contiki-loader-main.c b/platform/pc-6001/contiki-loader-main.c
index dea316b142a..90ff4df76ac 100644
--- a/platform/pc-6001/contiki-loader-main.c
+++ b/platform/pc-6001/contiki-loader-main.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: contiki-loader-main.c,v 1.1 2007/11/28 09:44:27 matsutsuka Exp $
  *
  */
 
diff --git a/platform/pc-6001/contiki-main.c b/platform/pc-6001/contiki-main.c
index b5d3a0564ba..1505d9a5aca 100644
--- a/platform/pc-6001/contiki-main.c
+++ b/platform/pc-6001/contiki-main.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: contiki-main.c,v 1.4 2009/12/16 06:47:18 matsutsuka Exp $
  *
  */
 
diff --git a/platform/pc-6001/contiki-minimal-main.c b/platform/pc-6001/contiki-minimal-main.c
index 2bdf9756eb6..4fa3daa2f8f 100644
--- a/platform/pc-6001/contiki-minimal-main.c
+++ b/platform/pc-6001/contiki-minimal-main.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: contiki-minimal-main.c,v 1.2 2009/12/11 14:59:31 matsutsuka Exp $
  *
  */
 
diff --git a/platform/pc-6001/contiki-serial-main.c b/platform/pc-6001/contiki-serial-main.c
index bfd5cedbda1..0bb64b24865 100644
--- a/platform/pc-6001/contiki-serial-main.c
+++ b/platform/pc-6001/contiki-serial-main.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: contiki-serial-main.c,v 1.5 2009/12/11 14:59:31 matsutsuka Exp $
  *
  */
 
diff --git a/platform/pc-6001/contiki-server-main.c b/platform/pc-6001/contiki-server-main.c
index 0824ebb97ae..3a53667bb52 100644
--- a/platform/pc-6001/contiki-server-main.c
+++ b/platform/pc-6001/contiki-server-main.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: contiki-server-main.c,v 1.1 2007/11/28 09:44:27 matsutsuka Exp $
  *
  */
 
diff --git a/platform/pc-6001/ctk/ctk-conio_arch-source.c b/platform/pc-6001/ctk/ctk-conio_arch-source.c
index e134e84d3ee..ea843e0dacc 100644
--- a/platform/pc-6001/ctk/ctk-conio_arch-source.c
+++ b/platform/pc-6001/ctk/ctk-conio_arch-source.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ctk-conio_arch-source.c,v 1.2 2007/09/29 04:10:00 matsutsuka Exp $
  *
  */
 
diff --git a/platform/pc-6001/ctk/ctk-conio_arch.c b/platform/pc-6001/ctk/ctk-conio_arch.c
index 4db83b76e47..12cc833ba52 100644
--- a/platform/pc-6001/ctk/ctk-conio_arch.c
+++ b/platform/pc-6001/ctk/ctk-conio_arch.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ctk-conio_arch.c,v 1.4 2009/12/16 06:47:18 matsutsuka Exp $
  *
  */
 
diff --git a/platform/pc-6001/ctk/ctk_arch-def.h b/platform/pc-6001/ctk/ctk_arch-def.h
index 2f80c0a992a..c55d88892d7 100644
--- a/platform/pc-6001/ctk/ctk_arch-def.h
+++ b/platform/pc-6001/ctk/ctk_arch-def.h
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ctk_arch-def.h,v 1.5 2007/12/14 23:49:14 oliverschmidt Exp $
  *
  */
 
diff --git a/platform/pc-6001/ctk/ctk_arch.h b/platform/pc-6001/ctk/ctk_arch.h
index da609c09865..d6e34057f70 100644
--- a/platform/pc-6001/ctk/ctk_arch.h
+++ b/platform/pc-6001/ctk/ctk_arch.h
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ctk_arch.h,v 1.1 2007/09/11 12:12:59 matsutsuka Exp $
  *
  */
  
diff --git a/platform/pc-6001/ctk/libconio_arch.h b/platform/pc-6001/ctk/libconio_arch.h
index beeeee133c2..7f3162ae001 100644
--- a/platform/pc-6001/ctk/libconio_arch.h
+++ b/platform/pc-6001/ctk/libconio_arch.h
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: libconio_arch.h,v 1.3 2007/11/28 09:38:21 matsutsuka Exp $
  *
  */
 
diff --git a/platform/pc-6001/dev/getkey.h b/platform/pc-6001/dev/getkey.h
index 0ba092ea393..b1dca478611 100644
--- a/platform/pc-6001/dev/getkey.h
+++ b/platform/pc-6001/dev/getkey.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: getkey.h,v 1.1 2007/09/11 12:12:59 matsutsuka Exp $
  */
 
 /*
diff --git a/platform/pc-6001/dev/isprint_arch.h b/platform/pc-6001/dev/isprint_arch.h
index 7481e0e2946..90da5f10131 100644
--- a/platform/pc-6001/dev/isprint_arch.h
+++ b/platform/pc-6001/dev/isprint_arch.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: isprint_arch.h,v 1.1 2007/09/11 12:12:59 matsutsuka Exp $
  */
 
 /*
diff --git a/platform/pc-6001/dev/rtimer-arch.h b/platform/pc-6001/dev/rtimer-arch.h
index c3e116fa41e..acc1aab844b 100644
--- a/platform/pc-6001/dev/rtimer-arch.h
+++ b/platform/pc-6001/dev/rtimer-arch.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rtimer-arch.h,v 1.1 2007/09/11 12:12:59 matsutsuka Exp $
  */
 
 /*
diff --git a/platform/pc-6001/loader/loader_arch.c b/platform/pc-6001/loader/loader_arch.c
index dee81c0650d..33184e0bfe0 100644
--- a/platform/pc-6001/loader/loader_arch.c
+++ b/platform/pc-6001/loader/loader_arch.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: loader_arch.c,v 1.2 2009/07/09 18:24:56 matsutsuka Exp $
  *
  */
  
diff --git a/platform/pc-6001/loader/loader_arch.h b/platform/pc-6001/loader/loader_arch.h
index ec48ded10c8..44cf9853511 100644
--- a/platform/pc-6001/loader/loader_arch.h
+++ b/platform/pc-6001/loader/loader_arch.h
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: loader_arch.h,v 1.2 2009/07/09 18:24:56 matsutsuka Exp $
  *
  */
  
diff --git a/platform/redbee-dev/button-sensor.c b/platform/redbee-dev/button-sensor.c
index 6542293f35c..a1e0806188d 100644
--- a/platform/redbee-dev/button-sensor.c
+++ b/platform/redbee-dev/button-sensor.c
@@ -30,7 +30,6 @@
  *
  * This file is part of the Contiki OS.
  *
- * $Id: button-sensor.c,v 1.1 2010/11/07 13:56:17 maralvira Exp $
  */
 
 #include "lib/sensors.h"
diff --git a/platform/redbee-econotag/button-sensor.c b/platform/redbee-econotag/button-sensor.c
index f89cd65447b..24b9b63c113 100644
--- a/platform/redbee-econotag/button-sensor.c
+++ b/platform/redbee-econotag/button-sensor.c
@@ -30,7 +30,6 @@
  *
  * This file is part of the Contiki OS.
  *
- * $Id: button-sensor.c,v 1.1 2010/06/09 14:46:30 maralvira Exp $
  */
 
 #include "lib/sensors.h"
diff --git a/platform/redbee-econotag/node-id.h b/platform/redbee-econotag/node-id.h
index 5e52ebf76e3..f0435228ac5 100644
--- a/platform/redbee-econotag/node-id.h
+++ b/platform/redbee-econotag/node-id.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id$
  */
 
 #ifndef __NODE_ID_H__
diff --git a/platform/sensinode/dev/slip-arch.c b/platform/sensinode/dev/slip-arch.c
index bf6e1b2914f..422847cf989 100644
--- a/platform/sensinode/dev/slip-arch.c
+++ b/platform/sensinode/dev/slip-arch.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: slip_uart1.c,v 1.8 2008/02/03 20:59:35 adamdunkels Exp $
  */
 
 /*
diff --git a/platform/sentilla-usb/contiki-sentilla-usb-platform.c b/platform/sentilla-usb/contiki-sentilla-usb-platform.c
index 56658d4dae5..f5ee8c13436 100644
--- a/platform/sentilla-usb/contiki-sentilla-usb-platform.c
+++ b/platform/sentilla-usb/contiki-sentilla-usb-platform.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: contiki-sentilla-usb-platform.c,v 1.1 2010/08/25 19:57:33 nifi Exp $
  */
 
 /**
diff --git a/platform/sky/apps/blink.c b/platform/sky/apps/blink.c
index d9698a196f8..22dd274df15 100644
--- a/platform/sky/apps/blink.c
+++ b/platform/sky/apps/blink.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: blink.c,v 1.1 2008/01/23 20:34:37 adamdunkels Exp $
  */
 
 /**
diff --git a/platform/sky/apps/burn-nodeid.c b/platform/sky/apps/burn-nodeid.c
index fac8b7a2071..5da18edf8bf 100644
--- a/platform/sky/apps/burn-nodeid.c
+++ b/platform/sky/apps/burn-nodeid.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: burn-nodeid.c,v 1.4 2008/02/25 16:34:56 fros4943 Exp $
  */
 
 /**
diff --git a/platform/sky/apps/fader.c b/platform/sky/apps/fader.c
index 74109db09dd..c36fb01b5cc 100644
--- a/platform/sky/apps/fader.c
+++ b/platform/sky/apps/fader.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: fader.c,v 1.1 2007/03/21 23:17:28 adamdunkels Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h
index 9a845ba1143..3b31278321f 100644
--- a/platform/sky/contiki-conf.h
+++ b/platform/sky/contiki-conf.h
@@ -1,5 +1,4 @@
 /* -*- C -*- */
-/* @(#)$Id: contiki-conf.h,v 1.91 2011/01/09 21:04:14 adamdunkels Exp $ */
 
 #ifndef CONTIKI_CONF_H
 #define CONTIKI_CONF_H
diff --git a/platform/sky/contiki-sky-main.c b/platform/sky/contiki-sky-main.c
index c5f76f63212..b6cc3ee4d20 100644
--- a/platform/sky/contiki-sky-main.c
+++ b/platform/sky/contiki-sky-main.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: contiki-sky-main.c,v 1.87 2011/01/09 21:03:42 adamdunkels Exp $
  */
 
 #include <stdio.h>
diff --git a/platform/sky/contiki-sky-platform.c b/platform/sky/contiki-sky-platform.c
index 8fe2576a804..ccb6be8355d 100644
--- a/platform/sky/contiki-sky-platform.c
+++ b/platform/sky/contiki-sky-platform.c
@@ -30,7 +30,6 @@
  *
  * Author: Niclas Finne <nfi@sics.se>, Joakim Eriksson <joakime@sics.se>
  *
- * $Id: contiki-sky-platform.c,v 1.1 2010/05/03 13:51:11 nifi Exp $
  */
 
 #include "dev/button-sensor.h"
diff --git a/platform/sky/dev/battery-sensor.c b/platform/sky/dev/battery-sensor.c
index 5c733bd5a45..f11b9da921e 100644
--- a/platform/sky/dev/battery-sensor.c
+++ b/platform/sky/dev/battery-sensor.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: battery-sensor.c,v 1.11 2010/08/25 19:30:52 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/sky/dev/button-sensor.c b/platform/sky/dev/button-sensor.c
index 51f0acf93c3..4a0d07accb4 100644
--- a/platform/sky/dev/button-sensor.c
+++ b/platform/sky/dev/button-sensor.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: button-sensor.c,v 1.4 2010/01/14 20:01:19 nifi Exp $
  */
 #include "contiki.h"
 #include "lib/sensors.h"
diff --git a/platform/sky/dev/i2c.c b/platform/sky/dev/i2c.c
index c0997187e5f..b9d10a9c72b 100644
--- a/platform/sky/dev/i2c.c
+++ b/platform/sky/dev/i2c.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: i2c.c,v 1.2 2007/01/12 13:41:57 bg- Exp $
  */
 
 /*
diff --git a/platform/sky/dev/i2c.h b/platform/sky/dev/i2c.h
index 0b8020a2833..71df70997b7 100644
--- a/platform/sky/dev/i2c.h
+++ b/platform/sky/dev/i2c.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: i2c.h,v 1.2 2007/01/12 13:41:57 bg- Exp $
  */
 
 #ifndef I2C_H
diff --git a/platform/sky/dev/light-sensor.c b/platform/sky/dev/light-sensor.c
index 4e17b6051be..a75b542eeaa 100644
--- a/platform/sky/dev/light-sensor.c
+++ b/platform/sky/dev/light-sensor.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: light-sensor.c,v 1.7 2010/08/25 19:30:53 nifi Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/sky/dev/light-sensor.h b/platform/sky/dev/light-sensor.h
index 467fec6678c..486e6a8bba6 100644
--- a/platform/sky/dev/light-sensor.h
+++ b/platform/sky/dev/light-sensor.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: light-sensor.h,v 1.2 2010/01/14 20:23:02 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/sky/dev/light.c b/platform/sky/dev/light.c
index 0e8fd1abb8e..53f610fa962 100644
--- a/platform/sky/dev/light.c
+++ b/platform/sky/dev/light.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: light.c,v 1.1 2006/08/02 14:44:46 bg- Exp $
  */
 
 #include <stdlib.h>
diff --git a/platform/sky/dev/light.h b/platform/sky/dev/light.h
index 09423c6286e..8ea84b9973d 100644
--- a/platform/sky/dev/light.h
+++ b/platform/sky/dev/light.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: light.h,v 1.1 2006/08/02 14:44:46 bg- Exp $
  */
 #ifndef __LIGHT_H__
 #define __LIGHT_H__
diff --git a/platform/sky/dev/radio-sensor.c b/platform/sky/dev/radio-sensor.c
index d041a3c9931..54cbfc7f177 100644
--- a/platform/sky/dev/radio-sensor.c
+++ b/platform/sky/dev/radio-sensor.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: radio-sensor.c,v 1.7 2010/08/25 19:30:53 nifi Exp $
  */
 
 #include "lib/sensors.h"
diff --git a/platform/sky/dev/sky-sensors.c b/platform/sky/dev/sky-sensors.c
index e598b2ad1d8..48ac224282b 100644
--- a/platform/sky/dev/sky-sensors.c
+++ b/platform/sky/dev/sky-sensors.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sky-sensors.c,v 1.3 2010/08/25 19:30:53 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/sky/dev/sky-sensors.h b/platform/sky/dev/sky-sensors.h
index 5021b9e856f..4a5e8d9e18a 100644
--- a/platform/sky/dev/sky-sensors.h
+++ b/platform/sky/dev/sky-sensors.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  * This file is part of the Contiki operating system.
- * $Id: sky-sensors.h,v 1.2 2010/08/25 19:30:53 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/sky/dev/temperature-sensor.c b/platform/sky/dev/temperature-sensor.c
index 09943f0a335..6471df485c2 100644
--- a/platform/sky/dev/temperature-sensor.c
+++ b/platform/sky/dev/temperature-sensor.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: temperature-sensor.c,v 1.1 2010/08/25 19:34:06 nifi Exp $
  */
 
 /**
diff --git a/platform/sky/dev/temperature-sensor.h b/platform/sky/dev/temperature-sensor.h
index 174612b17d5..6ac9b77d2d4 100644
--- a/platform/sky/dev/temperature-sensor.h
+++ b/platform/sky/dev/temperature-sensor.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: temperature-sensor.h,v 1.1 2010/08/25 19:34:07 nifi Exp $
  */
 
 /**
diff --git a/platform/sky/dev/xmem.c b/platform/sky/dev/xmem.c
index ad9eda96b46..1efc6e91bc7 100644
--- a/platform/sky/dev/xmem.c
+++ b/platform/sky/dev/xmem.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: xmem.c,v 1.13 2011/01/18 14:03:55 nvt-se Exp $
  */
 
 /**
diff --git a/platform/sky/node-id.c b/platform/sky/node-id.c
index 72f28d6b915..b57884bb35e 100644
--- a/platform/sky/node-id.c
+++ b/platform/sky/node-id.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: node-id.c,v 1.1 2007/03/23 09:59:08 nifi Exp $
  */
 
 /**
diff --git a/platform/sky/node-id.h b/platform/sky/node-id.h
index 592379fc9bb..f0435228ac5 100644
--- a/platform/sky/node-id.h
+++ b/platform/sky/node-id.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: node-id.h,v 1.1 2007/03/23 09:59:08 nifi Exp $
  */
 
 #ifndef __NODE_ID_H__
diff --git a/platform/sky/platform-conf.h b/platform/sky/platform-conf.h
index a640571546f..ea1ee7acd1c 100644
--- a/platform/sky/platform-conf.h
+++ b/platform/sky/platform-conf.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: platform-conf.h,v 1.2 2010/12/16 22:52:27 adamdunkels Exp $
  */
 
 /**
diff --git a/platform/stk500/contiki-stk500-main.c b/platform/stk500/contiki-stk500-main.c
index efecf38f5ac..54169f19eb4 100644
--- a/platform/stk500/contiki-stk500-main.c
+++ b/platform/stk500/contiki-stk500-main.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id$
  *
  */
 
diff --git a/platform/win32/cfs/cfs-win32-dir.c b/platform/win32/cfs/cfs-win32-dir.c
index 314a129eb89..1613d23f603 100644
--- a/platform/win32/cfs/cfs-win32-dir.c
+++ b/platform/win32/cfs/cfs-win32-dir.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: cfs-win32-dir.c,v 1.1 2008/07/06 10:24:38 oliverschmidt Exp $
  */
 
 #define WIN32_LEAN_AND_MEAN
diff --git a/platform/win32/clock.c b/platform/win32/clock.c
index 8fdc1dd8594..808e3984a3e 100644
--- a/platform/win32/clock.c
+++ b/platform/win32/clock.c
@@ -30,7 +30,6 @@
  *
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: clock.c,v 1.2 2008/07/10 17:08:54 adamdunkels Exp $
  */
 
 #define WIN32_LEAN_AND_MEAN
diff --git a/platform/win32/contiki-main.c b/platform/win32/contiki-main.c
index ff2d20d2889..5774bd9a80a 100644
--- a/platform/win32/contiki-main.c
+++ b/platform/win32/contiki-main.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: contiki-main.c,v 1.21 2010/10/27 22:17:39 oliverschmidt Exp $
  */
 
 #define WIN32_LEAN_AND_MEAN
diff --git a/platform/win32/ctk/ctk-console.c b/platform/win32/ctk/ctk-console.c
index 85176b701fa..4254d7676bb 100644
--- a/platform/win32/ctk/ctk-console.c
+++ b/platform/win32/ctk/ctk-console.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: ctk-console.c,v 1.10 2007/12/15 20:12:28 oliverschmidt Exp $
  */
 
 #define WIN32_LEAN_AND_MEAN
diff --git a/platform/win32/ctk/ctk-console.h b/platform/win32/ctk/ctk-console.h
index 74a58ab392b..adcabcb710d 100644
--- a/platform/win32/ctk/ctk-console.h
+++ b/platform/win32/ctk/ctk-console.h
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: ctk-console.h,v 1.5 2007/04/15 13:30:17 oliverschmidt Exp $
  */
 #ifndef __CTK_CONSOLE_H__
 #define __CTK_CONSOLE_H__
diff --git a/platform/win32/loader/dll-loader.c b/platform/win32/loader/dll-loader.c
index d581fa0776e..eb252947e58 100644
--- a/platform/win32/loader/dll-loader.c
+++ b/platform/win32/loader/dll-loader.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: dll-loader.c,v 1.4 2008/02/07 15:54:50 oliverschmidt Exp $
  */
 
 #define WIN32_LEAN_AND_MEAN
diff --git a/platform/win32/loader/dll-loader.h b/platform/win32/loader/dll-loader.h
index f71a9eba0fb..f459aefeb0f 100644
--- a/platform/win32/loader/dll-loader.h
+++ b/platform/win32/loader/dll-loader.h
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: dll-loader.h,v 1.5 2008/02/08 12:14:52 oliverschmidt Exp $
  */
 #ifndef __DLL_LOADER_H__
 #define __DLL_LOADER_H__
diff --git a/platform/win32/loader/unload.c b/platform/win32/loader/unload.c
index f497d4e3d52..783868a8c23 100644
--- a/platform/win32/loader/unload.c
+++ b/platform/win32/loader/unload.c
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: unload.c,v 1.2 2010/10/12 19:57:44 oliverschmidt Exp $
  */
 
 #include <stdlib.h>
diff --git a/platform/win32/loader/unload.h b/platform/win32/loader/unload.h
index ad8ab7b8c75..9dcfbda153d 100644
--- a/platform/win32/loader/unload.h
+++ b/platform/win32/loader/unload.h
@@ -30,7 +30,6 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: unload.h,v 1.1 2010/10/12 11:03:53 oliverschmidt Exp $
  */
 
 #ifndef __UNLOAD_H__
diff --git a/platform/wismote/dev/battery-sensor.c b/platform/wismote/dev/battery-sensor.c
index d40ff7d358b..faf53402f72 100644
--- a/platform/wismote/dev/battery-sensor.c
+++ b/platform/wismote/dev/battery-sensor.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: battery-sensor.c,v 1.10 2010/02/03 20:30:07 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/wismote/dev/light-sensor.h b/platform/wismote/dev/light-sensor.h
index 467fec6678c..486e6a8bba6 100644
--- a/platform/wismote/dev/light-sensor.h
+++ b/platform/wismote/dev/light-sensor.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: light-sensor.h,v 1.2 2010/01/14 20:23:02 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/wismote/dev/light.c b/platform/wismote/dev/light.c
index ab7d708d036..be7d7540f40 100644
--- a/platform/wismote/dev/light.c
+++ b/platform/wismote/dev/light.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: light.c,v 1.1 2006/08/02 14:44:46 bg- Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/wismote/dev/light.h b/platform/wismote/dev/light.h
index 09423c6286e..8ea84b9973d 100644
--- a/platform/wismote/dev/light.h
+++ b/platform/wismote/dev/light.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: light.h,v 1.1 2006/08/02 14:44:46 bg- Exp $
  */
 #ifndef __LIGHT_H__
 #define __LIGHT_H__
diff --git a/platform/wismote/dev/radio-sensor.c b/platform/wismote/dev/radio-sensor.c
index a1205573079..4e0e48ce318 100644
--- a/platform/wismote/dev/radio-sensor.c
+++ b/platform/wismote/dev/radio-sensor.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: radio-sensor.c,v 1.6 2010/01/14 20:01:19 nifi Exp $
  */
 
 #include "lib/sensors.h"
diff --git a/platform/wismote/dev/sht15.h b/platform/wismote/dev/sht15.h
index 065a3d7a5d4..3af07d313ac 100644
--- a/platform/wismote/dev/sht15.h
+++ b/platform/wismote/dev/sht15.h
@@ -27,7 +27,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 */
 /*
-  $Id: v 0.1 2011/02/15 tchapelle Exp $
 */
 
 
diff --git a/platform/wismote/dev/sky-sensors.c b/platform/wismote/dev/sky-sensors.c
index 6279a4afdd5..c52e66ab760 100644
--- a/platform/wismote/dev/sky-sensors.c
+++ b/platform/wismote/dev/sky-sensors.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sky-sensors.c,v 1.2 2010/02/06 18:28:26 joxe Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/wismote/dev/sky-sensors.h b/platform/wismote/dev/sky-sensors.h
index 0ec18905d1f..ec3136e2bba 100644
--- a/platform/wismote/dev/sky-sensors.h
+++ b/platform/wismote/dev/sky-sensors.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  * This file is part of the Contiki operating system.
- * $Id: sky-sensors.h,v 1.1 2010/02/02 20:59:45 joxe Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/wismote/dev/xmem.c b/platform/wismote/dev/xmem.c
index dc3b5c25fd1..d4009f7b093 100644
--- a/platform/wismote/dev/xmem.c
+++ b/platform/wismote/dev/xmem.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: xmem.c,v 1.10 2009/09/07 11:31:26 nifi Exp $
  */
 
 /**
diff --git a/platform/wismote/node-id.c b/platform/wismote/node-id.c
index 8cbecb1ae87..a0614574d32 100644
--- a/platform/wismote/node-id.c
+++ b/platform/wismote/node-id.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: node-id.c,v 1.1 2007/03/23 09:59:08 nifi Exp $
  */
 
 /**
diff --git a/platform/wismote/node-id.h b/platform/wismote/node-id.h
index 592379fc9bb..f0435228ac5 100644
--- a/platform/wismote/node-id.h
+++ b/platform/wismote/node-id.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: node-id.h,v 1.1 2007/03/23 09:59:08 nifi Exp $
  */
 
 #ifndef __NODE_ID_H__
diff --git a/platform/z1/apps/blink.c b/platform/z1/apps/blink.c
index ad7617e6ba7..22dd274df15 100644
--- a/platform/z1/apps/blink.c
+++ b/platform/z1/apps/blink.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: blink.c,v 1.1 2010/08/24 16:26:38 joxe Exp $
  */
 
 /**
diff --git a/platform/z1/apps/burn-nodeid.c b/platform/z1/apps/burn-nodeid.c
index 6f8d9345c61..b12b6e274da 100644
--- a/platform/z1/apps/burn-nodeid.c
+++ b/platform/z1/apps/burn-nodeid.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: burn-nodeid.c,v 1.1 2010/08/24 16:26:38 joxe Exp $
  */
 
 /**
diff --git a/platform/z1/apps/fader.c b/platform/z1/apps/fader.c
index 5dac4f1a80a..c36fb01b5cc 100644
--- a/platform/z1/apps/fader.c
+++ b/platform/z1/apps/fader.c
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: fader.c,v 1.1 2010/08/24 16:26:38 joxe Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/z1/contiki-z1-main.c b/platform/z1/contiki-z1-main.c
index e97fddf9a10..d4ee19c36a3 100644
--- a/platform/z1/contiki-z1-main.c
+++ b/platform/z1/contiki-z1-main.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: contiki-z1-main.c,v 1.4 2010/08/26 22:08:11 nifi Exp $
  */
 
 #include <stdio.h>
diff --git a/platform/z1/contiki-z1-platform.c b/platform/z1/contiki-z1-platform.c
index 606ca8d43ae..60272bb003a 100644
--- a/platform/z1/contiki-z1-platform.c
+++ b/platform/z1/contiki-z1-platform.c
@@ -30,7 +30,6 @@
  * Author: Enric M. Calvo <ecalvo@zolertia.com> based on previous work by
  *         Niclas Finne <nfi@sics.se>, Joakim Eriksson <joakime@sics.se>
  *
- * $Id: contiki-sky-platform.c,v 1.1 2010/05/03 13:51:11 nifi Exp $
  */
 
 #include "dev/button-sensor.h"
diff --git a/platform/z1/dev/battery-sensor.c b/platform/z1/dev/battery-sensor.c
index 0ad412a49bf..dd787ccae50 100644
--- a/platform/z1/dev/battery-sensor.c
+++ b/platform/z1/dev/battery-sensor.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: battery-sensor.c,v 1.11 2010/08/25 19:30:52 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/z1/dev/button-sensor.c b/platform/z1/dev/button-sensor.c
index 0c1fff35e6d..e935efa7ba3 100644
--- a/platform/z1/dev/button-sensor.c
+++ b/platform/z1/dev/button-sensor.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: button-sensor.c,v 1.2 2010/08/26 16:01:20 joxe Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/z1/dev/cc2420-arch.c b/platform/z1/dev/cc2420-arch.c
index 2e3d2f18a1d..35994c12dce 100644
--- a/platform/z1/dev/cc2420-arch.c
+++ b/platform/z1/dev/cc2420-arch.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: cc2420-arch.c,v 1.1 2010/11/07 08:38:51 enricmcalvo Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/z1/dev/light-sensor.c b/platform/z1/dev/light-sensor.c
index 3c10ae1561d..014049b1604 100644
--- a/platform/z1/dev/light-sensor.c
+++ b/platform/z1/dev/light-sensor.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: light-sensor.c,v 1.7 2010/08/25 19:30:53 nifi Exp $
  */
 
 #include "contiki.h"
diff --git a/platform/z1/dev/light-sensor.h b/platform/z1/dev/light-sensor.h
index 467fec6678c..486e6a8bba6 100644
--- a/platform/z1/dev/light-sensor.h
+++ b/platform/z1/dev/light-sensor.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: light-sensor.h,v 1.2 2010/01/14 20:23:02 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/z1/dev/light.c b/platform/z1/dev/light.c
index 7d739e86f9c..ad1fb88d65d 100644
--- a/platform/z1/dev/light.c
+++ b/platform/z1/dev/light.c
@@ -35,7 +35,6 @@
  * \author
  *      Enric M. Calvo <ecalvo@zolertia.com>, adapted from previous work 
  *
- * @(#)$Id: light.c,v 1.0 2011/02/27 ecalvo $
  */
 
 #include <stdlib.h>
diff --git a/platform/z1/dev/light.h b/platform/z1/dev/light.h
index 09423c6286e..8ea84b9973d 100644
--- a/platform/z1/dev/light.h
+++ b/platform/z1/dev/light.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: light.h,v 1.1 2006/08/02 14:44:46 bg- Exp $
  */
 #ifndef __LIGHT_H__
 #define __LIGHT_H__
diff --git a/platform/z1/dev/radio-sensor.c b/platform/z1/dev/radio-sensor.c
index d041a3c9931..54cbfc7f177 100644
--- a/platform/z1/dev/radio-sensor.c
+++ b/platform/z1/dev/radio-sensor.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: radio-sensor.c,v 1.7 2010/08/25 19:30:53 nifi Exp $
  */
 
 #include "lib/sensors.h"
diff --git a/platform/z1/dev/sky-sensors.c b/platform/z1/dev/sky-sensors.c
index e598b2ad1d8..48ac224282b 100644
--- a/platform/z1/dev/sky-sensors.c
+++ b/platform/z1/dev/sky-sensors.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sky-sensors.c,v 1.3 2010/08/25 19:30:53 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/z1/dev/sky-sensors.h b/platform/z1/dev/sky-sensors.h
index 5021b9e856f..4a5e8d9e18a 100644
--- a/platform/z1/dev/sky-sensors.h
+++ b/platform/z1/dev/sky-sensors.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  * This file is part of the Contiki operating system.
- * $Id: sky-sensors.h,v 1.2 2010/08/25 19:30:53 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/z1/dev/temperature-sensor.c b/platform/z1/dev/temperature-sensor.c
index 78bb7a6ad3f..1d4328d2489 100644
--- a/platform/z1/dev/temperature-sensor.c
+++ b/platform/z1/dev/temperature-sensor.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: temperature-sensor.c,v 1.1 2010/08/25 19:34:06 nifi Exp $
  */
 
 /**
diff --git a/platform/z1/dev/temperature-sensor.h b/platform/z1/dev/temperature-sensor.h
index 174612b17d5..6ac9b77d2d4 100644
--- a/platform/z1/dev/temperature-sensor.h
+++ b/platform/z1/dev/temperature-sensor.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: temperature-sensor.h,v 1.1 2010/08/25 19:34:07 nifi Exp $
  */
 
 /**
diff --git a/platform/z1/dev/xmem.c b/platform/z1/dev/xmem.c
index 88864804635..9d25fda04d7 100644
--- a/platform/z1/dev/xmem.c
+++ b/platform/z1/dev/xmem.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: xmem.c,v 1.2 2011/01/18 15:48:38 nifi Exp $
  */
 
 /**
diff --git a/platform/z1/dev/z1-phidgets.c b/platform/z1/dev/z1-phidgets.c
index 2ebdd1dbb5a..e86c3e2f00b 100644
--- a/platform/z1/dev/z1-phidgets.c
+++ b/platform/z1/dev/z1-phidgets.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: z1-phidgets.c,v 1.3 2010/11/05 10:31:57 joxe Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/z1/dev/z1-phidgets.h b/platform/z1/dev/z1-phidgets.h
index 0493acf5713..8edf3498dd0 100644
--- a/platform/z1/dev/z1-phidgets.h
+++ b/platform/z1/dev/z1-phidgets.h
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: z1-phidgets.h,v 1.2 2010/08/27 12:58:57 joxe Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/platform/z1/node-id.c b/platform/z1/node-id.c
index b16b46a0bd8..344a1b8b6ed 100644
--- a/platform/z1/node-id.c
+++ b/platform/z1/node-id.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: node-id.c,v 1.2 2010/08/26 22:08:11 nifi Exp $
  */
 
 /**
diff --git a/platform/z1/node-id.h b/platform/z1/node-id.h
index f77bd368b72..b31fbab6b42 100644
--- a/platform/z1/node-id.h
+++ b/platform/z1/node-id.h
@@ -30,7 +30,6 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: node-id.h,v 1.1 2010/08/24 16:26:38 joxe Exp $
  */
 
 #ifndef __NODE_ID_H__
diff --git a/platform/z1sp/contiki-z1sp-platform.c b/platform/z1sp/contiki-z1sp-platform.c
index 606ca8d43ae..60272bb003a 100644
--- a/platform/z1sp/contiki-z1sp-platform.c
+++ b/platform/z1sp/contiki-z1sp-platform.c
@@ -30,7 +30,6 @@
  * Author: Enric M. Calvo <ecalvo@zolertia.com> based on previous work by
  *         Niclas Finne <nfi@sics.se>, Joakim Eriksson <joakime@sics.se>
  *
- * $Id: contiki-sky-platform.c,v 1.1 2010/05/03 13:51:11 nifi Exp $
  */
 
 #include "dev/button-sensor.h"
diff --git a/tools/codeprop.c b/tools/codeprop.c
index a3bf9da33c4..5d4df98b9d9 100644
--- a/tools/codeprop.c
+++ b/tools/codeprop.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: codeprop.c,v 1.5 2010/10/19 18:29:05 adamdunkels Exp $
  */
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/tools/collect-view/src/se/sics/contiki/collect/CommandConnection.java b/tools/collect-view/src/se/sics/contiki/collect/CommandConnection.java
index fb97008a7f2..739e47628d5 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/CommandConnection.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/CommandConnection.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: CommandConnection.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/Configurable.java b/tools/collect-view/src/se/sics/contiki/collect/Configurable.java
index 131350369bc..fceecd2f5b2 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/Configurable.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/Configurable.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Configurable.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/Link.java b/tools/collect-view/src/se/sics/contiki/collect/Link.java
index 0989c425df0..30b54edf2b6 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/Link.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/Link.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Link.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/MoteFinder.java b/tools/collect-view/src/se/sics/contiki/collect/MoteFinder.java
index 5000402d880..fa87c69f1e7 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/MoteFinder.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/MoteFinder.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MoteFinder.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/MoteProgrammer.java b/tools/collect-view/src/se/sics/contiki/collect/MoteProgrammer.java
index 25d014ed6e5..dad209e7fa0 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/MoteProgrammer.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/MoteProgrammer.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MoteProgrammer.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/MoteProgrammerProcess.java b/tools/collect-view/src/se/sics/contiki/collect/MoteProgrammerProcess.java
index 1864accbd3d..db9fc3d9d67 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/MoteProgrammerProcess.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/MoteProgrammerProcess.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MoteProgrammerProcess.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/Node.java b/tools/collect-view/src/se/sics/contiki/collect/Node.java
index bcd1fbd0e62..c13c006560a 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/Node.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/Node.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Node.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/SensorData.java b/tools/collect-view/src/se/sics/contiki/collect/SensorData.java
index a82c5b8762e..83f295816ac 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/SensorData.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/SensorData.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SensorData.java,v 1.2 2011/01/09 21:06:10 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/SensorDataAggregator.java b/tools/collect-view/src/se/sics/contiki/collect/SensorDataAggregator.java
index 818e9006e2f..769a257135d 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/SensorDataAggregator.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/SensorDataAggregator.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SensorDataAggregator.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/SensorInfo.java b/tools/collect-view/src/se/sics/contiki/collect/SensorInfo.java
index 96e37ef5247..3b030e0f529 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/SensorInfo.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/SensorInfo.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SensorInfo.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/SerialConnection.java b/tools/collect-view/src/se/sics/contiki/collect/SerialConnection.java
index 289c6237bf3..e5f82204c71 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/SerialConnection.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/SerialConnection.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SerialConnection.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/SerialConnectionListener.java b/tools/collect-view/src/se/sics/contiki/collect/SerialConnectionListener.java
index 081f9eba9ad..a1475a4c108 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/SerialConnectionListener.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/SerialConnectionListener.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SerialConnectionListener.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/SerialDumpConnection.java b/tools/collect-view/src/se/sics/contiki/collect/SerialDumpConnection.java
index e0847b31ed2..0bea38d39e9 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/SerialDumpConnection.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/SerialDumpConnection.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SerialDumpConnection.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/StdinConnection.java b/tools/collect-view/src/se/sics/contiki/collect/StdinConnection.java
index 2c29568c9dd..2c4a9ecdc84 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/StdinConnection.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/StdinConnection.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: StdinConnection.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/Visualizer.java b/tools/collect-view/src/se/sics/contiki/collect/Visualizer.java
index 77024f37bb6..63048aa9f70 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/Visualizer.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/Visualizer.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Visualizer.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/gui/BarChartPanel.java b/tools/collect-view/src/se/sics/contiki/collect/gui/BarChartPanel.java
index 452cc032fe5..9ff0b48be77 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/gui/BarChartPanel.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/gui/BarChartPanel.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: BarChartPanel.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/gui/MapPanel.java b/tools/collect-view/src/se/sics/contiki/collect/gui/MapPanel.java
index dfc16f3373b..759f739c846 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/gui/MapPanel.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/gui/MapPanel.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MapPanel.java,v 1.4 2010/11/23 16:21:48 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/gui/NodeControl.java b/tools/collect-view/src/se/sics/contiki/collect/gui/NodeControl.java
index 5b4babd9596..943305c18b0 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/gui/NodeControl.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/gui/NodeControl.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: NodeControl.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/gui/NodeInfoPanel.java b/tools/collect-view/src/se/sics/contiki/collect/gui/NodeInfoPanel.java
index 9451f9e4cc7..d27a0c97130 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/gui/NodeInfoPanel.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/gui/NodeInfoPanel.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: NodeInfoPanel.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/gui/SerialConsole.java b/tools/collect-view/src/se/sics/contiki/collect/gui/SerialConsole.java
index a7201e462bb..b87c49a566d 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/gui/SerialConsole.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/gui/SerialConsole.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SerialConsole.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/collect-view/src/se/sics/contiki/collect/gui/TimeChartPanel.java b/tools/collect-view/src/se/sics/contiki/collect/gui/TimeChartPanel.java
index cacb4c9baa8..5254363efcd 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/gui/TimeChartPanel.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/gui/TimeChartPanel.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: TimeChartPanel.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/AvrMoteMemory.java b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/AvrMoteMemory.java
index b0cff21de88..661bdedea95 100644
--- a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/AvrMoteMemory.java
+++ b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/AvrMoteMemory.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: AvrMoteMemory.java,v 1.4 2009/11/17 14:30:26 joxe Exp $
  */
 
 package se.sics.cooja.avrmote;
diff --git a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMote.java b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMote.java
index 5f8c155a810..9aeb85e338b 100644
--- a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMote.java
+++ b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMote.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MicaZMote.java,v 1.15 2010/10/04 12:54:01 joxe Exp $
  */
 
 package se.sics.cooja.avrmote;
diff --git a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMoteType.java b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMoteType.java
index afbafb5b13b..5b885e1eafc 100644
--- a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMoteType.java
+++ b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMoteType.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MicaZMoteType.java,v 1.8 2010/02/18 11:13:20 joxe Exp $
  */
 
 package se.sics.cooja.avrmote;
diff --git a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaClock.java b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaClock.java
index 6bbb395e735..8e9171d7b42 100644
--- a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaClock.java
+++ b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaClock.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MicaClock.java,v 1.7 2010/02/05 08:24:57 fros4943 Exp $
  */
 
 package se.sics.cooja.avrmote.interfaces;
diff --git a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZID.java b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZID.java
index 0dd8007eaa7..29a47016e6b 100644
--- a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZID.java
+++ b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZID.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MicaZID.java,v 1.4 2010/02/05 08:24:57 fros4943 Exp $
  */
 
 package se.sics.cooja.avrmote.interfaces;
diff --git a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZLED.java b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZLED.java
index b1e29f97897..7b5341e6ba5 100644
--- a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZLED.java
+++ b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZLED.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MicaZLED.java,v 1.5 2010/02/05 08:24:57 fros4943 Exp $
  */
 
 package se.sics.cooja.avrmote.interfaces;
diff --git a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZRadio.java b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZRadio.java
index d8ae03a1405..ba9192cd6b3 100644
--- a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZRadio.java
+++ b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZRadio.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MicaZRadio.java,v 1.7 2010/02/05 08:24:57 fros4943 Exp $
  */
 
 package se.sics.cooja.avrmote.interfaces;
diff --git a/tools/cooja/apps/collect-view/java/se/sics/cooja/plugins/collectview/CollectView.java b/tools/cooja/apps/collect-view/java/se/sics/cooja/plugins/collectview/CollectView.java
index 3bc18ce140a..d9fe01b0fbd 100644
--- a/tools/cooja/apps/collect-view/java/se/sics/cooja/plugins/collectview/CollectView.java
+++ b/tools/cooja/apps/collect-view/java/se/sics/cooja/plugins/collectview/CollectView.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: CollectView.java,v 1.4 2010/11/12 16:50:38 nifi Exp $
  */
 package se.sics.cooja.plugins.collectview;
 import java.awt.BorderLayout;
diff --git a/tools/cooja/apps/mrm/java/se/sics/mrm/AngleInterval.java b/tools/cooja/apps/mrm/java/se/sics/mrm/AngleInterval.java
index da147c5519c..73e00a1e7da 100644
--- a/tools/cooja/apps/mrm/java/se/sics/mrm/AngleInterval.java
+++ b/tools/cooja/apps/mrm/java/se/sics/mrm/AngleInterval.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: AngleInterval.java,v 1.2 2007/03/23 21:13:43 fros4943 Exp $
  */
 
 package se.sics.mrm;
diff --git a/tools/cooja/apps/mrm/java/se/sics/mrm/AreaViewer.java b/tools/cooja/apps/mrm/java/se/sics/mrm/AreaViewer.java
index 15703d99e36..0d4d2425706 100644
--- a/tools/cooja/apps/mrm/java/se/sics/mrm/AreaViewer.java
+++ b/tools/cooja/apps/mrm/java/se/sics/mrm/AreaViewer.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: AreaViewer.java,v 1.5 2009/02/18 12:08:10 fros4943 Exp $
  */
 
 package se.sics.mrm;
diff --git a/tools/cooja/apps/mrm/java/se/sics/mrm/ChannelModel.java b/tools/cooja/apps/mrm/java/se/sics/mrm/ChannelModel.java
index 74eeff71778..57c10dd88c0 100644
--- a/tools/cooja/apps/mrm/java/se/sics/mrm/ChannelModel.java
+++ b/tools/cooja/apps/mrm/java/se/sics/mrm/ChannelModel.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ChannelModel.java,v 1.4 2009/02/18 12:08:10 fros4943 Exp $
  */
 
 package se.sics.mrm;
diff --git a/tools/cooja/apps/mrm/java/se/sics/mrm/FormulaViewer.java b/tools/cooja/apps/mrm/java/se/sics/mrm/FormulaViewer.java
index 191b1489598..d3d18abd53f 100644
--- a/tools/cooja/apps/mrm/java/se/sics/mrm/FormulaViewer.java
+++ b/tools/cooja/apps/mrm/java/se/sics/mrm/FormulaViewer.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: FormulaViewer.java,v 1.3 2008/02/18 08:21:59 fros4943 Exp $
  */
 
 package se.sics.mrm;
diff --git a/tools/cooja/apps/mrm/java/se/sics/mrm/Interval.java b/tools/cooja/apps/mrm/java/se/sics/mrm/Interval.java
index 21960ef681a..c19390cdf11 100644
--- a/tools/cooja/apps/mrm/java/se/sics/mrm/Interval.java
+++ b/tools/cooja/apps/mrm/java/se/sics/mrm/Interval.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Interval.java,v 1.2 2007/03/23 21:13:43 fros4943 Exp $
  */
 
 package se.sics.mrm;
diff --git a/tools/cooja/apps/mrm/java/se/sics/mrm/MRM.java b/tools/cooja/apps/mrm/java/se/sics/mrm/MRM.java
index 362418ed816..8ba61896104 100644
--- a/tools/cooja/apps/mrm/java/se/sics/mrm/MRM.java
+++ b/tools/cooja/apps/mrm/java/se/sics/mrm/MRM.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MRM.java,v 1.12 2010/12/02 15:25:50 fros4943 Exp $
  */
 
 package se.sics.mrm;
diff --git a/tools/cooja/apps/mrm/java/se/sics/mrm/ObstacleWorld.java b/tools/cooja/apps/mrm/java/se/sics/mrm/ObstacleWorld.java
index 3a687b54dac..d753845d442 100644
--- a/tools/cooja/apps/mrm/java/se/sics/mrm/ObstacleWorld.java
+++ b/tools/cooja/apps/mrm/java/se/sics/mrm/ObstacleWorld.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ObstacleWorld.java,v 1.2 2007/03/23 21:13:43 fros4943 Exp $
  */
 
 package se.sics.mrm;
diff --git a/tools/cooja/apps/mrm/java/se/sics/mrm/RayData.java b/tools/cooja/apps/mrm/java/se/sics/mrm/RayData.java
index 9bde355c9f6..51b067e3dd8 100644
--- a/tools/cooja/apps/mrm/java/se/sics/mrm/RayData.java
+++ b/tools/cooja/apps/mrm/java/se/sics/mrm/RayData.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: RayData.java,v 1.2 2007/03/23 21:13:43 fros4943 Exp $
  */
 
 package se.sics.mrm;
diff --git a/tools/cooja/apps/mrm/java/se/sics/mrm/RayPath.java b/tools/cooja/apps/mrm/java/se/sics/mrm/RayPath.java
index 1b87369217b..6d11dc8dcd0 100644
--- a/tools/cooja/apps/mrm/java/se/sics/mrm/RayPath.java
+++ b/tools/cooja/apps/mrm/java/se/sics/mrm/RayPath.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: RayPath.java,v 1.2 2007/03/23 21:13:43 fros4943 Exp $
  */
 
 package se.sics.mrm;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMote.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMote.java
index b5d8facd369..e0033ac61bb 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMote.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMote.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ESBMote.java,v 1.11 2009/10/27 10:02:48 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java
index e04bca85f8a..934f5f54fbb 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ESBMoteType.java,v 1.13 2010/02/18 11:13:21 joxe Exp $
  */
 
 package se.sics.cooja.mspmote;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspCompileDialog.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspCompileDialog.java
index 4669ea314fd..745053ab124 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspCompileDialog.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspCompileDialog.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MspCompileDialog.java,v 1.2 2010/03/08 14:26:12 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
index 497132c8761..7d6286ed9ca 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MspMote.java,v 1.48 2010/10/04 12:54:01 joxe Exp $
  */
 
 package se.sics.cooja.mspmote;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteMemory.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteMemory.java
index 5c76b4696f9..d85d31d19d8 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteMemory.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteMemory.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: MspMoteMemory.java,v 1.3 2008/03/17 09:54:19 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteTimeEvent.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteTimeEvent.java
index 950c44ceff8..fdab58e0746 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteTimeEvent.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteTimeEvent.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MspMoteTimeEvent.java,v 1.1 2010/02/03 19:10:36 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMote.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMote.java
index 393703430d6..e8d5f32c782 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMote.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMote.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SkyMote.java,v 1.19 2010/09/09 19:56:59 nifi Exp $
  */
 
 package se.sics.cooja.mspmote;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java
index 6afdae7d89b..ec8453bc680 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SkyMoteType.java,v 1.18 2010/03/14 19:45:04 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/CC2420RadioPacketConverter.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/CC2420RadioPacketConverter.java
index 6241a325ea0..51972ada745 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/CC2420RadioPacketConverter.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/CC2420RadioPacketConverter.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: CC2420RadioPacketConverter.java,v 1.16 2010/03/26 13:33:40 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.interfaces;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/CRCCoder.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/CRCCoder.java
index 33b6f0ca0f8..132b11f3e8d 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/CRCCoder.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/CRCCoder.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: CRCCoder.java,v 1.2 2008/03/18 16:55:44 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.interfaces;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/ESBButton.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/ESBButton.java
index c677e6fbd81..99cb607f7a5 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/ESBButton.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/ESBButton.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ESBButton.java,v 1.4 2010/02/05 08:44:57 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.interfaces;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/ESBLED.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/ESBLED.java
index 9dac2d3f7d6..64b328178e2 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/ESBLED.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/ESBLED.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ESBLED.java,v 1.6 2010/02/05 08:44:57 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.interfaces;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/GCRCoder.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/GCRCoder.java
index e184db95d3c..6b9a93a462b 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/GCRCoder.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/GCRCoder.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: GCRCoder.java,v 1.1 2008/02/07 14:54:16 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.interfaces;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspClock.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspClock.java
index 47d4d8c6601..b624b501d8b 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspClock.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspClock.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MspClock.java,v 1.11 2010/02/05 08:44:57 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.interfaces;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspDebugOutput.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspDebugOutput.java
index 0fe83ec6cb9..e72d121c840 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspDebugOutput.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspDebugOutput.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MspDebugOutput.java,v 1.2 2010/01/21 18:02:54 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.interfaces;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspMoteID.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspMoteID.java
index b87227312bf..c8a535f7623 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspMoteID.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspMoteID.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MspMoteID.java,v 1.16 2010/03/08 14:26:12 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.interfaces;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyButton.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyButton.java
index 0bd8ca82cf5..91bf22f330a 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyButton.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyButton.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SkyButton.java,v 1.4 2010/03/29 10:18:14 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.interfaces;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyCoffeeFilesystem.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyCoffeeFilesystem.java
index 56a803843fd..158827ef6c2 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyCoffeeFilesystem.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyCoffeeFilesystem.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SkyCoffeeFilesystem.java,v 1.3 2010/02/05 08:44:57 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.interfaces;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyFlash.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyFlash.java
index 6fc6c3f4d04..5f93f59867f 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyFlash.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyFlash.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SkyFlash.java,v 1.8 2010/09/09 19:56:59 nifi Exp $
  */
 
 package se.sics.cooja.mspmote.interfaces;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyLED.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyLED.java
index bb37ebf05eb..9f3dff307f4 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyLED.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyLED.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SkyLED.java,v 1.3 2010/02/05 08:44:57 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.interfaces;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyTemperature.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyTemperature.java
index fbbbcc6ff1b..e31998712d0 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyTemperature.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyTemperature.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SkyTemperature.java,v 1.1 2010/03/14 19:45:04 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.interfaces;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TR1001Radio.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TR1001Radio.java
index cf08583f996..873c028b003 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TR1001Radio.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TR1001Radio.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: TR1001Radio.java,v 1.20 2010/02/05 08:44:57 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.interfaces;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TR1001RadioPacketConverter.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TR1001RadioPacketConverter.java
index 118e3edca24..16b81a2928a 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TR1001RadioPacketConverter.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TR1001RadioPacketConverter.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: TR1001RadioPacketConverter.java,v 1.6 2010/02/03 13:47:33 nifi Exp $
  */
 
 package se.sics.cooja.mspmote.interfaces;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/BreakpointsUI.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/BreakpointsUI.java
index ede9fc11149..c789339c6ce 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/BreakpointsUI.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/BreakpointsUI.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: BreakpointsUI.java,v 1.5 2009/06/16 12:15:15 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.plugins;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/CodeUI.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/CodeUI.java
index 3e711a76974..c4159228b25 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/CodeUI.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/CodeUI.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: CodeUI.java,v 1.8 2009/09/23 08:16:06 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.plugins;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/CodeVisualizerSkin.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/CodeVisualizerSkin.java
index 466b8d51c24..39236d27e82 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/CodeVisualizerSkin.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/CodeVisualizerSkin.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: CodeVisualizerSkin.java,v 1.2 2010/03/26 12:29:11 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.plugins;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspBreakpoint.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspBreakpoint.java
index 4735d406921..3b421359a27 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspBreakpoint.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspBreakpoint.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MspBreakpoint.java,v 1.4 2010/08/13 10:19:20 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.plugins;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspCLI.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspCLI.java
index cfa08dcca7b..99d7d667805 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspCLI.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspCLI.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MspCLI.java,v 1.5 2010/01/15 10:55:03 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.plugins;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspCycleWatcher.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspCycleWatcher.java
index 53ae6a3d1ab..0495abd09b1 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspCycleWatcher.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspCycleWatcher.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MspCycleWatcher.java,v 1.3 2010/01/15 10:55:03 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.plugins;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspStackWatcher.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspStackWatcher.java
index c45d72952dc..61e3942527d 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspStackWatcher.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspStackWatcher.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MspStackWatcher.java,v 1.7 2010/01/15 10:55:03 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.plugins;
diff --git a/tools/cooja/apps/native_gateway/java/se/sics/cooja/plugins/NativeIPGateway.java b/tools/cooja/apps/native_gateway/java/se/sics/cooja/plugins/NativeIPGateway.java
index 83f9e34a138..7add1c3ead0 100644
--- a/tools/cooja/apps/native_gateway/java/se/sics/cooja/plugins/NativeIPGateway.java
+++ b/tools/cooja/apps/native_gateway/java/se/sics/cooja/plugins/NativeIPGateway.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: NativeIPGateway.java,v 1.12 2010/01/15 10:55:21 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
diff --git a/tools/cooja/apps/serial_socket/java/SerialSocketClient.java b/tools/cooja/apps/serial_socket/java/SerialSocketClient.java
index 5d547dc0462..9bf8dcbc7bc 100644
--- a/tools/cooja/apps/serial_socket/java/SerialSocketClient.java
+++ b/tools/cooja/apps/serial_socket/java/SerialSocketClient.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SerialSocketClient.java,v 1.1 2010/01/27 14:28:26 fros4943 Exp $
  */
 
 import java.awt.BorderLayout;
diff --git a/tools/cooja/apps/serial_socket/java/SerialSocketServer.java b/tools/cooja/apps/serial_socket/java/SerialSocketServer.java
index 6f96803714d..5ec23184c39 100644
--- a/tools/cooja/apps/serial_socket/java/SerialSocketServer.java
+++ b/tools/cooja/apps/serial_socket/java/SerialSocketServer.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SerialSocketServer.java,v 1.3 2010/03/25 08:00:15 fros4943 Exp $
  */
 
 import java.awt.BorderLayout;
diff --git a/tools/cooja/config/test_template.c b/tools/cooja/config/test_template.c
index 072faef9441..e01d8812883 100644
--- a/tools/cooja/config/test_template.c
+++ b/tools/cooja/config/test_template.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: test_template.c,v 1.1 2009/02/20 16:59:52 fros4943 Exp $
  */
 
 #include <jni.h>
diff --git a/tools/cooja/examples/project_new_interface/dummy_intf.c b/tools/cooja/examples/project_new_interface/dummy_intf.c
index a23c243d1aa..06efc996aba 100644
--- a/tools/cooja/examples/project_new_interface/dummy_intf.c
+++ b/tools/cooja/examples/project_new_interface/dummy_intf.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: dummy_intf.c,v 1.2 2008/10/28 16:09:52 fros4943 Exp $
  */
 
 #include "dummy_intf.h"
diff --git a/tools/cooja/examples/project_new_interface/dummy_intf.h b/tools/cooja/examples/project_new_interface/dummy_intf.h
index 551b9e1dc64..0f8ec70cd22 100644
--- a/tools/cooja/examples/project_new_interface/dummy_intf.h
+++ b/tools/cooja/examples/project_new_interface/dummy_intf.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: dummy_intf.h,v 1.1 2007/03/23 23:33:54 fros4943 Exp $
  */
 
 #ifndef __DUMMY_INTF_H__
diff --git a/tools/cooja/examples/project_new_interface/java/DummyInterface.java b/tools/cooja/examples/project_new_interface/java/DummyInterface.java
index ef5e0635cbb..7ee51d3e870 100644
--- a/tools/cooja/examples/project_new_interface/java/DummyInterface.java
+++ b/tools/cooja/examples/project_new_interface/java/DummyInterface.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: DummyInterface.java,v 1.5 2010/12/02 15:27:27 fros4943 Exp $
  */
 
 import java.util.*;
diff --git a/tools/cooja/examples/project_new_plugin/java/MyDummyPlugin.java b/tools/cooja/examples/project_new_plugin/java/MyDummyPlugin.java
index 35b4d89e6f9..3139eaa7d78 100644
--- a/tools/cooja/examples/project_new_plugin/java/MyDummyPlugin.java
+++ b/tools/cooja/examples/project_new_plugin/java/MyDummyPlugin.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MyDummyPlugin.java,v 1.4 2010/02/03 09:54:54 fros4943 Exp $
  */
 
 import java.awt.BorderLayout;
diff --git a/tools/cooja/examples/project_new_radiomedium/java/DummyRadioMedium.java b/tools/cooja/examples/project_new_radiomedium/java/DummyRadioMedium.java
index afcfa6c097e..38c9f85bd07 100644
--- a/tools/cooja/examples/project_new_radiomedium/java/DummyRadioMedium.java
+++ b/tools/cooja/examples/project_new_radiomedium/java/DummyRadioMedium.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: DummyRadioMedium.java,v 1.3 2008/10/28 16:36:48 fros4943 Exp $
  */
 
 import java.util.Collection;
diff --git a/tools/cooja/java/se/sics/cooja/AbstractionLevelDescription.java b/tools/cooja/java/se/sics/cooja/AbstractionLevelDescription.java
index a179957dd34..584f809fa67 100644
--- a/tools/cooja/java/se/sics/cooja/AbstractionLevelDescription.java
+++ b/tools/cooja/java/se/sics/cooja/AbstractionLevelDescription.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: AbstractionLevelDescription.java,v 1.1 2008/02/07 10:29:40 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/AddressMemory.java b/tools/cooja/java/se/sics/cooja/AddressMemory.java
index f50cac2d769..c2402d4c568 100644
--- a/tools/cooja/java/se/sics/cooja/AddressMemory.java
+++ b/tools/cooja/java/se/sics/cooja/AddressMemory.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: AddressMemory.java,v 1.2 2008/02/11 14:02:29 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/COOJAProject.java b/tools/cooja/java/se/sics/cooja/COOJAProject.java
index 4e7984fd384..5e303c5a478 100644
--- a/tools/cooja/java/se/sics/cooja/COOJAProject.java
+++ b/tools/cooja/java/se/sics/cooja/COOJAProject.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: COOJAProject.java,v 1.1 2010/12/02 15:27:08 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/COOJARadioPacket.java b/tools/cooja/java/se/sics/cooja/COOJARadioPacket.java
index 70b9bbafe64..cda3666273c 100644
--- a/tools/cooja/java/se/sics/cooja/COOJARadioPacket.java
+++ b/tools/cooja/java/se/sics/cooja/COOJARadioPacket.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: COOJARadioPacket.java,v 1.1 2008/03/18 12:47:10 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/ClassDescription.java b/tools/cooja/java/se/sics/cooja/ClassDescription.java
index 7203e00afee..3dd74d67856 100644
--- a/tools/cooja/java/se/sics/cooja/ClassDescription.java
+++ b/tools/cooja/java/se/sics/cooja/ClassDescription.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ClassDescription.java,v 1.1 2006/08/21 12:12:57 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/ContikiError.java b/tools/cooja/java/se/sics/cooja/ContikiError.java
index 487fa2a6239..af479a53f16 100644
--- a/tools/cooja/java/se/sics/cooja/ContikiError.java
+++ b/tools/cooja/java/se/sics/cooja/ContikiError.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ContikiError.java,v 1.1 2010/02/21 21:50:58 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/ConvertedRadioPacket.java b/tools/cooja/java/se/sics/cooja/ConvertedRadioPacket.java
index 78cac3c50ac..4fada29dd2e 100644
--- a/tools/cooja/java/se/sics/cooja/ConvertedRadioPacket.java
+++ b/tools/cooja/java/se/sics/cooja/ConvertedRadioPacket.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ConvertedRadioPacket.java,v 1.1 2009/04/01 23:34:45 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/CoojaApplet.java b/tools/cooja/java/se/sics/cooja/CoojaApplet.java
index fbcdb09559b..46456dd396d 100644
--- a/tools/cooja/java/se/sics/cooja/CoojaApplet.java
+++ b/tools/cooja/java/se/sics/cooja/CoojaApplet.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: CoojaApplet.java,v 1.2 2008/04/03 13:59:24 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/CoreComm.java b/tools/cooja/java/se/sics/cooja/CoreComm.java
index 1d9276af056..1e69e4f8fc0 100644
--- a/tools/cooja/java/se/sics/cooja/CoreComm.java
+++ b/tools/cooja/java/se/sics/cooja/CoreComm.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: CoreComm.java,v 1.16 2010/02/03 16:06:04 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/EventQueue.java b/tools/cooja/java/se/sics/cooja/EventQueue.java
index bb4daea8eb2..a1509d2a527 100644
--- a/tools/cooja/java/se/sics/cooja/EventQueue.java
+++ b/tools/cooja/java/se/sics/cooja/EventQueue.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: EventQueue.java,v 1.11 2010/10/04 10:52:26 nifi Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/GUI.java b/tools/cooja/java/se/sics/cooja/GUI.java
index f23b3dce094..d966685b9c0 100644
--- a/tools/cooja/java/se/sics/cooja/GUI.java
+++ b/tools/cooja/java/se/sics/cooja/GUI.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: GUI.java,v 1.174 2010/12/10 17:50:48 nifi Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/MoteInterface.java b/tools/cooja/java/se/sics/cooja/MoteInterface.java
index a1e7461b711..36a67ee8f51 100644
--- a/tools/cooja/java/se/sics/cooja/MoteInterface.java
+++ b/tools/cooja/java/se/sics/cooja/MoteInterface.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MoteInterface.java,v 1.7 2009/11/13 08:41:06 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/MoteInterfaceHandler.java b/tools/cooja/java/se/sics/cooja/MoteInterfaceHandler.java
index 34ab353277f..a83d9725c9c 100644
--- a/tools/cooja/java/se/sics/cooja/MoteInterfaceHandler.java
+++ b/tools/cooja/java/se/sics/cooja/MoteInterfaceHandler.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MoteInterfaceHandler.java,v 1.9 2010/03/14 19:50:34 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/MoteMemory.java b/tools/cooja/java/se/sics/cooja/MoteMemory.java
index 00d0460e3ae..c4b32a1f0f2 100644
--- a/tools/cooja/java/se/sics/cooja/MoteMemory.java
+++ b/tools/cooja/java/se/sics/cooja/MoteMemory.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MoteMemory.java,v 1.2 2007/01/10 14:57:42 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/MotePlugin.java b/tools/cooja/java/se/sics/cooja/MotePlugin.java
index f02be2dfd9c..8fb3db4670a 100644
--- a/tools/cooja/java/se/sics/cooja/MotePlugin.java
+++ b/tools/cooja/java/se/sics/cooja/MotePlugin.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MotePlugin.java,v 1.1 2010/01/15 10:46:12 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/MoteTimeEvent.java b/tools/cooja/java/se/sics/cooja/MoteTimeEvent.java
index b3381a876c3..716bee83c1e 100644
--- a/tools/cooja/java/se/sics/cooja/MoteTimeEvent.java
+++ b/tools/cooja/java/se/sics/cooja/MoteTimeEvent.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MoteTimeEvent.java,v 1.1 2009/05/26 14:19:17 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/Plugin.java b/tools/cooja/java/se/sics/cooja/Plugin.java
index aabf42e168e..1c2f5ef583e 100644
--- a/tools/cooja/java/se/sics/cooja/Plugin.java
+++ b/tools/cooja/java/se/sics/cooja/Plugin.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Plugin.java,v 1.5 2010/01/15 10:46:53 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/PluginType.java b/tools/cooja/java/se/sics/cooja/PluginType.java
index 16084db2517..b61eb93f0c1 100644
--- a/tools/cooja/java/se/sics/cooja/PluginType.java
+++ b/tools/cooja/java/se/sics/cooja/PluginType.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: PluginType.java,v 1.2 2007/01/10 14:57:42 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/Positioner.java b/tools/cooja/java/se/sics/cooja/Positioner.java
index b295e06cc45..178806304d8 100644
--- a/tools/cooja/java/se/sics/cooja/Positioner.java
+++ b/tools/cooja/java/se/sics/cooja/Positioner.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Positioner.java,v 1.3 2009/02/18 13:55:01 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/ProjectConfig.java b/tools/cooja/java/se/sics/cooja/ProjectConfig.java
index 961bf90219d..767ba892218 100644
--- a/tools/cooja/java/se/sics/cooja/ProjectConfig.java
+++ b/tools/cooja/java/se/sics/cooja/ProjectConfig.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ProjectConfig.java,v 1.5 2010/12/02 15:28:06 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/RadioConnection.java b/tools/cooja/java/se/sics/cooja/RadioConnection.java
index 6cf24d722e9..18867359fdf 100644
--- a/tools/cooja/java/se/sics/cooja/RadioConnection.java
+++ b/tools/cooja/java/se/sics/cooja/RadioConnection.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: RadioConnection.java,v 1.12 2009/11/25 15:21:15 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/RadioMedium.java b/tools/cooja/java/se/sics/cooja/RadioMedium.java
index f6a1da1c73c..a579c932f62 100644
--- a/tools/cooja/java/se/sics/cooja/RadioMedium.java
+++ b/tools/cooja/java/se/sics/cooja/RadioMedium.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: RadioMedium.java,v 1.11 2010/12/10 15:55:47 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/RadioPacket.java b/tools/cooja/java/se/sics/cooja/RadioPacket.java
index 3c246ec85e6..cc88250dd99 100644
--- a/tools/cooja/java/se/sics/cooja/RadioPacket.java
+++ b/tools/cooja/java/se/sics/cooja/RadioPacket.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: RadioPacket.java,v 1.2 2009/04/01 23:35:23 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/SimEventCentral.java b/tools/cooja/java/se/sics/cooja/SimEventCentral.java
index 9b2ff72b220..947a2888c35 100644
--- a/tools/cooja/java/se/sics/cooja/SimEventCentral.java
+++ b/tools/cooja/java/se/sics/cooja/SimEventCentral.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: SimEventCentral.java,v 1.4 2010/03/26 09:12:20 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/Simulation.java b/tools/cooja/java/se/sics/cooja/Simulation.java
index 4b21878c113..3e76cbde7a9 100644
--- a/tools/cooja/java/se/sics/cooja/Simulation.java
+++ b/tools/cooja/java/se/sics/cooja/Simulation.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: Simulation.java,v 1.70 2011/01/13 19:05:09 adamdunkels Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/TimeEvent.java b/tools/cooja/java/se/sics/cooja/TimeEvent.java
index 24388c58036..25b24d609c9 100644
--- a/tools/cooja/java/se/sics/cooja/TimeEvent.java
+++ b/tools/cooja/java/se/sics/cooja/TimeEvent.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: TimeEvent.java,v 1.5 2010/10/04 10:11:55 nifi Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/VisPlugin.java b/tools/cooja/java/se/sics/cooja/VisPlugin.java
index d265db8ddd5..968ce27612a 100644
--- a/tools/cooja/java/se/sics/cooja/VisPlugin.java
+++ b/tools/cooja/java/se/sics/cooja/VisPlugin.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: VisPlugin.java,v 1.12 2010/01/15 10:47:36 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/Watchpoint.java b/tools/cooja/java/se/sics/cooja/Watchpoint.java
index c65182a94fd..acd6f982dc9 100644
--- a/tools/cooja/java/se/sics/cooja/Watchpoint.java
+++ b/tools/cooja/java/se/sics/cooja/Watchpoint.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Watchpoint.java,v 1.2 2009/06/16 12:15:27 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/WatchpointMote.java b/tools/cooja/java/se/sics/cooja/WatchpointMote.java
index 0d2185eb6d5..091486fce10 100644
--- a/tools/cooja/java/se/sics/cooja/WatchpointMote.java
+++ b/tools/cooja/java/se/sics/cooja/WatchpointMote.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: WatchpointMote.java,v 1.1 2009/06/11 10:02:11 fros4943 Exp $
  */
 
 package se.sics.cooja;
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMote.java b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMote.java
index d91677a7147..98f30195d93 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMote.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMote.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiMote.java,v 1.18 2010/10/04 12:54:01 joxe Exp $
  */
 
 package se.sics.cooja.contikimote;
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteInterface.java b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteInterface.java
index 723b963b072..552f67714a7 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteInterface.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteInterface.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiMoteInterface.java,v 1.3 2009/02/25 14:46:25 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote;
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java
index bc9358bfe44..3574c76abd7 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiMoteType.java,v 1.44 2010/11/10 13:11:43 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote;
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/ContikiProcess.java b/tools/cooja/java/se/sics/cooja/contikimote/ContikiProcess.java
index 139b29bee26..0e0af8f0781 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/ContikiProcess.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/ContikiProcess.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiProcess.java,v 1.1 2008/10/03 13:02:43 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote;
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiBeeper.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiBeeper.java
index 7a7910c60f2..fed23865b44 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiBeeper.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiBeeper.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiBeeper.java,v 1.11 2010/02/05 08:49:18 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiButton.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiButton.java
index d84cbb9e3f3..ee2a9278fe5 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiButton.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiButton.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiButton.java,v 1.16 2010/02/05 08:49:18 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiCFS.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiCFS.java
index 0ea5aa1d9e9..7c2c984d856 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiCFS.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiCFS.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiCFS.java,v 1.12 2010/11/15 21:44:38 adamdunkels Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiIPAddress.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiIPAddress.java
index d29f1b3b0f1..58f451b2a0b 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiIPAddress.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiIPAddress.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiIPAddress.java,v 1.7 2010/02/05 08:49:18 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLED.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLED.java
index 6e93339aee7..0e80a7c75a1 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLED.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLED.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiLED.java,v 1.8 2010/02/05 08:49:18 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiMoteID.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiMoteID.java
index 4d3d30e4354..0135b4beeb2 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiMoteID.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiMoteID.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiMoteID.java,v 1.8 2010/05/02 09:42:52 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiPIR.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiPIR.java
index 795f41b9e33..508e73edd13 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiPIR.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiPIR.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiPIR.java,v 1.10 2010/02/05 08:49:42 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRS232.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRS232.java
index 3f5ef983aee..c5516049145 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRS232.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRS232.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiRS232.java,v 1.13 2010/02/03 15:49:25 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java
index 0e941fa6fa9..9c5d9de9282 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiRadio.java,v 1.32 2010/03/09 08:11:05 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiVib.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiVib.java
index b4cd9c068cd..02ef46bc274 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiVib.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiVib.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiVib.java,v 1.10 2010/02/05 08:49:42 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/dialogs/AddMoteDialog.java b/tools/cooja/java/se/sics/cooja/dialogs/AddMoteDialog.java
index 06126eb88eb..4d3bcdcaabc 100644
--- a/tools/cooja/java/se/sics/cooja/dialogs/AddMoteDialog.java
+++ b/tools/cooja/java/se/sics/cooja/dialogs/AddMoteDialog.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: AddMoteDialog.java,v 1.10 2009/09/17 13:20:03 fros4943 Exp $
  */
 
 package se.sics.cooja.dialogs;
diff --git a/tools/cooja/java/se/sics/cooja/dialogs/BufferSettings.java b/tools/cooja/java/se/sics/cooja/dialogs/BufferSettings.java
index 3074257a5fa..9c45f6df6a4 100644
--- a/tools/cooja/java/se/sics/cooja/dialogs/BufferSettings.java
+++ b/tools/cooja/java/se/sics/cooja/dialogs/BufferSettings.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: BufferSettings.java,v 1.1 2009/07/03 13:37:41 fros4943 Exp $
  */
 
 package se.sics.cooja.dialogs;
diff --git a/tools/cooja/java/se/sics/cooja/dialogs/CompileContiki.java b/tools/cooja/java/se/sics/cooja/dialogs/CompileContiki.java
index fda1b8699b0..3d9786ae27c 100644
--- a/tools/cooja/java/se/sics/cooja/dialogs/CompileContiki.java
+++ b/tools/cooja/java/se/sics/cooja/dialogs/CompileContiki.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: CompileContiki.java,v 1.8 2010/12/03 15:25:17 fros4943 Exp $
  */
 
 package se.sics.cooja.dialogs;
diff --git a/tools/cooja/java/se/sics/cooja/dialogs/ConfigurationWizard.java b/tools/cooja/java/se/sics/cooja/dialogs/ConfigurationWizard.java
index ba9cc2ddbd9..b26ebeaf489 100644
--- a/tools/cooja/java/se/sics/cooja/dialogs/ConfigurationWizard.java
+++ b/tools/cooja/java/se/sics/cooja/dialogs/ConfigurationWizard.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ConfigurationWizard.java,v 1.9 2010/03/15 11:04:06 fros4943 Exp $
  */
 
 package se.sics.cooja.dialogs;
diff --git a/tools/cooja/java/se/sics/cooja/dialogs/ContikiMoteCompileDialog.java b/tools/cooja/java/se/sics/cooja/dialogs/ContikiMoteCompileDialog.java
index 53b49dbec33..cdd530924a3 100644
--- a/tools/cooja/java/se/sics/cooja/dialogs/ContikiMoteCompileDialog.java
+++ b/tools/cooja/java/se/sics/cooja/dialogs/ContikiMoteCompileDialog.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiMoteCompileDialog.java,v 1.8 2010/11/10 13:11:43 fros4943 Exp $
  */
 
 package se.sics.cooja.dialogs;
diff --git a/tools/cooja/java/se/sics/cooja/dialogs/CreateSimDialog.java b/tools/cooja/java/se/sics/cooja/dialogs/CreateSimDialog.java
index 6e261a39acc..735b1a7dece 100644
--- a/tools/cooja/java/se/sics/cooja/dialogs/CreateSimDialog.java
+++ b/tools/cooja/java/se/sics/cooja/dialogs/CreateSimDialog.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: CreateSimDialog.java,v 1.18 2010/01/15 14:00:43 fros4943 Exp $
  */
 
 package se.sics.cooja.dialogs;
diff --git a/tools/cooja/java/se/sics/cooja/dialogs/ExternalToolsDialog.java b/tools/cooja/java/se/sics/cooja/dialogs/ExternalToolsDialog.java
index 7e7256a457c..4738b258da6 100644
--- a/tools/cooja/java/se/sics/cooja/dialogs/ExternalToolsDialog.java
+++ b/tools/cooja/java/se/sics/cooja/dialogs/ExternalToolsDialog.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ExternalToolsDialog.java,v 1.13 2010/03/10 12:48:35 fros4943 Exp $
  */
 
 package se.sics.cooja.dialogs;
diff --git a/tools/cooja/java/se/sics/cooja/dialogs/ImportAppMoteDialog.java b/tools/cooja/java/se/sics/cooja/dialogs/ImportAppMoteDialog.java
index 39404832aca..0d7276be4d4 100644
--- a/tools/cooja/java/se/sics/cooja/dialogs/ImportAppMoteDialog.java
+++ b/tools/cooja/java/se/sics/cooja/dialogs/ImportAppMoteDialog.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ImportAppMoteDialog.java,v 1.1 2010/01/24 20:06:16 nifi Exp $
  */
 
 package se.sics.cooja.dialogs;
diff --git a/tools/cooja/java/se/sics/cooja/dialogs/MessageList.java b/tools/cooja/java/se/sics/cooja/dialogs/MessageList.java
index 7cebbb445c6..70bf63b5886 100644
--- a/tools/cooja/java/se/sics/cooja/dialogs/MessageList.java
+++ b/tools/cooja/java/se/sics/cooja/dialogs/MessageList.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MessageList.java,v 1.15 2009/11/13 14:27:46 fros4943 Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/cooja/java/se/sics/cooja/dialogs/ProjectDirectoriesDialog.java b/tools/cooja/java/se/sics/cooja/dialogs/ProjectDirectoriesDialog.java
index c28e53af601..64776f1393b 100644
--- a/tools/cooja/java/se/sics/cooja/dialogs/ProjectDirectoriesDialog.java
+++ b/tools/cooja/java/se/sics/cooja/dialogs/ProjectDirectoriesDialog.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ProjectDirectoriesDialog.java,v 1.18 2010/12/07 11:59:55 fros4943 Exp $
  */
 
 package se.sics.cooja.dialogs;
diff --git a/tools/cooja/java/se/sics/cooja/dialogs/TableColumnAdjuster.java b/tools/cooja/java/se/sics/cooja/dialogs/TableColumnAdjuster.java
index af88396a201..ed49d24ef10 100644
--- a/tools/cooja/java/se/sics/cooja/dialogs/TableColumnAdjuster.java
+++ b/tools/cooja/java/se/sics/cooja/dialogs/TableColumnAdjuster.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: TableColumnAdjuster.java,v 1.1 2009/06/12 14:12:59 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
diff --git a/tools/cooja/java/se/sics/cooja/dialogs/UpdateAggregator.java b/tools/cooja/java/se/sics/cooja/dialogs/UpdateAggregator.java
index 392e1fe65c1..63782afcbc9 100644
--- a/tools/cooja/java/se/sics/cooja/dialogs/UpdateAggregator.java
+++ b/tools/cooja/java/se/sics/cooja/dialogs/UpdateAggregator.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: UpdateAggregator.java,v 1.2 2010/03/26 10:11:50 nifi Exp $
  */
 
 package se.sics.cooja.dialogs;
diff --git a/tools/cooja/java/se/sics/cooja/emulatedmote/CRCCoder.java b/tools/cooja/java/se/sics/cooja/emulatedmote/CRCCoder.java
index 7079bcaa99c..a9c89c2f2d4 100644
--- a/tools/cooja/java/se/sics/cooja/emulatedmote/CRCCoder.java
+++ b/tools/cooja/java/se/sics/cooja/emulatedmote/CRCCoder.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: CRCCoder.java,v 1.1 2009/11/10 12:54:39 joxe Exp $
  */
 
 package se.sics.cooja.emulatedmote;
diff --git a/tools/cooja/java/se/sics/cooja/emulatedmote/Radio802154.java b/tools/cooja/java/se/sics/cooja/emulatedmote/Radio802154.java
index 3dcb73ba760..8d55d5f4add 100644
--- a/tools/cooja/java/se/sics/cooja/emulatedmote/Radio802154.java
+++ b/tools/cooja/java/se/sics/cooja/emulatedmote/Radio802154.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Radio802154.java,v 1.2 2010/02/05 09:07:58 fros4943 Exp $
  */
 package se.sics.cooja.emulatedmote;
 
diff --git a/tools/cooja/java/se/sics/cooja/emulatedmote/Radio802154PacketConverter.java b/tools/cooja/java/se/sics/cooja/emulatedmote/Radio802154PacketConverter.java
index 6447462aaac..b1ae3c84b6d 100644
--- a/tools/cooja/java/se/sics/cooja/emulatedmote/Radio802154PacketConverter.java
+++ b/tools/cooja/java/se/sics/cooja/emulatedmote/Radio802154PacketConverter.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Radio802154PacketConverter.java,v 1.1 2009/11/10 12:54:39 joxe Exp $
  */
 
 package se.sics.cooja.emulatedmote;
diff --git a/tools/cooja/java/se/sics/cooja/emulatedmote/RadioByte.java b/tools/cooja/java/se/sics/cooja/emulatedmote/RadioByte.java
index ddbb96b471d..56b4fb33197 100644
--- a/tools/cooja/java/se/sics/cooja/emulatedmote/RadioByte.java
+++ b/tools/cooja/java/se/sics/cooja/emulatedmote/RadioByte.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: RadioByte.java,v 1.1 2009/11/10 12:54:39 joxe Exp $
  */
 
 package se.sics.cooja.emulatedmote;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/ApplicationRadio.java b/tools/cooja/java/se/sics/cooja/interfaces/ApplicationRadio.java
index 87e23b08f70..f7b42c6239f 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/ApplicationRadio.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/ApplicationRadio.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ApplicationRadio.java,v 1.14 2010/08/31 07:35:22 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/Battery.java b/tools/cooja/java/se/sics/cooja/interfaces/Battery.java
index 4b596180234..e43c325561c 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/Battery.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/Battery.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Battery.java,v 1.12 2010/02/03 15:49:24 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/Beeper.java b/tools/cooja/java/se/sics/cooja/interfaces/Beeper.java
index 90d4f9fad24..df016ca934b 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/Beeper.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/Beeper.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Beeper.java,v 1.1 2006/08/21 12:12:58 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/Button.java b/tools/cooja/java/se/sics/cooja/interfaces/Button.java
index df060b83cae..0dc419b96ae 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/Button.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/Button.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Button.java,v 1.1 2006/08/21 12:12:58 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/Clock.java b/tools/cooja/java/se/sics/cooja/interfaces/Clock.java
index a092b761b2e..88990037fed 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/Clock.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/Clock.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Clock.java,v 1.6 2009/05/26 14:24:21 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/CustomDataRadio.java b/tools/cooja/java/se/sics/cooja/interfaces/CustomDataRadio.java
index d673e7cbcc0..7c7ce8f7c5a 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/CustomDataRadio.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/CustomDataRadio.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: CustomDataRadio.java,v 1.1 2008/03/18 12:58:59 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/LED.java b/tools/cooja/java/se/sics/cooja/interfaces/LED.java
index 9e384c5142b..31a1cd4ec51 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/LED.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/LED.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: LED.java,v 1.1 2006/08/21 12:12:59 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/Log.java b/tools/cooja/java/se/sics/cooja/interfaces/Log.java
index 69f8d7e6235..56cc605acfd 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/Log.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/Log.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Log.java,v 1.2 2008/10/03 10:39:49 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/Mote2MoteRelations.java b/tools/cooja/java/se/sics/cooja/interfaces/Mote2MoteRelations.java
index 913c56a9cda..1048a716736 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/Mote2MoteRelations.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/Mote2MoteRelations.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Mote2MoteRelations.java,v 1.7 2010/12/10 17:50:49 nifi Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/MoteAttributes.java b/tools/cooja/java/se/sics/cooja/interfaces/MoteAttributes.java
index 57310c462a3..45643ef2f4c 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/MoteAttributes.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/MoteAttributes.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MoteAttributes.java,v 1.3 2010/05/17 14:21:51 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/MoteID.java b/tools/cooja/java/se/sics/cooja/interfaces/MoteID.java
index 846d9469d43..90eb2352b6d 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/MoteID.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/MoteID.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MoteID.java,v 1.3 2009/11/27 15:53:10 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/PIR.java b/tools/cooja/java/se/sics/cooja/interfaces/PIR.java
index 70f90aaeea6..61349182528 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/PIR.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/PIR.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: PIR.java,v 1.1 2006/08/21 12:12:59 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/PolledAfterActiveTicks.java b/tools/cooja/java/se/sics/cooja/interfaces/PolledAfterActiveTicks.java
index f32d9e8aa18..238a40ccecf 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/PolledAfterActiveTicks.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/PolledAfterActiveTicks.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: PolledAfterActiveTicks.java,v 1.3 2009/03/21 15:41:42 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/PolledAfterAllTicks.java b/tools/cooja/java/se/sics/cooja/interfaces/PolledAfterAllTicks.java
index f74813d7ad1..2884ed85aaa 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/PolledAfterAllTicks.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/PolledAfterAllTicks.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: PolledAfterAllTicks.java,v 1.3 2009/03/09 14:08:54 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeActiveTicks.java b/tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeActiveTicks.java
index 887568241f7..9ddae2b889f 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeActiveTicks.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeActiveTicks.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: PolledBeforeActiveTicks.java,v 1.2 2009/03/09 14:08:54 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeAllTicks.java b/tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeAllTicks.java
index b49ddc41633..114635dbd63 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeAllTicks.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeAllTicks.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: PolledBeforeAllTicks.java,v 1.2 2009/03/09 14:08:54 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/Position.java b/tools/cooja/java/se/sics/cooja/interfaces/Position.java
index 992196d1e89..f70c570b527 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/Position.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/Position.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Position.java,v 1.6 2010/02/05 09:07:58 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/Radio.java b/tools/cooja/java/se/sics/cooja/interfaces/Radio.java
index 49dd82f4ac3..e076b0d782a 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/Radio.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/Radio.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: Radio.java,v 1.11 2009/11/25 16:05:47 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/RimeAddress.java b/tools/cooja/java/se/sics/cooja/interfaces/RimeAddress.java
index b7a8907ff14..36e6c3b386a 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/RimeAddress.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/RimeAddress.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: RimeAddress.java,v 1.5 2010/02/03 10:14:46 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/SerialPort.java b/tools/cooja/java/se/sics/cooja/interfaces/SerialPort.java
index 5c943f126b6..958c6f2d830 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/SerialPort.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/SerialPort.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SerialPort.java,v 1.1 2008/09/17 12:04:27 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
diff --git a/tools/cooja/java/se/sics/cooja/motes/AbstractApplicationMote.java b/tools/cooja/java/se/sics/cooja/motes/AbstractApplicationMote.java
index 437b157651f..b757ce57201 100644
--- a/tools/cooja/java/se/sics/cooja/motes/AbstractApplicationMote.java
+++ b/tools/cooja/java/se/sics/cooja/motes/AbstractApplicationMote.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: AbstractApplicationMote.java,v 1.12 2010/10/04 12:54:01 joxe Exp $
  */
 
 package se.sics.cooja.motes;
diff --git a/tools/cooja/java/se/sics/cooja/motes/AbstractEmulatedMote.java b/tools/cooja/java/se/sics/cooja/motes/AbstractEmulatedMote.java
index c008d017ca5..ab6c8722903 100644
--- a/tools/cooja/java/se/sics/cooja/motes/AbstractEmulatedMote.java
+++ b/tools/cooja/java/se/sics/cooja/motes/AbstractEmulatedMote.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: AbstractEmulatedMote.java,v 1.3 2010/08/13 09:59:41 fros4943 Exp $
  */
 
 package se.sics.cooja.motes;
diff --git a/tools/cooja/java/se/sics/cooja/motes/AbstractWakeupMote.java b/tools/cooja/java/se/sics/cooja/motes/AbstractWakeupMote.java
index 2092b6a79d0..5e04b2a2f2c 100644
--- a/tools/cooja/java/se/sics/cooja/motes/AbstractWakeupMote.java
+++ b/tools/cooja/java/se/sics/cooja/motes/AbstractWakeupMote.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: AbstractWakeupMote.java,v 1.3 2010/10/12 10:58:31 fros4943 Exp $
  */
 
 package se.sics.cooja.motes;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/DGRMConfigurator.java b/tools/cooja/java/se/sics/cooja/plugins/DGRMConfigurator.java
index f33f73956ba..19f6408114b 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/DGRMConfigurator.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/DGRMConfigurator.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: DGRMConfigurator.java,v 1.4 2010/02/03 09:30:38 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/EventListener.java b/tools/cooja/java/se/sics/cooja/plugins/EventListener.java
index b1919470fdf..ab443643127 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/EventListener.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/EventListener.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: EventListener.java,v 1.10 2009/09/17 13:20:48 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/LogListener.java b/tools/cooja/java/se/sics/cooja/plugins/LogListener.java
index d5c2db38725..5dd5660e675 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/LogListener.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/LogListener.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: LogListener.java,v 1.36 2010/11/10 13:03:49 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java b/tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java
index 5f96c031afe..c70f35fa0f5 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: LogScriptEngine.java,v 1.25 2010/11/10 13:05:18 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/MoteInformation.java b/tools/cooja/java/se/sics/cooja/plugins/MoteInformation.java
index c9479f6335b..463d6684f8f 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/MoteInformation.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/MoteInformation.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MoteInformation.java,v 1.9 2010/05/17 09:30:27 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/MoteInterfaceViewer.java b/tools/cooja/java/se/sics/cooja/plugins/MoteInterfaceViewer.java
index 792a1f3b913..7044ad57621 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/MoteInterfaceViewer.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/MoteInterfaceViewer.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MoteInterfaceViewer.java,v 1.10 2010/05/09 22:50:34 nifi Exp $
  */
 
 package se.sics.cooja.plugins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/Notes.java b/tools/cooja/java/se/sics/cooja/plugins/Notes.java
index 3d131eaa63a..e23b20e3558 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/Notes.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/Notes.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Notes.java,v 1.1 2010/03/11 22:11:10 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/RadioLogger.java b/tools/cooja/java/se/sics/cooja/plugins/RadioLogger.java
index 421159c6e0b..071ccf15bab 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/RadioLogger.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/RadioLogger.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: RadioLogger.java,v 1.40 2010/11/15 12:00:54 joxe Exp $
  */
 
 package se.sics.cooja.plugins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/SLIP.java b/tools/cooja/java/se/sics/cooja/plugins/SLIP.java
index 2d3fd34c226..2ffa3915a62 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/SLIP.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/SLIP.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SLIP.java,v 1.1 2009/01/15 13:13:47 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/ScriptMote.java b/tools/cooja/java/se/sics/cooja/plugins/ScriptMote.java
index d4759b8c66d..0cd245a78bc 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/ScriptMote.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/ScriptMote.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ScriptMote.java,v 1.2 2009/09/17 13:20:48 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/ScriptParser.java b/tools/cooja/java/se/sics/cooja/plugins/ScriptParser.java
index af5e91f65da..e6484ceb3e3 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/ScriptParser.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/ScriptParser.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ScriptParser.java,v 1.8 2010/08/17 15:04:15 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/SimInformation.java b/tools/cooja/java/se/sics/cooja/plugins/SimInformation.java
index e12a5c93d23..09ab3b554ab 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/SimInformation.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/SimInformation.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SimInformation.java,v 1.6 2009/05/26 14:27:00 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/TimeLine.java b/tools/cooja/java/se/sics/cooja/plugins/TimeLine.java
index a392bc94802..7a09dec3000 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/TimeLine.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/TimeLine.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: TimeLine.java,v 1.30 2010/10/19 20:31:02 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/VariableWatcher.java b/tools/cooja/java/se/sics/cooja/plugins/VariableWatcher.java
index 659c58203a7..73f4dec52b5 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/VariableWatcher.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/VariableWatcher.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: VariableWatcher.java,v 1.10 2010/01/15 10:54:42 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/Visualizer.java b/tools/cooja/java/se/sics/cooja/plugins/Visualizer.java
index b95d8ac50eb..fa6d272ac37 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/Visualizer.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/Visualizer.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Visualizer.java,v 1.19 2010/12/10 17:50:49 nifi Exp $
  */
 
 package se.sics.cooja.plugins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/VisualizerSkin.java b/tools/cooja/java/se/sics/cooja/plugins/VisualizerSkin.java
index 3515a99c54d..47ee831e5e3 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/VisualizerSkin.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/VisualizerSkin.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: VisualizerSkin.java,v 1.4 2010/02/03 15:49:24 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/analyzers/RadioLoggerAnalyzerSuite.java b/tools/cooja/java/se/sics/cooja/plugins/analyzers/RadioLoggerAnalyzerSuite.java
index f6157308c39..4e6c886f563 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/analyzers/RadioLoggerAnalyzerSuite.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/analyzers/RadioLoggerAnalyzerSuite.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: RadioLoggerAnalyzerSuite.java,v 1.1 2010/03/12 16:02:47 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins.analyzers;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/skins/AddressVisualizerSkin.java b/tools/cooja/java/se/sics/cooja/plugins/skins/AddressVisualizerSkin.java
index e2ced98326a..c095e7323f6 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/skins/AddressVisualizerSkin.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/skins/AddressVisualizerSkin.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: AddressVisualizerSkin.java,v 1.4 2009/11/05 11:54:59 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins.skins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/skins/AttributeVisualizerSkin.java b/tools/cooja/java/se/sics/cooja/plugins/skins/AttributeVisualizerSkin.java
index c189a8689af..a79c24d9ae0 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/skins/AttributeVisualizerSkin.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/skins/AttributeVisualizerSkin.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: AttributeVisualizerSkin.java,v 1.2 2010/05/17 14:32:30 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins.skins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/skins/DGRMVisualizerSkin.java b/tools/cooja/java/se/sics/cooja/plugins/skins/DGRMVisualizerSkin.java
index df2d869004c..d49ab8976f7 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/skins/DGRMVisualizerSkin.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/skins/DGRMVisualizerSkin.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: DGRMVisualizerSkin.java,v 1.1 2010/09/24 12:49:14 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins.skins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/skins/GridVisualizerSkin.java b/tools/cooja/java/se/sics/cooja/plugins/skins/GridVisualizerSkin.java
index aeec2d07890..b34925f6be4 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/skins/GridVisualizerSkin.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/skins/GridVisualizerSkin.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: GridVisualizerSkin.java,v 1.1 2009/08/27 13:59:48 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins.skins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/skins/IDVisualizerSkin.java b/tools/cooja/java/se/sics/cooja/plugins/skins/IDVisualizerSkin.java
index 76c1a02839d..7a654fcc684 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/skins/IDVisualizerSkin.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/skins/IDVisualizerSkin.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: IDVisualizerSkin.java,v 1.3 2009/09/17 13:20:59 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins.skins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/skins/LEDVisualizerSkin.java b/tools/cooja/java/se/sics/cooja/plugins/skins/LEDVisualizerSkin.java
index 47dc8473438..1c3ca5ca312 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/skins/LEDVisualizerSkin.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/skins/LEDVisualizerSkin.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: LEDVisualizerSkin.java,v 1.5 2009/10/28 15:16:21 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins.skins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/skins/LogVisualizerSkin.java b/tools/cooja/java/se/sics/cooja/plugins/skins/LogVisualizerSkin.java
index 29319e24c40..2a2d320f9af 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/skins/LogVisualizerSkin.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/skins/LogVisualizerSkin.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: LogVisualizerSkin.java,v 1.5 2010/02/12 09:25:46 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins.skins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/skins/MoteTypeVisualizerSkin.java b/tools/cooja/java/se/sics/cooja/plugins/skins/MoteTypeVisualizerSkin.java
index 7215ba2794f..81881a9f420 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/skins/MoteTypeVisualizerSkin.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/skins/MoteTypeVisualizerSkin.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MoteTypeVisualizerSkin.java,v 1.1 2009/10/16 13:14:53 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins.skins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/skins/PositionVisualizerSkin.java b/tools/cooja/java/se/sics/cooja/plugins/skins/PositionVisualizerSkin.java
index 2db8901bb8a..38de8d3d1e9 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/skins/PositionVisualizerSkin.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/skins/PositionVisualizerSkin.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: PositionVisualizerSkin.java,v 1.2 2009/09/17 12:38:04 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins.skins;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/skins/UDGMVisualizerSkin.java b/tools/cooja/java/se/sics/cooja/plugins/skins/UDGMVisualizerSkin.java
index 022bc60e353..d2aa2ed8a78 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/skins/UDGMVisualizerSkin.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/skins/UDGMVisualizerSkin.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: UDGMVisualizerSkin.java,v 1.11 2010/09/06 12:00:46 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins.skins;
diff --git a/tools/cooja/java/se/sics/cooja/positioners/EllipsePositioner.java b/tools/cooja/java/se/sics/cooja/positioners/EllipsePositioner.java
index 8b7ebbaf459..fe20aa1eef4 100644
--- a/tools/cooja/java/se/sics/cooja/positioners/EllipsePositioner.java
+++ b/tools/cooja/java/se/sics/cooja/positioners/EllipsePositioner.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: EllipsePositioner.java,v 1.1 2006/08/21 12:13:11 fros4943 Exp $
  */
 
 package se.sics.cooja.positioners;
diff --git a/tools/cooja/java/se/sics/cooja/positioners/LinearPositioner.java b/tools/cooja/java/se/sics/cooja/positioners/LinearPositioner.java
index e8dc7de740f..5b76974c7f0 100644
--- a/tools/cooja/java/se/sics/cooja/positioners/LinearPositioner.java
+++ b/tools/cooja/java/se/sics/cooja/positioners/LinearPositioner.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: LinearPositioner.java,v 1.1 2006/08/21 12:13:11 fros4943 Exp $
  */
 
 package se.sics.cooja.positioners;
diff --git a/tools/cooja/java/se/sics/cooja/positioners/ManualPositioner.java b/tools/cooja/java/se/sics/cooja/positioners/ManualPositioner.java
index b09ed450c4f..8d8349865e0 100644
--- a/tools/cooja/java/se/sics/cooja/positioners/ManualPositioner.java
+++ b/tools/cooja/java/se/sics/cooja/positioners/ManualPositioner.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ManualPositioner.java,v 1.1 2009/02/18 13:55:51 fros4943 Exp $
  */
 
 package se.sics.cooja.positioners;
diff --git a/tools/cooja/java/se/sics/cooja/positioners/RandomPositioner.java b/tools/cooja/java/se/sics/cooja/positioners/RandomPositioner.java
index aef46adc89d..a42a0480184 100644
--- a/tools/cooja/java/se/sics/cooja/positioners/RandomPositioner.java
+++ b/tools/cooja/java/se/sics/cooja/positioners/RandomPositioner.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: RandomPositioner.java,v 1.2 2009/02/18 12:07:19 fros4943 Exp $
  */
 
 package se.sics.cooja.positioners;
diff --git a/tools/cooja/java/se/sics/cooja/radiomediums/AbstractRadioMedium.java b/tools/cooja/java/se/sics/cooja/radiomediums/AbstractRadioMedium.java
index b0b4d1e0ab9..08e59b1dbaa 100644
--- a/tools/cooja/java/se/sics/cooja/radiomediums/AbstractRadioMedium.java
+++ b/tools/cooja/java/se/sics/cooja/radiomediums/AbstractRadioMedium.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: AbstractRadioMedium.java,v 1.15 2010/10/12 10:29:43 fros4943 Exp $
  */
 
 package se.sics.cooja.radiomediums;
diff --git a/tools/cooja/java/se/sics/cooja/radiomediums/DGRMDestinationRadio.java b/tools/cooja/java/se/sics/cooja/radiomediums/DGRMDestinationRadio.java
index cf1dc08ba7b..f733978590b 100644
--- a/tools/cooja/java/se/sics/cooja/radiomediums/DGRMDestinationRadio.java
+++ b/tools/cooja/java/se/sics/cooja/radiomediums/DGRMDestinationRadio.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: DirectedGraphMedium.java,v 1.8 2010/12/02 15:25:50 fros4943 Exp $
  */
 
 package se.sics.cooja.radiomediums;
diff --git a/tools/cooja/java/se/sics/cooja/radiomediums/DestinationRadio.java b/tools/cooja/java/se/sics/cooja/radiomediums/DestinationRadio.java
index 2613af0c639..1d012895f6a 100644
--- a/tools/cooja/java/se/sics/cooja/radiomediums/DestinationRadio.java
+++ b/tools/cooja/java/se/sics/cooja/radiomediums/DestinationRadio.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: DirectedGraphMedium.java,v 1.8 2010/12/02 15:25:50 fros4943 Exp $
  */
 
 package se.sics.cooja.radiomediums;
diff --git a/tools/cooja/java/se/sics/cooja/radiomediums/DirectedGraphMedium.java b/tools/cooja/java/se/sics/cooja/radiomediums/DirectedGraphMedium.java
index 78d48e50a57..9d63c77d36d 100644
--- a/tools/cooja/java/se/sics/cooja/radiomediums/DirectedGraphMedium.java
+++ b/tools/cooja/java/se/sics/cooja/radiomediums/DirectedGraphMedium.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: DirectedGraphMedium.java,v 1.8 2010/12/02 15:25:50 fros4943 Exp $
  */
 
 package se.sics.cooja.radiomediums;
diff --git a/tools/cooja/java/se/sics/cooja/radiomediums/SilentRadioMedium.java b/tools/cooja/java/se/sics/cooja/radiomediums/SilentRadioMedium.java
index bbffff6db98..7ab876b35cb 100644
--- a/tools/cooja/java/se/sics/cooja/radiomediums/SilentRadioMedium.java
+++ b/tools/cooja/java/se/sics/cooja/radiomediums/SilentRadioMedium.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SilentRadioMedium.java,v 1.4 2007/03/23 21:06:23 fros4943 Exp $
  */
 
 package se.sics.cooja.radiomediums;
diff --git a/tools/cooja/java/se/sics/cooja/radiomediums/UDGM.java b/tools/cooja/java/se/sics/cooja/radiomediums/UDGM.java
index 82865c6a4ea..9e637874ab9 100644
--- a/tools/cooja/java/se/sics/cooja/radiomediums/UDGM.java
+++ b/tools/cooja/java/se/sics/cooja/radiomediums/UDGM.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: UDGM.java,v 1.31 2010/09/06 12:00:46 fros4943 Exp $
  */
 
 package se.sics.cooja.radiomediums;
diff --git a/tools/cooja/java/se/sics/cooja/radiomediums/UDGMConstantLoss.java b/tools/cooja/java/se/sics/cooja/radiomediums/UDGMConstantLoss.java
index 4b91f6ead5c..f3952b65d42 100644
--- a/tools/cooja/java/se/sics/cooja/radiomediums/UDGMConstantLoss.java
+++ b/tools/cooja/java/se/sics/cooja/radiomediums/UDGMConstantLoss.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: UDGMConstantLoss.java,v 1.1 2010/09/06 12:00:46 fros4943 Exp $
  */
 
 package se.sics.cooja.radiomediums;
diff --git a/tools/cooja/java/se/sics/cooja/util/ArrayQueue.java b/tools/cooja/java/se/sics/cooja/util/ArrayQueue.java
index e18a1be2962..ee8a00c9ede 100644
--- a/tools/cooja/java/se/sics/cooja/util/ArrayQueue.java
+++ b/tools/cooja/java/se/sics/cooja/util/ArrayQueue.java
@@ -25,7 +25,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ArrayQueue.java,v 1.1 2010/09/09 19:51:53 nifi Exp $
  */
 
 package se.sics.cooja.util;
diff --git a/tools/cooja/java/se/sics/cooja/util/ArrayUtils.java b/tools/cooja/java/se/sics/cooja/util/ArrayUtils.java
index 9f5d407cdfe..9f8002c67e9 100644
--- a/tools/cooja/java/se/sics/cooja/util/ArrayUtils.java
+++ b/tools/cooja/java/se/sics/cooja/util/ArrayUtils.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ArrayUtils.java,v 1.4 2009/11/25 15:43:45 fros4943 Exp $
  */
 
 package se.sics.cooja.util;
diff --git a/tools/cooja/java/se/sics/cooja/util/ExecuteJAR.java b/tools/cooja/java/se/sics/cooja/util/ExecuteJAR.java
index 25de553036e..6ee5ab206be 100644
--- a/tools/cooja/java/se/sics/cooja/util/ExecuteJAR.java
+++ b/tools/cooja/java/se/sics/cooja/util/ExecuteJAR.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ExecuteJAR.java,v 1.10 2010/03/19 15:02:26 fros4943 Exp $
  */
 
 package se.sics.cooja.util;
diff --git a/tools/cooja/java/se/sics/cooja/util/JSyntaxAddBreakpoint.java b/tools/cooja/java/se/sics/cooja/util/JSyntaxAddBreakpoint.java
index b2e394c8c82..cfd9b69436a 100644
--- a/tools/cooja/java/se/sics/cooja/util/JSyntaxAddBreakpoint.java
+++ b/tools/cooja/java/se/sics/cooja/util/JSyntaxAddBreakpoint.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: CodeUI.java,v 1.8 2009/09/23 08:16:06 fros4943 Exp $
  */
 
 package se.sics.cooja.util;
diff --git a/tools/cooja/java/se/sics/cooja/util/JSyntaxRemoveBreakpoint.java b/tools/cooja/java/se/sics/cooja/util/JSyntaxRemoveBreakpoint.java
index 85bb3245de4..b9d03f7776a 100644
--- a/tools/cooja/java/se/sics/cooja/util/JSyntaxRemoveBreakpoint.java
+++ b/tools/cooja/java/se/sics/cooja/util/JSyntaxRemoveBreakpoint.java
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: CodeUI.java,v 1.8 2009/09/23 08:16:06 fros4943 Exp $
  */
 
 package se.sics.cooja.util;
diff --git a/tools/cooja/java/se/sics/cooja/util/StringUtils.java b/tools/cooja/java/se/sics/cooja/util/StringUtils.java
index bcb0a09cef6..b3b6a9ad147 100644
--- a/tools/cooja/java/se/sics/cooja/util/StringUtils.java
+++ b/tools/cooja/java/se/sics/cooja/util/StringUtils.java
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: StringUtils.java,v 1.5 2010/02/25 22:36:08 joxe Exp $
  */
 
 package se.sics.cooja.util;
diff --git a/tools/release-tools/compile-platforms/hello-world.c b/tools/release-tools/compile-platforms/hello-world.c
index e7bd31e5909..bc11ab91ffa 100644
--- a/tools/release-tools/compile-platforms/hello-world.c
+++ b/tools/release-tools/compile-platforms/hello-world.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: hello-world.c,v 1.1 2009/06/18 08:40:57 adamdunkels Exp $
  */
 
 /**
diff --git a/tools/scat.c b/tools/scat.c
index 41234ac81e7..9642acc2751 100644
--- a/tools/scat.c
+++ b/tools/scat.c
@@ -26,7 +26,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
  *
- * $Id: scat.c,v 1.6 2007/05/21 15:22:45 bg- Exp $
  *
  */
 
diff --git a/tools/sky/uip6-bridge/bridge-conf.h b/tools/sky/uip6-bridge/bridge-conf.h
index bd75d250e66..d9670786332 100644
--- a/tools/sky/uip6-bridge/bridge-conf.h
+++ b/tools/sky/uip6-bridge/bridge-conf.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: bridge-conf.h,v 1.8 2010/03/19 12:58:17 nifi Exp $
  */
 
 /**
diff --git a/tools/sky/uip6-bridge/dev/slip.c b/tools/sky/uip6-bridge/dev/slip.c
index 72ffbf61114..9b915ac5ff8 100644
--- a/tools/sky/uip6-bridge/dev/slip.c
+++ b/tools/sky/uip6-bridge/dev/slip.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: slip.c,v 1.2 2010/10/19 18:29:05 adamdunkels Exp $
  */
 
 
diff --git a/tools/sky/uip6-bridge/dev/slip.h b/tools/sky/uip6-bridge/dev/slip.h
index 16beadd32ee..755b1d4c45d 100644
--- a/tools/sky/uip6-bridge/dev/slip.h
+++ b/tools/sky/uip6-bridge/dev/slip.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: slip.h,v 1.1 2009/05/08 12:49:36 joxe Exp $
  */
 
 #ifndef __SLIP_H__
diff --git a/tools/sky/uip6-bridge/uip6-bridge-tap.c b/tools/sky/uip6-bridge/uip6-bridge-tap.c
index 0ca9a6878a5..64c9f6cf7ba 100644
--- a/tools/sky/uip6-bridge/uip6-bridge-tap.c
+++ b/tools/sky/uip6-bridge/uip6-bridge-tap.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uip6-bridge-tap.c,v 1.3 2010/06/14 19:19:17 adamdunkels Exp $
  *
  */
 
diff --git a/tools/stm32w/tapslip6.c b/tools/stm32w/tapslip6.c
index 31ac0ecd23b..0b9d951ce67 100644
--- a/tools/stm32w/tapslip6.c
+++ b/tools/stm32w/tapslip6.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: tapslip6.c,v 1.1 2010/10/25 10:42:41 salvopitru Exp $
  */
 
  /**
diff --git a/tools/stm32w/uip6_bridge/bridge-conf.h b/tools/stm32w/uip6_bridge/bridge-conf.h
index 2c76ab87ad1..30deec66eb2 100644
--- a/tools/stm32w/uip6_bridge/bridge-conf.h
+++ b/tools/stm32w/uip6_bridge/bridge-conf.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: bridge-conf.h,v 1.1 2010/10/25 10:42:41 salvopitru Exp $
  */
 
 /**
diff --git a/tools/stm32w/uip6_bridge/dev/slip.c b/tools/stm32w/uip6_bridge/dev/slip.c
index 7ae2c962643..5dc043d96e3 100644
--- a/tools/stm32w/uip6_bridge/dev/slip.c
+++ b/tools/stm32w/uip6_bridge/dev/slip.c
@@ -29,7 +29,6 @@
 *
 * This file is part of the Contiki operating system.
 *
-* @(#)$Id: slip.c,v 1.1 2010/10/25 10:42:41 salvopitru Exp $
 */
 
 
diff --git a/tools/stm32w/uip6_bridge/dev/slip.h b/tools/stm32w/uip6_bridge/dev/slip.h
index 3130ea6f4b5..755b1d4c45d 100644
--- a/tools/stm32w/uip6_bridge/dev/slip.h
+++ b/tools/stm32w/uip6_bridge/dev/slip.h
@@ -29,7 +29,6 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: slip.h,v 1.1 2010/10/25 10:42:41 salvopitru Exp $
  */
 
 #ifndef __SLIP_H__
diff --git a/tools/stm32w/wpcapslip6/wpcapslip6.c b/tools/stm32w/wpcapslip6/wpcapslip6.c
index 7ad9dd6c02b..21d88cbf78e 100755
--- a/tools/stm32w/wpcapslip6/wpcapslip6.c
+++ b/tools/stm32w/wpcapslip6/wpcapslip6.c
@@ -30,7 +30,6 @@
 *
 * This file is part of the uIP TCP/IP stack.
 *
-* $Id: wpcapslip6.c,v 1.3 2011/01/19 09:22:23 salvopitru Exp $
 */
 
  /**
diff --git a/tools/tapslip6.c b/tools/tapslip6.c
index 8fc0f58894a..baf0b3e6360 100644
--- a/tools/tapslip6.c
+++ b/tools/tapslip6.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: tapslip6.c,v 1.3 2009/11/03 14:00:28 nvt-se Exp $
  *
  */
 
diff --git a/tools/tunslip.c b/tools/tunslip.c
index bde85ec97d7..f08cc45fe23 100644
--- a/tools/tunslip.c
+++ b/tools/tunslip.c
@@ -28,7 +28,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: tunslip.c,v 1.17 2010/11/25 09:17:39 adamdunkels Exp $
  *
  */
 
diff --git a/tools/wpcapslip/wpcap.c b/tools/wpcapslip/wpcap.c
index b154cf43696..b62ddbf25c0 100644
--- a/tools/wpcapslip/wpcap.c
+++ b/tools/wpcapslip/wpcap.c
@@ -30,7 +30,6 @@
  *
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: wpcap.c,v 1.6 2010/10/19 20:30:47 oliverschmidt Exp $
  */
 
 
diff --git a/tools/wpcapslip/wpcapslip.c b/tools/wpcapslip/wpcapslip.c
index 8d21e9ef797..e6e193f90d5 100644
--- a/tools/wpcapslip/wpcapslip.c
+++ b/tools/wpcapslip/wpcapslip.c
@@ -30,7 +30,6 @@
  *
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: wpcapslip.c,v 1.4 2010/10/19 18:29:05 adamdunkels Exp $
  */
 
 
diff --git a/tools/z80/hex2bin/src/hexameter.c b/tools/z80/hex2bin/src/hexameter.c
index 5cb32d8efd8..295f4a2e1d5 100644
--- a/tools/z80/hex2bin/src/hexameter.c
+++ b/tools/z80/hex2bin/src/hexameter.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: hexameter.c,v 1.3 2009/12/15 07:13:14 matsutsuka Exp $
  *
  */
 
diff --git a/tools/z80/hex2bin/src/ihx2bin.c b/tools/z80/hex2bin/src/ihx2bin.c
index 5724a4ffeec..f3726bc0063 100644
--- a/tools/z80/hex2bin/src/ihx2bin.c
+++ b/tools/z80/hex2bin/src/ihx2bin.c
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ihx2bin.c,v 1.3 2009/12/15 07:13:14 matsutsuka Exp $
  *
  */
 
diff --git a/tools/z80/hex2bin/src/ihx2bin.h b/tools/z80/hex2bin/src/ihx2bin.h
index 43c0c11ce37..ee2cc29ae95 100644
--- a/tools/z80/hex2bin/src/ihx2bin.h
+++ b/tools/z80/hex2bin/src/ihx2bin.h
@@ -27,7 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ihx2bin.h,v 1.3 2009/12/15 07:13:14 matsutsuka Exp $
  *
  */