Fix includes and config bits to conform to CCI.