Index: excitation.c
===================================================================
--- excitation.c	(revision 30978)
+++ excitation.c	(revision 30979)
@@ -329,7 +329,7 @@
 	{ NULL, NULL}
 };
 
-static void exc_close_cb(void *caller_data, pcb_hid_attr_ev_t ev)
+static void exc_close_cb(void *caller_data, rnd_hid_attr_ev_t ev)
 {
 	exc_ctx_t *ctx = caller_data;
 	PCB_DAD_FREE(ctx->dlg);
Index: export_openems.c
===================================================================
--- export_openems.c	(revision 30978)
+++ export_openems.c	(revision 30979)
@@ -708,18 +708,18 @@
 	free(gc);
 }
 
-static void openems_set_drawing_mode(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen)
+static void openems_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen)
 {
 	switch(op) {
-		case PCB_HID_COMP_RESET:
+		case RND_HID_COMP_RESET:
 			break;
-		case PCB_HID_COMP_POSITIVE:
-		case PCB_HID_COMP_POSITIVE_XOR:
+		case RND_HID_COMP_POSITIVE:
+		case RND_HID_COMP_POSITIVE_XOR:
 			break;
-		case PCB_HID_COMP_NEGATIVE:
+		case RND_HID_COMP_NEGATIVE:
 			rnd_message(RND_MSG_ERROR, "Can't draw composite layer, especially not on copper\n");
 			break;
-		case PCB_HID_COMP_FLUSH:
+		case RND_HID_COMP_FLUSH:
 			break;
 	}
 }
Index: mesh.c
===================================================================
--- mesh.c	(revision 30978)
+++ mesh.c	(revision 30979)
@@ -956,7 +956,7 @@
 	mesh.ui_layer_z = pcb_uilayer_alloc(mesh_ui_cookie, "mesh z", &clr);
 }
 
-static void ia_close_cb(void *caller_data, pcb_hid_attr_ev_t ev)
+static void ia_close_cb(void *caller_data, rnd_hid_attr_ev_t ev)
 {
 	PCB_DAD_FREE(ia.dlg);
 	memset(&ia, 0, sizeof(ia));
@@ -971,7 +971,7 @@
 
 	fname = pcb_gui->fileselect(pcb_gui, "Save mesh settings...",
 															"Picks file for saving mesh settings.\n",
-															default_file, ".lht", NULL, "mesh", PCB_HID_FSD_MAY_NOT_EXIST, NULL);
+															default_file, ".lht", NULL, "mesh", RND_HID_FSD_MAY_NOT_EXIST, NULL);
 	if (fname == NULL)
 		return; /* cancel */
 
@@ -1001,7 +1001,7 @@
 
 	fname = pcb_gui->fileselect(pcb_gui, "Load mesh settings...",
 															"Picks file for loading mesh settings from.\n",
-															default_file, ".lht", NULL, "mesh", PCB_HID_FSD_READ, NULL);
+															default_file, ".lht", NULL, "mesh", RND_HID_FSD_READ, NULL);
 	if (fname == NULL)
 		return; /* cancel */