diff --git a/admin.php b/admin.php
index ca2eba6567943ec0f0e3a7dbe0774a0b378bac22..6dbf77a89aa30766962ef23d14df43864672b174 100644
--- a/admin.php
+++ b/admin.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 include_once "includes/common.inc";
 
diff --git a/cron.php b/cron.php
index 37dd33192554f65c923ed1000bb8478a21a32d9a..a29170219a86e6b39c419c29b9ad9d8880bcb0d8 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 55f7aef80bd46b0d5d065799411a325f13a853d0..b87c425ef6026629ad2a2cf9ed092fe35163ac90 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 18a40be7c5d1c58824aa7d79e4fc8f8988d24ad9..43f2b1119218fc97b9c5ea75fab4e8f536645df3 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function conf_init() {
   global $HTTP_HOST;
diff --git a/includes/conf.php b/includes/conf.php
index bebc4f4911ef142a2c3d56529a42d5d0b67ffee9..013e67c9e934abe771528b8813268cfce07ec9dd 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 d2f4aee041aea8589479fd51927a0c6758d77d98..f879aef8833ab2e7ad453c2b77c6278168c50c3c 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 3446e3d69e9e39cc20e8bafa85c6b9f0827df0d1..43cb3a72bffbdda3fc4151d1a867e4dd1296f3fb 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/module.inc b/includes/module.inc
index 545c7d2cc0a746b6489ceb1e0f7051e370660854..bc634da1fa911cbddb9a78206ded8c7794237c0c 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 a7cb48784595cb0e7721c3249e7e9561e6ebdd14..08592c70fffa2c6faa93bf4b68f8b30e6a5e0f99 100644
--- a/includes/pager.inc
+++ b/includes/pager.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function pager_help() {
   ?>
diff --git a/includes/theme.inc b/includes/theme.inc
index de737591db78299eb40898155130309a461f2ad2..c4338f7a6379bfc384189286b672b377784f799d 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 db6d68b36eb8905b8f37c1dfcafbb10becc8c047..c8937c3f8fd2b101693ed24db628716545bdb035 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 61ce1913ceb0bb393c3cba98b023fb3ee668dbfa..595600ece98c9f89a2fcdd4045cb389f3d132855 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 0d725ebcbb11f0d1f506428bbf19832eebca4937..c4a4d8b80e684e872875b33e86b5d4e60c538483 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 include_once "includes/common.inc";
 
diff --git a/module.php b/module.php
index 4767459d03611d471487ee4d31384442073dd7d6..8ae001e9e0188925f65a75f9a4af82f7076db597 100644
--- a/module.php
+++ b/module.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 include_once "includes/common.inc";
 
diff --git a/modules/archive.module b/modules/archive.module
index d2f33c0ab7003321a5970b45f0d8a0f1bd179226..19b2eb255547608085db75b3ace0e4082c831ac4 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 navigation old content.");
diff --git a/modules/block.module b/modules/block.module
index 406314ab5d70bf7a01ecd36950588ccd7559ea62..769e939526827fc451f48f6f8b68d69dbb68ea6b 100644
--- a/modules/block.module
+++ b/modules/block.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function block_help() {
  ?>
diff --git a/modules/blog.module b/modules/blog.module
index af236a2f0e42399f7ac3a30ed93557ae4ce725fb..e3d0a869bccde20338a76eb5b0022ee1bde54fd4 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 34049d431c80fea6ebaf97be87c77c2bd9583dc2..9ab2af35b5302dac751e1dca3e1b53e05d2c2886 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 42261f7504d6df0ca16f918599dc279c61b78143..14c06940e8baa3469c4c900d4dc2b128b4517146 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 b7ba3c3638bc1992a6e97a0bb8df616a70a0d15e..ebabd2e0943f297af425b5e7a270fc1c2aceb6da 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 01d47a1ccad69f8a2475b45c86795085e2a34c66..41d5212f4acb74820235a0c2fb8830b4ffa1b940 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 772664498f77a598b7ba0502916a376698a56e0a..5cb39afcf1e48dfafb72ae95c856100b2c5cf610 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 3974f6e74459ac864826b71c2352ac12600aa744..d7a3a40afd7911ce20f4e8857bd02f20556617aa 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 98b77b12a1817e630e62cb1b4695792f5341d96c..01f26a0389dcc6ef4c10f6ad0624472e85235f42 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 ce8bf2286354a77d8d9ad60d233ece549f5ab51d..5413072c4c6a05e875fef8c678d37cbbf843f614 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 883296f27272824b8bf54a234dc1b016d328b094..a36deb6752c615a7b5176fc25472c6ee0b34ef07 100644
--- a/modules/locale.module
+++ b/modules/locale.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function locale_help() {
  ?>
diff --git a/modules/node.module b/modules/node.module
index f5e0caea9c3a9bfac1983f3ce307ac1abdeb8e43..0f09529fb21922d6bb6a2fd53fbcb07250c14b1f 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 e0491ed814afd2af8cf3ddc155f7ee138a14ee2c..28bad5f0417ebd599b05a9bef8df097282fe04ee 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>site page</i>.  Unlike a story, a site 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 site page is usually linked from the main navigation bar, using whatever text the author wishes.  To create a site page without this navigation link, simply skip the form field which requests link text.  Administrators are the exclusive authors of site pages (i.e. requires the <i>administer nodes</i> in ". la("permission", array("mod" => "user", "op" => "permission")) .").</p>";
diff --git a/modules/ping.module b/modules/ping.module
index a4410b4364610b916b8c29047f4aa7b9d18ee888..436d7888a9d63de26bc046b3633bd0dda48c9f2b 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 3994a4f3bec8e195a599ab4727cb7ed52c47722a..371cf640ebe1289965bdd4417a545abd140b089a 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 807afc156f99b756a54d6532f5a12aa5cf773014..a8ae51dcf5f55f144e00c642bd6b6915ee34c4e0 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 7cfc6f5c24c85713dd29c22c78754ec47bebd1e4..258016a70a241c2c44de376ef6e9888206efcc15 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 e3fbb9dfbfe5d460ec9529b755a3dbd4db15b48d..b9851e48e4021264f77a59abf697553a2988c704 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 ba7d9aae3f9ed04d441784a0e2e847e20e9ef442..bf78473c6634a0b251b13465a75d5a1f4e2297d3 100644
--- a/modules/statistics.module
+++ b/modules/statistics.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 // Initialization hook, runs each time statistic module is loaded
 function statistics_init() {
diff --git a/modules/story.module b/modules/story.module
index 0cd34af7f6e36871f4e755cb8e9c4160a4eb773e..54db80b1c8502582109217304c4469a539a705a7 100644
--- a/modules/story.module
+++ b/modules/story.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function story_help() {
   $output .= "<p>The story module enables to users to submit thoughful, cohesive posts for consideration by the rest of the community.  Stories usually follow a specific content flow: <i>submit -&gt; moderate -&gt; post to home page -&gt; comment</i>.  Administrators are able to shortcut this flow as desired.</p>";
diff --git a/modules/system.module b/modules/system.module
index 63d58e1c7c11c965a3479bdf70712d43cf145bc6..24e06567b212de33dbf1b3501263f9b52cc419f7 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, behaviors including visual and operational settings.</p>";
diff --git a/modules/taxonomy.module b/modules/taxonomy.module
index 0146568424647ab9df5100817b48e27ad17c9bcf..08c2f0554e598ee7ab7924f504e712825e5c1699 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 645760468fa65dac97a33005b5ae4c5256bf961e..660290a1826d1880813e363e30f39803458da11f 100644
--- a/modules/tracker.module
+++ b/modules/tracker.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function tracker_help() {
   $output .= "The tracker module is a handy module for displaying the most recent comments happenning all over your web site.  By following the <i>view new comments</i> link in the user block, a user may quickly review all recent comments.  When a user first arrives at the main tracker page, she sees all recent comments in reverse chronological order, grouped by post.  In addition, a self-centered user may choose to display only his own comments.</p>";
diff --git a/modules/user.module b/modules/user.module
index af845e0ea43fa526de523a2267e10a181f203994..fa81d7751608dbaf29d7f2bbc7b2c7a204322a20 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 dd27f57f330f54f888b0c0c0723f1f286664f94a..e3656650dfa9c35c97bdd1657107527d7abd2dc4 100644
--- a/modules/watchdog.module
+++ b/modules/watchdog.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function watchdog_help() {
  ?>
diff --git a/node.php b/node.php
index 0be74c8a3a31d674a2edce68de79a023ec009c3b..40d6d274f5eaea3c58d0d309980f979f1404bf8c 100644
--- a/node.php
+++ b/node.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 include_once "includes/common.inc";
 
diff --git a/scripts/code-style.pl b/scripts/code-style.pl
index cc1f159e79754f8cd47e3dc2711874c932cb862e..799208a8ad99c8a28de16ac41118266277fa5d67 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 b1508b2ac8ebb94c310d52ffffea98d520df1553..9a0ec6b6f1ec24c8349b3a5ac18ebf40c03f56da 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/goofy/goofy.theme b/themes/goofy/goofy.theme
index 3816e16b609f0b506f1bae1e1ef764501f563e87..8fbdf2064ae5957dfd0eace8d5953c22c8b388f1 100644
--- a/themes/goofy/goofy.theme
+++ b/themes/goofy/goofy.theme
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
   /*********************************************************************
 
diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme
index 21710f487d13f59c937f0d43bd01c16a88304711..854592f381c0252ecd7d93c884b1dbf7773d2fa5 100644
--- a/themes/marvin/marvin.theme
+++ b/themes/marvin/marvin.theme
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
   /*********************************************************************
 
diff --git a/themes/unconed/unconed.theme b/themes/unconed/unconed.theme
index 9e9d3b47a993fb6162601695a51f78453039dc76..dfd9c84c1104620f0ad827941b171dc19a149621 100644
--- a/themes/unconed/unconed.theme
+++ b/themes/unconed/unconed.theme
@@ -1,5 +1,4 @@
 <?php
-// $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";