Index: pstk_compat.c
===================================================================
--- pstk_compat.c	(revision 30912)
+++ pstk_compat.c	(revision 30913)
@@ -117,7 +117,7 @@
 {
 	pcb_pstk_proto_t proto;
 	pcb_pstk_shape_t shape[5]; /* max number of shapes: 3 coppers, 2 masks */
-	pcb_cardinal_t pid;
+	rnd_cardinal_t pid;
 	pcb_pstk_shape_t copper_master, mask_master;
 	pcb_pstk_tshape_t tshp;
 	int n;
@@ -478,7 +478,7 @@
 	pcb_layer_type_t side;
 	pcb_pstk_proto_t proto;
 	pcb_pstk_shape_t shape[3]; /* max number of shapes: 1 copper, 1 mask, 1 paste */
-	pcb_cardinal_t pid;
+	rnd_cardinal_t pid;
 	pcb_pstk_tshape_t tshp;
 	int n;
 	rnd_coord_t cx, cy;
Index: pstk_help.c
===================================================================
--- pstk_help.c	(revision 30912)
+++ pstk_help.c	(revision 30913)
@@ -37,7 +37,7 @@
 pcb_pstk_t *pcb_pstk_new_hole(pcb_data_t *data, rnd_coord_t x, rnd_coord_t y, rnd_coord_t drill_dia, rnd_bool plated)
 {
 	pcb_pstk_proto_t proto;
-	pcb_cardinal_t pid;
+	rnd_cardinal_t pid;
 
 	memset(&proto, 0, sizeof(proto));
 	proto.hdia = drill_dia;
@@ -89,7 +89,7 @@
 
 	memset(&proto, 0, sizeof(proto));
 	if (pcb_pstk_proto_conv(data, &proto, quiet, &tmp, cx, cy) == 0) {
-		pcb_cardinal_t pid;
+		rnd_cardinal_t pid;
 		if (plated != -1)
 			proto.hplated = plated;
 		pid = pcb_pstk_proto_insert_or_free(data, &proto, quiet, 0);
@@ -286,7 +286,7 @@
 pcb_pstk_t *pcb_pstk_new_from_shape(pcb_data_t *data, rnd_coord_t x, rnd_coord_t y, rnd_coord_t drill_dia, rnd_bool plated, rnd_coord_t glob_clearance, pcb_pstk_shape_t *shape)
 {
 	pcb_pstk_proto_t proto;
-	pcb_cardinal_t pid;
+	rnd_cardinal_t pid;
 	pcb_pstk_tshape_t tshp;
 	pcb_pstk_shape_t *s;