diff --git a/urjtag/configure.ac b/urjtag/configure.ac
index c4508770..8becd5dd 100644
--- a/urjtag/configure.ac
+++ b/urjtag/configure.ac
@@ -158,7 +158,7 @@ AS_IF([test "x$with_libusb" != xno], [
         ;;
       esac
     ],[
-      AC_PATH_TOOL(LIBUSB_CONFIG, libusb-config, no) 
+      AC_PATH_TOOL(LIBUSB_CONFIG, libusb-config, no)
       AS_IF([test "$LIBUSB_CONFIG" != "no"],[
         LIBUSB_LIBS=`$LIBUSB_CONFIG --libs`
         LIBUSB_CFLAGS=`$LIBUSB_CONFIG --cflags`
@@ -195,7 +195,7 @@ AS_IF([test "x$with_libftdi" != xno], [
       LIBFTDI_LIBS="-L$with_libftdi -lftdi"
       LIBFTDI_CFLAGS="-I$with_libftdi"
     ],[
-      AC_PATH_TOOL(LIBFTDI_CONFIG, libftdi-config, no) 
+      AC_PATH_TOOL(LIBFTDI_CONFIG, libftdi-config, no)
       AS_IF([test "$LIBFTDI_CONFIG" != "no"],[
         LIBFTDI_LIBS=`$LIBFTDI_CONFIG --libs`
         LIBFTDI_CFLAGS=`$LIBFTDI_CONFIG --cflags`
diff --git a/urjtag/include/urjtag/error.h b/urjtag/include/urjtag/error.h
index 843a964a..6b36ea7c 100644
--- a/urjtag/include/urjtag/error.h
+++ b/urjtag/include/urjtag/error.h
@@ -1,5 +1,5 @@
 /*
- * $Id: error.h 1519 2009-04-22 23:12:44Z rfhh $
+ * $Id$
  *
  * Copyright (C) 2009, Rutger Hofman, VU Amsterdam
  *
diff --git a/urjtag/include/urjtag/jim.h b/urjtag/include/urjtag/jim.h
index 3a5ce2fe..7c85b933 100644
--- a/urjtag/include/urjtag/jim.h
+++ b/urjtag/include/urjtag/jim.h
@@ -1,5 +1,5 @@
 /*
- * $Id: jim.h $
+ * $Id$
  *
  * Copyright (C) 2008 Kolja Waschk <kawk>
  *
diff --git a/urjtag/include/urjtag/log.h b/urjtag/include/urjtag/log.h
index 69a91a61..95b4d340 100644
--- a/urjtag/include/urjtag/log.h
+++ b/urjtag/include/urjtag/log.h
@@ -1,5 +1,5 @@
 /*
- * $Id: log.h 1519 2009-04-22 23:12:44Z rfhh $
+ * $Id$
  *
  * Copyright (C) 2009, Rutger Hofman, VU Amsterdam
  *
diff --git a/urjtag/include/urjtag/params.h b/urjtag/include/urjtag/params.h
index 712fa5d8..5b2d9374 100644
--- a/urjtag/include/urjtag/params.h
+++ b/urjtag/include/urjtag/params.h
@@ -1,5 +1,5 @@
 /*
- * $Id: params.h 1606 2009-05-19 15:06:20Z rfhh $
+ * $Id$
  *
  * Parameter list, in the vein of X parameter passing
  * Copyright (C) 2009 VU Amsterdam
diff --git a/urjtag/include/urjtag/parse.h b/urjtag/include/urjtag/parse.h
index 7acb51c3..e0506a9b 100644
--- a/urjtag/include/urjtag/parse.h
+++ b/urjtag/include/urjtag/parse.h
@@ -1,5 +1,5 @@
 /*
- * $Id: parse.h 1544 2009-05-01 12:55:19Z rfhh $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  *
diff --git a/urjtag/include/urjtag/part.h b/urjtag/include/urjtag/part.h
index 7d2709f1..dd8d761b 100644
--- a/urjtag/include/urjtag/part.h
+++ b/urjtag/include/urjtag/part.h
@@ -81,7 +81,7 @@ int urj_part_instruction_length_set (urj_part_t *part, int length);
  * @param code string that contains the bit pattern for the default instruction
  * @param data_register default data register for instruction (e.g. BR)
  */
-urj_part_instruction_t *urj_part_instruction_define (urj_part_t *part, 
+urj_part_instruction_t *urj_part_instruction_define (urj_part_t *part,
                                                      const char *instruction,
                                                      const char *code,
                                                      const char *data_register);
diff --git a/urjtag/include/urjtag/svf.h b/urjtag/include/urjtag/svf.h
index 78d4f89a..5c1720ed 100644
--- a/urjtag/include/urjtag/svf.h
+++ b/urjtag/include/urjtag/svf.h
@@ -39,7 +39,7 @@
  * Checks the jtag-environment (availability of SIR instruction and SDR
  * register). Initializes all svf-global variables and performs clean-up
  * afterwards.
- * 
+ *
  * @param chain            pointer to global chain
  * @param SVF_FILE         file handle of SVF file
  * @param stop_on_mismatch 1 = stop upon tdo mismatch
diff --git a/urjtag/include/urjtag/types.h b/urjtag/include/urjtag/types.h
index c0c385ac..f05cc1ea 100644
--- a/urjtag/include/urjtag/types.h
+++ b/urjtag/include/urjtag/types.h
@@ -1,5 +1,5 @@
 /*
- * $Id: urjtag.h 1525 2009-04-23 15:56:49Z rfhh $
+ * $Id$
  *
  * Global opaque types that had better be predefined
  * Copyright (C) 2009, Rutger Hofman
diff --git a/urjtag/include/urjtag/urjtag.h.in b/urjtag/include/urjtag/urjtag.h.in
index 7da5dd47..9fddfafa 100644
--- a/urjtag/include/urjtag/urjtag.h.in
+++ b/urjtag/include/urjtag/urjtag.h.in
@@ -1,5 +1,5 @@
 /*
- * $Id: urjtag.h 1525 2009-04-23 15:56:49Z rfhh $
+ * $Id$
  *
  * Public include file for the UrJTAG library.
  * Copyright (C) 2009, Rutger Hofman
diff --git a/urjtag/src/apps/jtag/Makefile.am b/urjtag/src/apps/jtag/Makefile.am
index c0e8802f..8e7cf8ad 100644
--- a/urjtag/src/apps/jtag/Makefile.am
+++ b/urjtag/src/apps/jtag/Makefile.am
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.am 1531 2009-04-24 15:28:59Z rfhh $
+# $Id$
 #
 # Copyright (C) 2002 ETC s.r.o.
 #
diff --git a/urjtag/src/bsdl/bsdl_bison.y b/urjtag/src/bsdl/bsdl_bison.y
index 31a2f044..a1ab5f6a 100644
--- a/urjtag/src/bsdl/bsdl_bison.y
+++ b/urjtag/src/bsdl/bsdl_bison.y
@@ -717,7 +717,7 @@ Update_Field_List      : Update_Field
                        | Update_Field_List COMMA Update_Field
 ;
 Update_Field           : DECIMAL_NUMBER
-                       | DECIMAL_NUMBER COLON 
+                       | DECIMAL_NUMBER COLON
                          { urj_bsdl_flex_set_hex (priv_data->scanner); }
                          Data_Expression
                          { urj_bsdl_flex_set_decimal (priv_data->scanner); }
@@ -1125,7 +1125,7 @@ urj_bsdl_sem_deinit (urj_bsdl_parser_priv_t *priv)
  *
  * Initializes storage elements in the private parser structure that are
  * used for parser maintenance purposes.
- * Subsequently calls initializer functions for the scanner and the semantic 
+ * Subsequently calls initializer functions for the scanner and the semantic
  * parts.
  *
  * Parameters
diff --git a/urjtag/src/bsdl/vhdl_bison.y b/urjtag/src/bsdl/vhdl_bison.y
index a6cf3352..67f6d0a4 100644
--- a/urjtag/src/bsdl/vhdl_bison.y
+++ b/urjtag/src/bsdl/vhdl_bison.y
@@ -516,7 +516,7 @@ VHDL_Attribute_Types : VHDL_Attr_Boolean
                        }
 ;
 VHDL_Attr_Boolean  : IDENTIFIER OF IDENTIFIER COLON SIGNAL IS Boolean SEMICOLON
-                     { 
+                     {
                        //set_attr_bool (priv_data, $1, $7);
                        //free ($3);
                        /* skip boolean attributes for the time being */
@@ -831,7 +831,7 @@ urj_vhdl_sem_deinit (urj_vhdl_parser_priv_t *priv_data)
  *
  * Initializes storage elements in the private parser structure that are
  * used for parser maintenance purposes.
- * Subsequently calls initializer functions for the scanner and the semantic 
+ * Subsequently calls initializer functions for the scanner and the semantic
  * parts.
  *
  * Parameters
diff --git a/urjtag/src/bus/arm9tdmi.c b/urjtag/src/bus/arm9tdmi.c
index a2586457..4d9ce639 100644
--- a/urjtag/src/bus/arm9tdmi.c
+++ b/urjtag/src/bus/arm9tdmi.c
@@ -123,7 +123,7 @@ static void
 arm9tdmi_exec_instruction(urj_bus_t *bus, unsigned int c1_inst, unsigned int c1_data, unsigned int flags)
 {
     int i;
- 
+
     for (i = 0; i < 32; i++)
 	scan1->in->data[66-i] = (c1_inst >> i) & 1;
     scan1->in->data[34] = flags;
diff --git a/urjtag/src/bus/bscoach.c b/urjtag/src/bus/bscoach.c
index 1965375d..6e00d89d 100644
--- a/urjtag/src/bus/bscoach.c
+++ b/urjtag/src/bus/bscoach.c
@@ -3,8 +3,8 @@
  *
  * Busdriver for flashaccess on the Goepel "Boundary Scan Coach" training board
  * www.goepel.com
- * The flash has 1Mbit but only 15 address lines are connected. 
- * So only 4Kbit can be accessed. 
+ * The flash has 1Mbit but only 15 address lines are connected.
+ * So only 4Kbit can be accessed.
  * Erfurt, Oct. 10th M. Schneider www.masla.de
  *
  * This program is free software; you can redistribute it and/or
diff --git a/urjtag/src/bus/buses_list.h b/urjtag/src/bus/buses_list.h
index 1e557b81..cc0b986c 100644
--- a/urjtag/src/bus/buses_list.h
+++ b/urjtag/src/bus/buses_list.h
@@ -1,5 +1,5 @@
 /*
- * $Id: buses.h 1687 2009-12-29 23:53:09Z arniml $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  *
diff --git a/urjtag/src/bus/ejtag_dma.c b/urjtag/src/bus/ejtag_dma.c
index 986fbabc..eb0afe27 100644
--- a/urjtag/src/bus/ejtag_dma.c
+++ b/urjtag/src/bus/ejtag_dma.c
@@ -29,7 +29,7 @@
  * Documentation:
  * [1] MIPS Licensees, "MIPS EJTAG Debug Solution", 980818 Rev. 2.0.0
  * [2] MIPS Technologies, Inc. "EJTAG Specification", 2001-02-15, Rev. 2.60
- * 
+ *
  *
  */
 
@@ -205,7 +205,7 @@ ejtag_dma_write (urj_bus_t *bus, unsigned int addr, unsigned int data, int sz)
     urj_part_set_instruction (bus->part, "EJTAG_CONTROL");
     urj_tap_chain_shift_instructions (bus->chain);
     urj_tap_register_fill (ejctrl->in, 0);
-    ejctrl->in->data[PrAcc] = 1;        // Processor access 
+    ejctrl->in->data[PrAcc] = 1;        // Processor access
     ejctrl->in->data[ProbEn] = 1;
     ejctrl->in->data[DmaAcc] = 1;       // DMA operation request */
     ejctrl->in->data[DstRt] = 1;
@@ -277,7 +277,7 @@ ejtag_dma_read (urj_bus_t *bus, unsigned int addr, int sz)
     urj_part_set_instruction (bus->part, "EJTAG_CONTROL");
     urj_tap_chain_shift_instructions (bus->chain);
     urj_tap_register_fill (ejctrl->in, 0);
-    ejctrl->in->data[PrAcc] = 1;        // Processor access 
+    ejctrl->in->data[PrAcc] = 1;        // Processor access
     ejctrl->in->data[ProbEn] = 1;
     ejctrl->in->data[DmaAcc] = 1;       // DMA operation request */
     ejctrl->in->data[DstRt] = 1;
diff --git a/urjtag/src/bus/ixp465.c b/urjtag/src/bus/ixp465.c
index f324c6f0..3a5d092f 100644
--- a/urjtag/src/bus/ixp465.c
+++ b/urjtag/src/bus/ixp465.c
@@ -57,8 +57,8 @@ typedef struct {
  *
  */
 static urj_bus_t *
-ixp465_bus_new (urj_chain_t *chain, 
-                const urj_bus_driver_t *driver, 
+ixp465_bus_new (urj_chain_t *chain,
+                const urj_bus_driver_t *driver,
                 const urj_param_t *cmd_params[])
 {
     urj_bus_t *bus;
@@ -80,7 +80,7 @@ ixp465_bus_new (urj_chain_t *chain,
 
 //  CHAIN = chain;
 //  PART = part = chain->parts->parts[chain->active_part];
-        
+
     bus = urj_bus_generic_new (chain, driver, sizeof (bus_params_t));
          if (bus == NULL)
                  return NULL;
diff --git a/urjtag/src/bus/writemem.c b/urjtag/src/bus/writemem.c
index b0cc50c8..9d51d032 100644
--- a/urjtag/src/bus/writemem.c
+++ b/urjtag/src/bus/writemem.c
@@ -2,7 +2,7 @@
  * $Id$
  *
  * Written by Kent Palmkvist (kentp@isy.liu.se>, 2005.
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
diff --git a/urjtag/src/cmd/cmd_debug.c b/urjtag/src/cmd/cmd_debug.c
index a0734203..96641940 100644
--- a/urjtag/src/cmd/cmd_debug.c
+++ b/urjtag/src/cmd/cmd_debug.c
@@ -1,5 +1,5 @@
 /*
- * $Id: debug.c,v 1.0 2005/10/10 00:00:0 DJF $
+ * $Id$
  *
  * Copyright (C) 2005 Protoparts
  *
diff --git a/urjtag/src/cmd/cmd_idcode.c b/urjtag/src/cmd/cmd_idcode.c
index e4bd2e68..0464b67e 100644
--- a/urjtag/src/cmd/cmd_idcode.c
+++ b/urjtag/src/cmd/cmd_idcode.c
@@ -1,5 +1,5 @@
 /*
- * $Id: idcode.c 1102 2008-02-27 03:38:31Z jiez $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  *
diff --git a/urjtag/src/cmd/cmd_list.h b/urjtag/src/cmd/cmd_list.h
index 0d043411..83459d14 100644
--- a/urjtag/src/cmd/cmd_list.h
+++ b/urjtag/src/cmd/cmd_list.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cmd.h 1637 2009-05-28 14:38:54Z rfhh $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  * All rights reserved.
diff --git a/urjtag/src/cmd/cmd_print.c b/urjtag/src/cmd/cmd_print.c
index c3859670..71cb9d42 100644
--- a/urjtag/src/cmd/cmd_print.c
+++ b/urjtag/src/cmd/cmd_print.c
@@ -103,7 +103,7 @@ cmd_print_run (urj_chain_t *chain, char *params[])
                     urj_log (URJ_LOG_LEVEL_NORMAL, "\tinput=%s",
                              s->input->name);
                 if (s->output)
-                    urj_log (URJ_LOG_LEVEL_NORMAL, "\toutput=%s", 
+                    urj_log (URJ_LOG_LEVEL_NORMAL, "\toutput=%s",
                              s->output->name);
 
                 for (sa = part->saliases; sa != NULL; sa = sa->next)
diff --git a/urjtag/src/cmd/cmd_scan.c b/urjtag/src/cmd/cmd_scan.c
index 36e4ca17..3d7e7ffa 100644
--- a/urjtag/src/cmd/cmd_scan.c
+++ b/urjtag/src/cmd/cmd_scan.c
@@ -1,5 +1,5 @@
 /*
- * $Id: scan.c 733 2007-11-07 22:21:33Z arniml $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  *
diff --git a/urjtag/src/cmd/cmd_set.c b/urjtag/src/cmd/cmd_set.c
index 6d2f5c33..da0c1f57 100644
--- a/urjtag/src/cmd/cmd_set.c
+++ b/urjtag/src/cmd/cmd_set.c
@@ -99,7 +99,7 @@ cmd_set_run (urj_chain_t *chain, char *params[])
                        params[2]);
         return URJ_STATUS_FAIL;
     }
-    
+
     return urj_part_set_signal (part, s, dir, data);
 }
 
diff --git a/urjtag/src/cmd/cmd_shell.c b/urjtag/src/cmd/cmd_shell.c
index e32d35d0..0d006071 100644
--- a/urjtag/src/cmd/cmd_shell.c
+++ b/urjtag/src/cmd/cmd_shell.c
@@ -1,5 +1,5 @@
 /*
- * $Id: shell.c,v 1.6 2003/08/19 08:42:20 telka Exp $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  *
diff --git a/urjtag/src/cmd/cmd_test.c b/urjtag/src/cmd/cmd_test.c
index ea916706..585755ea 100644
--- a/urjtag/src/cmd/cmd_test.c
+++ b/urjtag/src/cmd/cmd_test.c
@@ -1,5 +1,5 @@
 /*
- * $Id: test.c,v 1.0 2005/10/10 00:00:0 DJF $
+ * $Id$
  *
  * Copyright (C) 2005 Protoparts
  *
diff --git a/urjtag/src/flash/Makefile.am b/urjtag/src/flash/Makefile.am
index 24879c96..5806cdc6 100644
--- a/urjtag/src/flash/Makefile.am
+++ b/urjtag/src/flash/Makefile.am
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.am 506 2003-08-13 10:05:15Z telka $
+# $Id$
 #
 # Copyright (C) 2002 ETC s.r.o.
 #
diff --git a/urjtag/src/flash/amd.h b/urjtag/src/flash/amd.h
index f0a42a10..63617250 100644
--- a/urjtag/src/flash/amd.h
+++ b/urjtag/src/flash/amd.h
@@ -1,5 +1,5 @@
 /*
- * $Id: flash.h 1554 2009-05-03 16:06:22Z rfhh $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  * All rights reserved.
diff --git a/urjtag/src/flash/amd_flash.c b/urjtag/src/flash/amd_flash.c
index 77f44507..d62f9627 100644
--- a/urjtag/src/flash/amd_flash.c
+++ b/urjtag/src/flash/amd_flash.c
@@ -159,7 +159,7 @@ urj_flash_amd_detect (urj_bus_t *bus, uint32_t adr,
                            (size_t) 1, sizeof (urj_flash_cfi_chip_t));
             return URJ_STATUS_FAIL;
         }
-        (*cfi_array)->cfi_chips[i]->width = 1;        //ba;           
+        (*cfi_array)->cfi_chips[i]->width = 1;        //ba;
         cfi = &(*cfi_array)->cfi_chips[i]->cfi;
 
         cfi->identification_string.pri_id_code = CFI_VENDOR_NULL;
diff --git a/urjtag/src/flash/flash.h b/urjtag/src/flash/flash.h
index b7b01e3b..51c55254 100644
--- a/urjtag/src/flash/flash.h
+++ b/urjtag/src/flash/flash.h
@@ -1,5 +1,5 @@
 /*
- * $Id: flash.h 1554 2009-05-03 16:06:22Z rfhh $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  * All rights reserved.
diff --git a/urjtag/src/flash/jedec.h b/urjtag/src/flash/jedec.h
index ec0f19f2..0bd10695 100644
--- a/urjtag/src/flash/jedec.h
+++ b/urjtag/src/flash/jedec.h
@@ -1,5 +1,5 @@
 /*
- * $Id: jedec.h 1510 2009-04-21 17:29:52Z rfhh $
+ * $Id$
  *
  * Copyright (C) 2003 Matan Ziv-Av
  *
diff --git a/urjtag/src/flash/jedec_exp.c b/urjtag/src/flash/jedec_exp.c
index a8d9379c..ae9b7fc6 100644
--- a/urjtag/src/flash/jedec_exp.c
+++ b/urjtag/src/flash/jedec_exp.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  *
- * Written by Kolja Waschk, 2008, 
+ * Written by Kolja Waschk, 2008,
  * partially based on snippets from jedec.c/amd_flash.c/cfi.c
  */
 
diff --git a/urjtag/src/global/Makefile.am b/urjtag/src/global/Makefile.am
index fb7b7d3c..3fa82f0b 100644
--- a/urjtag/src/global/Makefile.am
+++ b/urjtag/src/global/Makefile.am
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.am 1531 2009-04-24 15:28:59Z rfhh $
+# $Id$
 #
 # Copyright (C) 2003 ETC s.r.o.
 #
diff --git a/urjtag/src/global/log-error.c b/urjtag/src/global/log-error.c
index 8f9db1a2..f59b6249 100644
--- a/urjtag/src/global/log-error.c
+++ b/urjtag/src/global/log-error.c
@@ -1,5 +1,5 @@
 /*
- * $Id: urjtag.c 1539 2009-05-01 12:02:08Z rfhh $
+ * $Id$
  *
  * Copyright (C) 2009 Rutger Hofman, VU Amsterdam
  *
diff --git a/urjtag/src/global/params.c b/urjtag/src/global/params.c
index b1d7aa6e..733baa75 100644
--- a/urjtag/src/global/params.c
+++ b/urjtag/src/global/params.c
@@ -1,5 +1,5 @@
 /*
- * $Id: buses.c 1606 2009-05-19 15:06:20Z rfhh $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  *
diff --git a/urjtag/src/jim/Makefile.am b/urjtag/src/jim/Makefile.am
index d89abf32..971ea901 100644
--- a/urjtag/src/jim/Makefile.am
+++ b/urjtag/src/jim/Makefile.am
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.am $
+# $Id$
 #
 # Copyright (C) 2008 Kolja Waschk <kawk>
 #
diff --git a/urjtag/src/jim/README.jim b/urjtag/src/jim/README.jim
index 23b31c2d..1891c7bd 100644
--- a/urjtag/src/jim/README.jim
+++ b/urjtag/src/jim/README.jim
@@ -3,7 +3,7 @@
 # UrJTAG. The connection between UrJTAG and the code here currently is by means
 # of a special "cable" named "jim", which can access a virtual chain of
 # devices. The only device yet is "some_cpu", which is automatically put in
-# the chain when you type "cable jim". 
+# the chain when you type "cable jim".
 
 cable jim
 bsdl path .
diff --git a/urjtag/src/jim/intel_28f800b3.c b/urjtag/src/jim/intel_28f800b3.c
index c2d363a7..ff9cbf25 100644
--- a/urjtag/src/jim/intel_28f800b3.c
+++ b/urjtag/src/jim/intel_28f800b3.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tap.c $
+ * $Id$
  *
  * Copyright (C) 2008 Kolja Waschk <kawk>
  *
diff --git a/urjtag/src/jim/jim_tap.c b/urjtag/src/jim/jim_tap.c
index b2c134fd..15635722 100644
--- a/urjtag/src/jim/jim_tap.c
+++ b/urjtag/src/jim/jim_tap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tap.c $
+ * $Id$
  *
  * Copyright (C) 2008 Kolja Waschk <kawk>
  *
diff --git a/urjtag/src/jim/some_cpu.bsd b/urjtag/src/jim/some_cpu.bsd
index 1a748b27..3850a132 100644
--- a/urjtag/src/jim/some_cpu.bsd
+++ b/urjtag/src/jim/some_cpu.bsd
@@ -1,5 +1,5 @@
 --
--- $Id: $
+-- $Id$
 --
 -- BSDL definitions for "some_cpu" of "JTAG target simulator"
 --
@@ -40,36 +40,36 @@
 -- sub io_pin($$$$$)
 -- {
 --   my ($inbitno, $outbitno, $ctrlbitno, $name,$dir) = @_;
--- 
---   if($dir eq 'inout' || $dir eq 'in') { 
+--
+--   if($dir eq 'inout' || $dir eq 'in') {
 --     printf '"%d (BC_1, %s, input, X), " &%s', $inbitno, $name, "\n";
 --   } else {
---     printf '"%d (BC_1, *, internal, X), " &%s', $inbitno, "\n"; 
+--     printf '"%d (BC_1, *, internal, X), " &%s', $inbitno, "\n";
 --   };
 --   if($dir ne 'in') {
 --     printf '"%d (BC_1, %s, output3, X, %d, 0, Z), " &%s', $outbitno, $name, $ctrlbitno, "\n";
 --     printf '"%d (BC_1, *, control, 0), " &%s', $ctrlbitno, "\n";
 --   }
 -- }
--- 
+--
 -- #######################################
--- 
+--
 -- io_pin(100, 96, 103, 'OE','out');
 -- io_pin(101, 97, 104, 'WE','out');
 -- io_pin(102, 98, 105, 'CS','out');
 -- io_pin(99,  0,  0, 'RESET','in');
 -- $bsi = 106;
--- 
+--
 -- for(my $i=0;$i<32; $i++) {
 --   # address output  in   0.. 31
---   # address buffer  in  
+--   # address buffer  in
 --   # address control in
 --   io_pin($i+$bsi,$i,$i+$bsi+32,sprintf('A(%d)',$i),'out');
 -- }
 -- for(my $i=0;$i<32; $i++) {
 --   # data output  in  32.. 63
 --   # data input   in  64.. 95
---   # data control in  
+--   # data control in
 --   io_pin($i+64, $i+32, $i+$bsi+64, sprintf('D(%d)',$i), 'inout');
 -- };
 
@@ -89,13 +89,13 @@ port  (
   WE    : out bit ;
   A     : out bit_vector(0 to 31);
   D     : inout bit_vector(0 to 31)
-);        
+);
 
 use STD_1149_1_1994.all;
 
 attribute COMPONENT_CONFORMANCE of  some_cpu : entity is " STD_1149_1_1993 ";
 attribute PIN_MAP of  some_cpu : entity is PHYSICAL_PIN_MAP  ;
-          
+
 constant JIM : PIN_MAP_STRING:=
 " CS    : 2, " &
 " OE    : 3, " &
@@ -118,20 +118,20 @@ attribute TAP_SCAN_MODE  of TMS : signal is true  ;
 attribute TAP_SCAN_CLOCK of TCK : signal is (8.0e6, BOTH) ;
 
 attribute INSTRUCTION_LENGTH  of some_cpu : entity is 2 ;
-            
+
 attribute INSTRUCTION_OPCODE  of some_cpu : entity is
-" EXTEST    ( 00  )," & 
-" IDCODE    ( 01  )," & 
-" SAMPLE    ( 10  )," & 
-" BYPASS    ( 11  )"  ; 
+" EXTEST    ( 00  )," &
+" IDCODE    ( 01  )," &
+" SAMPLE    ( 10  )," &
+" BYPASS    ( 11  )"  ;
 
 attribute INSTRUCTION_CAPTURE of some_cpu : entity is " 01 ";
-            
+
 attribute IDCODE_REGISTER of some_cpu : entity is "10000111011001010100001100100001" ;
 
 attribute BOUNDARY_LENGTH of some_cpu : entity is 202 ;
-                                  
-attribute BOUNDARY_REGISTER of some_cpu : entity is                         
+
+attribute BOUNDARY_REGISTER of some_cpu : entity is
 
 "100 (BC_1, *, internal, X), " &
 "96 (BC_1, OE, output3, X, 103, 0, Z), " &
diff --git a/urjtag/src/jim/some_cpu.c b/urjtag/src/jim/some_cpu.c
index d81f35f4..59f52ab5 100644
--- a/urjtag/src/jim/some_cpu.c
+++ b/urjtag/src/jim/some_cpu.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tap.c $
+ * $Id$
  *
  * Copyright (C) 2008 Kolja Waschk <kawk>
  *
diff --git a/urjtag/src/lib/ansidecl.h b/urjtag/src/lib/ansidecl.h
index c19955a9..27286833 100644
--- a/urjtag/src/lib/ansidecl.h
+++ b/urjtag/src/lib/ansidecl.h
@@ -165,7 +165,7 @@ So instead we use the macro below and test it against specific values.  */
 #define VA_OPEN(AP, VAR)	{ va_list AP; va_start(AP, VAR); { struct Qdmy
 #define VA_CLOSE(AP)		} va_end(AP); }
 #define VA_FIXEDARG(AP, T, N)	struct Qdmy
- 
+
 #undef const
 #undef volatile
 #undef signed
diff --git a/urjtag/src/lib/libiberty.h b/urjtag/src/lib/libiberty.h
index 4e697343..4b50a76a 100644
--- a/urjtag/src/lib/libiberty.h
+++ b/urjtag/src/lib/libiberty.h
@@ -1,7 +1,7 @@
 /* Function declarations for libiberty.
 
    Copyright 2001, 2002, 2005 Free Software Foundation, Inc.
-   
+
    Note - certain prototypes declared in this header file are for
    functions whoes implementation copyright does not belong to the
    FSF.  Those prototypes are present in this file for reference
@@ -23,7 +23,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street - Fifth Floor,
    Boston, MA 02110-1301, USA.
-   
+
    Written by Cygnus Support, 1994.
 
    The libiberty library provides a number of functions which are
@@ -188,7 +188,7 @@ extern char * getpwd (void);
 #ifdef __MINGW32__
 /* Forward declaration to avoid #include <sys/time.h>.   */
 struct timeval;
-extern int gettimeofday (struct timeval *, void *); 
+extern int gettimeofday (struct timeval *, void *);
 #endif
 
 /* Get the amount of time the process has run, in microseconds.  */
@@ -407,7 +407,7 @@ extern struct pex_obj *pex_init (int flags, const char *pname,
 /* Capture stderr to a pipe.  The output can be read by
    calling pex_read_err and reading from the returned
    FILE object.  This flag may be specified only for
-   the last program in a pipeline.  
+   the last program in a pipeline.
 
    This flag is supported only on Unix and Windows.  */
 #define PEX_STDERR_TO_PIPE	0x40
diff --git a/urjtag/src/lib/safe-ctype.c b/urjtag/src/lib/safe-ctype.c
index 0972b4b3..d1aed351 100644
--- a/urjtag/src/lib/safe-ctype.c
+++ b/urjtag/src/lib/safe-ctype.c
@@ -64,7 +64,7 @@ others.  However, there are two differences between these macros and
 those provided by @file{ctype.h}:
 
 @itemize @bullet
-@item These macros are guaranteed to have well-defined behavior for all 
+@item These macros are guaranteed to have well-defined behavior for all
 values representable by @code{signed char} and @code{unsigned char}, and
 for @code{EOF}.
 
diff --git a/urjtag/src/lib/usleep.c b/urjtag/src/lib/usleep.c
index f632b9ca..05a2c567 100644
--- a/urjtag/src/lib/usleep.c
+++ b/urjtag/src/lib/usleep.c
@@ -1,5 +1,5 @@
 /*
- * $Id: usleep.c 1519 2009-04-22 23:12:44Z rfhh $
+ * $Id$
  *
  * Copyright (C) 2009, Rutger Hofman, VU Amsterdam
  *
diff --git a/urjtag/src/svf/Makefile.am b/urjtag/src/svf/Makefile.am
index 5ad0171a..27e3f81f 100644
--- a/urjtag/src/svf/Makefile.am
+++ b/urjtag/src/svf/Makefile.am
@@ -34,7 +34,7 @@ libsvf_la_SOURCES = \
 	svf.c
 
 libsvf_flex_la_SOURCES = \
-	svf_flex.l 
+	svf_flex.l
 
 svf_flex.$(OBJEXT) svf.$(OBJEXT): svf_bison.$(OBJEXT)
 
diff --git a/urjtag/src/svf/svf_bison.y b/urjtag/src/svf/svf_bison.y
index e2e57cba..a8ce7dc9 100644
--- a/urjtag/src/svf/svf_bison.y
+++ b/urjtag/src/svf/svf_bison.y
@@ -69,14 +69,14 @@ static void urj_svf_free_ths_params(struct ths_params *);
 %token IDENTIFIER NUMBER HEXA_NUM_FRAGMENT VECTOR_STRING
 
 %token EMPTY
-%token ENDDR ENDIR 
+%token ENDDR ENDIR
 %token FREQUENCY HZ
-%token STATE RESET IDLE 
+%token STATE RESET IDLE
 %token TDI TDO MASK SMASK
 %token TRST ON OFF Z ABSENT
 %token HDR HIR SDR SIR TDR TIR
 %token PIO PIOMAP IN OUT INOUT H L U D X
-%token RUNTEST MAXIMUM SEC TCK SCK ENDSTATE 
+%token RUNTEST MAXIMUM SEC TCK SCK ENDSTATE
 %token IRPAUSE IRSHIFT IRUPDATE IRSELECT IREXIT1 IREXIT2 IRCAPTURE
 %token DRPAUSE DRSHIFT DRUPDATE DRSELECT DREXIT1 DREXIT2 DRCAPTURE
 %token SVF_EOF 0    /* SVF_EOF must match bison's token YYEOF */
@@ -269,7 +269,7 @@ svf_statement
 ths_param_list
             : /* empty element */
             | ths_param_list ths_opt_param
-; 
+;
 
 ths_opt_param
             : TDI   '(' hexa_num_sequence ')'
@@ -320,7 +320,7 @@ hexa_num_sequence
 ;
 
 stable_state
-            : RESET 
+            : RESET
             | IDLE
             | DRPAUSE
             | IRPAUSE
@@ -341,7 +341,7 @@ runtest_clk_count
                 $$.dvalue = $<dvalue>1;
               }
 
-            | NUMBER SCK 
+            | NUMBER SCK
               {
                 $$.token  = $<token>2;
                 $$.dvalue = $<dvalue>1;
@@ -366,7 +366,7 @@ runtest_time
 ;
 
 runtest_max_time_opt
-            : 
+            :
               {
                 priv_data->parser_params.runtest.max_time = 0.0;
               }
@@ -400,7 +400,7 @@ all_states
             | IRPAUSE
             | DRPAUSE
             | RESET
-            | IDLE 
+            | IDLE
 ;
 
 path_states
@@ -423,7 +423,7 @@ path_states
 ;
 
 piomap_rec
-            : 
+            :
             | piomap_rec direction IDENTIFIER
 ;
 
diff --git a/urjtag/src/tap/cable.c b/urjtag/src/tap/cable.c
index 15601bb3..0e5e0341 100644
--- a/urjtag/src/tap/cable.c
+++ b/urjtag/src/tap/cable.c
@@ -183,7 +183,7 @@ urj_tap_cable_add_queue_item (urj_cable_t *cable, urj_cable_queue_info_t *q)
                 }
                 else
                 {
-                    /* Same as above, but for the case if new space 
+                    /* Same as above, but for the case if new space
                      * isn't large enough to hold all relocated items */
 
                     /* Step 1: 456123__ -> __612345 */
diff --git a/urjtag/src/tap/cable.h b/urjtag/src/tap/cable.h
index 61333528..d98d485e 100644
--- a/urjtag/src/tap/cable.h
+++ b/urjtag/src/tap/cable.h
@@ -1,5 +1,5 @@
 /*
- * $Id: buses.h 1711 2010-01-23 19:12:01Z vapier $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  *
diff --git a/urjtag/src/tap/cable/ft2232.c b/urjtag/src/tap/cable/ft2232.c
index 2735c212..633d9cdf 100644
--- a/urjtag/src/tap/cable/ft2232.c
+++ b/urjtag/src/tap/cable/ft2232.c
@@ -299,7 +299,7 @@ ft2232h_set_frequency (urj_cable_t *cable, uint32_t new_frequency)
 {
     ft2232_set_frequency_common( cable, new_frequency, FT2232H_MAX_TCK_FREQ);
 }
- 
+
 static int
 ft2232_generic_init (urj_cable_t *cable)
 {
diff --git a/urjtag/src/tap/cable/ft2232_list.h b/urjtag/src/tap/cable/ft2232_list.h
index b1843f4d..7bc0a7c5 100644
--- a/urjtag/src/tap/cable/ft2232_list.h
+++ b/urjtag/src/tap/cable/ft2232_list.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ft2232.c 1714 2010-01-23 20:07:41Z vapier $
+ * $Id$
  *
  * Generic cable driver for FTDI's FT2232C chip in MPSSE mode.
  * Copyright (C) 2007 A. Laeuger
diff --git a/urjtag/src/tap/cable/generic_parport.c b/urjtag/src/tap/cable/generic_parport.c
index 00db7fd7..2732c8f1 100644
--- a/urjtag/src/tap/cable/generic_parport.c
+++ b/urjtag/src/tap/cable/generic_parport.c
@@ -1,5 +1,5 @@
 /*
- * $Id: generic.c 1003 2008-02-10 10:00:30Z kawk $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  *
diff --git a/urjtag/src/tap/cable/generic_parport.h b/urjtag/src/tap/cable/generic_parport.h
index b7ced65f..db7b812e 100644
--- a/urjtag/src/tap/cable/generic_parport.h
+++ b/urjtag/src/tap/cable/generic_parport.h
@@ -1,5 +1,5 @@
 /*
- * $Id: generic.h 1002 2008-02-10 09:50:59Z kawk $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  *
diff --git a/urjtag/src/tap/cable/generic_usbconn_list.h b/urjtag/src/tap/cable/generic_usbconn_list.h
index b495af72..04ba6e66 100644
--- a/urjtag/src/tap/cable/generic_usbconn_list.h
+++ b/urjtag/src/tap/cable/generic_usbconn_list.h
@@ -1,5 +1,5 @@
 /*
- * $Id: generic_usbconn.c 1689 2010-01-08 17:06:27Z kawk $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  *
diff --git a/urjtag/src/tap/cable/jim.c b/urjtag/src/tap/cable/jim.c
index f03d6d2c..b371f291 100644
--- a/urjtag/src/tap/cable/jim.c
+++ b/urjtag/src/tap/cable/jim.c
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * JTAG target simulator JIM "cable" driver
  *
diff --git a/urjtag/src/tap/cable/jlink.c b/urjtag/src/tap/cable/jlink.c
index 99e08323..e41b2957 100644
--- a/urjtag/src/tap/cable/jlink.c
+++ b/urjtag/src/tap/cable/jlink.c
@@ -1,5 +1,5 @@
 /*
- * $Id: jlink.c,v 1.8 2003/08/19 08:42:20 telka Exp $
+ * $Id$
  *
  * Segger J-Link cable driver
  *
@@ -188,7 +188,7 @@ jlink_get_status (urj_usbconn_libusb_param_t *params)
                  data->usb_in_buffer[6], data->usb_in_buffer[7]);
         if (vref < 1500)
         {
-            urj_error_set (URJ_ERROR_USB, 
+            urj_error_set (URJ_ERROR_USB,
                            "Vref too low. Possibly the target isn't powered or disconnected?");
             result = -1;
         }
diff --git a/urjtag/src/tap/cable/keithkoep.c b/urjtag/src/tap/cable/keithkoep.c
index abe088b4..5cdf4aa3 100644
--- a/urjtag/src/tap/cable/keithkoep.c
+++ b/urjtag/src/tap/cable/keithkoep.c
@@ -44,7 +44,7 @@
 
 /*
  * status
- * 
+ *
  * 7 - BUSY (pin 11)
  * 6 - ACK (pin 10)
  * 5 - PE (pin 12)
@@ -53,7 +53,7 @@
  */
 #define TDO     5
 
-/* 
+/*
  * control
  *
  * 0 - STROBE (pin 1)
diff --git a/urjtag/src/tap/cable/mpcbdm.c b/urjtag/src/tap/cable/mpcbdm.c
index e06024b6..d1d9cdc9 100644
--- a/urjtag/src/tap/cable/mpcbdm.c
+++ b/urjtag/src/tap/cable/mpcbdm.c
@@ -43,14 +43,14 @@
 #define TCK     0
 #define TMS     2
 
-/* 
- * control 
+/*
+ * control
  */
 #define HRESET  3               /* the signal is inverted by cable hardware */
 #define SRESET  1               /* the signal is inverted by cable hardware */
 #define TRST    0               /* the signal is inverted by cable hardware */
 
-/* 
+/*
  * status
  *
  * 7 - BUSY (pin 11)
diff --git a/urjtag/src/tap/cable/triton.c b/urjtag/src/tap/cable/triton.c
index aa4205b2..b608fcf5 100644
--- a/urjtag/src/tap/cable/triton.c
+++ b/urjtag/src/tap/cable/triton.c
@@ -29,7 +29,7 @@
  * TRITON Starterkit II (PXA255/250) JTAG Parallel Cable Driver
  * (boards probably produced by www.mite.cz)
  * Other vendors: www.strategic-test.com, www.fsforth.de (www.es-usa.com),
- *                www.directinsight.co.uk, www.quantum.com.pl, 
+ *                www.directinsight.co.uk, www.quantum.com.pl,
  *
  * This code has been verified to work with a Starterkit II,
  * but a Starterkit I might also work (however it has a differing JTAG cable
diff --git a/urjtag/src/tap/cable/vision_ep9307.c b/urjtag/src/tap/cable/vision_ep9307.c
index af1432e5..77ee3b2c 100644
--- a/urjtag/src/tap/cable/vision_ep9307.c
+++ b/urjtag/src/tap/cable/vision_ep9307.c
@@ -1,5 +1,5 @@
 /*
- * $Id: vision_ep9307.c $
+ * $Id$
  *
  * Vision EP9307 SoM GPIO JTAG Cable Driver
  * Copyright (C) 2007, 2008 H Hartley Sweeten
diff --git a/urjtag/src/tap/cable/wiggler2.c b/urjtag/src/tap/cable/wiggler2.c
index a5e810c7..ea2871b6 100644
--- a/urjtag/src/tap/cable/wiggler2.c
+++ b/urjtag/src/tap/cable/wiggler2.c
@@ -1,5 +1,5 @@
 /*
- * $Id: wiggler2.c,v 1.8 2003/09/11 16:45:15 telka Exp $
+ * $Id$
  *
  * Modified WIGGLER JTAG Cable Driver
  * Copyright (C) 2003 Ultra d.o.o.
diff --git a/urjtag/src/tap/cable/xpc.c b/urjtag/src/tap/cable/xpc.c
index 8556ba0d..3467416d 100644
--- a/urjtag/src/tap/cable/xpc.c
+++ b/urjtag/src/tap/cable/xpc.c
@@ -1,5 +1,5 @@
 /*
- * $Id: xpc.c,v 1.8 2003/08/19 08:42:20 telka Exp $
+ * $Id$
  *
  * Xilinx Platform Cable USB Driver (slow GPIO only)
  * Copyright (C) 2008 Kolja Waschk
@@ -56,23 +56,23 @@ static int last_tdo;
  *
  *   IOA.0 => green LED (0=off)
  *   IOA.1 => red LED   (0=off)
- *   IOA.2 is tied to VCC via R25 on my board 
- *   IOA.3 isn't connected 
+ *   IOA.2 is tied to VCC via R25 on my board
+ *   IOA.3 isn't connected
  *   IOA.4 => CPLD pin 85 (reset?)
- *   IOA.5 => CPLD pin 86, eventually OE? 
+ *   IOA.5 => CPLD pin 86, eventually OE?
  *   IOA.6 => CPLD pin 83 (reset?)
  *   IOA.7 => CPLD pin 49 (reset?)
- *    
+ *
  * = FX2 Port C =
  *
- *   probably used as GPIFADR 0..7, to CPLD 
- *      
+ *   probably used as GPIFADR 0..7, to CPLD
+ *
  * = FX2 Port E =
  *
- *   IOE.3 => CPLD TCK 
- *   IOE.4 => CPLD TMS 
- *   IOE.5 => CPLD TDO 
- *   IOE.6 => CPLD TDI 
+ *   IOE.3 => CPLD TCK
+ *   IOE.4 => CPLD TMS
+ *   IOE.5 => CPLD TDO
+ *   IOE.6 => CPLD TDI
  */
 
 /* ---------------------------------------------------------------------- */
@@ -233,7 +233,7 @@ xpcu_select_gpio (struct usb_dev_handle *xpcu, int int_or_ext)
  *   Bit 14: Third bit.
  *   Bit 15: Fourth bit.
  *
- *   After the bulk write, if any of the bits 12..15 was set in any word, a 
+ *   After the bulk write, if any of the bits 12..15 was set in any word, a
  *   bulk_read shall follow to collect the TDO data.
  *
  *   TDO data is shifted in from MSB. In a "full" word with 16 TDO bits, the
diff --git a/urjtag/src/tap/cable_list.h b/urjtag/src/tap/cable_list.h
index 0d7b01b5..5f4f6ac8 100644
--- a/urjtag/src/tap/cable_list.h
+++ b/urjtag/src/tap/cable_list.h
@@ -1,5 +1,5 @@
 /*
- * $Id: buses.h 1687 2009-12-29 23:53:09Z arniml $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  *
diff --git a/urjtag/src/tap/idcode.c b/urjtag/src/tap/idcode.c
index 7279eeec..ba942667 100644
--- a/urjtag/src/tap/idcode.c
+++ b/urjtag/src/tap/idcode.c
@@ -1,5 +1,5 @@
 /*
- * $Id: idcode.c 1120 2008-03-15 02:27:13Z jiez $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  *
diff --git a/urjtag/src/tap/parport.h b/urjtag/src/tap/parport.h
index 38ff5b67..0c750a95 100644
--- a/urjtag/src/tap/parport.h
+++ b/urjtag/src/tap/parport.h
@@ -1,5 +1,5 @@
 /*
- * $Id: buses.h 1711 2010-01-23 19:12:01Z vapier $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  *
diff --git a/urjtag/src/tap/parport_list.h b/urjtag/src/tap/parport_list.h
index 86ff0c9d..62a0c4f6 100644
--- a/urjtag/src/tap/parport_list.h
+++ b/urjtag/src/tap/parport_list.h
@@ -1,5 +1,5 @@
 /*
- * $Id: buses.h 1687 2009-12-29 23:53:09Z arniml $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  *
diff --git a/urjtag/src/tap/usbconn.h b/urjtag/src/tap/usbconn.h
index 97b3effe..ca0974c5 100644
--- a/urjtag/src/tap/usbconn.h
+++ b/urjtag/src/tap/usbconn.h
@@ -1,5 +1,5 @@
 /*
- * $Id: buses.h 1711 2010-01-23 19:12:01Z vapier $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  *
diff --git a/urjtag/src/tap/usbconn/libftdx.h b/urjtag/src/tap/usbconn/libftdx.h
index a89e130e..f84e5cf9 100644
--- a/urjtag/src/tap/usbconn/libftdx.h
+++ b/urjtag/src/tap/usbconn/libftdx.h
@@ -1,5 +1,5 @@
 /*
- * $Id: libftdx.h 1594 2009-05-13 23:36:04Z rfhh $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/urjtag/src/tap/usbconn/libusb.h b/urjtag/src/tap/usbconn/libusb.h
index 6dfc92e1..6b447e94 100644
--- a/urjtag/src/tap/usbconn/libusb.h
+++ b/urjtag/src/tap/usbconn/libusb.h
@@ -1,5 +1,5 @@
 /*
- * $Id: libusb.h 1606 2009-05-19 15:06:20Z rfhh $
+ * $Id$
  *
  * Link driver for accessing USB devices via libusb
  *
diff --git a/urjtag/src/tap/usbconn_list.h b/urjtag/src/tap/usbconn_list.h
index e80ab0d4..d71df61f 100644
--- a/urjtag/src/tap/usbconn_list.h
+++ b/urjtag/src/tap/usbconn_list.h
@@ -1,5 +1,5 @@
 /*
- * $Id: buses.h 1687 2009-12-29 23:53:09Z arniml $
+ * $Id$
  *
  * Copyright (C) 2003 ETC s.r.o.
  *