Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 4764)
+++ trunk/src/crosshair.c	(revision 4765)
@@ -706,7 +706,7 @@
  * endpoints.
  */
 struct onpoint_search_info {
-	CrosshairType *crosshair;
+	pcb_crosshair_t *crosshair;
 	Coord X;
 	Coord Y;
 };
@@ -714,7 +714,7 @@
 static r_dir_t onpoint_line_callback(const pcb_box_t * box, void *cl)
 {
 	struct onpoint_search_info *info = (struct onpoint_search_info *) cl;
-	CrosshairType *crosshair = info->crosshair;
+	pcb_crosshair_t *crosshair = info->crosshair;
 	pcb_line_t *line = (pcb_line_t *) box;
 
 #ifdef DEBUG_ONPOINT
@@ -740,7 +740,7 @@
 static r_dir_t onpoint_arc_callback(const pcb_box_t * box, void *cl)
 {
 	struct onpoint_search_info *info = (struct onpoint_search_info *) cl;
-	CrosshairType *crosshair = info->crosshair;
+	pcb_crosshair_t *crosshair = info->crosshair;
 	ArcType *arc = (ArcType *) box;
 	Coord p1x, p1y, p2x, p2y;
 
@@ -810,7 +810,7 @@
  * at the given coordinates and adds them to the crosshair's
  * object list along with their respective type.
  */
-static void onpoint_work(CrosshairType * crosshair, Coord X, Coord Y)
+static void onpoint_work(pcb_crosshair_t * crosshair, Coord X, Coord Y)
 {
 	pcb_box_t SearchBox = point_box(X, Y);
 	struct onpoint_search_info info;
@@ -874,13 +874,13 @@
 	return x * x;
 }
 
-static double crosshair_sq_dist(CrosshairType * crosshair, Coord x, Coord y)
+static double crosshair_sq_dist(pcb_crosshair_t * crosshair, Coord x, Coord y)
 {
 	return square(x - crosshair->X) + square(y - crosshair->Y);
 }
 
 struct snap_data {
-	CrosshairType *crosshair;
+	pcb_crosshair_t *crosshair;
 	double nearest_sq_dist;
 	pcb_bool nearest_is_grid;
 	Coord x, y;
Index: trunk/src/crosshair.h
===================================================================
--- trunk/src/crosshair.h	(revision 4764)
+++ trunk/src/crosshair.h	(revision 4765)
@@ -41,7 +41,7 @@
 	  Point2;
 	long int State;
 	pcb_bool otherway;
-} AttachedBoxType;
+} pcb_attached_box_t;
 
 typedef struct {								/* currently attached object */
 	Coord X, Y;										/* saved position when PCB_MODE_MOVE */
@@ -54,12 +54,12 @@
 	pcb_cardinal_t RubberbandN,					/* number of lines in array */
 	  RubberbandMax;
 	RubberbandTypePtr Rubberband;
-} AttachedObjectType, *AttachedObjectTypePtr;
+} pcb_attached_object_t;
 
 typedef struct {
 	pcb_bool status;
 	Coord X, Y;
-} MarkType, *MarkTypePtr;
+} pcb_mark_t;
 
 enum crosshair_shape {
 	Basic_Crosshair_Shape = 0,		/*  4-ray */
@@ -75,9 +75,9 @@
 	  MinX, MinY,									/* lowest and highest coordinates */
 	  MaxX, MaxY;
 	AttachedLineType AttachedLine;	/* data of new lines... */
-	AttachedBoxType AttachedBox;
+	pcb_attached_box_t AttachedBox;
 	PolygonType AttachedPolygon;
-	AttachedObjectType AttachedObject;	/* data of attached objects */
+	pcb_attached_object_t AttachedObject;	/* data of attached objects */
 	enum crosshair_shape shape;		/* shape of crosshair */
 	vtop_t onpoint_objs;
 	vtop_t old_onpoint_objs;
@@ -86,7 +86,7 @@
 	long int *drags;
 	int drags_len, drags_current;
 	Coord dragx, dragy;						/* the point where drag started */
-} CrosshairType, *CrosshairTypePtr;
+} pcb_crosshair_t;
 
 
 /* ---------------------------------------------------------------------------
Index: trunk/src/data.c
===================================================================
--- trunk/src/data.c	(revision 4764)
+++ trunk/src/data.c	(revision 4765)
@@ -38,8 +38,8 @@
  * some shared identifiers
  */
 
-CrosshairType Crosshair;				/* information about cursor settings */
-MarkType Marked;								/* a cross-hair mark */
+pcb_crosshair_t Crosshair;				/* information about cursor settings */
+pcb_mark_t Marked;								/* a cross-hair mark */
 
 int LayerStack[MAX_LAYER];			/* determines the layer draw order */
 
Index: trunk/src/data.h
===================================================================
--- trunk/src/data.h	(revision 4764)
+++ trunk/src/data.h	(revision 4765)
@@ -56,9 +56,9 @@
 /* ---------------------------------------------------------------------------
  * some shared identifiers
  */
-extern CrosshairType Crosshair;
+extern pcb_crosshair_t Crosshair;
 
-extern MarkType Marked;
+extern pcb_mark_t Marked;
 
 #define max_group (PCB->Data->LayerN)
 #define max_copper_layer (PCB->Data->LayerN)
Index: trunk/src/set.c
===================================================================
--- trunk/src/set.c	(revision 4764)
+++ trunk/src/set.c	(revision 4765)
@@ -253,7 +253,7 @@
 
 void SetLocalRef(Coord X, Coord Y, pcb_bool Showing)
 {
-	static MarkType old;
+	static pcb_mark_t old;
 	static int count = 0;
 
 	if (Showing) {
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 4764)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 4765)
@@ -2444,10 +2444,10 @@
 
 	{
 		static int c_x = -2, c_y = -2;
-		static MarkType saved_mark;
+		static pcb_mark_t saved_mark;
 		static const Unit *old_grid_unit = NULL;
 		if (crosshair_x != c_x || crosshair_y != c_y
-				|| conf_core.editor.grid_unit != old_grid_unit || memcmp(&saved_mark, &Marked, sizeof(MarkType))) {
+				|| conf_core.editor.grid_unit != old_grid_unit || memcmp(&saved_mark, &Marked, sizeof(pcb_mark_t))) {
 			static int last_state = 0;
 			static int this_state = 0;
 
@@ -2475,7 +2475,7 @@
 				}
 				last_state = this_state + 100;
 			}
-			memcpy(&saved_mark, &Marked, sizeof(MarkType));
+			memcpy(&saved_mark, &Marked, sizeof(pcb_mark_t));
 
 			if (old_grid_unit != conf_core.editor.grid_unit) {
 				old_grid_unit = conf_core.editor.grid_unit;