Moved some macros to containers.h