diff -r cff9c4101dd7 -r a9bbd82d2dce src/server/util/objs.mk
--- a/src/server/util/objs.mk	Sat Jan 14 14:33:38 2012 +0100
+++ b/src/server/util/objs.mk	Sun Jan 15 17:00:16 2012 +0100
@@ -33,7 +33,7 @@
 UTILOBJ = io.o
 UTILOBJ += netbuf.o
 UTILOBJ += object.o
-UTILOBJ += pblock.o
+# UTILOBJ += pblock.o
 UTILOBJ += plist.o
 UTILOBJ += pool.o
 UTILOBJ += shexp.o
@@ -41,8 +41,15 @@
 UTILOBJ += system.o
 UTILOBJ += systhr.o
 UTILOBJ += thrpool.o
-UTILOBJ += uri.o
+#UTILOBJ += uri.o
 UTILOBJ += util.o
 
 UTILOBJS = $(UTILOBJ:%=$(UTIL_OBJPRE)%)
+UTILSOURCE = $(UTILOBJ:%.o=util/%.c)
 
+# add cpp files
+UTILOBJS += $(UTIL_OBJPRE)pblock.o
+UTILOBJS += $(UTIL_OBJPRE)uri.o
+
+UTILSOURCE += util/pblock.cpp
+UTILSOURCE += util/uri.cpp