Index: export_test.c
===================================================================
--- export_test.c	(revision 4788)
+++ export_test.c	(revision 4789)
@@ -22,7 +22,7 @@
 
 const char *export_test_cookie = "export_test HID";
 
-static hid_attribute_t export_test_options[] = {
+static pcb_hid_attribute_t export_test_options[] = {
 /* %start-doc options "8 export_test Creation"
 @ftable @code
 @item --export_testfile <string>
@@ -37,11 +37,11 @@
 
 #define NUM_OPTIONS (sizeof(export_test_options)/sizeof(export_test_options[0]))
 
-static hid_attr_val_t export_test_values[NUM_OPTIONS];
+static pcb_hid_attr_val_t export_test_values[NUM_OPTIONS];
 
 static const char *export_test_filename;
 
-static hid_attribute_t *export_test_get_export_options(int *n)
+static pcb_hid_attribute_t *export_test_get_export_options(int *n)
 {
 	static char *last_export_test_filename = 0;
 
@@ -292,7 +292,7 @@
 	return (0);
 }
 
-static void export_test_do_export(hid_attr_val_t * options)
+static void export_test_do_export(pcb_hid_attr_val_t * options)
 {
 	int i;