Index: conf/conftest.c
===================================================================
--- conf/conftest.c	(revision 30970)
+++ conf/conftest.c	(revision 30971)
@@ -14,7 +14,7 @@
 int global_notify = 0;
 rnd_conf_hid_id_t hid_id;
 const char *hid_cookie = "conftest cookie";
-pcb_hid_t *pcb_gui = NULL;
+rnd_hid_t *pcb_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: librnd/glue.c
===================================================================
--- librnd/glue.c	(revision 30970)
+++ librnd/glue.c	(revision 30971)
@@ -61,10 +61,10 @@
 {
 }
 
-void pcbhl_expose_main(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *region, pcb_xform_t *xform_caller)
+void pcbhl_expose_main(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *region, rnd_xform_t *xform_caller)
 {
 }
 
-void pcbhl_expose_preview(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *e)
+void pcbhl_expose_preview(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *e)
 {
 }