Fix includes for trigger data