Fix includes after export statements