Fix includes and CML