Fix includes to only run on the queue