Remove libutil header where it is not needed