Index: draw.c
===================================================================
--- draw.c	(revision 25585)
+++ draw.c	(revision 25586)
@@ -24,7 +24,7 @@
 	qb.y1 = region->view.Y1;
 	qb.x2 = region->view.X2;
 	qb.y2 = region->view.Y2;
-	for(l = hle_rtree_first(&it, &design.lines, &qb); l != NULL; l = hle_rtree_next(&it)) {
+	for(l = hle_rtree_first(&it, &hle_design.lines, &qb); l != NULL; l = hle_rtree_next(&it)) {
 		pcb_gui->set_line_width(gc, l->thick);
 		pcb_gui->set_line_cap(gc, pcb_cap_round);
 		pcb_gui->draw_line(gc, l->x1, l->y1, l->x2, l->y2);
Index: gui_act.c
===================================================================
--- gui_act.c	(revision 25585)
+++ gui_act.c	(revision 25586)
@@ -53,7 +53,7 @@
 	NOGUI();
 
 	if (argc < 2) {
-		pcb_gui->zoom_win(0, 0, design.hidlib.size_x, design.hidlib.size_y, 1);
+		pcb_gui->zoom_win(0, 0, hle_design.hidlib.size_x, hle_design.hidlib.size_y, 1);
 		return 0;
 	}
 
Index: main.c
===================================================================
--- main.c	(revision 25585)
+++ main.c	(revision 25586)
@@ -25,7 +25,7 @@
 {
 }
 
-design_t design;
+hle_design_t hle_design;
 
 static void gen_lines(void)
 {
@@ -43,7 +43,7 @@
 		l->bbox.x2 = MAX(l->x1, l->x2) + l->thick;
 		l->bbox.y2 = MAX(l->y1, l->y2) + l->thick;
 
-		hle_rtree_insert(&design.lines, l, &l->bbox);
+		hle_rtree_insert(&hle_design.lines, l, &l->bbox);
 	}
 }
 
@@ -51,10 +51,10 @@
 {
 	const char *gui_name = "gtk2_gdk";
 
-	design.hidlib.size_x = PCB_MM_TO_COORD(100);
-	design.hidlib.size_y = PCB_MM_TO_COORD(100);
-	design.hidlib.grid = PCB_MM_TO_COORD(1);
-	hle_rtree_init(&design.lines);
+	hle_design.hidlib.size_x = PCB_MM_TO_COORD(100);
+	hle_design.hidlib.size_y = PCB_MM_TO_COORD(100);
+	hle_design.hidlib.grid = PCB_MM_TO_COORD(1);
+	hle_rtree_init(&hle_design.lines);
 
 	gen_lines();
 
@@ -72,5 +72,5 @@
 		pcbhl_log_print_uninit_errs("");
 		exit(1);
 	}
-	pcb_gui->do_export(&design.hidlib, 0);
+	pcb_gui->do_export(&hle_design.hidlib, 0);
 }
Index: main.h
===================================================================
--- main.h	(revision 25585)
+++ main.h	(revision 25586)
@@ -13,8 +13,8 @@
 typedef struct {
 	pcb_hidlib_t hidlib;
 	hle_rtree_t lines;
-} design_t;
+} hle_design_t;
 
-extern design_t design;
+extern hle_design_t hle_design;
 
 #endif