remove private defines from util.h