Index: tests/pcb-printf/Makefile
===================================================================
--- tests/pcb-printf/Makefile	(revision 5792)
+++ tests/pcb-printf/Makefile	(revision 5793)
@@ -5,6 +5,7 @@
 LDFLAGS = -lm
 
 GDS= $(TRUNK)/src_3rd/genvector/gds_char.o
+LIBPCB_BASE= $(SRC)/unit.o $(SRC)/compat_misc.o
 
 all: tester_spd prcli
 
@@ -12,13 +13,13 @@
 	@echo "*** all ok, QC PASS ***"
 	@rm tester.stdout ; true
 
-prcli: prcli.o $(SRC)/pcb-printf.o $(SRC)/unit.o $(GDS) $(SRC)/misc_util.o $(GDS)
+prcli: prcli.o $(SRC)/pcb-printf.o $(SRC)/misc_util.o $(LIBPCB_BASE) $(GDS)
 
 prcli.o: prcli.c
 
-tester: tester.o $(SRC)/pcb-printf.o $(SRC)/unit.o $(GDS)
+tester: tester.o $(SRC)/pcb-printf.o $(LIBPCB_BASE)  $(GDS)
 
-tester_spd: tester_spd.o $(SRC)/pcb-printf_spd.o $(SRC)/unit.o $(GDS)
+tester_spd: tester_spd.o $(SRC)/pcb-printf_spd.o $(LIBPCB_BASE) $(GDS)
 
 tester.o: tester.c
 	$(CC) -c $(CFLAGS) -o $@ tester.c
@@ -40,5 +41,5 @@
 	$(CC) -c $(CFLAGS_OP) -DSPEED $(CFLAGS) -o $@ $(SRC)/pcb-printf.c
 
 clean:
-	rm tester tester.o 2>/dev/null ; true
+	rm tester tester.o prcli prcli.o tester_spd tester_spd.o 2>/dev/null ; true
 
Index: tests/pcb-printf/prcli.c
===================================================================
--- tests/pcb-printf/prcli.c	(revision 5792)
+++ tests/pcb-printf/prcli.c	(revision 5793)
@@ -6,7 +6,7 @@
 int main(int argc, char *argv[])
 {
 	const char *fmt = argv[1];
-	Coord crd;
+	pcb_coord_t crd;
 	int n;
 
 	pcb_printf_slot[0] = "%mr";
@@ -15,7 +15,7 @@
 		pcb_bool success;
 		double val = pcb_get_value_ex(argv[n], NULL, NULL, NULL, "", &success);
 		if (!success) {
-			fprintf(stderr, "Unable to convert '%s' to coord\n", argv[n]);
+			fprintf(stderr, "Unable to convert '%s' to pcb_coord_t\n", argv[n]);
 			return 1;
 		}
 		crd = val;
Index: tests/pcb-printf/tester.c
===================================================================
--- tests/pcb-printf/tester.c	(revision 5792)
+++ tests/pcb-printf/tester.c	(revision 5793)
@@ -1,7 +1,6 @@
 #include <time.h>
 #include <locale.h>
 #include "config.h"
-#include "global.h"
 #include "pcb-printf.h"
 
 #ifdef SPEED
@@ -20,7 +19,7 @@
 
 int main()
 {
-	Coord c[] = {0, 1, 1024, 1024*1024, 1024*1024*1024};
+	pcb_coord_t c[] = {0, 1, 1024, 1024*1024, 1024*1024*1024};
 	char *fmt[] = {
 	"%mI",  "%mm",  "%mM",  "%ml",  "%mL",  "%ms",  "%mS",  "%md",  "%mD",  "%m3",  "%mr",
 	"%$mI", "%$mm", "%$mM", "%$ml", "%$mL", "%$ms", "%$mS", "%$md", "%$mD", "%$m3", "%$mr",