Update headers for compile with cm10.1