Added util/macros.h - ups