diff --git a/ares/ares__close_sockets.c b/ares/ares__close_sockets.c
index 7475a4b44ef8e11952c8543f83a5c38d7176d959..dcb319ec863ff98ed0f604b862cb9721981c514c 100644
--- a/ares/ares__close_sockets.c
+++ b/ares/ares__close_sockets.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
diff --git a/ares/ares__get_hostent.c b/ares/ares__get_hostent.c
index ca6f2f1c02c5ee1e7a131e5bf4c25c1e83c7b977..52204005c12e00eb363236e9409b37202d20f358 100644
--- a/ares/ares__get_hostent.c
+++ b/ares/ares__get_hostent.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
diff --git a/ares/ares__read_line.c b/ares/ares__read_line.c
index f4d4f505b0a548ee5d125ce25508c5c03733d0ee..d9659043d58f2bebe83d19a0b2201b060a51119f 100644
--- a/ares/ares__read_line.c
+++ b/ares/ares__read_line.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
diff --git a/ares/ares_cancel.c b/ares/ares_cancel.c
index 4df1e9f5b2928c6c93c24a529a454b942dc3caa3..f2f6c7e22ac6d63f3f9082c27e408290180c0960 100644
--- a/ares/ares_cancel.c
+++ b/ares/ares_cancel.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright (C) 2004 by Daniel Stenberg et al
  *
  * Permission to use, copy, modify, and distribute this software and its
diff --git a/ares/ares_destroy.c b/ares/ares_destroy.c
index d3860da136d92cd1b2a9477f890ba802a94e1e96..61028a630445206f1847ec89f88716a1caddfd32 100644
--- a/ares/ares_destroy.c
+++ b/ares/ares_destroy.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
diff --git a/ares/ares_expand_name.c b/ares/ares_expand_name.c
index 8c5be9b440d859dfdb8cd31ea1630c5f4eed2397..950ea740fa5f15178487dc99d2bdfc7b331c3bb1 100644
--- a/ares/ares_expand_name.c
+++ b/ares/ares_expand_name.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
diff --git a/ares/ares_expand_string.c b/ares/ares_expand_string.c
index dcb0c0290c67eb4cdcf14bc715c26e483720e77d..58d209ad5d36fc723f0ebcec8ac7b987eb1a17f6 100644
--- a/ares/ares_expand_string.c
+++ b/ares/ares_expand_string.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -53,13 +55,13 @@ int ares_expand_string(const unsigned char *encoded,
   *s = malloc(len+1);
   if (*s == NULL)
     return ARES_ENOMEM;
-  q = *s; 
+  q = *s;
   strncpy((char *)q, (char *)encoded, len);
   q[len] = '\0';
 
   *s = q;
 
-  *enclen = len+1; 
+  *enclen = len+1;
 
   return ARES_SUCCESS;
 }
diff --git a/ares/ares_free_hostent.c b/ares/ares_free_hostent.c
index 8d6967eed0a09aaeb603a36a4a31f90488459a29..a41624fc13a86efdd41581bc955398de4089c966 100644
--- a/ares/ares_free_hostent.c
+++ b/ares/ares_free_hostent.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
diff --git a/ares/ares_free_string.c b/ares/ares_free_string.c
index 5fa646b46eac435e35f66712a7a59df9d7df2e37..2da45bc98c8df7567ecb25f917171c79ef223932 100644
--- a/ares/ares_free_string.c
+++ b/ares/ares_free_string.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright 2000 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -16,6 +18,7 @@
 #include "setup.h"
 #include <stdlib.h>
 #include "ares.h"
+#include "ares_private.h"
 
 void ares_free_string(void *str)
 {
diff --git a/ares/ares_gethostbyname.c b/ares/ares_gethostbyname.c
index bdc902974abacb6b8925398ccfa15149a753c2f1..e1696ac0e0d22b54ebd67405377d8b771e334c52 100644
--- a/ares/ares_gethostbyname.c
+++ b/ares/ares_gethostbyname.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
diff --git a/ares/ares_mkquery.c b/ares/ares_mkquery.c
index d5c40cb74a135db1b0c995f4e6e087d6b46a8b0f..43b67549aa221c4b29a5d4ea53ef1b2d1473d502 100644
--- a/ares/ares_mkquery.c
+++ b/ares/ares_mkquery.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -30,6 +32,7 @@
 #include <string.h>
 #include "ares.h"
 #include "ares_dns.h"
+#include "ares_private.h"
 
 /* Header format, from RFC 1035:
  *                                  1  1  1  1  1  1
diff --git a/ares/ares_parse_a_reply.c b/ares/ares_parse_a_reply.c
index 8f69bf0e674741536ab8968ccac09c9440b282ff..60246d36aa978941d24717b2c598270344cf470d 100644
--- a/ares/ares_parse_a_reply.c
+++ b/ares/ares_parse_a_reply.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
diff --git a/ares/ares_parse_ptr_reply.c b/ares/ares_parse_ptr_reply.c
index 2bac907db651862c21ca749e4de0ae994215ed8d..21ea8fae1edc053b3685e48b5c08ece82f94dce9 100644
--- a/ares/ares_parse_ptr_reply.c
+++ b/ares/ares_parse_ptr_reply.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
diff --git a/ares/ares_query.c b/ares/ares_query.c
index 47c0670eb83b21c94a6f63a2d0be9f3fc47a9f27..4f044d886f64c08e2279cfdc61bc6316f90a0e61 100644
--- a/ares/ares_query.c
+++ b/ares/ares_query.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
diff --git a/ares/ares_search.c b/ares/ares_search.c
index dc416c0262abb193d0bd53095f90710e1a3e2d3b..816e160eaf4c164f369fcd88d26426c6fac074e8 100644
--- a/ares/ares_search.c
+++ b/ares/ares_search.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
diff --git a/ares/ares_send.c b/ares/ares_send.c
index 83cea801761a3ae90a1681626e81a39c0aac6f09..f0a85ad4e12e1f597f2c99288240e51a7fc2cebd 100644
--- a/ares/ares_send.c
+++ b/ares/ares_send.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
diff --git a/ares/ares_strerror.c b/ares/ares_strerror.c
index 6e9fa0edd47a25c3df3a6d32022530b1b6e5a1e4..326e6fba8eb5b85377a9cffa0f0c79cb9a90ae3f 100644
--- a/ares/ares_strerror.c
+++ b/ares/ares_strerror.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
diff --git a/ares/ares_timeout.c b/ares/ares_timeout.c
index c550218da3107502f31f4ae0cc39591ff68f4780..c6af87e3c7d922fd4377e02270b7f36e73c885d9 100644
--- a/ares/ares_timeout.c
+++ b/ares/ares_timeout.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
diff --git a/ares/bitncmp.c b/ares/bitncmp.c
index 0da540fff8ed30d05e5eb32b6df2fadb5d39f6fb..0d4ce565abff56ba5c139ef295b82c04a5922162 100644
--- a/ares/bitncmp.c
+++ b/ares/bitncmp.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996,1999 by Internet Software Consortium.
diff --git a/ares/inet_net_pton.c b/ares/inet_net_pton.c
index e028ec66be6ce83e1e0da72432172aba16035cc9..3621bb8d239fce311d557bfcadf604211052dcb7 100644
--- a/ares/inet_net_pton.c
+++ b/ares/inet_net_pton.c
@@ -1,3 +1,5 @@
+/* $Id: */
+
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996,1999 by Internet Software Consortium.
diff --git a/ares/setup.h b/ares/setup.h
index c6ec2618eed105e7975d88ca0bca5492a2dc1974..4dcfa81346ed56a169891eebc1b7a98b33c7c039 100644
--- a/ares/setup.h
+++ b/ares/setup.h
@@ -1,6 +1,8 @@
 #ifndef __ARES_SETUP_H
 #define __ARES_SETUP_H
 
+/* $Id: */
+
 /* Copyright (C) 2004 - 2005 by Daniel Stenberg et al
  *
  * Permission to use, copy, modify, and distribute this software and its
diff --git a/ares/windows_port.c b/ares/windows_port.c
index e80d00d5cd8990eb5c4215bcaf96fc00c1e985d3..3dc8c78fadec3b40ea54ddfdd38cc409e5edac06 100644
--- a/ares/windows_port.c
+++ b/ares/windows_port.c
@@ -1,5 +1,7 @@
 #include "setup.h"
 
+/* $Id: */
+
 /* only do the following on windows
  */
 #if (defined(WIN32) || defined(WATT32)) && !defined(MSDOS)