Added X-Macro definitions to the data types.