Additional files from new CCAN libs