Fix includes in new codec code