diff --git a/INSTALL b/INSTALL
index 85b24183e02798938bbeaeb8ce5b41014b16ec96..1276f295670aa98e63ba56ad6b2b9b8e66c40842 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,3 @@
-// $Id$
 
 REQUIREMENTS
 ------------
diff --git a/cron.php b/cron.php
index 140a4202fee410e5d21efa3c53941dbee5c194a3..c656f89e14e5a5906c68e9bac6c4278278f2fe3b 100644
--- a/cron.php
+++ b/cron.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 include_once "includes/common.inc";
 
diff --git a/error.php b/error.php
index 0433593d595bf7847af97a292876370e5f575332..06fcd87b9c3c2b4f9b45b7da259d19b389313a5b 100644
--- a/error.php
+++ b/error.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 include_once "includes/common.inc";
 
diff --git a/includes/common.inc b/includes/common.inc
index 795ac393c6a74093af6055a12a9be147502b954e..b3fcdcc434d5b3e17bdbeef960bdae8befc3afd9 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function conf_init() {
 
diff --git a/includes/conf.php b/includes/conf.php
index 920a94397bd18117d28724830a67982567ae31e3..87237d9dc2e683c65a27f97aea0ca4cac58ee980 100644
--- a/includes/conf.php
+++ b/includes/conf.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 #
 # Database settings:
diff --git a/includes/database.mysql.inc b/includes/database.mysql.inc
index c3ac1287685931cb910764f6fd923b05ae146b60..b7d8285e31444afa8d0c8cbd6d587483ae3b42a6 100644
--- a/includes/database.mysql.inc
+++ b/includes/database.mysql.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function db_connect($url) {
   $url = parse_url($url);
diff --git a/includes/database.pear.inc b/includes/database.pear.inc
index 1b93096b27007cb34cad5cebbeae158471a8e54c..cd6078e8ee2e6d4172da6e8ad9c499523542da34 100644
--- a/includes/database.pear.inc
+++ b/includes/database.pear.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 require_once 'DB.php';
 
diff --git a/includes/menu.inc b/includes/menu.inc
index 617e9ed2201ec7cc09040cda52d7f38cef4244b6..4667c60f669a33d1e66770bd899da4a6c6695765 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function menu($path, $title, $callback = NULL, $help = NULL, $weight = 0, $hidden = 0) {
   global $_gmenu;
diff --git a/includes/module.inc b/includes/module.inc
index 1732104a27c870c3813e357b04c605d8734b44cb..0e0d15d2f37604092085843e74dd8df147ca564b 100644
--- a/includes/module.inc
+++ b/includes/module.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 // initialize modules:
 function module_init() {
diff --git a/includes/pager.inc b/includes/pager.inc
index a567499b2ee52c2aba657e72308e25fb5af9ab88..e51834074f2aba0d30e04993e1b0f59258cb2359 100644
--- a/includes/pager.inc
+++ b/includes/pager.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /* ***************************************************
  *            external functions (API)
diff --git a/includes/theme.inc b/includes/theme.inc
index 05880fbd8799a8584e309b818785f846558cbfff..65cedd014425901a949797b1e70b700685b8549a 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
 * Basic theme
diff --git a/includes/xmlrpc.inc b/includes/xmlrpc.inc
index 77b1f7129275e5a4fd135edf13d612d62a705863..5ec19241cb0e02494de81c56a4a26243b9e253aa 100644
--- a/includes/xmlrpc.inc
+++ b/includes/xmlrpc.inc
@@ -1,7 +1,6 @@
 <?php          // -*-c++-*-
 // by Edd Dumbill (C) 1999-2001
 // <edd@usefulinc.com>
-// $Id$
 
 
 // Copyright (c) 1999,2000,2001 Edd Dumbill.
diff --git a/includes/xmlrpcs.inc b/includes/xmlrpcs.inc
index 723e7a919494a58a0e75a29d4a7e741c1e2d2656..1feb0e3fe04969b00903802d84695a82de71b646 100644
--- a/includes/xmlrpcs.inc
+++ b/includes/xmlrpcs.inc
@@ -1,7 +1,6 @@
 <?php
 // by Edd Dumbill (C) 1999-2001
 // <edd@usefulinc.com>
-// $Id$
 
 // Copyright (c) 1999,2000,2001 Edd Dumbill.
 // All rights reserved.
diff --git a/index.php b/index.php
index 3d149eab22b7dbd3a8925d183ddc02ead6cf80b1..5d55e390fc8c7b7bd91cf2e310225f90925b6d3d 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 include_once "includes/common.inc";
 
diff --git a/modules/admin.module b/modules/admin.module
index 81e23fffa9d5a3add409af4a63647881441bd803..b785ad052246f9b3c0e8c7221d3d762fbaf9890d 100644
--- a/modules/admin.module
+++ b/modules/admin.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 include_once "includes/common.inc";
 
diff --git a/modules/archive.module b/modules/archive.module
index 1afd48cc182f82d1a42e78164ab1672f78153a0e..0ff6a805db74d5b3e7eb264a6a97d2904363454a 100644
--- a/modules/archive.module
+++ b/modules/archive.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function archive_system($field){
   $system["description"] = t("Displays a calendar to navigate old content.");
diff --git a/modules/block.module b/modules/block.module
index 5ac9d9f59aa6944ef4f0f21109db0ce37a1abe7e..ecbd85053a81b3c00d78ba7b3136e14e1e6f2834 100644
--- a/modules/block.module
+++ b/modules/block.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function block_help() {
   $output .= "<p>Blocks are the boxes visible in the sidebar(s) of your web site. These are usually generated automatically by modules (e.g. recent forum topics), but you can also create your own blocks using either static HTML or dynamic PHP content.</p>";
diff --git a/modules/blog.module b/modules/blog.module
index 939ba82b14419cc6f1067e73c9577db44c95a8e1..e107c1d6e72d9d04252aded684a6733a5b8cbab0 100644
--- a/modules/blog.module
+++ b/modules/blog.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function blog_system($field){
   $system["description"] = t("Enables keeping a blog or easily and regularly updated web page.");
diff --git a/modules/book.module b/modules/book.module
index 909542a153a0923d948ec4661b6105f08985234b..724e589c6a008a3a487b0b2f99086aea3ba880a2 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function book_system($field){
   $system["description"] = t("Allows users to collaboratively author a book.");
diff --git a/modules/cloud.module b/modules/cloud.module
index bc22c6067022bcd7420ccceec9ea16c944350bc4..1aa52e18bf777278f35c4b4e54931ffa02678724 100644
--- a/modules/cloud.module
+++ b/modules/cloud.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function cloud_help($type = "administrator") {
   if ($type == "user") {
diff --git a/modules/comment.module b/modules/comment.module
index 03cc39d5542c701bbecfed3876605362612a449d..26622ca8071e8808976b8a49ddf30afa23eb54c4 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 $GLOBALS["cmodes"] = array(1 => t("Flat list - collapsed"), 2 => t("Flat list - expanded"), 3 => t("Threaded list - collapsed"), 4 => t("Threaded list - expanded"));
 $GLOBALS["corder"] = array(1 => t("Date - newest first"), 2 => t("Date - oldest first"));
diff --git a/modules/drupal.module b/modules/drupal.module
index dfd84738bca344a924285d196dc4dbc63643dfa4..111de6200829b3a1e88fc8b0f43fe08ffa8d9b89 100644
--- a/modules/drupal.module
+++ b/modules/drupal.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function drupal_help_directory() {
 
diff --git a/modules/forum.module b/modules/forum.module
index 434f7c1d4cf2640efd3c55df0008eca4e1e9b9ee..9a119ff280674c90997cd22ee4b41733eb28da05 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function forum_system($field){
   $system["description"] = t("Enable threaded discussions about general topics.");
diff --git a/modules/help.module b/modules/help.module
index d07e77ff9793d426e49f835803e404ab3988008a..da4e79c5c283cb06080c8c4cb418a11891059274 100644
--- a/modules/help.module
+++ b/modules/help.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function help_system($field){
   $system["description"] = t("Manages displaying online help.");
diff --git a/modules/import.module b/modules/import.module
index e6ce14b2febc4099ee787feb191757ec20848b56..68e967694047ed641dc49f78f626221058216e82 100644
--- a/modules/import.module
+++ b/modules/import.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 
 function import_help() {
diff --git a/modules/jabber.module b/modules/jabber.module
index e9c4d7cc8312a905093e7a3ff2b85c99cd64d39c..25675e1a66f1f6dcd97c10dd6abf2933049b8960 100644
--- a/modules/jabber.module
+++ b/modules/jabber.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function jabber_system($field){
   $system["description"] = t("Enables login with Jabber ID and password.");
diff --git a/modules/locale.module b/modules/locale.module
index 8a64bde42b70c2d061c91402f12dbc6e8ffc10ff..0c7e80af122617ed484f267f012d4baf32c97db0 100644
--- a/modules/locale.module
+++ b/modules/locale.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function locale_help() {
   $output .= "<p>Normally programs are written and documented in English, and use English to interact with users.  This is true for a great deal of web sites.  However, most people are less comfortable with English than with their own native language, and would prefer to use their mother tongue as much as possible.  Many people love see their web site showing a lot less of English, and far more of their own language.</p>";
diff --git a/modules/node.module b/modules/node.module
index 7e3a75f2b1fcc815ed6dbf9f45379c4768572a90..f9c7944dd68914611a367c9c1c27da667c1c1b0e 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function node_help() {
   global $mod;
diff --git a/modules/page.module b/modules/page.module
index de77eb2fae8d4640369b63d77c87c093b2441711..a1863051564bfc9502abb9f169464cba6d073e8b 100644
--- a/modules/page.module
+++ b/modules/page.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function page_help() {
   $output .= "<p>The page module is used to create a <i>static page</i>.  Unlike a story, a static page is a persistent web page on your site which usually shortcuts the typical lifecycle of user generated content (i.e. submit -&gt; moderate -&gt; post -&gt; comment).  A static page is usually linked from the main navigation bar, using whatever text the author wishes.  To create a static page without this navigation link, simply skip the form field which requests link text.</p>";
diff --git a/modules/ping.module b/modules/ping.module
index 4216164bdd597109a97a60ffe73c5d1fa69a2e88..b4d968114e3e8270231dd82e6e804a56498f0c43 100644
--- a/modules/ping.module
+++ b/modules/ping.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function ping_help() {
   $output = "<p>Drupal can pings sites automatically to notify them that your site has changed. It can ping the following sites :</p>";
diff --git a/modules/poll.module b/modules/poll.module
index a2e8027607e4913d3917d308fd1ac7e51a43f571..7c843501bd3d3713592cee5caad4c97b09c67ddc 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function poll_allowvotes(&$node) {
   /*
diff --git a/modules/profile.module b/modules/profile.module
index cb6dfb145b1cb09967f9e6d01b6f9d8fb7fa282f..4bbe2fa7bfeae3cc333d9862a47c523b320f0c57 100644
--- a/modules/profile.module
+++ b/modules/profile.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function _profile_init() {
   /*
diff --git a/modules/queue.module b/modules/queue.module
index 95f68ac269498b0e46849025f9cd586f418fd3b4..44042958694b830ebe6d5260b1ba5f1d06b353ab 100644
--- a/modules/queue.module
+++ b/modules/queue.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function queue_system($field){
   $system["description"] = t("Enables content to be moderated by the community.");
diff --git a/modules/search.module b/modules/search.module
index 7eebf9f034b7948d15bd6aa6738da1ca53e95106..b72bc9c061e28d7bd1c92d7d09a27b37c3734c16 100644
--- a/modules/search.module
+++ b/modules/search.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function search_help() {
   $output = "<b>". t("Search guidelines") ."</b>";
diff --git a/modules/statistics.module b/modules/statistics.module
index 4e2cd55a7fee2d44789fd1bbc4f07fbcca9d9b2f..4363409b7144e26f6bc31f89f48f7ea6a5272f09 100644
--- a/modules/statistics.module
+++ b/modules/statistics.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function statistics_init() {
   global $recent_activity;
diff --git a/modules/story.module b/modules/story.module
index 8434646ad09952389c07d8e4d3773c03191d6c02..fbbb6dc71f486a0a7e7948c6175422f5a5852e0f 100644
--- a/modules/story.module
+++ b/modules/story.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function story_help() {
   $output .= "<p>The story module lets your users submit articles for consideration by the rest of the community, who can vote on them if moderation is enabled.  Stories usually follow a publishing flow of <b>submit -&gt; moderate -&gt; post to the main page -&gt; comments</b>.  Administrators are able to shortcut this flow as desired.</p>";
diff --git a/modules/system.module b/modules/system.module
index 465d334634fbd1df15b592204bffac9aea0a2da1..a0a1b71efefb5dcbc5c7a63961bf7e5d3277d22e 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function system_help() {
   $output .= "<p>Drupal comes with system-wide defaults but the setting-module provides control over many Drupal preferences, behaviours including visual and operational settings.</p>";
diff --git a/modules/taxonomy.module b/modules/taxonomy.module
index 567a8e5e3ff87df9b4edaf64f12cae560d8b2039..00a98babbb05317d75ff963092fbd74272147446 100644
--- a/modules/taxonomy.module
+++ b/modules/taxonomy.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function taxonomy_system($field){
   $system["description"] = t("Enables the organization of content into categories.");
diff --git a/modules/tracker.module b/modules/tracker.module
index c4c3e9607caf448e789e6c9f8a98ed564a037ec6..e09b3e8b9ddceef6c624b0ffbe5bfb3bff2bf84a 100644
--- a/modules/tracker.module
+++ b/modules/tracker.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function tracker_help() {
   $output .= "<p>The tracker module is a handy module for displaying the most recent posts.  By following the <i>view recent posts</i> link in the user block, a user may quickly review all recent postings.</p>";
diff --git a/modules/user.module b/modules/user.module
index 359a10e04bc8a76cfd861edbb57d7b7c3a42ed9f..92be8017400ce0817c72ff3a2833b2062479c640 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 session_set_save_handler("sess_open", "sess_close", "sess_read", "sess_write", "sess_destroy", "sess_gc");
 session_start();
diff --git a/modules/watchdog.module b/modules/watchdog.module
index 66bc986fe898a34827cfc7133e39ecd5fb95f022..1a368c7c2023fcee3ba9055764b36f2632be340d 100644
--- a/modules/watchdog.module
+++ b/modules/watchdog.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function watchdog_help() {
 
diff --git a/scripts/code-style.pl b/scripts/code-style.pl
index f7d773e54845cf01ca618e27977f3d7aace8a02c..598d0f5c03ef269f8b76d8857d172893043b1295 100644
--- a/scripts/code-style.pl
+++ b/scripts/code-style.pl
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# $Id$
 
 # Author: Alexander Schwartz (alexander.schwartz@gmx.net)
 # Licence: GPL
@@ -9,7 +8,6 @@
 # code.  This program tries to show as many improvements as possible with
 # no false positives.
 
-# $Id$
 
 $comment = 0;
 $program = 0;
diff --git a/scripts/mail-to-sql.php b/scripts/mail-to-sql.php
index 4471b38d779fc661d249b5b32c9062c6af591912..68cdbf8e667a1119b95b3caec1b8b8d1185f58fe 100644
--- a/scripts/mail-to-sql.php
+++ b/scripts/mail-to-sql.php
@@ -1,6 +1,5 @@
 #!/usr/local/bin/php -q
 <?php
-// $Id$
 
 ini_set("include_path", ".:/home/dries/personal/cvs/web/pear:/home/dries/personal/cvs/web/drupal.org/x.x.x");
 include_once "includes/common.inc";
diff --git a/themes/example/example.theme b/themes/example/example.theme
index d8ae776ede3e077029f0356b61d38da9909f6741..ab4a371816c56a31c7f8c2c3873e976726e00d19 100644
--- a/themes/example/example.theme
+++ b/themes/example/example.theme
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 class Theme_example extends BaseTheme {
 
diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme
index 4bce3d3a55f0c01be793efa62755edb9f3f437b5..52ca4541ada5f70011e5af3e1d16501f5a2b8a57 100644
--- a/themes/marvin/marvin.theme
+++ b/themes/marvin/marvin.theme
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
  class Theme_marvin extends BaseTheme {
    var $link = "#666699";
diff --git a/themes/unconed/unconed.theme b/themes/unconed/unconed.theme
index 4e5448e83602dec1952045d08f8213d021fba3e5..44981ffd88b0508d102eb5ecb7b133432c780d25 100644
--- a/themes/unconed/unconed.theme
+++ b/themes/unconed/unconed.theme
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
  class Theme_unconed extends BaseTheme {
    var $foreground = "#000000";
diff --git a/themes/xtemplate/xtemplate.inc b/themes/xtemplate/xtemplate.inc
index cc31e9a0064aca4f8c498d9d7a17f8de2370d560..e3dd6999b145336e701573f0cd43fc1144617852 100644
--- a/themes/xtemplate/xtemplate.inc
+++ b/themes/xtemplate/xtemplate.inc
@@ -33,7 +33,6 @@ class XTemplate {
   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/xmlrpc.php b/xmlrpc.php
index e1eda8807f4c4e37a5dc51ee469e32c11285bf17..c6a2466aab8deddbe53383adf68c0698abd1e372 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 include_once "includes/xmlrpcs.inc";
 include_once "includes/common.inc";