Index: infobar.c
===================================================================
--- infobar.c	(revision 30944)
+++ infobar.c	(revision 30945)
@@ -67,7 +67,7 @@
 	}
 }
 
-static void pcb_infobar_update_conf(conf_native_t *cfg, int arr_idx)
+static void pcb_infobar_update_conf(rnd_conf_native_t *cfg, int arr_idx)
 {
 	if ((!infobar_gui_inited) || (last_interval == conf_core.rc.file_changed_interval))
 		return;
Index: lib_hid_pcbui.c
===================================================================
--- lib_hid_pcbui.c	(revision 30944)
+++ lib_hid_pcbui.c	(revision 30945)
@@ -93,10 +93,10 @@
 	rnd_toolbar_uninit();
 }
 
-static conf_hid_id_t install_events(const char *cookie, const char *paths[], conf_hid_callbacks_t cb[], void (*update_cb)(conf_native_t*,int))
+static conf_hid_id_t install_events(const char *cookie, const char *paths[], conf_hid_callbacks_t cb[], void (*update_cb)(rnd_conf_native_t*,int))
 {
 	const char **rp;
-	conf_native_t *nat;
+	rnd_conf_native_t *nat;
 	int n;
 	conf_hid_id_t conf_id;
 
Index: routest.c
===================================================================
--- routest.c	(revision 30944)
+++ routest.c	(revision 30945)
@@ -216,7 +216,7 @@
 	rst_update();
 }
 
-void pcb_rst_update_conf(conf_native_t *cfg, int arr_idx)
+void pcb_rst_update_conf(rnd_conf_native_t *cfg, int arr_idx)
 {
 	if ((PCB != NULL) && (pcb_gui != NULL)) {
 		if (pcb_gui->update_menu_checkbox != NULL)
Index: routest.h
===================================================================
--- routest.h	(revision 30944)
+++ routest.h	(revision 30945)
@@ -4,7 +4,7 @@
 
 void pcb_rst_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 void pcb_rst_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-void pcb_rst_update_conf(conf_native_t *cfg, int arr_idx);
+void pcb_rst_update_conf(rnd_conf_native_t *cfg, int arr_idx);
 
 
 extern const char pcb_acts_AdjustStyle[];
Index: status.c
===================================================================
--- status.c	(revision 30944)
+++ status.c	(revision 30945)
@@ -319,12 +319,12 @@
 	}
 }
 
-void pcb_status_st_update_conf(conf_native_t *cfg, int arr_idx)
+void pcb_status_st_update_conf(rnd_conf_native_t *cfg, int arr_idx)
 {
 	status_st_pcb2dlg();
 }
 
-void pcb_status_rd_update_conf(conf_native_t *cfg, int arr_idx)
+void pcb_status_rd_update_conf(rnd_conf_native_t *cfg, int arr_idx)
 {
 	status_rd_pcb2dlg();
 }
Index: status.h
===================================================================
--- status.h	(revision 30944)
+++ status.h	(revision 30945)
@@ -3,8 +3,8 @@
 #include <librnd/core/actions.h>
 
 void pcb_status_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-void pcb_status_st_update_conf(conf_native_t *cfg, int arr_idx);
-void pcb_status_rd_update_conf(conf_native_t *cfg, int arr_idx);
+void pcb_status_st_update_conf(rnd_conf_native_t *cfg, int arr_idx);
+void pcb_status_rd_update_conf(rnd_conf_native_t *cfg, int arr_idx);
 void pcb_status_st_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 void pcb_status_rd_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);