Split util.h into two files