Remove makefile indirection, fix include
Update libutil