diff --git a/ChangeLog b/ChangeLog
index fe255aed48..85d3fc7e16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Fri Dec  7 11:06:58 CET 2007 Jim Meyering <meyering@redhat.com>
+
+	Include "config.h" in remaining non-generated files.
+	* proxy/libvirt_proxy.c: Likewise.
+	* python/libvir.c: Likewise.
+	* python/types.c: Likewise.
+	* src/event.c: Likewise.
+	* src/xm_internal.c: Likewise.
+	* tests/reconnect.c: Likewise.
+	* tests/testutils.c: Likewise.
+
 Fri Dec  7 09:39:41 CET 2007 Daniel Veillard <veillard@redhat.com>
 
 	* python/generator.py python/libvir.c python/libvirt-python-api.xml:
diff --git a/proxy/libvirt_proxy.c b/proxy/libvirt_proxy.c
index d7deb44014..152df562f7 100644
--- a/proxy/libvirt_proxy.c
+++ b/proxy/libvirt_proxy.c
@@ -2,13 +2,15 @@
  * proxy_svr.c: root suid proxy server for Xen access to APIs with no
  *              side effects from unauthenticated clients.
  *
- * Copyright (C) 2006 Red Hat, Inc.
+ * Copyright (C) 2006, 2007 Red Hat, Inc.
  *
  * See COPYING.LIB for the License of this software
  *
  * Daniel Veillard <veillard@redhat.com>
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/python/libvir.c b/python/libvir.c
index 91f3acc3ce..0edec41b4a 100644
--- a/python/libvir.c
+++ b/python/libvir.c
@@ -4,11 +4,13 @@
  *           entry points where an automatically generated stub is
  *           unpractical
  *
- * Copyright (C) 2005 Red Hat, Inc.
+ * Copyright (C) 2005, 2007 Red Hat, Inc.
  *
  * Daniel Veillard <veillard@redhat.com>
  */
 
+#include "config.h"
+
 #include <Python.h>
 #include "libvirt/libvirt.h"
 #include "libvirt/virterror.h"
diff --git a/python/types.c b/python/types.c
index cc0f2b171d..146bb24564 100644
--- a/python/types.c
+++ b/python/types.c
@@ -2,11 +2,13 @@
  * types.c: converter functions between the internal representation
  *          and the Python objects
  *
- * Copyright (C) 2005 Red Hat, Inc.
+ * Copyright (C) 2005, 2007 Red Hat, Inc.
  *
  * Daniel Veillard <veillard@redhat.com>
  */
 
+#include "config.h"
+
 #include "libvirt_wrap.h"
 
 PyObject *
diff --git a/src/event.c b/src/event.c
index 2fe9a266c0..7dcbf3211e 100644
--- a/src/event.c
+++ b/src/event.c
@@ -21,6 +21,7 @@
  * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
+#include "config.h"
 
 #include "event.h"
 
diff --git a/src/xm_internal.c b/src/xm_internal.c
index 43263d74b1..07abbb1d41 100644
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -23,6 +23,8 @@
  */
 
 #ifdef WITH_XEN
+#include "config.h"
+
 #include <dirent.h>
 #include <time.h>
 #include <sys/stat.h>
diff --git a/tests/reconnect.c b/tests/reconnect.c
index 246e3bbd70..d94f5c76ff 100644
--- a/tests/reconnect.c
+++ b/tests/reconnect.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "libvirt/libvirt.h"
diff --git a/tests/testutils.c b/tests/testutils.c
index 6121785ee5..1141edb1a6 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -10,6 +10,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>