Index: stackup.c
===================================================================
--- stackup.c	(revision 30970)
+++ stackup.c	(revision 30971)
@@ -276,7 +276,7 @@
 int tedax_stackup_fsave(tedax_stackup_t *ctx, pcb_board_t *pcb, const char *stackid, FILE *f)
 {
 	int prefix = 0;
-	pcb_layergrp_id_t gid;
+	rnd_layergrp_id_t gid;
 	pcb_layergrp_t *grp;
 
 	fprintf(f, "begin stackup v1 ");
Index: tboard.c
===================================================================
--- tboard.c	(revision 30970)
+++ tboard.c	(revision 30971)
@@ -106,7 +106,7 @@
 {
 	htsi_t urefdes;
 	htsi_entry_t *re;
-	pcb_layergrp_id_t gid;
+	rnd_layergrp_id_t gid;
 	int n;
 	rnd_attribute_t *a;
 	tedax_stackup_t ctx;
Index: tetest.c
===================================================================
--- tetest.c	(revision 30970)
+++ tetest.c	(revision 30971)
@@ -173,7 +173,7 @@
 
 /*** export HID ***/
 
-static pcb_export_opt_t tedax_etest_options[] = {
+static rnd_export_opt_t tedax_etest_options[] = {
 	{"outfile", "Name of the tedax etest output file",
 	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
 #define HA_outfile 0
@@ -185,11 +185,11 @@
 
 #define NUM_OPTIONS (sizeof(tedax_etest_options)/sizeof(tedax_etest_options[0]))
 
-static pcb_hid_attr_val_t tedax_etest_values[NUM_OPTIONS];
+static rnd_hid_attr_val_t tedax_etest_values[NUM_OPTIONS];
 
 static const char *tedax_etest_filename;
 
-static pcb_export_opt_t *tedax_etest_get_export_options(pcb_hid_t *hid, int *n)
+static rnd_export_opt_t *tedax_etest_get_export_options(rnd_hid_t *hid, int *n)
 {
 	if ((PCB != NULL)  && (tedax_etest_options[HA_outfile].default_val.str == NULL))
 		pcb_derive_default_filename(PCB->hidlib.filename, &tedax_etest_options[HA_outfile], ".etest.tdx");
@@ -199,7 +199,7 @@
 	return tedax_etest_options;
 }
 
-static void tedax_etest_do_export(pcb_hid_t *hid, pcb_hid_attr_val_t *options)
+static void tedax_etest_do_export(rnd_hid_t *hid, rnd_hid_attr_val_t *options)
 {
 	int i;
 	const char *name;
@@ -226,7 +226,7 @@
 	pcb_cam_end(&cam);
 }
 
-static int tedax_etest_usage(pcb_hid_t *hid, const char *topic)
+static int tedax_etest_usage(rnd_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\ntEDAx etest exporter command line arguments:\n\n");
 	pcb_hid_usage(tedax_etest_options, sizeof(tedax_etest_options) / sizeof(tedax_etest_options[0]));
@@ -235,13 +235,13 @@
 }
 
 static const char *tedax_etest_cookie = "tEDAx etest";
-static int tedax_etest_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv)
+static int tedax_etest_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
 	pcb_export_register_opts(tedax_etest_options, sizeof(tedax_etest_options) / sizeof(tedax_etest_options[0]), tedax_etest_cookie, 0);
 	return pcb_hid_parse_command_line(argc, argv);
 }
 
-static pcb_hid_t exp_tedax_etest;
+static rnd_hid_t exp_tedax_etest;
 
 void tedax_etest_uninit(void)
 {
@@ -250,11 +250,11 @@
 
 void tedax_etest_init(void)
 {
-	memset(&exp_tedax_etest, 0, sizeof(pcb_hid_t));
+	memset(&exp_tedax_etest, 0, sizeof(rnd_hid_t));
 
 	pcb_hid_nogui_init(&exp_tedax_etest);
 
-	exp_tedax_etest.struct_size = sizeof(pcb_hid_t);
+	exp_tedax_etest.struct_size = sizeof(rnd_hid_t);
 	exp_tedax_etest.name = "tedax-etest";
 	exp_tedax_etest.description = "Electric test (list of exposed pads)";
 	exp_tedax_etest.exporter = 1;
Index: tlayer.c
===================================================================
--- tlayer.c	(revision 30970)
+++ tlayer.c	(revision 30971)
@@ -42,7 +42,7 @@
 #include <librnd/core/vtc0.h>
 #include "plug_io.h"
 
-int tedax_layer_fsave(pcb_board_t *pcb, pcb_layergrp_id_t gid, const char *layname, FILE *f)
+int tedax_layer_fsave(pcb_board_t *pcb, rnd_layergrp_id_t gid, const char *layname, FILE *f)
 {
 	char lntmp[64];
 	int lno;
@@ -124,7 +124,7 @@
 	return 0;
 }
 
-int tedax_layer_save(pcb_board_t *pcb, pcb_layergrp_id_t gid, const char *layname, const char *fn)
+int tedax_layer_save(pcb_board_t *pcb, rnd_layergrp_id_t gid, const char *layname, const char *fn)
 {
 	int res;
 	FILE *f;
Index: tlayer.h
===================================================================
--- tlayer.h	(revision 30970)
+++ tlayer.h	(revision 30971)
@@ -1,8 +1,8 @@
 #include "board.h"
 #include "layer.h"
 
-int tedax_layer_save(pcb_board_t *pcb, pcb_layergrp_id_t gid, const char *layname, const char *fn);
-int tedax_layer_fsave(pcb_board_t *pcb, pcb_layergrp_id_t gid, const char *layname, FILE *f);
+int tedax_layer_save(pcb_board_t *pcb, rnd_layergrp_id_t gid, const char *layname, const char *fn);
+int tedax_layer_fsave(pcb_board_t *pcb, rnd_layergrp_id_t gid, const char *layname, FILE *f);
 
 int tedax_layers_load(pcb_data_t *data, const char *fn, const char *blk_id, int silent);
 int tedax_layers_fload(pcb_data_t *data, FILE *f, const char *blk_id, int silent);