Index: import_sch_conf.h
===================================================================
--- import_sch_conf.h	(revision 30944)
+++ import_sch_conf.h	(revision 30945)
@@ -6,13 +6,13 @@
 typedef struct {
 	const struct {
 		const struct {
-			CFT_STRING import_fmt;          /* name of the input format */
-			CFT_LIST args;                  /* import_fmt arguments, typically file names */
-			CFT_BOOLEAN verbose;            /* verbose logging of the import code */
+			RND_CFT_STRING import_fmt;          /* name of the input format */
+			RND_CFT_LIST args;                  /* import_fmt arguments, typically file names */
+			RND_CFT_BOOLEAN verbose;            /* verbose logging of the import code */
 
 			/* obsolete: temporary compatibility with import_sch for the transition period */
-			CFT_STRING gnetlist_program;       /* DEPRECATED: gnetlist program name */
-			CFT_STRING make_program;           /* DEPRECATED: make program name */
+			RND_CFT_STRING gnetlist_program;       /* DEPRECATED: gnetlist program name */
+			RND_CFT_STRING make_program;           /* DEPRECATED: make program name */
 		} import_sch;
 	} plugins;
 } conf_import_sch_t;
Index: import_sch_dlg.c
===================================================================
--- import_sch_dlg.c	(revision 30944)
+++ import_sch_dlg.c	(revision 30945)
@@ -359,7 +359,7 @@
 	return 0;
 }
 
-static void isch_cfg_chg(conf_native_t *cfg, int arr_idx)
+static void isch_cfg_chg(rnd_conf_native_t *cfg, int arr_idx)
 {
 	if ((isch_conf_lock == 0) && isch_ctx.active)
 		isch_pcb2dlg();