Added definitions for X macros.