diff --git a/backend/dc25.c b/backend/dc25.c
index b37a92355..70a02deba 100644
--- a/backend/dc25.c
+++ b/backend/dc25.c
@@ -3,8 +3,6 @@
 
    dc25.c
 
-   $Id$
-
    This file (C) 1998 Peter Fales
 
    This file is part of the SANE package.
@@ -1841,8 +1839,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
 
   fp = sanei_config_open (DC25_CONFIG_FILE);
 
-  DBG (127,
-       "sane_init() $Id$\n");
+  DBG (127, "sane_init()\n");
 
   if (!fp)
     {
diff --git a/backend/dmc.c b/backend/dmc.c
index 5584961ed..5a2a9cc64 100644
--- a/backend/dmc.c
+++ b/backend/dmc.c
@@ -44,8 +44,6 @@
    This file implements a SANE backend for the Polaroid Digital
    Microscope Camera. */
 
-/* $Id$ */
-
 #include "../include/sane/config.h"
 
 #include <limits.h>
diff --git a/backend/dmc.h b/backend/dmc.h
index aa866bc92..a92af5578 100644
--- a/backend/dmc.h
+++ b/backend/dmc.h
@@ -38,8 +38,6 @@
    whether to permit this exception to apply to your modifications.
    If you do not wish that, delete this exception notice.  */
 
-/* $Id$ */
-
 #ifndef polaroid_dmc_h
 #define polaroid_dmc_h
 
diff --git a/backend/gphoto2.c b/backend/gphoto2.c
index 587dc4e8b..59b306d81 100644
--- a/backend/gphoto2.c
+++ b/backend/gphoto2.c
@@ -671,8 +671,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
 
   DBG_INIT ();
 
-  DBG (1,
-       "GPHOTO2 Backend $Id$\n");
+  DBG (1, "GPHOTO2 Backend\n");
 
   if (getenv ("GP_DEBUG"))
     {
diff --git a/backend/hp-option.h b/backend/hp-option.h
index a6da585b7..56b8c8b70 100644
--- a/backend/hp-option.h
+++ b/backend/hp-option.h
@@ -42,9 +42,6 @@
    HP Scanner Control Language (SCL).
 */
 
-/*
-   $Id$
-*/
 #ifndef HP_OPTION_H_INCLUDED
 #define HP_OPTION_H_INCLUDED
 #include "hp.h"
diff --git a/backend/hp5400.h b/backend/hp5400.h
index bf61a2360..40b53cfb0 100644
--- a/backend/hp5400.h
+++ b/backend/hp5400.h
@@ -43,8 +43,6 @@
    If you write modifications of your own for SANE, it is your choice
    whether to permit this exception to apply to your modifications.
    If you do not wish that, delete this exception notice.
-
-   $Id$
 */
 
 
diff --git a/backend/leo.c b/backend/leo.c
index e0200dec7..45ade2a8c 100644
--- a/backend/leo.c
+++ b/backend/leo.c
@@ -42,7 +42,6 @@
 */
 
 /*
-   $Id$
    Across FS-1130
 */
 
diff --git a/backend/leo.h b/backend/leo.h
index 50fb2ba56..377ab1c71 100644
--- a/backend/leo.h
+++ b/backend/leo.h
@@ -41,10 +41,6 @@
    If you do not wish that, delete this exception notice.
 */
 
-/*
-	$Id$
-*/
-
 /* Commands supported by the scanner. */
 #define SCSI_TEST_UNIT_READY			0x00
 #define SCSI_INQUIRY					0x12
diff --git a/backend/matsushita.c b/backend/matsushita.c
index f9c219757..a3102e0fa 100644
--- a/backend/matsushita.c
+++ b/backend/matsushita.c
@@ -43,7 +43,6 @@
 */
 
 /*
-   $Id$
    Matsushita/Panasonic KV-SS25, KV-SS50, KV-SS55, KV-SS50EX,
                         KV-SS55EX, KV-SS850, KV-SS855 SCSI scanners.
 
diff --git a/backend/matsushita.h b/backend/matsushita.h
index a1c61d03e..28c4cbe2d 100644
--- a/backend/matsushita.h
+++ b/backend/matsushita.h
@@ -40,10 +40,6 @@
    If you do not wish that, delete this exception notice.
 */
 
-/*
-	$Id$
-*/
-
 /* Commands supported by the KV-SS 25 scanner. */
 #define SCSI_TEST_UNIT_READY			0x00
 #define SCSI_INQUIRY					0x12
diff --git a/backend/niash.c b/backend/niash.c
index 7d300d6c9..0fc952639 100644
--- a/backend/niash.c
+++ b/backend/niash.c
@@ -14,8 +14,6 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-  $Id$
 */
 
 /*
diff --git a/backend/niash_core.c b/backend/niash_core.c
index 9922461a0..70bb38c6b 100644
--- a/backend/niash_core.c
+++ b/backend/niash_core.c
@@ -14,8 +14,6 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-  $Id$
 */
 
 /*
diff --git a/backend/niash_core.h b/backend/niash_core.h
index fc0adbda4..b1459d372 100644
--- a/backend/niash_core.h
+++ b/backend/niash_core.h
@@ -14,8 +14,6 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-  $Id$
 */
 
 /*
diff --git a/backend/niash_xfer.c b/backend/niash_xfer.c
index a3d0ea257..85fcb884a 100644
--- a/backend/niash_xfer.c
+++ b/backend/niash_xfer.c
@@ -14,8 +14,6 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-  $Id$
 */
 
 /*
diff --git a/backend/niash_xfer.h b/backend/niash_xfer.h
index b32524061..8050af907 100644
--- a/backend/niash_xfer.h
+++ b/backend/niash_xfer.h
@@ -14,8 +14,6 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-  $Id$
 */
 
 /*
diff --git a/backend/ricoh-scsi.c b/backend/ricoh-scsi.c
index 73bd4fa01..8fc59bbb9 100644
--- a/backend/ricoh-scsi.c
+++ b/backend/ricoh-scsi.c
@@ -37,15 +37,12 @@
 
    If you write modifications of your own for SANE, it is your choice
    whether to permit this exception to apply to your modifications.
-   If you do not wish that, delete this exception notice. */
-
-/*
-	$Id$
-	This file implements the low-level scsi-commands.
+   If you do not wish that, delete this exception notice.
 */
 
-
-
+/*
+	This file implements the low-level scsi-commands.
+*/
 
 /* SCSI commands that the Ricoh scanners understand: */
 #define RICOH_SCSI_TEST_UNIT_READY	0x00
diff --git a/backend/ricoh.c b/backend/ricoh.c
index 889f1c0ac..7eeee1c08 100644
--- a/backend/ricoh.c
+++ b/backend/ricoh.c
@@ -40,7 +40,6 @@
 */
 
 /*
-	$Id$
         This file implements a SANE backend for Ricoh flatbed scanners.
 */
 
diff --git a/backend/ricoh.h b/backend/ricoh.h
index 87712976f..60706b108 100644
--- a/backend/ricoh.h
+++ b/backend/ricoh.h
@@ -36,10 +36,7 @@
 
    If you write modifications of your own for SANE, it is your choice
    whether to permit this exception to apply to your modifications.
-   If you do not wish that, delete this exception notice.  */
-
-/*
-	$Id$
+   If you do not wish that, delete this exception notice.
 */
 
 #ifndef ricoh_h
diff --git a/backend/sceptre.c b/backend/sceptre.c
index 3670f3c94..761793bb8 100644
--- a/backend/sceptre.c
+++ b/backend/sceptre.c
@@ -43,7 +43,6 @@
 */
 
 /*
-   $Id$
    Sceptre S1200 SCSI scanner (sometimes also called S120)
 */
 
diff --git a/backend/sceptre.h b/backend/sceptre.h
index 5f2d24591..c385e75ec 100644
--- a/backend/sceptre.h
+++ b/backend/sceptre.h
@@ -40,10 +40,6 @@
    If you do not wish that, delete this exception notice.
 */
 
-/*
-	$Id$
-*/
-
 /* Commands supported by the Sceptre S1200 scanner. */
 #define SCSI_TEST_UNIT_READY			0x00
 #define SCSI_GET_STATUS					0x02
diff --git a/backend/sm3600-scanmtek.c b/backend/sm3600-scanmtek.c
index 4aa4f1ba4..bf3d9482e 100644
--- a/backend/sm3600-scanmtek.c
+++ b/backend/sm3600-scanmtek.c
@@ -43,8 +43,6 @@
 
 Userspace scan tool for the Microtek 3600 scanner
 
-$Id$
-
 ====================================================================== */
 
 #include "sm3600-scantool.h"
diff --git a/backend/sm3600-scanusb.c b/backend/sm3600-scanusb.c
index 7ae90d3a0..d2801a76f 100644
--- a/backend/sm3600-scanusb.c
+++ b/backend/sm3600-scanusb.c
@@ -43,8 +43,6 @@
 
 Userspace scan tool for the Microtek 3600 scanner
 
-$Id$
-
 (C) Marian Eichholz 2001
 
 26.4.2001: Added an abstraction layer for TransferControlMsg.
diff --git a/backend/sm3600-scanutil.c b/backend/sm3600-scanutil.c
index 68b5fcc74..6fa4540cf 100644
--- a/backend/sm3600-scanutil.c
+++ b/backend/sm3600-scanutil.c
@@ -43,8 +43,6 @@
 
 Userspace scan tool for the Microtek 3600 scanner
 
-$Id$
-
 ====================================================================== */
 
 #include <unistd.h>
diff --git a/backend/snapscan-data.c b/backend/snapscan-data.c
index 6a20499b6..a4647e2cf 100644
--- a/backend/snapscan-data.c
+++ b/backend/snapscan-data.c
@@ -43,11 +43,11 @@
    This file contains static calibration data for the Benq 5150C scanner.
    Once it is known how calibration for this scanner works this file
    becomes obsolete.
-   */
+*/
 
-
-/* $Id$
-   SANE SnapScan backend */
+/*
+   SANE SnapScan backend
+*/
 
 static const SANE_Byte calibration_data_5150[] =
 {
diff --git a/backend/snapscan-options.c b/backend/snapscan-options.c
index e80e607a1..2c582b604 100644
--- a/backend/snapscan-options.c
+++ b/backend/snapscan-options.c
@@ -44,10 +44,12 @@
    If you do not wish that, delete this exception notice.
 
    This file is a component of the implementation of a backend for many
-   of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners. */
+   of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners.
+*/
 
-/* $Id$
-   SANE SnapScan backend */
+/*
+   SANE SnapScan backend
+*/
 
 /* default option values */
 
diff --git a/backend/snapscan-scsi.c b/backend/snapscan-scsi.c
index 0651f68ad..8cce4bc12 100644
--- a/backend/snapscan-scsi.c
+++ b/backend/snapscan-scsi.c
@@ -44,11 +44,12 @@
    If you do not wish that, delete this exception notice.
 
    This file is a component of the implementation of a backend for many
-   of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners. */
+   of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners.
+*/
 
-
-/* $Id$
-   SnapScan backend scsi command functions */
+/*
+   SnapScan backend scsi command functions
+*/
 
 /* scanner scsi commands */
 
diff --git a/backend/snapscan-sources.c b/backend/snapscan-sources.c
index 7a2f89b02..924d16f9d 100644
--- a/backend/snapscan-sources.c
+++ b/backend/snapscan-sources.c
@@ -44,11 +44,12 @@
    If you do not wish that, delete this exception notice.
 
    This file is a component of the implementation of a backend for many
-   of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners. */
+   of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners.
+*/
 
-
-/* $Id$
-   SnapScan backend data sources (implementation) */
+/*
+   SnapScan backend data sources (implementation)
+*/
 
 /**************************************************************************************
 If you get confused from all the structs (like I did when I first saw them),
diff --git a/backend/snapscan-sources.h b/backend/snapscan-sources.h
index 516243ee6..6983a5a53 100644
--- a/backend/snapscan-sources.h
+++ b/backend/snapscan-sources.h
@@ -44,11 +44,12 @@
    If you do not wish that, delete this exception notice.
 
    This file is a component of the implementation of a backend for many
-   of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners. */
+   of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners.
+*/
 
-
-/* $Id$
-   SnapScan backend scan data sources */
+/*
+   SnapScan backend scan data sources
+*/
 
 #ifndef SNAPSCAN_SOURCES_H
 #define SNAPSCAN_SOURCES_H
diff --git a/backend/snapscan-usb.c b/backend/snapscan-usb.c
index 093dc402d..ac28c571b 100644
--- a/backend/snapscan-usb.c
+++ b/backend/snapscan-usb.c
@@ -68,8 +68,9 @@
      So far this strategy has worked flawlessly. Thanks Dmitri!
 */
 
-/* $Id$
-   SnapScan backend scan data sources */
+/*
+   SnapScan backend scan data sources
+*/
 
 #include "snapscan-usb.h"
 #include "snapscan-mutex.c"
diff --git a/backend/snapscan-usb.h b/backend/snapscan-usb.h
index a317482f7..067aaf638 100644
--- a/backend/snapscan-usb.h
+++ b/backend/snapscan-usb.h
@@ -45,8 +45,9 @@
   backend.
 */
 
-/* $Id$
-   SnapScan backend scan data sources */
+/*
+   SnapScan backend scan data sources
+*/
 
 #ifndef snapscan_usb_h
 #define snapscan_usb_h
diff --git a/backend/snapscan.c b/backend/snapscan.c
index d097df690..380751741 100644
--- a/backend/snapscan.c
+++ b/backend/snapscan.c
@@ -45,11 +45,12 @@
    If you do not wish that, delete this exception notice.
 
    This file is a component of the implementation of a backend for many
-   of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners. */
+   of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners.
+*/
 
-
-/* $Id$
-   SANE SnapScan backend */
+/*
+   SANE SnapScan backend
+*/
 
 #include "../include/sane/config.h"
 
diff --git a/backend/snapscan.h b/backend/snapscan.h
index 101a95d7a..a5ee46ef7 100644
--- a/backend/snapscan.h
+++ b/backend/snapscan.h
@@ -44,10 +44,12 @@
    If you do not wish that, delete this exception notice.
 
    This file is a component of the implementation of a backend for many
-   of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners. */
+   of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners.
+*/
 
-/* $Id$
-   SANE SnapScan backend */
+/*
+   SANE SnapScan backend
+*/
 
 #ifndef snapscan_h
 #define snapscan_h
diff --git a/backend/stv680.c b/backend/stv680.c
index da2e8d5b0..d1f199dd8 100644
--- a/backend/stv680.c
+++ b/backend/stv680.c
@@ -36,8 +36,7 @@
    ------------------------------------------------------------------
 */
 
-/*  $Id$
-
+/*
    stv680 vidcam  driver Gerard Klaver
 */
 
diff --git a/backend/stv680.h b/backend/stv680.h
index 307011f82..0b9bb552e 100644
--- a/backend/stv680.h
+++ b/backend/stv680.h
@@ -36,10 +36,6 @@
    ---------------------------------------------------------------------
 */
 
-/*
-	$Id$
-        update 20-04-2006*/
-
 /* Commands supported by the vidcam. */
 
 /*--------------------------------------------------------------------------*/
diff --git a/backend/teco1.c b/backend/teco1.c
index a0ebc8b2d..dd2f42f2f 100644
--- a/backend/teco1.c
+++ b/backend/teco1.c
@@ -42,7 +42,6 @@
 */
 
 /*
-   $Id$
    Some Relisys scanners AVEC and RELI series
 */
 
diff --git a/backend/teco1.h b/backend/teco1.h
index a90d9baeb..c793e6751 100644
--- a/backend/teco1.h
+++ b/backend/teco1.h
@@ -41,10 +41,6 @@
    If you do not wish that, delete this exception notice.
 */
 
-/*
-	$Id$
-*/
-
 /* Commands supported by the scanner. */
 #define SCSI_TEST_UNIT_READY			0x00
 #define SCSI_REQUEST_SENSE				0x03
diff --git a/backend/teco2.c b/backend/teco2.c
index ba27aa5b4..1b8e6a72b 100644
--- a/backend/teco2.c
+++ b/backend/teco2.c
@@ -43,7 +43,6 @@
 */
 
 /*
-   $Id$
    TECO scanner VM3575, VM656A, VM6575, VM6586, VM356A, VM3564
    update 2003/02/14, Patch for VM356A Gerard Klaver
    update 2003/03/19, traces, tests VM356A Gerard Klaver, Michael Hoeller
diff --git a/backend/teco2.h b/backend/teco2.h
index 65bcd2c73..db9756f67 100644
--- a/backend/teco2.h
+++ b/backend/teco2.h
@@ -42,10 +42,6 @@
    If you do not wish that, delete this exception notice.
 */
 
-/*
-	$Id$
-*/
-
 /* Commands supported by the scanner. */
 #define SCSI_TEST_UNIT_READY			0x00
 #define SCSI_REQUEST_SENSE			0x03
diff --git a/backend/teco3.c b/backend/teco3.c
index ebd508797..4cdb582f3 100644
--- a/backend/teco3.c
+++ b/backend/teco3.c
@@ -42,7 +42,6 @@
 */
 
 /*
-   $Id$
    VM3552 (and maybe VM4552 and VM6552)
 */
 
diff --git a/backend/teco3.h b/backend/teco3.h
index 642a55414..d0f9c26b6 100644
--- a/backend/teco3.h
+++ b/backend/teco3.h
@@ -41,10 +41,6 @@
    If you do not wish that, delete this exception notice.
 */
 
-/*
-	$Id$
-*/
-
 /* Commands supported by the scanner. */
 #define SCSI_TEST_UNIT_READY			0x00
 #define SCSI_REQUEST_SENSE				0x03
diff --git a/doc/descriptions/dmc.desc b/doc/descriptions/dmc.desc
index 08a01bb87..5f14fe633 100644
--- a/doc/descriptions/dmc.desc
+++ b/doc/descriptions/dmc.desc
@@ -1,5 +1,3 @@
-; $Id$
-;
 ; SANE Backend specification file (Matto Marjanovic's format)
 ;
 ; It's basically emacs-lisp --- so ";" indicates comment to end of line.
diff --git a/doc/descriptions/niash.desc b/doc/descriptions/niash.desc
index e4b66d9e3..b85dc1067 100644
--- a/doc/descriptions/niash.desc
+++ b/doc/descriptions/niash.desc
@@ -1,4 +1,3 @@
-; $Id$
 ; SANE Backend specification file
 ;
 ; It's basically emacs-lisp --- so ";" indicates comment to end of line.
diff --git a/doc/descriptions/snapscan.desc b/doc/descriptions/snapscan.desc
index 2943e2d8f..33d7ec32f 100644
--- a/doc/descriptions/snapscan.desc
+++ b/doc/descriptions/snapscan.desc
@@ -1,5 +1,3 @@
-; $Id$
-;
 ; SANE Backend specification file (Matto Marjanovic's format)
 ;
 ; It's basically emacs-lisp --- so ";" indicates comment to end of line.
diff --git a/doc/sane-niash.man b/doc/sane-niash.man
index 8e14b76f7..6b775cc72 100644
--- a/doc/sane-niash.man
+++ b/doc/sane-niash.man
@@ -1,4 +1,3 @@
-.\" $Id$
 .TH sane\-niash 5 "14 Jul 2008" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-niash
 
diff --git a/testsuite/tools/data/testfile.desc b/testsuite/tools/data/testfile.desc
index fcbb1b892..be78f981a 100644
--- a/testsuite/tools/data/testfile.desc
+++ b/testsuite/tools/data/testfile.desc
@@ -1919,7 +1919,6 @@
 
 :devicetype :meta
 :desc "Dynamic loading of shared-library backends."
-; $Id$
 ;
 ; SANE Backend specification file (Matto Marjanovic's format)
 ;
@@ -7593,7 +7592,7 @@
 :devicetype :meta
 :desc "Network access to saned servers"
 :comment "Can be used to access any scanner supported by SANE over the net. Supports IPv4 and IPv6."
-; $Id$
+
 ; SANE Backend specification file
 ;
 ; It's basically emacs-lisp --- so ";" indicates comment to end of line.
@@ -9383,9 +9382,6 @@
 
 ; :status specifier is optional after :model and at the top-level
 
-
-; $Id$
-;
 ; SANE Backend specification file (Matto Marjanovic's format)
 ;
 ; It's basically emacs-lisp --- so ";" indicates comment to end of line.