diff --git a/admin.php b/admin.php
index 617dc252ec7..debd247fcb0 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 37dd3319255..a29170219a8 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 55f7aef80bd..b87c425ef60 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 df6b4de6a5b..123276ef5a5 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 9014e7500e6..1291c7b8a11 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 5417eb305ee..99f84794c3f 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 8f9e21bffee..bb8d3f0f6d8 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 deaace7803d..fbc177862d1 100644
--- a/includes/module.inc
+++ b/includes/module.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 // initialize modules:
 function module_init() {
diff --git a/includes/theme.inc b/includes/theme.inc
index e0456916114..e8682ae1154 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 db6d68b36eb..c8937c3f8fd 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 61ce1913ceb..595600ece98 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 b9c0a285f45..d5b41b3e556 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 4767459d036..8ae001e9e01 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 4c0cf4bc1c6..00a26a6f003 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 c672855f45b..4b0a56b5938 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 7aba6d5dc59..a3eccfa9d96 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 7579d6f2436..23565d1457c 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 77817ba8b17..297d29c1617 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 1d8930f21bd..07f3ddecb29 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 $GLOBALS["cmodes"] = array(1 => "Flat list - collapsed", 2 => "Flat list - expanded", 3 => "Threaded list - collapsed", 4 => "Threaded list - expanded");
 $GLOBALS["corder"] = array(1 => "Date - newest first", 2 => "Date - oldest first");
diff --git a/modules/forum.module b/modules/forum.module
index a7dd3b2902b..4077445f2d7 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function forum_system($field){
   $system["description"] = t("Allows threaded discussions about general topics.");
diff --git a/modules/help.module b/modules/help.module
index 423ac662cf5..28d661dc259 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 2f48a9004ec..162a42f811f 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 47be2babfd9..8f63081a956 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 9de8fca32e2..e015ea5a833 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 a7853d6464d..c3ba733fce0 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 41e8e55c0f6..d08f21edf4c 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/poll.module b/modules/poll.module
index 6a47fe45111..4c02604ca49 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function poll_allowvotes(&$node) {
   /*
diff --git a/modules/queue.module b/modules/queue.module
index dc94db02b7d..51ccc741227 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/rating.module b/modules/rating.module
index 4f8fe48be4e..57f4f1cce4a 100644
--- a/modules/rating.module
+++ b/modules/rating.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function rating_help() {
   $output .= "<p>Drupal uses <i>gravity</i> as an indication for each user's contributed value.  The system can be compared with <a href=\"http://www.slashcode.com/\">SlashCode</a>'s Karma and is - in fact - even more similar to <a href=\"http://scoop.kuro5hin.org/\">Scoop</a>'s Mojo.</p>";
diff --git a/modules/search.module b/modules/search.module
index 92f7807b54d..f24f2157a70 100644
--- a/modules/search.module
+++ b/modules/search.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function search_help() {
   $output = "<b>". t("Search hints") ."</b>";
diff --git a/modules/statistics.module b/modules/statistics.module
index da8be898db7..141bc642074 100644
--- a/modules/statistics.module
+++ b/modules/statistics.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 if (variable_get("referrer", 0) && $referrer = getenv("HTTP_REFERER")) {
   db_query("INSERT INTO referrer (URL, timestamp) values ('%s', '%s')", $referrer, time());
diff --git a/modules/story.module b/modules/story.module
index 475c7d78f16..13e894b1e42 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 a7913a2515e..31739cb742c 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 1718d014266..f21c49b5894 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 e643c8db592..e662f8f10b9 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 2791895a6de..0d3ab47dcbd 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 d4e7b654e4b..64fa4d40573 100644
--- a/modules/watchdog.module
+++ b/modules/watchdog.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function watchdog_help() {
  ?>
diff --git a/modules/weblogs.module b/modules/weblogs.module
index 5c06b1a7cea..c7dc25c04dd 100644
--- a/modules/weblogs.module
+++ b/modules/weblogs.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function weblogs_help() {
   $output = "<p><a href=\"http://www.weblogs.com/\">Weblogs.com</a> is a website that tracks and displays links to changed weblogs and news-oriented websites.  To get your Drupal site listed, weblogs.com must be informed about your site's updates.  This is the job of the weblog module and when installed, the administrator doesn't have to do anything to participate in the <a href=\"http://www.weblogs.com/\">weblogs.com system</a>. The weblog module automatically notifies weblogs.com when your site is updated.  To do so, Drupal implements the <a href=\"http://www.xmlrpc.com/weblogsCom/\">XML-RPC interface of weblogs.com</a>. Requires crontab.</p>";
diff --git a/node.php b/node.php
index d00da60cc14..e6b886919a3 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 50d70054394..799208a8ad9 100644
--- a/scripts/code-style.pl
+++ b/scripts/code-style.pl
@@ -8,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/themes/example/example.theme b/themes/example/example.theme
index ce5828fdc1b..aa56b0c0e71 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 3c938f96c24..0d3f811e7db 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 b169c6ef495..9a5799610d1 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 a1e6683ebf4..d3f90844d3d 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 e1eda8807f4..c6a2466aab8 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 include_once "includes/xmlrpcs.inc";
 include_once "includes/common.inc";