Added macro to handle defining persona and action type enums.
Removed some unneeded #includes.