Index: exp_fmt_amf.c
===================================================================
--- exp_fmt_amf.c	(revision 36988)
+++ exp_fmt_amf.c	(revision 36989)
@@ -75,7 +75,7 @@
 	verthash_uninit(&verthash);
 }
 
-static stl_facet_t *amf_solid_fload(rnd_hidlib_t *hl, FILE *f, const char *fn);
+static stl_facet_t *amf_solid_fload(rnd_design_t *hl, FILE *f, const char *fn);
 
 static const stl_fmt_t fmt_amf = {
 	/* output */
Index: exp_fmt_stl.c
===================================================================
--- exp_fmt_stl.c	(revision 36988)
+++ exp_fmt_stl.c	(revision 36989)
@@ -102,7 +102,7 @@
 	fprintf(f, "endsolid\n");
 }
 
-static stl_facet_t *stl_solid_fload(rnd_hidlib_t *hl, FILE *f, const char *fn);
+static stl_facet_t *stl_solid_fload(rnd_design_t *hl, FILE *f, const char *fn);
 
 static const stl_fmt_t fmt_stl = {
 	/* output */
Index: export_stl.c
===================================================================
--- export_stl.c	(revision 36988)
+++ export_stl.c	(revision 36989)
@@ -360,7 +360,7 @@
 	const char *attr_model_name;
 	const char *attr_xlate, *attr_xlate_old;
 	const char *attr_rotate, *attr_rotate_old;
-	stl_facet_t *(*model_load)(rnd_hidlib_t *hl, FILE *f, const char *fn);
+	stl_facet_t *(*model_load)(rnd_design_t *hl, FILE *f, const char *fn);
 } stl_fmt_t;
 
 static const rnd_export_opt_t *stl_get_export_options_(rnd_hid_t *hid, int *n, const stl_fmt_t *fmt)
Index: model_load_amf.c
===================================================================
--- model_load_amf.c	(revision 36988)
+++ model_load_amf.c	(revision 36989)
@@ -162,7 +162,7 @@
 	return head;
 }
 
-static stl_facet_t *amf_solid_fload(rnd_hidlib_t *hl, FILE *f, const char *fn)
+static stl_facet_t *amf_solid_fload(rnd_design_t *hl, FILE *f, const char *fn)
 {
 	xmlDoc *doc;
 	xmlNode *root, *n, *m;
@@ -213,7 +213,7 @@
 #else
 
 /* Fallback: still provide a dummy if libxml is not available */
-static stl_facet_t *amf_solid_fload(rnd_hidlib_t *hl, FILE *f, const char *fn)
+static stl_facet_t *amf_solid_fload(rnd_design_t *hl, FILE *f, const char *fn)
 {
 	return &stl_format_not_supported;
 }
Index: model_load_stl.c
===================================================================
--- model_load_stl.c	(revision 36988)
+++ model_load_stl.c	(revision 36989)
@@ -24,7 +24,7 @@
  *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
  */
 
-static stl_facet_t *stl_solid_fload(rnd_hidlib_t *hl, FILE *f, const char *fn)
+static stl_facet_t *stl_solid_fload(rnd_design_t *hl, FILE *f, const char *fn)
 {
 	stl_facet_t *head = NULL, *tail = NULL, *t;
 	char *cmd, line[512];
Index: stl_models.c
===================================================================
--- stl_models.c	(revision 36988)
+++ stl_models.c	(revision 36989)
@@ -157,7 +157,7 @@
 
 static stl_facet_t stl_format_not_supported;
 
-static void stl_model_place(rnd_hidlib_t *hl, FILE *outf, htsp_t *models, const char *name, rnd_coord_t ox, rnd_coord_t oy, double rotdeg, int on_bottom, const char *user_xlate, const char *user_rot, double maxy, rnd_coord_t z0, rnd_coord_t z1, const stl_fmt_t *ifmt, const stl_fmt_t *ofmt)
+static void stl_model_place(rnd_design_t *hl, FILE *outf, htsp_t *models, const char *name, rnd_coord_t ox, rnd_coord_t oy, double rotdeg, int on_bottom, const char *user_xlate, const char *user_rot, double maxy, rnd_coord_t z0, rnd_coord_t z1, const stl_fmt_t *ifmt, const stl_fmt_t *ofmt)
 {
 	stl_facet_t *head = NULL;
 	double uxlate[3] = {0,0,0}, xlate[3], urot[3] = {0,0,0}, rot[3];
Index: test_load/main.c
===================================================================
--- test_load/main.c	(revision 36988)
+++ test_load/main.c	(revision 36989)
@@ -3,7 +3,7 @@
 #define STL_TESTER
 #include "../stl_models.c"
 
-stl_facet_t *stl_solid_load(rnd_hidlib_t *hl, const char *fn)
+stl_facet_t *stl_solid_load(rnd_design_t *hl, const char *fn)
 {
 	FILE *f;
 	stl_facet_t *res;