Index: board.c
===================================================================
--- board.c	(revision 31039)
+++ board.c	(revision 31040)
@@ -189,7 +189,7 @@
 
 TODO("padstack: move this to obj_pstk.c after pinvia removal")
 #include "obj_pstk_inlines.h"
-static pcb_r_dir_t hole_counting_callback(const rnd_rnd_box_t * b, void *cl)
+static rnd_r_dir_t hole_counting_callback(const rnd_rnd_box_t * b, void *cl)
 {
 	pcb_pstk_t *ps = (pcb_pstk_t *)b;
 	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
@@ -201,10 +201,10 @@
 		else
 			hcs->nunplated++;
 	}
-	return PCB_R_DIR_FOUND_CONTINUE;
+	return RND_R_DIR_FOUND_CONTINUE;
 }
 
-static pcb_r_dir_t slot_counting_callback(const rnd_rnd_box_t *b, void *cl)
+static rnd_r_dir_t slot_counting_callback(const rnd_rnd_box_t *b, void *cl)
 {
 	pcb_pstk_t *ps = (pcb_pstk_t *)b;
 	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
@@ -216,7 +216,7 @@
 		else
 			hcs->nunplated++;
 	}
-	return PCB_R_DIR_FOUND_CONTINUE;
+	return RND_R_DIR_FOUND_CONTINUE;
 }
 
 void pcb_board_count_holes(pcb_board_t *pcb, int *plated, int *unplated, const rnd_rnd_box_t *within_area)
@@ -223,7 +223,7 @@
 {
 	HoleCountStruct hcs = { 0, 0 };
 
-	pcb_r_search(pcb->Data->padstack_tree, within_area, NULL, hole_counting_callback, &hcs, NULL);
+	rnd_r_search(pcb->Data->padstack_tree, within_area, NULL, hole_counting_callback, &hcs, NULL);
 
 	if (plated != NULL)
 		*plated = hcs.nplated;
@@ -235,7 +235,7 @@
 {
 	HoleCountStruct hcs = { 0, 0 };
 
-	pcb_r_search(pcb->Data->padstack_tree, within_area, NULL, slot_counting_callback, &hcs, NULL);
+	rnd_r_search(pcb->Data->padstack_tree, within_area, NULL, slot_counting_callback, &hcs, NULL);
 
 	if (plated != NULL)
 		*plated = hcs.nplated;