Fix includes and set xml as default format