Index: abstract.c
===================================================================
--- abstract.c	(revision 859)
+++ abstract.c	(revision 860)
@@ -31,7 +31,7 @@
 #include <genht/hash.h>
 
 #include "abstract.h"
-#include "compat.h"
+#include "compat_misc.h"
 
 void csch_ahdr_uninit(csch_ahdr_t *hdr)
 {
@@ -127,7 +127,7 @@
 
 	net = calloc(sizeof(csch_anet_t), 1);
 	csch_aobj_init(abs, &net->hdr, CSCH_ATYPE_NET);
-	net->netname = csch_strdup(netname);
+	net->netname = pcb_strdup(netname);
 	htsp_set(&abs->nets, net->netname, net);
 	return net;
 }
@@ -142,7 +142,7 @@
 
 	comp = calloc(sizeof(csch_acomp_t), 1);
 	csch_aobj_init(abs, &comp->hdr, CSCH_ATYPE_COMP);
-	comp->name = csch_strdup(name);
+	comp->name = pcb_strdup(name);
 	htsp_set(&abs->comps, comp->name, comp);
 	htsp_init(&comp->ports, strhash, strkeyeq);
 	return comp;
@@ -158,7 +158,7 @@
 
 	port = calloc(sizeof(csch_aport_t), 1);
 	csch_aobj_init(abs, &port->hdr, CSCH_ATYPE_PORT);
-	port->name = csch_strdup(name);
+	port->name = pcb_strdup(name);
 	htsp_set(&comp->ports, port->name, port);
 	return port;
 }