Fix util.h resolution issue