diff --git a/ChangeLog b/ChangeLog
index 980332e29e..de81d3a7ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-14  Jim Meyering  <meyering@redhat.com>
+
+	Clean up global name space in examples and tests.
+	* docs/examples/suspend.c: Declare global "conn" to be static.
+	* tests/qemuxml2argvtest.c: Declare global "driver" to be static.
+	* tests/qemuxml2xmltest.c: Likewise.
+
 Sun Jan 13 22:59:53 EST 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/remote_internal.c: Refactor code to make error patches
diff --git a/docs/examples/suspend.c b/docs/examples/suspend.c
index 80e4da7b3a..9ca6299e48 100644
--- a/docs/examples/suspend.c
+++ b/docs/examples/suspend.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <libvirt/libvirt.h>
 
-virConnectPtr conn = NULL; /* the hypervisor connection */
+static virConnectPtr conn = NULL; /* the hypervisor connection */
 
 /**
  * checkDomainState:
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index d4e39b259b..22e2e81861 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -16,7 +16,7 @@
 
 static char *progname;
 static char *abs_top_srcdir;
-struct qemud_driver driver;
+static struct qemud_driver driver;
 
 #define MAX_FILE 4096
 
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index c42e6fb68d..2ab169674d 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -16,7 +16,7 @@
 
 static char *progname;
 static char *abs_top_srcdir;
-struct qemud_driver driver;
+static struct qemud_driver driver;
 
 #define MAX_FILE 4096