Index: trunk/src/crosshair.h
===================================================================
--- trunk/src/crosshair.h	(revision 4818)
+++ trunk/src/crosshair.h	(revision 4819)
@@ -61,7 +61,7 @@
 	pcb_coord_t X, Y;
 } pcb_mark_t;
 
-enum crosshair_shape {
+enum pcb_crosshair_shape_e {
 	Basic_Crosshair_Shape = 0,		/*  4-ray */
 	Union_Jack_Crosshair_Shape,		/*  8-ray */
 	Dozen_Crosshair_Shape,				/* 12-ray */
@@ -78,7 +78,7 @@
 	pcb_attached_box_t AttachedBox;
 	pcb_polygon_t AttachedPolygon;
 	pcb_attached_object_t AttachedObject;	/* data of attached objects */
-	enum crosshair_shape shape;		/* shape of crosshair */
+	enum pcb_crosshair_shape_e shape;		/* shape of crosshair */
 	vtop_t onpoint_objs;
 	vtop_t old_onpoint_objs;
 
Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 4818)
+++ trunk/src/gui_act.c	(revision 4819)
@@ -192,7 +192,7 @@
 
 %end-doc */
 
-static enum crosshair_shape CrosshairShapeIncrement(enum crosshair_shape shape)
+static enum pcb_crosshair_shape_e CrosshairShapeIncrement(enum pcb_crosshair_shape_e shape)
 {
 	switch (shape) {
 	case Basic_Crosshair_Shape:
Index: trunk/src_plugins/hid_gtk/gtkhid-gdk.c
===================================================================
--- trunk/src_plugins/hid_gtk/gtkhid-gdk.c	(revision 4818)
+++ trunk/src_plugins/hid_gtk/gtkhid-gdk.c	(revision 4819)
@@ -1016,7 +1016,7 @@
 
 static void draw_crosshair(GdkGC * xor_gc, gint x, gint y)
 {
-	static enum crosshair_shape prev = Basic_Crosshair_Shape;
+	static enum pcb_crosshair_shape_e prev = Basic_Crosshair_Shape;
 
 	draw_right_cross(xor_gc, x, y);
 	if (prev == Union_Jack_Crosshair_Shape)
Index: trunk/src_plugins/hid_gtk/gtkhid-gl.c
===================================================================
--- trunk/src_plugins/hid_gtk/gtkhid-gl.c	(revision 4818)
+++ trunk/src_plugins/hid_gtk/gtkhid-gl.c	(revision 4819)
@@ -659,7 +659,7 @@
 
 static void draw_crosshair(gint x, gint y, gint z)
 {
-	static enum crosshair_shape prev = Basic_Crosshair_Shape;
+	static enum pcb_crosshair_shape_e prev = Basic_Crosshair_Shape;
 
 	draw_right_cross(x, y, z);
 	if (prev == Union_Jack_Crosshair_Shape)