Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 4996)
+++ trunk/doc-rnd/hacking/renames	(revision 4997)
@@ -765,3 +765,6 @@
 rats_patch_apply -> pcb_ratspatch_apply
 rats_patch_fexport -> pcb_ratspatch_fexport
 RemovePCB -> pcb_board_remove
+RemoveSelected -> pcb_remove_selected
+RemoveObject -> pcb_remove_object
+DestroyObject -> pcb_destroy_object
Index: trunk/src/action_helper.c
===================================================================
--- trunk/src/action_helper.c	(revision 4996)
+++ trunk/src/action_helper.c	(revision 4997)
@@ -306,7 +306,7 @@
 			pcb_buffer_clear(PCB_PASTEBUFFER);
 			pcb_buffer_add_selected(PCB_PASTEBUFFER, Note.X, Note.Y, pcb_true);
 			SaveUndoSerialNumber();
-			RemoveSelected();
+			pcb_remove_selected();
 			SaveMode();
 			saved_mode = pcb_true;
 			SetMode(PCB_MODE_PASTE_BUFFER);
@@ -1022,7 +1022,7 @@
 						SaveUndoSerialNumber();
 						Flags = ((pcb_polygon_t *) Crosshair.AttachedObject.Ptr2)->Flags;
 						pcb_poly_to_polygons_on_layer(PCB->Data, (pcb_layer_t *) Crosshair.AttachedObject.Ptr1, result, Flags);
-						RemoveObject(PCB_TYPE_POLYGON,
+						pcb_remove_object(PCB_TYPE_POLYGON,
 												 Crosshair.AttachedObject.Ptr1, Crosshair.AttachedObject.Ptr2, Crosshair.AttachedObject.Ptr3);
 						RestoreUndoSerialNumber();
 						IncrementUndoSerialNumber();
@@ -1124,7 +1124,7 @@
 					ptr++;
 				}
 			}
-			RemoveObject(type, ptr1, ptr2, ptr3);
+			pcb_remove_object(type, ptr1, ptr2, ptr3);
 			IncrementUndoSerialNumber();
 			SetChangedFlag(pcb_true);
 		}
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 4996)
+++ trunk/src/obj_elem.c	(revision 4997)
@@ -374,7 +374,7 @@
 	}
 	END_LOOP;
 	if (!hasParts) {
-		DestroyObject(PCB->Data, PCB_TYPE_ELEMENT, Element, Element, Element);
+		pcb_destroy_object(PCB->Data, PCB_TYPE_ELEMENT, Element, Element, Element);
 		pcb_message(PCB_MSG_DEFAULT, _("There was nothing to convert!\n" "Elements must have some silk, pads or pins.\n"));
 		return (pcb_false);
 	}
Index: trunk/src/object_act.c
===================================================================
--- trunk/src/object_act.c	(revision 4996)
+++ trunk/src/object_act.c	(revision 4997)
@@ -734,7 +734,7 @@
 			PCB_LINE_ALL_LOOP(PCB->Data);
 			{
 				if (PCB_FLAG_TEST(PCB_FLAG_AUTO, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) {
-					RemoveObject(PCB_TYPE_LINE, layer, line, line);
+					pcb_remove_object(PCB_TYPE_LINE, layer, line, line);
 					changed = pcb_true;
 				}
 			}
@@ -742,7 +742,7 @@
 			PCB_ARC_ALL_LOOP(PCB->Data);
 			{
 				if (PCB_FLAG_TEST(PCB_FLAG_AUTO, arc) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, arc)) {
-					RemoveObject(PCB_TYPE_ARC, layer, arc, arc);
+					pcb_remove_object(PCB_TYPE_ARC, layer, arc, arc);
 					changed = pcb_true;
 				}
 			}
@@ -750,7 +750,7 @@
 			PCB_VIA_LOOP(PCB->Data);
 			{
 				if (PCB_FLAG_TEST(PCB_FLAG_AUTO, via) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, via)) {
-					RemoveObject(PCB_TYPE_VIA, via, via, via);
+					pcb_remove_object(PCB_TYPE_VIA, via, via, via);
 					changed = pcb_true;
 				}
 			}
@@ -766,7 +766,7 @@
 			{
 				if (PCB_FLAGS_TEST(PCB_FLAG_AUTO | PCB_FLAG_SELECTED, line)
 						&& !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) {
-					RemoveObject(PCB_TYPE_LINE, layer, line, line);
+					pcb_remove_object(PCB_TYPE_LINE, layer, line, line);
 					changed = pcb_true;
 				}
 			}
@@ -776,7 +776,7 @@
 			{
 				if (PCB_FLAGS_TEST(PCB_FLAG_AUTO | PCB_FLAG_SELECTED, via)
 						&& !PCB_FLAG_TEST(PCB_FLAG_LOCK, via)) {
-					RemoveObject(PCB_TYPE_VIA, via, via, via);
+					pcb_remove_object(PCB_TYPE_VIA, via, via, via);
 					changed = pcb_true;
 				}
 			}
Index: trunk/src/polygon.c
===================================================================
--- trunk/src/polygon.c	(revision 4996)
+++ trunk/src/polygon.c	(revision 4997)
@@ -1213,7 +1213,7 @@
 		line.Point2 = Polygon->Points[next];
 		line.Thickness = 0;
 		if (IsPointOnLine(p->X, p->Y, 0.0, &line)) {
-			RemoveObject(PCB_TYPE_POLYGON_POINT, Layer, Polygon, p);
+			pcb_remove_object(PCB_TYPE_POLYGON_POINT, Layer, Polygon, p);
 			changed = pcb_true;
 		}
 	}
Index: trunk/src/remove.c
===================================================================
--- trunk/src/remove.c	(revision 4996)
+++ trunk/src/remove.c	(revision 4997)
@@ -73,7 +73,7 @@
  * removes all selected and visible objects
  * returns pcb_true if any objects have been removed
  */
-pcb_bool RemoveSelected(void)
+pcb_bool pcb_remove_selected(void)
 {
 	pcb_opctx_t ctx;
 
@@ -93,7 +93,7 @@
  * remove object as referred by pointers and type,
  * allocated memory is passed to the 'remove undo' list
  */
-void *RemoveObject(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+void *pcb_remove_object(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
 {
 	pcb_opctx_t ctx;
 	void *ptr;
@@ -110,7 +110,7 @@
  * remove object as referred by pointers and type
  * allocated memory is destroyed assumed to already be erased
  */
-void *DestroyObject(pcb_data_t *Target, int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+void *pcb_destroy_object(pcb_data_t *Target, int Type, void *Ptr1, void *Ptr2, void *Ptr3)
 {
 	pcb_opctx_t ctx;
 
Index: trunk/src/remove.h
===================================================================
--- trunk/src/remove.h	(revision 4996)
+++ trunk/src/remove.h	(revision 4997)
@@ -38,8 +38,8 @@
 	(PCB_TYPE_VIA | PCB_TYPE_LINE_POINT | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT |	\
 	PCB_TYPE_POLYGON_POINT | PCB_TYPE_POLYGON | PCB_TYPE_RATLINE | PCB_TYPE_ARC)
 
-pcb_bool RemoveSelected(void);
-void *RemoveObject(int, void *, void *, void *);
-void *DestroyObject(pcb_data_t *, int, void *, void *, void *);
+pcb_bool pcb_remove_selected(void);
+void *pcb_remove_object(int, void *, void *, void *);
+void *pcb_destroy_object(pcb_data_t *, int, void *, void *, void *);
 
 #endif
Index: trunk/src/remove_act.c
===================================================================
--- trunk/src/remove_act.c	(revision 4996)
+++ trunk/src/remove_act.c	(revision 4997)
@@ -51,7 +51,7 @@
 	Note.Y = Crosshair.Y;
 
 	if (id == -1) {								/* no arg */
-		if (RemoveSelected() == pcb_false)
+		if (pcb_remove_selected() == pcb_false)
 			id = F_Object;
 	}
 
@@ -63,7 +63,7 @@
 		RestoreMode();
 		break;
 	case F_Selected:
-		RemoveSelected();
+		pcb_remove_selected();
 		break;
 	case F_AllRats:
 		if (pcb_rats_destroy(pcb_false))
@@ -80,7 +80,7 @@
 
 /* --------------------------------------------------------------------------- */
 
-static const char removeselected_syntax[] = "RemoveSelected()";
+static const char removeselected_syntax[] = "pcb_remove_selected()";
 
 static const char removeselected_help[] = "Removes any selected objects.";
 
@@ -90,7 +90,7 @@
 
 static int ActionRemoveSelected(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
-	if (RemoveSelected())
+	if (pcb_remove_selected())
 		SetChangedFlag(pcb_true);
 	return 0;
 }
Index: trunk/src/select_act.c
===================================================================
--- trunk/src/select_act.c	(revision 4996)
+++ trunk/src/select_act.c	(revision 4997)
@@ -227,7 +227,7 @@
 				y = pcb_grid_fit(y, PCB->Grid, PCB->GridOffsetY);
 				pcb_buffer_add_selected(PCB_PASTEBUFFER, x, y, pcb_true);
 				SaveUndoSerialNumber();
-				RemoveSelected();
+				pcb_remove_selected();
 				pcb_element_convert_from_buffer(PCB_PASTEBUFFER);
 				RestoreUndoSerialNumber();
 				pcb_buffer_copy_to_layout(x, y);
Index: trunk/src/undo.c
===================================================================
--- trunk/src/undo.c	(revision 4996)
+++ trunk/src/undo.c	(revision 4997)
@@ -221,7 +221,7 @@
 		case UNDO_REMOVE:
 			type = SearchObjectByID(RemoveList, &ptr1, &ptr2, &ptr3, ptr->ID, ptr->Kind);
 			if (type != PCB_TYPE_NONE) {
-				DestroyObject(RemoveList, type, ptr1, ptr2, ptr3);
+				pcb_destroy_object(RemoveList, type, ptr1, ptr2, ptr3);
 			}
 			break;
 		default:
@@ -740,7 +740,7 @@
 			Entry->Kind = PCB_TYPE_POLYGON;
 			Entry->Type = UNDO_REMOVE_POINT;
 			Entry->Data.RemovedPoint.Index = point_idx;
-			DestroyObject(PCB->Data, PCB_TYPE_POLYGON_POINT, layer, polygon, pnt);
+			pcb_destroy_object(PCB->Data, PCB_TYPE_POLYGON_POINT, layer, polygon, pnt);
 			if (andDraw && layer->On)
 				DrawPolygon(layer, polygon);
 			return (pcb_true);
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 4996)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 4997)
@@ -4081,12 +4081,12 @@
 	if (rb->type == LINE && rb->livedraw_obj.line) {
 		pcb_layer_t *layer = LAYER_PTR(PCB->LayerGroups.Entries[rb->group][0]);
 		EraseLine(rb->livedraw_obj.line);
-		DestroyObject(PCB->Data, PCB_TYPE_LINE, layer, rb->livedraw_obj.line, NULL);
+		pcb_destroy_object(PCB->Data, PCB_TYPE_LINE, layer, rb->livedraw_obj.line, NULL);
 		rb->livedraw_obj.line = NULL;
 	}
 	if (rb->type == VIA && rb->livedraw_obj.via) {
 		EraseVia(rb->livedraw_obj.via);
-		DestroyObject(PCB->Data, PCB_TYPE_VIA, rb->livedraw_obj.via, NULL, NULL);
+		pcb_destroy_object(PCB->Data, PCB_TYPE_VIA, rb->livedraw_obj.via, NULL, NULL);
 		rb->livedraw_obj.via = NULL;
 	}
 }
Index: trunk/src_plugins/djopt/djopt.c
===================================================================
--- trunk/src_plugins/djopt/djopt.c	(revision 4996)
+++ trunk/src_plugins/djopt/djopt.c	(revision 4997)
@@ -685,7 +685,7 @@
 
 static void remove_via_at(corner_s * c)
 {
-	RemoveObject(PCB_TYPE_VIA, c->via, 0, 0);
+	pcb_remove_object(PCB_TYPE_VIA, c->via, 0, 0);
 	c->via = 0;
 }
 
Index: trunk/src_plugins/hid_gtk/gui-netlist-window.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-netlist-window.c	(revision 4996)
+++ trunk/src_plugins/hid_gtk/gui-netlist-window.c	(revision 4997)
@@ -536,7 +536,7 @@
 	PCB_LINE_VISIBLE_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line))
-			RemoveObject(PCB_TYPE_LINE, layer, line, line);
+			pcb_remove_object(PCB_TYPE_LINE, layer, line, line);
 	}
 	ENDALL_LOOP;
 
@@ -543,7 +543,7 @@
 	PCB_ARC_VISIBLE_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, arc) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, arc))
-			RemoveObject(PCB_TYPE_ARC, layer, arc, arc);
+			pcb_remove_object(PCB_TYPE_ARC, layer, arc, arc);
 	}
 	ENDALL_LOOP;
 
@@ -551,7 +551,7 @@
 		PCB_VIA_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, via) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, via))
-			RemoveObject(PCB_TYPE_VIA, via, via, via);
+			pcb_remove_object(PCB_TYPE_VIA, via, via, via);
 	}
 	END_LOOP;
 
Index: trunk/src_plugins/hid_lesstif/netlist.c
===================================================================
--- trunk/src_plugins/hid_lesstif/netlist.c	(revision 4996)
+++ trunk/src_plugins/hid_lesstif/netlist.c	(revision 4997)
@@ -176,7 +176,7 @@
 	PCB_LINE_VISIBLE_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line))
-			RemoveObject(PCB_TYPE_LINE, layer, line, line);
+			pcb_remove_object(PCB_TYPE_LINE, layer, line, line);
 	}
 	ENDALL_LOOP;
 
@@ -183,7 +183,7 @@
 	PCB_ARC_VISIBLE_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, arc) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, arc))
-			RemoveObject(PCB_TYPE_ARC, layer, arc, arc);
+			pcb_remove_object(PCB_TYPE_ARC, layer, arc, arc);
 	}
 	ENDALL_LOOP;
 
@@ -191,7 +191,7 @@
 		PCB_VIA_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, via) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, via))
-			RemoveObject(PCB_TYPE_VIA, via, via, via);
+			pcb_remove_object(PCB_TYPE_VIA, via, via, via);
 	}
 	END_LOOP;
 }
Index: trunk/src_plugins/io_pcb/parse_y.c
===================================================================
--- trunk/src_plugins/io_pcb/parse_y.c	(revision 4996)
+++ trunk/src_plugins/io_pcb/parse_y.c	(revision 4997)
@@ -2390,7 +2390,7 @@
 					    "    line:        %i\n"
 					    "    description: 'ignored polygon (< 3 points in a contour)'\n",
 					    yyfilename, pcb_lineno);
-				    DestroyObject(yyData, PCB_TYPE_POLYGON, Layer, Polygon, Polygon);
+				    pcb_destroy_object(yyData, PCB_TYPE_POLYGON, Layer, Polygon, Polygon);
 				  }
 				else
 				  {
Index: trunk/src_plugins/io_pcb/parse_y.y
===================================================================
--- trunk/src_plugins/io_pcb/parse_y.y	(revision 4996)
+++ trunk/src_plugins/io_pcb/parse_y.y	(revision 4997)
@@ -1168,7 +1168,7 @@
 					    "    line:        %i\n"
 					    "    description: 'ignored polygon (< 3 points in a contour)'\n",
 					    yyfilename, pcb_lineno);
-				    DestroyObject(yyData, PCB_TYPE_POLYGON, Layer, Polygon, Polygon);
+				    pcb_destroy_object(yyData, PCB_TYPE_POLYGON, Layer, Polygon, Polygon);
 				  }
 				else
 				  {