Index: pcb-mincut/load.c
===================================================================
--- pcb-mincut/load.c	(revision 30941)
+++ pcb-mincut/load.c	(revision 30942)
@@ -116,7 +116,7 @@
 		if (htsi_has(name2node, (char *)id))
 			return htsi_get(name2node, (char *)id);
 		if (alloc) {
-			node2name[num_nodes] = pcb_strdup(id);
+			node2name[num_nodes] = rnd_strdup(id);
 			htsi_set(name2node, node2name[num_nodes], num_nodes);
 			return num_nodes++;
 		}
@@ -189,8 +189,8 @@
 	}
 
 	name2node = htsi_alloc(keyhash, strkeyeq);
-	node2name[0] = pcb_strdup("(S)"); htsi_set(name2node, node2name[0], 0);
-	node2name[1] = pcb_strdup("(T)"); htsi_set(name2node, node2name[1], 1);
+	node2name[0] = rnd_strdup("(S)"); htsi_set(name2node, node2name[0], 0);
+	node2name[1] = rnd_strdup("(T)"); htsi_set(name2node, node2name[1], 1);
 	num_nodes = 2;
 	nn_net[0] = 0;
 	nn_net[1] = 0;
Index: pcb-mincut/main.c
===================================================================
--- pcb-mincut/main.c	(revision 30941)
+++ pcb-mincut/main.c	(revision 30942)
@@ -9,8 +9,8 @@
 
 #undef strdup
 
-char *pcb_strdup(const char *s) { return strdup(s); }
-int pcb_rand() { return rand(); }
+char *rnd_strdup(const char *s) { return strdup(s); }
+int rnd_rand() { return rand(); }
 
 int main()
 {
Index: pcb-mincut/solve.c
===================================================================
--- pcb-mincut/solve.c	(revision 30941)
+++ pcb-mincut/solve.c	(revision 30942)
@@ -44,7 +44,7 @@
 static int pick_del(sstate_t *st)
 {
 	int idx, ret, size;
-	idx = pcb_rand() % st->num_avail;
+	idx = rnd_rand() % st->num_avail;
 	ret = st->avail[idx];
 	size = (st->num_avail-idx-1) * sizeof(int);
 	if (size > 0)
@@ -66,7 +66,7 @@
 	}
 	if (num_neigh == 0)
 		return -1;
-	return st->neigh[pcb_rand() % num_neigh];
+	return st->neigh[rnd_rand() % num_neigh];
 }
 
 static void retag(sstate_t *st, int from, int to)
Index: rats_mincut.c
===================================================================
--- rats_mincut.c	(revision 30941)
+++ rats_mincut.c	(revision 30942)
@@ -185,8 +185,8 @@
 	if (nonterms < 1)
 		bad_gr = 1;
 
-	g->node2name[0] = pcb_strdup("S");
-	g->node2name[1] = pcb_strdup("T");
+	g->node2name[0] = rnd_strdup("S");
+	g->node2name[1] = rnd_strdup("T");
 
 	/* calculate how many edges each node has and the max edge count */
 	maxedges = 0;