diff --git a/README.txt b/README.txt
index dc69c5f16c9a1ea17acbfce492b0245e484d5f55..fd217156a0724a2e00d7c848569fa8d994f65215 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,3 @@
-$Id$
 
 Entity API module
 -----------------
diff --git a/entity.api.php b/entity.api.php
index b2ecd33b2af3a0f8d916070e7ab47e89adc70345..f77e85eadc0beab7f136fcf79b65d0316c9f1699 100644
--- a/entity.api.php
+++ b/entity.api.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/entity.features.inc b/entity.features.inc
index f252c4c5fe0302140bb0cf7e1b91892586944e9e..56adeaf10d7ee7e8681071155d377ed11dc2c361 100644
--- a/entity.features.inc
+++ b/entity.features.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/entity.info b/entity.info
index f4ad3d563ae538399c2e9ca95694eb89cb6e3771..3fce9ed0ad0c158279d02e8cb07bd891faf75207 100644
--- a/entity.info
+++ b/entity.info
@@ -1,4 +1,3 @@
-; $Id$
 name = Entity API
 description = Enables modules to work with any entity type and to provide entities.
 core = 7.x
diff --git a/entity.info.inc b/entity.info.inc
index dfefcb104b2f64589962639ad7da5893b8eb18a0..10be38989bd5be202399f5642fe8a8ef8aabeeb6 100644
--- a/entity.info.inc
+++ b/entity.info.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/entity.install b/entity.install
index 65cec65e765c6b598cc5bd4151de7b5430b07145..d3d55edb9bfd63a3f06defb1d152d2e4fca68078 100644
--- a/entity.install
+++ b/entity.install
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/entity.module b/entity.module
index a8af598ea5abe98d3c2e3ff1ec043f1c89b976bd..c2bef0f0827f3f01bf8d0847518c4e0dbe5b1306 100644
--- a/entity.module
+++ b/entity.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/entity.rules.inc b/entity.rules.inc
index 9efd6e6ef9b90a3d3451ed0ef461775ffc100386..1a21b4a7fdf37273d20ef88f8521cc17af7f3181 100644
--- a/entity.rules.inc
+++ b/entity.rules.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/entity.test b/entity.test
index d21fb49542c61eea06cefd2aebc46343bb946be7..c1f5fcab13d345c61a49e2fef8d94f4199028192 100644
--- a/entity.test
+++ b/entity.test
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/entity.tpl.php b/entity.tpl.php
index 4477ef0a5ddccca2d1fdcd6ae9f798635c45b1c4..cfe94dd7e5f2cd095c75ad22cf04a22e62ce4be4 100644
--- a/entity.tpl.php
+++ b/entity.tpl.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/entity/entity.db.inc b/entity/entity.db.inc
index 64c965a16cac289b7f8ccb0f4b7d76572c503b49..ec60e60d9f321d84fe92ecd07eb34a913cee6958 100644
--- a/entity/entity.db.inc
+++ b/entity/entity.db.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/entity_metadata/entity_metadata.info b/entity_metadata/entity_metadata.info
index dcbe6a324ff0dd566ee7d7b0ad8f7ebc268ddf12..5fb786364144b4b728557f298f60352cdd927f98 100644
--- a/entity_metadata/entity_metadata.info
+++ b/entity_metadata/entity_metadata.info
@@ -1,4 +1,3 @@
-; $Id$
 name = Entity Metadata
 description = (deprecated) Provides more metadata for entities and a useful API to allow modules making use of it.
 core = 7.x
diff --git a/entity_metadata/entity_metadata.module b/entity_metadata/entity_metadata.module
index 5e93f364604e4260fbece066a8317b9b1924716f..a592ecde33b68e83534755d72ef9602adb2751cb 100644
--- a/entity_metadata/entity_metadata.module
+++ b/entity_metadata/entity_metadata.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/entity_token.info b/entity_token.info
index 50e4c6c9075c6cf1e7c866622bbe8fdd8d33b7ea..66fddcbefc834cdf97012cebd2c82358dd3a6d74 100644
--- a/entity_token.info
+++ b/entity_token.info
@@ -1,4 +1,3 @@
-; $Id$
 name = Entity tokens
 description = Provides token replacements for all properties that have no tokens and are known to the entity API.
 core = 7.x
diff --git a/entity_token.module b/entity_token.module
index a16e926a10fc7cf5ed12ce449bbe1f7bcec750c0..f0abe59e38517d3af3fa59d7b184bf66a77675ce 100644
--- a/entity_token.module
+++ b/entity_token.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/entity_token.tokens.inc b/entity_token.tokens.inc
index 6311ec0cd97828ff7d02dc12f931f923df8ad9df..ff1484843298a71b8527e62f7e9836cb9b3d2a29 100644
--- a/entity_token.tokens.inc
+++ b/entity_token.tokens.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/includes/entity.controller.inc b/includes/entity.controller.inc
index c32f9045dc9cf82ccad1cdcf1fd5db675d262529..5105ee7f2e5674730dbd00e35b756a7ff1ae0fbd 100644
--- a/includes/entity.controller.inc
+++ b/includes/entity.controller.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/includes/entity.inc b/includes/entity.inc
index 5803cb913b21a6816840794c67c23aff3cd3df34..8cf0418700212e918313f1593984f82ebc183363 100644
--- a/includes/entity.inc
+++ b/includes/entity.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/includes/entity.property.inc b/includes/entity.property.inc
index 05e75d6c90cd3a0119ff4164907a43cdad796897..06e26937b5031dde17a09904339accb6ae413e42 100644
--- a/includes/entity.property.inc
+++ b/includes/entity.property.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/includes/entity.ui.inc b/includes/entity.ui.inc
index 30cf76499c3ee6c9608ab73b5d2fc0f5b83286a9..14d97a4bac412ae5cba84d0c25a3f240a9f1936d 100644
--- a/includes/entity.ui.inc
+++ b/includes/entity.ui.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/includes/entity.wrapper.inc b/includes/entity.wrapper.inc
index 104bb419e058dec153ddcd18c2a9990a51af1929..bde3bc0c78a9efa3d28ddf3c8578d16aaa636510 100644
--- a/includes/entity.wrapper.inc
+++ b/includes/entity.wrapper.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/modules/book.info.inc b/modules/book.info.inc
index 1c16ee6c51dadf7390cd980123b817844cade5ba..4d06aafc5281b7ac9ad2c7804395000a3ca15040 100644
--- a/modules/book.info.inc
+++ b/modules/book.info.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/modules/callbacks.inc b/modules/callbacks.inc
index f3ae5c6b82c8dc2bca365975a21a015f1b53f429..35c4f1bacfd8e5cbea56cf6e60a951dab22417aa 100644
--- a/modules/callbacks.inc
+++ b/modules/callbacks.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/modules/comment.info.inc b/modules/comment.info.inc
index 61ab588904b17956b0d68bb11b5c0b018f000764..72dbda61fc7c96bee622f2e76038c9408720ebe7 100644
--- a/modules/comment.info.inc
+++ b/modules/comment.info.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/modules/field.info.inc b/modules/field.info.inc
index bb8b4637f4f2081ac2d9eb3c257aa679cf5012a1..047c55783374449af6f3c3375c371fe28024bb81 100644
--- a/modules/field.info.inc
+++ b/modules/field.info.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/modules/node.info.inc b/modules/node.info.inc
index 33e38ce5afba543a40f80c7ffd50ffc231df88f9..53fb55eb6e85df0b2c8e76cbc09be22f997342e3 100644
--- a/modules/node.info.inc
+++ b/modules/node.info.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/modules/poll.info.inc b/modules/poll.info.inc
index 4af025b39e45dc66841ca6c0bd8a98ccc5132b0c..a2fbe1d4e69b4e064c8e3977a17580e86546967b 100644
--- a/modules/poll.info.inc
+++ b/modules/poll.info.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/modules/statistics.info.inc b/modules/statistics.info.inc
index 1a6b7ba8422360cf0ef612e6831caf94fe7d99a7..0afba901c7ebdf5bfc1cef65886e5c444ee0c539 100644
--- a/modules/statistics.info.inc
+++ b/modules/statistics.info.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/modules/system.info.inc b/modules/system.info.inc
index 473173838e4924c6095580c428e92376b0cf59db..e07827da6f48217ca997334329811d492be6a71d 100644
--- a/modules/system.info.inc
+++ b/modules/system.info.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/modules/taxonomy.info.inc b/modules/taxonomy.info.inc
index bcc476f6beb07f00e5928bf6e1c393e78a277715..0dcdad05ceb27418beec17354373bd21a55b5109 100644
--- a/modules/taxonomy.info.inc
+++ b/modules/taxonomy.info.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/modules/user.info.inc b/modules/user.info.inc
index 144ca1ea7bced2ed69f73b07cc6cf983297caf09..abc8f4e80b84fd42c72e8394f8b98e8841a04c56 100644
--- a/modules/user.info.inc
+++ b/modules/user.info.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/tests/entity_feature.info b/tests/entity_feature.info
index 70c9f560f32b37eced1de982bbacbe2bfdbdc85b..03e37ce6a5cc1429b9c732f88bb1bd404f1f1dcc 100644
--- a/tests/entity_feature.info
+++ b/tests/entity_feature.info
@@ -1,4 +1,3 @@
-; $Id$
 name = Entity feature module
 description = Provides some entities in code.
 version = VERSION
diff --git a/tests/entity_feature.module b/tests/entity_feature.module
index a8dedba1bb3bb657c4a9875024521b7e2d3bf354..b626eae7a11fde68aae41b7ead683c1a377dbd3b 100644
--- a/tests/entity_feature.module
+++ b/tests/entity_feature.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/tests/entity_test.info b/tests/entity_test.info
index 688956f5ddfcac022b93a625e169c3506f3032fa..a6ad0b6ffd8e70c4ffe40b4862474f6d5e116324 100644
--- a/tests/entity_test.info
+++ b/tests/entity_test.info
@@ -1,4 +1,3 @@
-; $Id$
 name = Entity CRUD test module
 description = Provides entity types based upon the CRUD API.
 version = VERSION
diff --git a/tests/entity_test.install b/tests/entity_test.install
index 43dbd84ab934c5ca9fcbb185f9c663fdef4d84a3..08691583790361f38d8f8b7da8241dbced6791fa 100644
--- a/tests/entity_test.install
+++ b/tests/entity_test.install
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/tests/entity_test.module b/tests/entity_test.module
index 0cabcb1a186a5ece077d8ab84d42098489ed62ae..7281d1c251e8ce97e8eca272a3645183640333b7 100644
--- a/tests/entity_test.module
+++ b/tests/entity_test.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file