diff --git a/bindings/python/mapnik_gamma_method.cpp b/bindings/python/mapnik_gamma_method.cpp
index 8ab0388ae..23b832d6d 100644
--- a/bindings/python/mapnik_gamma_method.cpp
+++ b/bindings/python/mapnik_gamma_method.cpp
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
 
 #include <boost/python.hpp>
diff --git a/bindings/python/mapnik_scaling_method.cpp b/bindings/python/mapnik_scaling_method.cpp
index a5ac926c6..c237a708c 100644
--- a/bindings/python/mapnik_scaling_method.cpp
+++ b/bindings/python/mapnik_scaling_method.cpp
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
 
 #include <boost/python.hpp>
diff --git a/demo/viewer/about_dialog.cpp b/demo/viewer/about_dialog.cpp
index 5f6fa88f5..270db196f 100644
--- a/demo/viewer/about_dialog.cpp
+++ b/demo/viewer/about_dialog.cpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 #include "about_dialog.hpp"
 
diff --git a/demo/viewer/about_dialog.hpp b/demo/viewer/about_dialog.hpp
index b70e27330..8411a4dc0 100644
--- a/demo/viewer/about_dialog.hpp
+++ b/demo/viewer/about_dialog.hpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 
 #if !defined ABOUT_DIALOG_HPP
diff --git a/demo/viewer/info_dialog.cpp b/demo/viewer/info_dialog.cpp
index 92b3599d3..734293d52 100644
--- a/demo/viewer/info_dialog.cpp
+++ b/demo/viewer/info_dialog.cpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 #include "info_dialog.hpp"
 
diff --git a/demo/viewer/info_dialog.hpp b/demo/viewer/info_dialog.hpp
index 81d550c8b..754c1a96f 100644
--- a/demo/viewer/info_dialog.hpp
+++ b/demo/viewer/info_dialog.hpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 
 #ifndef INFO_DIALOG_HPP
diff --git a/demo/viewer/layer_info_dialog.cpp b/demo/viewer/layer_info_dialog.cpp
index c223146b4..93e0072db 100644
--- a/demo/viewer/layer_info_dialog.cpp
+++ b/demo/viewer/layer_info_dialog.cpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 #include "layer_info_dialog.hpp"
 
diff --git a/demo/viewer/layer_info_dialog.hpp b/demo/viewer/layer_info_dialog.hpp
index 4fb8730fa..9b9d2abc2 100644
--- a/demo/viewer/layer_info_dialog.hpp
+++ b/demo/viewer/layer_info_dialog.hpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 
 #ifndef LAYER_INFO_DIALOG_HPP
diff --git a/demo/viewer/layerdelegate.cpp b/demo/viewer/layerdelegate.cpp
index fbaf101ed..73f6f17fa 100644
--- a/demo/viewer/layerdelegate.cpp
+++ b/demo/viewer/layerdelegate.cpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 #include <QtGui>
 #include "layerdelegate.hpp"
diff --git a/demo/viewer/layerdelegate.hpp b/demo/viewer/layerdelegate.hpp
index a5442a6fc..616b6f53d 100644
--- a/demo/viewer/layerdelegate.hpp
+++ b/demo/viewer/layerdelegate.hpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 #ifndef LAYER_DELEGATE_HPP
 #define LAYER_DELEGATE_HPP
 
diff --git a/demo/viewer/layerlistmodel.cpp b/demo/viewer/layerlistmodel.cpp
index 68280dce1..a85645174 100644
--- a/demo/viewer/layerlistmodel.cpp
+++ b/demo/viewer/layerlistmodel.cpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 
 #include "layerlistmodel.hpp"
diff --git a/demo/viewer/layerlistmodel.hpp b/demo/viewer/layerlistmodel.hpp
index 6d4ec00a5..7c155d95e 100644
--- a/demo/viewer/layerlistmodel.hpp
+++ b/demo/viewer/layerlistmodel.hpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 
 #ifndef LAYER_LIST_MODEL_HPP
diff --git a/demo/viewer/layerwidget.cpp b/demo/viewer/layerwidget.cpp
index 4affb0a2c..876d6b13f 100644
--- a/demo/viewer/layerwidget.cpp
+++ b/demo/viewer/layerwidget.cpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 #include "layerwidget.hpp"
 #include <qabstractitemdelegate.h>
diff --git a/demo/viewer/layerwidget.hpp b/demo/viewer/layerwidget.hpp
index a62a91e10..a3b163c29 100644
--- a/demo/viewer/layerwidget.hpp
+++ b/demo/viewer/layerwidget.hpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 #ifndef LAYERWIDGET_HPP
 #define LAYERWIDGET_HPP
diff --git a/demo/viewer/main.cpp b/demo/viewer/main.cpp
index c5cb4ad4c..4b314a500 100644
--- a/demo/viewer/main.cpp
+++ b/demo/viewer/main.cpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 // qt
 #include <QApplication>
diff --git a/demo/viewer/mainwindow.cpp b/demo/viewer/mainwindow.cpp
index c4fc631b6..996138678 100644
--- a/demo/viewer/mainwindow.cpp
+++ b/demo/viewer/mainwindow.cpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 // stl
 #include <iostream>
diff --git a/demo/viewer/mainwindow.hpp b/demo/viewer/mainwindow.hpp
index 25271693b..99936da73 100644
--- a/demo/viewer/mainwindow.hpp
+++ b/demo/viewer/mainwindow.hpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 #ifndef MAINWINDOW_HPP
 #define MAINWINDOW_HPP
diff --git a/demo/viewer/mapwidget.cpp b/demo/viewer/mapwidget.cpp
index eb57adce9..159f556cc 100644
--- a/demo/viewer/mapwidget.cpp
+++ b/demo/viewer/mapwidget.cpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 #include <QtGui>
 
diff --git a/demo/viewer/mapwidget.hpp b/demo/viewer/mapwidget.hpp
index 0aab462b8..11026a546 100644
--- a/demo/viewer/mapwidget.hpp
+++ b/demo/viewer/mapwidget.hpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 #ifndef MAP_WIDGET_HPP
 #define MAP_WIDGET_HPP
diff --git a/demo/viewer/styles_model.cpp b/demo/viewer/styles_model.cpp
index 4a0fd0116..3468de005 100644
--- a/demo/viewer/styles_model.cpp
+++ b/demo/viewer/styles_model.cpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 #include "styles_model.hpp"
 #include <mapnik/expression_string.hpp>
diff --git a/demo/viewer/styles_model.hpp b/demo/viewer/styles_model.hpp
index 92bafaacd..5dfb9190f 100644
--- a/demo/viewer/styles_model.hpp
+++ b/demo/viewer/styles_model.hpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-//$Id$
 
 #ifndef STYLE_MODEL_HPP
 #define STYLE_MODEL_HPP
diff --git a/plugins/input/geos/geos_feature_ptr.hpp b/plugins/input/geos/geos_feature_ptr.hpp
index 6d9365896..069dc6124 100644
--- a/plugins/input/geos/geos_feature_ptr.hpp
+++ b/plugins/input/geos/geos_feature_ptr.hpp
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
 #ifndef GEOS_FEATURE_PTR_HPP
 #define GEOS_FEATURE_PTR_HPP
diff --git a/utils/geometry_to_wkb/main.cpp b/utils/geometry_to_wkb/main.cpp
index 980303418..735cc7f69 100644
--- a/utils/geometry_to_wkb/main.cpp
+++ b/utils/geometry_to_wkb/main.cpp
@@ -20,7 +20,6 @@
  *
  *****************************************************************************/
 
-//$Id$
 
 #include <iostream>
 #include <string>
diff --git a/utils/pgsql2sqlite/main.cpp b/utils/pgsql2sqlite/main.cpp
index ad9d695c0..a5b13f945 100644
--- a/utils/pgsql2sqlite/main.cpp
+++ b/utils/pgsql2sqlite/main.cpp
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
 // mapnik
 #include "pgsql2sqlite.hpp"
diff --git a/utils/pgsql2sqlite/pgsql2sqlite.hpp b/utils/pgsql2sqlite/pgsql2sqlite.hpp
index 2d8583caa..3874ead7a 100644
--- a/utils/pgsql2sqlite/pgsql2sqlite.hpp
+++ b/utils/pgsql2sqlite/pgsql2sqlite.hpp
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
 #include "sqlite.hpp"
 
diff --git a/utils/pgsql2sqlite/sqlite.cpp b/utils/pgsql2sqlite/sqlite.cpp
index 8509008a5..2da3fb17c 100644
--- a/utils/pgsql2sqlite/sqlite.cpp
+++ b/utils/pgsql2sqlite/sqlite.cpp
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
 #include "sqlite.hpp"
 
diff --git a/utils/pgsql2sqlite/sqlite.hpp b/utils/pgsql2sqlite/sqlite.hpp
index cdc5d7484..e7ce0eb1b 100644
--- a/utils/pgsql2sqlite/sqlite.hpp
+++ b/utils/pgsql2sqlite/sqlite.hpp
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
 // boost
 #include <boost/shared_ptr.hpp>