diff --git a/TODO b/TODO
index a9d2d3a..bf20524 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 ToDo:
 - Convert to zend_parse_parameters
 - Unify error handling
diff --git a/config.m4 b/config.m4
index eb55983..3fb90ba 100644
--- a/config.m4
+++ b/config.m4
@@ -1,7 +1,3 @@
-dnl
-dnl $Id$
-dnl 
-
 AC_DEFUN([PHP_MCRYPT_CHECK_VERSION],[
   old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=-I$MCRYPT_DIR/include
diff --git a/config.w32 b/config.w32
index 169781e..3735e04 100644
--- a/config.w32
+++ b/config.w32
@@ -1,4 +1,3 @@
-// $Id$
 // vim:ft=javascript
 
 ARG_WITH("mcrypt", "mcrypt support", "no");
diff --git a/mcrypt.c b/mcrypt.c
index 127525f..e728a04 100644
--- a/mcrypt.c
+++ b/mcrypt.c
@@ -16,7 +16,6 @@
    |          Derick Rethans <derick@derickrethans.nl>                    |
    +----------------------------------------------------------------------+
  */
-/* $Id$ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/mcrypt_filter.c b/mcrypt_filter.c
index 23ed098..2bdb716 100644
--- a/mcrypt_filter.c
+++ b/mcrypt_filter.c
@@ -14,8 +14,6 @@
   +----------------------------------------------------------------------+
   | Author: Sara Golemon <pollita@php.net>                               |
   +----------------------------------------------------------------------+
-
-  $Id$
 */
 
 #include "php.h"
diff --git a/php_mcrypt.h b/php_mcrypt.h
index 04aad97..11c9960 100644
--- a/php_mcrypt.h
+++ b/php_mcrypt.h
@@ -16,7 +16,6 @@
    |          Derick Rethans <derick@derickrethans.nl>                    |
    +----------------------------------------------------------------------+
  */
-/* $Id$ */
 
 #ifndef PHP_MCRYPT_H
 #define PHP_MCRYPT_H
diff --git a/php_mcrypt_filter.h b/php_mcrypt_filter.h
index dd62336..29337f0 100644
--- a/php_mcrypt_filter.h
+++ b/php_mcrypt_filter.h
@@ -14,8 +14,6 @@
   +----------------------------------------------------------------------+
   | Author: Sara Golemon <pollita@php.net>                               |
   +----------------------------------------------------------------------+
-
-  $Id$
 */
 
 #ifndef PHP_MCRYPT_FILTER_H