Index: conf/conftest.c
===================================================================
--- conf/conftest.c	(revision 30979)
+++ conf/conftest.c	(revision 30980)
@@ -14,7 +14,7 @@
 int global_notify = 0;
 rnd_conf_hid_id_t hid_id;
 const char *hid_cookie = "conftest cookie";
-rnd_hid_t *pcb_gui = NULL;
+rnd_hid_t *rnd_gui = NULL;
 const char *pcb_hidlib_default_embedded_menu = "";
 const char *pcbhl_menu_file_paths[] = { "./", "~/.pcb-rnd/", PCBSHAREDIR "/", NULL };
 const char *pcbhl_menu_name_fmt = "pcb-menu-%s.lht";
Index: propedit/tester.c
===================================================================
--- propedit/tester.c	(revision 30979)
+++ propedit/tester.c	(revision 30980)
@@ -2,7 +2,7 @@
 #include <assert.h>
 #include "props.h"
 
-void *pcb_gui = NULL;
+void *rnd_gui = NULL;
 
 int pcb_propsel_set(const char *prop, const char *value)
 {