This means we need to include many more headers in various files that simply included util.h before, but it seems cleaner to do it this way.