Fix include paths to new location of libutil.