Index: dlg.c
===================================================================
--- dlg.c	(revision 30952)
+++ dlg.c	(revision 30953)
@@ -195,10 +195,10 @@
 		MKDIR_ND(nd, nd, LHT_LIST, "rules");
 		if ((nd->data.list.first == NULL) && (role != RND_CFR_USER)) {
 			gdl_iterator_t it;
-			pcb_conf_listitem_t *i;
+			rnd_conf_listitem_t *i;
 
 			/* need to copy all rules! */
-			pcb_conflist_foreach(&conf_drc_query.plugins.drc_query.rules, &it, i) {
+			rnd_conflist_foreach(&conf_drc_query.plugins.drc_query.rules, &it, i) {
 				lht_node_t *nnew = lht_dom_duptree(i->prop.src);
 				lht_dom_list_append(nd, nnew);
 			}
@@ -369,7 +369,7 @@
 	pcb_hid_row_t *r;
 	char *cell[5], *cursor_path = NULL;
 	gdl_iterator_t it;
-	pcb_conf_listitem_t *i;
+	rnd_conf_listitem_t *i;
 	pcb_drcq_stat_t *st;
 
 	if (!ctx->active)
@@ -388,7 +388,7 @@
 
 	cell[4] = NULL;
 
-	pcb_conflist_foreach(&conf_drc_query.plugins.drc_query.rules, &it, i) {
+	rnd_conflist_foreach(&conf_drc_query.plugins.drc_query.rules, &it, i) {
 		int *dis, dis_ = 0;
 		rnd_conf_role_t role;
 		lht_node_t *rule = i->prop.src;
Index: drc_query.c
===================================================================
--- drc_query.c	(revision 30952)
+++ drc_query.c	(revision 30953)
@@ -178,7 +178,7 @@
 	return 0;
 }
 
-static const char *load_str(lht_node_t *rule, pcb_conf_listitem_t *i, const char *name)
+static const char *load_str(lht_node_t *rule, rnd_conf_listitem_t *i, const char *name)
 {
 	lht_node_t *n = lht_dom_hash_get(rule, name);
 	if (n == NULL)
@@ -204,7 +204,7 @@
 {
 	pcb_board_t *pcb = (pcb_board_t *)hidlib;
 	gdl_iterator_t it;
-	pcb_conf_listitem_t *i;
+	rnd_conf_listitem_t *i;
 	long cnt = 0;
 	int bufno = -1;
 	pcb_qry_exec_t ec;
@@ -215,7 +215,7 @@
 
 	pcb_qry_init(&ec, pcb, NULL, bufno);
 
-	pcb_conflist_foreach(&conf_drc_query.plugins.drc_query.rules, &it, i) {
+	rnd_conflist_foreach(&conf_drc_query.plugins.drc_query.rules, &it, i) {
 		lht_node_t *rule = i->prop.src;
 		int *dis;
 		if (rule->type != LHT_HASH) {
@@ -240,7 +240,7 @@
 static vtp0_t free_drc_conf_nodes;
 static rnd_conf_native_t *nat_defs = NULL;
 static rnd_conf_native_t *nat_rules = NULL;
-static void drc_query_newconf(rnd_conf_native_t *cfg, pcb_conf_listitem_t *i)
+static void drc_query_newconf(rnd_conf_native_t *cfg, rnd_conf_listitem_t *i)
 {
 	if (nat_rules == NULL) {
 		if (strncmp(cfg->hash_path, DRC_CONF_PATH_RULES, strlen(DRC_CONF_PATH_RULES)-1) == 0) {