added lots of util-* headers