diff --git a/lib/dns/client.c b/lib/dns/client.c
index dcb8817e2b..f094188c83 100644
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -14,7 +14,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.2 2009/09/01 00:22:26 jinmei Exp $ */
+/* $Id: client.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */
+
+#include <config.h>
 
 #include <isc/app.h>
 #include <isc/mem.h>
diff --git a/lib/dns/tsec.c b/lib/dns/tsec.c
index dbd0b85cb8..44bde128db 100644
--- a/lib/dns/tsec.c
+++ b/lib/dns/tsec.c
@@ -14,7 +14,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsec.c,v 1.2 2009/09/01 00:22:26 jinmei Exp $ */
+/* $Id: tsec.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */
+
+#include <config.h>
 
 #include <isc/mem.h>
 
diff --git a/lib/export/samples/nsprobe.c b/lib/export/samples/nsprobe.c
index fa3dfd4720..b8fdcefb9e 100644
--- a/lib/export/samples/nsprobe.c
+++ b/lib/export/samples/nsprobe.c
@@ -14,7 +14,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsprobe.c,v 1.2 2009/09/01 00:22:27 jinmei Exp $ */
+/* $Id: nsprobe.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */
+
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/export/samples/sample-async.c b/lib/export/samples/sample-async.c
index d209f3a066..49e1c7a187 100644
--- a/lib/export/samples/sample-async.c
+++ b/lib/export/samples/sample-async.c
@@ -14,7 +14,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sample-async.c,v 1.2 2009/09/01 00:22:27 jinmei Exp $ */
+/* $Id: sample-async.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */
+
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/export/samples/sample-gai.c b/lib/export/samples/sample-gai.c
index 321004ef04..364b5ad152 100644
--- a/lib/export/samples/sample-gai.c
+++ b/lib/export/samples/sample-gai.c
@@ -14,7 +14,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sample-gai.c,v 1.2 2009/09/01 00:22:27 jinmei Exp $ */
+/* $Id: sample-gai.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */
+
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/export/samples/sample-request.c b/lib/export/samples/sample-request.c
index 75242ee410..b45e952d43 100644
--- a/lib/export/samples/sample-request.c
+++ b/lib/export/samples/sample-request.c
@@ -14,7 +14,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sample-request.c,v 1.2 2009/09/01 00:22:27 jinmei Exp $ */
+/* $Id: sample-request.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */
+
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/export/samples/sample-update.c b/lib/export/samples/sample-update.c
index e186f536d6..5ada36461d 100644
--- a/lib/export/samples/sample-update.c
+++ b/lib/export/samples/sample-update.c
@@ -14,7 +14,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sample-update.c,v 1.2 2009/09/01 00:22:27 jinmei Exp $ */
+/* $Id: sample-update.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */
+
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/export/samples/sample.c b/lib/export/samples/sample.c
index 64797955c6..765a759af9 100644
--- a/lib/export/samples/sample.c
+++ b/lib/export/samples/sample.c
@@ -14,7 +14,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sample.c,v 1.2 2009/09/01 00:22:27 jinmei Exp $ */
+/* $Id: sample.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */
+
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/irs/gai_strerror.c b/lib/irs/gai_strerror.c
index ce31df95c6..edae6613a8 100644
--- a/lib/irs/gai_strerror.c
+++ b/lib/irs/gai_strerror.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gai_strerror.c,v 1.2 2009/09/01 00:22:27 jinmei Exp $ */
+/* $Id: gai_strerror.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */
 
 /*! \file gai_strerror.c
  * gai_strerror() returns an error message corresponding to an
@@ -50,6 +50,8 @@
  *
  * strerror(), getaddrinfo(), getnameinfo(), RFC3493.
  */
+#include <config.h>
+
 #include <irs/netdb.h>
 
 /*% Text of error messages. */
diff --git a/lib/isc/app_api.c b/lib/isc/app_api.c
index 8f44c5e84c..80ebd2ba88 100644
--- a/lib/isc/app_api.c
+++ b/lib/isc/app_api.c
@@ -14,7 +14,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: app_api.c,v 1.2 2009/09/01 00:22:28 jinmei Exp $ */
+/* $Id: app_api.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */
+
+#include <config.h>
 
 #include <unistd.h>
 
diff --git a/lib/isc/mem_api.c b/lib/isc/mem_api.c
index 432cd67b66..e50c56b843 100644
--- a/lib/isc/mem_api.c
+++ b/lib/isc/mem_api.c
@@ -14,7 +14,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mem_api.c,v 1.2 2009/09/01 00:22:28 jinmei Exp $ */
+/* $Id: mem_api.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */
+
+#include <config.h>
 
 #include <isc/magic.h>
 #include <isc/mem.h>
diff --git a/lib/isc/socket_api.c b/lib/isc/socket_api.c
index 66541299bd..a10efef41f 100644
--- a/lib/isc/socket_api.c
+++ b/lib/isc/socket_api.c
@@ -14,7 +14,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket_api.c,v 1.2 2009/09/01 00:22:28 jinmei Exp $ */
+/* $Id: socket_api.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */
+
+#include <config.h>
 
 #include <isc/app.h>
 #include <isc/magic.h>
diff --git a/lib/isc/task_api.c b/lib/isc/task_api.c
index ff5c5c5cd6..af7a93ca64 100644
--- a/lib/isc/task_api.c
+++ b/lib/isc/task_api.c
@@ -14,7 +14,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task_api.c,v 1.2 2009/09/01 00:22:28 jinmei Exp $ */
+/* $Id: task_api.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */
+
+#include <config.h>
 
 #include <unistd.h>
 
diff --git a/lib/isc/timer_api.c b/lib/isc/timer_api.c
index 07c3448d8d..44a0b9f1ff 100644
--- a/lib/isc/timer_api.c
+++ b/lib/isc/timer_api.c
@@ -14,7 +14,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer_api.c,v 1.2 2009/09/01 00:22:28 jinmei Exp $ */
+/* $Id: timer_api.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */
+
+#include <config.h>
 
 #include <unistd.h>
 
diff --git a/lib/isccfg/dnsconf.c b/lib/isccfg/dnsconf.c
index e8907bdbb9..8429f34ccf 100644
--- a/lib/isccfg/dnsconf.c
+++ b/lib/isccfg/dnsconf.c
@@ -15,10 +15,12 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnsconf.c,v 1.2 2009/09/01 00:22:28 jinmei Exp $ */
+/* $Id: dnsconf.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */
 
 /*! \file */
 
+#include <config.h>
+
 #include <isccfg/cfg.h>
 #include <isccfg/grammar.h>