diff --git a/Makefile.am b/Makefile.am
index a8529071b02d642d225fbe1016bcd56f99e3b2a6..cc976675c6500a48529da0dfc2f39c3a57668830 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 # we need the module file to be able to build via dunecontrol
 EXTRA_DIST= CMakeLists.txt dune.module
 
diff --git a/am/Makefile.am b/am/Makefile.am
index 606649a8b4b3866a31ef7265362cb63ac389b7d0..850852b18d35c8f820376efc57d88bb5440da579 100644
--- a/am/Makefile.am
+++ b/am/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 am_DATA = inkscape.am webstuff global-rules sourcescheck \
         no-check-without-lib latex checklog doxygen top-rules \
         headercheck documentation cmake-pkg-config
diff --git a/am/checklog b/am/checklog
index 2fa3f24543a9d1940cf9a9c25fbb69d9a8ee71a0..ea1f552a6fab027daeb2ffad4a59b92edc1a537f 100644
--- a/am/checklog
+++ b/am/checklog
@@ -1,6 +1,4 @@
 # -*- Makefile -*-
-# $Id$
-
 #
 # check-log
 #
diff --git a/am/documentation b/am/documentation
index 85fa17504fedfbe8cf9b031b62f817c07f67b049..4e269562fcb7df09cc255f176c467b00093ba1f2 100644
--- a/am/documentation
+++ b/am/documentation
@@ -1,5 +1,4 @@
 # -*- Makefile -*-
-# $Id: global-rules 5267 2008-09-10 10:45:42Z christi $
 
 maintainer-clean-local: doc-clean-am
 
diff --git a/am/global-rules b/am/global-rules
index 3299431cf4d858769d5458d85525273ee46529a4..4ad332efa893ea535b2fd3df4bb4d6e35874fe82 100644
--- a/am/global-rules
+++ b/am/global-rules
@@ -1,6 +1,4 @@
 # -*- Makefile -*-
-# $Id$
-
 #
 # this file should be included into any Makefile.am so that we can
 # easily introduce new global rules. DO NOT OVERUSE!
diff --git a/am/headercheck b/am/headercheck
index 07dfe5eb7005c5e52bc74db02de4f00522be7ef2..623e38e92926438994193641d25f09927120d0c4 100644
--- a/am/headercheck
+++ b/am/headercheck
@@ -1,5 +1,4 @@
 # -*- Makefile -*-
-# $Id: sourcescheck 5183 2008-04-27 17:37:08Z christi $
 
 headercheck_PATTERN = *.hh
 
diff --git a/am/latex b/am/latex
index 7641cb93a040e1f092af486672102e020121db05..aa890c2c18ddafd2959f8801571756027d0ff815 100644
--- a/am/latex
+++ b/am/latex
@@ -1,5 +1,4 @@
 # -*- makefile -*-
-# $Id$
 
 # Rules for latex stuff
 
diff --git a/am/no-check-without-lib b/am/no-check-without-lib
index 4fce88d1bfe832ee872d4a64fe693efe9c00dfe6..3cdc55dd91c0ad82bd81e5733ef7a617988c8dc1 100644
--- a/am/no-check-without-lib
+++ b/am/no-check-without-lib
@@ -1,5 +1,4 @@
 # -*- Makefile -*-
-# $Id$
 
 # many tests need parts of libdune. Telling the tests to use
 # previously build partial libs is possible but difficult to maintain:
diff --git a/am/sourcescheck b/am/sourcescheck
index 1cc8cc94d0b40534b61a13344109a3f822bc8d16..e3ca13142723b0888617b1c7132d142542a56351 100644
--- a/am/sourcescheck
+++ b/am/sourcescheck
@@ -1,5 +1,4 @@
 # -*- Makefile -*-
-# $Id$
 
 sourcescheck_IGNORE = aclocal.m4 dependencies.m4
 
diff --git a/am/webstuff b/am/webstuff
index 81853169dab77f06ce43dda7fbedb66cc137f365..0440458383d211e00d206666282bb60065574a06 100644
--- a/am/webstuff
+++ b/am/webstuff
@@ -1,5 +1,4 @@
 # -*- makefile -*-
-# $Id$
 
 ## rules to create HTML-pages from wml-files with additional magic to
 ## possibly use the layout of the Dune-homepage
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 521dafb03618348ddbd04958d928d276228e98eb..fad103a781c7c6eceb6b7115874042251b67a063 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 # put scripts into dist-tarball
 EXTRA_DIST = am2cmake.py CMakeLists.txt duneproject dunecontrol \
   dunedoxynize \
diff --git a/bin/dune-autogen b/bin/dune-autogen
index c9f0bdbf90298f8fc5bebc6413d5b96d859cc5fd..8784c76630c3eba718dd27eb427ca8536f0cb338 100755
--- a/bin/dune-autogen
+++ b/bin/dune-autogen
@@ -1,5 +1,4 @@
 #!/bin/bash
-# $Id: autogen.sh 5054 2008-01-08 15:06:55Z christi $
 
 # barf on errors
 set -e
diff --git a/bin/duneproject b/bin/duneproject
index 55316aca85ccc2292ad0d104c4dde023a4a0a9ef..b0a50fd8da8a2fddcba16f3d7e99eaadecc0a9db 100755
--- a/bin/duneproject
+++ b/bin/duneproject
@@ -434,8 +434,6 @@ for further options.
 
 The full build-system is described in the dune-common/doc/buildsystem (SVN version) or under share/doc/dune-common/buildsystem if you installed DUNE!
 
-\$Id$
-
 R_DELIM
 
 ################## MAKEFILE.AM ##################
@@ -446,8 +444,6 @@ for name in $DEPENDENCIES; do
 done
 echo "- $PROJECT/Makefile.am"
 cat> "$PROJECT/Makefile.am" << M_DELIM
-# \$Id$
-
 # we need the module file to be able to build via dunecontrol
 EXTRA_DIST = dune.module \\
   CMakeLists.txt \\
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 35730d5b2f087c42e78b701d604f35c1ddc6e9d8..63cfc8f96bb4058159db211dd253031282490154 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 # also build these sub directories
 SUBDIRS = doxygen buildsystem comm
 
diff --git a/doc/buildsystem/Makefile.am b/doc/buildsystem/Makefile.am
index 3f953d611b0a60364fb8fc2792fec8a174659764..ccee36ee7a845fcab30a7e17d2beec21f98a86c6 100644
--- a/doc/buildsystem/Makefile.am
+++ b/doc/buildsystem/Makefile.am
@@ -1,5 +1,3 @@
-# $Id: Makefile.am 4499 2006-04-13 14:56:35Z christi $
-
 # setting like in dune-web
 CURDIR=doc/buildsystem
 BASEDIR=../..
diff --git a/doc/comm/Makefile.am b/doc/comm/Makefile.am
index 176ec746a32fb63cd8c3a47f2705f3d847b9a55a..128928d573b58e898c0d006d04f6264493227529 100644
--- a/doc/comm/Makefile.am
+++ b/doc/comm/Makefile.am
@@ -1,5 +1,3 @@
-# $Id: Makefile.am 1681 2012-08-31 11:30:17Z gruenich $
-
 SUBDIRS = figures
 
 MPIPROGRAMS = indexset poosc08 poosc08_test
diff --git a/doc/comm/buildindexset.hh b/doc/comm/buildindexset.hh
index 3a122ebfc3488398f05c6a2ed1e561ed3ead115e..9abaa0a9af7e8ab6f6ec5d1ce8e740626cd2d4e1 100644
--- a/doc/comm/buildindexset.hh
+++ b/doc/comm/buildindexset.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id: buildindexset.hh 1565 2012-04-30 22:04:34Z mblatt $
 #ifndef BUILDINDEXSET_HH
 #define BUILDINDEXSET_HH
 
diff --git a/doc/comm/figures/Makefile.am b/doc/comm/figures/Makefile.am
index febc84358755016d532dadfed31aaff69292886b..3cc3c1bc3e3adc0b8ca098f78f7462e2b78e4bb0 100644
--- a/doc/comm/figures/Makefile.am
+++ b/doc/comm/figures/Makefile.am
@@ -1,4 +1,3 @@
-# $Id: $
 EXTRA_DIST=darray.eps distarray.eps distindex.eps
 
 include $(top_srcdir)/am/webstuff
diff --git a/doc/comm/indexset.cc b/doc/comm/indexset.cc
index 8371b19cbf8e4ab5bca9186a044a26efe4254a10..57ce16b2a224824158ae71743329f88d40894040 100644
--- a/doc/comm/indexset.cc
+++ b/doc/comm/indexset.cc
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id: indexset.cc 1728 2012-11-06 13:06:44Z christi $
 
 #include "config.h"
 
diff --git a/doc/comm/reverse.hh b/doc/comm/reverse.hh
index 371ad2ef1c33646cf2daf64084aef8eb46bbb6a7..93068fd3949a7605531cc81537d7bd9be5d5f9ab 100644
--- a/doc/comm/reverse.hh
+++ b/doc/comm/reverse.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id: reverse.hh 942 2008-09-10 18:21:57Z christi $
 #ifndef REVERSE_HH
 #define REVERSE_HH
 
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index 2bf1067570e18db16242feb76d82a0f1c09e6370..7c01196fd894578af369eb209c1bbe3bb4613839 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 doxydir = $(pkgdatadir)/doc/doxygen
 
 dist_doxy_DATA =					\
diff --git a/dune/Makefile.am b/dune/Makefile.am
index 1a1e5262878ddf5a857eee3ceee5c9b10cade26d..50ee006a9cf7ef9d8084928e0d949fae1b18012f 100644
--- a/dune/Makefile.am
+++ b/dune/Makefile.am
@@ -1,5 +1,3 @@
-# $Id: $
-
 SUBDIRS = common
 
 include $(top_srcdir)/am/global-rules
diff --git a/dune/common/Makefile.am b/dune/common/Makefile.am
index 22934b23196e7625fc55197246cc0eadce0026c0..c8a4e3bda995ad05f1342d203023648cc236519c 100644
--- a/dune/common/Makefile.am
+++ b/dune/common/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 SUBDIRS = . test parallel std
 
 # the standard debug streams are put into the libdune
diff --git a/dune/common/alignment.hh b/dune/common/alignment.hh
index 0d8c5e92d114a14e4ba9d1337ce95bdfe526aeb1..8d771668bccc51c4cf41a48aa729de92e0c7a500 100644
--- a/dune/common/alignment.hh
+++ b/dune/common/alignment.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 #ifndef DUNE_ALIGNMENT_HH
 #define DUNE_ALIGNMENT_HH
 
diff --git a/dune/common/arraylist.hh b/dune/common/arraylist.hh
index cd52d5615e56a2b5d37e09e2ee00c62bd582814c..3337eac510eae9aaccd895417cbcbac8c7ded46e 100644
--- a/dune/common/arraylist.hh
+++ b/dune/common/arraylist.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 
 #ifndef DUNE_ARRAYLIST_HH
 #define DUNE_ARRAYLIST_HH
diff --git a/dune/common/bigunsignedint.hh b/dune/common/bigunsignedint.hh
index 2c57c029a32dbf4ed7642609f7e2aedda14b3fdb..73f2a795720909abce9a71493fdbb24778dd24d0 100644
--- a/dune/common/bigunsignedint.hh
+++ b/dune/common/bigunsignedint.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 
 #ifndef DUNE_BIGUNSIGNEDINT_HH
 #define DUNE_BIGUNSIGNEDINT_HH
diff --git a/dune/common/debugstream.hh b/dune/common/debugstream.hh
index 88c7af4d8387507aca27a6b75807be48739e7581..9a44bb06c4b7b6201b441bc0a9a4900a7a1437e2 100644
--- a/dune/common/debugstream.hh
+++ b/dune/common/debugstream.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 
 #ifndef DUNE_DEBUGSTREAM_HH
 #define DUNE_DEBUGSTREAM_HH
diff --git a/dune/common/densematrix.hh b/dune/common/densematrix.hh
index f02310e5fac4dfbb106e986b3ca1cb22e95221eb..d3ed73f489920949ed5624b04e5120a8f84a50d8 100644
--- a/dune/common/densematrix.hh
+++ b/dune/common/densematrix.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id: fmatrix.hh 6128 2010-09-08 13:50:00Z christi $
 #ifndef DUNE_DENSEMATRIX_HH
 #define DUNE_DENSEMATRIX_HH
 
diff --git a/dune/common/dynmatrix.hh b/dune/common/dynmatrix.hh
index b23ee398f8fc35627c2c4feea07fd394cc07ab1c..1bece488b3ce3f3b4437f75f6dfd01c1f9a4d016 100644
--- a/dune/common/dynmatrix.hh
+++ b/dune/common/dynmatrix.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id: fmatrix.hh 6181 2010-10-13 18:53:40Z christi $
 #ifndef DUNE_DYNMATRIX_HH
 #define DUNE_DYNMATRIX_HH
 
diff --git a/dune/common/dynvector.hh b/dune/common/dynvector.hh
index fa5a6bc154305b39ebaa73b491ea84052ae05b20..0319e6d74d8e9321cd3944ea9d879604883130c9 100644
--- a/dune/common/dynvector.hh
+++ b/dune/common/dynvector.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id: fvector.hh 6105 2010-08-25 16:06:36Z christi $
 #ifndef DUNE_DYNVECTOR_HH
 #define DUNE_DYNVECTOR_HH
 
diff --git a/dune/common/fmatrix.hh b/dune/common/fmatrix.hh
index d57af2dba95b2b2089d7affa4f4debda91d06c14..f55a1b836e3a0af253b00bbb9e5e0c08d52c63cf 100644
--- a/dune/common/fmatrix.hh
+++ b/dune/common/fmatrix.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 #ifndef DUNE_FMATRIX_HH
 #define DUNE_FMATRIX_HH
 
diff --git a/dune/common/ftraits.hh b/dune/common/ftraits.hh
index b245b1e6b222d1b358662fcbd77b789972ca1a6f..d0560aeeba5eca57e8ee9f1909f3dc009f59b850 100644
--- a/dune/common/ftraits.hh
+++ b/dune/common/ftraits.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id: fvector.hh 5262 2008-09-07 09:03:38Z christi $
 #ifndef DUNE_FTRAITS_HH
 #define DUNE_FTRAITS_HH
 
diff --git a/dune/common/fvector.hh b/dune/common/fvector.hh
index 606e6be5c8cf453de701d60c650fab171a740b58..3a3032014787549f84b347f426b58f880068f55b 100644
--- a/dune/common/fvector.hh
+++ b/dune/common/fvector.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 #ifndef DUNE_FVECTOR_HH
 #define DUNE_FVECTOR_HH
 
diff --git a/dune/common/genericiterator.hh b/dune/common/genericiterator.hh
index ea9c2069b644f577b1775bdefc5e9cc700f67cce..13bd726bf3eefef7893a3a72b368890ce8fc52d9 100644
--- a/dune/common/genericiterator.hh
+++ b/dune/common/genericiterator.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 #ifndef DUNE_GENERICITERATOR_HH
 #define DUNE_GENERICITERATOR_HH
 
diff --git a/dune/common/iteratorfacades.hh b/dune/common/iteratorfacades.hh
index b99953de641fd3c7ec635dec9bb721ce2b603dd0..d8553ddd09ed8faf96fbd291154ff79f077b77df 100644
--- a/dune/common/iteratorfacades.hh
+++ b/dune/common/iteratorfacades.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 #ifndef DUNE_ITERATORFACADES_HH
 #define DUNE_ITERATORFACADES_HH
 #include <iterator>
diff --git a/dune/common/matvectraits.hh b/dune/common/matvectraits.hh
index db67e68f7d4f6f4f18699147efea3c4699094c47..1c79157116cd67190338190e24da9b5c9cbf8181 100644
--- a/dune/common/matvectraits.hh
+++ b/dune/common/matvectraits.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id: fvector.hh 5262 2008-09-07 09:03:38Z christi $
 #ifndef DUNE_MATVECTRAITS_HH
 #define DUNE_MATVECTRAITS_HH
 
diff --git a/dune/common/parallel/Makefile.am b/dune/common/parallel/Makefile.am
index 6c14fd0633a4dfc7852ec5cc90da8b104a971b41..f63d4f2e7c493e1c0948f3e2b01df1e8bba6a52c 100644
--- a/dune/common/parallel/Makefile.am
+++ b/dune/common/parallel/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 SUBDIRS = test
 
 parallelincludedir = $(includedir)/dune/common/parallel
diff --git a/dune/common/parallel/communicator.hh b/dune/common/parallel/communicator.hh
index 89d63d4b2e361349880897702a4b234c971ae78d..3d3f970b06060f9b29da60923be5cba6f5d67601 100644
--- a/dune/common/parallel/communicator.hh
+++ b/dune/common/parallel/communicator.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 #ifndef DUNE_COMMUNICATOR
 #define DUNE_COMMUNICATOR
 
diff --git a/dune/common/parallel/indexset.hh b/dune/common/parallel/indexset.hh
index c02947122e834e9dd78b6b083e756b6a227ddcb9..051ed4766727fb31a0cfe0a7646c70256cf65ec1 100644
--- a/dune/common/parallel/indexset.hh
+++ b/dune/common/parallel/indexset.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 #ifndef DUNE_INDEXSET_HH
 #define DUNE_INDEXSET_HH
 
diff --git a/dune/common/parallel/indicessyncer.hh b/dune/common/parallel/indicessyncer.hh
index 3dc513310241c7690e37c1a8611f7d9056a08a4e..8efdc6e72b1166a1e127c84287d5af04c41cfb21 100644
--- a/dune/common/parallel/indicessyncer.hh
+++ b/dune/common/parallel/indicessyncer.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 #ifndef DUNE_INDICESSYNCER_HH
 #define DUNE_INDICESSYNCER_HH
 
diff --git a/dune/common/parallel/interface.hh b/dune/common/parallel/interface.hh
index 3fceb8d240c6d747f2a9dfd081a69473c143f89b..be135580cbaf824e01f6c8c84db4cd8fbf6f757f 100644
--- a/dune/common/parallel/interface.hh
+++ b/dune/common/parallel/interface.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 #ifndef DUNE_INTERFACE_HH
 #define DUNE_INTERFACE_HH
 
diff --git a/dune/common/parallel/localindex.hh b/dune/common/parallel/localindex.hh
index e65cbf18f876102cba1d2505eb4387e857c308e7..761543bf27b228f4938ddfec6f23b30b436408bb 100644
--- a/dune/common/parallel/localindex.hh
+++ b/dune/common/parallel/localindex.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 
 #ifndef DUNE_COMMON_LOCALINDEX_HH
 #define DUNE_COMMON_LOCALINDEX_HH
diff --git a/dune/common/parallel/mpihelper.hh b/dune/common/parallel/mpihelper.hh
index 01325b249712f18b67e58f74ee6f9b4d53055313..fd8822c6ffde84a447ccc724a48d0a51e967f568 100644
--- a/dune/common/parallel/mpihelper.hh
+++ b/dune/common/parallel/mpihelper.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id: $
 #ifndef DUNE_MPIHELPER
 #define DUNE_MPIHELPER
 
diff --git a/dune/common/parallel/mpitraits.hh b/dune/common/parallel/mpitraits.hh
index dac7b4f6955f0f330f6685445e87d2e9c53a7597..206ce393cf57fbdbab33a6b05ee0d283948d8c1b 100644
--- a/dune/common/parallel/mpitraits.hh
+++ b/dune/common/parallel/mpitraits.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id: mpitraits.hh 1083 2009-09-28 17:13:20Z mblatt $
 #ifndef DUNE_MPITRAITS_HH
 #define DUNE_MPITRAITS_HH
 
diff --git a/dune/common/parallel/plocalindex.hh b/dune/common/parallel/plocalindex.hh
index adeaa378dbb992713cba26ddff4182f316ed93e0..994cf4b0d45dfe1f81c70f77903e0b6f24557730 100644
--- a/dune/common/parallel/plocalindex.hh
+++ b/dune/common/parallel/plocalindex.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 
 #ifndef DUNE_PLOCALINDEX_HH
 #define DUNE_PLOCALINDEX_HH
diff --git a/dune/common/parallel/remoteindices.hh b/dune/common/parallel/remoteindices.hh
index 97227e95fde261179758dfe6595a54a425b63028..ae1c77e0c26d29e93fb5275c294bbf829ad9b341 100644
--- a/dune/common/parallel/remoteindices.hh
+++ b/dune/common/parallel/remoteindices.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 #ifndef DUNE_REMOTEINDICES_HH
 #define DUNE_REMOTEINDICES_HH
 
diff --git a/dune/common/parallel/selection.hh b/dune/common/parallel/selection.hh
index c546fdcf5fabe4d37930ee06a659941a28bbd291..f8042fef7280bdb68d03f5063cde060786c227e1 100644
--- a/dune/common/parallel/selection.hh
+++ b/dune/common/parallel/selection.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 #ifndef DUNE_SELECTION_HH
 #define DUNE_SELECTION_HH
 
diff --git a/dune/common/parallel/test/Makefile.am b/dune/common/parallel/test/Makefile.am
index b8a01e3d7cec0c4f54264825925b0b2c51b68652..e1652c7856e3e4661df86b2a24eed7fb907452a9 100644
--- a/dune/common/parallel/test/Makefile.am
+++ b/dune/common/parallel/test/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 MPITESTS = indicestest                            \
            indexsettest                           \
            syncertest                             \
diff --git a/dune/common/poolallocator.hh b/dune/common/poolallocator.hh
index 9a70f677d00edb23be64391360c972feeaa29ad3..39ddc7b125c5395952bf22e9713fb1ff78c9bc35 100644
--- a/dune/common/poolallocator.hh
+++ b/dune/common/poolallocator.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 #ifndef DUNE_COMMON_POOLALLOCATOR_HH
 #define DUNE_COMMON_POOLALLOCATOR_HH
 
diff --git a/dune/common/propertymap.hh b/dune/common/propertymap.hh
index 3f7e917c80736b2a41e4e8cce39e9c6cb1114194..2f2323efdcac7279ea297456aaef7bb64887a083 100644
--- a/dune/common/propertymap.hh
+++ b/dune/common/propertymap.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 #ifndef DUNE_PROPERTYMAP_HH
 #define DUNE_PROPERTYMAP_HH
 
diff --git a/dune/common/shared_ptr.hh b/dune/common/shared_ptr.hh
index f48cd8896adaad29b8a655cdc14ff74341b616f9..39c6dde472fffe24073c500d2a6a0665b137dc4c 100644
--- a/dune/common/shared_ptr.hh
+++ b/dune/common/shared_ptr.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id: smartpointer.hh 5504 2009-04-08 13:35:31Z christi $
 
 #ifndef DUNE_SHARED_PTR_HH
 #define DUNE_SHARED_PTR_HH
diff --git a/dune/common/sllist.hh b/dune/common/sllist.hh
index 2e694e6b4f7be8c58f0b2e77c03338065c76ec81..0c93ac21b426dd8b3f856b90fa79670e45fc2c41 100644
--- a/dune/common/sllist.hh
+++ b/dune/common/sllist.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 #ifndef DUNE_SLLIST_HH
 #define DUNE_SLLIST_HH
 
diff --git a/dune/common/stdstreams.cc b/dune/common/stdstreams.cc
index c28eb7b4e3e6c0fe4faad906415c262ddaf880e2..1dc56b1980c12d6e29856badd10872dc4412b228 100644
--- a/dune/common/stdstreams.cc
+++ b/dune/common/stdstreams.cc
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/dune/common/stdstreams.hh b/dune/common/stdstreams.hh
index ffda31ce223863141a525f76b1739731a71fb7da..39dfc8a65c5fbd2cee8bc0b57a2464cceb21baeb 100644
--- a/dune/common/stdstreams.hh
+++ b/dune/common/stdstreams.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 
 /**
    \file
diff --git a/dune/common/test/Makefile.am b/dune/common/test/Makefile.am
index 21fc953ad688b4881921058b8941d6b4451cde17..670c2b476b13c8b06d6bfd99eda4412fa8e3796d 100644
--- a/dune/common/test/Makefile.am
+++ b/dune/common/test/Makefile.am
@@ -1,5 +1,4 @@
 # -*- tab-width: 4; indent-tabs-mode: nil -*-
-# $Id$
 
 TESTPROGS = \
     arraylisttest \
diff --git a/dune/common/test/arraylisttest.cc b/dune/common/test/arraylisttest.cc
index 56ff518e9767170126c0d608064d9f28bfc409d1..de64c6f4e0543b647478b230b2c40f1565565388 100644
--- a/dune/common/test/arraylisttest.cc
+++ b/dune/common/test/arraylisttest.cc
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/dune/common/test/iteratortest.hh b/dune/common/test/iteratortest.hh
index c8cbe100fd50902bbd18d73bc199fe1af9277782..94bca25a81030d67306ac4e7ee6c08c5ccd670dd 100644
--- a/dune/common/test/iteratortest.hh
+++ b/dune/common/test/iteratortest.hh
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 
 #ifndef DUNE_ITERATORTEST_HH
 #define DUNE_ITERATORTEST_HH
diff --git a/dune/common/test/shared_ptrtest.cc b/dune/common/test/shared_ptrtest.cc
index c7991d21b24e2e48a050129f28dafcfa62b8792d..3b936754ee3d52ae88bb5fa92fe9e652cab9078d 100644
--- a/dune/common/test/shared_ptrtest.cc
+++ b/dune/common/test/shared_ptrtest.cc
@@ -1,8 +1,6 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
 
-// $Id$
-
 // make sure assert works even when not compiling for debugging
 #ifdef NDEBUG
 #undef NDEBUG
diff --git a/dune/common/test/streamtest.cc b/dune/common/test/streamtest.cc
index 087e2fb1db84101a8d38cf095b46082b91e10e4c..89239413fe579daa6a588b9bac206cb436306df6 100644
--- a/dune/common/test/streamtest.cc
+++ b/dune/common/test/streamtest.cc
@@ -1,6 +1,5 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-// $Id$
 
 /*
 
diff --git a/dune/common/test/tuplestest.cc b/dune/common/test/tuplestest.cc
index b6bff9d15b02936d018de8901dfd655ed881d0e3..ad20f92e374f74f10893b2eb8ffc1fca2a061abf 100644
--- a/dune/common/test/tuplestest.cc
+++ b/dune/common/test/tuplestest.cc
@@ -1,8 +1,6 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
 
-// $Id$
-
 // make sure assert works even when not compiling for debugging
 #ifdef NDEBUG
 #undef NDEBUG
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 668814721f0fdd631b4f8eb8754d3aa058e49963..2e27f49c1ad31e2d29e87d30070fc037d273fc97 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,3 @@
-# $Id: $
 dunemodulelibdir=$(libdir)
 
 EXTRA_DIST = CMakeLists.txt dunemodules.lib dunecommonam2cmake.lib
diff --git a/m4/dune.m4 b/m4/dune.m4
index 90191b3c17a70b72b11ffb90fa39cc6e0d346aca..46659e7033646b29cdeeb021618d514f28555323 100644
--- a/m4/dune.m4
+++ b/m4/dune.m4
@@ -1,5 +1,4 @@
 dnl -*- autoconf -*-
-# $Id$
 # checks for dune-headers and everything they need
 
 # TODO
diff --git a/m4/dune_all.m4 b/m4/dune_all.m4
index 575591a007091aa1fc137f8c64860b6207177eea..3277de21de9b63eaa04795c91971edd8fdbb379c 100644
--- a/m4/dune_all.m4
+++ b/m4/dune_all.m4
@@ -1,5 +1,4 @@
 ## -*- autoconf -*-
-# $Id$
 
 # this meta-check calls everything needed for Dune to work and all
 # possible components. Applications should use this so that
diff --git a/m4/dune_compiler.m4 b/m4/dune_compiler.m4
index d4d582429dac919e6755e296d354656ad5fce229..4ea13a085bf836299e2432cf8b492c9069ac9876 100644
--- a/m4/dune_compiler.m4
+++ b/m4/dune_compiler.m4
@@ -1,4 +1,3 @@
-# $Id$
 # check for supported compilers
 
 AC_DEFUN([DUNE_CHECK_COMPILER],[
diff --git a/m4/dune_deprecated.m4 b/m4/dune_deprecated.m4
index 17deefa7e7fe5d88e839ce308e59d87a1d856f2a..8b7d76b02333257d448a9eba49bd59d873ecac2c 100644
--- a/m4/dune_deprecated.m4
+++ b/m4/dune_deprecated.m4
@@ -1,5 +1,3 @@
-# $Id$
-
 # Check for the right way to create the deprecation warning
 
 AC_DEFUN([DUNE_CHECKDEPRECATED],[
diff --git a/m4/dune_linkcxx.m4 b/m4/dune_linkcxx.m4
index 5d61bec801898ef3fa8743bf030a0c80f07fd61b..4440fb5b172756df57051ac2c2df8d857be4c58f 100644
--- a/m4/dune_linkcxx.m4
+++ b/m4/dune_linkcxx.m4
@@ -1,4 +1,3 @@
-# $Id$
 # tries to link c++ objects
 
 AC_DEFUN([DUNE_LINKCXX],[
diff --git a/m4/dune_mpi.m4 b/m4/dune_mpi.m4
index aeac3fa3fea25483bc83ca219fed219884389e43..65974f566f3ce1cf62984863d0408c3cabafbf05 100644
--- a/m4/dune_mpi.m4
+++ b/m4/dune_mpi.m4
@@ -1,5 +1,4 @@
 dnl -*- autoconf -*-
-# $Id$
 
 # wrapper for the autoconf-archive check. Note: compiling MPI-stuff sucks!
 
diff --git a/m4/dune_streams.m4 b/m4/dune_streams.m4
index 688560521b94e5040ba21080df622ad1efe601b4..acdd22715961360fae59996ba9fa0ba095cf107a 100644
--- a/m4/dune_streams.m4
+++ b/m4/dune_streams.m4
@@ -1,5 +1,3 @@
-# $Id: dune_deprecated.m4 1114 2004-11-17 14:00:06Z christi $
-
 # Set the minimal verbosity level. All stream with a level below will
 # get removed by the optimizer.
 
diff --git a/m4/hdf5.m4 b/m4/hdf5.m4
index 8a252bd49188ec6ad6f8238a725b18130ef17a7d..b3152849908b1944537dacb39db57a214d9c0bb4 100644
--- a/m4/hdf5.m4
+++ b/m4/hdf5.m4
@@ -1,5 +1,4 @@
 ## -*- autoconf -*-
-# $Id$
 # searches for HDF5-stuff
 
 # DUNE_PATH_HDF5()
diff --git a/m4/inkscape.m4 b/m4/inkscape.m4
index 3fd49e2490d3ff4f6e99fb73c0c3cca7feec217e..665f02b67345ef2cbc9fc981da6fd0d26f37d55e 100644
--- a/m4/inkscape.m4
+++ b/m4/inkscape.m4
@@ -1,5 +1,3 @@
-# $Id$
-
 # Check for inkscape and define automake conditional
 
 AC_DEFUN([DUNE_INKSCAPE],[
diff --git a/m4/opengl.m4 b/m4/opengl.m4
index 0025baac903d738bc237093358520f7b400e18ef..fac562e15439a9347d0c7fa9dc07aca4f2cc7754 100644
--- a/m4/opengl.m4
+++ b/m4/opengl.m4
@@ -1,5 +1,4 @@
 ## -*- autoconf -*-
-# $Id$
 # searches for OpenGL-stuff
 
 # DUNE_PATH_OPENGL()
diff --git a/m4/parmetis.m4 b/m4/parmetis.m4
index 3ba7c91bd14f13fa92599c564b33a51f7c3a260d..5a337d3338983dd6cbce6169906ddd0745126777 100644
--- a/m4/parmetis.m4
+++ b/m4/parmetis.m4
@@ -1,6 +1,5 @@
 dnl -*- mode: autoconf; tab-width: 8; indent-tabs-mode: nil; -*-
 dnl vi: set et ts=8 sw=2 sts=2:
-# $Id$
 # searches for ParMetis headers and libs
 
 AC_DEFUN([DUNE_PATH_PARMETIS],[
diff --git a/m4/xdr.m4 b/m4/xdr.m4
index 666e183c0f3d759ffdb0783b718188b29864f484..3278fab47cb7c1d804acd37dc08f0ec0cde39d73 100644
--- a/m4/xdr.m4
+++ b/m4/xdr.m4
@@ -1,4 +1,3 @@
-# $Id$
 # searches for XDR Headers which are implicitly included by rpc.h
 # some systems don't like it when xdr.h is directly included
 
diff --git a/share/bash-completion/completions/Makefile.am b/share/bash-completion/completions/Makefile.am
index fb8436e4f2c2b6d6a6cdae3dc0d5beebd5a704a4..d96755050a166d715b1c9b6a0f57d65685012b6a 100644
--- a/share/bash-completion/completions/Makefile.am
+++ b/share/bash-completion/completions/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 completions_DATA = dunecontrol
 
 # Not all file names seem to be treated equal by _DATA.