removed commented out inclusion of action_definition.h and macro