diff --git a/lib/wind/doxygen.c b/lib/wind/doxygen.c
index db836f46b..7470ed25f 100644
--- a/lib/wind/doxygen.c
+++ b/lib/wind/doxygen.c
@@ -32,7 +32,6 @@
  */
 
 #include <config.h>
-RCSID("$Id$");
 
 /*! @mainpage Heimdal wind library
  *
diff --git a/lib/wind/idn-lookup.c b/lib/wind/idn-lookup.c
index bcf0e8a9b..7c1b046bf 100644
--- a/lib/wind/idn-lookup.c
+++ b/lib/wind/idn-lookup.c
@@ -48,8 +48,6 @@
 
 #include "windlocl.h"
 
-RCSID("$Id$");
-
 static int version_flag = 0;
 static int help_flag	= 0;
 
diff --git a/lib/wind/map.c b/lib/wind/map.c
index a005accce..03f00de25 100644
--- a/lib/wind/map.c
+++ b/lib/wind/map.c
@@ -40,8 +40,6 @@
 
 #include "map_table.h"
 
-RCSID("$Id$");
-
 static int
 translation_cmp(const void *key, const void *data)
 {
diff --git a/lib/wind/normalize.c b/lib/wind/normalize.c
index 3f71449fa..4c70a5293 100644
--- a/lib/wind/normalize.c
+++ b/lib/wind/normalize.c
@@ -42,8 +42,6 @@
 
 #include "normalize_table.h"
 
-RCSID("$Id$");
-
 static int
 translation_cmp(const void *key, const void *data)
 {
diff --git a/lib/wind/punycode.c b/lib/wind/punycode.c
index e0f079b8c..2b190ce03 100644
--- a/lib/wind/punycode.c
+++ b/lib/wind/punycode.c
@@ -37,8 +37,6 @@
 #include <string.h>
 #include "windlocl.h"
 
-RCSID("$Id$");
-
 static const unsigned base         = 36;
 static const unsigned t_min        = 1;
 static const unsigned t_max        = 26;
diff --git a/lib/wind/stringprep.c b/lib/wind/stringprep.c
index aa04b3fd1..a991f20cf 100644
--- a/lib/wind/stringprep.c
+++ b/lib/wind/stringprep.c
@@ -39,8 +39,6 @@
 #include <string.h>
 #include <errno.h>
 
-RCSID("$Id$");
-
 /**
  * Process a input UCS4 string according a string-prep profile.
  *
diff --git a/lib/wind/test-bidi.c b/lib/wind/test-bidi.c
index e87d49722..d62f48a19 100644
--- a/lib/wind/test-bidi.c
+++ b/lib/wind/test-bidi.c
@@ -37,8 +37,6 @@
 #include <stdio.h>
 #include "windlocl.h"
 
-RCSID("$Id$");
-
 #define MAX_LENGTH 10
 
 struct test {
diff --git a/lib/wind/test-ldap.c b/lib/wind/test-ldap.c
index 2112dc2fb..72a125d5f 100644
--- a/lib/wind/test-ldap.c
+++ b/lib/wind/test-ldap.c
@@ -40,8 +40,6 @@
 #include <assert.h>
 #include "windlocl.h"
 
-RCSID("$Id: test-utf8.c 22571 2008-02-05 20:22:06Z lha $");
-
 #define MAX_LENGTH 10
 
 struct testcase {
diff --git a/lib/wind/test-map.c b/lib/wind/test-map.c
index 496d86702..475d0c5dc 100644
--- a/lib/wind/test-map.c
+++ b/lib/wind/test-map.c
@@ -41,8 +41,6 @@
 
 #include "windlocl.h"
 
-RCSID("$Id$");
-
 #define MAX_LENGTH 2
 
 struct example {
diff --git a/lib/wind/test-normalize.c b/lib/wind/test-normalize.c
index d01e119ea..c63706a97 100644
--- a/lib/wind/test-normalize.c
+++ b/lib/wind/test-normalize.c
@@ -44,8 +44,6 @@
 #include "windlocl.h"
 #include "normalize_table.h"
 
-RCSID("$Id$");
-
 static size_t
 parse_vector(char *buf, uint32_t *v)
 {
diff --git a/lib/wind/test-prohibited.c b/lib/wind/test-prohibited.c
index 683b433d2..93c0cb1dd 100644
--- a/lib/wind/test-prohibited.c
+++ b/lib/wind/test-prohibited.c
@@ -37,8 +37,6 @@
 #include <stdio.h>
 #include "windlocl.h"
 
-RCSID("$Id$");
-
 static uint32_t positives[] = {
     0x00A0, 0x3000,
     0x0080, 0x009F, 0x206A, 0x206F, 0xFEFF,
diff --git a/lib/wind/test-punycode.c b/lib/wind/test-punycode.c
index 4766a3022..3dcfe8169 100644
--- a/lib/wind/test-punycode.c
+++ b/lib/wind/test-punycode.c
@@ -40,8 +40,6 @@
 #include "windlocl.h"
 #include "punycode_examples.h"
 
-RCSID("$Id$");
-
 int
 main(void)
 {
diff --git a/lib/wind/test-utf8.c b/lib/wind/test-utf8.c
index f41d3a8e7..3197528b6 100644
--- a/lib/wind/test-utf8.c
+++ b/lib/wind/test-utf8.c
@@ -39,8 +39,6 @@
 #include <err.h>
 #include "windlocl.h"
 
-RCSID("$Id$");
-
 static const char *failing_testcases[] = {
     "\x80",
     "\xFF",
diff --git a/lib/wind/utf8.c b/lib/wind/utf8.c
index ed944b4c7..d16683645 100644
--- a/lib/wind/utf8.c
+++ b/lib/wind/utf8.c
@@ -34,8 +34,6 @@
 #include <config.h>
 #include "windlocl.h"
 
-RCSID("$Id$");
-
 static int
 utf8toutf32(const unsigned char **pp, uint32_t *out)
 {