Index: puller.c
===================================================================
--- puller.c	(revision 15868)
+++ puller.c	(revision 15869)
@@ -444,7 +444,7 @@
 	x = the_arc->X - the_arc->Width * cos(d2r(arc_angle)) + 0.5;
 	y = the_arc->Y + the_arc->Height * sin(d2r(arc_angle)) + 0.5;
 
-	pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, the_line, &(the_line->Point2), x - the_line->Point2.X, y - the_line->Point2.Y);
+	pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, the_line, &(the_line->Point2), x - the_line->Point2.X, y - the_line->Point2.Y);
 
 	pcb_gui->invalidate_all();
 	pcb_undo_inc_serial();
@@ -558,8 +558,8 @@
 #define ARC2EXTRA(a)     ((Extra *)g_hash_table_lookup (arcs, a))
 #define EXTRA2LINE(e)    (e->parent.line)
 #define EXTRA2ARC(e)     (e->parent.arc)
-#define EXTRA_IS_LINE(e) (e->type == PCB_TYPE_LINE)
-#define EXTRA_IS_ARC(e)  (e->type == PCB_TYPE_ARC)
+#define EXTRA_IS_LINE(e) (e->type == PCB_OBJ_LINE)
+#define EXTRA_IS_ARC(e)  (e->type == PCB_OBJ_ARC)
 
 static void unlink_end(Extra * x, Extra ** e)
 {
@@ -794,7 +794,7 @@
 	Extra *extra = g_slice_new0(Extra);
 	g_hash_table_insert(lines, line, extra);
 	extra->parent.line = line;
-	extra->type = PCB_TYPE_LINE;
+	extra->type = PCB_OBJ_LINE;
 	return extra;
 }
 
@@ -803,7 +803,7 @@
 	Extra *extra = g_slice_new0(Extra);
 	g_hash_table_insert(arcs, arc, extra);
 	extra->parent.arc = arc;
-	extra->type = PCB_TYPE_ARC;
+	extra->type = PCB_OBJ_ARC;
 	return extra;
 }
 
@@ -1043,8 +1043,8 @@
 	x = line->Point1.X;
 	y = line->Point1.Y;
 #if 1
-	pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, line, &(line->Point1), line->Point2.X - line->Point1.X, line->Point2.Y - line->Point1.Y);
-	pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, line, &(line->Point2), x - line->Point2.X, y - line->Point2.Y);
+	pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, line, &(line->Point1), line->Point2.X - line->Point1.X, line->Point2.Y - line->Point1.Y);
+	pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, line, &(line->Point2), x - line->Point2.X, y - line->Point2.Y);
 #else
 	/* In theory, we should be using the above so that undo works.  */
 	line->Point1.X = line->Point2.X;
@@ -1438,7 +1438,7 @@
 #endif
 	pcb_line_t *line = pcb_line_new(CURRENT, x1, y1, x2, y2,
 																					sample->Thickness, sample->Clearance, sample->Flags);
-	pcb_undo_add_obj_to_create(PCB_TYPE_LINE, CURRENT, line, line);
+	pcb_undo_add_obj_to_create(PCB_OBJ_LINE, CURRENT, line, line);
 
 #if TRACE1
 	e =
@@ -1466,7 +1466,7 @@
 	if (arc == 0) {
 		arc = pcb_arc_new(CURRENT, x, y, r, r, sa, da * 2, sample->Thickness, sample->Clearance, sample->Flags);
 	}
-	pcb_undo_add_obj_to_create(PCB_TYPE_ARC, CURRENT, arc, arc);
+	pcb_undo_add_obj_to_create(PCB_OBJ_ARC, CURRENT, arc, arc);
 
 	if (!arc)
 		longjmp(abort_buf, 1);
@@ -1547,8 +1547,8 @@
 		fprintf(stderr, "double neg move?\n");
 		abort();
 	}
-	pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, l, &(l->Point1), -1 - l->Point1.X, -1 - l->Point1.Y);
-	pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, l, &(l->Point2), -1 - l->Point2.X, -1 - l->Point2.Y);
+	pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, l, &(l->Point1), -1 - l->Point1.X, -1 - l->Point1.Y);
+	pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, l, &(l->Point2), -1 - l->Point2.X, -1 - l->Point2.Y);
 #endif
 }
 
@@ -1828,11 +1828,11 @@
 
 		pcb_arc_set_angles(CURRENT, start_arc, start_arc->StartAngle, new_delta);
 		fix_arc_extra(start_arc, sarc_extra);
-		pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point1),
+		pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point1),
 							 sarc_extra->end.x - start_line->Point1.X, sarc_extra->end.y - start_line->Point1.Y);
 
 		if (del_arc) {
-			pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point1),
+			pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point1),
 								 sarc_extra->start.x - start_line->Point1.X, sarc_extra->start.y - start_line->Point1.Y);
 			mark_arc_for_deletion(start_arc);
 		}
@@ -1894,17 +1894,17 @@
 
 			pcb_arc_set_angles(CURRENT, end_arc, end_arc->StartAngle, new_delta);
 			fix_arc_extra(end_arc, earc_extra);
-			pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point2),
+			pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point2),
 								 earc_extra->end.x - start_line->Point2.X, earc_extra->end.y - start_line->Point2.Y);
 
 			if (del_arc) {
-				pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point2),
+				pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point2),
 									 earc_extra->start.x - start_line->Point2.X, earc_extra->start.y - start_line->Point2.Y);
 				mark_arc_for_deletion(end_arc);
 			}
 		}
 		else {
-			pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point2),
+			pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point2),
 								 end_line->Point2.X - start_line->Point2.X, end_line->Point2.Y - start_line->Point2.Y);
 		}
 		mark_line_for_deletion(end_line);
@@ -1938,7 +1938,7 @@
 #if TRACE1
 	pcb_printf("new point %#mS\n", ex, ey);
 #endif
-	pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, end_line, &(end_line->Point1), ex - end_line->Point1.X, ey - end_line->Point1.Y);
+	pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, end_line, &(end_line->Point1), ex - end_line->Point1.X, ey - end_line->Point1.Y);
 
 	/* Step 4: Split start_line at the obstacle and insert a zero-delta
 	   arc at it.  */
@@ -1951,7 +1951,7 @@
 	if (end_arc)
 		earc_extra = ARC2EXTRA(end_arc);
 
-	pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point2),
+	pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point2),
 						 new_aextra->start.x - start_line->Point2.X, new_aextra->start.y - start_line->Point2.Y);
 
 	new_line = create_line(start_line, new_aextra->end.x, new_aextra->end.y, ex, ey);