Index: trunk/src/action_helper.c
===================================================================
--- trunk/src/action_helper.c	(revision 4803)
+++ trunk/src/action_helper.c	(revision 4804)
@@ -1130,7 +1130,7 @@
 				break;
 			}
 			if (type == PCB_TYPE_ELEMENT) {
-				RubberbandTypePtr ptr;
+				pcb_rubberband_t *ptr;
 				int i;
 
 				Crosshair.AttachedObject.RubberbandN = 0;
Index: trunk/src/board.c
===================================================================
--- trunk/src/board.c	(revision 4803)
+++ trunk/src/board.c	(revision 4804)
@@ -192,7 +192,7 @@
 	int nunplated;
 } HoleCountStruct;
 
-static r_dir_t hole_counting_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t hole_counting_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pin_t *pin = (pcb_pin_t *) b;
 	HoleCountStruct *hcs = (HoleCountStruct *) cl;
Index: trunk/src/change_act.c
===================================================================
--- trunk/src/change_act.c	(revision 4803)
+++ trunk/src/change_act.c	(revision 4804)
@@ -668,7 +668,7 @@
 					if (QueryInputAndChangeObjectName(type, ptr1, ptr2, ptr3, pinnum)) {
 						SetChangedFlag(pcb_true);
 						if (type == PCB_TYPE_ELEMENT) {
-							RubberbandTypePtr ptr;
+							pcb_rubberband_t *ptr;
 							int i;
 
 							RestoreUndoSerialNumber();
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 4803)
+++ trunk/src/crosshair.c	(revision 4804)
@@ -356,7 +356,7 @@
  */
 static void XORDrawMoveOrCopyObject(void)
 {
-	RubberbandTypePtr ptr;
+	pcb_rubberband_t *ptr;
 	pcb_cardinal_t i;
 	Coord dx = Crosshair.X - Crosshair.AttachedObject.X, dy = Crosshair.Y - Crosshair.AttachedObject.Y;
 
@@ -711,7 +711,7 @@
 	Coord Y;
 };
 
-static r_dir_t onpoint_line_callback(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t onpoint_line_callback(const pcb_box_t * box, void *cl)
 {
 	struct onpoint_search_info *info = (struct onpoint_search_info *) cl;
 	pcb_crosshair_t *crosshair = info->crosshair;
@@ -737,7 +737,7 @@
 
 #define close_enough(v1, v2) (coord_abs((v1)-(v2)) < 10)
 
-static r_dir_t onpoint_arc_callback(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t onpoint_arc_callback(const pcb_box_t * box, void *cl)
 {
 	struct onpoint_search_info *info = (struct onpoint_search_info *) cl;
 	pcb_crosshair_t *crosshair = info->crosshair;
Index: trunk/src/crosshair.h
===================================================================
--- trunk/src/crosshair.h	(revision 4803)
+++ trunk/src/crosshair.h	(revision 4804)
@@ -53,7 +53,7 @@
 	 *Ptr3;
 	pcb_cardinal_t RubberbandN,					/* number of lines in array */
 	  RubberbandMax;
-	RubberbandTypePtr Rubberband;
+	pcb_rubberband_t *Rubberband;
 } pcb_attached_object_t;
 
 typedef struct {
Index: trunk/src/find_drc.c
===================================================================
--- trunk/src/find_drc.c	(revision 4803)
+++ trunk/src/find_drc.c	(revision 4804)
@@ -223,7 +223,7 @@
 }
 
 /* DRC clearance callback */
-static r_dir_t drc_callback(pcb_data_t *data, pcb_layer_t *layer, pcb_polygon_t *polygon, int type, void *ptr1, void *ptr2)
+static pcb_r_dir_t drc_callback(pcb_data_t *data, pcb_layer_t *layer, pcb_polygon_t *polygon, int type, void *ptr1, void *ptr2)
 {
 	const char *message;
 	Coord x, y;
Index: trunk/src/find_lookup.c
===================================================================
--- trunk/src/find_lookup.c	(revision 4803)
+++ trunk/src/find_lookup.c	(revision 4804)
@@ -28,10 +28,10 @@
 #include "compat_nls.h"
 #include "board.h"
 
-static inline r_dir_t r_search_pt(pcb_rtree_t * rtree, const pcb_point_t * pt,
+static inline pcb_r_dir_t r_search_pt(pcb_rtree_t * rtree, const pcb_point_t * pt,
 															int radius,
-															r_dir_t (*region_in_search) (const pcb_box_t * region, void *cl),
-															r_dir_t (*rectangle_in_region) (const pcb_box_t * box, void *cl), void *closure,
+															pcb_r_dir_t (*region_in_search) (const pcb_box_t * region, void *cl),
+															pcb_r_dir_t (*rectangle_in_region) (const pcb_box_t * box, void *cl), void *closure,
 															int *num_found)
 {
 	pcb_box_t box;
@@ -292,7 +292,7 @@
 	jmp_buf env;
 };
 
-static r_dir_t LOCtoPVline_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoPVline_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_line_t *line = (pcb_line_t *) b;
 	struct pv_info *i = (struct pv_info *) cl;
@@ -304,7 +304,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t LOCtoPVarc_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoPVarc_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_arc_t *arc = (pcb_arc_t *) b;
 	struct pv_info *i = (struct pv_info *) cl;
@@ -316,7 +316,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t LOCtoPVpad_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoPVpad_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pad_t *pad = (pcb_pad_t *) b;
 	struct pv_info *i = (struct pv_info *) cl;
@@ -328,7 +328,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t LOCtoPVrat_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoPVrat_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_rat_t *rat = (pcb_rat_t *) b;
 	struct pv_info *i = (struct pv_info *) cl;
@@ -338,7 +338,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t LOCtoPVpoly_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoPVpoly_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_polygon_t *polygon = (pcb_polygon_t *) b;
 	struct pv_info *i = (struct pv_info *) cl;
@@ -529,7 +529,7 @@
 	return (pcb_false);
 }
 
-static r_dir_t pv_pv_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t pv_pv_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pin_t *pin = (pcb_pin_t *) b;
 	struct pv_info *i = (struct pv_info *) cl;
@@ -608,7 +608,7 @@
 	jmp_buf env;
 };
 
-static r_dir_t pv_line_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t pv_line_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pin_t *pv = (pcb_pin_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -625,7 +625,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t pv_pad_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t pv_pad_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pin_t *pv = (pcb_pin_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -642,7 +642,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t pv_arc_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t pv_arc_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pin_t *pv = (pcb_pin_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -659,7 +659,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t pv_poly_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t pv_poly_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pin_t *pv = (pcb_pin_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -691,7 +691,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t pv_rat_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t pv_rat_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pin_t *pv = (pcb_pin_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -815,7 +815,7 @@
 	return (pcb_false);
 }
 
-r_dir_t pv_touch_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t pv_touch_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pin_t *pin = (pcb_pin_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -825,7 +825,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t LOCtoArcLine_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoArcLine_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_line_t *line = (pcb_line_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -837,7 +837,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t LOCtoArcArc_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoArcArc_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_arc_t *arc = (pcb_arc_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -851,7 +851,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t LOCtoArcPad_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoArcPad_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pad_t *pad = (pcb_pad_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -917,7 +917,7 @@
 	return (pcb_false);
 }
 
-static r_dir_t LOCtoLineLine_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoLineLine_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_line_t *line = (pcb_line_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -929,7 +929,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t LOCtoLineArc_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoLineArc_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_arc_t *arc = (pcb_arc_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -943,7 +943,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t LOCtoLineRat_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoLineRat_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_rat_t *rat = (pcb_rat_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -963,7 +963,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t LOCtoLinePad_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoLinePad_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pad_t *pad = (pcb_pad_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -1045,7 +1045,7 @@
 	jmp_buf env;
 };
 
-static r_dir_t LOCtoRat_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoRat_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_line_t *line = (pcb_line_t *) b;
 	struct rat_info *i = (struct rat_info *) cl;
@@ -1059,7 +1059,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t PolygonToRat_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t PolygonToRat_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_polygon_t *polygon = (pcb_polygon_t *) b;
 	struct rat_info *i = (struct rat_info *) cl;
@@ -1073,7 +1073,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t LOCtoPad_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoPad_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pad_t *pad = (pcb_pad_t *) b;
 	struct rat_info *i = (struct rat_info *) cl;
@@ -1133,7 +1133,7 @@
 	return (pcb_false);
 }
 
-static r_dir_t LOCtoPadLine_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoPadLine_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_line_t *line = (pcb_line_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -1145,7 +1145,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t LOCtoPadArc_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoPadArc_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_arc_t *arc = (pcb_arc_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -1159,7 +1159,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t LOCtoPadPoly_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoPadPoly_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_polygon_t *polygon = (pcb_polygon_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -1172,7 +1172,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t LOCtoPadRat_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoPadRat_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_rat_t *rat = (pcb_rat_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -1198,7 +1198,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t LOCtoPadPad_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoPadPad_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pad_t *pad = (pcb_pad_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -1309,7 +1309,7 @@
 	return retv;
 }
 
-static r_dir_t LOCtoPolyLine_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoPolyLine_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_line_t *line = (pcb_line_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -1321,7 +1321,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t LOCtoPolyArc_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoPolyArc_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_arc_t *arc = (pcb_arc_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -1335,7 +1335,7 @@
 	return 0;
 }
 
-static r_dir_t LOCtoPolyPad_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoPolyPad_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pad_t *pad = (pcb_pad_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
@@ -1348,7 +1348,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t LOCtoPolyRat_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t LOCtoPolyRat_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_rat_t *rat = (pcb_rat_t *) b;
 	struct lo_info *i = (struct lo_info *) cl;
Index: trunk/src/move.c
===================================================================
--- trunk/src/move.c	(revision 4803)
+++ trunk/src/move.c	(revision 4804)
@@ -86,7 +86,7 @@
  */
 void *MoveObjectAndRubberband(int Type, void *Ptr1, void *Ptr2, void *Ptr3, Coord DX, Coord DY)
 {
-	RubberbandTypePtr ptr;
+	pcb_rubberband_t *ptr;
 	pcb_opctx_t ctx;
 	void *ptr2;
 
Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 4803)
+++ trunk/src/obj_arc.c	(revision 4804)
@@ -592,7 +592,7 @@
 	_draw_arc(arc);
 }
 
-r_dir_t draw_arc_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t draw_arc_callback(const pcb_box_t * b, void *cl)
 {
 	draw_arc((pcb_layer_t *) cl, (pcb_arc_t *) b);
 	return R_DIR_FOUND_CONTINUE;
Index: trunk/src/obj_arc_draw.h
===================================================================
--- trunk/src/obj_arc_draw.h	(revision 4803)
+++ trunk/src/obj_arc_draw.h	(revision 4804)
@@ -28,7 +28,7 @@
 
 /* Include rtree.h for this */
 #ifdef PCB_RTREE_H
-r_dir_t draw_arc_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t draw_arc_callback(const pcb_box_t * b, void *cl);
 #endif
 
 void _draw_arc(pcb_arc_t * arc);
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 4803)
+++ trunk/src/obj_elem.c	(revision 4804)
@@ -1680,7 +1680,7 @@
 
 }
 
-r_dir_t draw_element_name_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t draw_element_name_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_text_t *text = (pcb_text_t *) b;
 	pcb_element_t *element = (pcb_element_t *) text->Element;
@@ -1742,7 +1742,7 @@
 	draw_element_pins_and_pads(element);
 }
 
-r_dir_t draw_element_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t draw_element_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_element_t *element = (pcb_element_t *) b;
 	int *side = cl;
@@ -1790,7 +1790,7 @@
 	}
 }
 
-r_dir_t draw_element_mark_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t draw_element_mark_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_element_t *element = (pcb_element_t *) b;
 
Index: trunk/src/obj_elem_draw.h
===================================================================
--- trunk/src/obj_elem_draw.h	(revision 4803)
+++ trunk/src/obj_elem_draw.h	(revision 4804)
@@ -28,9 +28,9 @@
 
 /* Include rtree.h for these */
 #ifdef PCB_RTREE_H
-r_dir_t draw_element_name_callback(const pcb_box_t * b, void *cl);
-r_dir_t draw_element_mark_callback(const pcb_box_t * b, void *cl);
-r_dir_t draw_element_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t draw_element_name_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t draw_element_mark_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t draw_element_callback(const pcb_box_t * b, void *cl);
 #endif
 
 void draw_element_package(pcb_element_t * element);
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 4803)
+++ trunk/src/obj_line.c	(revision 4804)
@@ -78,7 +78,7 @@
 	jmp_buf env;
 };
 
-static r_dir_t line_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t line_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_line_t *line = (pcb_line_t *) b;
 	struct line_info *i = (struct line_info *) cl;
@@ -463,7 +463,7 @@
 	jmp_buf env;
 };
 
-static r_dir_t moveline_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t moveline_callback(const pcb_box_t * b, void *cl)
 {
 	struct via_info *i = (struct via_info *) cl;
 	pcb_pin_t *via;
@@ -553,7 +553,7 @@
 	pcb_line_t *line;
 	pcb_point_t *point;
 };
-static r_dir_t remove_point(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t remove_point(const pcb_box_t * b, void *cl)
 {
 	pcb_line_t *line = (pcb_line_t *) b;
 	struct rlp_info *info = (struct rlp_info *) cl;
@@ -741,7 +741,7 @@
 	_draw_line(line);
 }
 
-r_dir_t draw_line_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t draw_line_callback(const pcb_box_t * b, void *cl)
 {
 	draw_line((pcb_layer_t *) cl, (pcb_line_t *) b);
 	return R_DIR_FOUND_CONTINUE;
Index: trunk/src/obj_line_draw.h
===================================================================
--- trunk/src/obj_line_draw.h	(revision 4803)
+++ trunk/src/obj_line_draw.h	(revision 4804)
@@ -28,7 +28,7 @@
 
 /* Include rtree.h for this */
 #ifdef PCB_RTREE_H
-r_dir_t draw_line_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t draw_line_callback(const pcb_box_t * b, void *cl);
 #endif
 
 void _draw_line(pcb_line_t * line);
Index: trunk/src/obj_line_drcenf.c
===================================================================
--- trunk/src/obj_line_drcenf.c	(revision 4803)
+++ trunk/src/obj_line_drcenf.c	(revision 4804)
@@ -199,7 +199,7 @@
 	jmp_buf env;
 };
 
-static r_dir_t drcVia_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t drcVia_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pin_t *via = (pcb_pin_t *) b;
 	struct drc_info *i = (struct drc_info *) cl;
@@ -209,7 +209,7 @@
 	return R_DIR_FOUND_CONTINUE;
 }
 
-static r_dir_t drcPad_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t drcPad_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pad_t *pad = (pcb_pad_t *) b;
 	struct drc_info *i = (struct drc_info *) cl;
@@ -219,7 +219,7 @@
 	return R_DIR_FOUND_CONTINUE;
 }
 
-static r_dir_t drcLine_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t drcLine_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_line_t *line = (pcb_line_t *) b;
 	struct drc_info *i = (struct drc_info *) cl;
@@ -229,7 +229,7 @@
 	return R_DIR_FOUND_CONTINUE;
 }
 
-static r_dir_t drcArc_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t drcArc_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_arc_t *arc = (pcb_arc_t *) b;
 	struct drc_info *i = (struct drc_info *) cl;
Index: trunk/src/obj_pad.c
===================================================================
--- trunk/src/obj_pad.c	(revision 4803)
+++ trunk/src/obj_pad.c	(revision 4804)
@@ -389,7 +389,7 @@
 		draw_pad_name(pad);
 }
 
-r_dir_t draw_pad_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t draw_pad_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pad_t *pad = (pcb_pad_t *) b;
 	int *side = cl;
@@ -399,7 +399,7 @@
 	return R_DIR_FOUND_CONTINUE;
 }
 
-r_dir_t clear_pad_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t clear_pad_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pad_t *pad = (pcb_pad_t *) b;
 	int *side = cl;
Index: trunk/src/obj_pad_draw.h
===================================================================
--- trunk/src/obj_pad_draw.h	(revision 4803)
+++ trunk/src/obj_pad_draw.h	(revision 4804)
@@ -29,8 +29,8 @@
 
 /* Include rtree.h for these */
 #ifdef PCB_RTREE_H
-r_dir_t draw_pad_callback(const pcb_box_t * b, void *cl);
-r_dir_t clear_pad_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t draw_pad_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t clear_pad_callback(const pcb_box_t * b, void *cl);
 #endif
 
 void draw_pad(pcb_pad_t * pad);
Index: trunk/src/obj_pinvia.c
===================================================================
--- trunk/src/obj_pinvia.c	(revision 4803)
+++ trunk/src/obj_pinvia.c	(revision 4804)
@@ -864,13 +864,13 @@
 	_draw_pv(pin, draw_hole);
 }
 
-r_dir_t draw_pin_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t draw_pin_callback(const pcb_box_t * b, void *cl)
 {
 	draw_pin((pcb_pin_t *) b, pcb_false);
 	return R_DIR_FOUND_CONTINUE;
 }
 
-r_dir_t clear_pin_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t clear_pin_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pin_t *pin = (pcb_pin_t *) b;
 	if (conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly)
@@ -887,13 +887,13 @@
 	_draw_pv(via, draw_hole);
 }
 
-r_dir_t draw_via_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t draw_via_callback(const pcb_box_t * b, void *cl)
 {
 	draw_via((pcb_pin_t *) b, pcb_false);
 	return R_DIR_FOUND_CONTINUE;
 }
 
-r_dir_t draw_hole_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t draw_hole_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pin_t *pv = (pcb_pin_t *) b;
 	int plated = cl ? *(int *) cl : -1;
Index: trunk/src/obj_pinvia_draw.h
===================================================================
--- trunk/src/obj_pinvia_draw.h	(revision 4803)
+++ trunk/src/obj_pinvia_draw.h	(revision 4804)
@@ -28,10 +28,10 @@
 
 /* Include rtree.h for these */
 #ifdef PCB_RTREE_H
-r_dir_t draw_pin_callback(const pcb_box_t * b, void *cl);
-r_dir_t clear_pin_callback(const pcb_box_t * b, void *cl);
-r_dir_t draw_via_callback(const pcb_box_t * b, void *cl);
-r_dir_t draw_hole_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t draw_pin_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t clear_pin_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t draw_via_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t draw_hole_callback(const pcb_box_t * b, void *cl);
 #endif
 
 
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 4803)
+++ trunk/src/obj_poly.c	(revision 4804)
@@ -407,7 +407,7 @@
 	pcb_polygon_t *polygon;
 } mptlc;
 
-r_dir_t mptl_pin_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t mptl_pin_callback(const pcb_box_t * b, void *cl)
 {
 	struct mptlc *d = (struct mptlc *) cl;
 	pcb_pin_t *pin = (pcb_pin_t *) b;
@@ -634,7 +634,7 @@
 }
 
 /*** draw ***/
-r_dir_t draw_poly_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t draw_poly_callback(const pcb_box_t * b, void *cl)
 {
 	struct pcb_draw_poly_info_s *i = cl;
 	pcb_polygon_t *polygon = (pcb_polygon_t *) b;
Index: trunk/src/obj_poly_draw.h
===================================================================
--- trunk/src/obj_poly_draw.h	(revision 4803)
+++ trunk/src/obj_poly_draw.h	(revision 4804)
@@ -32,7 +32,7 @@
 	const pcb_box_t *drawn_area;
 	pcb_layer_t *layer;
 };
-r_dir_t draw_poly_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t draw_poly_callback(const pcb_box_t * b, void *cl);
 #endif
 
 void ErasePolygon(pcb_polygon_t *Polygon);
Index: trunk/src/obj_rat.c
===================================================================
--- trunk/src/obj_rat.c	(revision 4803)
+++ trunk/src/obj_rat.c	(revision 4804)
@@ -220,7 +220,7 @@
 }
 
 /*** draw ***/
-r_dir_t draw_rat_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t draw_rat_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_rat_t *rat = (pcb_rat_t *) b;
 
Index: trunk/src/obj_rat_draw.h
===================================================================
--- trunk/src/obj_rat_draw.h	(revision 4803)
+++ trunk/src/obj_rat_draw.h	(revision 4804)
@@ -28,7 +28,7 @@
 
 /* Include rtree.h for these */
 #ifdef PCB_RTREE_H
-r_dir_t draw_rat_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t draw_rat_callback(const pcb_box_t * b, void *cl);
 #endif
 
 void EraseRat(pcb_rat_t *Rat);
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 4803)
+++ trunk/src/obj_text.c	(revision 4804)
@@ -541,7 +541,7 @@
 }
 
 
-r_dir_t draw_text_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t draw_text_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_layer_t *layer = cl;
 	pcb_text_t *text = (pcb_text_t *) b;
Index: trunk/src/obj_text_draw.h
===================================================================
--- trunk/src/obj_text_draw.h	(revision 4803)
+++ trunk/src/obj_text_draw.h	(revision 4804)
@@ -29,7 +29,7 @@
 
 /* Include rtree.h for these */
 #ifdef PCB_RTREE_H
-r_dir_t draw_text_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t draw_text_callback(const pcb_box_t * b, void *cl);
 #endif
 
 void DrawTextLowLevel(pcb_text_t *Text, Coord min_line_width);
Index: trunk/src/polygon.c
===================================================================
--- trunk/src/polygon.c	(revision 4803)
+++ trunk/src/polygon.c	(revision 4804)
@@ -867,7 +867,7 @@
 	info->batch_size = 0;
 }
 
-static r_dir_t pin_sub_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t pin_sub_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pin_t *pin = (pcb_pin_t *) b;
 	struct cpInfo *info = (struct cpInfo *) cl;
@@ -906,7 +906,7 @@
 	return R_DIR_FOUND_CONTINUE;
 }
 
-static r_dir_t arc_sub_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t arc_sub_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_arc_t *arc = (pcb_arc_t *) b;
 	struct cpInfo *info = (struct cpInfo *) cl;
@@ -923,7 +923,7 @@
 	return R_DIR_FOUND_CONTINUE;
 }
 
-static r_dir_t pad_sub_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t pad_sub_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pad_t *pad = (pcb_pad_t *) b;
 	struct cpInfo *info = (struct cpInfo *) cl;
@@ -943,7 +943,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t line_sub_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t line_sub_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_line_t *line = (pcb_line_t *) b;
 	struct cpInfo *info = (struct cpInfo *) cl;
@@ -971,7 +971,7 @@
 	return R_DIR_FOUND_CONTINUE;
 }
 
-static r_dir_t text_sub_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t text_sub_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_text_t *text = (pcb_text_t *) b;
 	struct cpInfo *info = (struct cpInfo *) cl;
@@ -1390,10 +1390,10 @@
 	void *ptr1, *ptr2;
 	pcb_layer_t *layer;
 	pcb_data_t *data;
-	r_dir_t (*callback) (pcb_data_t *, pcb_layer_t *, pcb_polygon_t *, int, void *, void *);
+	pcb_r_dir_t (*callback) (pcb_data_t *, pcb_layer_t *, pcb_polygon_t *, int, void *, void *);
 };
 
-static r_dir_t subtract_plow(pcb_data_t *Data, pcb_layer_t *Layer, pcb_polygon_t *Polygon, int type, void *ptr1, void *ptr2)
+static pcb_r_dir_t subtract_plow(pcb_data_t *Data, pcb_layer_t *Layer, pcb_polygon_t *Polygon, int type, void *ptr1, void *ptr2)
 {
 	if (!Polygon->Clipped)
 		return 0;
@@ -1423,7 +1423,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t add_plow(pcb_data_t *Data, pcb_layer_t *Layer, pcb_polygon_t *Polygon, int type, void *ptr1, void *ptr2)
+static pcb_r_dir_t add_plow(pcb_data_t *Data, pcb_layer_t *Layer, pcb_polygon_t *Polygon, int type, void *ptr1, void *ptr2)
 {
 	switch (type) {
 	case PCB_TYPE_PIN:
@@ -1446,7 +1446,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t plow_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t plow_callback(const pcb_box_t * b, void *cl)
 {
 	struct plow_info *plow = (struct plow_info *) cl;
 	pcb_polygon_t *polygon = (pcb_polygon_t *) b;
@@ -1458,7 +1458,7 @@
 
 int
 PlowsPolygon(pcb_data_t * Data, int type, void *ptr1, void *ptr2,
-						 r_dir_t (*call_back) (pcb_data_t *data, pcb_layer_t *lay, pcb_polygon_t *poly, int type, void *ptr1, void *ptr2))
+						 pcb_r_dir_t (*call_back) (pcb_data_t *data, pcb_layer_t *lay, pcb_polygon_t *poly, int type, void *ptr1, void *ptr2))
 {
 	pcb_box_t sb = ((pcb_pin_t *) ptr2)->BoundingBox;
 	int r = 0, seen;
Index: trunk/src/polygon.h
===================================================================
--- trunk/src/polygon.h	(revision 4803)
+++ trunk/src/polygon.h	(revision 4804)
@@ -63,7 +63,7 @@
 void CopyAttachedPolygonToLayer(void);
 int PolygonHoles(pcb_polygon_t * ptr, const pcb_box_t * range, int (*callback) (pcb_pline_t *, void *user_data), void *user_data);
 int PlowsPolygon(pcb_data_t *, int, void *, void *,
-								 r_dir_t (*callback) (pcb_data_t *, pcb_layer_t *, pcb_polygon_t *, int, void *, void *));
+								 pcb_r_dir_t (*callback) (pcb_data_t *, pcb_layer_t *, pcb_polygon_t *, int, void *, void *));
 void ComputeNoHoles(pcb_polygon_t * poly);
 pcb_polyarea_t *ContourToPoly(pcb_pline_t *);
 pcb_polyarea_t *PolygonToPoly(pcb_polygon_t *);
Index: trunk/src/polygon1.c
===================================================================
--- trunk/src/polygon1.c	(revision 4803)
+++ trunk/src/polygon1.c	(revision 4804)
@@ -535,7 +535,7 @@
  * (C) 2006, harry eaton
  * This prunes the search for boxes that don't intersect the segment.
  */
-static r_dir_t seg_in_region(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t seg_in_region(const pcb_box_t * b, void *cl)
 {
 	struct info *i = (struct info *) cl;
 	double y1, y2;
@@ -572,7 +572,7 @@
  * problem. There are efficient algorithms for finding intersections with snap
  * rounding, but I don't have time to implement them right now.
  */
-static r_dir_t seg_in_seg(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t seg_in_seg(const pcb_box_t * b, void *cl)
 {
 	struct info *i = (struct info *) cl;
 	struct seg *s = (struct seg *) b;
@@ -656,7 +656,7 @@
 	return (void *) ans;
 }
 
-static r_dir_t get_seg(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t get_seg(const pcb_box_t * b, void *cl)
 {
 	struct info *i = (struct info *) cl;
 	struct seg *s = (struct seg *) b;
@@ -685,7 +685,7 @@
  *
  */
 
-static r_dir_t contour_bounds_touch(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t contour_bounds_touch(const pcb_box_t * b, void *cl)
 {
 	contour_info *c_info = (contour_info *) cl;
 	pcb_pline_t *pa = c_info->pa;
@@ -718,7 +718,7 @@
 
 	av = &looping_over->head;
 	do {													/* Loop over the nodes in the smaller contour */
-		r_dir_t rres;
+		pcb_r_dir_t rres;
 		/* check this edge for any insertions */
 		double dx;
 		info.v = av;
@@ -887,7 +887,7 @@
 /*****************************************************************/
 /* Routines for making labels */
 
-static r_dir_t count_contours_i_am_inside(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t count_contours_i_am_inside(const pcb_box_t * b, void *cl)
 {
 	pcb_pline_t *me = (pcb_pline_t *) cl;
 	pcb_pline_t *check = (pcb_pline_t *) b;
@@ -1144,7 +1144,7 @@
 	pcb_polyarea_t *pa;
 };
 
-static r_dir_t heap_it(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t heap_it(const pcb_box_t * b, void *cl)
 {
 	heap_t *heap = (heap_t *) cl;
 	struct polyarea_info *pa_info = (struct polyarea_info *) b;
@@ -1161,7 +1161,7 @@
 	pcb_pline_t *result;
 };
 
-static r_dir_t find_inside(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t find_inside(const pcb_box_t * b, void *cl)
 {
 	struct find_inside_info *info = (struct find_inside_info *) cl;
 	pcb_pline_t *check = (pcb_pline_t *) b;
@@ -1756,7 +1756,7 @@
 	pcb_pline_t *result;
 };
 
-static r_dir_t find_inside_m_pa(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t find_inside_m_pa(const pcb_box_t * b, void *cl)
 {
 	struct find_inside_m_pa_info *info = (struct find_inside_m_pa_info *) cl;
 	pcb_pline_t *check = (pcb_pline_t *) b;
@@ -2361,7 +2361,7 @@
 	C->tree = (pcb_rtree_t *) make_edge_tree(C);
 }																/* poly_PreContour */
 
-static r_dir_t flip_cb(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t flip_cb(const pcb_box_t * b, void *cl)
 {
 	struct seg *s = (struct seg *) b;
 	s->v = s->v->prev;
@@ -2539,7 +2539,7 @@
 } pip;
 
 
-static r_dir_t crossing(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t crossing(const pcb_box_t * b, void *cl)
 {
 	struct seg *s = (struct seg *) b;
 	struct pip *p = (struct pip *) cl;
Index: trunk/src/rotate.c
===================================================================
--- trunk/src/rotate.c	(revision 4803)
+++ trunk/src/rotate.c	(revision 4804)
@@ -96,7 +96,7 @@
  */
 void *RotateObject(int Type, void *Ptr1, void *Ptr2, void *Ptr3, Coord X, Coord Y, unsigned Steps)
 {
-	RubberbandTypePtr ptr;
+	pcb_rubberband_t *ptr;
 	void *ptr2;
 	pcb_bool changed = pcb_false;
 	pcb_opctx_t ctx;
Index: trunk/src/rtree.c
===================================================================
--- trunk/src/rtree.c	(revision 4803)
+++ trunk/src/rtree.c	(revision 4804)
@@ -396,8 +396,8 @@
 }
 
 typedef struct {
-	r_dir_t (*check_it) (const pcb_box_t * region, void *cl);
-	r_dir_t (*found_it) (const pcb_box_t * box, void *cl);
+	pcb_r_dir_t (*check_it) (const pcb_box_t * region, void *cl);
+	pcb_r_dir_t (*found_it) (const pcb_box_t * box, void *cl);
 	void *closure;
 	int cancel;
 } r_arg;
@@ -408,7 +408,7 @@
  */
 int __r_search(struct rtree_node *node, const pcb_box_t * query, r_arg * arg)
 {
-	r_dir_t res;
+	pcb_r_dir_t res;
 
 	assert(node);
 	/** assert that starting_region is well formed */
@@ -497,10 +497,10 @@
  * to see whether deeper searching is desired
  * Returns how the search ended.
  */
-r_dir_t
+pcb_r_dir_t
 r_search(pcb_rtree_t * rtree, const pcb_box_t * query,
-				 r_dir_t (*check_region) (const pcb_box_t * region, void *cl),
-				 r_dir_t (*found_rectangle) (const pcb_box_t * box, void *cl), void *cl,
+				 pcb_r_dir_t (*check_region) (const pcb_box_t * region, void *cl),
+				 pcb_r_dir_t (*found_rectangle) (const pcb_box_t * box, void *cl), void *cl,
 				 int *num_found)
 {
 	r_arg arg;
@@ -546,7 +546,7 @@
 }
 
 /*------ r_region_is_empty ------*/
-static r_dir_t __r_region_is_empty_rect_in_reg(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t __r_region_is_empty_rect_in_reg(const pcb_box_t * box, void *cl)
 {
 	jmp_buf *envp = (jmp_buf *) cl;
 	longjmp(*envp, 1);						/* found one! */
Index: trunk/src/rtree.h
===================================================================
--- trunk/src/rtree.h	(revision 4803)
+++ trunk/src/rtree.h	(revision 4804)
@@ -44,11 +44,11 @@
 };
 
 /* callback direction to the search engine */
-typedef enum r_dir_e {
+typedef enum pcb_r_dir_e {
 	R_DIR_NOT_FOUND = 0,         /* object not found or not accepted */
 	R_DIR_FOUND_CONTINUE = 1,    /* object found or accepted, go on searching */
 	R_DIR_CANCEL                 /* cancel the search and return immediately */
-} r_dir_t;
+} pcb_r_dir_t;
 
 /* create an rtree from the list of boxes.  if 'manage' is pcb_true, then
  * the tree will take ownership of 'boxlist' and free it when the tree
@@ -74,9 +74,9 @@
  * abort the search if that is the desired behavior.
  */
 
-r_dir_t r_search(pcb_rtree_t * rtree, const pcb_box_t * starting_region,
-						 r_dir_t (*region_in_search) (const pcb_box_t * region, void *cl),
-						 r_dir_t (*rectangle_in_region) (const pcb_box_t * box, void *cl), void *closure,
+pcb_r_dir_t r_search(pcb_rtree_t * rtree, const pcb_box_t * starting_region,
+						 pcb_r_dir_t (*region_in_search) (const pcb_box_t * region, void *cl),
+						 pcb_r_dir_t (*rectangle_in_region) (const pcb_box_t * box, void *cl), void *closure,
 						 int *num_found);
 
 /* -- special-purpose searches build upon r_search -- */
Index: trunk/src/rubberband.c
===================================================================
--- trunk/src/rubberband.c	(revision 4803)
+++ trunk/src/rubberband.c	(revision 4804)
@@ -47,7 +47,7 @@
 static void CheckLinePointForRubberbandConnection(pcb_layer_t *, pcb_line_t *, pcb_point_t *, pcb_bool);
 static void CheckPolygonForRubberbandConnection(pcb_layer_t *, pcb_polygon_t *);
 static void CheckLinePointForRat(pcb_layer_t *, pcb_point_t *);
-static r_dir_t rubber_callback(const pcb_box_t * b, void *cl);
+static pcb_r_dir_t rubber_callback(const pcb_box_t * b, void *cl);
 
 struct rubber_info {
 	Coord radius;
@@ -57,7 +57,7 @@
 	pcb_layer_t *layer;
 };
 
-static r_dir_t rubber_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t rubber_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_line_t *line = (pcb_line_t *) b;
 	struct rubber_info *i = (struct rubber_info *) cl;
@@ -210,7 +210,7 @@
 	pcb_point_t *point;
 };
 
-static r_dir_t rat_callback(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t rat_callback(const pcb_box_t * box, void *cl)
 {
 	pcb_rat_t *rat = (pcb_rat_t *) box;
 	struct rinfo *i = (struct rinfo *) cl;
@@ -491,16 +491,16 @@
 /* ---------------------------------------------------------------------------
  * get next slot for a rubberband connection, allocates memory if necessary
  */
-RubberbandTypePtr GetRubberbandMemory(void)
+pcb_rubberband_t *GetRubberbandMemory(void)
 {
-	RubberbandTypePtr ptr = Crosshair.AttachedObject.Rubberband;
+	pcb_rubberband_t *ptr = Crosshair.AttachedObject.Rubberband;
 
 	/* realloc new memory if necessary and clear it */
 	if (Crosshair.AttachedObject.RubberbandN >= Crosshair.AttachedObject.RubberbandMax) {
 		Crosshair.AttachedObject.RubberbandMax += STEP_RUBBERBAND;
-		ptr = (RubberbandTypePtr) realloc(ptr, Crosshair.AttachedObject.RubberbandMax * sizeof(RubberbandType));
+		ptr = (pcb_rubberband_t *) realloc(ptr, Crosshair.AttachedObject.RubberbandMax * sizeof(pcb_rubberband_t));
 		Crosshair.AttachedObject.Rubberband = ptr;
-		memset(ptr + Crosshair.AttachedObject.RubberbandN, 0, STEP_RUBBERBAND * sizeof(RubberbandType));
+		memset(ptr + Crosshair.AttachedObject.RubberbandN, 0, STEP_RUBBERBAND * sizeof(pcb_rubberband_t));
 	}
 	return (ptr + Crosshair.AttachedObject.RubberbandN++);
 }
@@ -509,9 +509,9 @@
  * adds a new line to the rubberband list of 'Crosshair.AttachedObject'
  * if Layer == 0  it is a rat line
  */
-RubberbandTypePtr CreateNewRubberbandEntry(pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *MovedPoint)
+pcb_rubberband_t *CreateNewRubberbandEntry(pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *MovedPoint)
 {
-	RubberbandTypePtr ptr = GetRubberbandMemory();
+	pcb_rubberband_t *ptr = GetRubberbandMemory();
 
 	/* we toggle the PCB_FLAG_RUBBEREND of the line to determine if */
 	/* both points are being moved. */
Index: trunk/src/rubberband.h
===================================================================
--- trunk/src/rubberband.h	(revision 4803)
+++ trunk/src/rubberband.h	(revision 4804)
@@ -38,12 +38,12 @@
 	pcb_layer_t *Layer;						/* layer that holds the line */
 	pcb_line_t *Line;							/* the line itself */
 	pcb_point_t *MovedPoint;			/* and finally the point */
-} RubberbandType, *RubberbandTypePtr;
+} pcb_rubberband_t;
 
 
 void LookupRubberbandLines(int, void *, void *, void *);
 void LookupRatLines(int, void *, void *, void *);
-RubberbandTypePtr GetRubberbandMemory(void);
-RubberbandTypePtr CreateNewRubberbandEntry(pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *MovedPoint);
+pcb_rubberband_t *GetRubberbandMemory(void);
+pcb_rubberband_t *CreateNewRubberbandEntry(pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *MovedPoint);
 
 #endif
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 4803)
+++ trunk/src/search.c	(revision 4804)
@@ -76,7 +76,7 @@
 	int locked;										/* This will be zero or PCB_FLAG_LOCK */
 };
 
-static r_dir_t pinorvia_callback(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t pinorvia_callback(const pcb_box_t * box, void *cl)
 {
 	struct ans_info *i = (struct ans_info *) cl;
 	pcb_pin_t *pin = (pcb_pin_t *) box;
@@ -131,7 +131,7 @@
 	return pcb_false;
 }
 
-static r_dir_t pad_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t pad_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_pad_t *pad = (pcb_pad_t *) b;
 	struct ans_info *i = (struct ans_info *) cl;
@@ -182,7 +182,7 @@
 	int locked;
 };
 
-static r_dir_t line_callback(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t line_callback(const pcb_box_t * box, void *cl)
 {
 	struct line_info *i = (struct line_info *) cl;
 	pcb_line_t *l = (pcb_line_t *) box;
@@ -214,7 +214,7 @@
 	return pcb_false;
 }
 
-static r_dir_t rat_callback(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t rat_callback(const pcb_box_t * box, void *cl)
 {
 	pcb_line_t *line = (pcb_line_t *) box;
 	struct ans_info *i = (struct ans_info *) cl;
@@ -256,7 +256,7 @@
 	int locked;
 };
 
-static r_dir_t arc_callback(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t arc_callback(const pcb_box_t * box, void *cl)
 {
 	struct arc_info *i = (struct arc_info *) cl;
 	pcb_arc_t *a = (pcb_arc_t *) box;
@@ -286,7 +286,7 @@
 	return pcb_false;
 }
 
-static r_dir_t text_callback(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t text_callback(const pcb_box_t * box, void *cl)
 {
 	pcb_text_t *text = (pcb_text_t *) box;
 	struct ans_info *i = (struct ans_info *) cl;
@@ -318,7 +318,7 @@
 	return pcb_false;
 }
 
-static r_dir_t polygon_callback(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t polygon_callback(const pcb_box_t * box, void *cl)
 {
 	pcb_polygon_t *polygon = (pcb_polygon_t *) box;
 	struct ans_info *i = (struct ans_info *) cl;
@@ -351,11 +351,11 @@
 	return pcb_false;
 }
 
-static r_dir_t linepoint_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t linepoint_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_line_t *line = (pcb_line_t *) b;
 	struct line_info *i = (struct line_info *) cl;
-	r_dir_t ret_val = R_DIR_NOT_FOUND;
+	pcb_r_dir_t ret_val = R_DIR_NOT_FOUND;
 	double d;
 
 	if (TEST_FLAG(i->locked, line))
@@ -428,7 +428,7 @@
 	return (pcb_false);
 }
 
-static r_dir_t name_callback(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t name_callback(const pcb_box_t * box, void *cl)
 {
 	pcb_text_t *text = (pcb_text_t *) box;
 	struct ans_info *i = (struct ans_info *) cl;
@@ -474,7 +474,7 @@
 	return (pcb_false);
 }
 
-static r_dir_t element_callback(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t element_callback(const pcb_box_t * box, void *cl)
 {
 	pcb_element_t *element = (pcb_element_t *) box;
 	struct ans_info *i = (struct ans_info *) cl;
Index: trunk/src_plugins/autoplace/autoplace.c
===================================================================
--- trunk/src_plugins/autoplace/autoplace.c	(revision 4803)
+++ trunk/src_plugins/autoplace/autoplace.c	(revision 4804)
@@ -220,7 +220,7 @@
     t = (box).X1; (box).X1 =   (box).X2; (box).X2 = t;\
 }
 /* helper methods for __r_find_neighbor */
-static r_dir_t __r_find_neighbor_reg_in_sea(const pcb_box_t * region, void *cl)
+static pcb_r_dir_t __r_find_neighbor_reg_in_sea(const pcb_box_t * region, void *cl)
 {
 	struct r_neighbor_info *ni = (struct r_neighbor_info *) cl;
 	pcb_box_t query = *region;
@@ -236,7 +236,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t __r_find_neighbor_rect_in_reg(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t __r_find_neighbor_rect_in_reg(const pcb_box_t * box, void *cl)
 {
 	struct r_neighbor_info *ni = (struct r_neighbor_info *) cl;
 	pcb_box_t query = *box;
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 4803)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 4804)
@@ -778,7 +778,7 @@
 	jmp_buf env;
 };
 
-static r_dir_t __found_one_on_lg(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t __found_one_on_lg(const pcb_box_t * box, void *cl)
 {
 	struct rb_info *inf = (struct rb_info *) cl;
 	routebox_t *rb = (routebox_t *) box;
@@ -1473,7 +1473,7 @@
 	routebox_t *nearest;
 	cost_t nearest_cost;
 };
-static r_dir_t __region_within_guess(const pcb_box_t * region, void *cl)
+static pcb_r_dir_t __region_within_guess(const pcb_box_t * region, void *cl)
 {
 	struct mincost_target_closure *mtc = (struct mincost_target_closure *) cl;
 	cost_t cost_to_region;
@@ -1487,7 +1487,7 @@
 	return (cost_to_region < mtc->nearest_cost) ? R_DIR_FOUND_CONTINUE : R_DIR_NOT_FOUND;
 }
 
-static r_dir_t __found_new_guess(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t __found_new_guess(const pcb_box_t * box, void *cl)
 {
 	struct mincost_target_closure *mtc = (struct mincost_target_closure *) cl;
 	routebox_t *guess = (routebox_t *) box;
@@ -1850,7 +1850,7 @@
  * like it wouldn't be seen. We do this while keep the inflated
  * box as large as possible.
  */
-static r_dir_t __Expand_this_rect(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t __Expand_this_rect(const pcb_box_t * box, void *cl)
 {
 	struct E_result *res = (struct E_result *) cl;
 	routebox_t *rb = (routebox_t *) box;
@@ -2385,7 +2385,7 @@
 	pcb_bool ignore_source;
 };
 
-static r_dir_t __GatherBlockers(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t __GatherBlockers(const pcb_box_t * box, void *cl)
 {
 	routebox_t *rb = (routebox_t *) box;
 	struct break_info *bi = (struct break_info *) cl;
@@ -2723,7 +2723,7 @@
 	jmp_buf env;
 };
 
-static r_dir_t foib_rect_in_reg(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t foib_rect_in_reg(const pcb_box_t * box, void *cl)
 {
 	struct foib_info *foib = (struct foib_info *) cl;
 	pcb_box_t rbox;
@@ -2760,7 +2760,7 @@
 	pcb_box_t query;
 	jmp_buf env;
 };
-static r_dir_t ftherm_rect_in_reg(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t ftherm_rect_in_reg(const pcb_box_t * box, void *cl)
 {
 	routebox_t *rbox = (routebox_t *) box;
 	struct therm_info *ti = (struct therm_info *) cl;
@@ -3514,7 +3514,7 @@
 
 #endif
 
-static r_dir_t __conflict_source(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t __conflict_source(const pcb_box_t * box, void *cl)
 {
 	routebox_t *rb = (routebox_t *) box;
 	if (rb->flags.touched || rb->flags.fixed)
@@ -4052,7 +4052,7 @@
 }
 
 #ifndef NDEBUG
-r_dir_t bad_boy(const pcb_box_t * b, void *cl)
+pcb_r_dir_t bad_boy(const pcb_box_t * b, void *cl)
 {
 	routebox_t *box = (routebox_t *) b;
 	if (box->type == EXPANSION_AREA)
@@ -4091,7 +4091,7 @@
 	}
 }
 
-static r_dir_t ripout_livedraw_obj_cb(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t ripout_livedraw_obj_cb(const pcb_box_t * b, void *cl)
 {
 	routebox_t *box = (routebox_t *) b;
 	ripout_livedraw_obj(box);
@@ -4391,7 +4391,7 @@
 	jmp_buf env;
 };
 
-static r_dir_t fpin_rect(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t fpin_rect(const pcb_box_t * b, void *cl)
 {
 	pcb_pin_t *pin = (pcb_pin_t *) b;
 	struct fpin_info *info = (struct fpin_info *) cl;
Index: trunk/src_plugins/autoroute/mtspace.c
===================================================================
--- trunk/src_plugins/autoroute/mtspace.c	(revision 4803)
+++ trunk/src_plugins/autoroute/mtspace.c	(revision 4804)
@@ -125,7 +125,7 @@
 	jmp_buf env;
 };
 
-static r_dir_t mts_remove_one(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t mts_remove_one(const pcb_box_t * b, void *cl)
 {
 	struct mts_info *info = (struct mts_info *) cl;
 	mtspacebox_t *box = (mtspacebox_t *) b;
@@ -205,7 +205,7 @@
  * First check if it does intersect, then break it into
  * overlaping regions that don't intersect this box.
  */
-static r_dir_t query_one(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t query_one(const pcb_box_t * box, void *cl)
 {
 	struct query_closure *qc = (struct query_closure *) cl;
 	mtspacebox_t *mtsb = (mtspacebox_t *) box;
Index: trunk/src_plugins/gl/hidgl.c
===================================================================
--- trunk/src_plugins/gl/hidgl.c	(revision 4803)
+++ trunk/src_plugins/gl/hidgl.c	(revision 4804)
@@ -547,7 +547,7 @@
 	double scale;
 };
 
-static r_dir_t do_hole(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t do_hole(const pcb_box_t * b, void *cl)
 {
 	struct do_hole_info *info = cl;
 	pcb_pline_t *curc = (pcb_pline_t *) b;
Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c
===================================================================
--- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c	(revision 4803)
+++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c	(revision 4804)
@@ -31,7 +31,7 @@
 	}
 }
 
-static r_dir_t search_callback (const pcb_box_t * b, void *cl)
+static pcb_r_dir_t search_callback (const pcb_box_t * b, void *cl)
 {
 	search_append(cl, (void *)b);
   return R_DIR_FOUND_CONTINUE;
Index: trunk/src_plugins/jostle/jostle.c
===================================================================
--- trunk/src_plugins/jostle/jostle.c	(revision 4803)
+++ trunk/src_plugins/jostle/jostle.c	(revision 4804)
@@ -366,7 +366,7 @@
 /*!
  * Process lines that intersect our 'brush'.
  */
-static r_dir_t jostle_callback(const pcb_box_t * targ, void *private)
+static pcb_r_dir_t jostle_callback(const pcb_box_t * targ, void *private)
 {
 	pcb_line_t *line = (pcb_line_t *) targ;
 	struct info *info = private;
Index: trunk/src_plugins/puller/puller.c
===================================================================
--- trunk/src_plugins/puller/puller.c	(revision 4803)
+++ trunk/src_plugins/puller/puller.c	(revision 4804)
@@ -274,7 +274,7 @@
 /*                                                                           */
 /*****************************************************************************/
 
-static r_dir_t line_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t line_callback(const pcb_box_t * b, void *cl)
 {
 	/* pcb_layer_t *layer = (pcb_layer_t *)cl; */
 	pcb_line_t *l = (pcb_line_t *) b;
@@ -300,7 +300,7 @@
 	return R_DIR_FOUND_CONTINUE;
 }
 
-static r_dir_t arc_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t arc_callback(const pcb_box_t * b, void *cl)
 {
 	/* pcb_layer_t *layer = (pcb_layer_t *) cl; */
 	pcb_arc_t *a = (pcb_arc_t *) b;
@@ -647,7 +647,7 @@
 
 #define NEAR(a,b) ((a) <= (b) + 2 && (a) >= (b) - 2)
 
-static r_dir_t find_pair_line_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t find_pair_line_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_line_t *line = (pcb_line_t *) b;
 #if TRACE1
@@ -682,7 +682,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t find_pair_arc_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t find_pair_arc_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_arc_t *arc = (pcb_arc_t *) b;
 	Extra *e = ARC2EXTRA(arc);
@@ -749,7 +749,7 @@
 	return 0;
 }
 
-static r_dir_t find_pair_pinline_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t find_pair_pinline_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_line_t *line = (pcb_line_t *) b;
 	pcb_pin_t *pin = (pcb_pin_t *) cl;
@@ -781,7 +781,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t find_pair_pinarc_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t find_pair_pinarc_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_arc_t *arc = (pcb_arc_t *) b;
 	pcb_pin_t *pin = (pcb_pin_t *) cl;
@@ -793,7 +793,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t check_point_in_pad(pcb_pad_t *pad, int x, int y, End * e)
+static pcb_r_dir_t check_point_in_pad(pcb_pad_t *pad, int x, int y, End * e)
 {
 	int inside_p;
 	int t;
@@ -837,7 +837,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t find_pair_padline_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t find_pair_padline_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_line_t *line = (pcb_line_t *) b;
 	pcb_pad_t *pad = (pcb_pad_t *) cl;
@@ -895,7 +895,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t find_pair_padarc_callback(const pcb_box_t * b, void *cl)
+static pcb_r_dir_t find_pair_padarc_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_arc_t *arc = (pcb_arc_t *) b;
 	pcb_pad_t *pad = (pcb_pad_t *) cl;
@@ -1490,7 +1490,7 @@
 	return gp_point_force(x, y, t, e, esa, eda, 0, func);
 }
 
-static r_dir_t gp_line_cb(const pcb_box_t * b, void *cb)
+static pcb_r_dir_t gp_line_cb(const pcb_box_t * b, void *cb)
 {
 	const pcb_line_t *l = (pcb_line_t *) b;
 	Extra *e = LINE2EXTRA(l);
@@ -1509,7 +1509,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t gp_arc_cb(const pcb_box_t * b, void *cb)
+static pcb_r_dir_t gp_arc_cb(const pcb_box_t * b, void *cb)
 {
 	const pcb_arc_t *a = (pcb_arc_t *) b;
 	Extra *e = ARC2EXTRA(a);
@@ -1531,7 +1531,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t gp_text_cb(const pcb_box_t * b, void *cb)
+static pcb_r_dir_t gp_text_cb(const pcb_box_t * b, void *cb)
 {
 	const pcb_text_t *t = (pcb_text_t *) b;
 	/* FIXME: drop in the actual text-line endpoints later. */
@@ -1542,7 +1542,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t gp_poly_cb(const pcb_box_t * b, void *cb)
+static pcb_r_dir_t gp_poly_cb(const pcb_box_t * b, void *cb)
 {
 	int i;
 	const pcb_polygon_t *p = (pcb_polygon_t *) b;
@@ -1551,7 +1551,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t gp_pin_cb(const pcb_box_t * b, void *cb)
+static pcb_r_dir_t gp_pin_cb(const pcb_box_t * b, void *cb)
 {
 	const pcb_pin_t *p = (pcb_pin_t *) b;
 	int t2 = (p->Thickness + 1) / 2;
@@ -1573,7 +1573,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t gp_pad_cb(const pcb_box_t * b, void *cb)
+static pcb_r_dir_t gp_pad_cb(const pcb_box_t * b, void *cb)
 {
 	const pcb_pad_t *p = (pcb_pad_t *) b;
 	int t2 = (p->Thickness + 1) / 2;
Index: trunk/src_plugins/teardrops/teardrops.c
===================================================================
--- trunk/src_plugins/teardrops/teardrops.c	(revision 4803)
+++ trunk/src_plugins/teardrops/teardrops.c	(revision 4804)
@@ -56,7 +56,7 @@
 	return distance;
 }
 
-static r_dir_t check_line_callback(const pcb_box_t * box, void *cl)
+static pcb_r_dir_t check_line_callback(const pcb_box_t * box, void *cl)
 {
 	pcb_layer_t *lay = &PCB->Data->Layer[layer];
 	pcb_line_t *l = (pcb_line_t *) box;