Index: import_sch_conf.h
===================================================================
--- import_sch_conf.h	(revision 29468)
+++ import_sch_conf.h	(nonexistent)
@@ -1,16 +0,0 @@
-#ifndef PCB_IMPORT_SCH_CONF_H
-#define PCB_IMPORT_SCH_CONF_H
-
-#include <librnd/core/conf.h>
-
-typedef struct {
-	const struct {
-		const struct {
-			CFT_STRING gnetlist_program;       /* gnetlist program name */
-			CFT_STRING make_program;           /* make program name */
-			CFT_BOOLEAN verbose;                  /* verbose logging of the import code */
-		} import_sch;
-	} plugins;
-} conf_import_sch_t;
-
-#endif
Index: Plug.tmpasm
===================================================================
--- Plug.tmpasm	(revision 29468)
+++ Plug.tmpasm	(revision 29469)
@@ -1,6 +1,5 @@
 put /local/pcb/mod {import_sch}
 put /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_sch/import_sch.o @]
-put /local/pcb/mod/CONF {$(PLUGDIR)/import_sch/import_sch_conf.h}
 
 switch /local/pcb/import_sch/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
Index: import_sch.c
===================================================================
--- import_sch.c	(revision 29468)
+++ import_sch.c	(revision 29469)
@@ -46,7 +46,7 @@
 #include <librnd/core/pcb-printf.h>
 #include "remove.h"
 #include <librnd/core/actions.h>
-#include "import_sch_conf.h"
+#include "../src_plugins/import_sch2/import_sch_conf.h"
 #include <librnd/core/misc_util.h>
 #include <librnd/core/compat_misc.h>
 #include "obj_rat.h"
@@ -397,7 +397,7 @@
 	PCB_REGISTER_ACTIONS(import_sch_action_list, import_sch_cookie)
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	pcb_conf_reg_field(conf_import_sch, field,isarray,type_name,cpath,cname,desc,flags);
-#include "import_sch_conf_fields.h"
+#include "../src_plugins/import_sch2/import_sch_conf_fields.h"
 
 	/* Compatibility: get some settings from the env */
 	tmp = getenv ("PCB_MAKE_PROGRAM");
Index: import_sch.pup
===================================================================
--- import_sch.pup	(revision 29468)
+++ import_sch.pup	(revision 29469)
@@ -6,5 +6,6 @@
 $fmt-feature-r import netlist and footprint info from gEDA schematics using gnetlist
 $fmt-feature-r import netlist and footprint produced by an external command
 $package import-net
+$dep import_sch2
 default buildin
 autoload 1